execsql2 2.20.0__tar.gz → 2.21.1__tar.gz

{execsql2-2.20.0 → execsql2-2.21.1}/.github/workflows/ci-cd.yml

@@ -86,7 +86,7 @@ jobs:
                   tox -e py
             - name: Upload coverage to Codecov
               if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13'
-              uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354  # v6.0.1
+              uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
               with:
                   token: ${{ secrets.CODECOV_TOKEN }}
                   files: coverage.xml
@@ -167,7 +167,7 @@ jobs:
               run: |
                   python -m pytest --cov=execsql --cov-branch --cov-report=xml --cov-fail-under=86
             - name: Upload coverage to Codecov
-              uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354  # v6.0.1
+              uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
               with:
                   token: ${{ secrets.CODECOV_TOKEN }}
                   files: coverage.xml

{execsql2-2.20.0 → execsql2-2.21.1}/CHANGELOG.md

@@ -13,6 +13,22 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.21.1] - 2026-06-24
+
+### Fixed
+
+- PostgreSQL: `EXPORT` and other repeated queries against objects a script drops/recreates or alters no longer fail with `FeatureNotSupported: cached plan must not change result type`. psycopg3's automatic server-side prepared statements are now disabled (`prepare_threshold=None`), restoring the psycopg2 behavior.
+
+______________________________________________________________________
+
+## [2.21.0] - 2026-06-24
+
+### Changed
+
+- PostgreSQL connections now use psycopg3 (install the `postgres` extra, which pulls `psycopg[binary]`) instead of psycopg2. The `PG_UPSERT` metacommand now requires `pg-upsert>=1.23.0`.
+
+______________________________________________________________________
+
 ## [2.20.0] - 2026-06-11
 
 ### Added

{execsql2-2.20.0 → execsql2-2.21.1}/PKG-INFO

@@ -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 → execsql2-2.21.1}/README.md

@@ -272,7 +272,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 → execsql2-2.21.1}/docs/about/divergence.md

@@ -210,6 +210,7 @@ All 33 mutable runtime globals in `state.py` have been consolidated into a `Runt
 
 ### Database Adapters
 
+- **PostgreSQL driver is psycopg3** — the PostgreSQL adapter uses `psycopg` (psycopg3, installed via the `psycopg[binary]` extra) instead of upstream's `psycopg2`. The connection now passes the libpq `dbname` keyword (psycopg3 rejects psycopg2's `database`), `VACUUM` toggles `conn.autocommit` instead of the removed `set_session()`, server-side `COPY` import uses psycopg3's `cursor.copy()` context manager instead of `copy_expert()`, and binary `IMPORT` sends raw `bytes` instead of `psycopg2.Binary()`. This also makes `db.conn` directly usable by the `PG_UPSERT` metacommand's pg-upsert ≥1.23.0 dependency, which itself requires a psycopg3 connection. The connection sets `prepare_threshold=None` to disable psycopg3's automatic server-side prepared statements, which psycopg2 never used; without this, re-running a query (e.g. via `EXPORT`) against an object the script drops/recreates or alters raises `FeatureNotSupported: cached plan must not change result type`.
 - **`Database` is an ABC** — `open_db()` and `exec_cmd()` are abstract methods. Subclasses that omit them raise `TypeError` at instantiation instead of at call time.
 - **Connection timeouts** — PostgreSQL and SQLite adapters accept a connection timeout parameter (default 30 seconds).
 - **DuckDB temporal types** — `TIMESTAMPTZ`, `TIMESTAMP`, `DATE`, `TIME` now map to native DuckDB types instead of `TEXT`.

{execsql2-2.20.0 → execsql2-2.21.1}/docs/dev/adding_db_adapters.md

@@ -59,7 +59,7 @@ class MyDBDatabase(Database):
         self.need_passwd = False
         self.encoding = "UTF-8"
         self.encode_commands = False
-        self.paramstr = "?"      # placeholder style: "?" for most drivers, "%s" for psycopg2
+        self.paramstr = "?"      # placeholder style: "?" for most drivers, "%s" for psycopg
         self.conn = None
         self.autocommit = True
         self.open_db()
@@ -137,7 +137,7 @@ These are the instance attributes and methods you must configure correctly:
 | Attribute / Method     | Type              | Purpose                                                                           |
 | ---------------------- | ----------------- | --------------------------------------------------------------------------------- |
 | `self.type`            | `DbType`          | DBMS type token (e.g., `dbt_sqlite`). Controls quoting and type-mapping.          |
-| `self.paramstr`        | `str`             | SQL parameter placeholder: `"?"` (most drivers) or `"%s"` (psycopg2, PyMySQL).    |
+| `self.paramstr`        | `str`             | SQL parameter placeholder: `"?"` (most drivers) or `"%s"` (psycopg, PyMySQL).     |
 | `self.encoding`        | `str`             | Database character encoding. Detect from the database on connect if possible.     |
 | `self.encode_commands` | `bool`            | `True` if SQL strings should be encoded before passing to the driver.             |
 | `self.autocommit`      | `bool`            | `True` means the driver commits automatically; `False` requires explicit commits. |

{execsql2-2.20.0 → execsql2-2.21.1}/docs/getting-started/requirements.md

@@ -38,16 +38,16 @@ The specific libraries installed by each extra are:
 
 ### Database drivers
 
-| Database / Format | Extra      | Library                                                      |
-| ----------------- | ---------- | ------------------------------------------------------------ |
-| PostgreSQL        | `postgres` | [psycopg2-binary](https://pypi.org/project/psycopg2-binary/) |
-| MySQL / MariaDB   | `mysql`    | [pymysql](https://pypi.org/project/PyMySQL/)                 |
-| MS SQL Server     | `mssql`    | [pyodbc](https://pypi.org/project/pyodbc/)                   |
-| DuckDB            | `duckdb`   | [duckdb](https://pypi.org/project/duckdb/)                   |
-| Firebird          | `firebird` | [firebird-driver](https://pypi.org/project/firebird-driver/) |
-| Oracle            | `oracle`   | [oracledb](https://pypi.org/project/oracledb/)               |
-| ODBC DSN          | `odbc`     | [pyodbc](https://pypi.org/project/pyodbc/)                   |
-| SQLite            | —          | Built-in (`sqlite3` standard library)                        |
+| Database / Format | Extra      | Library                                                         |
+| ----------------- | ---------- | --------------------------------------------------------------- |
+| PostgreSQL        | `postgres` | [psycopg[binary]](https://pypi.org/project/psycopg/) (psycopg3) |
+| MySQL / MariaDB   | `mysql`    | [pymysql](https://pypi.org/project/PyMySQL/)                    |
+| MS SQL Server     | `mssql`    | [pyodbc](https://pypi.org/project/pyodbc/)                      |
+| DuckDB            | `duckdb`   | [duckdb](https://pypi.org/project/duckdb/)                      |
+| Firebird          | `firebird` | [firebird-driver](https://pypi.org/project/firebird-driver/)    |
+| Oracle            | `oracle`   | [oracledb](https://pypi.org/project/oracledb/)                  |
+| ODBC DSN          | `odbc`     | [pyodbc](https://pypi.org/project/pyodbc/)                      |
+| SQLite            | —          | Built-in (`sqlite3` standard library)                           |
 
 ### `formats` bundle
 

{execsql2-2.20.0 → execsql2-2.21.1}/docs/guides/formatter.md

@@ -160,7 +160,7 @@ select id,name,created_at from users where active = true order by name;
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.20.0
+    rev: v2.21.1
     hooks:
       - id: execsql-format
 ```

{execsql2-2.20.0 → execsql2-2.21.1}/docs/guides/usage.md

@@ -82,7 +82,7 @@ When a DSN is used as a data source, *execsql* has no information about the feat
 
 ## PostgreSQL-Compatible Databases
 
-Amazon [Redshift](https://docs.aws.amazon.com/redshift/index.html) is built on PostgreSQL 8.0.3 and [CockroachDB](https://www.cockroachlabs.com/) uses the *psycopg2* library for connections from Python. Both of these databases can therefore potentially be used with *execsql* by specifying the database type as Postgres (i.e., db_type=p).
+Amazon [Redshift](https://docs.aws.amazon.com/redshift/index.html) is built on PostgreSQL 8.0.3 and [CockroachDB](https://www.cockroachlabs.com/) uses the *psycopg* library for connections from Python. Both of these databases can therefore potentially be used with *execsql* by specifying the database type as Postgres (i.e., db_type=p).
 
 The following Postgres-specific features that are used by *execsql* may function differently or not at all in other Postgres-compatible databases:
 

{execsql2-2.20.0 → execsql2-2.21.1}/docs/reference/metacommands.md

@@ -2368,7 +2368,7 @@ For the full list of temporary objects and their schemas, see the [pg-upsert Tem
 PG_VACUUM <vacuum arguments>
 ```
 
-Runs the 'vacuum' command on the current database if the current DBMS is Postgres. The 'vacuum' command will not execute successfully as a SQL command because it requires a change in the configuration of the (psycopg2) connection. This metacommand makes that change, runs the 'vacuum' metacommand, and restores the connection configuration to its default setting.
+Runs the 'vacuum' command on the current database if the current DBMS is Postgres. The 'vacuum' command will not execute successfully as a SQL command because it requires a change in the configuration of the (psycopg) connection. This metacommand makes that change, runs the 'vacuum' metacommand, and restores the connection configuration to its default setting.
 
 This metacommand has no effect if the current DBMS is not PostgreSQL.
 

{execsql2-2.20.0 → execsql2-2.21.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.20.0"
+version = "2.21.1"
 description = "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."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -48,7 +48,7 @@ dependencies = [
 
 [project.optional-dependencies]
 # Database drivers — conservative floors matching uv.lock; patches allowed.
-postgres = ["psycopg2-binary>=2.9"]
+postgres = ["psycopg[binary]>=3.1,<4"]
 mysql = ["pymysql>=1.1"]
 mssql = ["pyodbc>=5.0"]
 duckdb = ["duckdb>=1.0"]
@@ -69,12 +69,12 @@ formats = [
 auth = ["keyring>=25.0"]
 auth-plaintext = ["keyring>=25.0", "keyrings.alt>=5.0"]
 auth-encrypted = ["keyring>=25.0", "keyrings.alt>=5.0", "pycryptodome>=3.20"]
-upsert = ["pg-upsert>=1.22.1"]
+upsert = ["pg-upsert>=1.23.0"]
 map = ["tkintermapview>=1.29"]
 formatter = ["sqlglot>=25.0"]
 # Convenience groups
 all-db = [
-    "psycopg2-binary>=2.9",
+    "psycopg[binary]>=3.1,<4",
     "pymysql>=1.1",
     "pyodbc>=5.0",
     "duckdb>=1.0",
@@ -178,7 +178,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.20.0"
+current_version = "2.21.1"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{execsql2-2.20.0 → execsql2-2.21.1}/src/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)
 
 

{execsql2-2.20.0 → execsql2-2.21.1}/src/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 → execsql2-2.21.1}/tests/db/test_postgres.py

@@ -1,9 +1,10 @@
 """
 Tests for execsql.db.postgres — PostgresDatabase adapter.
 
-These tests mock psycopg2 entirely so they can run without a PostgreSQL
-server or the psycopg2 package installed.  They verify that the
-connect_timeout parameter is correctly threaded through to psycopg2.connect().
+These tests mock psycopg (psycopg3) entirely so they can run without a
+PostgreSQL server or the psycopg package installed.  They verify that the
+connect_timeout parameter is correctly threaded through to psycopg.connect(),
+and that the libpq ``dbname`` keyword (not psycopg2's ``database``) is used.
 """
 
 from __future__ import annotations
@@ -19,11 +20,11 @@ from execsql.db.postgres import DEFAULT_CONNECT_TIMEOUT
 # ---------------------------------------------------------------------------
 
 
-def _make_mock_psycopg2():
-    """Return a mock psycopg2 module whose connect() returns a usable conn."""
+def _make_mock_psycopg():
+    """Return a mock psycopg module whose connect() returns a usable conn."""
     mock_mod = MagicMock()
     mock_conn = MagicMock()
-    mock_conn.encoding = "UTF8"
+    mock_conn.info.encoding = "UTF8"
     mock_mod.connect.return_value = mock_conn
     return mock_mod
 
@@ -34,11 +35,11 @@ def _make_mock_psycopg2():
 
 
 class TestPostgresConnectTimeout:
-    @patch.dict("sys.modules", {"psycopg2": _make_mock_psycopg2()})
+    @patch.dict("sys.modules", {"psycopg": _make_mock_psycopg()})
     def test_default_connect_timeout(self):
         import sys
 
-        mock_psycopg2 = sys.modules["psycopg2"]
+        mock_psycopg = sys.modules["psycopg"]
         from execsql.db.postgres import PostgresDatabase
 
         db = PostgresDatabase(
@@ -48,15 +49,18 @@ class TestPostgresConnectTimeout:
             password="pass",
         )
         assert db.connect_timeout == DEFAULT_CONNECT_TIMEOUT
-        # Verify psycopg2.connect was called with connect_timeout=30
-        call_kwargs = mock_psycopg2.connect.call_args[1]
+        # Verify psycopg.connect was called with connect_timeout=30
+        call_kwargs = mock_psycopg.connect.call_args[1]
         assert call_kwargs["connect_timeout"] == DEFAULT_CONNECT_TIMEOUT
+        # psycopg3 requires the libpq ``dbname`` keyword, not psycopg2's ``database``.
+        assert call_kwargs["dbname"] == "testdb"
+        assert "database" not in call_kwargs
 
-    @patch.dict("sys.modules", {"psycopg2": _make_mock_psycopg2()})
+    @patch.dict("sys.modules", {"psycopg": _make_mock_psycopg()})
     def test_custom_connect_timeout(self):
         import sys
 
-        mock_psycopg2 = sys.modules["psycopg2"]
+        mock_psycopg = sys.modules["psycopg"]
         from execsql.db.postgres import PostgresDatabase
 
         db = PostgresDatabase(
@@ -67,14 +71,14 @@ class TestPostgresConnectTimeout:
             connect_timeout=10,
         )
         assert db.connect_timeout == 10
-        call_kwargs = mock_psycopg2.connect.call_args[1]
+        call_kwargs = mock_psycopg.connect.call_args[1]
         assert call_kwargs["connect_timeout"] == 10
 
-    @patch.dict("sys.modules", {"psycopg2": _make_mock_psycopg2()})
+    @patch.dict("sys.modules", {"psycopg": _make_mock_psycopg()})
     def test_connect_timeout_without_credentials(self):
         import sys
 
-        mock_psycopg2 = sys.modules["psycopg2"]
+        mock_psycopg = sys.modules["psycopg"]
         from execsql.db.postgres import PostgresDatabase
 
         db = PostgresDatabase(
@@ -84,5 +88,8 @@ class TestPostgresConnectTimeout:
             connect_timeout=5,
         )
         assert db.connect_timeout == 5
-        call_kwargs = mock_psycopg2.connect.call_args[1]
+        call_kwargs = mock_psycopg.connect.call_args[1]
         assert call_kwargs["connect_timeout"] == 5
+        # Credential-less path still uses ``dbname``.
+        assert call_kwargs["dbname"] == "testdb"
+        assert "database" not in call_kwargs

{execsql2-2.20.0 → execsql2-2.21.1}/tests/db/test_postgres_inprocess.py

@@ -7,7 +7,7 @@ subprocess* — subprocess execution yields no coverage credit, so those
 ~199 missed lines stay uncovered.
 
 The module is skipped when:
-  - psycopg2 is not installed, or
+  - psycopg (psycopg3) is not installed, or
   - the test PostgreSQL instance (localhost:5432, database=execsql_test,
     user=execsql, password=execsql) is not reachable.
 
@@ -30,7 +30,7 @@ import execsql.state as _state
 # Skip the entire module when the driver or server is unavailable
 # ---------------------------------------------------------------------------
 
-psycopg2 = pytest.importorskip("psycopg2", reason="psycopg2 not installed")
+psycopg = pytest.importorskip("psycopg", reason="psycopg (psycopg3) not installed")
 
 _PG_KW: dict = {
     "host": os.environ.get("EXECSQL_PG_HOST", "localhost"),
@@ -44,7 +44,7 @@ _PG_KW: dict = {
 
 def _pg_reachable() -> bool:
     try:
-        psycopg2.connect(**_PG_KW).close()
+        psycopg.connect(**_PG_KW).close()
         return True
     except Exception:
         return False
@@ -306,7 +306,7 @@ class TestDataAccess:
     def test_select_data_bad_sql_raises(self, db):
         # base.Database.select_data() re-raises the driver exception directly
         # after rolling back; it does not wrap in ErrInfo.
-        with pytest.raises(psycopg2.Error):
+        with pytest.raises(psycopg.Error):
             db.select_data("SELECT * FROM execsql_no_such_table_xyz;")
 
     def test_select_rowsource_iterates(self, db, fresh_table):
@@ -357,7 +357,7 @@ class TestExecCmd:
             db.commit()
 
     def test_exec_cmd_unknown_function_rolls_back(self, db):
-        with pytest.raises(psycopg2.Error):
+        with pytest.raises(psycopg.Error):
             db.exec_cmd("execsql_no_such_function_xyz")
 
 

{execsql2-2.20.0 → execsql2-2.21.1}/tests/integration/test_postgres.py

@@ -6,7 +6,7 @@ the backend (db_type = p).  Each test writes a minimal execsql.conf, creates a
 outcomes (tables created, data inserted, files exported, etc.).
 
 The entire module is skipped when:
-  - psycopg2 is not installed, OR
+  - psycopg (psycopg3) is not installed, OR
   - the test PostgreSQL instance (localhost:5432, database=execsql_test,
     user=execsql, password=execsql) is not reachable.
 """
@@ -23,10 +23,10 @@ import pytest
 from tests.integration.conftest import write_script
 
 # ---------------------------------------------------------------------------
-# Module-level skip: psycopg2 availability + server reachability
+# Module-level skip: psycopg (psycopg3) availability + server reachability
 # ---------------------------------------------------------------------------
 
-psycopg2 = pytest.importorskip("psycopg2", reason="psycopg2 package required")
+psycopg = pytest.importorskip("psycopg", reason="psycopg (psycopg3) package required")
 
 _PG_CONNECT_KWARGS: dict = {
     "host": os.environ.get("EXECSQL_PG_HOST", "localhost"),
@@ -41,7 +41,7 @@ _PG_CONNECT_KWARGS: dict = {
 def _pg_is_reachable() -> bool:
     """Return True if the test PostgreSQL instance is connectable."""
     try:
-        conn = psycopg2.connect(**_PG_CONNECT_KWARGS)
+        conn = psycopg.connect(**_PG_CONNECT_KWARGS)
         conn.close()
         return True
     except Exception:  # noqa: BLE001
@@ -101,7 +101,7 @@ def _run_execsql_pg(tmp_path, script_path, extra_args=None, timeout=30):
 
 def _query_pg(sql: str, params=None):
     """Open a connection to the test PostgreSQL database, run *sql*, and return all rows."""
-    conn = psycopg2.connect(**_PG_CONNECT_KWARGS)
+    conn = psycopg.connect(**_PG_CONNECT_KWARGS)
     try:
         cur = conn.cursor()
         cur.execute(sql, params)
@@ -112,7 +112,7 @@ def _query_pg(sql: str, params=None):
 
 def _exec_pg(sql: str, params=None):
     """Execute a non-SELECT statement against the test PostgreSQL database."""
-    conn = psycopg2.connect(**_PG_CONNECT_KWARGS)
+    conn = psycopg.connect(**_PG_CONNECT_KWARGS)
     try:
         conn.autocommit = True
         cur = conn.cursor()