]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Dropped oids from Transform.dump_sequence() return value
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Thu, 6 Aug 2020 01:15:52 +0000 (02:15 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sun, 23 Aug 2020 18:24:02 +0000 (19:24 +0100)
psycopg3/psycopg3/copy.py
psycopg3/psycopg3/proto.py
psycopg3/psycopg3/transform.py
psycopg3/psycopg3/utils/queries.py
psycopg3_c/psycopg3_c/_psycopg3.pyi
psycopg3_c/psycopg3_c/transform.pyx

index f8931decab375fa249bae7b1a06712caddaf4e50..1849f16c0369673263344395654c0eaf45ad70c9 100644 (file)
@@ -89,7 +89,7 @@ class BaseCopy:
     def format_row(self, row: Sequence[Any]) -> bytes:
         # TODO: cache this, or pass just a single format
         formats = [self.format] * len(row)
-        out, _ = self._transformer.dump_sequence(row, formats)
+        out = self._transformer.dump_sequence(row, formats)
         return self._format_row(out)
 
     def _format_row_text(self, row: Sequence[Optional[bytes]],) -> bytes:
index 9ae326aadfccee1f279915dc1745f792fb54639d..0b996adc48262c4863d88d5c7be85ee5503705e6 100644 (file)
@@ -79,7 +79,7 @@ class Transformer(Protocol):
 
     def dump_sequence(
         self, objs: Iterable[Any], formats: Iterable[Format]
-    ) -> Tuple[List[Optional[bytes]], List[int]]:
+    ) -> List[Optional[bytes]]:
         ...
 
     def types_sequence(self) -> List[int]:
index 95c714082b081b19cf76a04b6b16c57670cd5b80..2e8e41722dfe717f4e78a543788cea2b9f79ae9c 100644 (file)
@@ -145,7 +145,7 @@ class Transformer:
     # TODO: drop?
     def dump_sequence(
         self, objs: Iterable[Any], formats: Iterable[Format]
-    ) -> Tuple[List[Optional[bytes]], List[int]]:
+    ) -> List[Optional[bytes]]:
         out: List[Optional[bytes]] = []
         oids = self._oids = []
 
@@ -162,7 +162,7 @@ class Transformer:
                 out.append(None)
                 oids.append(TEXT_OID)
 
-        return out, self._oids
+        return out
 
     # TODO: drop?
     def types_sequence(self) -> List[int]:
index c2625ddcbf91e8571ec7417a21ca4ff1e3d502cb..ab70eb8e0868dfbb825ccf580237b0d5b4d749c6 100644 (file)
@@ -69,7 +69,7 @@ class PostgresQuery:
             params = _validate_and_reorder_params(
                 self._parts, vars, self._order
             )
-            self.params, _ = self._tx.dump_sequence(params, self.formats or ())
+            self.params = self._tx.dump_sequence(params, self.formats or ())
             if self.types is None:
                 self.types = self._tx.types_sequence()
         else:
index 1a9e1d596d0ba97a6fa1f526a5dadf77b314792d..4226c2dd643ef25d0fc9d207eb5a25245a067b73 100644 (file)
@@ -34,7 +34,7 @@ class Transformer:
     ) -> None: ...
     def dump_sequence(
         self, objs: Iterable[Any], formats: Iterable[pq.Format]
-    ) -> Tuple[List[Optional[bytes]], List[int]]: ...
+    ) -> List[Optional[bytes]]: ...
     def types_sequence(self) -> List[int]: ...
     def dump(
         self, obj: None, format: pq.Format = pq.Format.TEXT
index adae62a7b50979fc316a1b8dd84ed45e5cc5aced..98e2461b3ad182427d5697ed94b651db13662b82 100644 (file)
@@ -221,7 +221,7 @@ cdef class Transformer:
 
     def dump_sequence(
         self, objs: Iterable[Any], formats: Iterable[Format]
-    ) -> Tuple[List[Optional[bytes]], List[int]]:
+    ) -> List[Optional[bytes]]:
         out: List[Optional[bytes]] = []
         oids = self._oids = []
 
@@ -238,7 +238,7 @@ cdef class Transformer:
                 out.append(None)
                 oids.append(TEXT_OID)
 
-        return out, oids
+        return out
 
     def types_sequence(self) -> List[int]:
         return self._oids