execsql2 2.20.0__py3-none-any.whl → 2.21.1__py3-none-any.whl

execsql/db/factory.py

@@ -63,7 +63,7 @@ def db_Postgres(
     new_db: bool = False,
     password: str | None = None,
 ) -> PostgresDatabase:
-    """Open a new PostgreSQL connection via psycopg2."""
+    """Open a new PostgreSQL connection via psycopg (psycopg3)."""
     return PostgresDatabase(server_name, database_name, user, pw_needed, port, new_db=new_db, password=password)
 
 

execsql/db/postgres.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 """
 PostgreSQL database adapter for execsql.
 
-Implements :class:`PostgresDatabase`. Uses ``psycopg2`` for the
+Implements :class:`PostgresDatabase`. Uses ``psycopg`` (psycopg3) for the
 connection, supports schema-qualified tables, server-side ``COPY`` for
 fast IMPORT, ``CREATE DATABASE`` when ``new_db=True``, ``ROLE_EXISTS``,
 and the ``PG_VACUUM`` metacommand (``vacuum()`` method). Corresponds to
@@ -26,7 +26,7 @@ DEFAULT_CONNECT_TIMEOUT = 30  # seconds
 
 
 class PostgresDatabase(Database):
-    """PostgreSQL adapter using psycopg2, with schema support, server-side COPY, and keyring auth."""
+    """PostgreSQL adapter using psycopg (psycopg3), with schema support, server-side COPY, and keyring auth."""
 
     def __init__(
         self,
@@ -41,10 +41,11 @@ class PostgresDatabase(Database):
         connect_timeout: int = DEFAULT_CONNECT_TIMEOUT,
     ) -> None:
         try:
-            import psycopg2  # noqa: F401
+            import psycopg  # noqa: F401
         except Exception:
             fatal_error(
-                "The psycopg2 module is required to connect to PostgreSQL.   See http://initd.org/psycopg/",
+                "The psycopg module (psycopg3) is required to connect to PostgreSQL.   "
+                "See https://www.psycopg.org/psycopg3/",
             )
         from execsql.types import dbt_postgres
 
@@ -73,25 +74,33 @@ class PostgresDatabase(Database):
 
     def open_db(self) -> None:
         """Open a connection to the PostgreSQL database."""
-        import psycopg2
+        import psycopg
 
         def db_conn(db: PostgresDatabase, db_name: str):
             try:
+                # prepare_threshold=None disables psycopg3's automatic server-side
+                # prepared statements.  execsql re-runs the same query text (e.g. via
+                # EXPORT) against objects that scripts may drop/recreate or alter
+                # between runs; a cached plan whose result type then changes triggers
+                # PostgreSQL's "cached plan must not change result type" error.  psycopg2
+                # never auto-prepared, so this preserves backwards-compatible behavior.
                 if db.user and db.password:
-                    return psycopg2.connect(
+                    return psycopg.connect(
                         host=str(db.server_name),
-                        database=str(db_name),
+                        dbname=str(db_name),
                         port=db.port,
                         user=db.user,
                         password=db.password,
                         connect_timeout=db.connect_timeout,
+                        prepare_threshold=None,
                     )
                 else:
-                    return psycopg2.connect(
+                    return psycopg.connect(
                         host=str(db.server_name),
-                        database=db_name,
+                        dbname=db_name,
                         port=db.port,
                         connect_timeout=db.connect_timeout,
+                        prepare_threshold=None,
                     )
             except Exception as e:
                 msg = (
@@ -148,7 +157,7 @@ class PostgresDatabase(Database):
                 msg = f"Failed to open PostgreSQL database {self.db_name} on {self.server_name}"
                 raise ErrInfo(type="exception", exception_msg=exception_desc(), other_msg=msg) from e
             # (Re)set the encoding to match the database.
-            self.encoding = self.conn.encoding
+            self.encoding = self.conn.info.encoding
 
     def exec_cmd(self, querycommand: str) -> None:
         """Execute a stored function by name."""
@@ -242,13 +251,13 @@ class PostgresDatabase(Database):
         but should not be exposed to untrusted input.
         """
         self.commit()
-        self.conn.set_session(autocommit=True)
+        self.conn.autocommit = True
         curs = self.conn.cursor()
         try:
             curs.execute(f"VACUUM {argstring};")
         finally:
             curs.close()
-            self.conn.set_session(autocommit=False)
+            self.conn.autocommit = False
 
     def import_tabular_file(
         self,
@@ -290,7 +299,7 @@ class PostgresDatabase(Database):
         import_cols = [self.type.quoted(col) for col in import_cols]
         csv_file_cols_q = [self.type.quoted(col) for col in csv_file_cols]
         input_col_list = ",".join(import_cols)
-        # If encodings match, use copy_expert.
+        # If encodings match, use server-side COPY.
         # If encodings don't match, and the file encoding isn't recognized by CSV, read as CSV.
         enc_xlates = {
             "cp1252": "win1252",
@@ -319,7 +328,7 @@ class PostgresDatabase(Database):
             and not _state.conf.trim_strings
             and not _state.conf.replace_newlines
         ):
-            # Use Postgres' COPY FROM method via psycopg2's copy_expert() method.
+            # Use Postgres' COPY FROM method via psycopg3's cursor.copy() context manager.
             rf = csv_file_obj.open("rt")
             if skipheader:
                 next(rf)
@@ -346,7 +355,9 @@ class PostgresDatabase(Database):
                 )
             with self._cursor() as curs:
                 try:
-                    curs.copy_expert(copy_cmd, rf, _state.conf.import_buffer)
+                    with curs.copy(copy_cmd) as copy:
+                        while chunk := rf.read(_state.conf.import_buffer):
+                            copy.write(chunk)
                 except ErrInfo:
                     raise
                 except Exception as e:
@@ -461,12 +472,11 @@ class PostgresDatabase(Database):
         file_name: str,
     ) -> None:
         """Import an entire binary file into a single column of a table."""
-        import psycopg2
-
         with open(file_name, "rb") as f:
             filedata = f.read()
         sq_name = self.schema_qualified_table_name(schema_name, table_name)
         quoted_col = self.quote_identifier(column_name)
         sql = f"insert into {sq_name} ({quoted_col}) values ({self.paramsubs(1)});"
         with self._cursor() as curs:
-            curs.execute(sql, (psycopg2.Binary(filedata),))
+            # psycopg3 sends ``bytes`` to a ``bytea`` column directly; no Binary() wrapper.
+            curs.execute(sql, (filedata,))

{execsql2-2.20.0.dist-info → execsql2-2.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.20.0
+Version: 2.21.1
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Homepage, https://execsql2.readthedocs.io
 Project-URL: Repository, https://github.com/geocoug/execsql
@@ -52,9 +52,9 @@ Requires-Dist: keyring>=25.0; extra == 'all'
 Requires-Dist: odfpy>=1.4; extra == 'all'
 Requires-Dist: openpyxl>=3.1; extra == 'all'
 Requires-Dist: oracledb>=3.0; extra == 'all'
-Requires-Dist: pg-upsert>=1.22.1; extra == 'all'
+Requires-Dist: pg-upsert>=1.23.0; extra == 'all'
 Requires-Dist: polars>=1.0; extra == 'all'
-Requires-Dist: psycopg2-binary>=2.9; extra == 'all'
+Requires-Dist: psycopg[binary]<4,>=3.1; extra == 'all'
 Requires-Dist: pymysql>=1.1; extra == 'all'
 Requires-Dist: pyodbc>=5.0; extra == 'all'
 Requires-Dist: pyyaml>=6.0; extra == 'all'
@@ -66,7 +66,7 @@ Provides-Extra: all-db
 Requires-Dist: duckdb>=1.0; extra == 'all-db'
 Requires-Dist: firebird-driver>=1.10; extra == 'all-db'
 Requires-Dist: oracledb>=3.0; extra == 'all-db'
-Requires-Dist: psycopg2-binary>=2.9; extra == 'all-db'
+Requires-Dist: psycopg[binary]<4,>=3.1; extra == 'all-db'
 Requires-Dist: pymysql>=1.1; extra == 'all-db'
 Requires-Dist: pyodbc>=5.0; extra == 'all-db'
 Provides-Extra: auth
@@ -124,9 +124,9 @@ Requires-Dist: pyodbc>=5.0; extra == 'odbc'
 Provides-Extra: oracle
 Requires-Dist: oracledb>=3.0; extra == 'oracle'
 Provides-Extra: postgres
-Requires-Dist: psycopg2-binary>=2.9; extra == 'postgres'
+Requires-Dist: psycopg[binary]<4,>=3.1; extra == 'postgres'
 Provides-Extra: upsert
-Requires-Dist: pg-upsert>=1.22.1; extra == 'upsert'
+Requires-Dist: pg-upsert>=1.23.0; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]
@@ -403,7 +403,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.20.0
+    rev: v2.21.1
     hooks:
       - id: execsql-format
 ```

{execsql2-2.20.0.dist-info → execsql2-2.21.1.dist-info}/RECORD

@@ -22,11 +22,11 @@ execsql/db/access.py,sha256=sRJOJJo1psSO5RV6QPsFY1YJE5wc5aNOYCFDtxIn_Wo,19413
 execsql/db/base.py,sha256=0Cy_M3GHdkQDJMbMeWpNyUIPux9m1cVDy21MGMjhJCI,35002
 execsql/db/dsn.py,sha256=CZd5NhUSVvK3irv2maeWsSqBsZjhFsTxIuT29Z0rP2A,6240
 execsql/db/duckdb.py,sha256=79lRzKRhw1Pjfqcrba27S4Oq8a8AbDO_d0XkaNKKPQo,3197
-execsql/db/factory.py,sha256=YHdgyqQYy16548O3fGyElLC5C7DdIgva4Z29OsDxXjs,5367
+execsql/db/factory.py,sha256=C_cyi3GjNx0opuwc6maFFeCSkjfOfoUjuf68YT4VAHE,5377
 execsql/db/firebird.py,sha256=cV5wUzQHoz7yugHdNxAn8IW7fL3v1riIsGLykCZhZwA,9480
 execsql/db/mysql.py,sha256=Z0vI_nQ6vhG3sYa2fv5NOO3JmAsH6_jVjM8FuujQpqI,17961
 execsql/db/oracle.py,sha256=1_odb5xmlm8vjdJdQXz7SHm9dzIbZ5sxP_IxTklH3kA,12018
-execsql/db/postgres.py,sha256=UNzrXzMniEyT3Z7qjCA_HLEUY0PVr1cJShuhAxtl5l0,21241
+execsql/db/postgres.py,sha256=LIZgx4T_UPZvOk_mn0l832ShNKgzculdOrVrFO7Rj8I,22045
 execsql/db/sqlite.py,sha256=xooU6bvD9Y3frRpnbyesE63r6E1fwEHkkcN1YD_UIUE,11519
 execsql/db/sqlserver.py,sha256=j2ViLoBWzizgaL0u6V4iHfjinrlJ4rpBD3XZiKKdwSU,8968
 execsql/debug/__init__.py,sha256=j6EGUR0dHzUhWN1mHHtf1-Lhjq3Sb1V-vmnq2Ztgj1M,178
@@ -100,23 +100,23 @@ execsql/utils/numeric.py,sha256=xh02ANSRk3nUpQ-rtm66ILoMqoi7HtzCoRMIOT9U8QI,1570
 execsql/utils/regex.py,sha256=diEzTZqU_HHwVMadPAvN1Vgzhl7I03eVaEFGCXyGGL8,3770
 execsql/utils/strings.py,sha256=UQNjpRCEFa1UO6feU-M-9e24wWAvizs_iu_4fFusLxo,8516
 execsql/utils/timer.py,sha256=eDYf5VzCNFk7oo90InJucUm3XcBdhYMogjZMqeg9xzc,1899
-execsql2-2.20.0.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
-execsql2-2.20.0.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
-execsql2-2.20.0.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
-execsql2-2.20.0.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
-execsql2-2.20.0.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
-execsql2-2.20.0.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
-execsql2-2.20.0.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
-execsql2-2.20.0.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
-execsql2-2.20.0.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
-execsql2-2.20.0.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
-execsql2-2.20.0.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
-execsql2-2.20.0.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
-execsql2-2.20.0.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
-execsql2-2.20.0.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
-execsql2-2.20.0.dist-info/METADATA,sha256=2j1tQ7oxlDAfsmIPQwgDxxn9O34FN7MbKT1nLznLi-M,22603
-execsql2-2.20.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-execsql2-2.20.0.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
-execsql2-2.20.0.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
-execsql2-2.20.0.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
-execsql2-2.20.0.dist-info/RECORD,,
+execsql2-2.21.1.data/data/execsql2_extras/README.md,sha256=vX4NTL095dUoA_hesyRMGYBorEZ_Y_tJ9qrd-MVV09I,5032
+execsql2-2.21.1.data/data/execsql2_extras/config_settings.sqlite,sha256=aY5cxR7Q7J6zJ4bC9lu5mHUrhy211Cq3MNKPQVCt02E,20480
+execsql2-2.21.1.data/data/execsql2_extras/example_config_prompt.sql,sha256=2e8KzzVWhho8KxYVHETSVmZdhW7wodioDsqBLSL6m4s,7487
+execsql2-2.21.1.data/data/execsql2_extras/make_config_db.sql,sha256=WwyC6dK-Eh5CAVppiBCDHqiI1_wEI9U95Ytpr4lsZkg,8726
+execsql2-2.21.1.data/data/execsql2_extras/md_compare.sql,sha256=qYYVAjSeHZzjszxV3Bv6bg8Ckbq2kMHl87_gh4sywMU,24140
+execsql2-2.21.1.data/data/execsql2_extras/md_glossary.sql,sha256=hkZ2Onn57LAKKsuXxzhR8tPtcWXkmWEQkwPE58-Tm2k,10796
+execsql2-2.21.1.data/data/execsql2_extras/md_upsert.sql,sha256=_CAK4BzEboRXTNy03SJR-oOjcEdSNMuRBPL6noWUptY,112560
+execsql2-2.21.1.data/data/execsql2_extras/pg_compare.sql,sha256=1zJd4hVUKHR0tncc2qTBC9B4qVV4Us2ITkJpsjN3tMw,24352
+execsql2-2.21.1.data/data/execsql2_extras/pg_glossary.sql,sha256=IKuwna-_8b20ljSkXZruuiQigrCpo7ueQdUqd1MXiuI,9908
+execsql2-2.21.1.data/data/execsql2_extras/pg_upsert.sql,sha256=HpPJtTHvpEjQy03j-3iPxDEOHMRkudOg7O4D4YR38UI,108315
+execsql2-2.21.1.data/data/execsql2_extras/script_template.sql,sha256=2J35ddZPguJ-vwTsz83wErv0jiWUyJcdW_JM0mNKDXA,11155
+execsql2-2.21.1.data/data/execsql2_extras/ss_compare.sql,sha256=j1qVNUPXQsEU7-DoVgDJCGcE0EuIl7whLBT3fgeiMAo,24833
+execsql2-2.21.1.data/data/execsql2_extras/ss_glossary.sql,sha256=2gLxv34xzKt0vy7hSzJH7a9JiMC3ETrv9MofxQwAibU,13065
+execsql2-2.21.1.data/data/execsql2_extras/ss_upsert.sql,sha256=G_8rQ0VzuKIZHWs24O_WrfzpC5S27R1JsL-bFBR3SUQ,117730
+execsql2-2.21.1.dist-info/METADATA,sha256=huk0LlRjMH6EmtqJgkKkpmAGon-Qhb6j9J51idFmwOc,22612
+execsql2-2.21.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+execsql2-2.21.1.dist-info/entry_points.txt,sha256=sUOxkM-dN1eBGGpSpDLsAaE0yNXYQKWZAfxPOlMkQyk,90
+execsql2-2.21.1.dist-info/licenses/LICENSE.txt,sha256=LBdhuxejF8_bLCHZ2kWfmDXpDGUu914Gbd6_3JjCRe0,676
+execsql2-2.21.1.dist-info/licenses/NOTICE,sha256=McYzgxYav3U1OaVsY4Su1sfBrfmplpRdA9b6-gCDQCg,342
+execsql2-2.21.1.dist-info/RECORD,,