From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 24 Nov 2020 00:11:44 +0000 (+0000)
Subject: Queries modume moved out of utils package
X-Git-Tag: 3.0.dev0~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e45c8f3b349e16e64b478b90cb948378cdeab1;p=thirdparty%2Fpsycopg.git

Queries modume moved out of utils package
---

diff --git a/psycopg3/psycopg3/utils/queries.py b/psycopg3/psycopg3/_queries.py
similarity index 96%
rename from psycopg3/psycopg3/utils/queries.py
rename to psycopg3/psycopg3/_queries.py
index d8384b7dd..b26ee2f50 100644
--- a/psycopg3/psycopg3/utils/queries.py
+++ b/psycopg3/psycopg3/_queries.py
@@ -9,17 +9,13 @@ from functools import lru_cache
 from typing import Any, Dict, List, Mapping, Match, NamedTuple, Optional
 from typing import Sequence, Tuple, Union, TYPE_CHECKING
 
-from .. import errors as e
-from ..pq import Format
-from ..sql import Composable
-from ..oids import builtins
-from ..proto import Query, Params
+from . import errors as e
+from .pq import Format
+from .sql import Composable
+from .proto import Query, Params
 
 if TYPE_CHECKING:
-    from ..proto import Transformer
-
-TEXT_OID = builtins["text"].oid
-UNKNOWN_OID = builtins["unknown"].oid
+    from .proto import Transformer
 
 
 class QueryPart(NamedTuple):
@@ -87,7 +83,7 @@ class PostgresQuery:
                     ts.append(dumper.oid)
                 else:
                     ps.append(None)
-                    ts.append(UNKNOWN_OID)
+                    ts.append(0)
         else:
             self.params = self.types = None
 
diff --git a/psycopg3/psycopg3/cursor.py b/psycopg3/psycopg3/cursor.py
index c35d71d14..9ab116234 100644
--- a/psycopg3/psycopg3/cursor.py
+++ b/psycopg3/psycopg3/cursor.py
@@ -16,7 +16,7 @@ from . import pq
 from .oids import builtins
 from .copy import Copy, AsyncCopy
 from .proto import ConnectionType, Query, Params, DumpersMap, LoadersMap, PQGen
-from .utils.queries import PostgresQuery
+from ._queries import PostgresQuery
 
 if sys.version_info >= (3, 7):
     from contextlib import asynccontextmanager
diff --git a/tests/test_query.py b/tests/test_query.py
index ad7e6941b..339c80b7a 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -2,7 +2,7 @@ import pytest
 
 import psycopg3
 from psycopg3.adapt import Transformer
-from psycopg3.utils.queries import PostgresQuery, _split_query
+from psycopg3._queries import PostgresQuery, _split_query
 
 
 @pytest.mark.parametrize(