Merge ~lvoytek/ubuntu/+source/psycopg3:update-to-3.1.8 into ubuntu/+source/psycopg3:ubuntu/devel

[Lena Voytek]

Update from 3.1.7 to 3.1.8.
This is a bug fix release that brings psycopg up to a point where it's compatible with Django 4.2. If an FFe is still needed though I can create one.
See https://docs.djangoproject.com/en/4.2/releases/4.2/#psycopg-3-support

This update will also help fix the autopkgtest issues with python-django-celery-results in proposed as it requires at least 3.1.8 to run the upstream test suite

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic

[Athos Ribeiro (athos-ribeiro)]

The only feature included here is to the package internal development tools, which is not shipped in our package.

+1 on not needing a FFe;

+1 on going ahead of Debian here to support django.

Approved.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Uploaded

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, lvoytek
Uploaders: athos-ribeiro
MP auto-approved

review: Approve

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4527551..2160326 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,6 +15,7 @@ concurrency:
 jobs:
   lint:
     runs-on: ubuntu-latest
+    if: true
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages-bin.yml
similarity index 67%
rename from .github/workflows/packages.yml
rename to .github/workflows/packages-bin.yml
index 18a2817..f8283e9 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages-bin.yml
@@ -1,4 +1,4 @@
-name: Build packages
+name: Build binary packages
 
 on:
   workflow_dispatch:
@@ -7,77 +7,6 @@ on:
 
 jobs:
 
-  sdist:  # {{{
-    runs-on: ubuntu-latest
-    if: true
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {package: psycopg, format: sdist, impl: python}
-          - {package: psycopg, format: wheel, impl: python}
-          - {package: psycopg_c, format: sdist, impl: c}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.9
-
-      - name: Create the sdist packages
-        run: |-
-          python ${{ matrix.package }}/setup.py sdist -d `pwd`/dist/
-        if: ${{ matrix.format == 'sdist' }}
-
-      - name: Create the wheel packages
-        run: |-
-          pip install wheel
-          python ${{ matrix.package }}/setup.py bdist_wheel -d `pwd`/dist/
-        if: ${{ matrix.format == 'wheel' }}
-
-      - name: Install the Python package and test requirements
-        run: |-
-          pip install `ls dist/*`[test]
-          pip install ./psycopg_pool
-        if: ${{ matrix.package == 'psycopg' }}
-
-      - name: Install the C package and test requirements
-        run: |-
-          pip install dist/*
-          pip install ./psycopg[test]
-          pip install ./psycopg_pool
-        if: ${{ matrix.package == 'psycopg_c' }}
-
-      - name: Test the sdist package
-        run: pytest -m 'not slow and not flakey' --color yes
-        env:
-          PSYCOPG_IMPL: ${{ matrix.impl }}
-          PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres"
-          PGPASSWORD: password
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: ./dist/*
-
-    services:
-      postgresql:
-        image: postgres:14
-        env:
-          POSTGRES_PASSWORD: password
-        ports:
-          - 5432:5432
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-
-  # }}}
-
   linux:  # {{{
     runs-on: ubuntu-latest
     if: true
diff --git a/.github/workflows/packages-pool.yml b/.github/workflows/packages-pool.yml
index e9624e7..fdbb9e1 100644
--- a/.github/workflows/packages-pool.yml
+++ b/.github/workflows/packages-pool.yml
@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {package: psycopg_pool, format: sdist, impl: python}
-          - {package: psycopg_pool, format: wheel, impl: python}
+          - {package: psycopg_pool, format: sdist}
+          - {package: psycopg_pool, format: wheel}
 
     steps:
       - uses: actions/checkout@v3
@@ -24,26 +24,18 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Create the sdist packages
-        run: |-
-          python ${{ matrix.package }}/setup.py sdist -d `pwd`/dist/
-        if: ${{ matrix.format == 'sdist' }}
+      - name: Install the build package
+        run: pip install build
 
-      - name: Create the wheel packages
-        run: |-
-          pip install wheel
-          python ${{ matrix.package }}/setup.py bdist_wheel -d `pwd`/dist/
-        if: ${{ matrix.format == 'wheel' }}
+      - name: Create the package
+        run: python -m build -o dist --${{ matrix.format }} ${{ matrix.package }}
 
       - name: Install the Python pool package and test requirements
-        run: |-
-          pip install dist/*
-          pip install ./psycopg[test]
+        run: pip install ./psycopg[test] dist/*
 
-      - name: Test the sdist package
-        run: pytest -m 'not slow and not flakey' --color yes
+      - name: Test the package
+        run: pytest -m 'pool and not slow and not flakey' --color yes
         env:
-          PSYCOPG_IMPL: ${{ matrix.impl }}
           PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres"
           PGPASSWORD: password
 
diff --git a/.github/workflows/packages-src.yml b/.github/workflows/packages-src.yml
new file mode 100644
index 0000000..8dc119d
--- /dev/null
+++ b/.github/workflows/packages-src.yml
@@ -0,0 +1,66 @@
+name: Build source packages
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '37 6 * * sun'
+
+jobs:
+
+  sdist:
+    runs-on: ubuntu-latest
+    if: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {package: psycopg, format: sdist, impl: python}
+          - {package: psycopg, format: wheel, impl: python}
+          - {package: psycopg_c, format: sdist, impl: c}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Install the build package
+        run: pip install build
+
+      - name: Create the package
+        run: python -m build -o dist --${{ matrix.format }} ${{ matrix.package }}
+
+      - name: Install the Python package and test requirements
+        run: pip install `ls dist/*`[test] ./psycopg_pool
+        if: ${{ matrix.package == 'psycopg' }}
+
+      - name: Install the C package and test requirements
+        run: pip install dist/* ./psycopg[test] ./psycopg_pool
+        if: ${{ matrix.package == 'psycopg_c' }}
+
+      - name: Test the sdist package
+        run: pytest -m 'not slow and not flakey' --color yes
+        env:
+          PSYCOPG_IMPL: ${{ matrix.impl }}
+          PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres"
+          PGPASSWORD: password
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./dist/*
+
+    services:
+      postgresql:
+        image: postgres:14
+        env:
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9f6a7f5..7660f40 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,22 +35,21 @@ jobs:
           - {impl: c, python: "3.7", postgres: "postgres:15", libpq: newest}
           - {impl: c, python: "3.8", postgres: "postgres:13"}
           - {impl: c, python: "3.9", postgres: "postgres:14"}
-          - {impl: c, python: "3.10", postgres: "postgres:13", libpq: oldest}
+          - {impl: c, python: "3.10", postgres: "postgres:11", libpq: oldest}
           - {impl: c, python: "3.11", postgres: "postgres:10", libpq: newest}
 
           - {impl: python, python: "3.9", ext: dns, postgres: "postgres:14"}
           - {impl: python, python: "3.9", ext: postgis, postgres: "postgis/postgis"}
 
+          # Test with minimum dependencies versions
+          - {impl: c, python: "3.7", ext: min, postgres: "postgres:15"}
+
     env:
       PSYCOPG_IMPL: ${{ matrix.impl }}
       DEPS: ./psycopg[test] ./psycopg_pool
-      PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres"
-      PGPASSWORD: password
+      PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres password=password"
       MARKERS: ""
 
-      # Enable to run tests using the minimum version of dependencies.
-      # PIP_CONSTRAINT: ${{ github.workspace }}/tests/constraints.txt
-
     steps:
       - uses: actions/checkout@v3
 
@@ -58,70 +57,48 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Install the newest libpq version available
-        if: ${{ matrix.libpq == 'newest' }}
+      - name: Start PostgreSQL service
+        # Note: this would love to be a service, but I don't see a way to pass
+        # the args to the docker run command line.
         run: |
-          set -x
-
-          curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-            | gpg --dearmor \
-            | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null
-
-          # NOTE: in order to test with a preview release, add its number to
-          # the deb entry. For instance, to test on preview Postgres 16, use:
-          # "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main 16"
-          rel=$(lsb_release -c -s)
-          echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main" \
-            | sudo tee -a /etc/apt/sources.list.d/pgdg.list > /dev/null
-          sudo apt-get -qq update
-
-          pqver=$(apt-cache show libpq5  | grep ^Version: | head -1 \
-            | awk '{print $2}')
-          sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
-
-      - name: Install the oldest libpq version available
-        if: ${{ matrix.libpq == 'oldest' }}
+          docker pull ${{ matrix.postgres }}
+          docker run --rm -d --name postgres -p 5432:5432 \
+            -e POSTGRES_PASSWORD=password ${{ matrix.postgres }} \
+            -c max_prepared_transactions=10
+
+      - name: Install the wanted libpq version
+        run: sudo ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
+
+      - name: Include psycopg-c to the packages to install
+        if: ${{ matrix.impl == 'c' }}
         run: |
-          set -x
-          pqver=$(apt-cache show libpq5  | grep ^Version: | tail -1 \
-            | awk '{print $2}')
-          sudo apt-get -qq -y --allow-downgrades install \
-            "libpq-dev=${pqver}" "libpq5=${pqver}"
+          echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
 
-      - if: ${{ matrix.ext == 'dns' }}
+      - name: Include dnspython to the packages to install
+        if: ${{ matrix.ext == 'dns' }}
         run: |
           echo "DEPS=$DEPS dnspython" >> $GITHUB_ENV
           echo "MARKERS=$MARKERS dns" >> $GITHUB_ENV
 
-      - if: ${{ matrix.ext == 'postgis' }}
+      - name: Include shapely to the packages to install
+        if: ${{ matrix.ext == 'postgis' }}
         run: |
           echo "DEPS=$DEPS shapely" >> $GITHUB_ENV
           echo "MARKERS=$MARKERS postgis" >> $GITHUB_ENV
 
-      - if: ${{ matrix.impl == 'c' }}
+      - name: Configure to use the oldest dependencies
+        if: ${{ matrix.ext == 'min' }}
         run: |
-          echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
+          echo "DEPS=$DEPS dnspython shapely" >> $GITHUB_ENV
+          echo "PIP_CONSTRAINT=${{ github.workspace }}/tests/constraints.txt" \
+            >> $GITHUB_ENV
 
-      - name: Install Python dependencies
+      - name: Install Python packages
         run: pip install $DEPS
 
       - name: Run tests
         run: ./tools/build/ci_test.sh
 
-    services:
-      postgresql:
-        image: ${{ matrix.postgres }}
-        env:
-          POSTGRES_PASSWORD: password
-        ports:
-          - 5432:5432
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
 
   # }}}
 
@@ -152,29 +129,26 @@ jobs:
       # Don't run timing-based tests as they regularly fail.
       # pproxy-based tests fail too, with the proxy not coming up in 2s.
       NOT_MARKERS: "timing proxy mypy"
-      # PIP_CONSTRAINT: ${{ github.workspace }}/tests/constraints.txt
 
     steps:
       - uses: actions/checkout@v3
 
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
       - name: Install PostgreSQL on the runner
         run: brew install postgresql@14
 
-      - name: Start PostgreSQL service for test
+      - name: Start PostgreSQL service
         run: brew services start postgresql
 
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python }}
-
-      - if: ${{ matrix.impl == 'c' }}
-        # skip tests failing on importing psycopg_c.pq on subprocess
-        # they only fail on Travis, work ok locally under tox too.
-        # TODO: check the same on GitHub Actions
+      - name: Include psycopg-c to the packages to install
+        if: ${{ matrix.impl == 'c' }}
         run: |
           echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
 
-      - name: Install Python dependencies
+      - name: Install Python packages
         run: pip install $DEPS
 
       - name: Run tests
@@ -208,40 +182,47 @@ jobs:
       PSYCOPG_TEST_DSN: "host=127.0.0.1 dbname=postgres"
       # On windows pproxy doesn't seem very happy. Also a few timing test fail.
       NOT_MARKERS: "timing proxy mypy"
-      # PIP_CONSTRAINT: ${{ github.workspace }}/tests/constraints.txt
+
+    defaults:
+      run:
+        shell: bash
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Start PostgreSQL service for test
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Start PostgreSQL service
         run: |
           $PgSvc = Get-Service "postgresql*"
           Set-Service $PgSvc.Name -StartupType manual
           $PgSvc.Start()
+        shell: pwsh
 
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python }}
-
-      # Build a wheel package of the C extensions.
-      # If the wheel is not delocated, import fails with some dll not found
-      # (but it won't tell which one).
       - name: Build the C wheel
         if: ${{ matrix.impl == 'c' }}
         run: |
           pip install delvewheel wheel
-          $env:Path = "C:\Program Files\PostgreSQL\14\bin\;$env:Path"
-          python ./psycopg_c/setup.py bdist_wheel
-          &"delvewheel" repair `
-            --no-mangle "libiconv-2.dll;libwinpthread-1.dll" `
-            @(Get-ChildItem psycopg_c\dist\*.whl)
-          &"pip" install @(Get-ChildItem wheelhouse\*.whl)
+
+          # The windows runner is a total mess, with random copies of the libpq
+          # scattered all over the places. Give precedence to the one under our
+          # control (or the illusion of it).
+          export PATH="/c/Program Files/PostgreSQL/14/bin/:$PATH"
+
+          # If the wheel is not delocated, import fails with some dll not found
+          # (but it won't tell which one).
+          pip wheel -v -w ./psycopg_c/dist/ ./psycopg_c/
+          delvewheel repair --no-mangle "libiconv-2.dll;libwinpthread-1.dll" \
+            -w ./wheelhouse/ psycopg_c/dist/*.whl
+          echo "DEPS=$DEPS $(ls ./wheelhouse/*.whl)" >> $GITHUB_ENV
+
+      - name: Install Python packages
+        run: pip install $DEPS
 
       - name: Run tests
-        run: |
-          pip install $DEPS
-          ./tools/build/ci_test.sh
-        shell: bash
+        run: ./tools/build/ci_test.sh
 
 
   # }}}
@@ -268,7 +249,7 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Run CockroachDB
+      - name: Start CockroachDB service
         # Note: this would love to be a service, but I don't see a way to pass
         # the args to the docker run command line.
         run: |
@@ -276,39 +257,19 @@ jobs:
           docker run --rm -d --name crdb -p 26257:26257 \
             cockroachdb/cockroach:${{ matrix.crdb }} start-single-node --insecure
 
-      - name: Install the newest libpq version available
-        if: ${{ matrix.libpq == 'newest' }}
-        run: |
-          set -x
-
-          curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-            | gpg --dearmor \
-            | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null
-
-          # NOTE: in order to test with a preview release, add its number to
-          # the deb entry. For instance, to test on preview Postgres 16, use:
-          # "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main 16"
-          rel=$(lsb_release -c -s)
-          echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main" \
-            | sudo tee -a /etc/apt/sources.list.d/pgdg.list > /dev/null
-          sudo apt-get -qq update
-
-          pqver=$(apt-cache show libpq5  | grep ^Version: | head -1 \
-            | awk '{print $2}')
-          sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
+      - name: Install the wanted libpq version
+        run: sudo ./tools/build/ci_install_libpq.sh ${{ matrix.libpq }}
 
-      - if: ${{ matrix.impl == 'c' }}
+      - name: Include psycopg-c to the packages to install
+        if: ${{ matrix.impl == 'c' }}
         run: |
           echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
 
-      - name: Install Python dependencies
+      - name: Install Python packages
         run: pip install $DEPS
 
       - name: Run tests
         run: ./tools/build/ci_test.sh
 
-      - name: Stop CockroachDB
-        run: docker kill crdb
-
 
   # }}}
diff --git a/debian/changelog b/debian/changelog
index 91c9a7d..2e125c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+psycopg3 (3.1.8-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release 3.1.8 (LP: #2022089)
+    - This release update makes psycopg3 compatible with Django 4.2, see:
+      https://docs.djangoproject.com/en/4.2/releases/4.2/#psycopg-3-support
+    - Updates:
+      + Don't pollute server logs when types looked for by TypeInfo.fetch()
+        are not found.
+      + Set Cursor.rowcount to the number of rows of each result set from
+        Cursor.executemany() when called with !returning=True.
+      + Fix TypeInfo.fetch() when used with ClientCursor
+
+ -- Lena Voytek <[e-mail]>  Wed, 30 Aug 2023 07:23:06 -0700
+
 psycopg3 (3.1.7-4) unstable; urgency=medium
 
   * Add *.pydist files to deal with dh_python psycopg names overrides.
diff --git a/debian/control b/debian/control
index d719c72..f0f9c2b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Build-Depends-Indep:
  python3-sphinx <!nodoc>,
  python3-sphinx-autodoc-typehints <!nodoc>,
  furo <!nodoc>,
-Maintainer: Tomasz Rybak <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Tomasz Rybak <[e-mail]>
 Uploaders: Debian Python Team <[e-mail]>
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
diff --git a/docs/api/cursors.rst b/docs/api/cursors.rst
index 9c5b478..78c336b 100644
--- a/docs/api/cursors.rst
+++ b/docs/api/cursors.rst
@@ -105,6 +105,11 @@ The `!Cursor` class
         methods. Each input parameter will produce a separate result set: use
         `nextset()` to read the results of the queries after the first one.
 
+        The value of `rowcount` is set to the cumulated number of rows
+        affected by queries; except when using `!returning=True`, in which
+        case it is set to the number of rows in the current result set (i.e.
+        the first one, until `nextset()` gets called).
+
         See :ref:`query-parameters` for all the details about executing
         queries.
 
@@ -239,6 +244,10 @@ The `!Cursor` class
         a successful command, such as ``CREATE TABLE`` or ``UPDATE 42``.
 
     .. autoattribute:: rowcount
+
+        From `executemany()`, unless called with `!returning=True`, this is
+        the cumulated number of rows affected by executed commands.
+
     .. autoattribute:: rownumber
 
     .. attribute:: _query
diff --git a/docs/news.rst b/docs/news.rst
index 46dfbe7..d20c993 100644
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -10,6 +10,15 @@
 Current release
 ---------------
 
+Psycopg 3.1.8
+^^^^^^^^^^^^^
+
+- Don't pollute server logs when types looked for by `TypeInfo.fetch()` 
+  are not found (:ticket:`#473`).
+- Set `Cursor.rowcount` to the number of rows of each result set from
+  `~Cursor.executemany()` when called with `!returning=True` (:ticket:`#479`).
+- Fix `TypeInfo.fetch()` when used with `ClientCursor` (:ticket:`#484`).
+
 Psycopg 3.1.7
 ^^^^^^^^^^^^^
 
diff --git a/psycopg/psycopg/_adapters_map.py b/psycopg/psycopg/_adapters_map.py
index a3a6ef8..70bf4cc 100644
--- a/psycopg/psycopg/_adapters_map.py
+++ b/psycopg/psycopg/_adapters_map.py
@@ -197,9 +197,15 @@ class AdaptersMap:
             use the last one of the dumpers registered on `!cls`.
         """
         try:
-            dmap = self._dumpers[format]
+            # Fast path: the class has a known dumper.
+            return self._dumpers[format][cls]
         except KeyError:
-            raise ValueError(f"bad dumper format: {format}")
+            if format not in self._dumpers:
+                raise ValueError(f"bad dumper format: {format}")
+
+            # If the KeyError was caused by cls missing from dmap, let's
+            # look for different cases.
+            dmap = self._dumpers[format]
 
         # Look for the right class, including looking at superclasses
         for scls in cls.__mro__:
diff --git a/psycopg/psycopg/_typeinfo.py b/psycopg/psycopg/_typeinfo.py
index 2f1a24d..52d5ca7 100644
--- a/psycopg/psycopg/_typeinfo.py
+++ b/psycopg/psycopg/_typeinfo.py
@@ -12,13 +12,13 @@ from typing import Sequence, Tuple, Type, TypeVar, Union, TYPE_CHECKING
 from typing_extensions import TypeAlias
 
 from . import errors as e
-from .abc import AdaptContext
+from .abc import AdaptContext, Query
 from .rows import dict_row
 
 if TYPE_CHECKING:
-    from .connection import Connection
+    from .connection import BaseConnection, Connection
     from .connection_async import AsyncConnection
-    from .sql import Identifier
+    from .sql import Identifier, SQL
 
 T = TypeVar("T", bound="TypeInfo")
 RegistryKey: TypeAlias = Union[str, int, Tuple[type, int]]
@@ -62,34 +62,39 @@ class TypeInfo:
     @overload
     @classmethod
     async def fetch(
-        cls: Type[T],
-        conn: "AsyncConnection[Any]",
-        name: Union[str, "Identifier"],
+        cls: Type[T], conn: "AsyncConnection[Any]", name: Union[str, "Identifier"]
     ) -> Optional[T]:
         ...
 
     @classmethod
     def fetch(
-        cls: Type[T],
-        conn: "Union[Connection[Any], AsyncConnection[Any]]",
-        name: Union[str, "Identifier"],
+        cls: Type[T], conn: "BaseConnection[Any]", name: Union[str, "Identifier"]
     ) -> Any:
         """Query a system catalog to read information about a type."""
         from .sql import Composable
+        from .connection import Connection
         from .connection_async import AsyncConnection
 
         if isinstance(name, Composable):
             name = name.as_string(conn)
 
-        if isinstance(conn, AsyncConnection):
+        if isinstance(conn, Connection):
+            return cls._fetch(conn, name)
+        elif isinstance(conn, AsyncConnection):
             return cls._fetch_async(conn, name)
+        else:
+            raise TypeError(
+                f"expected Connection or AsyncConnection, got {type(conn).__name__}"
+            )
 
+    @classmethod
+    def _fetch(cls: Type[T], conn: "Connection[Any]", name: str) -> Optional[T]:
         # This might result in a nested transaction. What we want is to leave
         # the function with the connection in the state we found (either idle
         # or intrans)
         try:
             with conn.transaction():
-                with conn.cursor(binary=True, row_factory=dict_row) as cur:
+                with conn.cursor(row_factory=dict_row) as cur:
                     cur.execute(cls._get_info_query(conn), {"name": name})
                     recs = cur.fetchall()
         except e.UndefinedObject:
@@ -101,14 +106,9 @@ class TypeInfo:
     async def _fetch_async(
         cls: Type[T], conn: "AsyncConnection[Any]", name: str
     ) -> Optional[T]:
-        """
-        Query a system catalog to read information about a type.
-
-        Similar to `fetch()` but can use an asynchronous connection.
-        """
         try:
             async with conn.transaction():
-                async with conn.cursor(binary=True, row_factory=dict_row) as cur:
+                async with conn.cursor(row_factory=dict_row) as cur:
                     await cur.execute(cls._get_info_query(conn), {"name": name})
                     recs = await cur.fetchall()
         except e.UndefinedObject:
@@ -146,17 +146,43 @@ class TypeInfo:
             register_array(self, context)
 
     @classmethod
-    def _get_info_query(
-        cls, conn: "Union[Connection[Any], AsyncConnection[Any]]"
-    ) -> str:
-        return """\
+    def _get_info_query(cls, conn: "BaseConnection[Any]") -> Query:
+        from .sql import SQL
+
+        return SQL(
+            """\
 SELECT
     typname AS name, oid, typarray AS array_oid,
     oid::regtype::text AS regtype, typdelim AS delimiter
 FROM pg_type t
-WHERE t.oid = %(name)s::regtype
+WHERE t.oid = {regtype}
 ORDER BY t.oid
 """
+        ).format(regtype=cls._to_regtype(conn))
+
+    @classmethod
+    def _has_to_regtype_function(cls, conn: "BaseConnection[Any]") -> bool:
+        # to_regtype() introduced in PostgreSQL 9.4 and CockroachDB 22.2
+        info = conn.info
+        if info.vendor == "PostgreSQL":
+            return info.server_version >= 90400
+        elif info.vendor == "CockroachDB":
+            return info.server_version >= 220200
+        else:
+            return False
+
+    @classmethod
+    def _to_regtype(cls, conn: "BaseConnection[Any]") -> "SQL":
+        # `to_regtype()` returns the type oid or NULL, unlike the :: operator,
+        # which returns the type or raises an exception, which requires
+        # a transaction rollback and leaves traces in the server logs.
+
+        from .sql import SQL
+
+        if cls._has_to_regtype_function(conn):
+            return SQL("to_regtype(%(name)s)")
+        else:
+            return SQL("%(name)s::regtype")
 
     def _added(self, registry: "TypesRegistry") -> None:
         """Method called by the `!registry` when the object is added there."""
@@ -181,17 +207,19 @@ class RangeInfo(TypeInfo):
         self.subtype_oid = subtype_oid
 
     @classmethod
-    def _get_info_query(
-        cls, conn: "Union[Connection[Any], AsyncConnection[Any]]"
-    ) -> str:
-        return """\
+    def _get_info_query(cls, conn: "BaseConnection[Any]") -> Query:
+        from .sql import SQL
+
+        return SQL(
+            """\
 SELECT t.typname AS name, t.oid AS oid, t.typarray AS array_oid,
     t.oid::regtype::text AS regtype,
     r.rngsubtype AS subtype_oid
 FROM pg_type t
 JOIN pg_range r ON t.oid = r.rngtypid
-WHERE t.oid = %(name)s::regtype
+WHERE t.oid = {regtype}
 """
+        ).format(regtype=cls._to_regtype(conn))
 
     def _added(self, registry: "TypesRegistry") -> None:
         # Map ranges subtypes to info
@@ -201,8 +229,7 @@ WHERE t.oid = %(name)s::regtype
 class MultirangeInfo(TypeInfo):
     """Manage information about a multirange type."""
 
-    # TODO: expose to multirange module once added
-    # __module__ = "psycopg.types.multirange"
+    __module__ = "psycopg.types.multirange"
 
     def __init__(
         self,
@@ -219,21 +246,24 @@ class MultirangeInfo(TypeInfo):
         self.subtype_oid = subtype_oid
 
     @classmethod
-    def _get_info_query(
-        cls, conn: "Union[Connection[Any], AsyncConnection[Any]]"
-    ) -> str:
+    def _get_info_query(cls, conn: "BaseConnection[Any]") -> Query:
+        from .sql import SQL
+
         if conn.info.server_version < 140000:
             raise e.NotSupportedError(
                 "multirange types are only available from PostgreSQL 14"
             )
-        return """\
+
+        return SQL(
+            """\
 SELECT t.typname AS name, t.oid AS oid, t.typarray AS array_oid,
     t.oid::regtype::text AS regtype,
     r.rngtypid AS range_oid, r.rngsubtype AS subtype_oid
 FROM pg_type t
 JOIN pg_range r ON t.oid = r.rngmultitypid
-WHERE t.oid = %(name)s::regtype
+WHERE t.oid = {regtype}
 """
+        ).format(regtype=cls._to_regtype(conn))
 
     def _added(self, registry: "TypesRegistry") -> None:
         # Map multiranges ranges and subtypes to info
@@ -263,15 +293,16 @@ class CompositeInfo(TypeInfo):
         self.python_type: Optional[type] = None
 
     @classmethod
-    def _get_info_query(
-        cls, conn: "Union[Connection[Any], AsyncConnection[Any]]"
-    ) -> str:
-        return """\
+    def _get_info_query(cls, conn: "BaseConnection[Any]") -> Query:
+        from .sql import SQL
+
+        return SQL(
+            """\
 SELECT
     t.typname AS name, t.oid AS oid, t.typarray AS array_oid,
     t.oid::regtype::text AS regtype,
-    coalesce(a.fnames, '{}') AS field_names,
-    coalesce(a.ftypes, '{}') AS field_types
+    coalesce(a.fnames, '{{}}') AS field_names,
+    coalesce(a.ftypes, '{{}}') AS field_types
 FROM pg_type t
 LEFT JOIN (
     SELECT
@@ -282,15 +313,16 @@ LEFT JOIN (
         SELECT a.attrelid, a.attname, a.atttypid
         FROM pg_attribute a
         JOIN pg_type t ON t.typrelid = a.attrelid
-        WHERE t.oid = %(name)s::regtype
+        WHERE t.oid = {regtype}
         AND a.attnum > 0
         AND NOT a.attisdropped
         ORDER BY a.attnum
     ) x
     GROUP BY attrelid
 ) a ON a.attrelid = t.typrelid
-WHERE t.oid = %(name)s::regtype
+WHERE t.oid = {regtype}
 """
+        ).format(regtype=cls._to_regtype(conn))
 
 
 class EnumInfo(TypeInfo):
@@ -311,10 +343,11 @@ class EnumInfo(TypeInfo):
         self.enum: Optional[Type[Enum]] = None
 
     @classmethod
-    def _get_info_query(
-        cls, conn: "Union[Connection[Any], AsyncConnection[Any]]"
-    ) -> str:
-        return """\
+    def _get_info_query(cls, conn: "BaseConnection[Any]") -> Query:
+        from .sql import SQL
+
+        return SQL(
+            """\
 SELECT name, oid, array_oid, array_agg(label) AS labels
 FROM (
     SELECT
@@ -323,11 +356,12 @@ FROM (
     FROM pg_type t
     LEFT JOIN  pg_enum e
     ON e.enumtypid = t.oid
-    WHERE t.oid = %(name)s::regtype
+    WHERE t.oid = {regtype}
     ORDER BY e.enumsortorder
 ) x
 GROUP BY name, oid, array_oid
 """
+        ).format(regtype=cls._to_regtype(conn))
 
 
 class TypesRegistry:
diff --git a/psycopg/psycopg/cursor.py b/psycopg/psycopg/cursor.py
index 42c3804..7c32f29 100644
--- a/psycopg/psycopg/cursor.py
+++ b/psycopg/psycopg/cursor.py
@@ -219,7 +219,8 @@ class BaseCursor(Generic[ConnectionType, Row]):
         assert pipeline
 
         yield from self._start_query(query)
-        self._rowcount = 0
+        if not returning:
+            self._rowcount = 0
 
         assert self._execmany_returning is None
         self._execmany_returning = returning
@@ -251,8 +252,9 @@ class BaseCursor(Generic[ConnectionType, Row]):
         Generator implementing `Cursor.executemany()` with pipelines not available.
         """
         yield from self._start_query(query)
+        if not returning:
+            self._rowcount = 0
         first = True
-        nrows = 0
         for params in params_seq:
             if first:
                 pgq = self._convert_query(query, params)
@@ -266,17 +268,15 @@ class BaseCursor(Generic[ConnectionType, Row]):
             self._check_results(results)
             if returning:
                 self._results.extend(results)
-
-            for res in results:
-                nrows += res.command_tuples or 0
+            else:
+                # In non-returning case, set rowcount to the cumulated number
+                # of rows of executed queries.
+                for res in results:
+                    self._rowcount += res.command_tuples or 0
 
         if self._results:
             self._select_current_result(0)
 
-        # Override rowcount for the first result. Calls to nextset() will change
-        # it to the value of that result only, but we hope nobody will notice.
-        # You haven't read this comment.
-        self._rowcount = nrows
         self._last_query = query
 
         for cmd in self._conn._prepared.get_maintenance_commands():
@@ -545,16 +545,11 @@ class BaseCursor(Generic[ConnectionType, Row]):
                 self._results.extend(results)
                 if first_batch:
                     self._select_current_result(0)
-                    self._rowcount = 0
-
-            # Override rowcount for the first result. Calls to nextset() will
-            # change it to the value of that result only, but we hope nobody
-            # will notice.
-            # You haven't read this comment.
-            if self._rowcount < 0:
-                self._rowcount = 0
-            for res in results:
-                self._rowcount += res.command_tuples or 0
+            else:
+                # In non-returning case, set rowcount to the cumulated number of
+                # rows of executed queries.
+                for res in results:
+                    self._rowcount += res.command_tuples or 0
 
     def _send_prepare(self, name: bytes, query: PostgresQuery) -> None:
         if self._conn._pipeline:
diff --git a/psycopg/psycopg/cursor_async.py b/psycopg/psycopg/cursor_async.py
index 8971d40..42cd8e5 100644
--- a/psycopg/psycopg/cursor_async.py
+++ b/psycopg/psycopg/cursor_async.py
@@ -173,10 +173,10 @@ class AsyncCursor(BaseCursor["AsyncConnection[Any]", Row]):
     async def fetchone(self) -> Optional[Row]:
         await self._fetch_pipeline()
         self._check_result_for_fetch()
-        rv = self._tx.load_row(self._pos, self._make_row)
-        if rv is not None:
+        record = self._tx.load_row(self._pos, self._make_row)
+        if record is not None:
             self._pos += 1
-        return rv
+        return record
 
     async def fetchmany(self, size: int = 0) -> List[Row]:
         await self._fetch_pipeline()
diff --git a/psycopg/psycopg/pq/pq_ctypes.py b/psycopg/psycopg/pq/pq_ctypes.py
index 8b87c19..204e384 100644
--- a/psycopg/psycopg/pq/pq_ctypes.py
+++ b/psycopg/psycopg/pq/pq_ctypes.py
@@ -262,7 +262,7 @@ class PGconn:
         self._ensure_pgconn()
         rv = impl.PQexec(self._pgconn_ptr, command)
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"executing query failed: {error_message(self)}")
         return PGresult(rv)
 
     def send_query(self, command: bytes) -> None:
@@ -286,7 +286,7 @@ class PGconn:
         self._ensure_pgconn()
         rv = impl.PQexecParams(*args)
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"executing query failed: {error_message(self)}")
         return PGresult(rv)
 
     def send_query_params(
@@ -427,7 +427,7 @@ class PGconn:
         self._ensure_pgconn()
         rv = impl.PQprepare(self._pgconn_ptr, name, command, nparams, atypes)
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"preparing query failed: {error_message(self)}")
         return PGresult(rv)
 
     def exec_prepared(
@@ -477,7 +477,9 @@ class PGconn:
             result_format,
         )
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(
+                f"executing prepared query failed: {error_message(self)}"
+            )
         return PGresult(rv)
 
     def describe_prepared(self, name: bytes) -> "PGresult":
@@ -486,7 +488,7 @@ class PGconn:
         self._ensure_pgconn()
         rv = impl.PQdescribePrepared(self._pgconn_ptr, name)
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"describe prepared failed: {error_message(self)}")
         return PGresult(rv)
 
     def send_describe_prepared(self, name: bytes) -> None:
@@ -504,7 +506,7 @@ class PGconn:
         self._ensure_pgconn()
         rv = impl.PQdescribePortal(self._pgconn_ptr, name)
         if not rv:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"describe portal failed: {error_message(self)}")
         return PGresult(rv)
 
     def send_describe_portal(self, name: bytes) -> None:
diff --git a/psycopg/psycopg/version.py b/psycopg/psycopg/version.py
index a98bc35..f600f16 100644
--- a/psycopg/psycopg/version.py
+++ b/psycopg/psycopg/version.py
@@ -8,7 +8,7 @@ psycopg distribution version file.
 # https://www.python.org/dev/peps/pep-0440/
 
 # STOP AND READ! if you change:
-__version__ = "3.1.7"
+__version__ = "3.1.8"
 # also change:
 # - `docs/news.rst` to declare this as the current version or an unreleased one
 # - `psycopg_c/psycopg_c/version.py` to the same version.
diff --git a/psycopg/setup.cfg b/psycopg/setup.cfg
index fdcb612..f1c211a 100644
--- a/psycopg/setup.cfg
+++ b/psycopg/setup.cfg
@@ -8,6 +8,8 @@ license = GNU Lesser General Public License v3 (LGPLv3)
 
 project_urls =
     Homepage = https://psycopg.org/
+    Documentation = https://psycopg.org/psycopg3/docs/
+    Changes = https://psycopg.org/psycopg3/docs/news.html
     Code = https://github.com/psycopg/psycopg
     Issue Tracker = https://github.com/psycopg/psycopg/issues
     Download = https://pypi.org/project/psycopg/
diff --git a/psycopg/setup.py b/psycopg/setup.py
index 90d4380..9b18e86 100644
--- a/psycopg/setup.py
+++ b/psycopg/setup.py
@@ -14,11 +14,14 @@ here = os.path.abspath(os.path.dirname(__file__))
 if os.path.abspath(os.getcwd()) != here:
     os.chdir(here)
 
-# Only for release 3.1.7. Not building binary packages because Scaleway
+# Only for release 3.1.7-3.1.8. Not building binary packages because Scaleway
 # has no runner available, but psycopg-binary 3.1.6 should work as well
-# as the only change is in rows.py.
-version = "3.1.7"
-ext_versions = ">= 3.1.6, <= 3.1.7"
+# as there was no change in the interface between psycopg and psycopg_c.
+#
+# This is getting frustrating, dangerous, stupid. We need to find a way
+# out of Scaleway.
+version = "3.1.8"
+ext_versions = ">= 3.1.6, <= 3.1.8"
 
 extras_require = {
     # Install the C extension module (requires dev tools)
@@ -40,7 +43,7 @@ extras_require = {
         "pytest >= 6.2.5",
         "pytest-asyncio >= 0.17",
         "pytest-cov >= 3.0",
-        "pytest-randomly >= 3.10",
+        "pytest-randomly >= 3.5",
     ],
     # Requirements needed for development
     "dev": [
diff --git a/psycopg_c/MANIFEST.in b/psycopg_c/MANIFEST.in
new file mode 100644
index 0000000..117298e
--- /dev/null
+++ b/psycopg_c/MANIFEST.in
@@ -0,0 +1,3 @@
+# Include the build backend in the distributed files.
+# It doesn't seem it can be specified in setup.cfg
+include build_backend/*.py
diff --git a/psycopg_c/build_backend/cython_backend.py b/psycopg_c/build_backend/cython_backend.py
new file mode 100644
index 0000000..97bd2af
--- /dev/null
+++ b/psycopg_c/build_backend/cython_backend.py
@@ -0,0 +1,38 @@
+"""
+Build backend to build a Cython-based project only if needed.
+
+This backend adds a build dependency on Cython if pxd files are available,
+otherwise it only relies on the c files to have been precompiled.
+"""
+
+# Copyright (C) 2023 The Psycopg Team
+
+import os
+from typing import Any, List
+
+import tomli
+from setuptools import build_meta
+
+
+def get_requires_for_build_wheel(config_settings: Any = None) -> List[str]:
+    if not os.path.exists("psycopg_c/_psycopg.pyx"):
+        # Cython files don't exist: we must be in a sdist and we can trust
+        # that the .c files we have packaged exist.
+        return []
+
+    # Cython files exists: we must be in a git checkout and we need Cython
+    # to build. Get the version from the pyproject itself to keep things in the
+    # same place.
+    with open("pyproject.toml", "rb") as f:
+        pyprj = tomli.load(f)
+
+    rv: List[str] = pyprj["cython-backend"]["cython-requires"]
+    return rv
+
+
+get_requires_for_build_sdist = get_requires_for_build_wheel
+
+# For the rest, behave like the rest of setuptoos.build_meta
+prepare_metadata_for_build_wheel = build_meta.prepare_metadata_for_build_wheel
+build_wheel = build_meta.build_wheel
+build_sdist = build_meta.build_sdist
diff --git a/psycopg_c/psycopg_c/_psycopg.pyx b/psycopg_c/psycopg_c/_psycopg.pyx
index 9d2b8ba..5bbde2b 100644
--- a/psycopg_c/psycopg_c/_psycopg.pyx
+++ b/psycopg_c/psycopg_c/_psycopg.pyx
@@ -28,6 +28,12 @@ PG_BINARY = _py_Format.BINARY
 
 cdef extern from *:
     """
+/* Include this early to avoid a warning about redefined ARRAYSIZE in winnt.h */
+#ifdef MS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#endif
+
 #ifndef ARRAYSIZE
 #define ARRAYSIZE(a) ((sizeof(a) / sizeof(*(a))))
 #endif
diff --git a/psycopg_c/psycopg_c/_psycopg/waiting.pyx b/psycopg_c/psycopg_c/_psycopg/waiting.pyx
index 0af6c57..baaead6 100644
--- a/psycopg_c/psycopg_c/_psycopg/waiting.pyx
+++ b/psycopg_c/psycopg_c/_psycopg/waiting.pyx
@@ -72,12 +72,9 @@ wait_c_impl(int fileno, int wait, float timeout)
     select_rv = poll(&input_fd, 1, timeout_ms);
     Py_END_ALLOW_THREADS
 
+    if (select_rv < 0) { goto error; }
     if (PyErr_CheckSignals()) { goto finally; }
 
-    if (select_rv < 0) {
-        goto error;
-    }
-
     if (input_fd.events & POLLIN) { rv |= SELECT_EV_READ; }
     if (input_fd.events & POLLOUT) { rv |= SELECT_EV_WRITE; }
 
@@ -120,12 +117,9 @@ wait_c_impl(int fileno, int wait, float timeout)
     select_rv = select(fileno + 1, &ifds, &ofds, &efds, tvptr);
     Py_END_ALLOW_THREADS
 
+    if (select_rv < 0) { goto error; }
     if (PyErr_CheckSignals()) { goto finally; }
 
-    if (select_rv < 0) {
-        goto error;
-    }
-
     if (FD_ISSET(fileno, &ifds)) { rv |= SELECT_EV_READ; }
     if (FD_ISSET(fileno, &ofds)) { rv |= SELECT_EV_WRITE; }
 
@@ -168,7 +162,7 @@ def wait_c(gen: PQGen[RV], int fileno, timeout = None) -> RV:
     if timeout is None:
         ctimeout = -1.0
     else:
-        ctimeout = float(timeout)
+        ctimeout = <float>float(timeout)
         if ctimeout < 0.0:
             ctimeout = -1.0
 
diff --git a/psycopg_c/psycopg_c/pq/pgconn.pyx b/psycopg_c/psycopg_c/pq/pgconn.pyx
index 4a60530..5c5a911 100644
--- a/psycopg_c/psycopg_c/pq/pgconn.pyx
+++ b/psycopg_c/psycopg_c/pq/pgconn.pyx
@@ -207,7 +207,7 @@ cdef class PGconn:
         with nogil:
             pgresult = libpq.PQexec(self._pgconn_ptr, command)
         if pgresult is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"executing query failed: {error_message(self)}")
 
         return PGresult._from_ptr(pgresult)
 
@@ -244,7 +244,7 @@ cdef class PGconn:
                 <const char *const *>cvalues, clengths, cformats, result_format)
         _clear_query_params(ctypes, cvalues, clengths, cformats)
         if pgresult is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"executing query failed: {error_message(self)}")
         return PGresult._from_ptr(pgresult)
 
     def send_query_params(
@@ -353,7 +353,7 @@ cdef class PGconn:
                 self._pgconn_ptr, name, command, <int>nparams, atypes)
         PyMem_Free(atypes)
         if rv is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(f"preparing query failed: {error_message(self)}")
         return PGresult._from_ptr(rv)
 
     def exec_prepared(
@@ -382,14 +382,18 @@ cdef class PGconn:
 
         _clear_query_params(ctypes, cvalues, clengths, cformats)
         if rv is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(
+                f"executing prepared query failed: {error_message(self)}"
+            )
         return PGresult._from_ptr(rv)
 
     def describe_prepared(self, const char *name) -> PGresult:
         _ensure_pgconn(self)
         cdef libpq.PGresult *rv = libpq.PQdescribePrepared(self._pgconn_ptr, name)
         if rv is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(
+                f"describe prepared failed: {error_message(self)}"
+            )
         return PGresult._from_ptr(rv)
 
     def send_describe_prepared(self, const char *name) -> None:
@@ -404,7 +408,9 @@ cdef class PGconn:
         _ensure_pgconn(self)
         cdef libpq.PGresult *rv = libpq.PQdescribePortal(self._pgconn_ptr, name)
         if rv is NULL:
-            raise MemoryError("couldn't allocate PGresult")
+            raise e.OperationalError(
+                f"describe prepared failed: {error_message(self)}"
+            )
         return PGresult._from_ptr(rv)
 
     def send_describe_portal(self, const char *name) -> None:
diff --git a/psycopg_c/psycopg_c/types/array.pyx b/psycopg_c/psycopg_c/types/array.pyx
index 9abaef9..280d33c 100644
--- a/psycopg_c/psycopg_c/types/array.pyx
+++ b/psycopg_c/psycopg_c/types/array.pyx
@@ -164,7 +164,7 @@ cdef object _parse_token(
     if has_quotes:
         end -= 1
 
-    cdef int length = (end - start)
+    cdef Py_ssize_t length = (end - start)
     if length == 4 and not has_quotes \
             and start[0] == b'N' and start[1] == b'U' \
             and start[2] == b'L' and start[3] == b'L':
diff --git a/psycopg_c/psycopg_c/version.py b/psycopg_c/psycopg_c/version.py
index 5c989c2..cb0609c 100644
--- a/psycopg_c/psycopg_c/version.py
+++ b/psycopg_c/psycopg_c/version.py
@@ -6,6 +6,6 @@ psycopg-c distribution version file.
 
 # Use a versioning scheme as defined in
 # https://www.python.org/dev/peps/pep-0440/
-__version__ = "3.1.7"
+__version__ = "3.1.8"
 
 # also change psycopg/psycopg/version.py accordingly.
diff --git a/psycopg_c/pyproject.toml b/psycopg_c/pyproject.toml
index f0d7a3f..48958ce 100644
--- a/psycopg_c/pyproject.toml
+++ b/psycopg_c/pyproject.toml
@@ -1,3 +1,13 @@
 [build-system]
-requires = ["setuptools>=49.2.0", "wheel>=0.37", "Cython>=3.0.0a11"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools >= 49.2.0", "wheel >= 0.37", "tomli >= 2.0.1"]
+
+# The cython_backend is a build backend adding a Cython dependency if the c
+# source must be build from pxd files (when building from git checkout), and
+# doesn't require Cython when needing to build from c files (when building
+# from the sdist bundle).
+build-backend = "cython_backend"
+backend-path = ["build_backend"]
+
+[cython-backend]
+# These packages are only installed if there are pyx files to compile.
+cython-requires = ["Cython >= 3.0.0a11"]
diff --git a/psycopg_c/setup.cfg b/psycopg_c/setup.cfg
index 6c5c93c..bf12b96 100644
--- a/psycopg_c/setup.cfg
+++ b/psycopg_c/setup.cfg
@@ -8,6 +8,8 @@ license = GNU Lesser General Public License v3 (LGPLv3)
 
 project_urls =
     Homepage = https://psycopg.org/
+    Documentation = https://psycopg.org/psycopg3/docs/
+    Changes = https://psycopg.org/psycopg3/docs/news.html
     Code = https://github.com/psycopg/psycopg
     Issue Tracker = https://github.com/psycopg/psycopg/issues
     Download = https://pypi.org/project/psycopg-c/
@@ -36,7 +38,6 @@ license_files = LICENSE.txt
 
 [options]
 python_requires = >= 3.7
-setup_requires = Cython >= 3.0.0a11
 packages = find:
 zip_safe = False
 
diff --git a/psycopg_pool/psycopg_pool/version.py b/psycopg_pool/psycopg_pool/version.py
index fc99bbd..3645d78 100644
--- a/psycopg_pool/psycopg_pool/version.py
+++ b/psycopg_pool/psycopg_pool/version.py
@@ -8,6 +8,6 @@ psycopg pool version file.
 # https://www.python.org/dev/peps/pep-0440/
 
 # STOP AND READ! if you change:
-__version__ = "3.1.5"
+__version__ = "3.1.6.dev1"
 # also change:
 # - `docs/news_pool.rst` to declare this version current or unreleased
diff --git a/psycopg_pool/pyproject.toml b/psycopg_pool/pyproject.toml
new file mode 100644
index 0000000..21e410c
--- /dev/null
+++ b/psycopg_pool/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=49.2.0", "wheel>=0.37"]
+build-backend = "setuptools.build_meta"
diff --git a/psycopg_pool/setup.cfg b/psycopg_pool/setup.cfg
index 1a3274e..876e09d 100644
--- a/psycopg_pool/setup.cfg
+++ b/psycopg_pool/setup.cfg
@@ -8,6 +8,8 @@ license = GNU Lesser General Public License v3 (LGPLv3)
 
 project_urls =
     Homepage = https://psycopg.org/
+    Documentation = https://www.psycopg.org/psycopg3/docs/advanced/pool.html
+    Changes = https://psycopg.org/psycopg3/docs/news_pool.html
     Code = https://github.com/psycopg/psycopg
     Issue Tracker = https://github.com/psycopg/psycopg/issues
     Download = https://pypi.org/project/psycopg-pool/
diff --git a/tests/constraints.txt b/tests/constraints.txt
index ef03ba1..5c86d5a 100644
--- a/tests/constraints.txt
+++ b/tests/constraints.txt
@@ -6,27 +6,34 @@
 # From install_requires
 backports.zoneinfo == 0.2.0
 typing-extensions == 4.1.0
+importlib-metadata == 1.4
 
 # From the 'test' extra
-mypy == 0.981
+mypy == 0.990
 pproxy == 2.7.0
 pytest == 6.2.5
 pytest-asyncio == 0.17.0
 pytest-cov == 3.0.0
-pytest-randomly == 3.10.0
+pytest-randomly == 3.5.0
 
 # From the 'dev' extra
 black == 22.3.0
 dnspython == 2.1.0
 flake8 == 4.0.0
-mypy == 0.981
 types-setuptools == 57.4.0
 wheel == 0.37
 
 # From the 'docs' extra
-Sphinx == 4.2.0
-furo == 2021.11.23
+Sphinx == 5.0
+furo == 2022.6.21
 sphinx-autobuild == 2021.3.14
 sphinx-autodoc-typehints == 1.12.0
-dnspython == 2.1.0
+
+# Build tools
+setuptools == 49.2.0
+wheel == 0.37
+Cython == 3.0.0a11
+tomli == 2.0.1
+
+# Undeclared extras to "unblock" extra features
 shapely == 1.7.0
diff --git a/tests/crdb/test_cursor.py b/tests/crdb/test_cursor.py
index 991b084..d3c10e5 100644
--- a/tests/crdb/test_cursor.py
+++ b/tests/crdb/test_cursor.py
@@ -61,5 +61,14 @@ def test_changefeed(conn_cls, dsn, conn, testfeed, fmt_out):
     cur.execute("cancel query %s", [qid])
     assert cur.statusmessage == "CANCEL QUERIES 1"
 
-    assert q.get(timeout=1) is None
+    # We often find the record with {"after": null} at least another time
+    # in the queue. Let's tolerate an extra one.
+    for i in range(2):
+        row = q.get(timeout=1)
+        if row is None:
+            break
+        assert json.loads(row.value)["after"] is None, json
+    else:
+        pytest.fail("keep on receiving messages")
+
     t.join()
diff --git a/tests/crdb/test_cursor_async.py b/tests/crdb/test_cursor_async.py
index 229295d..fcc7760 100644
--- a/tests/crdb/test_cursor_async.py
+++ b/tests/crdb/test_cursor_async.py
@@ -57,5 +57,14 @@ async def test_changefeed(aconn_cls, dsn, aconn, testfeed, fmt_out):
     await cur.execute("cancel query %s", [qid])
     assert cur.statusmessage == "CANCEL QUERIES 1"
 
-    assert await asyncio.wait_for(q.get(), 1.0) is None
+    # We often find the record with {"after": null} at least another time
+    # in the queue. Let's tolerate an extra one.
+    for i in range(2):
+        row = await asyncio.wait_for(q.get(), 1.0)
+        if row is None:
+            break
+        assert json.loads(row.value)["after"] is None, json
+    else:
+        pytest.fail("keep on receiving messages")
+
     await asyncio.gather(t)
diff --git a/tests/fix_crdb.py b/tests/fix_crdb.py
index 88ab504..32ec457 100644
--- a/tests/fix_crdb.py
+++ b/tests/fix_crdb.py
@@ -106,6 +106,7 @@ _crdb_reasons = {
     "encoding": 35882,
     "geometric types": 21286,
     "hstore": 41284,
+    "inet": 94192,
     "infinity date": 41564,
     "interval style": 35807,
     "json array": 23468,
@@ -121,11 +122,14 @@ _crdb_reasons = {
     "server-side cursor": 41412,
     "severity_nonlocalized": 81794,
     "stored procedure": 1751,
+    "to_regtype": None,
 }
 
 _crdb_reason_version = {
     "backend pid": "skip < 22",
+    "inet": "skip == 22.2.1",
     "cancel": "skip < 22",
     "server-side cursor": "skip < 22.1.3",
     "severity_nonlocalized": "skip < 22.1.3",
+    "to_regtype": "skip < 22.2",
 }
diff --git a/tests/scripts/bench-411.py b/tests/scripts/bench-411.py
index 82ea451..a4d1af3 100644
--- a/tests/scripts/bench-411.py
+++ b/tests/scripts/bench-411.py
@@ -8,6 +8,7 @@ from enum import Enum
 from typing import Any, Dict, List, Generator
 from argparse import ArgumentParser, Namespace
 from contextlib import contextmanager
+from concurrent.futures import ThreadPoolExecutor
 
 logger = logging.getLogger()
 logging.basicConfig(
@@ -18,6 +19,7 @@ logging.basicConfig(
 
 class Driver(str, Enum):
     psycopg2 = "psycopg2"
+    psycopg2_green = "psycopg2_green"
     psycopg = "psycopg"
     psycopg_async = "psycopg_async"
     asyncpg = "asyncpg"
@@ -58,6 +60,12 @@ def main() -> None:
 
             run_psycopg2(psycopg2, args)
 
+        elif name == Driver.psycopg2_green:
+            import psycopg2
+            import psycopg2.extras  # type: ignore
+
+            run_psycopg2_green(psycopg2, args)
+
         elif name == Driver.psycopg:
             import psycopg
 
@@ -134,15 +142,61 @@ def run_psycopg2(psycopg2: Any, args: Namespace) -> None:
                 cursor.executemany(insert, data)
             conn.commit()
 
-    logger.info(f"running {args.ntests} queries")
-    to_query = random.choices(ids, k=args.ntests)
-    with psycopg2.connect(args.dsn) as conn:
-        with time_log("psycopg2"):
-            for id_ in to_query:
-                with conn.cursor() as cursor:
-                    cursor.execute(select, {"id": id_})
-                    cursor.fetchall()
-                # conn.rollback()
+    def run(i):
+        logger.info(f"thread {i} running {args.ntests} queries")
+        to_query = random.choices(ids, k=args.ntests)
+        with psycopg2.connect(args.dsn) as conn:
+            with time_log("psycopg2"):
+                for id_ in to_query:
+                    with conn.cursor() as cursor:
+                        cursor.execute(select, {"id": id_})
+                        cursor.fetchall()
+                    # conn.rollback()
+
+    if args.concurrency == 1:
+        run(0)
+    else:
+        with ThreadPoolExecutor(max_workers=args.concurrency) as executor:
+            list(executor.map(run, range(args.concurrency)))
+
+    if args.drop:
+        logger.info("dropping test records")
+        with psycopg2.connect(args.dsn) as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(drop)
+            conn.commit()
+
+
+def run_psycopg2_green(psycopg2: Any, args: Namespace) -> None:
+    logger.info("Running psycopg2_green")
+
+    psycopg2.extensions.set_wait_callback(psycopg2.extras.wait_select)
+
+    if args.create:
+        logger.info(f"inserting {args.ntests} test records")
+        with psycopg2.connect(args.dsn) as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(drop)
+                cursor.execute(table)
+                cursor.executemany(insert, data)
+            conn.commit()
+
+    def run(i):
+        logger.info(f"thread {i} running {args.ntests} queries")
+        to_query = random.choices(ids, k=args.ntests)
+        with psycopg2.connect(args.dsn) as conn:
+            with time_log("psycopg2"):
+                for id_ in to_query:
+                    with conn.cursor() as cursor:
+                        cursor.execute(select, {"id": id_})
+                        cursor.fetchall()
+                    # conn.rollback()
+
+    if args.concurrency == 1:
+        run(0)
+    else:
+        with ThreadPoolExecutor(max_workers=args.concurrency) as executor:
+            list(executor.map(run, range(args.concurrency)))
 
     if args.drop:
         logger.info("dropping test records")
@@ -151,6 +205,8 @@ def run_psycopg2(psycopg2: Any, args: Namespace) -> None:
                 cursor.execute(drop)
             conn.commit()
 
+    psycopg2.extensions.set_wait_callback(None)
+
 
 def run_psycopg(psycopg: Any, args: Namespace) -> None:
     logger.info("Running psycopg sync")
@@ -164,15 +220,22 @@ def run_psycopg(psycopg: Any, args: Namespace) -> None:
                 cursor.executemany(insert, data)
             conn.commit()
 
-    logger.info(f"running {args.ntests} queries")
-    to_query = random.choices(ids, k=args.ntests)
-    with psycopg.connect(args.dsn) as conn:
-        with time_log("psycopg"):
-            for id_ in to_query:
-                with conn.cursor() as cursor:
-                    cursor.execute(select, {"id": id_})
-                    cursor.fetchall()
-                # conn.rollback()
+    def run(i):
+        logger.info(f"thread {i} running {args.ntests} queries")
+        to_query = random.choices(ids, k=args.ntests)
+        with psycopg.connect(args.dsn) as conn:
+            with time_log("psycopg"):
+                for id_ in to_query:
+                    with conn.cursor() as cursor:
+                        cursor.execute(select, {"id": id_})
+                        cursor.fetchall()
+                    # conn.rollback()
+
+    if args.concurrency == 1:
+        run(0)
+    else:
+        with ThreadPoolExecutor(max_workers=args.concurrency) as executor:
+            list(executor.map(run, range(args.concurrency)))
 
     if args.drop:
         logger.info("dropping test records")
@@ -196,15 +259,22 @@ async def run_psycopg_async(psycopg: Any, args: Namespace) -> None:
                 await cursor.executemany(insert, data)
             await conn.commit()
 
-    logger.info(f"running {args.ntests} queries")
-    to_query = random.choices(ids, k=args.ntests)
-    async with await psycopg.AsyncConnection.connect(args.dsn) as conn:
-        with time_log("psycopg_async"):
-            for id_ in to_query:
-                cursor = await conn.execute(select, {"id": id_})
-                await cursor.fetchall()
-                await cursor.close()
-                # await conn.rollback()
+    async def run(i):
+        logger.info(f"task {i} running {args.ntests} queries")
+        to_query = random.choices(ids, k=args.ntests)
+        async with await psycopg.AsyncConnection.connect(args.dsn) as conn:
+            with time_log("psycopg_async"):
+                for id_ in to_query:
+                    cursor = await conn.execute(select, {"id": id_})
+                    await cursor.fetchall()
+                    await cursor.close()
+                    # await conn.rollback()
+
+    if args.concurrency == 1:
+        await run(0)
+    else:
+        tasks = [run(i) for i in range(args.concurrency)]
+        await asyncio.gather(*tasks)
 
     if args.drop:
         logger.info("dropping test records")
@@ -232,16 +302,23 @@ async def run_asyncpg(asyncpg: Any, args: Namespace) -> None:
             await conn.executemany(a_insert, [tuple(d.values()) for d in data])
         await conn.close()
 
-    logger.info(f"running {args.ntests} queries")
-    to_query = random.choices(ids, k=args.ntests)
-    conn = await asyncpg.connect(args.dsn)
-    with time_log("asyncpg"):
-        for id_ in to_query:
-            tr = conn.transaction()
-            await tr.start()
-            await conn.fetch(a_select, id_)
-            # await tr.rollback()
-    await conn.close()
+    async def run(i):
+        logger.info(f"task {i} running {args.ntests} queries")
+        to_query = random.choices(ids, k=args.ntests)
+        conn = await asyncpg.connect(args.dsn)
+        with time_log("asyncpg"):
+            for id_ in to_query:
+                # tr = conn.transaction()
+                # await tr.start()
+                await conn.fetch(a_select, id_)
+                # await tr.rollback()
+        await conn.close()
+
+    if args.concurrency == 1:
+        await run(0)
+    else:
+        tasks = [run(i) for i in range(args.concurrency)]
+        await asyncio.gather(*tasks)
 
     if args.drop:
         logger.info("dropping test records")
@@ -263,12 +340,21 @@ def parse_cmdline() -> Namespace:
 
     parser.add_argument(
         "--ntests",
+        "-n",
         type=int,
         default=10_000,
         help="number of tests to perform [default: %(default)s]",
     )
 
     parser.add_argument(
+        "--concurrency",
+        "-c",
+        type=int,
+        default=1,
+        help="number of parallel tasks [default: %(default)s]",
+    )
+
+    parser.add_argument(
         "--dsn",
         default=os.environ.get("PSYCOPG_TEST_DSN", ""),
         help="database connection string"
diff --git a/tests/test_client_cursor.py b/tests/test_client_cursor.py
index b355604..5ac793b 100644
--- a/tests/test_client_cursor.py
+++ b/tests/test_client_cursor.py
@@ -9,6 +9,7 @@ import psycopg
 from psycopg import sql, rows
 from psycopg.adapt import PyFormat
 from psycopg.postgres import types as builtins
+from psycopg.types import TypeInfo
 
 from .utils import gc_collect, gc_count
 from .test_cursor import my_row_factory
@@ -326,9 +327,10 @@ def test_executemany_returning(conn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.fetchone() == (10,)
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.fetchone() == (20,)
     assert cur.nextset() is None
 
@@ -352,12 +354,13 @@ def test_executemany_no_result(conn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     with pytest.raises(psycopg.ProgrammingError):
         cur.fetchone()
     pgresult = cur.pgresult
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     assert pgresult is not cur.pgresult
     assert cur.nextset() is None
@@ -853,3 +856,8 @@ def test_message_0x33(conn):
         assert cur.fetchone() == ("test",)
 
     assert not notices
+
+
+def test_typeinfo(conn):
+    info = TypeInfo.fetch(conn, "jsonb")
+    assert info is not None
diff --git a/tests/test_client_cursor_async.py b/tests/test_client_cursor_async.py
index 0cf8ec6..50f08f7 100644
--- a/tests/test_client_cursor_async.py
+++ b/tests/test_client_cursor_async.py
@@ -6,6 +6,7 @@ from typing import List
 import psycopg
 from psycopg import sql, rows
 from psycopg.adapt import PyFormat
+from psycopg.types import TypeInfo
 
 from .utils import alist, gc_collect, gc_count
 from .test_cursor import my_row_factory
@@ -316,9 +317,10 @@ async def test_executemany_returning(aconn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert (await cur.fetchone()) == (10,)
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert (await cur.fetchone()) == (20,)
     assert cur.nextset() is None
 
@@ -342,12 +344,13 @@ async def test_executemany_no_result(aconn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     with pytest.raises(psycopg.ProgrammingError):
         await cur.fetchone()
     pgresult = cur.pgresult
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     assert pgresult is not cur.pgresult
     assert cur.nextset() is None
@@ -725,3 +728,8 @@ async def test_message_0x33(aconn):
         assert (await cur.fetchone()) == ("test",)
 
     assert not notices
+
+
+async def test_typeinfo(aconn):
+    info = await TypeInfo.fetch(aconn, "jsonb")
+    assert info is not None
diff --git a/tests/test_cursor.py b/tests/test_cursor.py
index a667f4f..a39ed67 100644
--- a/tests/test_cursor.py
+++ b/tests/test_cursor.py
@@ -308,9 +308,10 @@ def test_executemany_returning(conn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.fetchone() == (10,)
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.fetchone() == (20,)
     assert cur.nextset() is None
 
@@ -334,12 +335,13 @@ def test_executemany_no_result(conn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     with pytest.raises(psycopg.ProgrammingError):
         cur.fetchone()
     pgresult = cur.pgresult
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     assert pgresult is not cur.pgresult
     assert cur.nextset() is None
diff --git a/tests/test_cursor_async.py b/tests/test_cursor_async.py
index ac3fdeb..fdc3d89 100644
--- a/tests/test_cursor_async.py
+++ b/tests/test_cursor_async.py
@@ -295,9 +295,10 @@ async def test_executemany_returning(aconn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert (await cur.fetchone()) == (10,)
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert (await cur.fetchone()) == (20,)
     assert cur.nextset() is None
 
@@ -321,12 +322,13 @@ async def test_executemany_no_result(aconn, execmany):
         [(10, "hello"), (20, "world")],
         returning=True,
     )
-    assert cur.rowcount == 2
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     with pytest.raises(psycopg.ProgrammingError):
         await cur.fetchone()
     pgresult = cur.pgresult
     assert cur.nextset()
+    assert cur.rowcount == 1
     assert cur.statusmessage.startswith("INSERT")
     assert pgresult is not cur.pgresult
     assert cur.nextset() is None
diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py
index 56fe598..3ef4014 100644
--- a/tests/test_pipeline.py
+++ b/tests/test_pipeline.py
@@ -326,9 +326,10 @@ def test_executemany(conn):
             [(10,), (20,)],
             returning=True,
         )
-        assert cur.rowcount == 2
+        assert cur.rowcount == 1
         assert cur.fetchone() == (10,)
         assert cur.nextset()
+        assert cur.rowcount == 1
         assert cur.fetchone() == (20,)
         assert cur.nextset() is None
 
diff --git a/tests/test_pipeline_async.py b/tests/test_pipeline_async.py
index 2e743cf..1dc6110 100644
--- a/tests/test_pipeline_async.py
+++ b/tests/test_pipeline_async.py
@@ -327,9 +327,10 @@ async def test_executemany(aconn):
             [(10,), (20,)],
             returning=True,
         )
-        assert cur.rowcount == 2
+        assert cur.rowcount == 1
         assert (await cur.fetchone()) == (10,)
         assert cur.nextset()
+        assert cur.rowcount == 1
         assert (await cur.fetchone()) == (20,)
         assert cur.nextset() is None
 
diff --git a/tests/test_typeinfo.py b/tests/test_typeinfo.py
index d0e57e6..f715539 100644
--- a/tests/test_typeinfo.py
+++ b/tests/test_typeinfo.py
@@ -4,6 +4,10 @@ import psycopg
 from psycopg import sql
 from psycopg.pq import TransactionStatus
 from psycopg.types import TypeInfo
+from psycopg.types.composite import CompositeInfo
+from psycopg.types.enum import EnumInfo
+from psycopg.types.multirange import MultirangeInfo
+from psycopg.types.range import RangeInfo
 
 
 @pytest.mark.parametrize("name", ["text", sql.Identifier("text")])
@@ -44,29 +48,66 @@ async def test_fetch_async(aconn, name, status):
     assert info.array_oid == psycopg.adapters.types["text"].array_oid
 
 
[e-mail]("name", ["nosuch", sql.Identifier("nosuch")])
[e-mail]("status", ["IDLE", "INTRANS"])
-def test_fetch_not_found(conn, name, status):
+_name = pytest.mark.parametrize("name", ["nosuch", sql.Identifier("nosuch")])
+_status = pytest.mark.parametrize("status", ["IDLE", "INTRANS"])
+_info_cls = pytest.mark.parametrize(
+    "info_cls",
+    [
+        pytest.param(TypeInfo),
+        pytest.param(RangeInfo, marks=pytest.mark.crdb_skip("range")),
+        pytest.param(
+            MultirangeInfo,
+            marks=(pytest.mark.crdb_skip("range"), pytest.mark.pg(">= 14")),
+        ),
+        pytest.param(CompositeInfo, marks=pytest.mark.crdb_skip("composite")),
+        pytest.param(EnumInfo),
+    ],
+)
+
+
+@_name
+@_status
+@_info_cls
+def test_fetch_not_found(conn, name, status, info_cls, monkeypatch):
+
+    if TypeInfo._has_to_regtype_function(conn):
+        exit_orig = psycopg.Transaction.__exit__
+
+        def exit(self, exc_type, exc_val, exc_tb):
+            assert exc_val is None
+            return exit_orig(self, exc_type, exc_val, exc_tb)
+
+        monkeypatch.setattr(psycopg.Transaction, "__exit__", exit)
     status = getattr(TransactionStatus, status)
     if status == TransactionStatus.INTRANS:
         conn.execute("select 1")
 
     assert conn.info.transaction_status == status
-    info = TypeInfo.fetch(conn, name)
+    info = info_cls.fetch(conn, name)
     assert conn.info.transaction_status == status
     assert info is None
 
 
 @pytest.mark.asyncio
[e-mail]("name", ["nosuch", sql.Identifier("nosuch")])
[e-mail]("status", ["IDLE", "INTRANS"])
-async def test_fetch_not_found_async(aconn, name, status):
+@_name
+@_status
+@_info_cls
+async def test_fetch_not_found_async(aconn, name, status, info_cls, monkeypatch):
+
+    if TypeInfo._has_to_regtype_function(aconn):
+        exit_orig = psycopg.AsyncTransaction.__aexit__
+
+        async def aexit(self, exc_type, exc_val, exc_tb):
+            assert exc_val is None
+            return await exit_orig(self, exc_type, exc_val, exc_tb)
+
+        monkeypatch.setattr(psycopg.AsyncTransaction, "__aexit__", aexit)
     status = getattr(TransactionStatus, status)
     if status == TransactionStatus.INTRANS:
         await aconn.execute("select 1")
 
     assert aconn.info.transaction_status == status
-    info = await TypeInfo.fetch(aconn, name)
+    info = await info_cls.fetch(aconn, name)
     assert aconn.info.transaction_status == status
 
     assert info is None
diff --git a/tests/types/test_net.py b/tests/types/test_net.py
index 8739398..d5fe346 100644
--- a/tests/types/test_net.py
+++ b/tests/types/test_net.py
@@ -6,9 +6,11 @@ from psycopg import pq
 from psycopg import sql
 from psycopg.adapt import PyFormat
 
+crdb_skip_inet = pytest.mark.crdb_skip("inet")
 crdb_skip_cidr = pytest.mark.crdb_skip("cidr")
 
 
+@crdb_skip_inet
 @pytest.mark.parametrize("fmt_in", PyFormat)
 @pytest.mark.parametrize("val", ["192.168.0.1", "2001:db8::"])
 def test_address_dump(conn, fmt_in, val):
@@ -22,6 +24,7 @@ def test_address_dump(conn, fmt_in, val):
     assert cur.fetchone()[0] is True
 
 
+@crdb_skip_inet
 @pytest.mark.parametrize("fmt_in", PyFormat)
 @pytest.mark.parametrize("val", ["127.0.0.1/24", "::ffff:102:300/128"])
 def test_interface_dump(conn, fmt_in, val):
diff --git a/tests/types/test_numeric.py b/tests/types/test_numeric.py
index a27bc84..fffc32f 100644
--- a/tests/types/test_numeric.py
+++ b/tests/types/test_numeric.py
@@ -77,7 +77,7 @@ class MyEnum(enum.IntEnum):
     foo = 42
 
 
-class MyMixinEnum(enum.IntEnum):
+class MyMixinEnum(int, enum.Enum):
     foo = 42000000
 
 
diff --git a/tools/build/ci_install_libpq.sh b/tools/build/ci_install_libpq.sh
new file mode 100755
index 0000000..55525e3
--- /dev/null
+++ b/tools/build/ci_install_libpq.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Install the desired libpq in github action (Linux runner)
+#
+# Specify `oldest` or `newest` as first argument in order to choose the oldest
+# available to the debian distro or the newest available from the pgdg ppa.
+
+set -euo pipefail
+set -x
+
+libpq=${1:-}
+rel=$(lsb_release -c -s)
+
+setup_repo () {
+    version=${1:-}
+    curl -sL -o /etc/apt/trusted.gpg.d/apt.postgresql.org.asc \
+        https://www.postgresql.org/media/keys/ACCC4CF8.asc
+    echo "deb http://apt.postgresql.org/pub/repos/apt ${rel}-pgdg main ${version}" \
+        >> /etc/apt/sources.list.d/pgdg.list
+    apt-get -qq update
+}
+
+case "$libpq" in
+    "")
+        # Assume a libpq is already installed in the system. We don't care about
+        # the version.
+        exit 0
+        ;;
+
+    oldest)
+        setup_repo 10
+        pqver=$(apt-cache show libpq5 | grep ^Version: | tail -1 | awk '{print $2}')
+        apt-get -qq -y --allow-downgrades install "libpq-dev=${pqver}" "libpq5=${pqver}"
+        ;;
+
+    newest)
+        setup_repo
+        pqver=$(apt-cache show libpq5 | grep ^Version: | head -1 | awk '{print $2}')
+        apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}"
+        ;;
+
+    *)
+        echo "Unexpected wanted libpq: '${libpq}'" >&2
+        exit 1
+        ;;
+
+esac
diff --git a/tools/bump_version.py b/tools/bump_version.py
index 50dbe0b..53810db 100755
--- a/tools/bump_version.py
+++ b/tools/bump_version.py
@@ -241,9 +241,12 @@ def main() -> int | None:
     bumper = Bumper(packages[opt.package], bump_level=opt.level)
     logger.info("current version: %s", bumper.current_version)
     logger.info("bumping to version: %s", bumper.want_version)
-    if not opt.dry_run:
+
+    if opt.actions is None or Action.UPDATE in opt.actions:
         bumper.update_files()
+    if opt.actions is None or Action.COMMIT in opt.actions:
         bumper.commit()
+    if opt.actions is None or Action.TAG in opt.actions:
         if opt.level != BumpLevel.DEV:
             bumper.create_tag()
 
@@ -257,18 +260,26 @@ class BumpLevel(str, Enum):
     DEV = "dev"
 
 
+class Action(str, Enum):
+    UPDATE = "update"
+    COMMIT = "commit"
+    TAG = "tag"
+
+
 def parse_cmdline() -> Namespace:
     parser = ArgumentParser(description=__doc__)
 
     parser.add_argument(
+        "-l",
         "--level",
-        choices=[level.value for level in BumpLevel],
+        choices=[m.value for m in BumpLevel],
         default=BumpLevel.PATCH.value,
         type=BumpLevel,
         help="the level to bump [default: %(default)s]",
     )
 
     parser.add_argument(
+        "-p",
         "--package",
         choices=list(packages.keys()),
         default="psycopg",
@@ -276,10 +287,11 @@ def parse_cmdline() -> Namespace:
     )
 
     parser.add_argument(
-        "-n",
-        "--dry-run",
-        help="Just pretend",
-        action="store_true",
+        "-a",
+        "--actions",
+        help="The actions to perform [default: all]",
+        nargs="*",
+        choices=[m.value for m in Action],
     )
 
     g = parser.add_mutually_exclusive_group()