From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Thu, 6 Aug 2020 01:15:52 +0000 (+0100)
Subject: Dropped oids from Transform.dump_sequence() return value
X-Git-Tag: 3.0.dev0~458^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11010a919b6fb4caf1555fd72ab16e72a174be10;p=thirdparty%2Fpsycopg.git

Dropped oids from Transform.dump_sequence() return value
---

diff --git a/psycopg3/psycopg3/copy.py b/psycopg3/psycopg3/copy.py
index f8931deca..1849f16c0 100644
--- a/psycopg3/psycopg3/copy.py
+++ b/psycopg3/psycopg3/copy.py
@@ -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:
diff --git a/psycopg3/psycopg3/proto.py b/psycopg3/psycopg3/proto.py
index 9ae326aad..0b996adc4 100644
--- a/psycopg3/psycopg3/proto.py
+++ b/psycopg3/psycopg3/proto.py
@@ -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]:
diff --git a/psycopg3/psycopg3/transform.py b/psycopg3/psycopg3/transform.py
index 95c714082..2e8e41722 100644
--- a/psycopg3/psycopg3/transform.py
+++ b/psycopg3/psycopg3/transform.py
@@ -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]:
diff --git a/psycopg3/psycopg3/utils/queries.py b/psycopg3/psycopg3/utils/queries.py
index c2625ddcb..ab70eb8e0 100644
--- a/psycopg3/psycopg3/utils/queries.py
+++ b/psycopg3/psycopg3/utils/queries.py
@@ -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:
diff --git a/psycopg3_c/psycopg3_c/_psycopg3.pyi b/psycopg3_c/psycopg3_c/_psycopg3.pyi
index 1a9e1d596..4226c2dd6 100644
--- a/psycopg3_c/psycopg3_c/_psycopg3.pyi
+++ b/psycopg3_c/psycopg3_c/_psycopg3.pyi
@@ -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
diff --git a/psycopg3_c/psycopg3_c/transform.pyx b/psycopg3_c/psycopg3_c/transform.pyx
index adae62a7b..98e2461b3 100644
--- a/psycopg3_c/psycopg3_c/transform.pyx
+++ b/psycopg3_c/psycopg3_c/transform.pyx
@@ -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