diff --git a/.github/ISSUE_TEMPLATE/announcements.md b/.github/ISSUE_TEMPLATE/announcements.md
deleted file mode 100644
index dad48096..00000000
--- a/.github/ISSUE_TEMPLATE/announcements.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Announcements
-about: Use this if you are sharing something interesting
-title: ''
-labels: announcement
-assignees: ''
-
----
-
-<!--
-
-Please start a discussion at https://github.com/oracle/python-oracledb/discussions instead of creating an Issue.
-
-Let us know if you are speaking at a conference on python-oracledb, or have a new package or app that uses python-oracledb, or something similarly exciting.
-
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c5dddef3..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--
-
-Thank you for using python-oracledb.
-
-See https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html for how to report security issues
-
-Please answer these questions so we can help you.
-
-Use Markdown syntax, see https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
-
--->
-
-1. What versions are you using?
-
-<!--
-
-Give your Oracle Database version, e.g.:
-
-    print(connection.version)
-
-Give your Oracle Client version (if you are using Thick mode):
-
-    print(oracledb.clientversion())
-
-Also run Python and show the output of:
-
-    import sys
-    import platform
-
-    print("platform.platform:", platform.platform())
-    print("sys.maxsize > 2**32:", sys.maxsize > 2**32)
-    print("platform.python_version:", platform.python_version())
-
-And:
-
-    print("oracledb.__version__:", oracledb.__version__)
-
--->
-
-2. Is it an error or a hang or a crash?
-
-3. What error(s) or behavior you are seeing?
-
-<!--
-
-Cut and paste text showing the command you ran.  No screenshots.
-
-Use a gist for long screen output and logs: see https://gist.github.com/
-
--->
-
-4. Does your application call init_oracle_client()?
-
-<!--
-
-This tells us whether you are using the python-oracledb Thin or Thick mode.
-
--->
-
-5. Include a runnable Python script that shows the problem.
-
-<!--
-
-Include all SQL needed to create the database schema.
-
-Format code by using three backticks on a line before and after code snippets, for example:
-
-```
-import oracledb
-```
-
--->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 3ba13e0c..00000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1 +0,0 @@
-blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/documentation-and-example-improvements.md b/.github/ISSUE_TEMPLATE/documentation-and-example-improvements.md
deleted file mode 100644
index 60427636..00000000
--- a/.github/ISSUE_TEMPLATE/documentation-and-example-improvements.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Documentation and Example Improvements
-about: Use this to suggest changes to documentation and examples
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-<!--
-
-Thank you for using python-oracledb.
-
-Please answer these questions so we can help you.
-
-Use Markdown syntax, see https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
-
--->
-
-1. What is the link to the documentation section that needs improving?
-
-2. Describe the confusion
-
-3. Suggest changes that would help
diff --git a/.github/ISSUE_TEMPLATE/enhancement-requests.md b/.github/ISSUE_TEMPLATE/enhancement-requests.md
deleted file mode 100644
index f8d1a114..00000000
--- a/.github/ISSUE_TEMPLATE/enhancement-requests.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Enhancement Requests
-about: Use this for enhancement requests
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-<!--
-
-Thank you for using python-oracledb.
-
-Review existing enhancement requests: https://github.com/oracle/python-oracledb/labels/enhancement
-
-Please answer these questions so we can help you.
-
-Use Markdown syntax, see https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
-
--->
-
-1. Describe your new request in detail
-
-2. Give supporting information about tools and operating systems.  Give relevant product version numbers
diff --git a/.github/ISSUE_TEMPLATE/installation-questions.md b/.github/ISSUE_TEMPLATE/installation-questions.md
deleted file mode 100644
index 5189b70a..00000000
--- a/.github/ISSUE_TEMPLATE/installation-questions.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Installation Problems
-about: Use this for python-oracledb installation questions
-title: ''
-labels: install & configuration
-assignees: ''
-
----
-
-<!--
-
-Please start a discussion at https://github.com/oracle/python-oracledb/discussions instead of creating an Issue.
-
-Give as much background information as possible: versions, runnable code, all SQL to create tables etc.
-
-But first Review:
-
-    - the Installation Instructions: https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html
-
-    - the troubleshooting tips: https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html#troubleshooting
-
--->
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
deleted file mode 100644
index 0401cc34..00000000
--- a/.github/SUPPORT.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Python python-oracledb Support
-
-python-oracledb is an Open Source project, so do some searching and reading
-before asking questions.
-
-## python-oracledb Installation issues
-
-Read the [Installation instructions](http://python-oracledb.readthedocs.io/en/latest/installation.html)
-
-## SQL and PL/SQL Questions
-
-Ask SQL and PL/SQL questions at [AskTOM](https://asktom.oracle.com/)
-
-Try out SQL and find code snippets on our hosted database
-with [LIVE SQL](https://livesql.oracle.com/)
-
-## Database and other Oracle Issues
-
-Ask Database and other Oracle issues at [Oracle
-Communities](https://community.oracle.com/hub/).
-
-## python-oracledb Documentation
-
-The python-oracledb documentation
-is [here](http://python-oracledb.readthedocs.io/en/latest/)
-
-## Got a python-oracledb question?
-
-Start a [Discussion](https://github.com/oracle/python-oracledb/discussions) on GitHub.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 9943fa4c..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Thanks for contributing!
-
-Before submitting PRs for python-oracledb you must have your signed *Oracle
-Contributor Agreement* accepted.  See https://oca.opensource.oracle.com
-
-If the problem solved is small, you may find it easier to open an Issue
-describing the problem and its cause so we can create the fix.
-
-The bottom of your commit message must have the following line using your name
-and e-mail address as it appears in the OCA Signatories list.
-
-```
-Signed-off-by: Your Name <you@example.org>
-```
-
-This can be automatically added to pull requests by committing with:
-
-```
-git commit --signoff
-````
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index c4743997..00000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# https://probot.github.io/apps/stale/
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 30
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - enhancement
-  - bug
-  - announcement
-  - OCA accepted
-# Label to use when marking an issue as stale
-staleLabel: inactive
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as inactive because it has not been
-  updated recently.  It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because it has not been updated for a month.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
deleted file mode 100644
index d75527f8..00000000
--- a/.github/workflows/build.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-name: Build python-oracledb packages
-
-on:
-  push:
-    tags:
-      - v*
-  workflow_dispatch:
-    inputs:
-      tgt:
-        description: List of package targets to build
-        default: 'Linux, macOS, Windows, Source'
-        required: false
-
-jobs:
-
-  build_source_package:
-    name: Build source package
-    if: contains(inputs.tgt, 'Source') || inputs.tgt == ''
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - uses: actions/setup-python@v5
-        with:
-          cache: 'pip'
-          python-version: 3.13
-
-      - name: Ensure build package is present
-        run: python -m pip install setuptools
-
-      - name: Build wheel for Python ${{ matrix.python-version }}
-        run: python setup.py sdist
-
-      - name: Upload the artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-oracledb-source
-          path: dist
-
-  build_linux_wheels:
-    name: Build wheels for Linux
-    if: contains(inputs.tgt, 'Linux') || inputs.tgt == ''
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-24.04
-            platform: amd64
-            container: quay.io/pypa/manylinux_2_28_x86_64
-          - os: ubuntu-24.04-arm
-            platform: arm64
-            container: quay.io/pypa/manylinux_2_28_aarch64
-
-    steps:
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Generate script
-        run: |
-          echo export PYO_COMPILE_ARGS=-g0 > build.sh
-          echo /opt/python/cp39-cp39/bin/python3.9 -m build >> build.sh
-          echo /opt/python/cp310-cp310/bin/python3.10 -m build >> build.sh
-          echo /opt/python/cp311-cp311/bin/python3.11 -m build >> build.sh
-          echo /opt/python/cp312-cp312/bin/python3.12 -m build >> build.sh
-          echo /opt/python/cp313-cp313/bin/python3.13 -m build >> build.sh
-          echo /opt/python/cp314-cp314/bin/python3.14 -m build >> build.sh
-          echo cd dist >> build.sh
-          echo auditwheel repair *.whl >> build.sh
-          echo rm *.whl >> build.sh
-          echo mv wheelhouse/*.whl . >> build.sh
-          chmod +x build.sh
-
-      - name: Build wheels
-        run: |
-          docker run \
-            -v $(pwd):/io  \
-            -w /io \
-            --platform linux/${{ matrix.platform }} \
-            ${{ matrix.container }} \
-            ./build.sh
-
-      - name: Upload the artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Linux_${{ matrix.platform }}_wheels
-          path: dist/*.whl
-
-  build_macos_wheels:
-    name: Build wheels for ${{ matrix.os }} Python-${{ matrix.python-version}}-${{ matrix.arch }}
-    if: contains(inputs.tgt, 'macOS') || inputs.tgt == ''
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
-        arch: ['']
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - uses: actions/setup-python@v5
-        with:
-          cache: 'pip'
-          python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.arch }}
-          allow-prereleases: true
-
-      - name: Ensure build package is present
-        run: python -m pip install build
-
-      - name: Build wheel for Python ${{ matrix.python-version }}
-        run: python -m build
-
-      - name: Upload the artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-oracledb-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.arch }}
-          path: dist/*.whl
-
-  build_windows_wheels:
-    name: Build wheels for ${{ matrix.os }} Python-${{ matrix.python-version}}-${{ matrix.arch }}
-    if: contains(inputs.tgt, 'Windows') || inputs.tgt == ''
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest]
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13.5', '3.14']
-        arch: ['x86', '']
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - uses: actions/setup-python@v5
-        with:
-          cache: 'pip'
-          python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.arch }}
-          allow-prereleases: true
-
-      - name: Ensure build package is present
-        run: python -m pip install build
-
-      - name: Build wheel for Python ${{ matrix.python-version }}
-        run: python -m build
-
-      - name: Upload the artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-oracledb-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.arch }}
-          path: dist/*.whl
-
-  combine_artifacts:
-    name: Combine artifacts into single artifact
-    if: ${{ always() }}
-    needs: [build_source_package, build_linux_wheels, build_macos_wheels, build_windows_wheels]
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/upload-artifact/merge@v4
-        with:
-          name: python-oracledb-wheels
-          delete-merged: true
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1339436c..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-__pycache__/
-.eggs/
-.tox/
-*.egg-info/
-build/
-dist/
-doc/build
-src/oracledb/*.c
-src/oracledb/interchange/*.c
-tests/ext/config.ini
-.ipynb_checkpoints/
-.venv*/
-.idea
-samples/sample.csv
-samples/sample.parquet
-samples/notebooks/testwrite.csv
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f7bb104d..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "src/oracledb/impl/thick/odpi"]
-	path = src/oracledb/impl/thick/odpi
-	url = ../odpi.git
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
deleted file mode 100644
index 80da1bc9..00000000
--- a/.pre-commit-config.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
--   repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
-    hooks:
-    -   id: black
--   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.291
-    hooks:
-    -   id: ruff
-        exclude: ^samples/tutorial/
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
deleted file mode 100644
index 1a6c05d2..00000000
--- a/.readthedocs.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# required
-version: 2
-
-build:
-  os: ubuntu-20.04
-  tools:
-    python: "3.9"
-
-# ensure that the submodules are included
-submodules:
-  include: all
-  recursive: true
-
-# Build documentation in the doc/src directory with Sphinx
-sphinx:
-   configuration: doc/src/conf.py
-
-# declare Python requirements required to build docs
-python:
-   install:
-   - requirements: doc/requirements.txt
-   - method: pip
-     path: .
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ad3c3dc1..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Contributing to this repository
-
-We welcome your contributions! There are multiple ways to contribute.
-
-## Opening issues
-
-For bugs or enhancement requests, please file a GitHub issue unless it's
-security related. When filing a bug remember that the better written the bug is,
-the more likely it is to be fixed. If you think you've found a security
-vulnerability, do not raise a GitHub issue and follow the instructions in our
-[security policy](./SECURITY.md).
-
-## Contributing code
-
-We welcome your code contributions. Before submitting code via a pull request,
-you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
-your commits need to include the following line using the name and e-mail
-address you used to sign the OCA:
-
-```text
-Signed-off-by: Your Name <you@example.org>
-```
-
-This can be automatically added to pull requests by committing with
-`--sign-off` or `-s`, e.g.
-
-```text
-git commit --signoff
-```
-
-Only pull requests from committers that can be verified as having signed the
-OCA can be accepted.
-
-## Pull request process
-
-1. Ensure there is an issue created to track and discuss the fix or enhancement
-   you intend to submit.
-1. Fork this repository.
-1. Create a branch in your fork to implement the changes. We recommend using
-   the issue number as part of your branch name, e.g. `1234-fixes`.
-1. Ensure that any documentation is updated with the changes that are required
-   by your change.
-1. Ensure that any samples are updated if the base image has been changed.
-1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
-   what your changes are meant to do and provide simple steps on how to validate.
-   your changes. Ensure that you reference the issue you created as well.
-1. We will assign the pull request to 2-3 people for review before it is merged.
-
-Note we merge to an internal repo first before pushing back to GitHub.
-
-## Code of conduct
-
-Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
-like more specific guidelines, see the [Contributor Covenant Code of
-Conduct][COC].
-
-[OCA]: https://oca.opensource.oracle.com
-[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 38fd1483..00000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright (c) 2016, 2025 Oracle and/or its affiliates.
-
-This software is dual-licensed to you under the Universal Permissive License
-(UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-either license.
-
-If you elect to accept the software under the Apache License, Version 2.0,
-the following applies:
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-The Universal Permissive License (UPL), Version 1.0
-===================================================
-
-Subject to the condition set forth below, permission is hereby granted to any
-person obtaining a copy of this software, associated documentation and/or data
-(collectively the "Software"), free of charge and under any and all copyright
-rights in the Software, and any and all patent rights owned or freely
-licensable by each licensor hereunder covering either (i) the unmodified
-Software as contributed to or provided by such licensor, or (ii) the Larger
-Works (as defined below), to deal in both
-
-(a) the Software, and
-
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
-    one is included with the Software (each a "Larger Work" to which the
-    Software is contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make,
-use, sell, offer for sale, import, export, have made, and have sold the
-Software and the Larger Work(s), and to sublicense the foregoing rights on
-either these or other terms.
-
-This license is subject to the following condition:
-
-The above copyright notice and either this complete permission notice or at a
-minimum a reference to the UPL must be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Apache License
-==============
-
-Version 2.0, January 2004
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  **Definitions**.
-
-    "License" shall mean the terms and conditions for use, reproduction, and
-    distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by the
-    copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all other
-    entities that control, are controlled by, or are under common control with
-    that entity.  For the purposes of this definition, "control" means (i) the
-    power, direct or indirect, to cause the direction or management of such
-    entity, whether by contract or otherwise, or (ii) ownership of fifty
-    percent (50%) or more of the outstanding shares, or (iii) beneficial
-    ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity exercising
-    permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation source,
-    and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical transformation
-    or translation of a Source form, including but not limited to compiled
-    object code, generated documentation, and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or Object form,
-    made available under the License, as indicated by a copyright notice that
-    is included in or attached to the work (an example is provided in the
-    Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object form,
-    that is based on (or derived from) the Work and for which the editorial
-    revisions, annotations, elaborations, or other modifications represent, as
-    a whole, an original work of authorship. For the purposes of this License,
-    Derivative Works shall not include works that remain separable from, or
-    merely link (or bind by name) to the interfaces of, the Work and Derivative
-    Works thereof.
-
-    "Contribution" shall mean any work of authorship, including the original
-    version of the Work and any modifications or additions to that Work or
-    Derivative Works thereof, that is intentionally submitted to Licensor for
-    inclusion in the Work by the copyright owner or by an individual or Legal
-    Entity authorized to submit on behalf of the copyright owner. For the
-    purposes of this definition, "submitted" means any form of electronic,
-    verbal, or written communication sent to the Licensor or its
-    representatives, including but not limited to communication on electronic
-    mailing lists, source code control systems, and issue tracking systems that
-    are managed by, or on behalf of, the Licensor for the purpose of discussing
-    and improving the Work, but excluding communication that is conspicuously
-    marked or otherwise designated in writing by the copyright owner as "Not a
-    Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity on
-    behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  **Grant of Copyright License.** Subject to the terms and conditions of this
-    License, each Contributor hereby grants to You a perpetual, worldwide,
-    non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-    reproduce, prepare Derivative Works of, publicly display, publicly perform,
-    sublicense, and distribute the Work and such Derivative Works in Source or
-    Object form.
-
-3.  **Grant of Patent License.** Subject to the terms and conditions of this
-    License, each Contributor hereby grants to You a perpetual, worldwide,
-    non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-    this section) patent license to make, have made, use, offer to sell, sell,
-    import, and otherwise transfer the Work, where such license applies only to
-    those patent claims licensable by such Contributor that are necessarily
-    infringed by their Contribution(s) alone or by combination of their
-    Contribution(s) with the Work to which such Contribution(s) was submitted.
-    If You institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-    Contribution incorporated within the Work constitutes direct or
-    contributory patent infringement, then any patent licenses granted to You
-    under this License for that Work shall terminate as of the date such
-    litigation is filed.
-
-4.  **Redistribution.** You may reproduce and distribute copies of the Work or
-    Derivative Works thereof in any medium, with or without modifications, and
-    in Source or Object form, provided that You meet the following conditions:
-
-    1.  You must give any other recipients of the Work or Derivative Works a
-        copy of this License; and
-
-    2.  You must cause any modified files to carry prominent notices stating
-        that You changed the files; and
-
-    3.  You must retain, in the Source form of any Derivative Works that You
-        distribute, all copyright, patent, trademark, and attribution notices
-        from the Source form of the Work, excluding those notices that do not
-        pertain to any part of the Derivative Works; and
-
-    4.  If the Work includes a "NOTICE" text file as part of its distribution,
-        then any Derivative Works that You distribute must include a readable
-        copy of the attribution notices contained within such NOTICE file,
-        excluding those notices that do not pertain to any part of the
-        Derivative Works, in at least one of the following places: within a
-        NOTICE text file distributed as part of the Derivative Works; within
-        the Source form or documentation, if provided along with the Derivative
-        Works; or, within a display generated by the Derivative Works, if and
-        wherever such third-party notices normally appear. The contents of the
-        NOTICE file are for informational purposes only and do not modify the
-        License. You may add Your own attribution notices within Derivative
-        Works that You distribute, alongside or as an addendum to the NOTICE
-        text from the Work, provided that such additional attribution notices
-        cannot be construed as modifying the License.
-
-        You may add Your own copyright statement to Your modifications and may
-        provide additional or different license terms and conditions for use,
-        reproduction, or distribution of Your modifications, or for any such
-        Derivative Works as a whole, provided Your use, reproduction, and
-        distribution of the Work otherwise complies with the conditions stated
-        in this License.
-
-5.  **Submission of Contributions.** Unless You explicitly state otherwise, any
-    Contribution intentionally submitted for inclusion in the Work by You to
-    the Licensor shall be under the terms and conditions of this License,
-    without any additional terms or conditions. Notwithstanding the above,
-    nothing herein shall supersede or modify the terms of any separate license
-    agreement you may have executed with Licensor regarding such Contributions.
-
-6.  **Trademarks.** This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor, except
-    as required for reasonable and customary use in describing the origin of
-    the Work and reproducing the content of the NOTICE file.
-
-7.  **Disclaimer of Warranty.** Unless required by applicable law or agreed to
-    in writing, Licensor provides the Work (and each Contributor provides its
-    Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied, including, without limitation, any
-    warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-    FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for
-    determining the appropriateness of using or redistributing the Work and
-    assume any risks associated with Your exercise of permissions under this
-    License.
-
-8.  **Limitation of Liability.** In no event and under no legal theory, whether
-    in tort (including negligence), contract, or otherwise, unless required by
-    applicable law (such as deliberate and grossly negligent acts) or agreed to
-    in writing, shall any Contributor be liable to You for damages, including
-    any direct, indirect, special, incidental, or consequential damages of any
-    character arising as a result of this License or out of the use or
-    inability to use the Work (including but not limited to damages for loss of
-    goodwill, work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor has been
-    advised of the possibility of such damages.
-
-9.  **Accepting Warranty or Additional Liability.** While redistributing the
-    Work or Derivative Works thereof, You may choose to offer, and charge a fee
-    for, acceptance of support, warranty, indemnity, or other liability
-    obligations and/or rights consistent with this License. However, in
-    accepting such obligations, You may act only on Your own behalf and on Your
-    sole responsibility, not on behalf of any other Contributor, and only if
-    You agree to indemnify, defend, and hold each Contributor harmless for any
-    liability incurred by, or claims asserted against, such Contributor by
-    reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 5bdd1ca4..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,13 +0,0 @@
-include MANIFEST.in
-include pyproject.toml
-include tox.ini
-include *.txt
-recursive-include src/oracledb *.pxd
-recursive-include src/oracledb *.pxi
-recursive-include src/oracledb *.pyx
-recursive-include src/oracledb/plugins *.py
-recursive-include src/oracledb/impl/thick/odpi *.c
-recursive-include src/oracledb/impl/thick/odpi *.h
-prune src/oracledb/impl/thick/odpi/test
-prune src/oracledb/impl/thick/odpi/samples
-recursive-include tests *.py
diff --git a/NOTICE.txt b/NOTICE.txt
deleted file mode 100644
index 4cd6fb08..00000000
--- a/NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2016, 2025, Oracle and/or its affiliates.
diff --git a/README.md b/README.md
deleted file mode 100644
index 41358be8..00000000
--- a/README.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# python-oracledb
-
-The python-oracledb driver is the widely used, open-source [Python][python]
-extension module allowing Python programs to connect directly to [Oracle
-Database][oracledb] with no extra libraries needed. The module is built with
-Cython for safety and speed. It is lightweight and high-performance. It is
-stable, well tested, and has comprehensive [documentation][documentation]. The
-module is maintained by Oracle.
-
-The module conforms to the [Python Database API 2.0 specification][pep249] with
-a considerable number of additions and a couple of minor exclusions, see the
-[feature list][features]. It is used by many Python frameworks, SQL generators,
-ORMs, and libraries.
-
-Python-oracledb has a rich feature set which is easy to use. It gives you
-control over SQL and PL/SQL statement execution; for working with data frames;
-for fast data ingestion; for calling NoSQL-style document APIs; for message
-queueing; for receiving database notifications; and for starting and stopping
-the database. It also has high availability and security features. Synchronous
-and [concurrent][concurrent] coding styles are supported. Database operations
-can optionally be [pipelined][pipelining].
-
-Python-oracledb is the successor to the now obsolete cx_Oracle driver.
-
-## Python-oracledb Installation
-
-Run:
-
-```
-python -m pip install oracledb --upgrade
-```
-
-See [Installing python-oracledb][installation] for details.
-
-## Samples
-
-Examples can be found in the [/samples][samples] directory and the
-[Python and Oracle Database Tutorial][tutorial].
-
-A basic example:
-
-```
-import oracledb
-import getpass
-
-un = "scott"                  # Sample database username
-cs = "localhost/orclpdb"      # Sample database connection string
-# cs = "localhost/freepdb1"   # For Oracle Database Free users
-# cs = "localhost/orclpdb1"   # Some databases may have this service
-pw = getpass.getpass(f"Enter password for {un}@{cs}: ")
-
-with oracledb.connect(user=un, password=pw, dsn=cs) as connection:
-    with connection.cursor() as cursor:
-        sql = "select sysdate from dual"
-        for r in cursor.execute(sql):
-            print(r)
-```
-
-## Dependencies and Interoperability
-
-- Python versions 3.9 through 3.14.
-
-  Pre-built packages are available on [PyPI][pypi] and other repositories.
-
-  Source code is also available.
-
-  Previous versions of python-oracledb supported older Python versions.
-
-- Oracle Client libraries are *optional*.
-
-  **Thin mode**: By default python-oracledb runs in a 'Thin' mode which
-  connects directly to Oracle Database.
-
-  **Thick mode**: Some advanced Oracle Database functionality is currently only
-  available when optional Oracle Client libraries are loaded by
-  python-oracledb.  Libraries are available in the free [Oracle Instant
-  Client][instantclient] packages. Python-oracledb can use Oracle Client
-  libraries versions 11.2 through 23, inclusive.
-
-- Oracle Database
-
-  **Thin mode**: Oracle Database 12.1 (or later) is required.
-
-  **Thick mode**: Oracle Database 9.2 (or later) is required, depending on the
-  Oracle Client library version.  Oracle Database's standard client-server
-  version interoperability allows connection to both older and newer
-  databases. For example when python-oracledb uses Oracle Client 19 libraries,
-  then it can connect to Oracle Database 11.2 or later.
-
-## Documentation
-
-See the [python-oracledb Documentation][documentation] and [Release
-Notes][relnotes].
-
-## Help
-
-Questions can be asked in [GitHub Discussions][ghdiscussions].
-
-Problem reports can be raised in [GitHub Issues][ghissues].
-
-## Tests
-
-See [/tests][tests]
-
-## Contributing
-
-This project welcomes contributions from the community. Before submitting a
-pull request, please [review our contribution guide](./CONTRIBUTING.md).
-
-## Security
-
-Please consult the [security guide](./SECURITY.md) for our responsible security
-vulnerability disclosure process.
-
-## License
-
-See [LICENSE][license], [THIRD_PARTY_LICENSES][tplicense], and
-[NOTICE][notice].
-
-[python]: https://www.python.org/
-[oracledb]: https://www.oracle.com/database/
-[instantclient]: https://www.oracle.com/database/technologies/instant-client.html
-[pep249]: https://peps.python.org/pep-0249/
-[documentation]: http://python-oracledb.readthedocs.io
-[relnotes]: https://python-oracledb.readthedocs.io/en/latest/release_notes.html
-[license]: https://github.com/oracle/python-oracledb/blob/main/LICENSE.txt
-[tplicense]: https://github.com/oracle/python-oracledb/blob/main/THIRD_PARTY_LICENSES.txt
-[notice]: https://github.com/oracle/python-oracledb/blob/main/NOTICE.txt
-[tutorial]: https://oracle.github.io/python-oracledb/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html
-[ghdiscussions]: https://github.com/oracle/python-oracledb/discussions
-[ghissues]: https://github.com/oracle/python-oracledb/issues
-[tests]: https://github.com/oracle/python-oracledb/tree/main/tests
-[samples]: https://github.com/oracle/python-oracledb/tree/main/samples
-[installation]: https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html
-[features]: https://oracle.github.io/python-oracledb/#features
-[concurrent]: https://python-oracledb.readthedocs.io/en/latest/user_guide/asyncio.html
-[pipelining]: https://python-oracledb.readthedocs.io/en/latest/user_guide/asyncio.html#pipelining-database-operations
-[pypi]: https://pypi.org/project/oracledb
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 2d8b906f..00000000
--- a/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Please see the python-oracledb home page for links to documentation,
-installation instructions, and source code:
-
-https://oracle.github.io/python-oracledb/index.html
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index 25e76bf5..00000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Reporting security vulnerabilities
-
-Oracle values the independent security research community and believes that
-responsible disclosure of security vulnerabilities helps us ensure the security
-and privacy of all our users.
-
-Please do NOT raise a GitHub Issue to report a security vulnerability. If you
-believe you have found a security vulnerability, please submit a report to
-[secalert_us@oracle.com][1] preferably with a proof of concept. Please review
-some additional information on [how to report security vulnerabilities to
-Oracle][2].  We encourage people who contact Oracle Security to use email
-encryption using [our encryption key][3].
-
-We ask that you do not use other channels or contact the project maintainers
-directly.
-
-Non-vulnerability related security issues including ideas for new or improved
-security features are welcome on GitHub Issues.
-
-## Security updates, alerts and bulletins
-
-Security updates will be released on a regular cadence. Many of our projects
-will typically release security fixes in conjunction with the Oracle Critical
-Patch Update program. Additional information, including past advisories, is
-available on our [security alerts][4] page.
-
-## Security-related information
-
-We will provide security related information such as a threat model,
-considerations for secure use, or any known security issues in our
-documentation. Please note that labs and sample code are intended to
-demonstrate a concept and may not be sufficiently hardened for production use.
-
-[1]: mailto:secalert_us@oracle.com
-[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
-[3]: https://www.oracle.com/security-alerts/encryptionkey.html
-[4]: https://www.oracle.com/security-alerts/
diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt
deleted file mode 100644
index 0f8f1a9a..00000000
--- a/THIRD_PARTY_LICENSES.txt
+++ /dev/null
@@ -1,1459 +0,0 @@
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-Cython
-
-The following attribution text was taken from Component Cython Version 0.24.1
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-Cryptography
-
-LICENSE: https://github.com/pyca/cryptography/blob/3.4.x/LICENSE
-This software is made available under the terms of *either* of the licenses
-found in LICENSE.APACHE or LICENSE.BSD. Contributions to cryptography are made
-under the terms of *both* these licenses.
-The code used in the OS random engine is derived from CPython, and is licensed
-under the terms of the PSF License Agreement.
-___________________________________________________________________________
-
-LICENSE.APACHE: https://github.com/pyca/cryptography/blob/3.4.x/LICENSE.APACHE
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-   1. Definitions.
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-   END OF TERMS AND CONDITIONS
-   APPENDIX: How to apply the Apache License to your work.
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-   Copyright [yyyy] [name of copyright owner]
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-       https://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-___________________________________________________________________________
-
-LICENSE.BSD: https://github.com/pyca/cryptography/blob/3.4.x/LICENSE.BSD
-
-Copyright (c) Individual contributors.
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of PyCA Cryptography nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=============================================================================================
-
-Fourth-party dependencies:
-
-six LICENSE - MIT:  https://github.com/benjaminp/six/blob/1.15.0/LICENSE
-
-Copyright (c) 2010-2020 Benjamin Peterson
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-___________________________________________________________________________________________
-
-cffi LICENSE - MIT: https://github.com/python-cffi/release-doc/blob/master/LICENSE
-
-MIT License
-Copyright (c) 2020 CFFI, Python's C Foreign Function Interface
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-___________________________________________________________________________________________
-
-pycparser LICENSE: https://github.com/eliben/pycparser/blob/master/LICENSE
-
-pycparser -- A C parser in Python
-Copyright (c) 2008-2017, Eli Bendersky
-All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of Eli Bendersky nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-Apache Arrow nanoarrow
-Copyright 2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-----------
-
-
-
-Apache nanoarrow 0.6.0
-
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-----------
-
-Copyright 2015-2023 Mikkel F. Jørgensen, dvide.com
-Copyright (c) 2016 Mikkel Fahnøe Jørgensen, dvide.com
-Copyright (c) 2005-2016 Paul Hsieh
-Copyright (c) 2024 Mikkel Fahnøe Jørgensen, dvide.com
-
-----------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-
-Microsoft Authentication Library (MSAL) for Python
-
-The MIT License (MIT)
-
-Copyright (c) Microsoft Corporation.
-All rights reserved.
-
-This code is licensed under the MIT License.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------------------------------------------------------------------------------------------------------------------
-cryptography
-
-This software is made available under the terms of *either* of the licenses
-found in LICENSE.APACHE or LICENSE.BSD. Contributions to cryptography are made
-under the terms of *both* these licenses.
-
- -- Apache License
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---BSD License
-
-Copyright (c) Individual contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    3. Neither the name of PyCA Cryptography nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
------------------------------------------------------------------------------------------------------------------------------
-
-cffi
-
-Except when otherwise stated (look for LICENSE files in directories or
-information at the beginning of each file) all software and
-documentation is licensed as follows:
-
-    The MIT License
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-
------------------------------------------------------------------------------------------------------------------------------
-pycparser
-pycparser -- A C parser in Python
-
-Copyright (c) 2008-2022, Eli Bendersky
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of the copyright holder nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------------------------------------------------------
-
-PyJWT
-
-The MIT License (MIT)
-
-Copyright (c) 2015-2022 José Padilla
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------------------------------------------------------------------------------
-
-certifi
-
-This package contains a modified version of ca-bundle.crt:
-
-ca-bundle.crt -- Bundle of CA Root Certificates
-
-This is a bundle of X.509 certificates of public Certificate Authorities
-(CA). These were automatically extracted from Mozilla's root certificates
-file (certdata.txt).  This file can be found in the mozilla source tree:
-https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt
-It contains the certificates in PEM format and therefore
-can be directly used with curl / libcurl / php_curl, or with
-an Apache+mod_ssl webserver for SSL client authentication.
-Just configure this file as the SSLCACertificateFile.#
-
-***** BEGIN LICENSE BLOCK *****
-This Source Code Form is subject to the terms of the Mozilla Public License,
-v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
-one at http://mozilla.org/MPL/2.0/.
-
-***** END LICENSE BLOCK *****
-@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
-
-
---Mozilla Public License
-
-Mozilla Public License
Version 2.0
-1. Definitions
-1.1. “Contributor”
-means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
-1.2. “Contributor Version”
-means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.
-1.3. “Contribution”
-means Covered Software of a particular Contributor.
-1.4. “Covered Software”
-means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
-1.5. “Incompatible With Secondary Licenses”
-means
-* that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
-* that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
-1.6. “Executable Form”
-means any form of the work other than Source Code Form.
-1.7. “Larger Work”
-means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
-1.8. “License”
-means this document.
-1.9. “Licensable”
-means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
-1.10. “Modifications”
-means any of the following:
-* any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
-* any new file in Source Code Form that contains any Covered Software.
-1.11. “Patent Claims” of a Contributor
-means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
-1.12. “Secondary License”
-means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
-1.13. “Source Code Form”
-means the form of the work preferred for making modifications.
-1.14. “You” (or “Your”)
-means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-2. License Grants and Conditions
-2.1. Grants
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-* under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
-* under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
-2.2. Effective Date
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
-2.3. Limitations on Grant Scope
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
-* for any code that a Contributor has removed from Covered Software; or
-* for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
-* under Patent Claims infringed by Covered Software in the absence of its Contributions.
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
-2.4. Subsequent Licenses
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
-2.5. Representation
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
-2.6. Fair Use
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
-2.7. Conditions
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
-3. Responsibilities
-3.1. Distribution of Source Form
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.
-3.2. Distribution of Executable Form
-If You distribute Covered Software in Executable Form then:
-* such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
-* You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.
-3.3. Distribution of a Larger Work
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
-3.4. Notices
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
-3.5. Application of Additional Terms
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
-4. Inability to Comply Due to Statute or Regulation
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5. Termination
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
-6. Disclaimer of Warranty
-Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.
-7. Limitation of Liability
-Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
-8. Litigation
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.
-9. Miscellaneous
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
-10. Versions of the License
-10.1. New Versions
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
-10.2. Effect of New Versions
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
-10.3. Modified Versions
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
-Exhibit A - Source Code Form License Notice
-This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
-You may add additional accurate notices of copyright ownership.
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.
-
-
------------------------------------------------------------------------------------------------------------------------------
-
-charset-normalizer
-
-MIT License
-
-Copyright (c) 2019 TAHRI Ahmed R.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------------------------------------------------------------------------------
-idna
-BSD 3-Clause License
-
-Copyright (c) 2013-2024, Kim Davies and contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------
-urllib
-
-MIT License
-
-Copyright (c) 2008-2020 Andrey Petrov and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------------------------------------------------------------------------------
-
-requests
-
-Copyright 2019 Kenneth Reitz
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
diff --git a/base.css b/base.css
new file mode 100644
index 00000000..603beda9
--- /dev/null
+++ b/base.css
@@ -0,0 +1,203 @@
+* {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+html,
+body {
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-size: 16px;
+  line-height: 1.5;
+}
+
+a {
+  color: #006ed0;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  text-decoration: underline;
+}
+
+h1 {
+  font-size: 24px;
+  margin: 0;
+  padding: 0;
+}
+
+h2,
+h3 {
+  margin-bottom: 8px;
+}
+
+h4 {
+  margin-bottom: 4px;
+}
+
+p {
+  margin: 0 0 24px;
+}
+
+ul,
+ol {
+  margin: 0 0 24px;
+}
+
+hr {
+  margin: 24px 0;
+  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, .15);
+  padding: 0;
+  background-color: transparent;
+}
+
+.container {
+  max-width: 998px;
+  padding-left: 16px;
+  padding-right: 16px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.oracleHeader {
+  background-color: #fff;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .1);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .1);
+}
+
+.oracleLogo {
+  width: 160px;
+  height: 64px;
+  padding-left: 160px;
+  color: #fff;
+  background-color: #c74634;
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center center;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQMAAABRCAYAAADW4MODAAAACXBIWXMAABcRAAAXEQHKJvM/AAAH90lEQVR4nO3d/3GjOBQHcN3N/R86iDsIHcRXQbwVrFNBfBUsqeCcCtbpwKlg7QouqeBIB3YF3PDymDDiPfFLEjj3/cwwO2tsBAI9/QCR34qiMAAAv//vcwAACIIBABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBAJA/ZpgNiTFmaYxJeUka3+jvZIx55eXA/+/qEPBYq/3a878hlHmYGWPujDFnPp4sYHqGz1+5LHjxJaudD+m8bAIfV5syr1d8zaYt3+1jx0tQc/pbi+XFszbGfG+s8e+ZL6y8w5ZjZdA7H790kQ+V8vaurN+feV2X4+9qwXm6EtLz4c0qYNJ5+TNw8JYkHITKc3ctrB/rzHnbpwIbZA7dhISj3q9IgcBwOv8aY7aeWh4+XHMebD1uc6cUzCvPNU3G+fldSc+HdaDtjrHmgPojUCAwnEbwQGBmEAxSbtbFCgK2B65J5hIQDO+Tj4BQ1lY3jU8/3fJ3xkj4/P3wsL8ujxM3/yVlMP0ZMPiVXrgLGcWU3QStCTuFN+6mSBF4qgwa0+RdcOFpy9sxTdCE988VcHx4V8YdpPMSq5uwi1CBhejKOU01gJhwxHNdrC98Yn3UCCkX9rvGmg83nFbXQZ9nT83sFTcDpXzYKYWgC617YKu6C6vGmnb7lkDwxt8ZWzijFYaOti2B4K02IDymeX+Kfuxly2CCZVfo9kVRLALtU7ndg5pyUWTCbyTS94YuSVEUr0IapXTANteNrXzIeZGshO24lkzYRuUwcL/7LpJl4DSXQpr1/A2dftBlikRdGboWvh9icV3MdiCS+AwGhtOU9E2nDCwnYTsF57uW9yf+rbTNPmnshO+HWiShC6MWtF975N9slykGELVBq79i3Etl5ej3U+PTz3Wxlc3Bo5Bm326C1j145ub6gbtftqsex71xpDHHEX9flkq3yDXedFFiB4NE6bcfPd9S62LDg1O2If1nH6T+YZ9goI2JnK0AvOHPbA+8jTZSgbfT+Iqk4zYxb/2FFjsYaBdb7EBQkWrDK8d+hiQNXkoBQpI4WlUb62LNleM2jm1UFsr99O1XKRAOUiXxPMNbnoPFvpsgXfDnmPdSLXu+V2xLIz/JpjVBu15omVJIj0oB33KNZqd5zdvSgoV0/oySxleyULpGywjXySpWoJ1DMJgysp64wNxan8d8CCl1BEPtc/v3D41PP2hNW8Pr/ml8+vEAkTZXQjp/7zO8/eeb1l27VoKwL48xW1yxg4FUyKSL7lIsWgpcm4XjnvWxYyHTauXHlt+/8iCqFEh2SsGXuNKA4d4dLbQg5jBrUYu6lyBvKdBjdBmQy4SmvuER7i4XUqY89HTD6U81lgMT3JmJPYAotQKmDgZj0y9P2n3j03Hulbyy91ubE9B1ZP/kuOgyIW+kJqvdxYLxniaYfRm9ZSA1KW/4opPWhZYqfb6+XZeqqb4Vatm+7h1NfylNW98Laa+Mm1SPKtfvrGj5sppwEDgGLT99PZZu0/I5qNjBQMvU9UQP+2g1qLafLrvay1OGBIQX3p8uQXEjFF5jvbykj1zZ3q1V0LV82XzxYGC462V3yZaOltXFmWLWYi7UxmfO2JgRMVVG049WbShl0KOjwKUcGKS+vOFjrffFcy5kfZ4pyJWA8632Ridp/RD2zMa98nDTt8gBQTovIWctlgHv78an7mvhskzwnPSm8WR3/Oe7U8fz9fb8CEnbnAHX5KOCJ/MMPdZ9Y2uf26y+45p7McS+tm3X/IYYE5Rc5yXk3ATXnIxYc2qCLlPMTdgpjwHfcI3m891xkqWjKf/mqQ944uN4bqz5cNtzynRlpdTKZ6u5mvGx+HJXay0dlHkUV7xOelLvKzg57q78dHQ5L8dEUUirXSq7ALXMsmXqdKGkKekzm3Ar/L5em3atzRLHFOSN8P208a1x8lprZuGoJQtupfSdFt13kYSetdilxbe+1BmMU77pKHPcGquTaqG+pMExmzaKL2VQ337iWnnsuaKlXbdVHhCyXxRat3Ksc1kpYx5PtRqw7ZgqPs5fpT44Kp2XN+X2pw+nWn5qLctQ+3KK0uKSIkTEpa2mjsXV55MMeZ/BqqU23Qq/qRZXS0pqzYxdtPcr2OlpL1IJJW05LyHVW1+uMacQQreyaJn6hajVAzvSlNoYzjwKHmOizZ773dqxPvB3pEe2tf17CnQHJufWj6S+LzsewdeOyacpX4pqT7F/5XPpc1xGc4x2l0aKEBMsiwlaCbuOfTvJmDcdLVr6na/W25a0OwN54L6pa4zCPv6kZWxkrFzYP9fr63xzvYYvC9hKOLWk7XWZSzCoF5Qs4Ik+cHOvTwZLxr72LGk5xuo2nWsQMEbT0dU9kfIw4fx1HdsQ0sBgGikgdDnXCXeZ9p4DgzQwHGyZ019Ukvj6M1Vj3lQrvegk9/T4tLTtehpGmB9QifXsuraPXfNU+31Xp5buge8/4WYbms8+/jRg1PkJcw8GABAJ/gozABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBABAEAwAgCAYAQBAMAIAgGAAAQTAAAIJgAAAEwQAACIIBABhjjPkPtwj1Cxa1b78AAAAASUVORK5CYII=');
+  white-space: nowrap;
+  overflow: hidden;
+  display: inline-block;
+  vertical-align: top;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.header {
+  color: #FFFFFF;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .1);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .1);
+  background-size: contain;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAdUAAAA/CAIAAAA5c8XwAAAF8HpUWHRSYXcgcHJvZmlsZSB0eXBlIGV4aWYAAHjarVZZruQ4Dvz3KfoI4iZKx9FCAXODPn4H5axXrxdM1wBjI9OZskRSEUFST/z+n/P8hovM9VHzVnutBZd27Tzwo5WfV3ye7xgVvd8/Lvp80/P9BfPnNWNE8JT3r+tnXD7jPwzVrycM/cMLsr8skC///N2xjy/H/KeIhhUr36/283PObufEu7uhFTDUd1Ovi+eHGUycQEnusorb8TH89nt33K2MskjLLqtM3Is6MUk5pLQfGnQoaOO5aCFG5WDHk3mx3LEmzp2XFCHRvOmwS5ctTVgWh4joI/wVC12//fpb1OB5E6YywRhhyX+9n3+b8Cv3OasAI6IEk/lihbiuCBBGMpffmAZC6Hx4swvwj/vrer4RK2DQLswNGxxlviam0U9tyRWAlORXy6sv8p2s8VWJwrchGBJQUCqJUaXizE6kwg0EDUTOojzBAJnxRpCsIhXcNOgIvrHG6c5l43ccqQJ+TKo4uOkyQJaqQT+uDRoaJqZmVs2tWbfxVKlardbqNXNuuLi6eXX35t1Hk6bNWm3eWuttdO6ClLReu/fWex8DPoc+wwZWD8wYY/KUqdNmnT7b7HMsyGfpslWXr7b6Gpu3bN226/bddt8jKCClJzQsani06DEOtHbk6LFTj592+hlfrH1Y/dv9P7BGH9b4MpXz/Is1jLqnoWuCss5YcgbGWAmMezIAQXNyVhqpcjKXnJXOyApjBGnJzaYyHqqgUIPYDn1x95O5X+btAdb/xhv/CnNPUvd/YI6fkL/w9g+s7ayE6zL2ZmFiWgTZd2QNYH80ngoPw5oXrTL70dEBvkXfc4TDCCbbPH1jYZV2Zqd+luf42CaEKIpH1/Vw8UOg/MwN1w4uqrA2irlv3RWgv5GsXU74AfyYE7ufqLUrLdezzgTfECTi6ssFmtjwWURWlXHC0ut2pCrt4Sh1x7BuWlnSI5xyzxnX2hAcnwdVFUPQXj8GKEAUS6tnRUd8bbRW0SuitNhbEEfyKtjiIEwGd2uLTj9okNV39IFgQ2bB2nf3CozYz41KDrpL4Qx9Lz2YdQJr24aQV8cw5vTzLGhhT8Lm6qqObUI2AN6hnVNXOwASljHTzkpiSjirMY8DNA7CqpPHLPsZC1UXZd64j927RNXTO4JBQ299IKs2LAsA2FGAr9npFbNVOhJ8pvpGnDofvhSXCDoB3NBNtEmkfkwmtSgA4RT0JPiODn0gn4bGbgOdHAEZUmeF0q1HPSbibwJyGn5O3dE2YsISzESpzSVb7ATgxIgccLK5O6njU0HheZJ0vET3ROR6KtrerN8g3xDd1N5klThboJpg9TCdEAFc15Jjw58j6QOCW+A+pUZnzTO2rMaKlFEfFTxZQItwgoODgQYAXj0GbGhqHht55m7u7AOEkfaDkKHyHhtIMfTXryKQuD1QZDa2Ar9tt6pXyaGJhcvZDySP0BAzj/wfBdzSybRC8kb6Q59vqf1Jr6oAGjCQvcLbcrhhRqN/FrSvEFF6Xopi1ZBr0CYSLBqGQBdAWiF7NrogZcYZeA3oL+HpqEFUHg3J/d64RhnuBiTGq9YD8VQYcjTGeWnAru8QwCDkwpabyh2ZjlyTzJhcZ1mIIH8khE4oYCgSe1P/qAV7Dq1pGKeYCa2OLA9MOIWeGc+A16zEu05CdZ44VaHoabLhKS/0gVjAvF+ESkUab9hA0mSLwolsKkOc5UGFW47Wgio/bfXRbGyctGJAOrEXfFYUXcSGgxj2hmoG2YKOxWm4SRlN99T2oEEYchO1JvMjy35KFflFWaBi4bAFUOgg0sAuYLeDcSCzR9/oOZFpgTXPPWmGtGGpyHZTwlJj6IsI6P5hiB6YceZwys3oPc9AFUYguANLnCHvFvPk41nMuGuiDo+1jeQeNZvuX3TFPL6jTNcbZb5ly8qRpp+sNqCo831RBk6a3vYbyC7vKPncLBD19QlX73uxGShxsIT4n3cMORgFjQkahkTQ3vyNH1mLc8WtCPkfzG2w9fwBwZEfYbSme7AAAAGDaUNDUElDQyBwcm9maWxlAAB4nH2RPUjDQBzFX1PFIhUFO4g4ZKhOFkRFdNMqFKFCqBVadTC59AuaNCQpLo6Ca8HBj8Wqg4uzrg6ugiD4AeLo5KToIiX+Lym0iPHguB/v7j3u3gFCvcw0q2MM0HTbTCXiYia7Kna9IogQgBn0ycwy5iQpCd/xdY8AX+9iPMv/3J+jR81ZDAiIxLPMMG3iDeKpTdvgvE8cYUVZJT4nHjXpgsSPXFc8fuNccFngmREznZonjhCLhTZW2pgVTY14kjiqajrlCxmPVc5bnLVylTXvyV8Yzukry1ynOYQEFrEECSIUVFFCGTZitOqkWEjRftzHP+j6JXIp5CqBkWMBFWiQXT/4H/zu1spPjHtJ4TjQ+eI4H8NA1y7QqDnO97HjNE6A4DNwpbf8lTow/Ul6raVFj4DebeDiuqUpe8DlDjDwZMim7EpBmkI+D7yf0Tdlgf5boHvN6625j9MHIE1dJW+Ag0NgpEDZ6z7vDrX39u+ZZn8/QOtyk7MGguQAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfmAwgAOgyiwpJSAAAgAElEQVR42qWd2XIb27G0AaKBxkQMJCWfiBO2z40v/BR+/0exRaAxz8N/8Um5c1c1IMk/LxQkBDS611CrKisrq/mvf/2r0Wjcbrf7/f7y8tL48XO9Xl9eXl5eXu73e8N+brfb7XbjnS8vL7fbrd1u3263y+XCm2+3W7PZ5A33+52P61K8odVqcbVms6kLFkVxu92u1+t4PO50Otfr9fPzsyzL6XR6Op2qqhqNRp1Op6qqRqMxGo0ajcZyuex2u4PB4Ha7rdfrRqMxHA7v9/tisSjL8vX19Xq9tlqt9Xp9uVxGo1Gz2dxsNsfjcTwet9vtZrO52+1Wq1W32x2NRrfbraqqfr8/GAzu9/tyubzdbtPptNlsNhqNqqpeXl50w4xYo9FotVrn87nX672+vjabzfv93mw2r9crv/C8jAY3w+tckyFiHHyQ9Vn+iy/VB19eXi6XC8PIK5ojbozXG3U/vIH/1f1ranR97v9+v3PDmizuJNwVH2dwePPtdmM2+eV6vfKpVqvFLwxFo9E4n89FUfD66XQqioIXe73efr+/3++DwWC/31+v17IsN5tNr9drNpuHw+H19XWxWHQ6ncFgcD6fdfEwttzkt2/fzudzWZZ8Ozfsg6DB8Y/zCm++Xq/NZrMoimazeTweT6cTf7KKNCZa8FoJPr/8y6XCFPC7bk/fzn/xEX5nWFqtVrvd9nf6/g1Lgt13uVwOh8P9fm+3291ul+/6xZ88MvmLfvqj9a9dczweed7hcMjA+jCG0cs7xd8Tlqje1mq1ME2PdoRG3pe6lgcmjm85nU5lWYbv5Q0YrkajcblcOp1Op9PRSpAF0Cs+462///3vXEXLyFeA7kZfpu/m/b7r9J6wAWSO8/W5QlmWw+GQJxmNRiws7Ol4PL7dbtvt9na7DYfD8/nMJux2u6fT6Xw+Yyvv9/vxeOx0OhwGbGAZu/1+//Ly0ul0Go3G8Xi83+9lWWKkrtfr6XRqt9udTudyuZxOp263yza7Xq/X67Xb7TKvh8Ph5eVlMpmUZXm5XM7nc6fT6fV6Oj9Op9PhcNDuYn9ievguH65gf33ANRG+ndzS+XSEq9V+XDPoxx5v4G6xL5o4Voyb3bDi9cPG1kfO5/PlcuGRT6cTE8QXYeUvl0tYIbqlRqOBLWOmrtcrk3K73TqdTqvVwgTzO5ZUb2DlYL65MiPAc+kkxvpkO4JJkr3zpa7XZUA1XIwnjx8sb61t4qndNZFz4y+6ueF1TZbbBY2qlt8j+5KvWTsIz3/8Tn73JzyjxtC3gDwzjbx/xG9DlstvLJwBfgV/Zz4L+UV7VnPkK5/XdW/cADaddSgDzfXxJ2pPBT2vZrOQHQz/kReEzkCZA30W2x8OTG1OeX/ykprNJlux2+32er2yLBmCsiwZu9VqdTgcML6Xy2W32w2Hw6Iottstdg0viQuy8xkO7aJ2u+2nQqfTkVvnPqP+ZWr9v9i6LHFsChZcbn673Z5MJlVVHQ6HbrdblmVVVZvNZrfb4RkVRdHtdtvttrvDYR0/8sL8RY8hTqfT5XLBVNWuckyV+7n6OZ1OrA88EU0lI+brWA6dW3nfKhxOjAyjoZ8wvM1ms9PpnE4n3Nj39/f9fr/ZbKbTaavVWq1W5/OZIIMDDFu53W57vR7mdbfbMYz3+329XnPsHY9HfwpZW9lETpRWq4Vd/vj46Ha7VVXJyPqpxgLmhGAMPeDQWZUtXdhavs9lYviU9qQ2lzYt364ZdHMvT1CzzPzqU+5rP7Kbsi84g8xasBG/6AW7dftFwx2WhH54ELmNrEx/Lrn/fJyncMvjDkF4kesrcNF60B70pa6wzGdBd36/33Ej3BOSUc67TFGmf0TLxp3X+/1e+E7zFZn3dniesCcZKX2x7sn/ZKMyytzE+Xy+Xq/r9XowGGCnjsfjfr+/XC7j8bgsy/V6fTgcms1mt9vlf93J5VJFUez3e93h6XTyDcAch2NTD8gvrVaLpRlCErw5BeOn02m5XPItACa+PVqt1mg0whPfbDbcBqdLURScGSwCX4I69hklX4h5kWH0w3wrQFY05Ls92wV3IhSXhANJN8AtnU4n4Qa++VlVfF1RFPrTAY1ut3s8HufzebPZfHt7AynCjQ23x/U93uLejsdjt9vFOO73e9lcvF3e3Ol0QDw0Fx73YYJfX1/LspzP54fDAWuOr83ThbBXMY3Mh8ZK83W9XjudTpgOvV+Oua8ot+m1W9R/12HgcStDxMJ2fy0f5CG6kj+UA9zfcmN/y2oHTy6cW0VRgORkCE4L25ExXxgZ7fH71CqSwfVYQTCpBxPZDSrL8n6/7/d7H1t9FocG++M3pj3ut+qhP3PH74VHNzoY81jo9XD6+bMFdz0PHN99Pp/xT9k/WpTH45EYv9PpjEYjbgnbOhqNut3uer2+Xq/D4bDT6Ww2m/P5PBwO5fgQKgJyAfXyjUywHtudR42L20GPPoByrtcr217oG/YUo8+Msp8ZoqIoCEw2m81+v9/v98CU+OC+P9frNUF09phqQWHFvH7qyunL0ESOsrOnIJzEI0SAmvP5zJIVbsDE8QZ8fI+sM+6vNTcYDLrdbqfTmc1m9/sdmJ4ZwXDzjRyE5/NZTqg/HRgFd8tXa/sRADGP2ZHk+ofDodPp/OUvf5nNZpvNhjMjgJtaq1hzQRBh74VdE0KZAMuGgOAR5hACc18MviZDMPorPmnAT3UqhMXgBj049RmJevQTgM4ndpnTpSgKfgkOQfAbAhysV3yd146bmyYHOnwSM44cImMdh+fzGXRUF8E++F3J9AWDG6Kf78ss5F5CHOoOs+cNwlkRjuvgwPud8YbX11e+xQG72+3GFpWV32636/W6LMvBYHC5XLbbbVmWQK7b7RbjCFJ8vV7JyB0Oh8vl4veG/XX3nBFkRBSSs4f5HTsOuIy5wRKNx2McQELpZrO53W55WOJld83AssGXj8fjcrkEvgTTkBfpTtwjx0TxV5gXdxiDm+yBZwCLaxMjHlLtdjuiezakUBTGzSMp9+wcjuCc47uAmEaj0eVyqarqfD6Px2MGismaTCaM8G63G4/H3DaG2GM9BQduZGXm8HAFZPE6mL4wGcaw1Wp9fHy02+2qqjyeyzk0/RkAvufGN5hyN8RyONwdq3UzHYPWrpFX7vbUna/n+TFhF0KKQtaBTCYj9rvQRMAowg3otnXMe6JekytHxB04LBK3HXx8LfKQNAt2SRY2eAkhuRVOylarRd6IEQ5Inawia9InnbXt36gPuof0Hf/1uLX2IJVFl2EKDxmOHY0aF9S/zWZTwbhOV4dCOEl4/XA4AER0u93hcNhut5fLJaBEq9UCxZtOp9iOw+HQ6/W4cw4oHXpKr/kM8afGRXh5gKe1bx3O5uNkcsbjMYhEURQ473hnSu61f/yUZXk4HA6Hw2636/f7/X4fD3o6nWoz1GbM5JA6LqTjxFeeZ1C16D0oCZ5UdluKojgcDuv1GmCn3W73+33l2QO9gR85yALytH/4FON2OBw2mw2rYjKZdLtd0N7lctnv99l1m82mKArWADFKCLfv9/vhcMhLlEmHFyFD6V5eoBwws+PxuCiKz89P8qhuiD1nLWJPTuzou3STwYbWhuHan7UhebDgoj2EdEu2KY/MZf4K1qoyrmG9yRN8BCg/8q9/egMhvebGF5RPJ5OvyZD81GdlizjJcJXkDzHafkCGwzXkSN3yymXMBDD3Ix0s8nBT3+tTo/vx7cMrhbYu31d7lnLIEFMrSNGaCOlyHiDAZK1WazAYYOYOh4NGn/uTQ3o4HIg9j8dju92eTqdlWTabzfV6vd1uX19fu93udrtdrVaj0Qg7vtlsGo1Gr9fD1cW96nQ6BKS4tP1+XzCFr93r9Xo+n/v9vqB0gZLcId4x9+ZBpQbhcrlwbk+nU/g0YtXg6pKyA2TodDr7/f5wOJxOp36/D7OilmYQYJAchofkhiP47gXzKWyZDFnA8gjDsYakN4fDIcekkwGwsMfjUViEUOBWq8VjyjVgV+hmTqdTr9fDvILyHw6Hqqo4XNk2h8Ph/f1dCSKcDqBnbOvlcjkej0yW+xGkbYNbEU4L7I6MC9PKgpzP56fTSXlt9+B8xAKw5q5G8Pi0zDwW0WgEID7MfrhzhZI5H6OURq25f5IKU7Cii+vjAJ2P0NhHptaNV3C3NVzuwYTFzFHNjBAOZvjIQ8MQWAsXvVwuJAkC/uPLQG6WH4EB3rnbT7iHWt9U06H1wJ34kezBU4h0iz+YaH/Oh/jgMnDEpIFe5vBFOOvCFO52O6yhM2d5wk6nMx6Pd7sdniwBL17k+XwGhRgOh+Px+Hw+a9/yLbvdju2H14y50bjv93tcOTYJtpJFwFbXZODp4Jr5PetUPJ1O8/kcP50xxdrqWa7XK8Q4MF8CaiG/zWYTm8tjbjabw+HQ7/cxLrVbyG1c7TbTatPK8MBNI1yLbIglcr1eV6vVbreDbDcYDKCRaA9wqmEWMWQMqUdhcgfc5MmKQTjlEXh2LCko/36/X6/Xr6+vQD2cXoDCu93ucrlwBpOGhW4opDjAsu7zBnJS4GPAn+l0Ol++fGGBOfoZeKCix4hNCGoZjs8A+fnNhHyDE5DFXNZh5lu03+/vdjvZsmwmPOip5ZxlcKAsS87RwWBAdOKIStj7P8V/nTxQ++YMIwhzc5KDog1PPgcAU+kKdq5nj1ilwaoGQ8QI4zvXcgcc51ECySc3wM1yPf1scJ81j1jYmEU+0wJ7N7OR/aCuDYf9PHdMWhktrUKnxJZlicOoz7IzcWnBXmez2cvLy3Q6FbG31Wr1+32CUBLlYlwDPry+vipFAwlf4K/sNbvxcrm4E1QUBd4Z9gJ3iaAbszifz/U4SuthLzgAwTfX63Wr1QJ7gWoOHLHf71erFXcojlqOB/MRms2x9pvD/MEFC6wpvhF6yfF4BAyR5SWYYJcCPTGwypUFDy7UpDhPAEwW3wqGWVEU4/EYyAhHWDUvsB2IJXFUoWPjCI9GI/hkOcMTeJMZE681EGARk8mk1+vJ/Q/v93yOny4CcEP62wnRgdUUmEWYHiGbwX3hv9br9aOHwp/w/IEndmrhfo94CP5qva7nFIj/4g1uRuTueAERD+tom8MsIUqQXXMDJT8ybJyQLXCUQ7MjQCOXz4QcDCUY4i8G5FbD6z6Z88Tzni2eMAf9CYWGBG5vPvxDsRY7FlYDv7TbbdY9dhBDoHMPIy72fqvVmk6n5N/+85//vLy8fPnyhe+CjQQFAitJBk/bAOsMbIL/LhS71Wodj8fj8Qi4fLvdoF6Iw6QkifYboC2U1c1m0+/3mQ8mYLlcwkvlanycYPlwOGy3W3jBwJ2E4YIjLpcL1CjNlqNUIQ4KE+R8RoI4JZ2ClXTQCloI9AzAE5BrPgLyzqLkibSk3BJx6sjyBghYHGrxVZj90WikFbzZbKAevr6+8hSLxYIpUyp1Op3iCHMGYHxVhlQbX4eVqRVb6wxyMOMI9/v95XJ5Op2CT5fNfUD9shny/a+Sjdo6C25b0I2bbCWsMl9FWVOPPh2qzk6VzoPAnXgCNfxiVdujvJ9Tbv0E8poFd6IdV2n++SfQfrPl8fIC5Z8CRJsxJbdvwdo62uDW1osVhQ1oLygA9XxjPoP/oNnUlkv64q6lqmjp+BdoZF9eXsBilIdxvFWmFkQPTIA4C0cMc1yWJQXH+LmLxeLl5eX9/V3jNZ/P4Utgr3e73evrKwkcpWtwsrAOYMryVna7XavVwl7jXkFKxaqeTqfxeKy4BieXP3Hl8NfghxLHHY/H1WqFc8FhI8SjLMvz+bxer5fLZbvdJsbH2e/3+4vFYjabDQYDKBzH4xHuIUtK4IlPkC+IUKDh2Jm29B/1NkUB0rder5vN5nQ65TDgRVgfeMdlWfLVHucyUCpy05YGDcAXc0q1vJu3tzdn15zPZyovXl9fCV/gsWBweRzKLhTp9/t98TRqE4khke0u4RN/TWf57Xbr9/tQzlerlVwqjz09V+NIgnxhz3H7+AdcLoTVmqNHzK1gfdwNyiSHHCoFPiyfIox7NJi/nnN7dAKFg8qTzJ48zPSSMIy1fl527XPuyo89PTtLWqhxiBueZ1B1eNQiXdyzIhL3rx0o8+/9g3+m6a/ljnjmJzMlg+2GLuaYOjgpVpXhEEWB1zG7bGDAPlxR7DUJK2qUtVtms1mr1VLZOO6n3oA7fL/fqXPHgVKSFDN6PB5lnVXPpv8FelbC/Xa7rVYrbP31egXS3W63ehy8Wgw3tkzernhmb29veMHz+VzWlsB/tVqx53H3mGmByyE1WnuAy9UCMQg1vkArXHO32+33+3a7jSvK8QaXmXIJzgzGX+aSH9xPocBefOEJN6eQy6kXdAMVhMhGYDoVjzw+GVepeRAkcQUP/TJE4AG4kmA6vYKxyLoZirfKsvz8/AxYpBI+XrCjFLxCJZkDWclQY0kWxEHD7JIrFnE4UriZG/RQYiAvO+Sy3Mq4TfxdqkNIfj5P0AXT6ZhkWLqCmGSOQugWUnw5kxlKJIJb6VBnePPzIpHwCrOPUxi42IGmImI7waiHGgIJX15eilpjH8qZc+m0Q7oaMsi5KgALyVbiSnlzWrJOy1X9MRWoeJfAhTwD+MBisQC2w1aCkSF/g6HByuCW8nUsetxS7hBbw3BITgVrzmcBLnD3+H273XIwgOrCvsIW8zuPwAmx2+222+1+vwf5ZRyoqd3v99vtFu8P2z2ZTPD4Go2G+LCu7RKgq9ogMagdebTFo3FLjUYDJgnblYQYpxfLiIQPXwdKg9klXCCgUbzsxGpuO1CyOp0OxDvfw9yALNpyuaQKGbsDOE4RjWJYXbDWUcjYl84AXtGfvhk8Wvf8da/X+9///d/5fK5jSaGxY1NsLa06Fp5vcu00bRNSkZzcoRbU7ZE717KtWV+CRaWyGl0hZxFdbcNPxOCd/dQQ/xYErPMmlAW53feAXZIsod7EhzHEIk4ICTFKGFj5p4FHlNN0ud7PT3EVQLk0UsiEBWKCVoUeXGnzolbDwk+wnBTK8cLLywu8BXYO/qPsqSJTVTBHELooEBsDCybkB+bDYInEdj6fF4tFo9F4e3sDR16tVipW1uGPfzccDlVFCk0CbxSryp8cUFR2sPkxuADWbC0hDP1+n6/Dv+aWgKFxGLHC3AO+Nr45xa+aGFJwx+OR1NNwOIQYC4JRVRXsVC/wzwThWt+E5QUezT3rqMPF7vf7oDS4vavV6na7vb6+9no94YlUDFdVhX+H2QW0dfI5I8l0u+KE+y+3220ymUgNg497Eo8jAWSJtUux8ng8xhN/lGx8UiDrLEPflo4FBzZeKOfn8Pv69etms5nNZlqZgfwuMydA1lmVBEac9PoulkrgtwiUdz2KACN4/K5lGbw2lx4UPTaQfIOiRSDDPpEleUQozrW8wWF079XjbPfHwxR49JAhYD9damUlnCPoSTwvPnamil/ZRXlc8yhUMDrTvN1uS4smDKZPqOAsvBP+LJ6UKuoXHQ7uOTudEMtIBN1ut8kmSVeQS8EkU4VFyAv1ej3CUiy1KjV0fbY6GWqZJ4zgaDTq9/tctigKSEvAiNztdrul5lWY7OVyobiAu8IXxpgCBCt2o6pCmACbjbqJxWKBK304HOA8SANBK2AwGBRFsVgsvn37hqllkYFXdLtdKBCTyYQQWylvCM5sM60quXK5RkMLBYspyjPOESJB4/GY+8E9h3jEV3PZy+UCMY4SDMhzQA1ai4yeY8GMiZgkoSoUy6uQTd4KaUmAXe6WRcKZBNr7nE2VS4fdLHq46o6k6NtO7QyUSoaRZfn169f1eo3/7lSHQOTUNLnnJQE8D1wAtYJOW/BAA8KoCwp+0VlYaxBzeO4ZUS9syVUYtdyPX/F5MzldcadPvavXet7MT6PMt3tk9LOn6CK3fqaG5GeGMkKiLMvdBD6Gwzg610Ppo1twlxbhRG+1WsUTZaPMifGzXUEc7CLMLsuCfUgg7yo24Xx22+F6KBJGUoQFnApPAG8RzxclX0BerAAVXJPJBNuKOT4ej1gZED3sjuQoMbjK41EcQZEbd07JkFL80I0VW4GNrFarxWJBtRucAUn2tNvt9/d39rCoDuJpF0VRVdVsNsOjHwwGjUZjs9ksFguyi5L7CVnaUO0WEDdEMnl9tVptt9vJZIIPLlYfWpryB3FFeUAyn5yFir6JS/B2uQ1CHIyvc9p9NXvanewrz3673Xq9HmET93C5XHhqdO+e54XytglVp76LGqY47LT8sCsyOozCzvv7e1EUhD6ysI5FZHOAE00g6GWvfmC4krLngtzpy1Of1XZCui+LwWYtxNr/0gYPOkHPU3DO/cqCErlQO9sTMUBUAetOcS7UfnRvXlrlt1SrzuEesZfVOJoqSo/fqkcV8ueCca9VHw3jTKxc5HKacOQ6zz+r5zFw4u2ztYhJg3OEKRHRz209+1wuEiYbPi/GFy9Jux0v6Xq9vr29iW6FqV2v16SVML6wDobDIdrBPDaZN8wx6TLhzhzX+IyQVWGq7XY7F7FFi13KO1CSiU8PhwMaadTv8i3X65VE/2KxIPmmzH6r1Xp/f5/P5/P5nNpcrCSUNVAUrGTAAQUg8lyhRpYD9nA4zGYzuBxwvBgi3F5RrcnIoaJJbOEuNiOm6hs4GwyF29zsSsiOYO4dOSVcUHKJWd5sNhLCfxQX58qgLM7i5BxZBz2RTIwCVS9jyVsaw0dR5Xq9hsWoWNJla9w7eeSte/Y8a7SH0uRscJ0G6kG9nwc+Ao+wcgn4KVvrgMyT6P6nZdaPdIfd5Q9V8u4dYx8kwPSoACTfnogltYVqgcfl/qnmLhTQqzjLFU6coeGetSc5czWKe5wK07/zHxoPxJW9ts9zuD6+4HrYRPABsuTIkEu3RblyBVBObhV7Tl7DZrPx1VaWpYgE6liB/oMLrKxWq/1+DxAsIiSkhcFgQGoV3BYyrywsKDMVVqTLcKiHwyF3hUFUfsyTGPf7fT6fE6gCVcNU22w2uOfdbhcqHoNJLw98YbHlXl5exuPxYrGgxweFYfArkFuTlkKWZXIXI6gAg2ufTqfpdNrv9/lztVqVZYnxVabUq71duAOyHUOnUaLU+5HBFfeAlcDoyUfWGRYKI1X3PBgMQj3CE8GKzDcKUbML/fnmF7tG+kcKxr06wPN+hAW9Xo8DzDVOnZEmZ8p1I2sfJ6TIsgvsZd86ERUX5joRkVV054+yBf5F7vizizP8+FMi2pOEhKf7VMfvtZqhwsVtnGRbfiX08VrwJ5oYAXwIsHuQCQ5hpdfdBfjCFT4Dqp4T43+ST8pSePyCu6qEQ8D+0TAjZgc0ZL/xflJb3p1FuwV/U3Rlvh0/ES9J/hFGB0uq0gyEAiiXcklmyXhjkbGS8Enf39+FTkC0ovkQ9oVvVwCOo63iK7oWgU7CYCN/BeCAeWW4uTHGjdvA9V4sFr1ejyoP5hjKF0bncDigK4+42na7rapqv99PJhOVe+x2u+VyqSq+HEhmGQHpOaAuhlHD6OPhStdc1BHhAFwKqJ2ivuFwqMr64LCIQcjO0ZzKneRT3W43M5YIPlCS6/V6ZAvz2v3dne+RnG8k4Qm8B6qZEu6yRFpRtVgqmAllICBOfjp60YFvYw8RHNj1QzQ8tTNkQ1WbbtJtejbZjxJororp1GOPnEJfm//iJ4hCBBUkBfUBx3eRB8+mZs83VDZrvpwlUitVEWIXHcmBgpZzdH5NsV9CKeNzNl4QdP8j/5bJv3hGOsw9jgC1hHQFUkl2i49jSeFUKaOCpZOoowpddNAJi5SkpAaR+JqMkDoAqXtVq9Xabrfb7RZ2rbj6EH53ux3Jd04FKr5wVBVWUwcBEIwogUrgEH8g8Y21ggIBHIzPSPWdaM7gp3Qtw6xDCl4ul3wvt4Ek42q1Wq/XONqQsYC21+v1bDYD1wZc5gEhw7opEbHMKSUAJvBJKPPlgERMDngB6WFoZ/insrwSj5ebHBwEV4TwvmTgNqwZZ0rIXmilyvKiT0/HqdwG4hHJ9/m2DzshN6cQARHsyPM/gWfimU+3fYhqAruRb1Cw7D2WAogXJOjc8cyKmsFgBSPucnRZZzZ8V27i56tFe80DhdCs4HfrMrKGkYf/QZQuSMTJx5Ry4a8AIBl9elQvGkBzP8CYX+X8g+nTqabyinyq5UPL/f2Qcmio/1BARoLmVsjCAVDiQIFRisDgYSa1bZhd9qp7bSrw1yuSWfG1Dj4gAXVg08aPpo2NRmO5XFLkhjiDoPHdbrfZbNSrjXFZLpfH4/Hr169iU5ANYwQw7qS/4I1xz0C9cnC22y1IKBwGTTYCb+DOFFmMRiPuarvdLhYLwA1QYAIIqZ9UVdXr9QBV+Xe5XFZV9fb2xmg7f05ADZsK8haayOzkw+EAEYUbIGiAYIfjr8pjYHGtEli6nMxIInh6miGS5SXK4bgN9i4k9KkM5PSSj8k9q6tQ0G984tj+NCOkOKN2c8qXgZvoIgOe9QrMMO/5JnEMUKPRaNTr9cCFJQmUM1EYQSWWg8HNKh+PRMgkXhMMihL9gZ5USyF1H1MNYmoLEH6rNCM7sy4/ndWBaysYdedBQ7HxoJmb07qD3xpq57wu0W1Rtn6uQyvvAa8CNqFeCQlwQVtPlJEDZFxkVqli2NwoYTgcEp5T4ICHCDgrEjhuEZG+/AI8O7jiVCcHOh7opPRAVZ0MFoG0ucYXWiUlUmgXUGLHxcnvCwgWKQ0FSwmXAPWK9nA8HpF3kQAx90kqAH4fziz0CfBivGBBFio+xuaqUg6rShdnZMY4FVRisNvtxEKjXyRXACuYTCaLxWK5XEKSDZxWbTCoHRhf1fWCRJPXYqBATgBSZJiWyyUaC1RGMCPCHOHYwR7hedVRKXc5yRQcN3/Olwj80NqKEi+R+vXI11XVfS+5tG6ON715kuMJteW2xG3NZhP0hkOOV9xpdZm8ziQAACAASURBVLRByX2XOss3X1uTlqtI3OXXMRZaJQX/KSuH/GEIfmSEfpr5/JUQxLspevPD55XEqhR1MNdrebIsTma81WqePKnGDt6DDm/Nu+I/R6u8xF9uijpiBFzY10zYF62///3vnpB1Gp37MsS/qilYr9eIw/OippnoFVou/hESi0TcUnfEisEkVe0ZHqLjyASnKpoQGQWOKriqgBgOgOVySW/HXq+nLCpVG+qyDM8JKEPWpyiK0WgEAM1X9Pt94ncOA7xFHoEKXUoYeBCvL8JSl2W53W6pQgbkJcxfrVbYaGycGpeBzBAECPklLACWoQk096PloowZQA2ZycFgQDHb4XCgSTt2HNQSRd3JZKLzr6oqZNhkfBlPgAsUlvHNGQF1Pve0CXQr/gWf4QxWcpIiDhfgFx6Vk3K/u/9dPStIB7iebEjg5DbPoQl0Tu6Fahd9EetcypauP1crgeblBlkI/Bfld11RIbDZXO7HQZVgXgVVq6ZLWbjfnYvQZixjEbXZuZyWdOKtcj+1ScuQt1Sn3UA9DOhTYE2EbEqoZHHSkR+cqoYPGH2g2OblF1osf+8/7zMnY69Ti4ZsuJNsSAwHTpacQVwAKh0GgwGunxxMOLxEvscfPxIWUKkbv4hOoFwBCWtQSzzHfr/vCx044ng8UnlBop+AfTabUTTBXFZVRQUd257kIS14GVxeAYsgjcbxw/CBxuJ3k6WUe+hMcipNGTESWXL8gYllxfB5MbigtDwvFlPvbLfb2+2WgCA0GVTNG3UlKsUGPPn4+ACzJsOJLywLMpvN6IyJZVcSf7PZACITqgN2u3NBgIKd5c4vP360TAEE3KMBi5BEMsTELCf4u55X8KBre7Lk7FNg9Th6oHEIXnxw8LVLCWgGgwHrVhlj98RzlzwW/C9a3vBcvlUDzC2xeb//rAStecxtw7JLriYJP52aLPmoUyfo0GevVkeCaOmZFygTnzNjAVgPusZBhyEkSB298cPATwsoPa0fP4+IEJkapBEIldNFrhPHSYGqha9EYQUbGHd1OByCD/I8CAk2Gg1wTOi07E9MpCBglHAllct5K1121z/28E0UC6QDsBRABAwQqXx0tsqyXK1WGEeYwtgOnAK6ftH8nINhu91SbAaCgTUZDocSCWM1fH5+4pZimhlQ6GUYSiw1Di9eJLxRXrzf76Clk8nk5eUFR5V2SgCC0N2AC8bjcaPRINqYz+fAAgz4brdzOpoWCsEvPj5TuVqt6PcO7MAxQG2FwLXFYsFZ4sRyvVkQrfpdetkbdtb5KqrI8vATDITJ0iwzO6RqQ/vC/87+1gbsEgwM/cCD2fUOiaHHTKAiKGIIXQj0pCxRVoXGCtxcMZMke/w8CEnOR0+XPcpQROCxbO1pVOtBi/PgB0bWSn7uBdfK/OdinIwFZ0qDN4rPh1A4OJ347DTe7IrWVt6KWyYV3Jy29eWkgsZQhpoNqRO0c+Tx3QD+7W9/y4Wb5L5OpxORLNgl3hCYAxaQBUdzIDa2bCsGEViTIiKcYhxbnaV4eTpqtEVVMgcRinQH6LMcczcWtL9EuYYoHu8YmTRM3v1+R+eFbsosd4rWXl9fMTHH43GxWOipCZDxaLTBJJ/GTWJKOHJU4w9GDCqH9QSL4Do4vMQEEAzYt36uqCZYzSWBdKjSBtt1wgMNfcUlwOTJapMSxPpLiAQBT4yvBL85SiUDxoy/vr6SbgX0ZzoAgoUvEQoQMLrxVTxOMKT3i5vojTUflbQ9YoDWwpq5fsEdW/WsVW7aBVQfNSQPPXdDm3oviFCpp0jT6iorwVLBuOx51+cN8Xv2FoOyZajKUQYlu3u1eIIbiEDMym+rnYhg4ELHs1wV/VM0I6uRydJ5UUZtw1PXd/cXvajPa3a8WUyogchiaaGPRICtassucv+KQDpu/fWvf3WHWVra0KRoVEyLGtYrgb/YuBjl6XSKjyx0FWYV+xNFSoIyvhjSqJiYUiQQTAHhTGLb2BFZZx3Ry+VyvV5zV/JweTw8X6BPycvCt4WSRTiPzhbnAWeMWF+cIqS/MBwAvmwnRd8q2hHxGRyc4FpymmVZUuKlvnAADjRFVwd4XOnj8ciL0r2V2wuSALNNeozk3AB5dfgxfbRxJSDA+DLdAOJU+jIFoMMA6+hAigOPcjHfy2wK7vRAzCuFVGqskjlP0mYtzdxg+BfRhrCfQ/fvWoSRgwRScyB1PWLLN+q6eOlTgTPrJApMIXEJrDW45+rn5NY27Hn3jjO7wJ16/6Bbn9wqIY9kUCP7/yf85tD7iZJD7fHpTOTGj2ZUQefaT0qPV9zU5jPMOdq1nVwcn3ViQ+PPjTkcJfclkSUggjBpKM4uXJgDcABAFgCXa2G5VAuLR4Mv2e122Yq8CAe22WziY6puR8kWFxBQRhibTqkVd4zsi7dxVG4Xt3S5XKowlI3EoGMvAJq73e5kMmFusCwI0PCk0LB4Iu5tvV5T2cGV1dZePdVpek/8jhEXmilaMbgBtb8cQmruMJ1OKXIDqKFSo6qq1Wr18fHBmVEUxWAwEMwNkNfr9dQbETVOBDeYbJAHOfUoCnEdCWK0Wi2sMzaxqiquo72Nv3y9XgUfN3604IaURsWwd8/TtHJNtaD3fgRaCRrDXGkZBAQa/+1P3niN1D1EKZ0gaR3K63kud3UfiY4HypqnvELRLeNJyhe0irSBK10IcQ5aOZ69UbwcqsU8IxoQz5+S9n5a7VarsFPb/tFlhdlooYDgSe4utIzzNp1BkChIGgVVGY94/Bm1/KRX55/VbWuJeuVeeIqgAelvA6GVz+7FNZ5r/VP9Bb4bIgk02pKiGD6aGL6wkZbLJZqBOFw4OxgCHEylCLG2woL9+JIbz34gyHVJWaE5IkXDkVA3e04Ibz2ABw2xVwYRfwc3loOEAjaJ3uKZQnoFlWZvANSCIUgZVj09lTrj+vwv4T8MLVqKYdQgbL2/vy8WCyQ0iUwnkwlqO2DQgAzX6xVgBOuP14n1xyfFw/34+AB7Ic5lAVG3htWDEYH6hGgkVVXBmmIuACjxbUmoahmB/BRFAZParY94DjpKRdvgST2DTN9S5ojYIrfzyd7Tb1GdnE4UEikeIbLwhD55lxqdr4PBQDRb72rjlsL3ZIA4c9Ma6IwgMMymtOWkc+KNRYLB9SSYtr0KOMPedi8PpMvLtBp1Pdi9W/AT++h5y1D0FXrL+9u8IeFznbZgoJWzVUGjM8By6WBoEBEw7lB1IsgrpxxDfFMb/Xie0O+50+kg1CU+X6jB8aH47k4p4dbv99lykK5YrGxvKXZLIRC5AMwBniO1ZLwogUGn6yMHAQgo0qJGzZOwfoKpsxmsCSZGhRiuLEfyippgqA7KDW42G7BpHU1oWb2/vwsPwYFV407cT/WjFGAiQQbwAYEJuJmo7nIqAFwAvFLgx2Z4e3tD5JeRZ0z+/e9/Xy6Xr1+/MhTQ9cB5eZDBYFBV1Xa7ZdPSRxn8hHQoEww6zMmERBwq7yQMCWVIuKnMBAQJv17MMAYNTh7QtlYnRynOMhwY4BedSSGoVDs1sm2qLApRtkxnrlvNrnEQc9BRXcswDSCpt9/2drzqZ6ydmZu8ZdXKwL3PpeG5pNUVHoRZSXdY2lVyHt2/lh/NvAfEI8MOPp45B5WFd5+EINmBFdwXdFADsTrY6ECrCLfnWURQUIXmtQTnLB8auIOhHK5WZ90pvV5Y6GiMGk15tbp7spzfas+cv53t7y58o9Fo/eMf/6As6nw+z+dz2A5ElN4uQT2G1SYH13W328mfIuDFXMJFY9dx1HMRcafEF1ba3eFq3Cu8XaWzAIKBpFmFqsvCA+U2JCaL/g5KNxggzCLOox4BmgfBOAMtZUuhKPBYVWchb0W3wWNSqKZWRryIfQdbIPCBawGGwCskErFo6gzPK0JXqCeUpL1IFACLLCPQcCaUvOhwOCSwoLL5fD57Dz0QEoBg7gQeG9VxwjRk3DmPCREIkqA9yGXDKcahxpQURQFCFRrHuh5TcL6ec4HVY0kVZYFflXMyoZxJoJY2MOMDSK04tLa2yvM27nNl6WH3ffzsCUeIhJx4mwYqMMYkr+Eq7x4jK+fpZig0/Qy+WODk5ZPjp5h7UEESY8StfEAG8gWzgLqIK2reQ/ytGlef4izm5RnOIP7Jm9X4xmGfJ/oqoaWmP7uTrxt/7vfqZdy5Zdx3Nx/DdL/fUavRUUy+BV6UEm7iD+DDUn8Mq4G4G7MCRAAC4AkHsmqgEI0fTQ8bjQaSDkTKjifgUrmmsJaUrqaibNJoeDTSg6dADh4uux1WBgE1/iyUYe6EMgeUGKnlpYCYPg5wKiStCQi+3+8hnOH+S1gH8wRtg5zYYrGAdAwjYjabrddrBhwAHad4PB7jTpZlCbiM3e/3+7DTSI4x/UIeKPxDj5g4CHIF6TvKizlU5CiJmEzhn+TcrtfreDwGgOJOsLz43eoqAk6Cp6b4wLvPqlEx9tqLvhTyU5unHlePlKuyUIDiEjfiQQcnHPZK6aiRVaA0cTV3xIK0SvYlvTjKa7WzD54JBsEeSVwCLI5xdv0Eyd4DU8jJCqXMPoxeyhUOFVf8Co7hIwjIzWXueRFoYa7vk7GU3NgtYOXsd/Bxz7o7lzwozDmkG/oShObfj7zjsMZc01J+EuCk55xFdwnahAGnhjUUFsb3xCKpfBBSmEa8G9iBDYw7Q3wNnQClcx0moKhoRJCXAxYQnwGWFV4nPqP65uL6scJAKtjVaqKjgAXrJhcAn8XjL1Ubg2gT1vF+aVRS4wBtC40ecQDW6zUflKPHv8ApNK1Q8g3vm5YN6D9gy+ihC8hLRk7C52q7OR6PUUbH0uHdw3OA+AUQCQ4AVA3lA86GmuMJQtnv9wAazAVX0AaoqgqgCZIjQhZsdRlfyqMlI8frlCZTiyhuGcAFzgjXF6nDXR6SisKgea6AwblmVRbQecJ/CCn7gAx63ZQzmRRpumiW6/wJ3nUD52VmHswG5ys3SPW65+A4Z/l8eVWsRoliqy+ULKb4QiRdMnGt8eeGoa4yE/p3aAOGMrNHCgbCOgUbBrwoVH7nXkqhFDDL3uIuqFUPS0W13bqOZs0lOzJY7/0pRIj0UoPa6bvbTyN1v/ZzKNDLnKwWiNihRuN7/QVwJ1sXW+xlozw/8mNKeeH5Ynwx/5hFMY0YBbLn0jhXpXKmTMoHFPoORKtktHTUBI+ywVQGqjlYLBacJa5gT+WFJNsBSYBrwWVw0jGaw+EQUwKywa1SQ4HqFcQyhoKCWh6T3COg7Xa7pVyFIwQzB6eC3/kKyAncKsgPapPSbieewLVXlyY8XDxTMGiEkODV8hEmlCFCKZHJgsEmyV0evNlsLhYL+jZxBouRBjjDEeJtTXBSEHXzVeWcAVWpCM30fJFo2qETbRavqdVqCSolXrf5KI/kuGEQVg2tHBxb9NYy/qRe4RoUmRt/7gDmkTJJCKCnIH8RhMm9dFVSc4ow3t7ekOVjOlRBoBZfEt323GOu4uMXipWIgGvVi3KRmycnaxU7Xf8sd6AIGsFBPtRV7d0Iesmfw6yuJFdbeJYhI68Fd0fV1Sf0Zmy9/IPstoch1bRSVwVen2H01j/+8Q8sHUYBNw2+EZ0IuC1HHtCRQZ8QQ8b2Vl0cCCkkKuhTvC7pJnfOa5v3Bd0cuBM4bqL6BheGay6Xy9PphJFVMwtMLUtWee3ZbIZPp6KXxWKBrcFNg0OGPyiuK5g1UKyaUQOzsBkIe4W6YLV5BZeBsw0HHFsJjU+gNuAy1h+015FiHme328HSw/4CH+G2U3zBhLKX+PPj44Nbgi98uVyg8TK/QN7S9sQBkYglxlf13wqQpZDtBQWAEgyRZIxEn6iVlfF1nAlqwaF70nwhy6nkIq4AEYS8uRxqVakFl8f7VgSxCEWjAXINBDXvSBTYCIE75bhHyFIKNcYlUmWTCvdVZaO8Yq6/CgIvqs3z7pOP3GG1mg3Cco9qXgLPzBs7BK/Q4V22gyZLpeqhyiakH90JVZYoFG07aczRJJ9N7zPkqh0uM1CLGntOSyBS7dJt/d///Z88WbWfIBuue+KMZY5xMBGvIVCCTUVQj43A9YOLBoIRRD0IkEnUQPphb0sXgv/FxqG9gF/JTXqspKwRfTEo3BJogPVZr9eDwWA8HotNQfWB2F1QBSDeqa5a3eNZmlKoIOSH4CECFpALBwanF2Hd/X4HCpDBJXIEUuAO0WbkwGAogJjJ+GFP5UVibaUeqVoPsBrocXCfQY2pGtehgqnF4kvRgqxa4L2gE8SLhDLL5RLtUJ1/TnIgTUq9InPHzuFoYbs+Ygh4sW8I5dwFCy1hQpgfCo1qY9tQI+vSKlntupbxFgxZ4DwxxX6F3FLIGZahAbMMt/8SigscCXGFNpkbsr5SAtDw6uzJNc15zOUN1MYfmZMX3DqP33PLjxzFe9t2d/zVUSLIQgZ5s9DdJ1SZ56ys13fkPF44HQOLXIeT+lq5PWX2vSOczo/aBVk48gDnATdWdVbYJngREJhQFeANVVVB6gTMpXm4CpcxVdgIPCN1z1VthehNHgtAU/PTKYymHAG2PYAODp3IbYC5ZJN4QOzIYrFA20yN8ObzORI8lJ9gBAFeOSGgLmB8gXpx7qBSIOdIorIoivl8PpvNOHjIouz3e2n7DgYDRCBBwIGS+QrmEp4cbgu+OcUpUsslAlKaWBVWYLtEOkoWQ3NGmJiKO2Bf0HnwBM4nhk7Ifq/Xk1g7uDkV5F5/qAYWPqGgTDwdJ9C3b9+azSa6SHIQxKrOThZwtoAR2QU6B5OfDNnkwIJ4JOHoNKPg6bhpUOLF9dezs+Pgg5a6EzkCxTXoS+T8Va3gr/a8mroGhiynLJB3MF4wTwjLGEB8mtyXvraHXq1EQ07l5xS/XmHhhdDe8Qrn8Lqigp8oToTw1ZK78Dn25WisF7YFjN7zeLlqrlZrzRkjIeEZYPQMLgVvoKDEiwthy8iTqIUawjpKWKGiC8cNOa63tzfeiWQthbDexQc/UckWDCub0911McBysyZJFPoqwSv3fr16A9ZTTRwEIeHoEa9pj8HigugqJin6k5hjb9lASgRvl3oNboNkFGjy29vbbDZD01JlZjTT5Kn7/T7ONVtoOBxyVHz9+pUb6Pf78DQgJ2Cywd8J7dlL6tIkcR/K2MCvVYuBm8zD8lkpEgA3o4jGe0D26UEHpFhV1fl8BtKBT6a6OI4HHH8XYpccJdUuuNUZ1XV41FtpeDcdd4tYVELiHFUgMvCkf45GvV4gZKW8tNTNt2MFmTzkBivstEcG1ztQiGtcG8nmaq6M4dZq6ebO04wMXgWbURRjh0RdTZF1Ao3yic5kLUz/KJ5QS0mhCg41hAo691JdHcHzYAGDDurJfp/yWIPRDEm2APeHepM8zp7e9DMmlzUHmvYf/i/bhqk6HA54eXIhZZEpploul6iugCHu93sIVTK+ovGrCRAYIkgrT6VJ9YUeFmjOOQJZkKvRghZxVR8numeaKXngaUklwVwWowMs5Xa7oWuuQZEqGH6lMs5MNpG4PES+BZ+ROgsKQObz+XK55H8nk0lVVaTaAE8l6SCCBNeEDghmT/oOf3wwGIBsYH263a6HFBISw7cl5AcKgE9Kfob6FEIT3Fi6kSK3BiNNxhdUgekj3MHaglCBsby+vsrsquMJvq16lMAUhqCmuNury2q79YTGM55f9e4DKlH1pE2g+ut1By6C4oFHuI7Z+VbMmnO5ippNJFdARQ1+BjzSAq9VCg8UsdzDAudAqzSXFHvLJQIjcp64FDqTHJMlkJWcvN7gEjG+N72Qweshg4ays5KdiRgG1s88ZVlVv+5d+4RWu61QslEDJbUvlW+EEm1nB2vKnEH8RFAiVKjnaX2kPPe9ZFRyxSADZPNZr8KCsRE4U5gqWFBQTXFyEXyBXsokIbmAvQYPlWcEn0HpS8hV1x8/DgO5vADcMnUYk8qqIEtBY/CR1cQBzAFXHQRWsTntgTldmEssMvW+TmbSpgKoBW4GtVB7i91uRxt54JrFYkEjIiTWPj8/gWIxwbi0ACPgLcj9kAEjRHABNkpaAMRHoxEGXf0CWItqYYeno07PzCYwCKGMsnBSRAO150iDdsb0fXx8aOXhHVP9KP1ilDQArKEtq8zEmZu5X4tMTIhsaimZavwjh861Bdw25RZwAavJmTqHUwM7orZ3Q7hD76/s7rActMAp9jSUKBCCO0KxbKZnOTrh9YR+V4rK1enZIRclRTm8lfGWuAfUFEnOuosjR1IdUnJxoI+Agy3u27pB9zRA1nbQQIU2d8FLC468q3EGTedMJHdHMCurZUKkbItD/0ESuhYKD+drIaYkbFalC8EB4QMgOEAxVbfblZwCtgN5LaXsSOItFgucQVLn2Gh10pQslgaF89ZRFT25VA1xtXIhNgCr2hDotJSkGSE5WSPZKUipJKYkQIyP/Pb2Rt2waqAFm2CIkfLq9/ur1erz8xMdDP53Pp9XVfX+/g6zArYATuhoNJLFpHKXEYYbAOZA0QTAmVx+cAbYDiiiMRrgP8jxYP6kk02ACReQo0VYhGfGSWkieqkun1AvSAygTom+PkiUmiWrFpmTD8dKZTI+laEdr7uoQJYs5dp+E0FWNfyvQjcnYNQmOrwW9onWT23Vf9bVDsGZ05kpeFGVXe4KEbAXb/3JODMvIfmjEoBAAgki66GVr55XBlTHjMiz8OGcWaUzg7x3VVUsY3fi3JcMKHAAWJ3t64SE0IbZk405Pg5iu4He6xZc/BBnHzs7LRRfBEYE/zL+cDSz8WV+8fBUGO2sj0eCn9kEf6+IRQSElg28FYOrJg5UatELkvyV1pkS5SxBwt5Go/HlyxeFRZRgcNNoUboENTdAnt2pJErpeL2/T6oQCewXuSyFyRSP0dwBzIHTHmYVAAWeL1YAmRjKc0mysUYhJMCyxH/EvybRPJ/P5/M5ihO01Vgul4vF4uPjQ44kF2T0GEl6JGtgSbtRQo7ypzT3FDehjiQShbKXgonEKiUKxovHEOBrw85WgyUCBZFeZFuZ4sFggJ4ynrJwc9VfMPjX65W8HEafgmZpVPMgVVUBlwd+aGAFBTzRa/Nlsr3fc+hVntWvPbQP1j9whvyzIaMdulc4cBHaP+tB3MY9aXfmeXZurCgKTmj1gQ0teAPyKC/Sfeec/Vd5XiZyBHmzQLcgZ4tMCgTzINkhlp6rfAWnMkhP6GwOZSm5fCM0JZIuLmWNXguXEXM1xAsCza7NpBM0lAKSlA4lPC45BEHew5EwEcHBfyIg1frnP/9JLguhFqytJGWpiBM5tN1uq0bWfWQoX6J2oZgl6QPACopuRUoNkqbKyKnaWKVKQc9YOT2gRpVCsEQYenBnOAMqxOCCtESTphevozeGpfYMj4ysZOPVQcdziTCuJIbb6XRwFcElOHhU1C+2mVo18xVsJ7Ii+KQir4jOCdlA/S8cbeAcgnOCBCUhJGOLgcbZ5zrIYoB1gAuD0dMUAxof+QBwiel0Kj1SXuFQIW9J308QQ1akko0cSwKLHlEmH4nD1lqrEC2GfukeV4ZrOjk36KjVdkgLzX6CIyOtItVPO+wYiGVeCODE0oAP4qAQkGXmlre3cLTXCWpPxtbjAF1B0bpX6DqFmeBGjftY4aj3CWLSofuoxecT7fxcAfio+i6U+fl1NKSi4oitmO17IK6FlqlBA/qRxnFoWhjGOfQ5rjXEzWbze5cq5bUxPexz4F1InQw3MJ9iUiwRCTeiSOmXS8NQ6jy49H5bEoIIWJ5Ad1HnpESHzQUyxvVzNwoVITgA4CGUPDDcFGuqcSf3LIyChJswfrhl2jkkygixXRgIztmXL1/wgslGknCTUR4OhwgoU6BMr1wcT5Yyt+Q9rolF5ENRlYQdBymiPpjxkVcIdixuPAPOnPLtjA9xA168JNMQa1dvOnKPGO7tdvv+/k4Sz3uI4KOBCAOqsEu1eznYqAQJhJZM2vV1L5Upr60KollyWHKThVCwnuVmHvVc8MsGbFdXC/zZXJrhZb65RCpQuPJN8sFQPO1s3MDUVPFRAKBdicZNc+73XDvCIQQRwz2rXHL2s9n5Rtjo8niC71/boCgQ10KTtCwNzOb1h/XxVwsSjV4u1cudkmuV2HSw6YR2neuAp7nshopyY8HFn6tAC9F31EkXw8ogSvkbwhY6ANKIIueG3lir1cLUwnMAV1LXYXUP4zGAKYRAQWhzQE3q1FIhkAy+io+xPhIa5p4Jw+V94y0CgAAgoMSmSVXvIpHwGEEAFrxR7D5aPKAck8lEKTgOpI+Pj2/fvi0WCwS2wRbwbfv9vkTQcdURgkDmnG51HBj4iWprT4QlLjCUWM09vAjKLkB7hb1q0NTmA5IDE0T6m7QbZxIiQeAYq9UKS81QLBYLn77ZbHa73T4+PqiEptqQKcZJd5lKBlxQZvAiFb/Xdtbxtt5BLTvkrzwdH8j5isc9OxQyewEPCTxW0SF8r3oui1Sqk94ClTg7Vt63Meu9BXw5kBlCOVkuPNFTByDYHR2l47w1Q5C4DPfAdvab9/fAL1R3czajCiBVDBZkc3Oyyzv1hfNJpaEhxxWqz73dn6f+PM8Zaixd1s4paIFPFoqY9RUuc1Hb5yIcwwG//p55I63PUxHae2BLgcZ6vcYwMRbL5fJ+vyvnht+E+gyzVVUVDC09Dz6jsmoYIBxGaK3sW4EyJNOVr3ctEiFr4pkqq6s7V1qfMmh8T5cBRJ2SgmYvE+QAwK9U7C+Di72moA78l4KU9/f32Wy2WCzwo2FQ4Kt6nbGEzQjoMGRA7YrTVfiH6ZGr2+v1pNWNV64yDTkg4DP4oTwU0sxKTvJdfB2HFilWkt1kC7Eyn5+fUN9YXuDjHx8fREJCoqj1EOcX6igWUx3tQFGkL5yzzNnXCCTQ3M9GWiKuE+aMIm8kLoBSLNRQlxGqnJ8IwHO0q2Oee1iOcgaVFrpczQAAFNBJREFUA+/vmXtJPEoDhh3rpALZEbdZejoXiwDGdYUaUcpC+cmjjiQZRs8V5F50ywbBH2Ll4xdnzWLdhn9jEL7RU+NWe3rNAW6ZjlrAyiuk3UCH5m/S86xt5xo08wJXJ1SN19bpBKe+4JhSqRLOL1l19ipeMNZT1CKKEUAe2GBQl6Q3uFqt1MkGfhJBNO6zuFze0g2Lo/YqQki9QFtJTOhr6mHuwqlyAMluiQMnLIIwHL1Nat48e6BjCrKBiMZAyYPBAB6YZIXxfKuqmk6n0H6p52ZzUmrc7Xahf7A3UE9n2PkTKpj7vIyGNhtGrSxLaCp41pxbnJdwinkblppDjlMNWJ9k436/VwUNlpreegwmFD1UgEHJpV7UaDQ+Pj7KskRpHoQHDJ38qviY0DOYDrp7ULCuZIX3ztGcukxfLosIWzSAfaENuESdxHp0em8tHPkEfX4kielOei1K6CYv9OP4aWZGhDkh/p5hyz0fXUw9qDR4SbQwX/Fnw4A8El9+BMu61+L10NyPNyeDpcPOdXzGxR5rs45KwkuxqDaI8ZRaaA7/SG3D87GhStgJbTkfm5sBasaZNby32modzzEW5G2kwUrgoLabCMF0u11cGBWtYlbUCw7XGCcLmWDRSMnVQJBQB0ksBTNBRQDzRAUHHdhcrdXZRZgbHED4UuzzgK/D+aUYjxUgiwbNC988MDS1pMTDVcINPtbr6yuJKQhz+/3+4+Pj/f3927dvJBhh5vIUUHolI7dYLMSdQMAMw8dJgzkGaGP+vBaZU4TRYxGDx1EAreiMPjcSgwcylhIFmTeVwGB/oSdzqFD6yPzSVpXpns1mGF906ZbL5XA4JLKBJ8PY6uM47BD4yrJ8e3uTA0KOFLp3pu661+a5aS9/yo6JS3yFNqDqhBRQ2swOrvVWHK3T60rihWM7x+yh7/oTgeNHNWZEM3JWciiAfmlG0l3gImT5tOB9TJzFETignujPlACHEYKihRf44Zxh9KVGK+k7TXoQz3Omh57FCYt/6iWcgJ1ggkMpWubJ6Kxym+Ahgqcog45oLnsLvLoA2nzHVAMdWtl5tTMgAMcbEraAtg4+FOkXqMG0kyDhhpsGRgz3SEqV0hdWdUpI7/rdC+7E7HKwUNMhZJDwlq/AXDouyTSzFeX2Sp0ybyHybwC+fJc8x9lshqrDeDxGOOLbt29vb2+TyYRjhopkogF0G2i1yyGBkhlGlvINBgHSgiNNkv30nBuZaFxapRwRMEKOgzcT9Ys5h86ONjN4CBw17CN8CRXjcbTI88UWY3xBYKCmqVMG80t4WFUV24NlR9gBguTUjkD1dRKr6y3IdsjoiPPvvq0aYTDpik91Kc/uPmnBW9vuIcSMIRp7ZDqD4oR7mq6T+cT5FWVV4nMZMAFwU4VYhoMDD8yxdTHMJCEdGM3cs07uQDLJrnHwYwJZTTNI3EZBEO4CdZhKBmS8220cmFvI0+qUDUB8pid62J1piy785oCVV3/8AR380OF6MvuuyBEOvO+MQ/XFYYecz2f1HMPY4Y6R8pZ0GQQjdVUgqUXMDlONeJZiVjXWRE2CKi/cLuUKiF6Jr9EAEr7mkJmIty4lp/5vfDtPRPsJlj5Ph+2goAtLFBRFg5wKLqpLuUNdwG5y/wAOq9Xq/f2dSgTeuVgs9vs9feqQvMEEO06t1z1hKo1wBl9+lnavkifYUEl6UssklQm58MhdyprTr0iCzqTaQJkUDQhKwl9GGk2gDW2bgYMF4FwuFx5ZhRiAQtR9gOSgH6SNIUanypd94yl5IuU8z3KonNQVIGVHcoCp7icyxD/to5wrl7ydWtAd5+zE9LurG3QksvzF805r0mDxlFrQTpNXVCsPlGXRQ0GEpAJEldWVlc59ohCUdXkC/BossqaVuWMpAlMoWeey975UHKpygbFMV8itBZVPCvUvQRLaD0hS6AAAuWBPlQGhC1zowRHwq+AF3263AtUY9SomvcB8UDBOZoYNz2GF1aCQAYcOgBg2ElApe5WW9SqKI2UHj1iZJWaFHJQ3N/N+LZL7cjUTDKukIFVxACgp34cDE4AVJ50n1Wfdw/KFAryLV8WxgWoaFUFQHdrt9vv7O6XAo9FoPp9j1OAVgDaoho1hEWcDJEHmGF6XpFLAedldIPKOmWJ9pC4o1pegc4YImEg4Mgcb+0pzzVEkV5Q9AImFKkHcf0IHtCBQT0ZTGOl35NygnaiDA8XrOloE6DMIfHVgd7m+oo7ecAaHxj+KFSTs4t2Og/fqxLIn3mv4YOgjl3lFWfQ9dKPxWhKtzCeCEh63Bk/ZHX91OfCKA0cwg4JwLirxLhg6PLz893ms8CgT9YjB7XPhVWeAaWw30ddcpcAJalmNKAvuhFM2iK6FQyXEKy6F6mViOn25c6fBOP8vNIHOgh66k/v9/r3+GFuuPKny5uwZimJ18CrYJ3cHEAGrFNYw5RuNRgMZF3a18jkqdwbJhRpF6SpfV5vxCFLWvCKeHKYEH9PrwUEhsTvQgeURA4BI0dHPTEweasJkz3q93mq1Ipv38fHx8fExn88J0rGelEJQ+oHB2mw2EIRxezmxMCuMwGAwmM/nRA84OJhpD3JbP368gB0tCJ7am7JICkfQG3w7rVfsu2o3IFAD7NA9iOBGFEMqwvmTgmyyc7PZ7HQ6ffnypdPpzGYzOtRBUyMTq0ZqMBchhKgRnG9aoXiZCByQB6GuAl5BPHwTOukqOHqhU2RtkO4dhgJAHJSuMnc407zkIgSp2Vrl4uc//iBCP92jrFVWlBnyPmnOIw78vwAX1JrgRzyNrPLlrquCm1rqt+dgKLjViOGBAv1hnXST2keZmZdnJDTpCLBsEAxiGajDdGYfC2sOVXMhOZztWB7tAhOjHid4hSIFi4oEMuhIlorc1aSdZgewJg6HA80mwJSrqpICuhrFY7kAExRQ12L/jsRrVnQEkelSwYI6aOAUY+nUQpRKvH6/LymWsGkF3OCuglaDeCLRMJvN3t7e3t7evn37tlqtgJg5vXq9Hn1LIRWQyYS658X1jDYkAbJw6tsmhhP8aHEeeF7niuPF48Zi/X2VAA1R3wFxGFcCZIByRxJoENp4CopfcX6hNPA6pxH1x5wrlG7PZrPdbjedTmmXR5oOsSEdNjKRLB5sh8g27t3kzRD6TXhjGDF5c+tJh/8CzTY4kk48Igj7/Pyk7zXTlDsX1OIGwZ9ydnCQ1nS7FlI08mzID7N9nF2gIFocBjY/+iG1WlzBkQ/tPp3K5vDoE2w6xwqO23o+iq5XFO88ydqFghqxI0R4IO1BTKmWZoG060fLI/6yE3XDfvcWy3RLcLxLEFloLMTaVkuO0IA508Z9xgUoFyIGyuDKPwIloKU50aJ6N7jfJCYplU74TbwOIrzZbGhXg1HAr6QWVgybwOfwjKSyZArACQrAPZRN0rQR+4MwUHLmuiRCG1Wg4aQTrWzp8A6HQ/Jpah7abrdXq9Xb21u/35/P58qzQcjD3QY/JdeHYpFgaMTpddrjwtNTzqWw3Atzs4sJU4yvUlQvQOIcxcGXf4RPqkpFXZY+cmVZQhPkAZloDkiyr0yZhO7AuDebzfv7+3A4JDjgPQys1C/BoNWESbVJbhpyP9onQg2q6ZKX7SFnwDRq7aYb1lDHTGlPJhiFQtInHAZ1PfCmyLKVOa0XOFKszNA1x+m3PjJeex0UHjJoUIsFPzpI8lmVpYfdcQnltnIjtERrVRpCNjJUsrkRIA/JKhoOh1hh72YdxDRyJjMMe+BO8HTeitBpwrV9m8KDh0PuEfMhjHMhaJUYwZlJ+Eoh+aNCFwlo8Qxs136/j/wu1lbV8YASKOeizUiMDy8YfVgyRVkTRIgE3hynAlkjEYxQrhH3kG/0GgS5V8721Vdoe3gdDgkBuBxlWc7nc0wz3CkIv/DDiBJwRSm1UEPP4/FIpo64HjMHqI/VE2lBaLhCEHE2XHxLHpDMqMuIcBE1VUIIWAxi0GSACJW9CEFCQh79MypHON7YQlC5VZ2MISbJOZ/Pd7sdbeKOxyN9PCVxRxkkeTloMIGvGhpP1Hbbrc2PeUIssOgDGSgQhGtFYLHm5GZVGe+oce1h4PevN8jOhv4dARhxvMvrOHD6WCRKQecQOBju4A/mEXPX25Ueg4p8rY57kOd25y7sWRlTjAOBpsPuQbbcRS/DN3IIiU0s3wg8cDweY6agA0ka25eBT4cKNGQ3vX0GN695DzU+fvCI0+3cjwz41uJd2RsohIz4YnJlPCeNY1bI85IUIjoAo4EoA49ViR3Cf+6YZA7aPYvFAk7rYDBwFQ8vZlcuLjSq4mok+iF1C7zGeGHuA8nfxU8hTkKQ8g5afKlKciFsLBaL8Xg8nU4h8BJZI4WBLLrE6Hh2iA2gIqTRPJ+mjFnYTlQeM/IkzTB8bk1YuM66w6SqGWjIvHv7bs45omzuHD4ZXy2uIbQ8Yj1x5kgJAunA/Pv8/Oz1etPpFNl4tO5msxkQtkjZ3D9cPYFXP804PZeIDMFy7dVCd5zQctFjycDiJOccklfu8bknW1sTnG87KDO4NeRP2hqwlZQJcHbdIxgx53YyGuPGNDBGfMzDfznrI/iqHh+IoOLdNmXcPa/7XH8nEGkD5ywMo5RLydpJg0LCLNoj7rEq6vIsmQ7I0Hw616/nHFoWhwq+be1hFn4KPxJ1r/KF2beAv9Ic4CTBvQLZYfNDgQKL5LIk7rDXwA5U+oL/giFyWZnswN8OQSL2FHUIwSaAzoS6HADqDhv6G3p6QZpVwVfy9qC4bFVVLZfLt7c3rC3QCp4s1dgw5ziExDN39YZAkHTyilSd3D9ygauAgcqrJTmGE41JDe2yBTQ7TdKFdxlJMm/cJ8k6JpcZgRrIpaQjAXz8/v4OuATt4T//+Q912HCJUFzjfFWM/CQWCzUOOYVdW55Q6+ipUCpEOV51Gsoo8gFQ24HG2Q6e639eSexCZSF0FRwUmifloygrIHvv+iw5JCWp3OCnNkj3zK0IncHtFR4avi4Yeg3gIxX5RxP3CNDPmm0KFmVSSb8TW0NgF0fQE/LB2XdDHJSjPazJ2s3aWSFoeNK/Nbcyut/vhXgnnGySEybGR2iRpLxT2eXWBUsvwRQYrGhaYg74ncQiCRyAVOJ3DHE+maWuxDL1hvM4iUEjGG8uJEPzZcV8FDzn1U3AvlDoYHTQukKqOgTpQAeyvyCSAOhipKr5oDSbBXlLUQgYXdGWKBBEQ36H8HIC2cUDHOACHFh1oJAb5cwY1dGRuMMYMaGMOTRwcpiMxvF4BFaC49Fqtb59+4ZwGtIQX758abfby+WSGhx2haN4T6q/Aq+L9MMjLzjUF2WhwmAovc4th4SPUIUc0Wf5nid77FFJRehzgcCuy2UFXaGAHshFCHfiTUZkGvghDCWf/MRDD3+KmuJDIR4k/hkUFLcAIaX5qBdq4Jw8upnQ3z4ch548kHtOPoa0DWRK9oLHPQ4gqOwNOK6221tIS9RKQ2TFjKz557VFf+ifaf5wrFR2TLZRy5Hf1a3EiXgCNJU9pOOk/CxyQcrMcFgtl0t6aig7H9ia2Fz1dEB+jDWhkmKvTK1VuxAVVGdM0EkRKCH0A7V1xdeIlsHnpaRYyXGva/DGU1hYmXjlnYgYSJQxGs7EYjVnCW3tNInNBwuiIBGUwBujqY2Tg8iaLPFevNiMHaU+GjBMQOfRcgMy5qkZmePxiHTy5+cnYQGKzIjksaxJz4K/P6k70C1JtaCWzlnbgc0pYq4JEKJCd82CFQviW/kNzkAKSpVPHOEAVgQ01tGMfD8BbyUB7sCgnzFBnSs0l3Seb22XEGHNWhIhDxx6HdVm1TxzWNuOL1vhfNRlCnZQdAsiGzKCuHqdTmc8HtNHUbiE+Je1x0BuZ1frngeIxmlUGQQL5tgN+vdATa4fYApmgroUuJ8OymCgOWTCqkLBlutwzdAYUeVJvEce8XA4hAucU4dAPEKBPbASB8CliTy4893osVjm4fviVgaMXsK0hgP0BFdSxKGJhM7FpyCBeBc/CcgBjMBBBhfLbV8BWwNW4MeDFpknjvgTfoUfsEJgGS4hztQH6nvV2Vo0cB6TQxFYX2QDkqj8L4AShYUY9Kqqjsfjx8eH+MI40aJa10qQZDOKxedh1bXkVxhRWUQmFGXpIAxMgAyVPvEN3S7nszDocyt95DQGn013z4WbBZA3UKRr8W6vGMQMaf0zX1yEtZfbmwZKmRS3H51wj9h4octRsDh5mnJP0rww9FzqU+csQ3fPvXiaqcfVU30dzKgAqavvwSMn3ZlkXoHpro+bb5/KcGKFNGyh/+OscLwff00f8+7fuOsaaBF7qYBgz1ORLIOraVa5HTEsF1TRcwDISUSo4jD0RhRakmH1R0JTmr8sZCWHmgwenppU06SYzm0zYiq7EqYBCKBCWx5c/Fyp4Qj+44RjkrRz8D11V7xHc6mplQQEz8W3q64PSCcQnL1wzhcQBlqAD/ML8ss8cuCJdOjVIgDHFDQDK1FXwpxKp8mTJ8/lFwCpKEuV0Oivx/vy+7JeYlbUzQmi2iqp5/Al3ERHsThKOXGDkq9gfQe+3SLXak7qqzV3OSbwRJk/LNkCkhZq/O535ZoJASkSZ9Fv7/nh50hIrgnMcEStpxk4yK1WSy1XwoHh8L3nNhRPEzUigtjr9T4/P1UH5FTXXETjmKQHUhoxFcKEYzjQGcJl/8RQplBNumXUUKi9vJaX+nqpYYTug/BTuLAKz3gPEShMCcmEQ4HyxqvSypMqEvvZ+5o4BOZHnxetisKdV0ne/F6U5a02uQ1cNmwillT1yi62i31RVw5cY7kbcNcw35TJ8aJqE4bDIX/iYMLM4+nUU44ybpoDiYLGeYClpsqDm0S0TCvDs5SCAnF/wBmch4RVhTrNmz0Vxs3w7eTr4C+LvMFQwGzh5uX9SUgoRGdPulEwDirW+PVMDvXQ3s/Yc5jOQ8hecOgM9tz05/7HOb3zCLx2yyI3whPFtUUTajgfMkXCynO8z+/qWcXiDK0fvMWMtwTlarPZDED/uSxybdlxeLpaJYp8GNdiI0TMLkUg2u+jqhA/9qAGlGX5P//zP7gUYU0Gb93Ji44de0gR7H6GQPMMhsPm/wHXVpvNkOd97QAAAABJRU5ErkJggg==')
+}
+
+.header > .container {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+
+@media (max-width: 767px) {
+  .header > .container {
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    -webkit-box-align: start;
+    -ms-flex-align: start;
+    align-items: flex-start;
+  }
+}
+
+.headerLogoContainer {
+  -webkit-box-flex: 0;
+  -ms-flex-positive: 0;
+  flex-grow: 0;
+  -ms-flex-negative: 0;
+  flex-shrink: 0;
+  -ms-flex-preferred-size: auto;
+  flex-basis: auto;
+  margin-right: 16px;
+}
+
+.headerLogo {
+  max-width: 128px;
+  display: block;
+  height: auto;
+  width: 100%;
+  margin-right: auto;
+}
+
+@media (max-width: 767px) {
+  .headerLogoContainer {
+    margin-right: 0;
+  }
+
+  .headerLogo {
+    max-width: 100%;
+  }
+}
+
+.headerTitle {
+  font-size: 40px;
+  line-height: 1.2;
+  font-weight: 700;
+  margin: 16px 0;
+}
+
+.headerNav {
+  margin: 16px 0;
+}
+
+.headerNav a {
+    color: #FFFFFF;
+}
+
+.headerNav ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+.headerNav li {
+  margin: 0;
+  padding: 0;
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+.headerNav li + li {
+  margin-left: 20px;
+}
+
+@media (max-width: 767px) {
+  .headerNav ul {
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -ms-flex-direction: column;
+    flex-direction: column;
+  }
+
+  .headerNav li + li {
+    margin-left: 0;
+    margin-top: 8px;
+  }
+}
+
+.mainContent {
+  padding-top: 16px;
+  padding-bottom: 16px;
+}
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index cac132a1..00000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile to generate python-oracledb documentation using Sphinx
-
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SOURCEDIR     = src
-BUILDDIR      = build
-
-.PHONY: html
-html:
-	@$(SPHINXBUILD) -M html $(SOURCEDIR) $(BUILDDIR) $(SPHINXOPTS)
-
-.PHONY: epub
-epub:
-	@$(SPHINXBUILD) -M epub $(SOURCEDIR) $(BUILDDIR) $(SPHINXOPTS)
-
-.PHONY: pdf
-pdf:
-	@$(SPHINXBUILD) -M latexpdf $(SOURCEDIR) $(BUILDDIR) $(SPHINXOPTS)
-
-.PHONY: clean
-clean:
-	rm -rf $(BUILDDIR)/*
diff --git a/doc/README.md b/doc/README.md
deleted file mode 100644
index fb9635fd..00000000
--- a/doc/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# python-oracledb Documentation Source
-
-This directory contains the python-oracledb documentation source. It is written
-using reST (re-Structured Text). The source files are processed using
-[Sphinx](http://www.sphinx-doc.org) and can be turned into HTML, PDF or ePub
-documentation.
-
-**Visit https://python-oracledb.readthedocs.io/ for pre-built production and
-development python-oracledb documentation**
-
-## Building Documentation Locally
-
-To build the documentation locally:
-
-1. Install Sphinx and the Read the Docs theme using the Python package manager
-   ``pip``, for example:
-
-        python -m pip install --upgrade -r requirements.txt
-
-   You can alternatively install these from pre-built packages for your
-   operating system.
-
-2. The "oracledb" module must be built and importable. This is needed for the
-   "autodoc" extension to create function signature documentation.
-
-3. Once Sphinx is installed, and "oracledb" can be imported by Python, use the
-   Makefile to build your desired documentation format.
-
-   To build the HTML documentation:
-
-       make
-
-   To make ePub documentation:
-
-       make epub
-
-   To make PDF documentation:
-
-       make pdf
-
-   The program ``latexmk`` may be required by Sphinx to generate PDF output.
diff --git a/doc/requirements.txt b/doc/requirements.txt
deleted file mode 100644
index dcc8e5c8..00000000
--- a/doc/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinx>=4.2.0
-sphinx-rtd-theme>=0.5.2
diff --git a/doc/src/.static/custom.css b/doc/src/.static/custom.css
deleted file mode 100644
index 17a42f2d..00000000
--- a/doc/src/.static/custom.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Added code to display tables without horizontal scrollbars
-add an extra line between two paragraphs and define the line
-spacing in tables */
-.wy-table-responsive table td, .wy-table-responsive table th {
-    white-space: pre-wrap;
-    line-height: 10pt;
-}
diff --git a/doc/src/_ext/dbapi_extension.py b/doc/src/_ext/dbapi_extension.py
deleted file mode 100644
index 43440c9d..00000000
--- a/doc/src/_ext/dbapi_extension.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dbapi_extension.py
-#
-# Used to document functionality that is an extension to the DB API definition.
-# -----------------------------------------------------------------------------
-
-from docutils import nodes
-from docutils.parsers.rst import Directive
-
-
-class DbApiExtension(Directive):
-    has_content = True
-
-    def run(self):
-        text = f"{self.prefix} {' '.join(self.content)}"
-        result = [nodes.emphasis(text=text), nodes.paragraph()]
-        return result
-
-
-class DbApiMethodExtension(DbApiExtension):
-    prefix = "This method is an extension to the DB API definition."
-
-
-class DbApiAttributeExtension(DbApiExtension):
-    prefix = "This attribute is an extension to the DB API definition."
-
-
-class DbApiConstantExtension(DbApiExtension):
-    prefix = "These constants are extensions to the DB API definition."
-
-
-class DbApiObjectExtension(DbApiExtension):
-    prefix = "This object is an extension to the DB API definition."
-
-
-def setup(app):
-    app.add_directive("dbapimethodextension", DbApiMethodExtension)
-    app.add_directive("dbapiattributeextension", DbApiAttributeExtension)
-    app.add_directive("dbapiconstantextension", DbApiConstantExtension)
-    app.add_directive("dbapiobjectextension", DbApiObjectExtension)
diff --git a/doc/src/_ext/oracle_deprecated.py b/doc/src/_ext/oracle_deprecated.py
deleted file mode 100644
index f02b60e4..00000000
--- a/doc/src/_ext/oracle_deprecated.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# oracle_deprecated.py
-#
-# Overrides the 'deprecated' directive so that a componment name can be used in
-# conjunction with the version.
-# -----------------------------------------------------------------------------
-
-
-from docutils import nodes
-from docutils.parsers.rst import Directive
-from sphinx import addnodes
-
-
-class DriverDeprecated(Directive):
-    has_content = True
-    required_arguments = 1
-    optional_arguments = 0
-    final_argument_whitespace = True
-
-    def run(self):
-        node = addnodes.versionmodified()
-        node.document = self.state.document
-        node["type"] = self.name
-        node["version"] = self.arguments[0]
-        text = "Deprecated since {}.".format(self.arguments[0])
-        classes = ["versionmodified", "deprecated"]
-        para = nodes.paragraph(
-            "", "", nodes.inline("", text, classes=classes), translatable=False
-        )
-        node.append(para)
-        return [node]
-
-
-def setup(app):
-    app.add_directive("deprecated", DriverDeprecated, override=True)
-
-    return {
-        "version": "0.1",
-        "parallel_read_safe": True,
-        "parallel_write_safe": True,
-    }
diff --git a/doc/src/_ext/table_with_summary.py b/doc/src/_ext/table_with_summary.py
deleted file mode 100644
index 96ecdd00..00000000
--- a/doc/src/_ext/table_with_summary.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# table_with_summary.py
-#
-# Defines a directive (list-table-with-summary) that adds support for a summary
-# option on top of the regular "list-table" directive.
-# -----------------------------------------------------------------------------
-
-import sphinx
-from docutils.parsers.rst import directives
-from docutils.parsers.rst.directives import tables
-
-from packaging import version
-
-
-class ListTableWithSummary(tables.ListTable):
-    option_spec = {"summary": directives.unchanged}
-    option_spec.update(tables.ListTable.option_spec)
-
-    def run(self):
-        result = super().run()
-        summary = self.options.get("summary")
-        if summary:
-            table_node = result[0]
-            table_node["summary"] = summary
-        return result
-
-
-class HTMLTranslator(sphinx.writers.html5.HTML5Translator):
-    def visit_paragraph(self, node):
-        children = node.children
-        if len(children) == 1 and children[0].astext() == "No relevant notes":
-            atts = {
-                "style": "clip: rect(1px, 1px, 1px, 1px);"
-                "clip-path: inset(50%);"
-                "height: 1px;"
-                "overflow: hidden;"
-                "position: absolute;"
-                "white-space: nowrap;"
-                "width: 1px;"
-            }
-            self.body.append(self.starttag(node, "p", "", **atts))
-        else:
-            super().visit_paragraph(node)
-
-    def visit_table(self, node):
-        if version.parse(sphinx.__version__) > version.parse("4.2.0"):
-            self._table_row_indices = [0]
-        else:
-            self._table_row_index = 0
-
-        atts = {}
-        classes = [
-            cls.strip(" \t\n") for cls in self.settings.table_style.split(",")
-        ]
-        classes.insert(0, "docutils")  # compat
-
-        # set align-default if align not specified to give a default style
-        classes.append("align-%s" % node.get("align", "default"))
-
-        if "width" in node:
-            atts["style"] = "width: %s" % node["width"]
-        if "summary" in node:
-            atts["summary"] = node["summary"]
-        tag = self.starttag(node, "table", CLASS=" ".join(classes), **atts)
-        self.body.append(tag)
-
-
-def setup(app):
-    app.add_directive("list-table-with-summary", ListTableWithSummary)
-    app.set_translator("html", HTMLTranslator, override=True)
diff --git a/doc/src/api_manual/aq.rst b/doc/src/api_manual/aq.rst
deleted file mode 100644
index 5d662480..00000000
--- a/doc/src/api_manual/aq.rst
+++ /dev/null
@@ -1,173 +0,0 @@
-.. _aq:
-
-**************************
-API: Advanced Queuing (AQ)
-**************************
-
-.. currentmodule:: oracledb
-
-See :ref:`aqusermanual` for more information about using AQ in python-oracledb.
-
-.. _queue:
-
-Queue Class
-===========
-
-.. autoclass:: Queue
-
-    A Queue object should be created using :meth:`Connection.queue()` and is
-    used to enqueue and dequeue messages.
-
-    .. dbapiobjectextension::
-
-Queue Methods
--------------
-
-.. automethod:: Queue.deqmany
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the method was changed from `deqMany()`. The old name will continue to
-    work for a period of time.
-
-.. automethod:: Queue.deqone
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the method was changed from `deqOne()`. The old name will continue to
-    work for a period of time.
-
-.. automethod:: Queue.enqmany
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the method was changed from `enqMany()`. The old name will continue
-    to work for a period of time.
-
-.. automethod:: Queue.enqone
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the method was changed from `enqOne()`. The old name will continue
-    to work for a period of time.
-
-Queue Attributes
-----------------
-
-.. autoproperty:: Queue.connection
-
-.. autoproperty:: Queue.deqoptions
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the attribute was changed from ``deqOptions``. The old name will continue
-    to work for a period of time.
-
-.. autoproperty:: Queue.enqoptions
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the attribute was changed from ``enqOptions``. The old name will continue
-    to work for a period of time.
-
-.. autoproperty:: Queue.name
-
-.. autoproperty:: Queue.payload_type
-
-    For consistency and compliance with the PEP 8 naming style, the name of
-    the attribute was changed from ``payloadType``. The old name will
-    continue to work for a period of time.
-
-.. _deqoptions:
-
-DeqOptions Class
-================
-
-.. autoclass:: DeqOptions
-
-    A DeqOptions object is used to configure how messages are dequeued
-    from queues. An instance of this object is found in the attribute
-    :attr:`Queue.deqoptions`.
-
-    .. dbapiobjectextension::
-
-DeqOptions Attributes
----------------------
-
-.. autoproperty:: DeqOptions.condition
-
-.. autoproperty:: DeqOptions.consumername
-
-.. autoproperty:: DeqOptions.correlation
-
-.. autoproperty:: DeqOptions.deliverymode
-
-.. autoproperty:: DeqOptions.mode
-
-.. autoproperty:: DeqOptions.msgid
-
-.. autoproperty:: DeqOptions.navigation
-
-.. autoproperty:: DeqOptions.transformation
-
-.. autoproperty:: DeqOptions.visibility
-
-.. autoproperty:: DeqOptions.wait
-
-.. _enqoptions:
-
-EnqOptions Class
-================
-
-.. autoclass:: EnqOptions
-
-    An EnqOptions object is used to configure how messages are enqueued into
-    queues. An instance of this object is found in the attribute
-    :attr:`Queue.enqoptions`.
-
-    .. dbapiobjectextension::
-
-EnqOptions Attributes
----------------------
-
-.. autoproperty:: EnqOptions.deliverymode
-
-.. autoproperty:: EnqOptions.transformation
-
-.. autoproperty:: EnqOptions.visibility
-
-.. _msgproperties:
-
-MessageProperties Class
-=======================
-
-.. autoclass:: MessageProperties
-
-    A MessageProperties object is used to identify the properties of messages
-    that are enqueued and dequeued in queues. They are created by the method
-    :meth:`Connection.msgproperties()`.  They are used by the methods
-    :meth:`Queue.enqone()` and :meth:`Queue.enqmany()` and returned by the
-    methods :meth:`Queue.deqone()` and :meth:`Queue.deqmany()`.
-
-    .. dbapiobjectextension::
-
-MessageProperties Attributes
-----------------------------
-
-.. autoproperty:: MessageProperties.attempts
-
-.. autoproperty:: MessageProperties.correlation
-
-.. autoproperty:: MessageProperties.delay
-
-.. autoproperty:: MessageProperties.deliverymode
-
-.. autoproperty:: MessageProperties.enqtime
-
-.. autoproperty:: MessageProperties.exceptionq
-
-.. autoproperty:: MessageProperties.expiration
-
-.. autoproperty:: MessageProperties.msgid
-
-.. autoproperty:: MessageProperties.payload
-
-.. autoproperty:: MessageProperties.priority
-
-.. autoproperty:: MessageProperties.recipients
-
-.. autoproperty:: MessageProperties.state
diff --git a/doc/src/api_manual/async_aq.rst b/doc/src/api_manual/async_aq.rst
deleted file mode 100644
index 058433dd..00000000
--- a/doc/src/api_manual/async_aq.rst
+++ /dev/null
@@ -1,85 +0,0 @@
-.. _asyncaq:
-
-********************************
-API: Async Advanced Queuing (AQ)
-********************************
-
-.. currentmodule:: oracledb
-
-See :ref:`aqusermanual` for more information about using AQ in python-oracledb.
-
-.. versionadded:: 3.1.0
-
-.. note::
-
-    AsyncQueue objects are only supported in python-oracledb Thin mode.
-
-.. _asyncqueue:
-
-AsyncQueue Class
-================
-
-.. autoclass:: AsyncQueue
-
-    An AsyncQueue object should be created using
-    :meth:`AsyncConnection.queue()` and is used to enqueue and dequeue
-    messages.
-
-AsyncQueue Methods
-------------------
-
-.. automethod:: AsyncQueue.deqmany
-
-.. automethod:: AsyncQueue.deqone
-
-.. automethod:: AsyncQueue.enqmany
-
-.. automethod:: AsyncQueue.enqone
-
-AsyncQueue Attributes
----------------------
-
-.. autoproperty:: AsyncQueue.connection
-
-.. autoproperty:: AsyncQueue.deqoptions
-
-.. autoproperty:: AsyncQueue.enqoptions
-
-.. autoproperty:: AsyncQueue.name
-
-.. autoproperty:: AsyncQueue.payload_type
-
-.. _asyncdeqoptions:
-
-DeqOptions Class
-================
-
-A DeqOptions object is used to configure how messages are dequeued from
-queues. An instance of this object is found in the attribute
-:attr:`AsyncQueue.deqoptions`.
-
-See :ref:`deqoptions` for information on the supported attributes.
-
-.. _asyncenqoptions:
-
-EnqOptions Class
-================
-
-An EnqOptions object is used to configure how messages are enqueued into
-queues. An instance of this object is found in the attribute
-:attr:`AsyncQueue.enqoptions`.
-
-See :ref:`enqoptions` for information on the supported attributes.
-
-.. _asyncmsgproperties:
-
-MessageProperties Class
-=======================
-
-A MessageProperties object is used to identify the properties of messages
-that are enqueued and dequeued in queues. They are created by the method
-:meth:`AsyncConnection.msgproperties()`. They are used by the method
-:meth:`AsyncQueue.enqone()` and returned by the method
-:meth:`AsyncQueue.deqone()`.
-
-See :ref:`msgproperties` for information on the supported attributes.
diff --git a/doc/src/api_manual/async_connection.rst b/doc/src/api_manual/async_connection.rst
deleted file mode 100644
index c31cab3b..00000000
--- a/doc/src/api_manual/async_connection.rst
+++ /dev/null
@@ -1,329 +0,0 @@
-.. _asyncconnobj:
-
-****************************
-API: AsyncConnection Objects
-****************************
-
-.. currentmodule:: oracledb
-
-AsyncConnection Class
-=====================
-
-.. autoclass:: AsyncConnection
-
-    An AsyncConnection object should be created with
-    :meth:`oracledb.connect_async()` or with
-    :meth:`AsyncConnectionPool.acquire()`. AsyncConnections support use of
-    concurrent programming with
-    `asyncio <https://docs.python.org/3/library/asyncio.html>`__.
-
-    .. dbapiobjectextension::
-
-    .. versionadded:: 2.0.0
-
-    .. note::
-
-        AsyncConnection objects are only supported in python-oracledb Thin
-        mode.
-
-    .. note::
-
-        Any outstanding database transaction will be rolled back when the
-        connection object is destroyed or closed.  You must perform a
-        :meth:`commit <commit>` first if you want data to persist in the
-        database, see :ref:`txnasync`.
-
-.. _asyncconnmeth:
-
-AsyncConnection Methods
-=======================
-
-.. automethod:: AsyncConnection.__aenter__
-
-.. automethod:: AsyncConnection.__aexit__
-
-.. automethod:: AsyncConnection.begin_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-.. automethod:: AsyncConnection.callfunc
-
-.. automethod:: AsyncConnection.callproc
-
-.. automethod:: AsyncConnection.cancel
-
-.. automethod:: AsyncConnection.changepassword
-
-.. automethod:: AsyncConnection.close
-
-    .. note::
-
-        Asynchronous connections are not automatically closed at the end of
-        scope. This is different to synchronous connection
-        behavior. Asynchronous connections should either be explicitly closed,
-        or have been initially created via a `context manager
-        <https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-        ``with`` block.
-
-.. automethod:: AsyncConnection.commit
-
-.. automethod:: AsyncConnection.createlob
-
-.. automethod:: AsyncConnection.cursor
-
-.. automethod:: AsyncConnection.decode_oson
-
-    .. versionadded:: 2.1.0
-
-.. automethod:: AsyncConnection.direct_path_load
-
-    See :ref:`directpathloads`.
-
-    .. versionadded:: 3.4.0
-
-    .. dbapimethodextension::
-
-.. automethod:: AsyncConnection.encode_oson
-
-    .. versionadded:: 2.1.0
-
-.. automethod:: AsyncConnection.execute
-
-.. automethod:: AsyncConnection.executemany
-
-.. automethod:: AsyncConnection.fetchall
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-.. automethod:: AsyncConnection.fetch_df_all
-
-    See :ref:`dataframeformat` for the supported data types and examples.
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_decimals`` and ``requested_schema`` parameters were added.
-
-    .. versionadded:: 3.0.0
-
-.. automethod:: AsyncConnection.fetch_df_batches
-
-    See :ref:`dataframeformat` for the supported data types and examples.
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_decimals`` and ``requested_schema`` parameters were added.
-
-    .. versionadded:: 3.0.0
-
-.. automethod:: AsyncConnection.fetchmany
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-.. automethod:: AsyncConnection.fetchone
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-.. automethod:: AsyncConnection.gettype
-
-.. automethod:: AsyncConnection.is_healthy
-
-.. automethod:: AsyncConnection.msgproperties
-
-    .. versionadded:: 3.1.0
-
-.. automethod:: AsyncConnection.ping()
-
-.. automethod:: AsyncConnection.queue
-
-    .. versionadded:: 3.1.0
-
-.. automethod:: AsyncConnection.resume_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-.. automethod:: AsyncConnection.rollback
-
-.. automethod:: AsyncConnection.run_pipeline
-
-    See :ref:`pipelining` for more information.
-
-    .. note::
-
-        True pipelining requires Oracle Database version 23, or later.
-
-        When you connect to an older database, operations are sequentially
-        executed by python-oracledb. Each operation concludes before the next
-        is sent to the database. There is no reduction in round-trips and no
-        performance benefit. This usage is only recommended for code
-        portability such as when preparing for a database upgrade.
-
-    .. versionadded:: 2.4.0
-
-.. automethod:: AsyncConnection.suspend_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-.. automethod:: AsyncConnection.tpc_begin
-
-    The following code sample demonstrates the ``tpc_begin()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_begin(xid=x, flags=oracledb.TPC_BEGIN_NEW, timeout=30)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_commit
-
-    The following code sample demonstrates the ``tpc_commit()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_commit(xid=x, one_phase=False)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_end
-
-    The following code sample demonstrates the ``tpc_end()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_end(xid=x, flags=oracledb.TPC_END_NORMAL)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_forget
-
-    The following code sample demonstrates the ``tpc_forget()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_forget(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_prepare
-
-    The following code sample demonstrates the ``tpc_prepare()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_prepare(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_recover
-
-    The following code sample demonstrates the ``tpc_recover()`` function::
-
-        await connection.tpc_recover()
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.tpc_rollback
-
-    The following code sample demonstrates the ``tpc_rollback()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        await connection.tpc_rollback(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. versionadded:: 2.3.0
-
-.. automethod:: AsyncConnection.xid
-
-.. _asynconnattr:
-
-AsyncConnection Attributes
-==========================
-
-.. autoproperty:: AsyncConnection.action
-
-.. autoproperty:: AsyncConnection.autocommit
-
-.. autoproperty:: AsyncConnection.call_timeout
-
-.. autoproperty:: AsyncConnection.client_identifier
-
-.. autoproperty:: AsyncConnection.clientinfo
-
-.. autoproperty:: AsyncConnection.current_schema
-
-.. autoproperty:: AsyncConnection.db_domain
-
-.. autoproperty:: AsyncConnection.db_name
-
-.. autoproperty:: AsyncConnection.dbop
-
-.. autoproperty:: AsyncConnection.dsn
-
-.. autoproperty:: AsyncConnection.econtext_id
-
-.. autoproperty:: AsyncConnection.edition
-
-.. autoproperty:: AsyncConnection.external_name
-
-.. autoproperty:: AsyncConnection.inputtypehandler
-
-.. autoproperty:: AsyncConnection.instance_name
-
-.. autoproperty:: AsyncConnection.internal_name
-
-.. autoproperty:: AsyncConnection.ltxid
-
-.. autoproperty:: AsyncConnection.max_identifier_length
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: AsyncConnection.max_open_cursors
-
-.. autoproperty:: AsyncConnection.module
-
-.. autoproperty:: AsyncConnection.outputtypehandler
-
-    See :ref:`outputtypehandlers`.
-
-.. autoproperty:: AsyncConnection.sdu
-
-.. autoproperty:: AsyncConnection.serial_num
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: AsyncConnection.service_name
-
-.. autoproperty:: AsyncConnection.session_id
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: AsyncConnection.stmtcachesize
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-.. autoproperty:: AsyncConnection.thin
-
-.. autoproperty:: AsyncConnection.transaction_in_progress
-
-.. autoproperty:: AsyncConnection.username
-
-.. autoproperty:: AsyncConnection.version
diff --git a/doc/src/api_manual/async_connection_pool.rst b/doc/src/api_manual/async_connection_pool.rst
deleted file mode 100644
index 064dc14d..00000000
--- a/doc/src/api_manual/async_connection_pool.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-.. _asyncconnpoolobj:
-
-********************************
-API: AsyncConnectionPool Objects
-********************************
-
-.. currentmodule:: oracledb
-
-AsyncConnectionPool Class
-=========================
-
-.. autoclass:: AsyncConnectionPool
-
-    An AsyncConnectionPool object should be created with
-    :meth:`oracledb.create_pool_async()`.
-
-    .. dbapiobjectextension::
-
-    .. versionadded:: 2.0.0
-
-    .. note::
-
-        AsyncConnectionPool objects are only supported in python-oracledb Thin
-        mode.
-
-.. _asynconnpoolmeth:
-
-AsyncConnectionPool Methods
-===========================
-
-.. automethod:: AsyncConnectionPool.acquire
-
-.. automethod:: AsyncConnectionPool.close
-
-.. automethod:: AsyncConnectionPool.drop
-
-.. automethod:: AsyncConnectionPool.release
-
-    .. note::
-
-        Asynchronous connections are not automatically closed at the end of
-        scope. This is different to synchronous connection
-        behavior. Asynchronous connections should either be explicitly
-        released, or have been initially created via a `context manager
-        <https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-        ``with`` statement.
-
-.. _asyncconnpoolattr:
-
-AsyncConnectionPool Attributes
-==============================
-
-.. autoproperty:: AsyncConnectionPool.busy
-
-.. autoproperty:: AsyncConnectionPool.dsn
-
-.. autoproperty:: AsyncConnectionPool.getmode
-
-.. autoproperty:: AsyncConnectionPool.homogeneous
-
-.. autoproperty:: AsyncConnectionPool.increment
-
-.. autoproperty:: AsyncConnectionPool.max
-
-.. autoproperty:: AsyncConnectionPool.max_lifetime_session
-
-.. autoproperty:: AsyncConnectionPool.max_sessions_per_shard
-
-.. autoproperty:: AsyncConnectionPool.min
-
-.. autoproperty:: AsyncConnectionPool.name
-
-.. autoproperty:: AsyncConnectionPool.opened
-
-.. autoproperty:: AsyncConnectionPool.ping_interval
-
-.. autoproperty:: AsyncConnectionPool.soda_metadata_cache
-
-.. autoproperty:: AsyncConnectionPool.stmtcachesize
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-.. autoproperty:: AsyncConnectionPool.thin
-
-.. autoproperty:: AsyncConnectionPool.timeout
-
-.. autoproperty:: AsyncConnectionPool.username
-
-.. autoproperty:: AsyncConnectionPool.wait_timeout
diff --git a/doc/src/api_manual/async_cursor.rst b/doc/src/api_manual/async_cursor.rst
deleted file mode 100644
index 88bb2415..00000000
--- a/doc/src/api_manual/async_cursor.rst
+++ /dev/null
@@ -1,172 +0,0 @@
-.. _asynccursorobj:
-
-************************
-API: AsyncCursor Objects
-************************
-
-.. currentmodule:: oracledb
-
-AsyncCursor Class
-=================
-
-.. autoclass:: AsyncCursor
-
-    An AsyncCursor object should be created with
-    :meth:`AsyncConnection.cursor()`.
-
-    .. dbapiobjectextension::
-
-    .. versionadded:: 2.0.0
-
-    .. note::
-
-        AsyncCursor objects are only supported in python-oracledb Thin mode.
-
-.. _asynccursormeth:
-
-AsyncCursor Methods
-===================
-
-.. automethod:: AsyncCursor.__aiter__
-
-.. automethod:: AsyncCursor.__aenter__
-
-.. automethod:: AsyncCursor.__aexit__
-
-.. automethod:: AsyncCursor.arrayvar
-
-.. automethod:: AsyncCursor.bindnames
-
-.. automethod:: AsyncCursor.callfunc
-
-    See :ref:`plsqlfunc` for examples.
-
-    .. note::
-
-        In line with the Python DB API, it is not recommended to call
-        :meth:`setinputsizes()` prior to calling this function.
-        Use :meth:`AsyncCursor.var()` instead.  In existing code that calls
-        :meth:`~AsyncCursor.setinputsizes()`, the first item in the
-        :meth:`~AsyncCursor.setinputsizes()` parameter list refers to the
-        return value of the PL/SQL function.
-
-.. automethod:: AsyncCursor.callproc
-
-    See :ref:`plsqlproc` for an example.
-
-.. automethod:: AsyncCursor.close
-
-    .. note::
-
-        Asynchronous cursors are not automatically closed at the end of
-        scope. This is different to synchronous cursor behavior. Asynchronous
-        cursors should either be explicitly closed, or have been initially
-        created via a `context manager
-        <https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-        ``with`` block.
-
-.. automethod:: AsyncCursor.execute
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-    .. versionchanged:: 3.3.0
-
-        The ``suspend_on_success`` parameter was added.
-
-.. automethod:: AsyncCursor.executemany
-
-    .. versionchanged:: 3.4.0
-
-        The ``batch_size`` parameter was added.
-
-    .. versionchanged:: 3.3.0
-
-        Added support for passing data frames in the ``parameters`` parameter.
-        The ``suspend_on_success`` parameter was added.
-
-.. automethod:: AsyncCursor.fetchall
-
-.. automethod:: AsyncCursor.fetchmany
-
-.. automethod:: AsyncCursor.fetchone
-
-.. automethod:: AsyncCursor.getarraydmlrowcounts
-
-.. automethod:: AsyncCursor.getbatcherrors
-
-.. automethod:: AsyncCursor.getimplicitresults
-
-    .. note::
-
-        It is most like the DB API method nextset(), but unlike that method
-        (which requires that the next result set overwrite the current result
-        set), this method returns cursors which can be fetched independently of
-        each other.
-
-.. automethod:: AsyncCursor.parse
-
-    .. note::
-
-        You can parse any DML or DDL statement. DDL statements are executed
-        immediately and an implied commit takes place.
-
-.. automethod:: AsyncCursor.prepare
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-.. automethod:: AsyncCursor.setinputsizes
-
-    .. note::
-
-        :meth:`AsyncCursor.setinputsizes()` should not be used for bind
-        variables passed to :meth:`AsyncCursor.callfunc()` or
-        :meth:`AsyncCursor.callproc()`.  Instead, use `AsyncCursor.var()`.
-
-        If :meth:`AsyncCursor.setinputsizes()` is used with
-        :meth:`AsyncCursor.callfunc()`, the first parameter in the list refers
-        to the return value of the PL/SQL function.
-
-.. automethod:: AsyncCursor.scroll
-
-.. automethod:: AsyncCursor.setoutputsize
-
-.. automethod:: AsyncCursor.var
-
-.. _asynccursorattr:
-
-AsyncCursor Attributes
-======================
-
-.. autoproperty:: AsyncCursor.arraysize
-
-    See :ref:`Tuning Fetch Performance <tuningfetch>` for more information.
-
-.. autoproperty:: AsyncCursor.bindvars
-
-.. autoproperty:: AsyncCursor.connection
-
-.. autoproperty:: AsyncCursor.description
-
-.. autoproperty:: AsyncCursor.fetchvars
-
-.. autoproperty:: AsyncCursor.inputtypehandler
-
-.. autoproperty:: AsyncCursor.lastrowid
-
-.. autoproperty:: AsyncCursor.outputtypehandler
-
-    See :ref:`outputtypehandlers`.
-
-.. autoproperty:: AsyncCursor.prefetchrows
-
-    See :ref:`Tuning Fetch Performance <tuningfetch>` for more information.
-
-.. autoproperty:: AsyncCursor.rowcount
-
-.. autoproperty:: AsyncCursor.rowfactory
-
-    See :ref:`rowfactories`.
-
-.. autoproperty:: AsyncCursor.scrollable
diff --git a/doc/src/api_manual/async_lob.rst b/doc/src/api_manual/async_lob.rst
deleted file mode 100644
index 983cf879..00000000
--- a/doc/src/api_manual/async_lob.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-.. _asynclobobj:
-
-*********************
-API: AsyncLOB Objects
-*********************
-
-.. currentmodule:: oracledb
-
-AsyncLOB Class
-==============
-
-.. autoclass:: AsyncLOB
-
-    An AsyncLOB object can be created with
-    :meth:`AsyncConnection.createlob()`. Also, this object is returned whenever
-    Oracle :data:`CLOB`, :data:`BLOB` and :data:`BFILE` columns are fetched.
-
-    .. dbapiobjectextension::
-
-    See :ref:`lobdata` for more information about using LOBs.
-
-    .. note::
-
-        AsyncLOB objects are only supported in python-oracledb Thin mode.
-
-.. _asynclobmeth:
-
-AsyncLOB Methods
-================
-
-.. automethod:: AsyncLOB.close
-
-.. automethod:: AsyncLOB.fileexists
-
-.. automethod:: AsyncLOB.getchunksize
-
-.. automethod:: AsyncLOB.getfilename
-
-.. automethod:: AsyncLOB.isopen
-
-.. automethod:: AsyncLOB.open
-
-.. automethod:: AsyncLOB.read
-
-.. automethod:: AsyncLOB.setfilename
-
-.. automethod:: AsyncLOB.size
-
-.. automethod:: AsyncLOB.trim
-
-.. automethod:: AsyncLOB.write
-
-.. _asynclobattr:
-
-AsyncLOB Attributes
-===================
-
-.. autoproperty:: AsyncLOB.type
-
-    See :ref:`database type constants <dbtypes>`.
diff --git a/doc/src/api_manual/connect_params.rst b/doc/src/api_manual/connect_params.rst
deleted file mode 100644
index 6d58b339..00000000
--- a/doc/src/api_manual/connect_params.rst
+++ /dev/null
@@ -1,393 +0,0 @@
-.. _connparam:
-
-**************************
-API: ConnectParams Objects
-**************************
-
-.. currentmodule:: oracledb
-
-ConnectParams Class
-===================
-
-.. autoclass:: ConnectParams
-
-    See :ref:`usingconnparams` for more information.
-
-    .. dbapiobjectextension::
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``instance_name``, ``use_sni``, ``thick_mode_dsn_passthrough`` and
-        ``extra_auth_params`` parameters were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from 0
-        seconds to 1 second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from 60.0 seconds to 20.0 seconds. The
-        ``ssl_version`` parameter was added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-
-.. _connparamsmeth:
-
-ConnectParams Methods
-=====================
-
-.. automethod:: ConnectParams.copy
-
-.. automethod:: ConnectParams.get_connect_string
-
-.. automethod:: ConnectParams.get_network_service_names
-
-.. automethod:: ConnectParams.parse_connect_string
-
-.. automethod:: ConnectParams.parse_dsn_with_credentials
-
-    .. versionadded:: 1.3.0
-
-.. automethod:: ConnectParams.set
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``use_sni``, ``thick_mode_dsn_passthrough``, ``extra_auth_params``
-        and ``instance_name`` parameters were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The ``ssl_version`` parameter was added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-.. automethod:: ConnectParams.set_from_config
-
-    .. versionadded:: 3.0.0
-
-.. _connparamsattr:
-
-ConnectParams Attributes
-========================
-
-All properties are read only.
-
-.. autoproperty:: ConnectParams.appcontext
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.cclass
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.config_dir
-
-.. autoproperty:: ConnectParams.connection_id_prefix
-
-    This attribute is only supported in python-oracledb Thin mode.
-
-    .. versionadded:: 1.4.0
-
-.. autoproperty:: ConnectParams.debug_jdwp
-
-    See :ref:`applntracing` for more information.
-
-.. autoproperty:: ConnectParams.disable_oob
-
-    For python-oracledb Thick mode, set the equivalent option in a
-    ``sqlnet.ora`` file.
-
-.. autoproperty:: ConnectParams.driver_name
-
-    This is an arbitrary value set by the user in the
-    :meth:`oracledb.ConnectParams()` method or the
-    :attr:`oracledb.defaults.driver_name <Defaults.driver_name>` attribute
-    which is the default value. This is the value shown in the CLIENT_DRIVER
-    column of the V$SESSION_CONNECT_INFO view.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: ConnectParams.edition
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.events
-
-.. autoproperty:: ConnectParams.expire_time
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.externalauth
-
-    For standalone connections, external authentication occurs when the
-    ``user`` and ``password`` attributes are not used. If these attributes,
-    are not used, you can optionally set the ``externalauth`` attribute to
-    *True*, which may aid code auditing.
-
-    This attribute is only supported in python-oracledb Thick mode.
-
-.. autoproperty:: ConnectParams.extra_auth_params
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: ConnectParams.host
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.https_proxy
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.https_proxy_port
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.instance_name
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: ConnectParams.machine
-
-    This is an arbitrary value set by the user in the
-    :meth:`oracledb.ConnectParams()` method or the
-    :attr:`oracledb.defaults.machine <Defaults.machine>` attribute which is the
-    default value. This is the value shown in the MACHINE column of the
-    V$SESSION view.
-
-    This attribute is only supported in python-oracledb Thin mode.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: ConnectParams.matchanytag
-
-.. autoproperty:: ConnectParams.mode
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.osuser
-
-    This is an arbitrary value set by the user in the
-    :meth:`oracledb.ConnectParams()` method or the
-    :attr:`oracledb.defaults.osuser <Defaults.osuser>` attribute which is the
-    default value. This is the value shown in the OSUSER column of the
-    V$SESSION view.
-
-    This attribute is only supported in python-oracledb Thin mode.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: ConnectParams.pool_boundary
-
-    If the value is *statement*, then pooled DRCP or PRCP connections are
-    implicitly released back to the DRCP or PRCP pool when the connection is
-    stateless (that is, there are no active cursors, active transactions,
-    temporary tables, or temporary LOBs). If the value is *transaction*, then
-    pooled DRCP or PRCP connections are implicitly released back to the DRCP or
-    PRCP pool when either one of the methods :meth:`Connection.commit()` or
-    :meth:`Connection.rollback()` are called.  This attribute requires the use
-    of DRCP or PRCP with Oracle Database version 23, or later. See
-    :ref:`implicitconnpool` for more information.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.1.0
-
-.. autoproperty:: ConnectParams.pool_name
-
-    See :ref:`DRCP Pool Names <poolnames>`.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 3.2.0
-
-.. autoproperty:: ConnectParams.port
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.program
-
-    This is an arbitrary value set by the user in the
-    :meth:`oracledb.ConnectParams()` method or the
-    :attr:`oracledb.defaults.program <Defaults.program>` attribute which is the
-    default value. This is the value shown in the PROGRAM column of the
-    V$SESSION view.
-
-    This attribute is supported in python-oracledb Thin mode.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: ConnectParams.protocol
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.proxy_user
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.purity
-
-    When the value of this attribute is :attr:`oracledb.PURITY_DEFAULT`, then
-    any standalone connection will use :attr:`oracledb.PURITY_NEW` and any
-    pooled connection will use :attr:`oracledb.PURITY_SELF`. The default value
-    is :data:`~oracledb.PURITY_DEFAULT`.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.retry_count
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.retry_delay
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of this attribute was changed from *0* seconds to *1*
-        second.
-
-.. autoproperty:: ConnectParams.sdu
-
-    See the `Database Net Services documentation
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-    id=GUID-86D61D6F-AD26-421A-BABA-77949C8A2B04>`__ for more details.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: ConnectParams.server_type
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.service_name
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.shardingkey
-
-.. autoproperty:: ConnectParams.sid
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.ssl_context
-
-    This attribute is only supported in python-oracledb Thin mode.
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: ConnectParams.ssl_server_cert_dn
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.ssl_server_dn_match
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.ssl_version
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.3.0
-
-.. autoproperty:: ConnectParams.stmtcachesize
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.supershardingkey
-
-.. autoproperty:: ConnectParams.tag
-
-    This attribute is only supported in python-oracledb Thick mode.
-
-.. autoproperty:: ConnectParams.tcp_connect_timeout
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of this attribute was changed from *60.0* seconds to
-        *20.0* seconds.
-
-.. autoproperty:: ConnectParams.terminal
-
-    This is an arbitrary value set by the user in the
-    :meth:`oracledb.ConnectParams()` method or the
-    :attr:`oracledb.defaults.terminal <Defaults.terminal>` attribute which is
-    the default value. This is the value shown in the TERMINAL column of the
-    V$SESSION view.
-
-    This attribute is only supported in python-oracledb Thin mode.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: ConnectParams.use_sni
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: ConnectParams.thick_mode_dsn_passthrough
-
-    This attribute is only supported in python-oracledb Thick mode.
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: ConnectParams.use_tcp_fast_open
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.1.0
-
-.. autoproperty:: ConnectParams.user
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: ConnectParams.wallet_location
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
diff --git a/doc/src/api_manual/connection.rst b/doc/src/api_manual/connection.rst
deleted file mode 100644
index 7df813d4..00000000
--- a/doc/src/api_manual/connection.rst
+++ /dev/null
@@ -1,458 +0,0 @@
-.. _connobj:
-
-***********************
-API: Connection Objects
-***********************
-
-.. currentmodule:: oracledb
-
-Connection Class
-================
-
-.. autoclass:: Connection
-
-    A connection object should be created with :meth:`oracledb.connect()` or
-    with :meth:`ConnectionPool.acquire()`.
-
-    .. note::
-
-        Any outstanding database transaction will be rolled back when the
-        connection object is destroyed or closed.  You must perform a commit
-        first if you want data to persist in the database, see :ref:`txnmgmnt`.
-
-Connection Methods
-==================
-
-.. automethod:: Connection.__enter__
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.__exit__
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.begin
-
-    .. deprecated:: 1.0
-
-    Use the method :meth:`tpc_begin()` instead.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.begin_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-.. automethod:: Connection.cancel
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.changepassword
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.close
-
-.. automethod:: Connection.commit
-
-.. automethod:: Connection.createlob
-
-    .. versionchanged:: 2.0
-
-        The parameter ``data`` was added.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.cursor
-
-.. automethod:: Connection.decode_oson
-
-    .. versionadded:: 2.1.0
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.direct_path_load
-
-    See :ref:`directpathloads`.
-
-    .. versionadded:: 3.4.0
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.encode_oson
-
-    .. versionadded:: 2.1.0
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.fetch_df_all
-
-    See :ref:`dataframeformat` for the supported data types and examples.
-
-    .. dbapimethodextension::
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_decimals`` and ``requested_schema`` parameters were added.
-
-    .. versionadded:: 3.0.0
-
-.. automethod:: Connection.fetch_df_batches
-
-    See :ref:`dataframeformat` for the supported data types and examples.
-
-    .. dbapimethodextension::
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_decimals`` and ``requested_schema`` parameters were added.
-
-    .. versionadded:: 3.0.0
-
-.. automethod:: Connection.getSodaDatabase
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.gettype
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.is_healthy
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.msgproperties
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.ping
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.prepare
-
-    .. deprecated:: 1.0. Use the method :meth:`tpc_prepare()` instead.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.queue
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.resume_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-.. automethod:: Connection.rollback
-
-.. automethod:: Connection.shutdown
-
-    See :ref:`startup`.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.startup
-
-    See :ref:`startup`.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.subscribe
-
-    .. dbapimethodextension::
-
-    .. note::
-
-        The subscription can be deregistered in the database by calling the
-        function :meth:`unsubscribe()`. If this method is not called and the
-        connection that was used to create the subscription is explicitly
-        closed using the function :meth:`close()`, the subscription will not be
-        deregistered in the database.
-
-.. automethod:: Connection.suspend_sessionless_transaction
-
-    See :ref:`sessionlesstxns`.
-
-    .. versionadded:: 3.3.0
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.tpc_begin
-
-    The following code sample demonstrates the ``tpc_begin()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_begin(xid=x, flags=oracledb.TPC_BEGIN_NEW, timeout=30)
-
-    See :ref:`tpc` for information on TPC.
-
-.. automethod:: Connection.tpc_commit
-
-    The following code sample demonstrates the ``tpc_commit()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_commit(xid=x, one_phase=False)
-
-    See :ref:`tpc` for information on TPC.
-
-.. automethod:: Connection.tpc_end
-
-    The following code sample demonstrates the ``tpc_end()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_end(xid=x, flags=oracledb.TPC_END_NORMAL)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.tpc_forget
-
-    The following code sample demonstrates the ``tpc_forget()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_forget(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.tpc_prepare
-
-    The following code sample demonstrates the ``tpc_prepare()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_prepare(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-.. automethod:: Connection.tpc_recover
-
-    The following code sample demonstrates the ``tpc_recover()`` function::
-
-        connection.tpc_recover()
-
-    See :ref:`tpc` for information on TPC.
-
-.. automethod:: Connection.tpc_rollback
-
-    The following code sample demonstrates the ``tpc_rollback()`` function::
-
-        x = connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-        connection.tpc_rollback(xid=x)
-
-    See :ref:`tpc` for information on TPC.
-
-.. automethod:: Connection.unsubscribe
-
-    .. dbapimethodextension::
-
-.. automethod:: Connection.xid
-
-    The following code sample demonstrates the ``xid()`` function::
-
-        connection.xid(format_id=1, global_transaction_id="tx1", branch_qualifier="br1")
-
-    See :ref:`tpc` for information on TPC.
-
-    .. dbapimethodextension::
-
-.. _connattrs:
-
-Connection Attributes
-=====================
-
-.. autoproperty:: Connection.action
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.autocommit
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.call_timeout
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.client_identifier
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.clientinfo
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.current_schema
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.db_domain
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.db_name
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.dbop
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.dsn
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.econtext_id
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.edition
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.external_name
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.handle
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.inputtypehandler
-
-    See :ref:`inputtypehandlers`.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.instance_name
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 1.4.0
-
-.. autoproperty:: Connection.internal_name
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.ltxid
-
-    .. dbapiattributeextension::
-
-    .. versionchanged:: 3.0.0
-
-        This attribute was added to python-oracledb Thin mode.
-
-.. autoproperty:: Connection.max_identifier_length
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Connection.max_open_cursors
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.module
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.outputtypehandler
-
-    See :ref:`outputtypehandlers`.
-
-    .. versionchanged:: 1.4
-
-        The method signature was changed. The previous signature
-        ``handler(cursor, name, default_type, length, precision, scale)`` will
-        still work but is deprecated and will be removed in a future version.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.proxy_user
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.sdu
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.serial_num
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Connection.service_name
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.session_id
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Connection.stmtcachesize
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.tag
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.thin
-
-    See :ref:`vsessconinfo`.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.transaction_in_progress
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: Connection.username
-
-    This read-only attribute returns the name of the user which established the
-    connection to the database.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Connection.version
-
-    This read-only attribute returns the version of the database to which a
-    connection has been established.
-
-    .. dbapiattributeextension::
-
-    .. note::
-
-        If you connect to Oracle Database 18 (or higher) in python-oracledb
-        Thick mode using Oracle Client libraries 12.2 (or lower) you will only
-        receive the base version (such as 18.0.0.0.0) instead of the full
-        version (such as 18.3.0.0.0).
-
-.. autoproperty:: Connection.warning
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
diff --git a/doc/src/api_manual/connection_pool.rst b/doc/src/api_manual/connection_pool.rst
deleted file mode 100644
index 13e58123..00000000
--- a/doc/src/api_manual/connection_pool.rst
+++ /dev/null
@@ -1,161 +0,0 @@
-.. _connpool:
-
-***************************
-API: ConnectionPool Objects
-***************************
-
-.. currentmodule:: oracledb
-
-ConnectionPool Class
-====================
-
-.. autoclass:: ConnectionPool
-
-    The new ConnectionPool class is synonymous with SessionPool. The
-    SessionPool class is deprecated in python-oracledb.  The preferred function
-    to create pools is now :meth:`oracledb.create_pool()`.  (The name
-    SessionPool came from the `Oracle Call Interface (OCI) session pool
-    <https://www.oracle.com/pls/topic/
-    lookup?ctx=dblatest&id=GUID-F9662FFB-EAEF-495C-96FC-49C6D1D9625C>`__. This
-    implementation is only used in python-oracledb Thick mode and is not
-    available in Thin mode).
-
-    .. dbapiobjectextension::
-
-In python-oracledb, the type `pool` will show the class
-`oracledb.ConnectionPool`.  This only affects the name.
-
-The following code will continue to work providing backward compatibility with
-the obsolete cx_Oracle driver:
-
-.. code-block:: python
-
-   issubclass(cls, oracledb.SessionPool) == True
-
-   isinstance(pool, oracledb.SessionPool) == True
-
-The following code will also work:
-
-.. code-block:: python
-
-   issubclass(cls, oracledb.ConnectionPool) == True
-
-   isinstance(pool, oracledb.ConnectionPool) == True
-
-The function :meth:`oracledb.SessionPool` that is used to create pools is
-deprecated in python-oracledb 1.0 and has been deprecated by the function
-:meth:`oracledb.create_pool`.
-
-.. _connpoolmethods:
-
-ConnectionPool Methods
-======================
-
-.. automethod:: ConnectionPool.acquire
-
-.. automethod:: ConnectionPool.close
-
-.. automethod:: ConnectionPool.drop
-
-.. automethod:: ConnectionPool.reconfigure
-
-    Reconfigures various parameters of a connection pool. The pool size can be
-    altered with ``reconfigure()`` by passing values for
-    :data:`~ConnectionPool.min`, :data:`~ConnectionPool.max` or
-    :data:`~ConnectionPool.increment`.  The :data:`~ConnectionPool.getmode`,
-    :data:`~ConnectionPool.timeout`, :data:`~ConnectionPool.wait_timeout`,
-    :data:`~ConnectionPool.max_lifetime_session`,
-    :data:`~ConnectionPool.max_sessions_per_shard`,
-    :data:`~ConnectionPool.soda_metadata_cache`,
-    :data:`~ConnectionPool.stmtcachesize` and
-    :data:`~ConnectionPool.ping_interval` attributes can be set directly or
-    with ``reconfigure()``.
-
-    All parameters are optional. Unspecified parameters will leave those pool
-    attributes unchanged. The parameters are processed in two stages. After any
-    size change has been processed, reconfiguration on the other parameters is
-    done sequentially. If an error such as an invalid value occurs when changing
-    one attribute, then an exception will be generated but any already changed
-    attributes will retain their new values.
-
-    During reconfiguration of a pool's size, the behavior of
-    :meth:`ConnectionPool.acquire()` depends on the ``getmode`` in effect when
-    ``acquire()`` is called:
-
-    * With mode :data:`~oracledb.POOL_GETMODE_FORCEGET`, an ``acquire()`` call
-      will wait until the pool has been reconfigured.
-
-    * With mode :data:`~oracledb.POOL_GETMODE_TIMEDWAIT`, an ``acquire()`` call
-      will try to acquire a connection in the time specified by
-      pool.wait_timeout and return an error if the time taken exceeds that
-      value.
-
-    * With mode :data:`~oracledb.POOL_GETMODE_WAIT`, an ``acquire()`` call will
-      wait until after the pool has been reconfigured and a connection is
-      available.
-
-    * With mode :data:`~oracledb.POOL_GETMODE_NOWAIT`, if the number of busy
-      connections is less than the pool size, ``acquire()`` will return a new
-      connection after pool reconfiguration is complete.
-
-    Closing connections with :meth:`ConnectionPool.release()` or
-    :meth:`Connection.close()` will wait until any pool size reconfiguration is
-    complete.
-
-    Closing the connection pool with :meth:`ConnectionPool.close()` will wait
-    until reconfiguration is complete.
-
-    See :ref:`Connection Pool Reconfiguration <poolreconfiguration>`.
-
-.. automethod:: ConnectionPool.release
-
-.. _connpoolattr:
-
-ConnectionPool Attributes
-=========================
-
-.. autoproperty:: ConnectionPool.busy
-
-.. autoproperty:: ConnectionPool.dsn
-
-.. autoproperty:: ConnectionPool.getmode
-
-.. autoproperty:: ConnectionPool.homogeneous
-
-.. autoproperty:: ConnectionPool.increment
-
-.. autoproperty:: ConnectionPool.max
-
-.. autoproperty:: ConnectionPool.max_lifetime_session
-
-    .. versionchanged:: 3.0.0
-
-        This attribute was added to python-oracledb Thin mode.
-
-.. autoproperty:: ConnectionPool.max_sessions_per_shard
-
-.. autoproperty:: ConnectionPool.min
-
-.. autoproperty:: ConnectionPool.name
-
-.. autoproperty:: ConnectionPool.opened
-
-.. autoproperty:: ConnectionPool.ping_interval
-
-    Prior to cx_Oracle 8.2, the ping interval was fixed at *60* seconds.
-
-.. autoproperty:: ConnectionPool.soda_metadata_cache
-
-.. autoproperty:: ConnectionPool.stmtcachesize
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-.. autoproperty:: ConnectionPool.thin
-
-    See :ref:`vsessconinfo`.
-
-.. autoproperty:: ConnectionPool.timeout
-
-.. autoproperty:: ConnectionPool.username
-
-.. autoproperty:: ConnectionPool.wait_timeout
diff --git a/doc/src/api_manual/cursor.rst b/doc/src/api_manual/cursor.rst
deleted file mode 100644
index ac8669a2..00000000
--- a/doc/src/api_manual/cursor.rst
+++ /dev/null
@@ -1,241 +0,0 @@
-.. _cursorobj:
-
-*******************
-API: Cursor Objects
-*******************
-
-.. currentmodule:: oracledb
-
-Cursor Class
-============
-
-.. autoclass:: Cursor
-
-    A cursor object should be created with :meth:`Connection.cursor()`.
-
-Cursor Methods
-==============
-
-.. automethod:: Cursor.__enter__
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.__exit__
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.__iter__
-
-    .. dbapimethodextension::
-        It is mentioned in PEP 249 as an optional extension.
-
-.. automethod:: Cursor.arrayvar
-
-    Array variables can only be used for PL/SQL associative arrays with
-    contiguous keys. For PL/SQL associative arrays with sparsely populated keys
-    or for varrays and nested tables, the approach shown in this
-    `example <https://github.com/oracle/python-oracledb/blob/main/
-    samples/plsql_collection.py>`__ needs to be used.
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.bindnames
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.callfunc
-
-    See :ref:`plsqlfunc` for examples.
-
-    .. dbapimethodextension::
-
-    .. note::
-
-        In line with the Python DB API, it is not recommended to call
-        :meth:`setinputsizes()` prior to calling this function.  Use
-        :meth:`var()` instead. In existing code that calls
-        :meth:`setinputsizes()`, the first item in the :meth:`setinputsizes()`
-        parameter list refers to the return value of the PL/SQL function.
-
-.. automethod:: Cursor.callproc
-
-    See :ref:`plsqlproc` for an example.
-
-    .. note::
-
-        The DB API definition does not allow for keyword parameters.
-
-.. automethod:: Cursor.close
-
-.. automethod:: Cursor.execute
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-    .. versionchanged:: 3.3.0
-
-        The ``suspend_on_success`` parameter was added.
-
-    .. note::
-
-        The DB API definition does not define the return value of this method.
-
-.. automethod:: Cursor.executemany
-
-    .. versionchanged:: 3.4.0
-
-        The ``batch_size`` parameter was added.
-
-    .. versionchanged:: 3.3.0
-
-        Added support for passing data frames in the ``parameters`` parameter.
-        The ``suspend_on_success`` parameter was added.
-
-.. automethod:: Cursor.fetchall
-
-    See :ref:`fetching` for an example.
-
-.. automethod:: Cursor.fetchmany
-
-    See :ref:`fetching` for an example.
-
-.. automethod:: Cursor.fetchone
-
-    See :ref:`fetching` for an example.
-
-.. automethod:: Cursor.getarraydmlrowcounts
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.getbatcherrors
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.getimplicitresults
-
-    .. dbapimethodextension::
-
-       It is most like the DB API method nextset(), but unlike that method
-       (which requires that the next result set overwrite the current result
-       set), this method returns cursors which can be fetched independently of
-       each other.
-
-.. automethod:: Cursor.parse
-
-    .. dbapimethodextension::
-
-    .. note::
-
-        You can parse any DML or DDL statement. DDL statements are executed
-        immediately and an implied commit takes place. You can also parse
-        PL/SQL statements.
-
-.. automethod:: Cursor.prepare
-
-    See :ref:`Statement Caching <stmtcache>` for more information.
-
-    .. dbapimethodextension::
-
-.. automethod:: Cursor.scroll
-
-    .. dbapimethodextension::
-        It is mentioned in PEP 249 as an optional extension.
-
-.. automethod:: Cursor.setinputsizes
-
-    .. note::
-
-        This function should not be used for bind variables passed to
-        :meth:`callfunc()` or :meth:`callproc()`.  Instead, use :meth:`var()`.
-
-        If this function is used with :meth:`callfunc()`, the first parameter
-        in the list refers to the return value of the PL/SQL function.
-
-.. automethod:: Cursor.setoutputsize
-
-.. automethod:: Cursor.var
-
-    .. versionchanged:: 1.4.0
-
-        The ``convert_nulls`` parameter was added.
-
-    .. dbapimethodextension::
-
-Cursor Attributes
-=================
-
-.. autoproperty:: Cursor.arraysize
-
-    See :ref:`Tuning Fetch Performance <tuningfetch>` for more information.
-
-.. autoproperty:: Cursor.bindvars
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.connection
-
-    .. dbapimethodextension::
-        It is mentioned in PEP 249 as an optional extension.
-
-.. autoproperty:: Cursor.description
-
-    .. versionchanged:: 1.4.0
-
-        Previously, this attribute was a sequence of 7-tuples.  Each of these
-        tuples contained information describing one query column: "(name, type,
-        display_size, internal_size, precision, scale, null_ok)".
-
-.. autoproperty:: Cursor.fetchvars
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.inputtypehandler
-
-    See :ref:`inputtypehandlers`.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.lastrowid
-
-.. autoproperty:: Cursor.outputtypehandler
-
-    See :ref:`outputtypehandlers`.
-
-    .. dbapiattributeextension::
-
-    .. versionchanged:: 1.4.0
-
-        The method signature was changed. The previous signature
-        handler(cursor, name, default_type, length, precision, scale) will
-        still work but is deprecated and will be removed in a future version.
-
-.. autoproperty:: Cursor.prefetchrows
-
-    See :ref:`Tuning Fetch Performance <tuningfetch>` for more information.
-
-    .. dbapimethodextension::
-
-.. autoproperty:: Cursor.rowcount
-
-.. autoproperty:: Cursor.rowfactory
-
-    See :ref:`rowfactories`.
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.scrollable
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.statement
-
-    .. dbapiattributeextension::
-
-.. autoproperty:: Cursor.warning
-
-    See :ref:`plsqlwarning` for more information.
-
-    .. dbapiattributeextension::
-
-    .. versionadded:: 2.0.0
diff --git a/doc/src/api_manual/dataframe.rst b/doc/src/api_manual/dataframe.rst
deleted file mode 100644
index d981bf1e..00000000
--- a/doc/src/api_manual/dataframe.rst
+++ /dev/null
@@ -1,76 +0,0 @@
-.. _oracledataframe:
-
-**********************
-API: DataFrame Objects
-**********************
-
-.. currentmodule:: oracledb
-
-Python-oracledb can fetch directly to data frames that expose an Apache Arrow
-PyCapsule Interface. These can be used by many numerical and data analysis
-libraries.
-
-See :ref:`dataframeformat` for more information, including the type mapping
-from Oracle Database types to Arrow data types.
-
-.. _oracledataframeobj:
-
-DataFrame Class
-===============
-
-.. autoclass:: DataFrame
-
-    A DataFrame object is returned by the methods
-    :meth:`Connection.fetch_df_all()`,
-    :meth:`Connection.fetch_df_batches()`,
-    :meth:`AsyncConnection.fetch_df_all()`, or
-    :meth:`AsyncConnection.fetch_df_batches()`.
-
-    Each column in a DataFrame exposes an `Apache Arrow PyCapsule
-    <https://arrow.apache.org/docs/format/CDataInterface/
-    PyCapsuleInterface.html>`__ interface, giving access to the underlying
-    Apache Arrow array.
-
-    .. dbapiobjectextension::
-
-    .. versionchanged:: 3.3.0
-
-        Removed the prefix "Oracle" from the class name.
-
-    .. versionadded:: 3.0.0
-
-.. _oracledataframemeth:
-
-DataFrame Methods
------------------
-
-.. automethod:: DataFrame.column_arrays
-
-.. automethod:: DataFrame.column_names
-
-.. automethod:: DataFrame.get_column
-
-.. automethod:: DataFrame.get_column_by_name
-
-.. automethod:: DataFrame.num_columns
-
-.. automethod:: DataFrame.num_rows
-
-.. _oraclearrowarrayobj:
-
-ArrowArray Objects
-==================
-
-.. autoclass:: ArrowArray
-
-    ArrowArray objects are returned by :meth:`DataFrame.column_arrays()`.
-
-    These are used for conversion to `PyArrow Tables
-    <https://arrow.apache.org/docs/python/generated/pyarrow.Table.html>`__, see
-    :ref:`dataframeformat`.
-
-    .. versionchanged:: 3.3.0
-
-        Removed the prefix "Oracle" from the class name.
-
-    .. versionadded:: 3.0.0
diff --git a/doc/src/api_manual/dbobject_type.rst b/doc/src/api_manual/dbobject_type.rst
deleted file mode 100644
index 0420d4df..00000000
--- a/doc/src/api_manual/dbobject_type.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-.. _dbobjecttype:
-
-*************************
-API: DbObjectType Objects
-*************************
-
-.. currentmodule:: oracledb
-
-DbObjectType Class
-==================
-
-.. autoclass:: DbObjectType
-
-    A DbObjectType object is returned with :meth:`Connection.gettype()` call
-    and is available as the :data:`Var.type` for variables containing Oracle
-    Database objects.
-
-    .. dbapiobjectextension::
-
-DbObjectType Methods
---------------------
-
-.. automethod:: DbObjectType.__call__
-
-.. automethod:: DbObjectType.newobject
-
-DbObjectType Attributes
------------------------
-
-.. autoproperty:: DbObjectType.attributes
-
-.. autoproperty:: DbObjectType.element_type
-
-   See :ref:`database type constants <dbtypes>`.
-
-.. autoproperty:: DbObjectType.iscollection
-
-.. autoproperty:: DbObjectType.name
-
-.. autoproperty:: DbObjectType.package_name
-
-.. autoproperty:: DbObjectType.schema
-
-.. _dbobject:
-
-DbObject Class
-================
-
-.. autoclass:: DbObject
-
-    A DbObject object is returned by the :meth:`DbObjectType.newobject()` call
-    and can be bound to variables of type :data:`~oracledb.DB_TYPE_OBJECT`.
-    Attributes can be retrieved and set directly.
-
-    .. dbapiobjectextension::
-
-DbObject Methods
-----------------
-
-.. automethod:: DbObject.append
-
-.. automethod:: DbObject.asdict
-
-.. automethod:: DbObject.aslist
-
-.. automethod:: DbObject.copy
-
-.. automethod:: DbObject.delete
-
-.. automethod:: DbObject.exists
-
-.. automethod:: DbObject.extend
-
-.. automethod:: DbObject.first
-
-.. automethod:: DbObject.getelement
-
-.. automethod:: DbObject.last
-
-.. automethod:: DbObject.next
-
-.. automethod:: DbObject.prev
-
-.. automethod:: DbObject.setelement
-
-.. automethod:: DbObject.size
-
-.. automethod:: DbObject.trim
-
-DbObject Attributes
--------------------
-
-.. autoproperty:: DbObject.type
-
-.. _dbobjectattr:
-
-DbObjectAttribute Class
-=======================
-
-.. autoclass:: DbObjectAttr
-
-    The elements of :attr:`DbObjectType.attributes` are instances of this
-    type.
-
-    .. dbapiobjectextension::
-
-DbObjectAttr Attributes
------------------------
-
-.. autoproperty:: DbObjectAttr.max_size
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: DbObjectAttr.name
-
-.. autoproperty:: DbObjectAttr.precision
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: DbObjectAttr.scale
-
-    .. versionadded:: 3.0.0
-
-.. autoproperty:: DbObjectAttr.type
-
-    See :ref:`database type constants <dbtypes>`.
diff --git a/doc/src/api_manual/defaults.rst b/doc/src/api_manual/defaults.rst
deleted file mode 100644
index 20e56603..00000000
--- a/doc/src/api_manual/defaults.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-.. _defaults:
-
-********************
-API: Defaults Object
-********************
-
-.. currentmodule:: oracledb
-
-Defaults Class
-==============
-
-.. autoclass:: Defaults
-
-    See :ref:`settingdefaults`.
-
-.. _defaultsattributes:
-
-Defaults Attributes
-===================
-
-.. autoproperty:: Defaults.arraysize
-
-    See :ref:`Tuning Fetch Performance <tuningfetch>`.
-
-.. autoproperty:: Defaults.config_dir
-
-    See :ref:`optnetfiles`.
-
-    .. versionchanged:: 3.0.0
-
-        The directory ``$ORACLE_HOME/network/admin`` was added to the
-        heuristic.
-
-.. autoproperty:: Defaults.driver_name
-
-    See :ref:`otherinit` and :ref:`dbviews`.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Defaults.fetch_decimals
-
-    See `decimal.Decimal <https://docs.python.org
-    /3/library/decimal.html#decimal-objects>`__.
-
-.. autoproperty:: Defaults.fetch_lobs
-
-    See :ref:`lobdata`.
-
-.. autoproperty:: Defaults.machine
-
-    See :ref:`dbviews`.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Defaults.osuser
-
-    See :ref:`dbviews`.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Defaults.prefetchrows
-
-    See :ref:`tuningfetch`.
-
-.. autoproperty:: Defaults.program
-
-    See :ref:`dbviews`.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Defaults.stmtcachesize
-
-    See :ref:`stmtcache`.
-
-.. autoproperty:: Defaults.terminal
-
-    See :ref:`dbviews`.
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: Defaults.thick_mode_dsn_passthrough
-
-    When ``thick_mode_dsn_passthrough`` is the default value `True`, the
-    behavior of python-oracledb 2.5 and earlier versions occurs:
-    python-oracledb Thick mode passes connect strings unchanged to the Oracle
-    Client libraries to handle. Those libraries have their own heuristics for
-    locating the optional :ref:`tnsnames.ora <optnetfiles>`, if used.
-
-    When ``thick_mode_dsn_passthrough`` is `False`, python-oracledb Thick mode
-    behaves similarly to Thin mode, which can be helpful for applications that
-    may be run in either mode:
-
-    - The search path used to locate and read any optional :ref:`tnsnames.ora
-      <optnetfiles>` file is handled in the python-oracledb driver. Different
-      :ref:`tnsnames.ora <optnetfiles>` files can be used by each
-      connection. Note loading of optional Thick mode files such as
-      ``sqlnet.ora`` and ``oraaccess.xml`` is always handled by Oracle Client
-      libraries regardless of the value of ``thick_mode_dsn_passthrough``
-      because it is those libraries that use these files.
-
-    - All connect strings will be parsed by the python-oracledb driver and a
-      generated connect descriptor is sent to the database. Parameters
-      unrecognized by python-oracledb in :ref:`Easy Connect strings
-      <easyconnect>` are discarded. In :ref:`full connect descriptors
-      <conndescriptor>` passed explicitly as the ``dsn`` parameter value or
-      stored in a :ref:`tnsnames.ora <optnetfiles>` file, any parameters that
-      are unrecognized by python-oracledb in the ``DESCRIPTION``,
-      ``CONNECT_DATA`` and ``SECURITY`` sections will be passed through to the
-      database unchanged, while unrecognized parameters in other sections are
-      discarded.
-
-    - If a :ref:`Centralized Configuration Provider <configurationproviders>`
-      is used for connection configuration, any :ref:`python-oracledb parameter
-      values <pyoparams>` in the configuration will be used.
-
-    .. versionadded:: 3.0.0
diff --git a/doc/src/api_manual/deprecations.rst b/doc/src/api_manual/deprecations.rst
deleted file mode 100644
index ba55373e..00000000
--- a/doc/src/api_manual/deprecations.rst
+++ /dev/null
@@ -1,351 +0,0 @@
-.. _deprecations:
-
-***********************************
-Deprecated and Desupported Features
-***********************************
-
-The following tables contain the deprecated and desupported features of the
-python-oracledb API, and the replacement to be used instead, if applicable.
-The desupported API feature is a previous deprecation that has been removed
-and is no longer available in python-oracledb. The most recent deprecated and
-desupported features are listed first.
-
-The previous cx_Oracle deprecation announcements remain in force for
-python-oracledb. The relevant functionality may be removed in a future version
-of python-oracledb. The cx_Oracle driver itself is obsolete and should not be
-used for new development.
-
-.. list-table-with-summary:: Deprecated in python-oracledb 3.4
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_3_4
-
-    * - Name
-      - Comments
-    * - The x86_64 macOS and 32-bit Windows platforms are deprecated. They will be desupported before, or when, the `cryptography <https://pypi.org/project/cryptography/>`__ package desupports them. See the `cryptography deprecation announcement <https://mail.python.org/archives/list/python-announce-list@python.org/thread/R4BZNC36MSFLKULA74KILLFY6GP3VCPA/>`__.
-      - Use arm64 macOS or 64-bit Windows instead.
-    * - Connectivity and interoperability with Oracle Database and Oracle Client libraries older than version 19 is deprecated and will be removed in a future version of python-oracledb. Production use, and availability of database and client software, is detailed in `Release Schedule of Current Database Releases <https://support.oracle.com/epmos/faces/ DocumentDisplay?id=742060.1>`__.
-      - Upgrade the database and client library versions.
-
-.. list-table-with-summary:: Deprecated in python-oracledb 3.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_3_0
-
-    * - Name
-      - Comments
-    * - Parameter ``pool`` of :meth:`oracledb.connect()` and :meth:`oracledb.connect_async()`
-      - Use :meth:`ConnectionPool.acquire()`, or make use of the :ref:`connection pool cache <connpoolcache>` instead
-
-.. list-table-with-summary:: Desupported in python-oracledb 2.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the desupported feature. The second column, Comments, includes information about the desupport and the replacement to use, if applicable.
-    :name: _desupported_2_0
-
-    * - Name
-      - Comments
-    * - ``oracledb.__future__.old_json_col_as_obj``
-      - VARCHAR2 and LOB columns created with the ``IS JSON`` check constraint are now always fetched as JSON.  Use an :ref:`output type handler <outputtypehandlers>` if the old behavior is required.
-    * - Parameters ``encoding`` and ``nencoding`` of :func:`oracledb.connect()` and :func:`oracledb.create_pool()`, and the related attributes on the objects created
-      - The driver encodings are always UTF-8. Remove uses of ``encoding`` and ``nencoding`` from your code.
-    * - Parameter ``threaded`` of :func:`oracledb.connect()` and :func:`oracledb.create_pool()`
-      - Threading is always used. Remove uses of ``threaded`` from your code.
-    * - Parameter ``waitTimeout`` of :func:`oracledb.create_pool()` and ``oracledb.SessionPool()``
-      - Replace with parameter ``wait_timeout``
-    * - Parameter ``maxLifetimeSession`` of :func:`oracledb.create_pool()` and ``oracledb.SessionPool()``
-      - Replace with parameter ``max_lifetime_session``
-    * - Parameter ``sessionCallback`` of :func:`oracledb.create_pool()` and ``oracledb.SessionPool()``
-      - Replace with parameter ``session_callback``
-    * - Parameter ``maxSessionsPerShard`` of :func:`oracledb.create_pool()` and ``oracledb.SessionPool()``
-      - Replace with parameter ``max_sessions_per_shard``
-    * - Attribute ``maxBytesPerCharacter`` of the :ref:`Connection object <connobj>`
-      - The driver encodings are always UTF-8 so this attribute can be replaced by the constant value 4
-    * - ``Connection.tnsentry``
-      - Replace with :attr:`Connection.dsn`
-    * - ``SessionPool.tnsentry``
-      - Replace with :attr:`ConnectionPool.dsn`
-
-.. list-table-with-summary:: Deprecated in python-oracledb 2.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_2_0
-
-    * - Name
-      - Comments
-    * - Calling :meth:`Variable.setvalue()` with a string value when the variable type is one of :data:`oracledb.DB_TYPE_BLOB`,
-        :data:`oracledb.DB_TYPE_CLOB` or :data:`oracledb.DB_TYPE_NCLOB`.
-      - Call :meth:`Connection.createlob()` with the value instead and pass the result to :meth:`Variable.setvalue()`.
-    * - Setting an attribute of type :data:`oracledb.DB_TYPE_BLOB`, :data:`oracledb.DB_TYPE_CLOB` or :data:`oracledb.DB_TYPE_NCLOB` on a database object to a string value.
-      - Call :meth:`Connection.createlob()` with the value instead and set the attribute with the result.
-
-.. list-table-with-summary:: Deprecated in python-oracledb 1.4
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_1_4
-
-    * - Name
-      - Comments
-    * - Output type handler with arguments ``handler(cursor, name, default_type, length, precision, scale)``
-      - Replace with ``handler(cursor, metadata)``. See :ref:`outputtypehandlers`.
-
-.. list-table-with-summary:: Deprecated in python-oracledb 1.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_1
-
-    * - Name
-      - Comments
-    * - SessionPool class and use of ``cx_Oracle.SessionPool()``
-      - Replace by the equivalent :ref:`ConnectionPool Class <connpool>`. Use the new method :meth:`oracledb.create_pool()` to create connection pools.
-    * - :meth:`Connection.begin()`
-      - Replace by the new :ref:`Two-Phase Commits (TPC) <tpc>` functionality.
-    * - :meth:`Connection.prepare()`
-      - Replace by the new :ref:`Two-Phase Commits (TPC) <tpc>` functionality.
-    * - Parameters ``encoding`` and ``nencoding`` of the :func:`oracledb.connect()`, :func:`oracledb.create_pool()` and ``oracledb.SessionPool()`` methods
-      - The encodings in use are always UTF-8.
-    * - Parameter ``threaded`` of the :meth:`oracledb.connect()` method
-      - This was used to allow the Oracle Client libraries to support threaded applications. This value is ignored in python-oracledb because the threaded OCI is always enabled in the Thick mode, and the option is not relevant to the Thin mode. The equivalent parameter was already deprecated for ``cx_Oracle.SessionPool()`` in cx_Oracle 8.2.
-    * - Attribute :attr:`Connection.maxBytesPerCharacter` of the Connection object
-      - This was previously deprecated.  In python-oracledb 1.0 it will return a constant value of 4 since encodings are always UTF-8.
-    * - Size argument, ``numRows`` of the :meth:`Cursor.fetchmany()` method
-      - Rename the parameter to ``size``.
-    * - ``cx_Oracle.makedsn()``
-      - Pass the connection string components as connection creation, or pool creation, parameters.  Or use a :ref:`ConnectParams Class <connparam>` object.
-    * - ``oracledb.Connection()``
-      - This method is no longer recommended for creating connections. Use the equivalent function :meth:`oracledb.connect()` instead.
-    * - Attribute ``Cursor.bindarraysize`` of the Cursor object
-      - Remove this attribute since it is no longer needed.
-    * - Constant :data:`~oracledb.ATTR_PURITY_DEFAULT`
-      - Replace by :data:`oracledb.PURITY_DEFAULT`.
-    * - Constant :data:`~oracledb.ATTR_PURITY_NEW`
-      - Replace by :data:`oracledb.PURITY_NEW`.
-    * - Constant :data:`~oracledb.ATTR_PURITY_SELF`
-      - Replace by :data:`oracledb.PURITY_SELF`.
-    * - Constant :data:`~oracledb.SPOOL_ATTRVAL_WAIT`
-      - Replace by :data:`oracledb.POOL_GETMODE_WAIT`.
-    * - Constant :data:`~oracledb.SPOOL_ATTRVAL_NOWAIT`
-      - Replace by :data:`oracledb.POOL_GETMODE_NOWAIT`.
-    * - Constant :data:`~oracledb.SPOOL_ATTRVAL_FORCEGET`
-      - Replace by :data:`oracledb.POOL_GETMODE_FORCEGET`.
-    * - Constant :data:`~oracledb.SPOOL_ATTRVAL_TIMEDWAIT`
-      - Replace by :data:`oracledb.POOL_GETMODE_TIMEDWAIT`.
-    * - Constant :data:`~oracledb.DEFAULT_AUTH`
-      - Replace by :data:`oracledb.AUTH_MODE_DEFAULT`.
-    * - Constant :data:`~oracledb.SYSASM`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSASM`.
-    * - Constant :data:`~oracledb.SYSBKP`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSBKP`.
-    * - Constant :data:`~oracledb.SYSDBA`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSDBA`.
-    * - Constant :data:`~oracledb.SYSDGD`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSDGD`.
-    * - Constant :data:`~oracledb.SYSKMT`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSKMT`.
-    * - Constant :data:`~oracledb.SYSOPER`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSOPER`.
-    * - Constant :data:`~oracledb.SYSRAC`
-      - Replace by :data:`oracledb.AUTH_MODE_SYSRAC`.
-    * - Constant :data:`~oracledb.PRELIM_AUTH`
-      - Replace by :data:`oracledb.AUTH_MODE_PRELIM`.
-    * - Constant :data:`~oracledb.SUBSCR_PROTO_OCI`
-      - Replace by :data:`oracledb.SUBSCR_PROTO_CALLBACK`.
-    * - Class name ObjectType
-      - Replace by the equivalent :ref:`DbObjectType<dbobjecttype>`.
-    * - Class name Object
-      - Replace by the equivalent :ref:`DbObject <dbobject>`.
-
-.. list-table-with-summary:: Desupported in python-oracledb 1.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the desupported feature. The second column, Comments, includes information about the desupport and the replacement to use, if applicable.
-    :name: _desupported_1
-
-    * - Name
-      - Comments
-    * - ``Cursor.fetchraw()``
-      - Use one of the other fetch methods such as :meth:`Cursor.fetchmany()` instead.
-    * - ``Cursor.executemanyprepared()``
-      - Use :meth:`Cursor.executemany()` instead.
-    * - Previously deprecated Advanced Queuing (AQ) API
-      - Use the new :ref:`AQ API <aq>` instead.  AQ is only available in python-oracledb Thick mode.
-    * - ``Connection.deq()``
-      - Replace with :meth:`Queue.deqone()` or :meth:`Queue.deqmany()`
-    * - ``Connection.deqoptions()``
-      - Replace with :attr:`Queue.deqoptions`
-    * - ``Connection.enq()``
-      - Replace with :meth:`Queue.enqone()` or :meth:`Queue.enqmany()`
-    * - ``Connection.enqoptions()``
-      - Replace with :attr:`Queue.enqoptions`
-
-.. list-table-with-summary:: Deprecated in cx_Oracle 8.2
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_8_2
-
-    * - Name
-      - Comments
-    * - ``encoding`` parameter to ``cx_Oracle.connect()``
-      - No longer needed as the use of encodings other than UTF-8 is
-        deprecated. Encoding is handled internally between python-oracledb and
-        Oracle Database.
-    * - ``nencoding`` parameter to ``cx_Oracle.connect()``
-      - No longer needed as the use of encodings other than UTF-8 is
-        deprecated.
-    * - ``encoding`` parameter to ```cx_Oracle.SessionPool()``
-      - No longer needed as the use of encodings other than UTF-8 is
-        deprecated.
-    * - ``nencoding`` parameter to ``cx_Oracle.SessionPool()``
-      - No longer needed as the use of encodings other than UTF-8 is
-        deprecated.
-    * - Connection.maxBytesPerCharacter
-      - No longer needed as the use of encodings other than UTF-8 is
-        deprecated. The constant value 4 can be used instead.
-    * - Positional parameters to ``cx_Oracle.connect()``
-      - Replace with keyword parameters in order to comply with the Python
-        database API.
-    * - Positional parameters to ``cx_Oracle.SessionPool()``
-      - Replace with keyword parameters in order to comply with the Python
-        database API.
-    * - ``threaded`` parameter to ``cx_Oracle.SessionPool()``
-      - The value of this parameter is ignored. Threading is now always used.
-    * - ``waitTimeout`` parameter to ``cx_Oracle.SessionPool()``
-      - Replace with parameter name ``wait_timeout``
-    * - ``maxLifetimeSession`` parameter to ``cx_Oracle.SessionPool()``
-      - Replace with parameter name ``max_lifetime_session``
-    * - ``sessionCallback`` parameter to ``cx_Oracle.SessionPool()``
-      - Replace with parameter name ``session_callback``
-    * - ``maxSessionsPerShard`` parameter to ``cx_Oracle.SessionPool()``
-      - Replace with parameter name ``max_sessions_per_shard``
-    * - ``SessionPool.tnsentry``
-      - Replace with :attr:`ConnectionPool.dsn`
-    * - ``payloadType`` parameter to ``Connection.queue()``
-      - Replace with parameter name ``payload_type`` if using keyword parameters.
-    * - ``ipAddress`` parameter to ``Connection.subscribe()``
-      - Replace with parameter name ``ip_address``
-    * - ``groupingClass`` parameter to ``Connection.subscribe()``
-      - Replace with parameter name ``grouping_class``
-    * - ``groupingValue`` parameter to ``Connection.subscribe()``
-      - Replace with parameter name ``grouping_value``
-    * - ``groupingType`` parameter to ``Connection.subscribe()``
-      - Replace with parameter name ``grouping_type``
-    * - ``clientInitiated`` parameter to ``Connection.subscribe()``
-      - Replace with parameter name ``client_initiated``
-    * - ``Connection.callTimeout``
-      - Replace with :attr:`Connection.call_timeout`
-    * - ``Connection.tnsentry``
-      - Replace with :attr:`Connection.dsn`
-    * - `keywordParameters` parameter to ``Cursor.callfunc()``
-      - Replace with parameter name ``keyword_parameters``
-    * - ``keywordParameters`` parameter to ``Cursor.callproc()``
-      - Replace with parameter name ``keyword_parameters``
-    * - ``encodingErrors`` parameter to ``Cursor.var()``
-      - Replace with parameter name ``encoding_errors``
-    * - ``Cursor.fetchraw()``
-      - Replace with :meth:`Cursor.fetchmany()`
-    * - ``newSize`` parameter to ``LOB.trim()``
-      - Replace with parameter name ``new_size``
-    * - ``Queue.deqMany()``
-      - Replace with :meth:`Queue.deqmany()`
-    * - ``Queue.deqOne()``
-      - Replace with :meth:`Queue.deqone()`
-    * - ``Queue.enqMany()``
-      - Replace with :meth:`Queue.enqmany()`
-    * - ``Queue.enqOne()``
-      - Replace with :meth:`Queue.enqone()`
-    * - ``Queue.deqOptions``
-      - Replace with :attr:`Queue.deqoptions`
-    * - ``Queue.enqOptions``
-      - Replace with :attr:`Queue.enqoptions`
-    * - ``Queue.payloadType``
-      - Replace with :attr:`Queue.payload_type`
-    * - ``Subscription.ipAddress``
-      - Replace with :attr:`Subscription.ip_address`
-    * - ``Message.consumerName``
-      - Replace with :attr:`Message.consumer_name`
-    * - ``Message.queueName``
-      - Replace with :attr:`Message.queue_name`
-    * - ``Variable.actualElements``
-      - Replace with :attr:`Variable.actual_elements`
-    * - ``Variable.bufferSize``
-      - Replace with :attr:`Variable.buffer_size`
-    * - ``Variable.numElements``
-      - Replace with :attr:`Variable.num_elements`
-
-
-.. list-table-with-summary:: Deprecated in cx_Oracle 8.0
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_8_0
-
-    * - Name
-      - Comments
-    * - ``cx_Oracle.BFILE``
-      - Replace with :attr:`oracledb.DB_TYPE_BFILE`
-    * - ``cx_Oracle.BLOB``
-      - Replace with :attr:`oracledb.DB_TYPE_BLOB`
-    * - ``cx_Oracle.BOOLEAN``
-      - Replace with :attr:`oracledb.DB_TYPE_BOOLEAN`
-    * - ``cx_Oracle.CLOB``
-      - Replace with :attr:`oracledb.DB_TYPE_CLOB`
-    * - ``cx_Oracle.CURSOR``
-      - Replace with :attr:`oracledb.DB_TYPE_CURSOR`
-    * - ``cx_Oracle.FIXED_CHAR``
-      - Replace with :attr:`oracledb.DB_TYPE_CHAR`
-    * - ``cx_Oracle.FIXED_NCHAR``
-      - Replace with :attr:`oracledb.DB_TYPE_NCHAR`
-    * - ``cx_Oracle.INTERVAL``
-      - Replace with :attr:`oracledb.DB_TYPE_INTERVAL_DS`
-    * - ``cx_Oracle.LONG_BINARY``
-      - Replace with :attr:`oracledb.DB_TYPE_LONG_RAW`
-    * - ``cx_Oracle.LONG_STRING``
-      - Replace with :attr:`oracledb.DB_TYPE_LONG`
-    * - ``cx_Oracle.NATIVE_FLOAT``
-      - Replace with :attr:`oracledb.DB_TYPE_BINARY_DOUBLE`
-    * - ``cx_Oracle.NATIVE_INT``
-      - Replace with :attr:`oracledb.DB_TYPE_BINARY_INTEGER`
-    * - ``cx_Oracle.NCHAR``
-      - Replace with :attr:`oracledb.DB_TYPE_NVARCHAR`
-    * - ``cx_Oracle.NCLOB``
-      - Replace with :attr:`oracledb.DB_TYPE_NCLOB`
-    * - ``cx_Oracle.OBJECT``
-      - Replace with :attr:`oracledb.DB_TYPE_OBJECT`
-    * - ``cx_Oracle.TIMESTAMP``
-      - Replace with :attr:`oracledb.DB_TYPE_TIMESTAMP`
-
-
-.. list-table-with-summary:: Deprecated in cx_Oracle 7.2
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_7_2
-
-    * - Name
-      - Comments
-    * - ``Connection.deq()``
-      - Replace with :meth:`Queue.deqone()` or :meth:`Queue.deqmany()`
-    * - ``Connection.deqoptions()``
-      - Replace with attribute :attr:`Queue.deqoptions`
-    * - ``Connection.enq()``
-      - Replace with :meth:`Queue.enqone()` or :meth:`Queue.enqmany()`
-    * - ``Connection.enqoptions()``
-      - Replace with attribute :attr:`Queue.enqoptions`
-
-
-.. list-table-with-summary:: Deprecated in cx_Oracle 6.4
-    :header-rows: 1
-    :class: wy-table-responsive
-    :summary: The first column, Name, displays the deprecated feature. The second column, Comments, includes information about the deprecation and the replacement to use, if applicable.
-    :name: _deprecations_6_4
-
-    * - Name
-      - Comments
-    * - ``Cursor.executemanyprepared()``
-      - Replace with :meth:`Cursor.executemany()` using None for the ``statement`` argument and an integer for the ``parameters`` argument.
diff --git a/doc/src/api_manual/fetch_info.rst b/doc/src/api_manual/fetch_info.rst
deleted file mode 100644
index adce4dda..00000000
--- a/doc/src/api_manual/fetch_info.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-.. _fetchinfoobj:
-
-**********************
-API: FetchInfo Objects
-**********************
-
-.. currentmodule:: oracledb
-
-FetchInfo Class
-===============
-
-.. autoclass:: FetchInfo
-
-    A FetchInfo object is created internally when a query is executed. They
-    are found in the sequence :data:`Cursor.description`. There is one
-    FetchInfo object for each column. For compatibility with the Python
-    Database API, this object behaves as a 7-tuple containing the values for
-    the attributes ``name``, ``type_code``, ``display_size``,
-    ``internal_size``, ``precision``, ``scale``, and ``null_ok`` in that order.
-    For example, if ``fetch_info`` is of type FetchInfo, then ``fetch_info[2]``
-    is the same as ``fetch_info.display_size``.
-
-    .. dbapiobjectextension::
-
-    .. versionadded:: 1.4.0
-
-FetchInfo Attributes
-====================
-
-.. autoproperty:: FetchInfo.annotations
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: FetchInfo.display_size
-
-.. autoproperty:: FetchInfo.domain_name
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: FetchInfo.domain_schema
-
-    .. versionadded:: 2.0.0
-
-.. autoproperty:: FetchInfo.internal_size
-
-.. autoproperty:: FetchInfo.is_json
-
-.. autoproperty:: FetchInfo.is_oson
-
-    .. versionadded:: 2.1.0
-
-.. autoproperty:: FetchInfo.name
-
-.. autoproperty:: FetchInfo.null_ok
-
-.. autoproperty:: FetchInfo.precision
-
-.. autoproperty:: FetchInfo.scale
-
-.. autoproperty:: FetchInfo.type
-
-.. autoproperty:: FetchInfo.type_code
-
-.. autoproperty:: FetchInfo.vector_dimensions
-
-    .. versionadded:: 2.2.0
-
-.. autoproperty:: FetchInfo.vector_format
-
-    .. versionadded:: 2.2.0
-
-.. autoproperty:: FetchInfo.vector_is_sparse
-
-    .. versionadded:: 3.0.0
diff --git a/doc/src/api_manual/lob.rst b/doc/src/api_manual/lob.rst
deleted file mode 100644
index 8fe6bb59..00000000
--- a/doc/src/api_manual/lob.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-.. _lobobj:
-
-****************
-API: LOB Objects
-****************
-
-.. currentmodule:: oracledb
-
-LOB Class
-=========
-
-.. autoclass:: LOB
-
-    A LOB object should be created with :meth:`Connection.createlob()`.
-
-    This object is returned by default whenever Oracle :data:`CLOB`,
-    :data:`BLOB`, and :data:`BFILE` columns are fetched.
-
-    This type object is the Python type of :data:`DB_TYPE_BLOB`,
-    :data:`DB_TYPE_BFILE`, :data:`DB_TYPE_CLOB` and :data:`DB_TYPE_NCLOB` data
-    that is returned from cursors.
-
-    .. dbapiobjectextension::
-
-    See :ref:`lobdata` for more information about using LOBs.
-
-LOB Methods
-===========
-
-.. automethod:: LOB.close
-
-.. automethod:: LOB.fileexists
-
-.. automethod:: LOB.getchunksize
-
-.. automethod:: LOB.getfilename
-
-.. automethod:: LOB.isopen
-
-.. automethod:: LOB.open
-
-.. automethod:: LOB.read
-
-.. automethod:: LOB.setfilename
-
-.. automethod:: LOB.size
-
-.. automethod:: LOB.trim
-
-.. automethod:: LOB.write
-
-LOB Attributes
-==============
-
-.. autoproperty:: LOB.type
-
-    See :ref:`database type constants <dbtypes>`.
diff --git a/doc/src/api_manual/module.rst b/doc/src/api_manual/module.rst
deleted file mode 100644
index 52f89c9d..00000000
--- a/doc/src/api_manual/module.rst
+++ /dev/null
@@ -1,1255 +0,0 @@
-.. module:: oracledb
-
-.. _module:
-
-****************************
-API: python-oracledb Module
-****************************
-
-.. _modmeth:
-
-Oracledb Methods
-================
-
-.. autofunction:: Binary
-
-.. autofunction:: clientversion
-
-    See :ref:`enablingthick`.
-
-    .. dbapimethodextension::
-
-.. autofunction:: connect
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``pool_alias``, ``instance_name``, ``use_sni``,
-        ``thick_mode_dsn_passthrough``, and ``extra_auth_params`` parameters
-        were added. The ``pool`` parameter was deprecated: use
-        :meth:`ConnectionPool.acquire()` instead.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from 0
-        seconds to 1 second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from 60.0 seconds to 20.0 seconds. The
-        ``ssl_version`` parameter was added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-.. autofunction:: connect_async
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``pool_alias``, ``instance_name``, ``use_sni``,
-        ``thick_mode_dsn_passthrough``, and ``extra_auth_params`` parameters
-        were added. The ``pool`` parameter was deprecated: use
-        :meth:`AsyncConnectionPool.acquire()` instead.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from 0
-        seconds to 1 second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from 60.0 seconds to 20.0 seconds. The
-        ``ssl_version`` parameter was added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-.. autofunction:: create_pipeline
-
-    .. versionadded:: 2.4.0
-
-.. autofunction:: create_pool
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``pool_alias``, ``instance_name``, ``use_sni``,
-        ``thick_mode_dsn_passthrough``, and ``extra_auth_params`` parameters
-        were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from *0*
-        seconds to *1* second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from *60.0* seconds to *20.0* seconds. The
-        ``ping_timeout`` and ``ssl_version`` parameters were added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-.. autofunction:: create_pool_async
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``pool_alias``, ``instance_name``, ``use_sni``,
-        ``thick_mode_dsn_passthrough``, and ``extra_auth_params`` parameters
-        were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from 0
-        seconds to 1 second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from 60.0 seconds to 20.0 seconds. The
-        ``ping_timeout`` and ``ssl_version`` parameters were added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-.. autofunction:: Date
-
-.. autofunction:: DateFromTicks
-
-.. autofunction:: enable_thin_mode
-
-    See :ref:`enablingthin` for more information.
-
-    .. versionadded:: 2.5.0
-
-.. autofunction:: from_arrow
-
-    .. versionadded:: 3.3.0
-
-.. autofunction:: get_pool
-
-    See :ref:`connpoolcache` for more information.
-
-    .. versionadded:: 3.0.0
-
-.. autofunction:: init_oracle_client
-
-    .. dbapimethodextension::
-
-    .. versionchanged:: 3.0.0
-
-        At completion of the method, the value of
-        :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` may get
-        changed by python-oracledb.
-
-    .. versionchanged:: 2.5.0
-
-        The values supplied to the ``lib_dir`` and ``config_dir`` parameters
-        are encoded using the encoding returned by `locale.getencoding()
-        <https://docs.python.org/3/library/locale.html#locale.getencoding>`__
-        for Python 3.11 and higher; for all other versions, the encoding
-        "utf-8" is used.  These values may also be supplied as a ``bytes``
-        object, in which case they will be used as is.
-
-.. autofunction:: is_thin_mode
-
-    See :ref:`vsessconinfo`.
-
-    .. dbapimethodextension::
-
-    .. versionadded:: 1.1.0
-
-.. autofunction:: makedsn
-
-    .. deprecated:: python-oracledb 1.0
-
-    Use the :meth:`oracledb.ConnectParams()` method instead.
-
-    .. dbapimethodextension::
-
-.. autofunction:: register_params_hook
-
-    To unregister a user function, use :meth:`oracledb.unregister_params_hook`.
-
-    See :ref:`registerparamshook`.
-
-    .. dbapimethodextension::
-
-    .. versionadded:: 3.0.0
-
-.. autofunction:: register_password_type
-
-    See :ref:`registerpasswordtype`.
-
-    .. dbapimethodextension::
-
-    .. versionadded:: 3.0.0
-
-.. autofunction:: register_protocol
-
-    See :ref:`registerprotocolhook` for more information.
-
-    .. dbapimethodextension::
-
-    .. versionadded:: 2.5.0
-
-.. autofunction:: Time
-
-.. autofunction:: TimeFromTicks
-
-.. autofunction:: Timestamp
-
-.. autofunction:: TimestampFromTicks
-
-.. autofunction:: unregister_params_hook
-
-    .. dbapimethodextension::
-
-    .. versionadded:: 3.0.0
-
-
-.. _moduleattributes:
-
-Oracledb Attributes
-===================
-
-.. autodata:: apilevel
-
-.. autodata:: defaults
-    :no-value:
-
-    See :ref:`settingdefaults`.
-
-    .. dbapiattributeextension::
-
-.. autodata:: paramstyle
-
-.. autodata:: threadsafety
-
-.. autodata:: __version__
-
-    .. dbapiattributeextension::
-
-.. _constants:
-
-Oracledb Constants
-==================
-
-Advanced Queuing: Delivery Modes
---------------------------------
-
-The AQ Delivery mode constants are possible values for the
-:attr:`~DeqOptions.deliverymode` attribute of the
-:ref:`dequeue options object <deqoptions>` passed as the ``options`` parameter
-to the :meth:`Queue.deqone()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.deqone()`, and :meth:`AsyncQueue.deqmany()`  methods as well
-as the :attr:`~EnqOptions.deliverymode` attribute of the
-:ref:`enqueue options object <enqoptions>` passed as the ``options`` parameter
-to the :meth:`Queue.enqone()`, :meth:`Queue.enqmany()`,
-:meth:`AsyncQueue.enqone()`, and :meth:`AsyncQueue.enqmany()` methods. They are
-also possible values for the :attr:`~MessageProperties.deliverymode` attribute
-of the :ref:`message properties object <msgproperties>` passed as the
-``msgproperties`` parameter to the :meth:`Queue.deqone()`,
-:meth:`Queue.deqmany()`, :meth:`AsyncQueue.deqone()`, or
-:meth:`AsyncQueue.deqmany()`, and :meth:`Queue.enqone()`,
-:meth:`Queue.enqmany()`, :meth:`AsyncQueue.enqone()`, or
-:meth:`AsyncQueue.enqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: MSG_BUFFERED
-
-.. autodata:: MSG_PERSISTENT
-
-.. autodata:: MSG_PERSISTENT_OR_BUFFERED
-
-
-Advanced Queuing: Dequeue Modes
--------------------------------
-
-The AQ Dequeue mode constants are possible values for the
-:attr:`~DeqOptions.mode` attribute of the
-:ref:`dequeue options object <deqoptions>`. This object is the ``options``
-parameter for the :meth:`Queue.deqone()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.deqone()`, or :meth:`AsyncQueue.deqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: DEQ_BROWSE
-
-.. autodata:: DEQ_LOCKED
-
-.. autodata:: DEQ_REMOVE
-
-.. autodata:: DEQ_REMOVE_NODATA
-
-
-Advanced Queuing: Dequeue Navigation Modes
-------------------------------------------
-
-The AQ Dequeue Navigation mode constants are possible values for the
-:attr:`~DeqOptions.navigation` attribute of the
-:ref:`dequeue options object <deqoptions>`. This object is the ``options``
-parameter for the :meth:`Queue.deqone()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.deqone()`, or :meth:`AsyncQueue.deqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: DEQ_FIRST_MSG
-
-.. autodata:: DEQ_NEXT_MSG
-
-.. autodata:: DEQ_NEXT_TRANSACTION
-
-
-Advanced Queuing: Dequeue Visibility Modes
-------------------------------------------
-
-The AQ Dequeue Visibility mode constants are possible values for the
-:attr:`~DeqOptions.visibility` attribute of the
-:ref:`dequeue options object <deqoptions>`. This object is the ``options``
-parameter for the :meth:`Queue.deqone()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.deqone()`, or :meth:`AsyncQueue.deqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: DEQ_IMMEDIATE
-
-.. autodata:: DEQ_ON_COMMIT
-
-
-Advanced Queuing: Dequeue Wait Modes
-------------------------------------
-
-The AQ Dequeue Wait mode constants are possible values for the
-:attr:`~DeqOptions.wait` attribute of the
-:ref:`dequeue options object <deqoptions>`. This object is the ``options``
-parameter for the :meth:`Queue.deqone()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.deqone()`, or :meth:`AsyncQueue.deqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: DEQ_NO_WAIT
-
-.. autodata:: DEQ_WAIT_FOREVER
-
-Advanced Queuing: Enqueue Visibility Modes
-------------------------------------------
-
-The AQ Enqueue Visibility mode constants are possible values for the
-:attr:`~EnqOptions.visibility` attribute of the
-:ref:`enqueue options object <enqoptions>`. This object is the ``options``
-parameter for the :meth:`Queue.enqone()`, :meth:`Queue.enqmany()`,
-:meth:`AsyncQueue.enqone()`, or :meth:`AsyncQueue.enqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: ENQ_IMMEDIATE
-
-    .. seealso::
-
-        :ref:`Bulk Enqueuing <bulkenqdeq>`.
-
-.. autodata:: ENQ_ON_COMMIT
-
-Advanced Queuing: Message States
---------------------------------
-
-The AQ Message state constants are possible values for the
-:attr:`~MessageProperties.state` attribute of the
-:ref:`message properties object <msgproperties>`. This object is the
-``msgproperties`` parameter for the :meth:`Queue.deqone()`,
-:meth:`Queue.deqmany()`, :meth:`AsyncQueue.deqone()` or
-:meth:`AsyncQueue.deqmany()` and :meth:`Queue.enqone()`,
-:meth:`Queue.enqmany()`, :meth:`AsyncQueue.enqone()`, or
-:meth:`AsyncQueue.enqmany()` methods.
-
-.. dbapiconstantextension::
-
-.. autodata:: MSG_EXPIRED
-
-.. autodata:: MSG_PROCESSED
-
-.. autodata:: MSG_READY
-
-.. autodata:: MSG_WAITING
-
-Advanced Queuing: Other Constants
----------------------------------
-
-This section contains other constants that are used for Advanced Queueing.
-
-.. dbapiconstantextension::
-
-.. autodata:: MSG_NO_DELAY
-
-.. autodata:: MSG_NO_EXPIRATION
-
-.. _connection-authorization-modes:
-
-Connection Authorization Modes
-------------------------------
-
-The Connection Authorization mode constants belong to the enumeration called
-``AuthMode``. They are possible values for the ``mode`` parameters of
-:meth:`oracledb.connect()`, :meth:`oracledb.create_pool()`,
-:meth:`oracledb.connect_async()`, and :meth:`oracledb.create_pool_async()`.
-These constants have deprecated the authorization modes used in the obsolete
-cx_Oracle driver.
-
-.. dbapiconstantextension::
-
-.. versionchanged:: 2.3.0
-
-    The integer constants for the connection authorization modes were replaced
-    with the enumeration ``AuthMode``.
-
-.. autodata:: AUTH_MODE_DEFAULT
-
-.. autodata:: AUTH_MODE_PRELIM
-
-.. autodata:: AUTH_MODE_SYSASM
-
-.. autodata:: AUTH_MODE_SYSBKP
-
-.. autodata:: AUTH_MODE_SYSDBA
-
-.. autodata:: AUTH_MODE_SYSDGD
-
-.. autodata:: AUTH_MODE_SYSKMT
-
-.. autodata:: AUTH_MODE_SYSOPER
-
-.. autodata:: AUTH_MODE_SYSRAC
-
-
-.. _pipeline-operation-types:
-
-Pipeline Operation Types
-------------------------
-
-The Pipeline Operation type constants belong to the enumeration called
-``PipelineOpType``. The pipelining constants listed below are used to identify
-the type of operation added. They are possible values for the
-:attr:`PipelineOp.op_type` attribute.
-
-.. versionadded:: 2.4.0
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_CALL_FUNC
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_CALL_PROC
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_COMMIT
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_EXECUTE
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_EXECUTE_MANY
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_FETCH_ALL
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_FETCH_MANY
-
-.. autodata:: oracledb.PIPELINE_OP_TYPE_FETCH_ONE
-
-
-Database Shutdown Modes
------------------------
-
-The Database Shutdown mode constants are possible values for the ``mode``
-parameter of the :meth:`Connection.shutdown()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: DBSHUTDOWN_ABORT
-
-.. autodata:: DBSHUTDOWN_FINAL
-
-.. autodata:: DBSHUTDOWN_IMMEDIATE
-
-.. autodata:: DBSHUTDOWN_TRANSACTIONAL
-
-.. autodata:: DBSHUTDOWN_TRANSACTIONAL_LOCAL
-
-.. _eventtypes:
-
-Event Types
------------
-
-The Event type constants are possible values for the :attr:`Message.type`
-attribute of the messages that are sent for subscriptions created by the
-:meth:`Connection.subscribe()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: EVENT_AQ
-
-.. autodata:: EVENT_DEREG
-
-.. autodata:: EVENT_NONE
-
-.. autodata:: EVENT_OBJCHANGE
-
-.. autodata:: EVENT_QUERYCHANGE
-
-.. autodata:: EVENT_SHUTDOWN
-
-.. autodata:: EVENT_SHUTDOWN_ANY
-
-.. autodata:: EVENT_STARTUP
-
-.. _cqn-operation-codes:
-
-Operation Codes
----------------
-
-The Operation code constants are possible values for the ``operations``
-parameter for the :meth:`Connection.subscribe()` method. One or more of these
-values can be OR'ed together. These values are also used by the
-:attr:`MessageTable.operation` or :attr:`MessageQuery.operation` attributes of
-the messages that are sent.
-
-.. dbapiconstantextension::
-
-.. autodata:: OPCODE_ALLOPS
-
-.. autodata:: OPCODE_ALLROWS
-
-.. autodata:: OPCODE_ALTER
-
-.. autodata:: OPCODE_DELETE
-
-.. autodata:: OPCODE_DROP
-
-.. autodata:: OPCODE_INSERT
-
-.. autodata:: OPCODE_UPDATE
-
-.. _connpoolmodes:
-
-Connection Pool Get Modes
--------------------------
-
-The Connection Pool Get mode constants belong to the enumeration called
-``PoolGetMode``. They are possible values for the ``getmode`` parameters of
-:meth:`oracledb.create_pool()`, :meth:`oracledb.create_pool_async()`,
-:meth:`PoolParams.set()`, and for related attributes. These constants have
-deprecated the Session Pool mode constants that were used in the obsolete
-cx_Oracle driver.
-
-.. dbapiconstantextension::
-
-.. versionchanged:: 2.3.0
-
-    The integer constants for the connection pool creation, reconfiguration,
-    and acquisition ``getmode`` parameters were replaced with the enumeration
-    ``PoolGetMode``.
-
-.. autodata:: POOL_GETMODE_FORCEGET
-
-.. autodata:: POOL_GETMODE_NOWAIT
-
-.. autodata:: POOL_GETMODE_TIMEDWAIT
-
-.. autodata:: POOL_GETMODE_WAIT
-
-
-.. _drcppurityconsts:
-
-Connection Pool Purity Constants
---------------------------------
-
-The Connection Pool Purity constants belong to the enumeration called
-``Purity``. They are possible values for the :ref:`drcp` ``purity`` parameter
-of :meth:`oracledb.create_pool()`, :meth:`ConnectionPool.acquire()`,
-:meth:`oracledb.connect()`, :meth:`oracledb.create_pool_async()`, and
-:meth:`oracledb.connect_async()`. These constants have deprecated the Session
-Pool purity constants that were used in the obsolete cx_Oracle driver.
-
-.. dbapiconstantextension::
-
-.. versionchanged:: 2.3.0
-
-    The integer constants for the connection pool get modes were replaced
-    with the enumeration ``Purity``.
-
-.. autodata:: PURITY_DEFAULT
-
-.. autodata:: PURITY_NEW
-
-.. autodata:: PURITY_SELF
-
-
-Subscription Grouping Classes
------------------------------
-
-The Subscription Grouping Class constants are possible values for the
-``groupingClass`` parameter of the :meth:`Connection.subscribe()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: SUBSCR_GROUPING_CLASS_NONE
-
-.. autodata:: SUBSCR_GROUPING_CLASS_TIME
-
-Subscription Grouping Types
----------------------------
-
-The Subscription Grouping Type constants are possible values for the
-``groupingType`` parameter of the :meth:`Connection.subscribe()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: SUBSCR_GROUPING_TYPE_SUMMARY
-
-.. autodata:: SUBSCR_GROUPING_TYPE_LAST
-
-.. _subscr-namespaces:
-
-Subscription Namespaces
------------------------
-
-The Subscription Namespace constants are possible values for the ``namespace``
-parameter of the :meth:`Connection.subscribe()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: SUBSCR_NAMESPACE_AQ
-
-.. autodata:: SUBSCR_NAMESPACE_DBCHANGE
-
-.. _subscr-protocols:
-
-Subscription Protocols
-----------------------
-
-The Subscription Protocol constants are possible values for the ``protocol``
-parameter of the :meth:`Connection.subscribe()` method.
-
-.. dbapiconstantextension::
-
-.. autodata:: SUBSCR_PROTO_CALLBACK
-
-.. autodata:: SUBSCR_PROTO_HTTP
-
-.. autodata:: SUBSCR_PROTO_MAIL
-
-.. autodata:: SUBSCR_PROTO_SERVER
-
-.. _subscr-qos:
-
-Subscription Quality of Service
--------------------------------
-
-The Subscription Quality of Service constants are possible values for the
-``qos`` parameter of the :meth:`Connection.subscribe()` method. One or more of
-these values can be OR'ed together.
-
-.. dbapiconstantextension::
-
-.. autodata:: SUBSCR_QOS_BEST_EFFORT
-
-.. autodata:: SUBSCR_QOS_DEFAULT
-
-.. autodata:: SUBSCR_QOS_DEREG_NFY
-
-.. autodata:: SUBSCR_QOS_QUERY
-
-.. autodata:: SUBSCR_QOS_RELIABLE
-
-.. autodata:: SUBSCR_QOS_ROWIDS
-
-
-.. _types:
-
-DB API Types
-------------
-
-.. autoclass:: ApiType
-
-    This type object is the Python type of the database API type constants.
-
-.. autodata:: BINARY
-    :no-value:
-
-.. autodata:: DATETIME
-    :no-value:
-
-.. autodata:: NUMBER
-    :no-value:
-
-.. autodata:: ROWID
-    :no-value:
-
-.. autodata:: STRING
-    :no-value:
-
-
-.. _dbtypes:
-
-Database Types
---------------
-
-.. autoclass:: DbType
-
-    This type object is the Python type of the database type constants.  All of
-    these types are extensions to the DB API definition. They are found in
-    query and object metadata. They can also be used to specify the database
-    type when binding data.
-
-    Also see the table :ref:`supporteddbtypes`.
-
-.. autodata:: DB_TYPE_BFILE
-    :no-value:
-
-.. autodata:: DB_TYPE_BINARY_DOUBLE
-    :no-value:
-
-.. autodata:: DB_TYPE_BINARY_FLOAT
-    :no-value:
-
-.. autodata:: DB_TYPE_BINARY_INTEGER
-    :no-value:
-
-.. autodata:: DB_TYPE_BLOB
-    :no-value:
-
-.. autodata:: DB_TYPE_BOOLEAN
-    :no-value:
-
-.. autodata:: DB_TYPE_CHAR
-    :no-value:
-
-.. autodata:: DB_TYPE_CLOB
-    :no-value:
-
-.. autodata:: DB_TYPE_CURSOR
-    :no-value:
-
-.. autodata:: DB_TYPE_DATE
-    :no-value:
-
-.. autodata:: DB_TYPE_INTERVAL_DS
-    :no-value:
-
-.. autodata:: DB_TYPE_INTERVAL_YM
-    :no-value:
-
-.. autodata:: DB_TYPE_JSON
-    :no-value:
-
-.. autodata:: DB_TYPE_LONG
-    :no-value:
-
-.. autodata:: DB_TYPE_LONG_NVARCHAR
-    :no-value:
-
-.. autodata:: DB_TYPE_LONG_RAW
-    :no-value:
-
-.. autodata:: DB_TYPE_NCHAR
-    :no-value:
-
-.. autodata:: DB_TYPE_NCLOB
-    :no-value:
-
-.. autodata:: DB_TYPE_NUMBER
-    :no-value:
-
-.. autodata:: DB_TYPE_NVARCHAR
-    :no-value:
-
-.. autodata:: DB_TYPE_OBJECT
-    :no-value:
-
-.. autodata:: DB_TYPE_RAW
-    :no-value:
-
-.. autodata:: DB_TYPE_ROWID
-    :no-value:
-
-.. autodata:: DB_TYPE_TIMESTAMP
-    :no-value:
-
-.. autodata:: DB_TYPE_TIMESTAMP_LTZ
-    :no-value:
-
-.. autodata:: DB_TYPE_TIMESTAMP_TZ
-    :no-value:
-
-.. autodata:: DB_TYPE_UNKNOWN
-    :no-value:
-
-.. autodata:: DB_TYPE_UROWID
-    :no-value:
-
-    .. note::
-
-        This type is not supported in python-oracledb Thick mode.
-        See :ref:`querymetadatadiff`.
-
-
-.. autodata:: DB_TYPE_VARCHAR
-    :no-value:
-
-.. autodata:: DB_TYPE_VECTOR
-    :no-value:
-
-    .. versionadded:: 2.2.0
-
-
-.. autodata:: DB_TYPE_XMLTYPE
-    :no-value:
-
-    .. versionadded:: 2.0.0
-
-
-.. _dbtypesynonyms:
-
-Database Type Synonyms
-----------------------
-
-All of the following constants are deprecated and will be removed in a future
-version of python-oracledb.
-
-.. data:: BFILE
-
-    A synonym for :data:`DB_TYPE_BFILE`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: BLOB
-
-    A synonym for :data:`DB_TYPE_BLOB`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: BOOLEAN
-
-    A synonym for :data:`DB_TYPE_BOOLEAN`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: CLOB
-
-    A synonym for :data:`DB_TYPE_CLOB`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-.. data:: CURSOR
-
-    A synonym for :data:`DB_TYPE_CURSOR`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: FIXED_CHAR
-
-    A synonym for :data:`DB_TYPE_CHAR`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: FIXED_NCHAR
-
-    A synonym for :data:`DB_TYPE_NCHAR`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: INTERVAL
-
-    A synonym for :data:`DB_TYPE_INTERVAL_DS`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: LONG_BINARY
-
-    A synonym for :data:`DB_TYPE_LONG_RAW`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: LONG_STRING
-
-    A synonym for :data:`DB_TYPE_LONG`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: NATIVE_FLOAT
-
-    A synonym for :data:`DB_TYPE_BINARY_DOUBLE`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: NATIVE_INT
-
-    A synonym for :data:`DB_TYPE_BINARY_INTEGER`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: NCHAR
-
-    A synonym for :data:`DB_TYPE_NCHAR`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: NCLOB
-
-    A synonym for :data:`DB_TYPE_NCLOB`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: OBJECT
-
-    A synonym for :data:`DB_TYPE_OBJECT`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. data:: TIMESTAMP
-
-    A synonym for :data:`DB_TYPE_TIMESTAMP`.
-
-    .. deprecated:: cx_Oracle 8.0
-
-
-.. _tpcconstants:
-
-Two-Phase Commit (TPC) Constants
----------------------------------
-
-The constants for the two-phase commit (TPC) functions
-:meth:`~Connection.tpc_begin()` and :meth:`~Connection.tpc_end()` are listed
-below.
-
-.. autodata:: TPC_BEGIN_JOIN
-
-.. autodata:: TPC_BEGIN_NEW
-
-.. autodata:: TPC_BEGIN_PROMOTE
-
-.. autodata:: TPC_BEGIN_RESUME
-
-.. autodata:: TPC_END_NORMAL
-
-.. autodata:: TPC_END_SUSPEND
-
-.. _vectorformatconstants:
-
-Vector Format Constants
------------------------
-
-These constants belong to the enumeration called ``VectorFormat`` and are
-possible values for the :attr:`FetchInfo.vector_format` attribute.
-
-.. versionadded:: 2.2.0
-
-.. versionchanged:: 2.3.0
-
-    The integer constants for the vector format constants were replaced with
-    the enumeration ``VectorFormat``.
-
-.. autodata:: VECTOR_FORMAT_BINARY
-
-    .. versionadded:: 2.3.0
-
-.. autodata:: VECTOR_FORMAT_FLOAT32
-
-.. autodata:: VECTOR_FORMAT_FLOAT64
-
-.. autodata:: VECTOR_FORMAT_INT8
-
-
-.. _exceptions:
-
-Oracledb Exceptions
-===================
-
-See :ref:`exception` for usage information.
-
-.. autoexception:: Warning
-
-.. autoexception:: Error
-
-.. autoexception:: DataError
-
-.. autoexception:: DatabaseError
-
-.. autoexception:: IntegrityError
-
-.. autoexception:: InterfaceError
-
-.. autoexception:: InternalError
-
-.. autoexception:: NotSupportedError
-
-.. autoexception:: OperationalError
-
-.. autoexception:: ProgrammingError
-
-
-.. _exchandling:
-
-Oracledb _Error Objects
-=======================
-
-See :ref:`exception` for usage information.
-
-.. note::
-
-    PEP 249 (Python Database API Specification v2.0) says the following about
-    exception values:
-
-        [...] The values of these exceptions are not defined. They should
-        give the user a fairly good idea of what went wrong, though. [...]
-
-    With python-oracledb every exception object has exactly one argument in the
-    ``args`` tuple. This argument is an ``oracledb._Error`` object which has
-    the following six read-only attributes.
-
-.. attribute:: _Error.code
-
-    Integer attribute representing the Oracle error number (ORA-XXXXX).
-
-.. attribute:: _Error.offset
-
-    Integer attribute representing the error offset when applicable.
-
-.. attribute:: _Error.full_code
-
-    String attribute representing the top-level error prefix and the
-    code that is shown in the :attr:`_Error.message`.
-
-.. attribute:: _Error.message
-
-    String attribute representing the Oracle message of the error. This message
-    may be localized by the environment of the Oracle connection.
-
-.. attribute:: _Error.context
-
-    String attribute representing the context in which the exception was
-    raised.
-
-.. attribute:: _Error.isrecoverable
-
-    Boolean attribute representing whether the error is recoverable or not.
-    This requires Oracle Database 12.1 (or later). If python-oracledb Thick
-    mode is used, then Oracle Client 12.1 (or later) is also required.
-
-    See :ref:`tg` for more information.
-
-.. _futureobj:
-
-Oracledb __future__ Object
-==========================
-
-A special object that contains attributes which control the behavior of
-python-oracledb, allowing for opting in for new features.
-
-.. _oracledbplugins:
-
-Oracledb Plugins
-================
-
-The `namespace package <https://packaging.python.org/en/latest/guides/
-packaging-namespace-packages/#native-namespace-packages>`__
-``oracledb.plugins`` can contain plugins to extend the capability of
-python-oracledb.  See :ref:`customplugins`. Note that the namespace
-``oracledb.plugins.ldap_support`` is reserved for future use by the
-python-oracledb project.
-
-To use the python-oracledb plugins in your application, import using
-``import oracledb.plugins.<name of plugin>``, for example::
-
-    import oracledb.plugins.oci_config_provider
-
-.. versionadded:: 3.0.0
-
-.. _configociplugin:
-
-Oracle Cloud Infrastructure (OCI) Object Storage Configuration Provider Plugin
-------------------------------------------------------------------------------
-
-``oci_config_provider`` is a plugin that can be imported to provide access to
-database connection credentials and application configuration information
-stored in the :ref:`OCI Object Storage configuration provider
-<ociobjstorageprovider>`.
-
-This plugin is implemented as a :ref:`connection protocol hook function
-<registerprotocolhook>` to handle connection strings which have the prefix
-``config-ociobject``, see :ref:`OCI Object Storage connection strings
-<connstringoci>`. The plugin parses these connection strings and gets the
-stored configuration information. Python-oracledb then uses this information to
-connect to Oracle Database.
-
-To use this plugin in python-oracledb Thick mode, you must set
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` to *False*. Alternatively use
-:meth:`ConnectParams.parse_connect_string()`, see :ref:`usingconnparams`.
-
-See :ref:`ociobjstorageprovider` for more information.
-
-.. versionadded:: 3.0.0
-
-.. _configazureplugin:
-
-Azure App Configuration Provider Plugin
----------------------------------------
-
-``azure_config_provider`` is a plugin that can be imported to provide access to
-database connection credentials and application configuration information
-stored in the :ref:`Azure App Configuration provider
-<azureappstorageprovider>`.
-
-This plugin is implemented as a :ref:`connection protocol hook function
-<registerprotocolhook>` to handle connection strings which have the prefix
-``config-azure``, see :ref:`Azure App Configuration connection strings
-<connstringazure>`. The plugin parses these connection strings and gets the
-stored configuration information. Python-oracledb then uses this information to
-connect to Oracle Database.
-
-To use this plugin in python-oracledb Thick mode, you must set
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` to *False*. Alternatively use
-:meth:`ConnectParams.parse_connect_string()`, see :ref:`usingconnparams`.
-
-See :ref:`azureappstorageprovider` for more information.
-
-.. versionadded:: 3.0.0
-
-.. _ocicloudnativeauthplugin:
-
-Oracle Cloud Infrastructure (OCI) Cloud Native Authentication Plugin
---------------------------------------------------------------------
-
-``oci_tokens`` is a plugin that can be imported to use the `Oracle Cloud
-Infrastructure (OCI) Software Development Kit (SDK)
-<https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm>`__ for
-generating access tokens when authenticating with OCI Identity and Access
-Management (IAM) token-based authentication.
-
-This plugin is implemented as a :ref:`parameter hook function
-<registerparamshook>` which uses the ``extra_auth_params`` parameter values of
-your connection and pool creation calls to generate OCI IAM access tokens.
-Python-oracledb then uses these tokens to connect to Oracle Database.
-
-See :ref:`cloudnativeauthoci` for more information.
-
-.. versionadded:: 3.0.0
-
-.. _azurecloudnativeauthplugin:
-
-Azure Cloud Native Authentication Plugin
-----------------------------------------
-
-``azure_tokens`` is a plugin that can be imported to use the `Microsoft
-Authentication Library (MSAL)
-<https://learn.microsoft.com/en-us/entra/msal/python/?view=msal-py- latest>`__
-for generating access tokens when authenticating with OAuth 2.0 token-based
-authentication.
-
-This plugin is implemented as a :ref:`parameter hook function
-<registerparamshook>` which uses the ``extra_auth_params`` parameter values of
-your connection and pool creation calls to generate OAuth2 access tokens.
-Python-oracledb then uses these tokens to connect to Oracle Database.
-
-See :ref:`cloudnativeauthoauth` for more information.
-
-.. versionadded:: 3.0.0
-
-.. _interval_ym:
-
-Oracledb IntervalYM Class
-=========================
-
-Objects of this class are returned for columns of type INTERVAL YEAR TO MONTH
-and can be passed to variables of type :data:`oracledb.DB_TYPE_INTERVAL_YM`
-The class is a `collections.namedtuple()
-<https://docs.python.org/3/library/collections.html#collections.namedtuple>`__
-class with two integer attributes, ``years`` and ``months``.
-
-.. versionadded:: 2.2.0
-
-.. _jsonid:
-
-Oracledb JsonId Class
-=====================
-
-Objects of this class are returned by :ref:`SODA <soda>` in the ``_id``
-attribute of documents stored in native collections when using Oracle Database
-23.4 (and later). It is a subclass of the `bytes <https://docs.python.org/3/
-library/stdtypes.html#bytes>`__ class.
-
-.. versionadded:: 2.1.0
-
-.. dbapimethodextension::
diff --git a/doc/src/api_manual/pipeline.rst b/doc/src/api_manual/pipeline.rst
deleted file mode 100644
index f1b6e096..00000000
--- a/doc/src/api_manual/pipeline.rst
+++ /dev/null
@@ -1,160 +0,0 @@
-.. _pipelineobj:
-
-*********************
-API: Pipeline Objects
-*********************
-
-.. currentmodule:: oracledb
-
-Pipelining is only supported in python-oracledb Thin mode with
-:ref:`asyncio <concurrentprogramming>`. See :ref:`pipelining` for more
-information about pipelining.
-
-.. note::
-
-    True pipelining is only available when connected to Oracle Database version
-    23, or later.
-
-.. versionadded:: 2.4.0
-
-.. _pipelineobjs:
-
-Pipeline Class
-==============
-
-.. autoclass:: Pipeline
-
-    Pipeline objects represent a pipeline used to execute multiple database
-    operations.  A Pipeline object is created by calling
-    :meth:`oracledb.create_pipeline()`.
-
-.. _pipelinemethods:
-
-Pipeline Methods
-----------------
-
-.. automethod:: Pipeline.add_callfunc
-
-.. automethod:: Pipeline.add_callproc
-
-.. automethod:: Pipeline.add_commit
-
-.. automethod:: Pipeline.add_execute
-
-.. automethod:: Pipeline.add_executemany
-
-    .. seealso::
-
-        :ref:`batchstmnt`
-
-.. automethod:: Pipeline.add_fetchall
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-.. automethod:: Pipeline.add_fetchmany
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-    .. seealso::
-
-        :ref:`roundtrips`, and :ref:`rowlimit`
-
-.. automethod:: Pipeline.add_fetchone
-
-    .. versionchanged:: 3.4.0
-
-        The ``fetch_lobs`` and ``fetch_decimals`` parameters were added.
-
-    .. seealso::
-
-        :ref:`rowlimit`
-
-Pipeline Attributes
--------------------
-
-.. autoproperty:: Pipeline.operations
-
-.. _pipelineopobjs:
-
-PipelineOp Class
-================
-
-.. autoclass:: PipelineOp
-
-    A PipelineOp object should be created by calling the methods in the
-    :ref:`Pipeline class <pipelineobjs>`.
-
-.. _pipelineopattrs:
-
-PipelineOp Attributes
----------------------
-
-.. autoproperty:: PipelineOp.arraysize
-
-    .. seealso::
-
-        :ref:`tuningfetch`
-
-.. autoproperty:: PipelineOp.fetch_decimals
-
-    .. versionadded:: 3.4.0
-
-.. autoproperty:: PipelineOp.fetch_lobs
-
-    .. versionadded:: 3.4.0
-
-.. autoproperty:: PipelineOp.keyword_parameters
-
-.. autoproperty:: PipelineOp.name
-
-.. autoproperty:: PipelineOp.num_rows
-
-.. autoproperty:: PipelineOp.op_type
-
-    See :ref:`pipeline-operation-types` for types of operations.
-
-.. autoproperty:: PipelineOp.parameters
-
-.. autoproperty:: PipelineOp.return_type
-
-.. autoproperty:: PipelineOp.rowfactory
-
-.. autoproperty:: PipelineOp.statement
-
-.. _pipelineopresultobjs:
-
-PipelineOpResult Objects
-========================
-
-.. autoclass:: PipelineOpResult
-
-    When :meth:`AsyncConnection.run_pipeline()` is called, it returns a list of
-    PipelineOpResult objects. These objects contain the results of the executed
-    :ref:`PipelineOp objects <pipelineopobjs>` operations.
-
-PipelineOpResult Attributes
----------------------------
-
-.. autoproperty:: PipelineOpResult.columns
-
-    .. versionadded:: 2.5.0
-
-.. autoproperty:: PipelineOpResult.error
-
-.. autoproperty:: PipelineOpResult.operation
-
-.. autoproperty:: PipelineOpResult.return_value
-
-.. autoproperty:: PipelineOpResult.rows
-
-.. autoproperty:: PipelineOpResult.warning
-
-    .. versionadded:: 2.5.0
-
-    .. seealso::
-
-        :ref:`PL/SQL Compilation Warnings  <pipelinewarning>`
diff --git a/doc/src/api_manual/pool_params.rst b/doc/src/api_manual/pool_params.rst
deleted file mode 100644
index bdebeb3c..00000000
--- a/doc/src/api_manual/pool_params.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-.. _poolparam:
-
-***********************
-API: PoolParams Objects
-***********************
-
-.. currentmodule:: oracledb
-
-PoolParams Class
-================
-
-.. autoclass:: PoolParams
-
-    The PoolParams class is a subclass of the :ref:`ConnectParams Class
-    <connparam>`.  In addition to the parameters and attributes of the
-    ConnectParams class, the PoolParams class also contains new parameters and
-    attributes.
-
-    See :ref:`usingpoolparams` for more information.
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``use_sni``, ``instance_name``, ``thick_mode_dsn_passthrough``,
-        ``extra_auth_params``, and ``instance_name`` parameters were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The default value of the ``retry_delay`` parameter was changed from *0*
-        seconds to *1* second. The default value of the ``tcp_connect_timeout``
-        parameter was changed from *60.0* seconds to *20.0* seconds. The
-        ``ping_timeout`` and ``ssl_version`` parameters were added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-    .. versionchanged:: 2.0.0
-
-        The ``ssl_context`` and ``sdu`` parameters were added.
-
-    .. versionchanged:: 1.4.0
-
-        The ``connection_id_prefix`` parameter was added.
-
-
-.. _poolparamsmeth:
-
-PoolParams Methods
-==================
-
-.. automethod:: PoolParams.copy
-
-.. automethod:: PoolParams.get_connect_string
-
-.. automethod:: PoolParams.parse_connect_string
-
-.. automethod:: PoolParams.set
-
-    .. versionchanged:: 3.2.0
-
-        The ``pool_name`` parameter was added.
-
-    .. versionchanged:: 3.0.0
-
-        The ``use_sni``, ``thick_mode_dsn_passthrough``,
-        ``extra_auth_params`` and ``instance_name`` parameters were added.
-
-    .. versionchanged:: 2.5.0
-
-        The ``program``, ``machine``, ``terminal``, ``osuser``, and
-        ``driver_name`` parameters were added. Support for ``edition`` and
-        ``appcontext`` was added to python-oracledb Thin mode.
-
-    .. versionchanged:: 2.3.0
-
-        The ``ping_timeout`` and ``ssl_version`` parameters were added.
-
-    .. versionchanged:: 2.1.0
-
-        The ``pool_boundary`` and ``use_tcp_fast_open`` parameters were added.
-
-.. _poolparamsattr:
-
-PoolParams Attributes
-=====================
-
-All properties are read only.
-
-.. autoproperty:: PoolParams.connectiontype
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.getmode
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.homogeneous
-
-    This attribute is only supported in python-oracledb Thick mode. The
-    python-oracledb Thin mode supports only homogeneous modes.
-
-.. autoproperty:: PoolParams.increment
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.min
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.max
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.max_lifetime_session
-
-    Connections become candidates for termination when they are acquired or
-    released back to the pool, and have existed for longer than
-    ``max_lifetime_session`` seconds. Connections that are in active use will
-    not be closed. In python-oracledb Thick mode, Oracle Client libraries 12.1
-    or later must be used and, prior to Oracle Client 21, cleanup only occurs
-    when the pool is accessed.
-
-.. autoproperty:: PoolParams.max_sessions_per_shard
-
-    This attribute is only supported in python-oracledb Thick mode.
-
-.. autoproperty:: PoolParams.ping_interval
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.ping_timeout
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-    .. versionadded:: 2.3.0
-
-.. autoproperty:: PoolParams.session_callback
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.soda_metadata_cache
-
-    This attribute is only supported in python-oracledb Thick mode.
-
-.. autoproperty:: PoolParams.timeout
-
-    This applies only when the pool has more than ``min`` connections open,
-    allowing it to shrink to the specified minimum size. The default value is
-    *0* seconds. A value of *0* means that there is no maximum time.
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
-
-.. autoproperty:: PoolParams.wait_timeout
-
-    This attribute is supported in both python-oracledb Thin and Thick modes.
diff --git a/doc/src/api_manual/soda.rst b/doc/src/api_manual/soda.rst
deleted file mode 100644
index c3a08791..00000000
--- a/doc/src/api_manual/soda.rst
+++ /dev/null
@@ -1,358 +0,0 @@
-.. _soda:
-
-**********
-API: SODA
-**********
-
-.. currentmodule:: oracledb
-
-`Oracle Database Simple Oracle Document Access (SODA)
-<https://docs.oracle.com/en/database/oracle/simple-oracle-document-access>`__
-allows documents to be inserted, queried, and retrieved from Oracle Database
-using a set of NoSQL-style python-oracledb methods. By default, documents are
-JSON strings. See the :ref:`user manual <sodausermanual>` for examples.
-
-.. note::
-
-    SODA is only supported in python-oracledb Thick mode.  See
-    :ref:`enablingthick`.
-
-.. _sodarequirements:
-
-SODA Requirements
-=================
-
-To use SODA, the role SODA_APP must be granted to the user.  To create
-collections, users need the CREATE TABLE privilege.  These can be granted by a
-DBA:
-
-.. code-block:: sql
-
-    SQL> grant soda_app, create table to myuser;
-
-Advanced users who are using Oracle sequences for keys will also need the
-CREATE SEQUENCE privilege.
-
-SODA requires Oracle Client 18.3 or higher and Oracle Database 18.1 and higher.
-
-.. note::
-
-    SODA APIs are only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick`.
-
-If you are using Oracle Database 21c (or later) and create new collections
-you need to do one of the following:
-
-- Use Oracle Client libraries 21c (or later)
-
-- Or explicitly use collection metadata when creating collections and set
-  the data storage type to BLOB, for example::
-
-    {
-        "keyColumn": {
-            "name":"ID"
-        },
-        "contentColumn": {
-            "name": "JSON_DOCUMENT",
-            "sqlType": "BLOB"
-        },
-        "versionColumn": {
-            "name": "VERSION",
-            "method": "UUID"
-        },
-        "lastModifiedColumn": {
-            "name": "LAST_MODIFIED"
-        },
-        "creationTimeColumn": {
-            "name": "CREATED_ON"
-        }
-    }
-
-- Or set the database initialization parameter `compatible
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-  id=GUID-A2E90F08-BC9F-4688-A9D0-4A948DD3F7A9>`__ to 19.0.0 or lower
-
-Otherwise, you may get errors such as ``ORA-40842: unsupported value JSON in
-the metadata for the field sqlType`` or ``ORA-40659: Data type does not match
-the specification in the collection metadata``.
-
-.. _sodadb:
-
-SodaDatabase Class
-==================
-
-.. autoclass:: SodaDatabase
-
-    A SodaDatabase object is returned by :meth:`Connection.getSodaDatabase()`.
-
-    .. dbapiobjectextension::
-
-SodaDatabase Methods
---------------------
-
-.. automethod:: SodaDatabase.createCollection
-
-    .. seealso::
-
-        :ref:`SODA collection object <sodacoll>` and `Oracle Database SODA
-        Collection Metadata Reference <https://www.oracle.com/pls/topic/lookup
-        ?ctx=dblatest&id=GUID-49EFF3D3-9FAB-4DA6-BDE2-2650383566A3>`__
-
-.. automethod:: SodaDatabase.createDocument
-
-.. automethod:: SodaDatabase.getCollectionNames
-
-.. automethod:: SodaDatabase.openCollection
-
-.. _sodacoll:
-
-SodaCollection Class
-====================
-
-.. autoclass:: SodaCollection
-
-    A SODA Collection object is used to represent SODA collections and is
-    created by :meth:`SodaDatabase.createCollection()` and
-    :meth:`SodaDatabase.openCollection()`.
-
-    .. dbapiobjectextension::
-
-SodaCollection Methods
-----------------------
-
-.. automethod:: SodaCollection.createIndex
-
-    .. seealso::
-
-        `Overview of SODA Indexing <https://www.oracle.com/pls/topic/lookup?
-        ctx=dblatest&id=GUID-4848E6A0-58A7-44FD-8D6D-A033D0CCF9CB>`__
-
-.. automethod:: SodaCollection.drop
-
-.. automethod:: SodaCollection.dropIndex
-
-    .. seealso::
-
-        `DROP INDEX statement <https://www.oracle.com/pls/topic/lookup?ctx=
-        dblatest&id=GUID-F60F75DF-2866-4F93-BB7F-8FCE64BF67B6>`__
-
-.. automethod:: SodaCollection.find
-
-    .. seealso::
-
-        :ref:`SodaOperation object <sodaop>`
-
-.. automethod:: SodaCollection.getDataGuide
-
-    .. seealso::
-
-        :ref:`SODA document object <sodadoc>`
-
-.. automethod:: SodaCollection.insertMany
-
-    .. seealso::
-
-        :ref:`SODA document object <sodadoc>`.
-
-.. automethod:: SodaCollection.insertManyAndGet
-
-    .. seealso::
-
-        :ref:`SODA Document objects <sodadoc>`, `MONITOR and NO_MONITOR Hints
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-19E0F73C
-        -A959-41E4-A168-91E436DEE1F1>`__, and `Monitoring Database Operations
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-C941CE9D
-        -97E1-42F8-91ED-4949B2B710BF>`__
-
-.. automethod:: SodaCollection.insertOne
-
-    .. seealso::
-
-        :ref:`SODA document object <sodadoc>`
-
-.. automethod:: SodaCollection.insertOneAndGet
-
-    .. seealso::
-
-        :ref:`SODA Document object <sodadoc>`, `MONITOR and NO_MONITOR Hints
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-19E0F73C
-        -A959-41E4-A168-91E436DEE1F1>`__, and `Monitoring Database Operations
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-C941CE9D
-        -97E1-42F8-91ED-4949B2B710BF>`__
-
-.. automethod:: SodaCollection.listIndexes
-
-    .. versionadded:: 1.4.0
-
-.. automethod:: SodaCollection.save
-
-.. automethod:: SodaCollection.saveAndGet
-
-    .. seealso::
-
-        `MONITOR and NO_MONITOR Hints <https://www.oracle.com/pls/topic/lookup?
-        ctx=dblatest&id=GUID-19E0F73C-A959-41E4-A168-91E436DEE1F1>`__ and
-        `Monitoring Database Operations <https://www.oracle.com/pls/topic/
-        lookup?ctx=dblatest&id=GUID-C941CE9D-97E1-42F8-91ED-4949B2B710BF>`__
-
-.. automethod:: SodaCollection.truncate
-
-SodaCollection Attributes
--------------------------
-
-.. autoproperty:: SodaCollection.metadata
-
-    .. seealso::
-
-        `Oracle Database SODA Collection Metadata Reference <https://www.oracle
-        .com/pls/topic/lookup?ctx=dblatest&id=GUID-49EFF3D3-9FAB-4DA6-BDE2-
-        2650383566A3>`__
-
-.. autoproperty:: SodaCollection.name
-
-.. _sodadoc:
-
-SodaDocument Class
-==================
-
-.. autoclass:: SodaDocument
-
-    A SODA Document object is returned by
-    :meth:`SodaDatabase.createDocument()`,
-    :meth:`SodaOperation.getDocuments()`, and
-    :meth:`SodaOperation.getOne()` as well as by iterating over
-    :ref:`SODA document cursors <sodadoccur>`.
-
-    .. dbapiobjectextension::
-
-SodaDocument Methods
---------------------
-
-.. automethod:: SodaDocument.getContent
-
-.. automethod:: SodaDocument.getContentAsBytes
-
-.. automethod:: SodaDocument.getContentAsString
-
-SodaDocument Attributes
------------------------
-
-.. autoproperty:: SodaDocument.createdOn
-
-    .. seealso::
-
-        `ISO 8601 <https://www.iso.org/iso-8601-date-and-time-format.html>`__
-
-.. autoproperty:: SodaDocument.key
-
-.. autoproperty:: SodaDocument.lastModified
-
-    .. seealso::
-
-        `ISO 8601 <https://www.iso.org/iso-8601-date-and-time-format.html>`__
-
-.. autoproperty:: SodaDocument.mediaType
-
-.. autoproperty:: SodaDocument.version
-
-.. _sodadoccur:
-
-SodaDocCursor Class
-===================
-
-.. autoclass:: SodaDocCursor
-
-    A SodaDocCursor object is returned by :meth:`SodaOperation.getCursor()`
-    and implements the iterator protocol. Each iteration will return a
-    :ref:`SODA document object <sodadoc>`.
-
-    .. dbapiobjectextension::
-
-SodaDocCursor Methods
----------------------
-
-.. automethod:: SodaDocCursor.close
-
-.. _sodaop:
-
-SodaOperation Class
-===================
-
-.. autoclass:: SodaOperation
-
-    A SODA Operation object represents an operation that will be performed on
-    all or some of the documents in a SODA collection. This object is created
-    by :meth:`SodaCollection.find()`.
-
-    .. dbapiobjectextension::
-
-SodaOperation Methods
----------------------
-
-.. automethod:: SodaOperation.count
-
-.. automethod:: SodaOperation.fetchArraySize
-
-.. automethod:: SodaOperation.filter
-
-    .. seealso::
-
-        `Overview of SODA filter specifications <https://www.oracle.com/pls/
-        topic/lookup?ctx=dblatest&id=GUID-CB09C4E3-BBB1-40DC-88A8-
-        8417821B0FBE>`__
-
-.. automethod:: SodaOperation.getCursor
-
-    .. seealso::
-
-        :ref:`SODA Document Cursor object <sodadoccur>`
-
-.. automethod:: SodaOperation.getDocuments
-
-    .. seealso::
-
-        :ref:`SODA Document objects <sodadoc>`
-
-.. automethod:: SodaOperation.getOne
-
-    .. seealso::
-
-        :ref:`SODA Document object <sodadoc>`
-
-.. automethod:: SodaOperation.hint
-
-    .. seealso::
-
-        Oracle AI Database SQL Tuning Guide documentation `MONITOR and
-        NO_MONITOR Hints <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-        id=GUID-19E0F73C-A959-41E4-A168-91E436DEE1F1>`__ and `Monitoring Database
-        Operations <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-        GUID-C941CE9D-97E1-42F8-91ED-4949B2B710BF>`__
-
-.. automethod:: SodaOperation.key
-
-.. automethod:: SodaOperation.keys
-
-.. automethod:: SodaOperation.limit
-
-.. automethod:: SodaOperation.lock
-
-    .. versionadded:: 1.4.0
-
-.. automethod:: SodaOperation.remove
-
-.. automethod:: SodaOperation.replaceOne
-
-    .. seealso::
-
-        :ref:`SODA document object <sodadoc>`
-
-.. automethod:: SodaOperation.replaceOneAndGet
-
-    .. seealso::
-
-        :ref:`SODA document object <sodadoc>`
-
-.. automethod:: SodaOperation.skip
-
-.. automethod:: SodaOperation.version
diff --git a/doc/src/api_manual/sparse_vector.rst b/doc/src/api_manual/sparse_vector.rst
deleted file mode 100644
index de75bc93..00000000
--- a/doc/src/api_manual/sparse_vector.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-.. _sparsevectorsobj:
-
-*************************
-API: SparseVector Objects
-*************************
-
-.. currentmodule:: oracledb
-
-SparseVector Class
-==================
-
-.. autoclass:: SparseVector
-
-    See :ref:`sparsevectors` for more information.
-
-    .. versionadded:: 3.0.0
-
-SparseVector Attributes
-=======================
-
-.. autoproperty:: SparseVector.indices
-
-.. autoproperty:: SparseVector.num_dimensions
-
-.. autoproperty:: SparseVector.values
diff --git a/doc/src/api_manual/subscription.rst b/doc/src/api_manual/subscription.rst
deleted file mode 100644
index 5371de7d..00000000
--- a/doc/src/api_manual/subscription.rst
+++ /dev/null
@@ -1,140 +0,0 @@
-.. _subscrobj:
-
-*************************
-API: Subscription Objects
-*************************
-
-.. currentmodule:: oracledb
-
-.. dbapiobjectextension::
-
-Subscription Class
-==================
-
-.. autoclass:: Subscription
-
-    A Subscription object should be created using
-    :meth:`Connection.subscribe()`. See :ref:`cqn` for more information.
-
-Subscription Methods
---------------------
-
-.. automethod:: Subscription.registerquery
-
-Subscription Attributes
------------------------
-
-.. autoproperty:: Subscription.callback
-
-.. autoproperty:: Subscription.connection
-
-.. autoproperty:: Subscription.id
-
-.. autoproperty:: Subscription.ip_address
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``ipAddress`` was renamed to ``ip_address``. The old name will
-    continue to work for a period of time.
-
-.. autoproperty:: Subscription.name
-
-.. autoproperty:: Subscription.namespace
-
-.. autoproperty:: Subscription.operations
-
-.. autoproperty:: Subscription.port
-
-.. autoproperty:: Subscription.protocol
-
-.. autoproperty:: Subscription.qos
-
-.. autoproperty:: Subscription.timeout
-
-.. _msgobjects:
-
-Message Class
-=============
-
-.. autoclass:: Message
-
-    A Message object is created when a notification is received. They are
-    passed to the callback procedure specified when a subscription is created.
-
-Message Attributes
-------------------
-
-.. autoproperty:: Message.consumer_name
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``consumerName`` was renamed to ``consumer_name``. The old name
-    will continue to work for a period of time.
-
-.. autoproperty:: Message.dbname
-
-.. autoproperty:: Message.msgid
-
-.. autoproperty:: Message.queries
-
-.. autoproperty:: Message.queue_name
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``queueName`` was renamed to ``queue_name``. The old name will
-    continue to work for a period of time.
-
-.. autoproperty:: Message.registered
-
-.. autoproperty:: Message.subscription
-
-.. autoproperty:: Message.tables
-
-.. autoproperty:: Message.txid
-
-.. autoproperty:: Message.type
-
-    See the constants section on :ref:`eventtypes` for additional information.
-
-MessageTable Class
-==================
-
-.. autoclass:: MessageTable
-
-    A MessageTable object is created when a notification is received for each
-    table change. They are accessed in the tables attribute of message
-    objects, and the tables attribute of message query objects.
-
-.. autoproperty:: MessageTable.name
-
-.. autoproperty:: MessageTable.operation
-
-.. autoproperty:: MessageTable.rows
-
-MessageRow Class
-================
-
-.. autoclass:: MessageRow
-
-    A MessageRow object is created when a notification is received for each
-    row changed in a table. They are found in the rows attribute of message
-    table objects.
-
-MessageRow Attributes
----------------------
-
-.. autoproperty:: MessageRow.operation
-
-.. autoproperty:: MessageRow.rowid
-
-MessageQuery Class
-==================
-
-.. autoclass:: MessageQuery
-
-    A MessageQuery object is created when a notification is received for a
-    query result set change. This object is found in the queries attribute of
-    message objects.
-
-.. autoproperty:: MessageQuery.id
-
-.. autoproperty:: MessageQuery.operation
-
-.. autoproperty:: MessageQuery.tables
diff --git a/doc/src/api_manual/variable.rst b/doc/src/api_manual/variable.rst
deleted file mode 100644
index dec5f024..00000000
--- a/doc/src/api_manual/variable.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. _varobj:
-
-*********************
-API: Variable Objects
-*********************
-
-.. currentmodule:: oracledb
-
-Variable Class
-==============
-
-.. autoclass:: Var
-
-    A Var object should be created with :meth:`Cursor.var()` or
-    :meth:`Cursor.arrayvar()`.
-
-    .. dbapiobjectextension::
-
-Variable Methods
-=================
-
-.. automethod:: Var.getvalue
-
-.. automethod:: Var.setvalue
-
-Variable Attributes
-===================
-
-.. autoproperty:: Var.actual_elements
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``actualElements`` was renamed to ``actual_elements``. The old
-    name will continue to work for a period of time.
-
-.. autoproperty:: Var.buffer_size
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``bufferSize`` was renamed to ``buffer_size``. The old
-    name will continue to work for a period of time.
-
-.. autoproperty:: Var.convert_nulls
-
-   .. versionadded:: 1.4.0
-
-.. autoproperty:: Var.inconverter
-
-.. autoproperty:: Var.num_elements
-
-    For consistency and compliance with the PEP 8 naming style, the
-    attribute ``numElements`` was renamed to ``num_elements``. The old name
-    will continue to work for a period of time.
-
-.. autoproperty:: Var.outconverter
-
-.. autoproperty:: Var.size
-
-.. autoproperty:: Var.type
-
-.. autoproperty:: Var.values
diff --git a/doc/src/conf.py b/doc/src/conf.py
deleted file mode 100644
index ebb643d7..00000000
--- a/doc/src/conf.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# python-oracledb documentation build configuration file
-#
-# This file is execfile()d with the current directory set to its containing dir
-#
-# The contents of this file are pickled, so don't put values in the namespace
-# that aren't pickleable (module imports are okay, they're removed
-# automatically).
-#
-# All configuration values have a default value; values that are commented out
-# serve to show the default value.
-
-import os
-import pathlib
-import sys
-
-# If your extensions are in another directory, add it here.
-sys.path.append(os.path.abspath("_ext"))
-
-# include the path of the source so that autodoc will function
-sys.path.insert(0, str(pathlib.Path("..", "src").resolve()))
-
-# General configuration
-# ---------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = [
-    "table_with_summary",
-    "oracle_deprecated",
-    "dbapi_extension",
-    "sphinx_rtd_theme",
-    "sphinx.ext.autodoc",
-]
-
-# preserve defaults in function signatures
-autodoc_preserve_defaults = True
-
-# ensure that the constructor documentation is used in class documentation
-autoclass_content = "init"
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = [".templates"]
-
-# The suffix of source filenames.
-source_suffix = {".rst": "restructuredtext"}
-
-# The root toctree document.
-root_doc = master_doc = "index"
-
-# General substitutions.
-project = "python-oracledb"
-copyright = (
-    "2016, 2025, Oracle and/or its affiliates. All rights reserved. "
-    "Portions Copyright © 2007-2015, Anthony Tuininga. All rights reserved. "
-    "Portions Copyright © 2001-2007, Computronix (Canada) Ltd., "
-    "Edmonton, Alberta, Canada. All rights reserved"
-)
-author = "Oracle"
-
-# The default replacements for |version| and |release|, also used in various
-# other places throughout the built documents.
-#
-# The values are acquired from the __version__ constant defined in the module
-# itself in order to avoid duplicate values (and therefore one being different
-# from the other)
-#
-# The short X.Y version.
-global_vars = {}
-local_vars = {}
-version_file_name = os.path.join("..", "..", "src", "oracledb", "version.py")
-with open(version_file_name) as f:
-    exec(f.read(), global_vars, local_vars)
-version = ".".join(local_vars["__version__"].split(".")[:2])
-# The full version, including alpha/beta/rc tags.
-release = local_vars["__version__"]
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-# today = ''
-# Else, today_fmt is used as the format for a strftime call.
-today_fmt = "%B %d, %Y"
-
-# List of documents that shouldn't be included in the build.
-# unused_docs = []
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-# add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-# show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
-
-
-# Options for HTML output
-# -----------------------
-
-# The style sheet to use for HTML and HTML Help pages. A file of that name
-# must exist either in Sphinx' static/ path, or in one of the custom paths
-# given in html_static_path.
-# html_style = 'default.css'
-
-# The theme to use for readthedocs.
-html_theme = "sphinx_rtd_theme"
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = [".static"]
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = "%b %d, %Y"
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-# html_use_smartypants = True
-
-# Content template for the index page.
-# html_index = ''
-
-# Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-# html_additional_pages = {}
-
-# If false, no module index is generated.
-# html_use_modindex = True
-
-# If true, the reST sources are included in the HTML build as _sources/<name>.
-html_copy_source = False
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "oracledbdoc"
-
-numfig = True
-
-
-# Display tables with no horizontal scrollbar
-def setup(app):
-    app.add_css_file("custom.css")
-
-
-# Options for LaTeX output
-# ------------------------
-
-# The paper size ('letter' or 'a4').
-# latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-# latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, document class
-# [howto/manual]).
-# latex_documents = []
-
-# Additional stuff for the LaTeX preamble.
-# latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-# latex_appendices = []
-
-# If false, no module index is generated.
-# latex_use_modindex = True
diff --git a/doc/src/images/python-oracledb-thick-arch.png b/doc/src/images/python-oracledb-thick-arch.png
deleted file mode 100644
index 8b24c53d..00000000
Binary files a/doc/src/images/python-oracledb-thick-arch.png and /dev/null differ
diff --git a/doc/src/images/python-oracledb-thin-arch.png b/doc/src/images/python-oracledb-thin-arch.png
deleted file mode 100644
index 20948905..00000000
Binary files a/doc/src/images/python-oracledb-thin-arch.png and /dev/null differ
diff --git a/doc/src/index.rst b/doc/src/index.rst
deleted file mode 100644
index 2f590eb8..00000000
--- a/doc/src/index.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-Welcome to python-oracledb's documentation
-==========================================
-
-The python-oracledb driver is an open source Python module that enables access
-to Oracle Database with no extra libraries needed. The module is built with
-Cython for safety and speed. It is lightweight and high-performance. It is
-stable, well tested, and has comprehensive documentation. The module is
-maintained by Oracle.
-
-You can use assistive technology products, such as screen readers, while you
-work with the python-oracledb documentation. You can also use the keyboard
-instead of the mouse.
-
-User Guide
-==========
-
-.. toctree::
-    :numbered:
-    :maxdepth: 3
-
-    user_guide/introduction.rst
-    user_guide/installation.rst
-    user_guide/initialization.rst
-    user_guide/connection_handling.rst
-    user_guide/authentication_methods.rst
-    user_guide/sql_execution.rst
-    user_guide/plsql_execution.rst
-    user_guide/bind.rst
-    user_guide/batch_statement.rst
-    user_guide/txn_management.rst
-    user_guide/tuning.rst
-    user_guide/lob_data.rst
-    user_guide/json_data_type.rst
-    user_guide/xml_data_type.rst
-    user_guide/vector_data_type.rst
-    user_guide/dataframes.rst
-    user_guide/soda.rst
-    user_guide/aq.rst
-    user_guide/cqn.rst
-    user_guide/two_phase_commit.rst
-    user_guide/startup.rst
-    user_guide/ha.rst
-    user_guide/asyncio.rst
-    user_guide/globalization.rst
-    user_guide/exception_handling.rst
-    user_guide/tracing.rst
-    user_guide/extending.rst
-    user_guide/troubleshooting.rst
-    user_guide/appendix_a.rst
-    user_guide/appendix_b.rst
-    user_guide/appendix_c.rst
-    user_guide/appendix_d.rst
-
-API Manual
-==========
-
-.. toctree::
-    :numbered:
-    :maxdepth: 3
-
-    api_manual/module.rst
-    api_manual/defaults.rst
-    api_manual/connection.rst
-    api_manual/connect_params.rst
-    api_manual/connection_pool.rst
-    api_manual/pool_params.rst
-    api_manual/cursor.rst
-    api_manual/dataframe.rst
-    api_manual/fetch_info.rst
-    api_manual/variable.rst
-    api_manual/subscription.rst
-    api_manual/lob.rst
-    api_manual/dbobject_type.rst
-    api_manual/sparse_vector.rst
-    api_manual/aq.rst
-    api_manual/soda.rst
-    api_manual/async_connection.rst
-    api_manual/async_connection_pool.rst
-    api_manual/async_cursor.rst
-    api_manual/async_lob.rst
-    api_manual/async_aq.rst
-    api_manual/pipeline.rst
-    api_manual/deprecations.rst
-
-.. toctree::
-    :maxdepth: 1
-
-    release_notes.rst
-    license.rst
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/doc/src/license.rst b/doc/src/license.rst
deleted file mode 100644
index b81cfd3d..00000000
--- a/doc/src/license.rst
+++ /dev/null
@@ -1,241 +0,0 @@
-:orphan:
-
-.. _license:
-
-*******
-License
-*******
-
-.. include:: <isonum.txt>
-
-.. centered:: **LICENSE AGREEMENT FOR python-oracledb**
-
-Copyright |copy| 2016, 2025 Oracle and/or its affiliates.
-
-This software is dual-licensed to you under the Universal Permissive License
-(UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-either license.
-
-If you elect to accept the software under the Apache License, Version 2.0,
-the following applies:
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-The Universal Permissive License (UPL), Version 1.0
-===================================================
-
-Subject to the condition set forth below, permission is hereby granted to any
-person obtaining a copy of this software, associated documentation and/or data
-(collectively the "Software"), free of charge and under any and all copyright
-rights in the Software, and any and all patent rights owned or freely
-licensable by each licensor hereunder covering either (i) the unmodified
-Software as contributed to or provided by such licensor, or (ii) the Larger
-Works (as defined below), to deal in both
-
-(a) the Software, and
-
-(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
-    one is included with the Software (each a "Larger Work" to which the
-    Software is contributed by such licensors),
-
-without restriction, including without limitation the rights to copy, create
-derivative works of, display, perform, and distribute the Software and make,
-use, sell, offer for sale, import, export, have made, and have sold the
-Software and the Larger Work(s), and to sublicense the foregoing rights on
-either these or other terms.
-
-This license is subject to the following condition:
-
-The above copyright notice and either this complete permission notice or at a
-minimum a reference to the UPL must be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Apache License
-==============
-
-Version 2.0, January 2004
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  **Definitions**.
-
-    "License" shall mean the terms and conditions for use, reproduction, and
-    distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by the
-    copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all other
-    entities that control, are controlled by, or are under common control with
-    that entity.  For the purposes of this definition, "control" means (i) the
-    power, direct or indirect, to cause the direction or management of such
-    entity, whether by contract or otherwise, or (ii) ownership of fifty
-    percent (50%) or more of the outstanding shares, or (iii) beneficial
-    ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity exercising
-    permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation source,
-    and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical transformation
-    or translation of a Source form, including but not limited to compiled
-    object code, generated documentation, and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or Object form,
-    made available under the License, as indicated by a copyright notice that
-    is included in or attached to the work (an example is provided in the
-    Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object form,
-    that is based on (or derived from) the Work and for which the editorial
-    revisions, annotations, elaborations, or other modifications represent, as
-    a whole, an original work of authorship. For the purposes of this License,
-    Derivative Works shall not include works that remain separable from, or
-    merely link (or bind by name) to the interfaces of, the Work and Derivative
-    Works thereof.
-
-    "Contribution" shall mean any work of authorship, including the original
-    version of the Work and any modifications or additions to that Work or
-    Derivative Works thereof, that is intentionally submitted to Licensor for
-    inclusion in the Work by the copyright owner or by an individual or Legal
-    Entity authorized to submit on behalf of the copyright owner. For the
-    purposes of this definition, "submitted" means any form of electronic,
-    verbal, or written communication sent to the Licensor or its
-    representatives, including but not limited to communication on electronic
-    mailing lists, source code control systems, and issue tracking systems that
-    are managed by, or on behalf of, the Licensor for the purpose of discussing
-    and improving the Work, but excluding communication that is conspicuously
-    marked or otherwise designated in writing by the copyright owner as "Not a
-    Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity on
-    behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  **Grant of Copyright License.** Subject to the terms and conditions of this
-    License, each Contributor hereby grants to You a perpetual, worldwide,
-    non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-    reproduce, prepare Derivative Works of, publicly display, publicly perform,
-    sublicense, and distribute the Work and such Derivative Works in Source or
-    Object form.
-
-3.  **Grant of Patent License.** Subject to the terms and conditions of this
-    License, each Contributor hereby grants to You a perpetual, worldwide,
-    non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
-    this section) patent license to make, have made, use, offer to sell, sell,
-    import, and otherwise transfer the Work, where such license applies only to
-    those patent claims licensable by such Contributor that are necessarily
-    infringed by their Contribution(s) alone or by combination of their
-    Contribution(s) with the Work to which such Contribution(s) was submitted.
-    If You institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-    Contribution incorporated within the Work constitutes direct or
-    contributory patent infringement, then any patent licenses granted to You
-    under this License for that Work shall terminate as of the date such
-    litigation is filed.
-
-4.  **Redistribution.** You may reproduce and distribute copies of the Work or
-    Derivative Works thereof in any medium, with or without modifications, and
-    in Source or Object form, provided that You meet the following conditions:
-
-    1.  You must give any other recipients of the Work or Derivative Works a
-        copy of this License; and
-
-    2.  You must cause any modified files to carry prominent notices stating
-        that You changed the files; and
-
-    3.  You must retain, in the Source form of any Derivative Works that You
-        distribute, all copyright, patent, trademark, and attribution notices
-        from the Source form of the Work, excluding those notices that do not
-        pertain to any part of the Derivative Works; and
-
-    4.  If the Work includes a "NOTICE" text file as part of its distribution,
-        then any Derivative Works that You distribute must include a readable
-        copy of the attribution notices contained within such NOTICE file,
-        excluding those notices that do not pertain to any part of the
-        Derivative Works, in at least one of the following places: within a
-        NOTICE text file distributed as part of the Derivative Works; within
-        the Source form or documentation, if provided along with the Derivative
-        Works; or, within a display generated by the Derivative Works, if and
-        wherever such third-party notices normally appear. The contents of the
-        NOTICE file are for informational purposes only and do not modify the
-        License. You may add Your own attribution notices within Derivative
-        Works that You distribute, alongside or as an addendum to the NOTICE
-        text from the Work, provided that such additional attribution notices
-        cannot be construed as modifying the License.
-
-        You may add Your own copyright statement to Your modifications and may
-        provide additional or different license terms and conditions for use,
-        reproduction, or distribution of Your modifications, or for any such
-        Derivative Works as a whole, provided Your use, reproduction, and
-        distribution of the Work otherwise complies with the conditions stated
-        in this License.
-
-5.  **Submission of Contributions.** Unless You explicitly state otherwise, any
-    Contribution intentionally submitted for inclusion in the Work by You to
-    the Licensor shall be under the terms and conditions of this License,
-    without any additional terms or conditions. Notwithstanding the above,
-    nothing herein shall supersede or modify the terms of any separate license
-    agreement you may have executed with Licensor regarding such Contributions.
-
-6.  **Trademarks.** This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor, except
-    as required for reasonable and customary use in describing the origin of
-    the Work and reproducing the content of the NOTICE file.
-
-7.  **Disclaimer of Warranty.** Unless required by applicable law or agreed to
-    in writing, Licensor provides the Work (and each Contributor provides its
-    Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied, including, without limitation, any
-    warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or
-    FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for
-    determining the appropriateness of using or redistributing the Work and
-    assume any risks associated with Your exercise of permissions under this
-    License.
-
-8.  **Limitation of Liability.** In no event and under no legal theory, whether
-    in tort (including negligence), contract, or otherwise, unless required by
-    applicable law (such as deliberate and grossly negligent acts) or agreed to
-    in writing, shall any Contributor be liable to You for damages, including
-    any direct, indirect, special, incidental, or consequential damages of any
-    character arising as a result of this License or out of the use or
-    inability to use the Work (including but not limited to damages for loss of
-    goodwill, work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor has been
-    advised of the possibility of such damages.
-
-9.  **Accepting Warranty or Additional Liability.** While redistributing the
-    Work or Derivative Works thereof, You may choose to offer, and charge a fee
-    for, acceptance of support, warranty, indemnity, or other liability
-    obligations and/or rights consistent with this License. However, in
-    accepting such obligations, You may act only on Your own behalf and on Your
-    sole responsibility, not on behalf of any other Contributor, and only if
-    You agree to indemnify, defend, and hold each Contributor harmless for any
-    liability incurred by, or claims asserted against, such Contributor by
-    reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
deleted file mode 100644
index 53ccec1f..00000000
--- a/doc/src/release_notes.rst
+++ /dev/null
@@ -1,4044 +0,0 @@
-:orphan:
-
-.. _releasenotes:
-
-.. currentmodule:: oracledb
-
-python-oracledb Release Notes
-=============================
-
-For deprecations, see :ref:`Deprecations <deprecations>`.
-
-Release changes are listed as affecting Thin Mode (the default runtime behavior
-of python-oracledb), as affecting the optional :ref:`Thick Mode
-<enablingthick>`, or as being 'Common' for changes that impact both modes.
-
-oracledb `3.5.0 <https://github.com/oracle/python-oracledb/compare/v3.4.1...v3.5.0>`__ (TBD)
---------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-Thick Mode Changes
-++++++++++++++++++
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug when getting the expiry time of
-    :ref:`authentication tokens <tokenauth>`
-    (`issue 548 <https://github.com/oracle/python-oracledb/issues/548>`__).
-#)  Added Session Token-based authentication support when using
-    :ref:`OCI Cloud Native Authentication <cloudnativeauthoci>`
-    (`issue 527 <https://github.com/oracle/python-oracledb/issues/527>`__).
-#)  Fixed bug when using multiple
-    :ref:`cloud native authentication <tokenauth>` plugins for connections.
-    Note that an invalid ``auth_type`` parameter will no longer raise an
-    exception but will simply be ignored.
-#)  Fixed regression with contents of :data:`Cursor.description` when calling
-    :meth:`Cursor.parse()` with a query that returns LOBs.
-#)  Updated the `Jupyter notebook samples <https://github.com/oracle/
-    python-oracledb/tree/main/samples/notebooks>`__ to cover recent
-    python-oracledb features.
-
-
-oracledb `3.4.1 <https://github.com/oracle/python-oracledb/compare/v3.4.0...v3.4.1>`__ (November 2025)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug when fetching a timestamp with nanosecond precision into a data
-    frame
-    (`issue 538 <https://github.com/oracle/python-oracledb/issues/538>`__).
-#)  Fixed bug when adding a call to a PL/SQL function which returns LOBs to a
-    :ref:`pipeline <pipelining>`.
-#)  Fixed bug when using bind variables with scrollable cursors.
-#)  Fixed bug when setting ``SOURCE_ROUTE`` on the ``DESCRIPTION`` section of a
-    full connect descriptor instead of the ``ADDRESS_LIST`` section.
-#)  Fixed bug that failed to handle the KeyboardInterrupt exception correctly
-    when the application caught this exception and then tried to reuse the
-    connection.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed segfault on some platforms when trying to execute queries returning
-    vector columns
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug that caused ``ORA-03137: malformed TTC packet from client
-    rejected`` exception to be raised when attempting to call
-    :meth:`Cursor.parse()` on a scrollable cursor.
-#)  Error ``DPY-2069: requested schema has {num_schema_columns} columns defined
-    but {num_fetched_columns} columns are being fetched`` is now raised when
-    the number of elements in the ``requested_schema`` parameter to
-    :meth:`Connection.fetch_df_all()` and :meth:`Connection.fetch_df_batches()`
-    doesn't match the number of columns being fetched. Previously this scenario
-    would throw unhelpful execptions or cause a segfault under certain
-    circumstances.
-#)  Error ``DPY-2068: scroll operation is not supported on a non-scrollable
-    cursor`` is now raised when using :meth:`Cursor.scroll()` method on a
-    non-scrollable cursor.
-
-
-oracledb `3.4.0 <https://github.com/oracle/python-oracledb/compare/v3.3.0...v3.4.0>`__ (October 2025)
------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for Oracle Database's :ref:`Direct Path Load
-    <directpathloads>` functionality which is very efficient for loading large
-    datasets into a database. Data may be a list of sequences or a DataFrame
-    object.
-#)  Fixed bug when setting values of type ``datetime.date`` on variables (such
-    as created by :meth:`Cursor.var()` or implicitly by
-    :meth:`Cursor.setinputsizes()`) of types
-    :attr:`oracledb.DB_TYPE_TIMESTAMP`, :attr:`oracledb.DB_TYPE_TIMESTAMP_TZ`
-    and :attr:`oracledb.DB_TYPE_TIMESTAMP_LTZ`.
-#)  Fixed bug validating the database host during connection.
-#)  Fixed bug causing hang due to blocked task cancellation during
-    :ref:`asyncio <concurrentprogramming>` loop shutdown.
-#)  Internal change: refactor encoding of Oracle data types.
-#)  Internal change: small performance improvement sending bytes on the
-    network transport.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug with error wrapping which could result in garbage characters
-    being introduced. Fixed potential bug when truncation could occur with very
-    large error messages.
-#)  Executed statements are normalized by removing leading and trailing spaces
-    before being sent to Oracle Database.
-
-Common Changes
-++++++++++++++
-
-#)  Changes to :ref:`data frame <dataframeformat>` support:
-
-    - Support for data frames is no longer considered a pre-release.
-    - Added parameter ``requested_schema`` to :meth:`Connection.fetch_df_all()`
-      and :meth:`Connection.fetch_df_batches()` to support type mapping when
-      querying
-      (`issue 494 <https://github.com/oracle/python-oracledb/issues/494>`__).
-    - The Apache Arrow data type "large" variants that have 64-bit offsets are
-      now used by default for strings and binary values in order to avoid the
-      limits imposed by using 32-bit offsets. Use ``requested_schema`` if the
-      smaller offset size is desired
-      (`issue 536 <https://github.com/oracle/python-oracledb/issues/536>`__).
-    - Added support for all of the signed and unsigned fixed width integer
-      types when ingesting data frames supporting the Arrow PyCapsule
-      interface. Previously only ``int64`` was supported.
-    - Added support for types ``date32`` and ``date64`` when ingesting data
-      frames supporting the Arrow PyCapsule interface as requested
-      (`issue 535 <https://github.com/oracle/python-oracledb/issues/535>`__).
-    - Ingesting data frames with multiple chunks is now supported.
-    - Error ``DPY-8002: Apach Arrow C Data structure overflow detected. A
-      larger structure is needed.`` is now raised when an overflow is detected
-      (`issue 536 <https://github.com/oracle/python-oracledb/issues/536>`__).
-    - Fixed bug when fetching NCHAR and NVARCHAR2 column data.
-    - Fixed bug when attempting to convert an integer that cannot be
-      represented as a native C ``int`` value to an Arrow data frame
-      (`issue 537 <https://github.com/oracle/python-oracledb/issues/537>`__).
-
-#)  Added a ``batch_size`` parameter to :meth:`Cursor.executemany()` and
-    :meth:`AsyncCursor.executemany()` to let these methods operate on data in
-    batches.
-#)  Added ``fetch_lobs`` and ``fetch_decimals`` parameters where applicable to
-    the methods used for fetching rows or data frames from the database. Note
-    that for the creation of pipeline operations, if these parameters are not
-    specified then the values of
-    :attr:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>` and
-    :attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>` are now
-    stored with the operation and used during pipeline execution
-    (`issue 19 <https://github.com/oracle/python-oracledb/issues/19>`__).
-#)   Added optional dependencies `[oci_config]`, `[azure_config]`,
-     `[oci_auth]`, and `[azure_auth]` to simplify installation of required
-     packages for :ref:`Centralized Configuration Provider
-     <configprovidermodules>` support and :ref:`Cloud Native Authentication
-     <cloudnativemodules>` support
-     (`issue 512 <https://github.com/oracle/python-oracledb/issues/512>`__).
-#)  The x86_64 macOS and 32-bit Windows platforms are :ref:`deprecated
-    <deprecations>`. They will be desupported in a future release before, or
-    when, the `cryptography <https://pypi.org/project/cryptography/>`__ package
-    desupports them. See the `cryptography deprecation announcement
-    <https://mail.python.org/
-    archives/list/python-announce-list@python.org/thread/
-    R4BZNC36MSFLKULA74KILLFY6GP3VCPA/>`__.
-#)  Connectivity and interoperability with Oracle Database and Oracle Client
-    libraries older than version 19 is deprecated and will be removed in a
-    future version of python-oracledb. Production use, and availability of
-    database and client software, is detailed in `Release Schedule of Current
-    Database Releases <https://support.oracle.com/epmos/faces/
-    DocumentDisplay?id=742060.1>`__.
-#)  Pin Cython to 3.1.x instead of 3.1.0 as requested
-    (`issue 530 <https://github.com/oracle/python-oracledb/issues/530>`__).
-#)  Fixed bug when attempting to execute an empty statement
-    (`issue 525 <https://github.com/oracle/python-oracledb/issues/525>`__).
-#)  Fixed bug when attempting to append an element to a
-    :ref:`DbObject <dbobjecttype>` which is not actually a collection.
-#)  API documentation is now generated from the source code.
-#)  The test suite now uses `pytest <https://docs.pytest.org/>`__.
-#)  Internal change: the value of ``__module__`` for all classes is now left
-    untouched to avoid issues with ``inspect.getsource()`` but ``__repr__()``
-    now consistently shows the module as ``oracledb``.
-#)  Internal change: `typing_extensions <https://pypi.org/project/
-    typing-extensions/>`__ is now a dependency.
-
-
-oracledb `3.3.0 <https://github.com/oracle/python-oracledb/compare/v3.2.0...v3.3.0>`__ (July 2025)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Error ``DPY-3001: session tagging is only supported in python-oracledb
-    thick mode`` is now raised when attempting to use session tagging with a
-    connection pool. Previously a ``NotImplementedError`` exception was raised
-    instead.
-#)  Fixed bug in the calculation of attribute
-    :attr:`MessageProperties.deliverymode`. Previously it was being set to the
-    value of the attribute :attr:`DeqOptions.deliverymode`.
-#)  Fixed bug with detection of when a connection has been closed by the
-    database without notification.
-#)  Fixed bug with execution of a PL/SQL block containing at least one output
-    bind variable immediately following a query that returned multiple
-    duplicate rows.
-#)  Fixed bug with connect strings containing ``SOURCE_ROUTE=YES`` where the
-    second host is unresolvable by the host running python-oracledb.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed regression resulting in cursor leak
-    (`issue 513 <https://github.com/oracle/python-oracledb/issues/513>`__).
-
-
-Common Changes
-++++++++++++++
-
-#)  Pre-built binaries are now being created for Python 3.14. Note this Python
-    version is currently in release candidate phase.
-#)  Added support for Oracle Database 23.6 :ref:`Sessionless Transactions
-    <sessionlesstxns>`.
-#)  Changes to :ref:`data frame <dataframeformat>` support:
-
-    - Added support for binding data frames to :meth:`Cursor.executemany()` and
-      :meth:`AsyncCursor.executemany()` for fast data ingestion. See
-      :ref:`dfinsert`.
-    - Added internal support for the ArrowArrayStream PyCapsule interface to
-      simplify :ref:`DataFrame <oracledataframeobj>` use.
-    - Removed use of the DataFrame Interchange Protocol in python-oracledb
-      :ref:`DataFrame <oracledataframeobj>` objects.
-    - Removed the prefix "Oracle" from the data frame object names. They are
-      now called :ref:`DataFrame <oracledataframeobj>` and :ref:`ArrowArray
-      <oraclearrowarrayobj>`.
-    - Documentation on methods and attributes of the :ref:`DataFrame
-      <oracledataframeobj>` and :ref:`ArrowArray <oraclearrowarrayobj>` objects
-      is now available when using IDE introspection.
-    - Upgraded Arrow C Data (nanoarrow) API version to 0.7.0.
-    - Ensured that the `Python GIL
-      <https://docs.python.org/3/glossary.html#term-global-interpreter-lock>`__
-      is held when releasing references to :ref:`ArrowArray
-      <oraclearrowarrayobj>` objects when exported Arrow buffers are released
-      by the consumer. This avoids a segfault seen in some circumstances.
-    - Fixed bug when deciding Arrow datatype for numeric expressions.
-      (`issue 510 <https://github.com/oracle/python-oracledb/issues/510>`__)
-    - Fixed bug when fetching numeric data that has no decimal point but the
-      Arrow array has scale > 0.
-    - Fixed bug when fetching dates that are in the year 2038 or later.
-    - Fixed bug when fetching numeric data with precision that exceeds 38 as
-      decimal data.
-    - Fixed bug when fetching large amounts of data in one round-trip when
-      using asyncio with Oracle Database 21c and earlier.
-
-    Note the data frame support in python-oracledb 3.3 is a pre-release, and
-    may change in a future version.
-#)  Internal change: migrated build configuration completely to pyproject.toml,
-    which allows for optional dependencies for the test suite on the numpy,
-    pandas and pyarrow modules.
-
-
-oracledb `3.2.0 <https://github.com/oracle/python-oracledb/compare/v3.1.1...v3.2.0>`__ (June 2025)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for :ref:`recipient lists <reciplists>` in Oracle Advanced
-    Queuing.
-#)  Emulate support for :meth:`Queue.deqmany()` with JSON payloads when using
-    Oracle Database 21c by internally calling :meth:`Queue.deqone()` as many
-    times as needed.
-#)  Pooled connections that are no longer needed are now closed normally if
-    possible instead of simply having the socket disconnected
-    (`issue 393 <https://github.com/oracle/python-oracledb/issues/393>`__).
-#)  Fixed bug when a connection pool internally makes an attempt to ping a
-    closed connection
-    (`issue 482 <https://github.com/oracle/python-oracledb/issues/482>`__).
-#)  Fixed bug when connecting with asyncio using the parameter ``https_proxy``.
-#)  Fixed bug when fetching LOBs with asyncio from Oracle Database 21c and
-    earlier
-    (`issue 500 <https://github.com/oracle/python-oracledb/issues/500>`__).
-#)  Fixed regression when connecting where only the host specified by the
-    ``https_proxy`` parameter can successfully perform name resolution.
-#)  Fixed bug resulting in explicit request boundaries to aid planned database
-    maintenance not being sent when using connection pools with asyncio.
-#)  Fixed bug populating :attr:`MessageProperties.deliverymode` after dequeue,
-    which is set using :attr:`DeqOptions.deliverymode`.
-#)  Fixed bug resulting in ``TypeError`` when using
-    :attr:`DeqOptions.correlation` for buffered delivery mode.
-#)  Fixed bug when fetching multiple consecutive null values into a :ref:`data
-    frame <dataframeformat>`.
-#)  Fixed bug using :ref:`Oracle Advanced Queuing <aqusermanual>` when
-    attempting to dequeue using an invalid :attr:`DeqOptions.msgid`.
-#)  Fixed bug resulting in an exception when :meth:`Cursor.executemany()` is
-    called with SQL containing bind variables and an empty parameter set
-    (`issue 508 <https://github.com/oracle/python-oracledb/issues/508>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed a bug resulting in error ``DPI-1046: parameter value cannot be a NULL
-    pointer`` when the attributes :attr:`DeqOptions.condition`,
-    :attr:`DeqOptions.consumername`, :attr:`DeqOptions.correlation`,
-    :attr:`DeqOptions.msgid`, :attr:`DeqOptions.transformation`,
-    :attr:`EnqOptions.transformation`, :attr:`MessageProperties.correlation`,
-    or :attr:`MessageProperties.exceptionq` are set to *None*.
-#)  Fixed a bug resulting in a ``ValueError`` exception when getting attribute
-    :attr:`MessageProperties.enqtime` if the value is not available or
-    *None*.
-#)  Fixed a memory leak when enqueuing to JSON queues with
-    :ref:`Oracle Advanced Queuing <aqusermanual>`.
-
-Common Changes
-++++++++++++++
-
-#)  Added Instance Principal authentication support when using
-    :ref:`OCI Cloud Native Authentication <cloudnativeauthoci>`.
-#)  Improvements to :ref:`data frame <dataframeformat>` support:
-
-    - Added support for VECTOR columns when fetching data frames.
-    - Fixed date handling to match PyArrow's and avoid localization issues
-      (`issue 499 <https://github.com/oracle/python-oracledb/issues/499>`__).
-    - Fixed bug on Windows when fetching dates prior to 1970 and after 2038
-      (`issue 483 <https://github.com/oracle/python-oracledb/issues/483>`__).
-    - Added support for the NCHAR, NVARCHAR and NCLOB data types
-      (`issue 505 <https://github.com/oracle/python-oracledb/issues/505>`__).
-
-#)  Added parameter ``pool_name`` to connection and pool creation methods to
-    support Oracle Database 23.4 multi-pool :ref:`drcp`.
-#)  :ref:`GitHub Action <installghactions>` workflow updates:
-
-    - Use GitHub Arm Linux runner for builds. Supplied by wojiushixiaobai
-      (`PR 496 <https://github.com/oracle/python-oracledb/pull/496>`__).
-    - Allow the GitHub build action to build a user-chosen subset of packages.
-    - Fix bug with GitHub build action merge artifacts step
-      (`issue 495 <https://github.com/oracle/python-oracledb/issues/495>`__).
-
-#)  Error ``DPY-2064: parameter 'max' should be greater than or equal to
-    parameter 'min'`` is now raised when a call to
-    :meth:`oracledb.create_pool()`, :meth:`oracledb.create_pool_async()`
-    or :meth:`oracledb.PoolParams()` is made with parameter ``max`` less than
-    the parameter ``min``. Previously python-oracledb Thin mode did not raise
-    an error and python-oracledb Thick mode raised the exception
-    ``ORA-24413: Invalid number of sessions specified``.
-#)  Improved the test suite and documentation.
-
-
-oracledb `3.1.1 <https://github.com/oracle/python-oracledb/compare/v3.1.0...v3.1.1>`__ (May 2025)
--------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug with :meth:`Connection.is_healthy()` after a session is killed,
-    such as by a DBA running ALTER SYSTEM KILL SESSION. Previously, in some
-    databases, it could incorrectly return *True*, while in other cases it
-    could hang.
-
-Common Changes
-++++++++++++++
-
-#)  Added support for using the Cython 3.1 release
-    (`issue 493 <https://github.com/oracle/python-oracledb/issues/493>`__).
-#)  Improvements to data frame fetching with :meth:`Connection.fetch_df_all()`
-    and :meth:`Connection.fetch_df_batches()`:
-
-    - Added support for converting an :ref:`OracleDataFrame
-      <oracledataframeobj>` object to a foreign data frame object more than
-      once
-      (`issue 470 <https://github.com/oracle/python-oracledb/issues/470>`__).
-    - Fixed a bug resulting in a segfault when attempting to use an
-      :ref:`output type handler <outputtypehandlers>` while fetching data frames
-      (`issue 486 <https://github.com/oracle/python-oracledb/issues/486>`__).
-    - Fixed memory corruption in data frame queries
-      (`issue 489 <https://github.com/oracle/python-oracledb/issues/489>`__).
-
-#)  Fixed parsing of the connection string in the
-    :ref:`Azure App Centralized Configuration Provider
-    <azureappstorageprovider>`.
-#)  Miscellaneous grammar and spelling fixes by John Bampton
-    (`PR 479 <https://github.com/oracle/python-oracledb/pull/479>`__).
-
-
-oracledb `3.1.0 <https://github.com/oracle/python-oracledb/compare/v3.0.0...v3.1.0>`__ (April 2025)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for :ref:`scrollable cursors <scrollablecursors>`.
-#)  Improved support for :ref:`Oracle Advanced Queuing <aqusermanual>`:
-
-    - Added support for JSON payloads
-    - Added support for bulk enqueuing and dequeuing
-    - Added support for using AQ with asyncio
-
-#)  Improved error message when the cryptography package cannot be imported
-    (`issue 455 <https://github.com/oracle/python-oracledb/issues/455>`__).
-#)  Fixed decoding of nested PL/SQL records
-    (`issue 456 <https://github.com/oracle/python-oracledb/issues/456>`__).
-#)  Fixed wildcard matching of domains in Subject Alternative Names
-    (`issue 462 <https://github.com/oracle/python-oracledb/issues/462>`__).
-#)  Fixed bug when binding a temporary LOB IN/OUT to a PL/SQL procedure
-    (`issue 468 <https://github.com/oracle/python-oracledb/issues/468>`__).
-#)  Fixed bug when an error is reported by the server in the middle of a
-    response to a client request
-    (`issue 472 <https://github.com/oracle/python-oracledb/issues/472>`__).
-#)  Fixed bug when connecting to an AC-enabled service
-    (`issue 476 <https://github.com/oracle/python-oracledb/issues/476>`__).
-#)  Fixed bug when using temporary LOBs with implicit pooling.
-#)  Fixed bug when fetching nested cursors.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug resulting in a segfault when unable to load the Oracle Client
-    libraries
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-#)  Fixed bug which resulted in error ``ORA-24328: illegal attribute value``
-    when calling :meth:`Connection.gettype()` with Oracle Client 11.2
-    libraries
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-#)  Improved error message when getting :attr:`Connection.max_open_cursors`
-    when using Oracle Client 11.2 libraries
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-#)  Improved error message when attempting to work with sparse vectors using
-    Oracle Client 23.6 (or earlier) libraries
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-
-Common Changes
-++++++++++++++
-
-#)  Dropped support for Python 3.8.
-#)  Improvements to data frame fetching with :meth:`Connection.fetch_df_all()`
-    and :meth:`Connection.fetch_df_batches()`:
-
-    - Added support for CLOB, BLOB, and RAW data types
-    - Fixed support for BOOLEAN data type
-    - Fixed bug when NUMBER data is fetched that does not have a precision or
-      scale specified and
-      :attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>` is set
-      to *True*.
-    - More efficient processing when a significant amount of data is duplicated
-      from one row to the next
-    - Avoid memory allocation/free cycles for decimal data
-    - Eliminated memory leak if OracleDataFrame is not converted to an external
-      data frame
-    - Eliminated small memory leak with production of each data frame
-
-#)  Made the :ref:`Azure App Centralized Configuration Provider
-    <azureappstorageprovider>` connection string suffix ".azconfig.io"
-    optional.
-#)  Fixed bug when binding a variable that was previously bound as an output
-    variable in a DML RETURNING statement.
-#)  Fixed bug when multiple rows containing LOBs and DbObjects are returned in
-    a DML RETURNING statement.
-#)  An error message that links to :ref:`documentation <ldapconnections>` on
-    setting up a protocol hook function is now returned by default for LDAP and
-    LDAPS URL connection strings in python-oracledb Thin mode, or when
-    :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-    <Defaults.thick_mode_dsn_passthrough>` is *False*.
-#)  Error ``DPY-2062: payload cannot be enqueued since it does not match the
-    payload type supported by the queue`` is now raised when the payload of a
-    message being enqueued is not supported by the queue. Previously,
-    python-oracledb Thick mode raised the error ``DPI-1071: payload type in
-    message properties must match the payload type of the queue`` and Thin mode
-    raised an internal error.
-#)  Improved the test suite and documentation.
-
-
-oracledb `3.0.0 <https://github.com/oracle/python-oracledb/compare/v2.5.1...v3.0.0>`__ (March 2025)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added :ref:`Oracle Advanced Queuing <aqusermanual>` support for single
-    enqueue and dequeue of RAW and Oracle object payload types.
-#)  Added namespace package :ref:`oracledb.plugins <plugins>` for plugins that
-    can be used to extend the capability of python-oracledb.
-#)  Added support for property :attr:`ConnectionPool.max_lifetime_session`
-    (`issue 410 <https://github.com/oracle/python-oracledb/issues/410>`__).
-#)  Added parameter :data:`ConnectParams.use_sni` to specify that the TLS SNI
-    extension should be used to reduce the number of TLS negotiations that are
-    needed to connect to the database.
-#)  Added parameter :data:`ConnectParams.instance_name` to specify the instance
-    name to use when connecting to the database. Added support for setting the
-    instance name in :ref:`Easy Connect strings <easyconnect>`.
-#)  Added support for Transaction Guard by adding support to get the values of
-    :attr:`Connection.ltxid` and :attr:`oracledb._Error.isrecoverable`.
-#)  Improved support for planned database maintenance by internally sending
-    explicit request boundaries when using python-oracledb connection pools.
-#)  Perform TLS server matching in python-oracledb instead of the Python SSL
-    library to allow alternate names to be checked
-    (`issue 415 <https://github.com/oracle/python-oracledb/issues/415>`__).
-#)  Host names are now resolved to IP addresses in python-oracledb instead of
-    the Python libraries. Address list load balancing and failover settings
-    will be used when establishing connections.
-#)  The thread that closes connection pools on interpreter shutdown is now only
-    started when the first pool is created and not at module import
-    (`issue 426 <https://github.com/oracle/python-oracledb/issues/426>`__).
-#)  Support for :ref:`Pipelining <pipelining>` is no longer considered a
-    pre-release.
-#)  Fixed hang when attempting to use pipelining against a database that
-    doesn't support the end of response flag.
-#)  Fixed hang when using asyncio and a connection is unexpectedly closed by
-    the database.
-#)  Fixed bug when using :ref:`asyncio <concurrentprogramming>` and calling a
-    stored procedure with data that exceeds 32767 bytes in length
-    (`issue 441 <https://github.com/oracle/python-oracledb/issues/441>`__).
-#)  Fixed bug when attempting to fetch a database object stored in a LOB. The
-    fetch will still fail but with an unsupported error exception instead of a
-    hang.
-#)  Error ``DPY-6002: The distinguished name (DN) on the server certificate
-    does not match the expected value: "{expected_dn}"`` now shows the expected
-    value.
-#)  Error ``DPY-6006: The name on the server certificate does not match the
-    expected value: "{expected_name}"`` is now raised when neither the common
-    name (CN) nor any of the subject alternative names (SANs) found on the
-    server certificate match the host name used to connect to the database.
-#)  The text of error ``DPY-4022: invalid value for DRCP purity {purity}``
-    changed to ``DPY-4022: invalid value for enumeration {name}: {value}``.
-#)  Error ``DPY-3001: bequeath is only supported in python-oracledb thick
-    mode`` is now raised when attempting to connect to the database without a
-    connect string.
-#)  Error ``DPY-3001: Native Network Encryption and Data Integrity is only
-    supported in python-oracledb thick mode`` is now the secondary error
-    message returned when Oracle Net NNE or checksumming is required by the
-    database. Previously, the error ``DPY-4011: the database or network closed
-    the connection`` was raised.
-#)  Optimization: the connect descriptor sent to the database does not include
-    the RETRY_DELAY parameter unless the RETRY_COUNT parameter is also
-    specified.
-#)  Internal change: improve low-level encoding and decoding routines.
-#)  Internal change: send buffer length for bind variables without unneeded
-    adjustment.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  At successful completion of a call to :meth:`oracledb.init_oracle_client()`,
-    the value of :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` may
-    get set by python-oracledb in some cases. For example it might be set to
-    the configuration directory that is relative to the loaded Oracle Client
-    libraries.
-#)  Connect string parsing and :ref:`tnsnames.ora <optnetfiles>` file handling
-    can be configured with the new parameter
-    :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-    <Defaults.thick_mode_dsn_passthrough>` which can be helpful for application
-    portability. When it is `False`, python-oracledb Thick mode behaves
-    similarly to Thin mode.
-#)  Fixed bug that caused :attr:`oracledb._Error.isrecoverable` to always be
-    `False`.
-
-Common Changes
-++++++++++++++
-
-#)  Added new methods :meth:`Connection.fetch_df_all()`,
-    :meth:`Connection.fetch_df_batches()`,
-    :meth:`AsyncConnection.fetch_df_all()`, and
-    :meth:`AsyncConnection.fetch_df_batches()` to fetch data as
-    :ref:`OracleDataFrame objects <oracledataframeobj>` that expose an Apache
-    Arrow PyCapsule interface for efficient data exchange with external
-    libraries. See :ref:`dataframeformat`.
-#)  Added support for Oracle Database 23.7
-    :ref:`SPARSE vectors <sparsevectors>`.
-#)  Added support for :ref:`naming and caching connection pools
-    <connpoolcache>` during creation, and retrieving them later from the
-    python-oracledb pool cache with :meth:`oracledb.get_pool()`.
-#)  Added :ref:`Centralized Configuration Provider <configurationproviders>`
-    support for Oracle Cloud Infrastructure Object Storage, Microsoft Azure App
-    Configuration, and file-based configurations.
-#)  Added :meth:`oracledb.register_password_type()` to allow users to register
-    a function that will be called when a password is supplied as a dictionary
-    containing the key "type".
-#)  Added :ref:`cloud native authentication <tokenauth>` support through the
-    integration of Oracle Cloud Infrastructure (OCI) SDK and Azure SDK.
-#)  Added parameter ``extra_auth_params`` to :meth:`oracledb.connect()`,
-    :meth:`oracledb.connect_async()`, :meth:`oracledb.create_pool()`,
-    and :meth:`oracledb.create_pool_async()` which is used to specify the
-    configuration parameters required for cloud native authentication.
-#)  Added :meth:`oracledb.register_params_hook()` and
-    :meth:`oracledb.unregister_params_hook()` which allow users to register or
-    unregister a function that manipulates the parameters used for creating
-    pools or standalone connections. See
-    :ref:`oci_tokens <ocicloudnativeauthplugin>` and
-    :ref:`azure_tokens <azurecloudnativeauthplugin>` plugins which make use of
-    this functionality.
-#)  Added attributes :attr:`DbObjectAttribute.precision`,
-    :attr:`DbObjectAttribute.scale`, and :attr:`DbObjectAttribute.max_size` that
-    provide additional metadata about
-    :ref:`database object attributes <dbobjectattr>`.
-#)  The attribute :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` is
-    now set to ``$ORACLE_HOME/network/admin`` if the environment variable
-    ``ORACLE_HOME`` is set and ``TNS_ADMIN`` is *not* set.
-#)  All connect strings are parsed by the driver if the new parameter
-    ``thick_mode_dsn_passthrough`` is set to *True*. Previously, only Thin
-    mode parsed all connect strings and Thick mode passed the connect string
-    unchanged to the Oracle Client library to parse. Parameters unrecognized by
-    the driver in :ref:`Easy Connect strings <easyconnect>` are now ignored.
-    Parameters unrecognized by the driver in the ``DESCRIPTION``,
-    ``CONNECT_DATA`` and ``SECURITY`` sections of a
-    :ref:`full connect descriptor <conndescriptor>` are passed through
-    unchanged. All other parameters in other sections of a full connect
-    descriptor that are unrecognized by the driver are ignored.
-#)  Fixed bug where some :ref:`DbObject <dbobjecttype>` attributes for database
-    objects defined using ANSI names (including FLOAT and REAL) may have shown
-    as integers.
-#)  All Oracle errors that result in the connection no longer being usable will
-    be raised as ``DPY-4011: the database or network closed the connection``
-    with the underlying reason being included in the error message.
-#)  Fix typing issue with :meth:`oracledb.connect()`,
-    :meth:`oracledb.connect_async()`, :meth:`oracledb.create_pool()` and
-    :meth:`oracledb.create_pool_async()`
-    (`issue 438 <https://github.com/oracle/python-oracledb/issues/438>`__).
-#)  Fix typing issues with setters for
-    :attr:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>` and
-    :attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`
-    (`issue 458 <https://github.com/oracle/python-oracledb/issues/458>`__).
-#)  Error ``DPY-2053: python-oracledb thin mode cannot be used because thick
-    mode has already been enabled`` is now raised when attempting to use
-    asyncio in Thick mode
-    (`issue 448 <https://github.com/oracle/python-oracledb/issues/448>`__).
-#)  Error ``DPY-2056: registered handler for protocol "{protocol}" failed for
-    arg "{arg}"`` is now raised when an exception occurs when calling the
-    registered handler for a protocol.
-#)  Added a sample Dockerfile that can be used to create a container for
-    developing and deploying python-oracledb applications.
-#)  Internal change: improve handling of metadata.
-#)  Internal build tool change: bumped minimum Cython version to 3.0.10 to
-    avoid bug in earlier versions.
-#)  Improved test suite and documentation.
-
-
-oracledb `2.5.1 <https://github.com/oracle/python-oracledb/compare/v2.5.0...v2.5.1>`__ (December 2024)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug when table recreation changes the data type of a column from
-    :data:`oracledb.DB_TYPE_LONG` or :data:`oracledb.DB_TYPE_LONG_RAW` to a
-    different compatible type
-    (`issue 424 <https://github.com/oracle/python-oracledb/issues/424>`__).
-#)  If the database states that an out-of-band break check should not take
-    place during connect (by setting the `DISABLE_OOB_AUTO
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-    id=GUID-490A0B3B-FEF3-425A-81B0-6FA29D4B8C0E>`__ parameter to TRUE),
-    python-oracledb no longer attempts to do so
-    (`issue 419 <https://github.com/oracle/python-oracledb/issues/419>`__).
-#)  All exceptions subclassed from ``OSError`` now cause connection retry
-    attempts, subject to the connection ``retry_count`` and ``retry_delay``
-    parameters
-    (`issue 420 <https://github.com/oracle/python-oracledb/issues/420>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug calculating property :data:`Connection.max_identifier_length`
-    when using Oracle Client libraries 12.1, or older. The returned value may
-    now be *None* when the size cannot be reliably determined by
-    python-oracledb, which occurs when using Oracle Client libraries 12.1 (or
-    older) to connect to Oracle Database 12.2, or later.
-    (`ODPI-C <https://github.com/oracle/odpi>`__ dependency update).
-#)  Fixed bug resulting in a segfault when using external authentication
-    (`issue 425 <https://github.com/oracle/python-oracledb/issues/425>`__).
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug when fetching empty data from CLOB or BLOB columns marked with
-    the ``IS JSON`` constraint
-    (`issue 429 <https://github.com/oracle/python-oracledb/issues/429>`__).
-
-
-oracledb `2.5.0 <https://github.com/oracle/python-oracledb/compare/v2.4.1...v2.5.0>`__ (November 2024)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added attributes :attr:`Connection.session_id` and
-    :attr:`Connection.serial_num` that provide information about the session
-    identifier and session serial number associated with a connection.
-#)  Added attributes
-    :attr:`oracledb.defaults.driver_name <Defaults.driver_name>`,
-    :attr:`oracledb.defaults.machine <Defaults.machine>`,
-    :attr:`oracledb.defaults.osuser <Defaults.osuser>`,
-    :attr:`oracledb.defaults.program <Defaults.program>`, and
-    :attr:`oracledb.defaults.terminal <Defaults.terminal>` to set
-    information about the driver name, machine name, operating system user,
-    program name, and terminal name respectively. The ``driver_name``,
-    ``machine``, ``osuser``, ``program``, and ``terminal`` parameters were also
-    added to :meth:`oracledb.connect()`, :meth:`oracledb.connect_async()`,
-    :meth:`oracledb.create_pool()`, and :meth:`oracledb.create_pool_async()`
-    (`issue 343 <https://github.com/oracle/python-oracledb/issues/343>`__).
-#)  Added :meth:`oracledb.register_protocol()` to allow users to register a
-    function that will be called when a particular protocol is detected in a
-    connection string.
-#)  Added :meth:`oracledb.enable_thin_mode()` as a means of enabling
-    python-oracledb Thin mode without waiting for an initial connection to be
-    successfully established. Since python-oracledb defaults to Thin mode, this
-    method is mostly useful for applications with multiple threads concurrently
-    creating connections to databases when the application starts
-    (`issue 408 <https://github.com/oracle/python-oracledb/issues/408>`__).
-#)  Added attribute :data:`PipelineOpResult.warning` to provide information
-    about any warning that was encountered during the execution of a pipeline
-    operation.
-#)  Added attribute :data:`PipelineOpResult.columns` to provide information
-    about any query column metadata returned from a pipeline operation.
-#)  Added support for setting the :ref:`edition <ebr>` when connecting to
-    Oracle Database.
-#)  Added support for Application Contexts, i.e. the ``appcontext`` parameter
-    is supported when connecting.
-#)  Fixed bug causing some pooled connections to be permanently marked as busy
-    and unavailable for reuse
-    (`issue 392 <https://github.com/oracle/python-oracledb/issues/392>`__).
-#)  Fixed bug with error handling when calling :meth:`Connection.gettype()` for
-    a type that exists but on which the user has insufficient privileges to
-    view
-    (`issue 397 <https://github.com/oracle/python-oracledb/issues/397>`__).
-#)  Fixed bug when calling :meth:`ConnectParams.parse_dsn_with_credentials()`
-    with an Easy Connect string containing a protocol.
-#)  Fixed bug when calling :meth:`Cursor.parse()` with autocommit enabled.
-#)  Fixed bug when parsing a :ref:`tnsnames.ora files <optnetfiles>` file with
-    a connect descriptor containing an embedded comment.
-#)  Fixed bug when calling :meth:`AsyncConnection.run_pipeline()` with a DML
-    RETURNING statement that results in an error.
-#)  Fixed error message when a SQL statement is parsed containing a q-string
-    without a closing quote.
-#)  Fixed bug affecting Python interpreter shut down using connection pooling
-    in SQLAlchemy. Pooled connection shutdown now occurs separately from pool
-    destruction.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Use `locale.getencoding() <https://docs.python.org/3/library/locale.html#
-    locale.getencoding>`__ with Python 3.11 and higher to determine the
-    encoding to use for the ``config_dir`` and ``lib_dir`` parameters to
-    :meth:`oracledb.init_oracle_client()`. Bytes are also accepted in which
-    case they will be used as is without any encoding
-    (`issue 255 <https://github.com/oracle/python-oracledb/issues/255>`__).
-#)  Fixed bug preventing subscriptions from invoking the callbacks associated
-    with them
-    (`issue 409 <https://github.com/oracle/python-oracledb/issues/409>`__).
-#)  Fixed bug affecting Application Continuity when older Oracle Client
-    libraries are used (`ODPI-C <https://github.com/oracle/odpi>`__ dependency
-    update).
-
-Common Changes
-++++++++++++++
-
-#)  Added support for returning the maximum identifier length allowed by the
-    database using the new property :data:`Connection.max_identifier_length`
-    (`issue 395 <https://github.com/oracle/python-oracledb/issues/395>`__).
-#)  Improved type hints for cursors
-    (`issue 391 <https://github.com/oracle/python-oracledb/issues/391>`__).
-#)  Improved error message when attempting to access attributes on a connection
-    before a connection has been established or a connection pool before it has
-    been created
-    (`issue 385 <https://github.com/oracle/python-oracledb/issues/385>`__).
-#)  The variables saved with :meth:`Cursor.setinputsizes()` are now forgotten
-    when an exception is raised
-    (`issue 411 <https://github.com/oracle/python-oracledb/issues/411>`__).
-#)  Fixed bug when calling :meth:`ConnectParams.set()` with a value of *None*
-    for the ``connectiontype`` and ``session_callback`` parameters. Previously,
-    any values set earlier would be improperly cleared and now they are
-    retained
-    (`issue 404 <https://github.com/oracle/python-oracledb/issues/404>`__).
-#)  Improved test suite and documentation.
-
-
-oracledb `2.4.1 <https://github.com/oracle/python-oracledb/compare/v2.4.0...v2.4.1>`__ (August 2024)
-----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug when detecting in-band notification warnings while the connection
-    is being created or actively used
-    (`issue 383 <https://github.com/oracle/python-oracledb/issues/383>`__).
-
-
-oracledb `2.4.0 <https://github.com/oracle/python-oracledb/compare/v2.3.0...v2.4.0>`__ (August 2024)
-----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for Oracle Database 23.4 :ref:`statement pipelining
-    <pipelining>`.
-#)  Fixed bug resulting in a segfault when a closed cursor is bound as a REF
-    CURSOR
-    (`issue 368 <https://github.com/oracle/python-oracledb/issues/368>`__).
-#)  Fixed bug resulting in an inability to connect to Oracle Database version
-    23 instances which have fast authentication disabled.
-#)  Fixed error message when idle time is exceeded by a connection. The error
-    ``DPY-4033: the database closed the connection because the connection's
-    idle time has been exceeded`` is now raised when this situation is
-    detected.
-#)  Reworked connection string parser:
-
-    - Fixed parsing an :ref:`Easy Connect <easyconnect>` string starting
-      with "`//`" (`issue 352
-      <https://github.com/oracle/python-oracledb/issues/352>`__).
-    - Fixed parsing an Easy Connect string with multiple hosts (a comma for
-      multiple addresses and a semicolon for multiple address lists).
-    - Fixed parsing an Easy Connect string with a static IPv6 address.
-    - Improved error when a connect descriptor parameter like DESCRIPTION or
-      ADDRESS incorrectly contains a simple value instead of nested values.
-
-#)  Reworked :ref:`tnsnames.ora<optnetfiles>` file parser to handle multiple
-    aliases found on separate lines (`issue 362
-    <https://github.com/oracle/python-oracledb/issues/362>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Variables containing cursors, LOBs or DbObject values now return the same
-    instances when calling :meth:`Variable.getvalue()`, matching Thin mode
-    behavior. Previously, new instances were created for each call in Thick
-    mode.
-
-Common Changes
-++++++++++++++
-
-#)  Added support for Python 3.13 and dropped support for Python 3.7.
-#)  Attribute :data:`ConnectionPool.getmode` is now one of the values of the
-    enumeration :ref:`connection pool get modes <connpoolmodes>` in order to be
-    consistent with the other uses of this attribute.
-#)  Error ``DPY-3027: binding a cursor from a different connection is not
-    supported`` is now raised when attempting to bind a cursor created on a
-    different connection. Previously, the attempt may have succeeded or may
-    have failed with a number of different unexpected exceptions.
-#)  Error ``DPY-1006: cursor is not open`` is now raised consistently when
-    attempting to bind a closed cursor. Previously, Thin mode would result in a
-    segfault and Thick mode would result in unusual errors.
-
-
-oracledb `2.3.0 <https://github.com/oracle/python-oracledb/compare/v2.2.1...v2.3.0>`__ (July 2024)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for :ref:`two-phase commits <tpc>`.
-#)  Added support for columns of type BFILE.
-#)  When calling :meth:`ConnectionPool.acquire()` or
-    :meth:`AsyncConnectionPool.acquire()`, the connection pool ``mode``
-    :data:`oracledb.POOL_GETMODE_TIMEDWAIT` now always honors the
-    ``wait_timeout`` value and the connection request will not additionally be
-    delayed by any internal network ping to the database (`issue 330
-    <https://github.com/oracle/python-oracledb/issues/330>`__).
-#)  Fixed bug when calling :meth:`oracledb.connect_async()` multiple times
-    concurrently
-    (`issue 353 <https://github.com/oracle/python-oracledb/issues/353>`__).
-#)  Fixed bug in fetching dates with years less than 0
-    (`issue 345 <https://github.com/oracle/python-oracledb/issues/345>`__).
-
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Eliminated memory leak when dequeing messages with JSON payloads
-    (`issue 346 <https://github.com/oracle/python-oracledb/issues/346>`__).
-#)  An exception is now avoided if an error message is not correctly UTF-8
-    encoded by the database.
-
-Common Changes
-++++++++++++++
-
-#)  Added support for Oracle Database 23.5
-    :ref:`BINARY vector format <binaryformat>`.
-#)  Replaced integer constants for
-    :ref:`connection authorization modes <connection-authorization-modes>`,
-    :ref:`connection pool get modes <connpoolmodes>`,
-    :ref:`connection pool purity constants <drcppurityconsts>` and
-    :ref:`vector format constants <vectorformatconstants>` with
-    `enumerations <https://docs.python.org/3/library/enum.html>`__ in order to
-    provide a more useful ``repr()`` and improve type safety, among other
-    things.
-#)  The default value of the ``tcp_connect_timeout`` parameter was changed
-    from 60 seconds to 20 seconds. The default value of the
-    ``retry_delay`` parameter was changed from 0 seconds to 1 second.
-#)  Added parameter ``ssl_version`` to :meth:`oracledb.connect()`
-    :meth:`oracledb.connect_async()`, :meth:`oracledb.create_pool()`, and
-    :meth:`oracledb.create_pool_async()` methods in order to specify which TLS
-    version to use when establishing connections with the protocol "tcps".
-#)  Added parameter ``ping_timeout`` to methods :meth:`oracledb.create_pool()`
-    and :meth:`oracledb.create_pool_async()` with a default value of 5000
-    milliseconds. This limits the amount of time that a call to
-    :meth:`~ConnectionPool.acquire()` will wait for a connection to respond to
-    any internal ping to the database before the connection is considered
-    unusable and a different connection is returned to the application.
-    Previously, a fixed timeout of 5000 milliseconds was used in Thick mode and
-    no explicit timeout was used in Thin mode.
-#)  Added support for maintainers to specify optional compilation arguments
-    when building python-oracledb. A new environment variable
-    ``PYO_COMPILE_ARGS`` can be set :ref:`before building <installsrc>`.
-#)  Improved detection of the signature used by output type handlers, in
-    particular those that that make use of ``__call__()``.
-#)  Python wheel package binaries for Linux on `PyPI
-    <https://pypi.org/project/oracledb/>`__ are now stripped to reduce their
-    size.
-#)  Error ``DPY-2049: invalid flags for tpc_begin()`` is now raised when
-    invalid flags are passed to :meth:`Connection.tpc_begin()`.  Previously,
-    ``TypeError`` or ``ORA-24759: invalid transaction start flags``
-    was raised instead.
-#)  Error ``DPY-2050: invalid flags for tpc_end()`` is now raised when invalid
-    flags are passed to :meth:`Connection.tpc_end()`. Previously, ``TypeError``
-    or ``DPI-1002: invalid OCI handle`` was raised instead.
-#)  Error ``DPY-3025: operation is not supported on BFILE LOBs`` is now raised
-    when operations are attempted on BFILE LOBs that are not permitted.
-    Previously, ``ORA-22275: invalid LOB locator specified`` was raised
-    instead.
-#)  Error ``DPY-3026: operation is only supported on BFILE LOBs`` is now raised
-    when operations are attempted on LOBs that are only supported by BFILE
-    LOBs. Previously, ``DPI-1002: invalid OCI handle`` was raised instead.
-#)  Error ``DPY-4005: timed out waiting for the connection pool to return a
-    connection`` is now raised consistently when using get mode
-    :data:`oracledb.POOL_GETMODE_TIMEDWAIT` and the timeout expires.
-    Previously ``asyncio.TimeoutError`` was being raised when using
-    :ref:`asyncio <asyncio>` and ``ORA-24457: OCISessionGet() could not find a
-    free session in the specified timeout period`` was being raised in Thick
-    mode.
-#)  If both the ``sid`` and ``service_name`` parameters are specified to
-    :meth:`oracledb.makedsn()`, now only the ``service_name`` parameter is
-    used and the ``sid`` parameter is ignored.
-#)  Fixed bug in :meth:`ConnectParams.set()` where parameters found in a
-    connect string (like ``host`` and ``service_name``) would be ignored.
-#)  Fixed bug in :meth:`Connection.tpc_recover()` where the returned items were
-    not of the type returned by :meth:`Connection.xid()` as documented.
-#)  Internal changes to ensure that no circular imports occur.
-
-
-oracledb `2.2.1 <https://github.com/oracle/python-oracledb/compare/v2.2.0...v2.2.1>`__ (May 2024)
--------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug when a :ref:`DbObject <dbobject>` instance contains an attribute
-    of type ``SYS.XMLTYPE``
-    (`issue 336 <https://github.com/oracle/python-oracledb/issues/336>`__).
-#)  Fixed bug when fetching LOBs after an exception has been raised
-    (`issue 338 <https://github.com/oracle/python-oracledb/issues/338>`__).
-#)  Fixed bug when a connect descriptor is used that doesn't define any
-    addresses
-    (`issue 339 <https://github.com/oracle/python-oracledb/issues/339>`__).
-#)  Fixed bug in statement cache when the maximum number of cursors is unknown
-    due to the database not being open.
-#)  Fixed bug in handling redirect data with small SDU sizes.
-#)  Fixed bug with TLS renegotiation under some circumstances.
-#)  Adjusted handling of internal break/reset mechanism in order to avoid
-    potential hangs in some configurations under some circumstances.
-
-
-oracledb `2.2.0 <https://github.com/oracle/python-oracledb/compare/v2.1.2...v2.2.0>`__ (May 2024)
--------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug in handling invisible columns with object type names containing
-    ``%ROWTYPE``
-    (`issue 325 <https://github.com/oracle/python-oracledb/issues/325>`__).
-#)  Fixed bug that would cause pooled connections to be marked checked out but
-    be unavailable for use permanently
-    (`issue 221 <https://github.com/oracle/python-oracledb/issues/221>`__).
-#)  Fixed bug that would cause an internal error to be raised when attempting
-    to close a connection that has been forcibly closed by the database.
-#)  Internal change: further efforts to tighten code looking for the end of a
-    database request made to Oracle Database version 23.
-
-Common Changes
-++++++++++++++
-
-#)  Added support for Oracle Database 23.4 columns of type :ref:`VECTOR
-    <vectors>`.
-#)  Added support for columns of type INTERVAL YEAR TO MONTH which can be
-    represented in Python by instances of the new
-    :ref:`oracledb.IntervalYM <interval_ym>` class
-    (`issue 310 <https://github.com/oracle/python-oracledb/issues/310>`__).
-#)  Added support for processing :ref:`tnsnames.ora files <optnetfiles>`
-    containing ``IFILE`` directives
-    (`issue 311 <https://github.com/oracle/python-oracledb/issues/311>`__).
-#)  Added support for getting a list of the network service names found in a
-    :ref:`tnsnames.ora <optnetfiles>` file by adding the method
-    :meth:`ConnectParams.get_network_service_names()`
-    (`issue 313 <https://github.com/oracle/python-oracledb/issues/313>`__).
-#)  Added support for iterating over :ref:`DbObject <dbobject>` instances that
-    are collections
-    (`issue 314 <https://github.com/oracle/python-oracledb/issues/314>`__).
-#)  Error ``ORA-24545: invalid value of POOL_BOUNDARY specified in connect
-    string`` is now raised consistently for both Thick and Thin modes.
-    Previously, Thin mode was raising the error
-    ``DPY-4030: invalid DRCP pool boundary {boundary}``.
-
-
-oracledb `2.1.2 <https://github.com/oracle/python-oracledb/compare/v2.1.1...v2.1.2>`__ (April 2024)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug that prevented error ``ORA-01403: no data found`` from being
-    raised when executing a PL/SQL block
-    (`issue 321 <https://github.com/oracle/python-oracledb/issues/321>`__).
-
-Common Changes
-++++++++++++++
-
-#)  Fixed the internal regular expression used for parsing :ref:`Easy Connect
-    <easyconnect>` strings to avoid errors with connection string arguments
-    containing the ``/`` character.
-
-
-oracledb `2.1.1 <https://github.com/oracle/python-oracledb/compare/v2.1.0...v2.1.1>`__ (March 2024)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug when calling :meth:`~Connection.gettype()` with an object type
-    name containing ``%ROWTYPE``
-    (`issue 304 <https://github.com/oracle/python-oracledb/issues/304>`__).
-#)  Error ``DPY-2048: the bind variable placeholder ":{name}" cannot be used
-    both before and after the RETURNING clause in a DML RETURNING statement``
-    is now raised when the same bind variable placeholder name is used both
-    before and after the RETURNING clause in a
-    :ref:`DML RETURNING statement <dml-returning-bind>`. Previously, various
-    internal errors were raised.
-#)  Restored the error message raised when attempting to connect to Oracle
-    Database 11g.
-#)  Internal change: tightened up code looking for the end of a database
-    request.
-#)  Network packet output is now immediately flushed in order to avoid
-    losing output due to buffering when multiple threads are running.
-
-
-oracledb `2.1.0 <https://github.com/oracle/python-oracledb/compare/v2.0.1...v2.1.0>`__ (March 2024)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Oracle Database version 23 feature support:
-
-    - Added support for
-      :ref:`implicit connection pooling with DRCP and PRCP <implicitconnpool>`,
-      enabled by the new ``pool_boundary`` parameter to
-      :meth:`oracledb.connect()`, :meth:`oracledb.connect_async()`,
-      :meth:`oracledb.create_pool()` and :meth:`oracledb.create_pool_async()`.
-    - Improved the performance of connection creation by reducing the number of
-      round trips required for all connections.
-    - Added support for TCP Fast Open for applications connecting from within
-      the OCI Cloud network to Oracle Autonomous Database Serverless (ADB-S),
-      enabled by the new ``use_tcp_fast_open`` parameter to
-      :meth:`oracledb.connect()`, :meth:`oracledb.connect_async()`,
-      :meth:`oracledb.create_pool()` and :meth:`oracledb.create_pool_async()`.
-
-#)  :ref:`asyncio <asyncio>` changes:
-
-    - Support for asyncio is no longer considered a pre-release.
-    - Internal change to improve handling of packets.
-    - Fixed bug when using :ref:`DRCP <drcp>`.
-    - Fixed bug in processing metadata that spans multiple network packets.
-    - Fixed bug when connecting to a database using listener redirects
-      (`issue 285 <https://github.com/oracle/python-oracledb/issues/285>`__).
-
-#)  Added support for Easy Connect strings found in
-    :ref:`tnsnames.ora <optnetfiles>` files.
-#)  Added support for writing UTF-8 encoded bytes to CLOB and NCLOB values and
-    writing strings to BLOB values in order to be consistent with what is done
-    for string variables.
-#)  User-defined errors raised by the database no longer display an error help
-    portal URL.
-#)  Fixed potential cursor issues when using :ref:`drcp`.
-#)  Fixed regression when using :ref:`IAM token authentication <iamauth>`
-    (`issue 288 <https://github.com/oracle/python-oracledb/issues/288>`__).
-#)  Fixed bug connecting to databases that are only mounted and not opened
-    (`issue 294 <https://github.com/oracle/python-oracledb/issues/294>`__).
-#)  Fixed bug in identifying bind variables in SQL statements containing a
-    single line comment at the end of the statement.
-#)  Fixed bug in determining the list of attributes for PL/SQL collections.
-#)  Fixed bug in calculating the :data:`Connection.thin` attribute.
-#)  Fixed type declaration for the ``connectiontype`` parameter to
-    :meth:`oracledb.create_pool_async()` and the return value of
-    :meth:`AsyncConnectionPool.acquire()`.
-
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Added support for internal use of JSON in SODA with Oracle Client version
-    23. This allows for seamless transfer of extended data types.
-#)  Fixed bug when calling :meth:`SodaDoc.getContent()` for SODA documents
-    that do not contain JSON.
-#)  Corrected support for Oracle Sharding.
-#)  Errors ``DPY-4011: the database or network closed the connection`` and
-    ``DPY-4024: call timeout of {timeout} ms exceeded`` now retain the original
-    error message raised by the Oracle Client library.
-
-Common Changes
-++++++++++++++
-
-#)  Added a boolean property :data:`FetchInfo.is_oson` which is set when a
-    column has the check constraint ``IS JSON FORMAT OSON`` enabled.
-#)  Added methods :meth:`Connection.decode_oson()` and
-    :meth:`Connection.encode_oson()` to support fetching and inserting into
-    columns which have the check constraint ``IS JSON FORMAT OSON`` enabled.
-#)  Added class :ref:`oracledb.JsonId <jsonid>` to represent JSON ID values
-    returned by SODA in Oracle Database 23.4 and later in the ``_id``
-    attribute of documents stored in native collections.
-#)  Added support for columns of type VECTOR usable with a limited
-    availability release of Oracle Database version 23.
-#)  Errors raised when calling :meth:`Cursor.executemany()` with PL/SQL now
-    have the :data:`oracledb._Error.offset` attribute populated with the last
-    iteration that succeeded
-    (`issue 283 <https://github.com/oracle/python-oracledb/issues/283>`__).
-#)  A number of performance improvements were made.
-#)  Error ``DPY-2045: arraysize must be an integer greater than zero`` is now
-    raised when an invalid value is used for the attribute
-    :data:`Cursor.arraysize`. Previously, a variety of errors (``TypeError``,
-    ``OverflowError`` or ``ORA-03147: missing mandatory TTC field``) were
-    raised.
-#)  Error ``DPY-2016: variable array size of %d is too small (should be at
-    least %d)`` is now raised when :meth:`Cursor.executemany()` is called with
-    an integer number of iterations that is too large for the existing bind
-    variables. Previously, python-oracledb Thin mode raised ``IndexError``
-    and python-oracledb Thick mode raised
-    ``DPI-1018: array size of %d is too small``.
-#)  Error ``DPY-1001: not connected to database`` is now raised when an attempt
-    is made to perform an operation on a LOB using a closed connection.
-    Previously, python-oracledb Thin mode raised an ``AttributeError``
-    exception and python-oracledb Thick mode raised
-    ``DPI-1040: LOB was already closed``.
-#)  Fixed bug in :meth:`ConnectParams.get_connect_string()` when a value for
-    the connection parameter ``purity`` has been specified.
-#)  Fixed bug in :meth:`ConnectParams.set()` that would clear the
-    ``ssl_context``, ``appcontext``, ``shardingkey`` and ``supershardingkey``
-    parameters if they were not included in the parameters. This also affected
-    calls to :meth:`oracledb.connect()` and :meth:`oracledb.create_pool()` that
-    made use of the DSN with credentials format.
-#)  The error ``DPY-2047: LOB amount must be greater than zero`` is now raised
-    when the ``amount`` parameter in :meth:`LOB.read()` is set to zero or
-    negative.
-#)  Fixed bug in the calculation of :data:`Cursor.rowcount` under some
-    circumstances.
-#)  Connection parameters that are strings now treat an empty string in the
-    same way as the value *None*.
-
-
-oracledb `2.0.1 <https://github.com/oracle/python-oracledb/compare/v2.0.0...v2.0.1>`__ (January 2024)
------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for using alternative event loop implementations such as
-    uvloop with :ref:`asyncio <asyncio>`
-    (`issue 276 <https://github.com/oracle/python-oracledb/issues/276>`__).
-#)  Added support for the `asynchronous context manager protocol
-    <https://docs.python.org/3/reference/datamodel.html?
-    highlight=aenter#asynchronous-context-managers>`__ on the
-    :ref:`AsyncCursor class <asynccursorobj>` as a convenience.
-#)  Fixed regression when connecting to a database using listener redirects
-    with either a :ref:`connection pool <connpooling>` or using
-    :ref:`asyncio <asyncio>`
-    (`issue 275 <https://github.com/oracle/python-oracledb/issues/275>`__).
-#)  Fixed bug when an intermittent hang occurs on some versions of Oracle
-    Database while using :ref:`asyncio <asyncio>` and the database raises an
-    error and output variables are present
-    (`issue 278 <https://github.com/oracle/python-oracledb/issues/278>`__).
-#)  Fixed bug when fetch variables contain output converters and a query is
-    re-executed
-    (`issue 271 <https://github.com/oracle/python-oracledb/issues/271>`__).
-#)  Corrected typing declaration for :meth:`oracledb.connect_async()`.
-#)  Internal change to ensure that connection pools are closed gracefully when
-    the main thread terminates.
-#)  Internal change to slightly improve performance of LOB reads and writes.
-
-Common Changes
-++++++++++++++
-
-#)  Fixed regression which prevented a null value from being set on
-    :ref:`DbObject <dbobject>` attributes or used as elements of collections
-    (`issue 273 <https://github.com/oracle/python-oracledb/issues/273>`__).
-#)  Fixed regression from cx_Oracle which ignored the value of the
-    ``encoding_errors`` parameter when creating variables by calling the method
-    :meth:`Cursor.var()`
-    (`issue 279 <https://github.com/oracle/python-oracledb/issues/279>`__).
-#)  Bumped minimum requirement of Cython to 3.0.
-
-
-oracledb `2.0.0 <https://github.com/oracle/python-oracledb/compare/v1.4.2...v2.0.0>`__ (December 2023)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for :ref:`concurrent programming with asyncio <asyncio>`
-    (`issue 6 <https://github.com/oracle/python-oracledb/issues/6>`__).
-#)  Added parameter :attr:`ConnectParams.sdu` for configuring the Session Data
-    Unit (SDU) size for sizing internal buffers used for tuning communication
-    with the database. The connection property :attr:`Connection.sdu` was also
-    added.
-#)  Added parameter :data:`ConnectParams.ssl_context` to modify the SSL context
-    used when connecting via TLS
-    (`issue 259 <https://github.com/oracle/python-oracledb/issues/259>`__).
-#)  Added support for an Oracle Database version 23 JSON feature allowing
-    fieldnames with more than 255 UTF-8 encoded bytes.
-#)  Added support for the ``FAILOVER`` clause in full connect descriptors.
-#)  Fixed bug in detecting the current time zone
-    (`issue 257 <https://github.com/oracle/python-oracledb/issues/257>`__).
-#)  Fixed bug in handling database response in certain unusual circumstances.
-#)  Fixed bug in handling exceptions raised during connection establishment.
-#)  Fixed bug in identifying bind variables in SQL statements containing
-    multiple line comments with multiple asterisks before the closing slash.
-#)  A more meaningful error is raised when the wrong type of data is passed to
-    :meth:`LOB.write()`.
-#)  Internal change to support an Oracle Database version 23 JSON feature
-    improving JSON storage usage.
-#)  Internal change to ensure that all connections in a pool have been closed
-    gracefully before the pool is closed.
-#)  Internal changes to improve handling of the network protocol between
-    python-oracledb and Oracle Database.
-#)  Internal changes to improve handling of multiple address and description
-    lists in full connect descriptors.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug in return value of :meth:`SodaOperation.replaceOne()`.
-
-Common Changes
-++++++++++++++
-
-#)  Dropped support for Python 3.6.
-#)  Desupported a number of parameters and attributes that were previously
-    deprecated. See :ref:`desupport notices<_desupported_2_0>` for details.
-#)  Added property :attr:`Cursor.warning` for database warnings (such as PL/SQL
-    compilation warnings) generated by calls to :meth:`Cursor.execute()` or
-    :meth:`Cursor.executemany()`.
-#)  Added property :attr:`Connection.warning` for warnings (such as the password
-    being in the grace period) generated during connection.
-#)  Added properties that provide information about the database:
-    :attr:`Connection.db_domain`, :attr:`Connection.db_name`,
-    :attr:`Connection.max_open_cursors`, :attr:`Connection.service_name`
-    and :attr:`Connection.transaction_in_progress`.
-#)  Added property :data:`Connection.proxy_user` to show the name of the user
-    which was used as a proxy when connecting (`issue 250
-    <https://github.com/oracle/python-oracledb/issues/250>`__).
-#)  Added properties :data:`FetchInfo.domain_schema`,
-    :data:`FetchInfo.domain_name` and :data:`FetchInfo.annotations` for the
-    `SQL domain <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-    17D3A9C6-D993-4E94-BF6B-CACA56581F41>`__ and `annotations
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-1AC16117-
-    BBB6-4435-8794-2B99F8F68052>`__ associated with columns that are being
-    fetched. SQL domains and annotations require Oracle Database version 23,
-    or later. If using python-oracledb Thick mode, Oracle Client version 23,
-    or later, is also required.
-#)  Added parameter ``data`` to :meth:`Connection.createlob()` to allow data to
-    be written at LOB creation time.
-#)  Added type :data:`~oracledb.DB_TYPE_XMLTYPE` to represent data of type
-    ``SYS.XMLTYPE`` in the database. Previously the value of
-    :data:`FetchInfo.type_code` for data of this type was
-    :data:`~oracledb.DB_TYPE_LONG` in Thick mode and
-    :data:`~oracledb.DB_TYPE_OBJECT` in Thin mode.
-#)  Attribute and element values of :ref:`Oracle Object <dbobject>` instances
-    that contain strings or bytes now have their maximum size constraints
-    checked. Errors ``DPY-2043`` (attributes) and ``DPY-2044`` (element values)
-    are now raised when constraints are violated.
-#)  Attribute and element values of :ref:`Oracle Object <dbobject>` instances
-    that are numbers are now returned as integers if the precision and scale
-    allow for it. This is the same way that numbers are fetched from the
-    database
-    (`issue 99 <https://github.com/oracle/python-oracledb/issues/99>`__).
-#)  Errors that have entries in the
-    :ref:`troubleshooting documentation <troubleshooting>` now have links to
-    that documentation shown in the message text.
-#)  Fixed bug with binding boolean values with Oracle Database version 23
-    (`issue 263 <https://github.com/oracle/python-oracledb/issues/263>`__).
-#)  Fixed bug with getting unknown attributes from :ref:`Oracle Object
-    <dbobject>` instances.
-#)  Error ``DPY-4029: errors in array DML exceed 65535`` is now raised when the
-    number of batch errors exceeds 65535 when calling
-    :meth:`Cursor.executemany()` with the parameter ``batcherrors`` set to the
-    value *True*. Note that in Thick mode this error is not raised unless the
-    number of batch errors is a multiple of 65536; instead, the number of batch
-    errors returned is modulo 65536
-    (`issue 262 <https://github.com/oracle/python-oracledb/issues/262>`__).
-#)  Black is now used to format Python code and ruff to lint Python code.
-
-
-oracledb `1.4.2 <https://github.com/oracle/python-oracledb/compare/v1.4.1...v1.4.2>`__ (October 2023)
------------------------------------------------------------------------------------------------------
-
-Thick Changes
-+++++++++++++
-
-#)  Fixed bug resulting in a segfault on some platforms when using two-phase
-    commit.
-
-Common Changes
-++++++++++++++
-
-#)  Pre-built binaries are now being created for Python 3.12
-    (`issue 237 <https://github.com/oracle/python-oracledb/issues/237>`__).
-
-
-oracledb `1.4.1 <https://github.com/oracle/python-oracledb/compare/v1.4.0...v1.4.1>`__ (September 2023)
--------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Improved statement bind variable placeholder parser performance, handle
-    statements which use the `Alternative Quoting Mechanism
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-1824CBAA-6E16-4921-B2A6-112FB02248DA>`__
-    ('Q' strings), and fix some issues identifying bind variable placeholders
-    in embedded quotes and in JSON syntax.
-
-Thick Changes
-+++++++++++++
-
-#)  Fixed error checking when getting or setting the connection pool parameters
-    ``ping_interval`` and ``soda_metadata_cache``.
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug when calling :meth:`Cursor.execute()` or
-    :meth:`Cursor.executemany()` with missing bind data after calling
-    :meth:`Cursor.setinputsizes()` with at least one of the values supplied as
-    *None*
-    (`issue 217 <https://github.com/oracle/python-oracledb/issues/217>`__).
-#)  SQL statement parsing now raises ``DPY-2041: missing ending quote (') in
-    string`` or ``DPY-2042: missing ending quote (") in identifier`` for
-    statements with the noted invalid syntax.  Previously, Thick mode gave
-    ``ORA-1756`` or ``ORA-1740``, respectively, while Thin mode did not throw
-    an error.
-#)  Added missing ">" to ``repr()`` of :ref:`sodadb`.
-
-
-oracledb `1.4.0 <https://github.com/oracle/python-oracledb/compare/v1.3.2...v1.4.0>`__ (August 2023)
-----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for an Oracle Database version 23 feature that can improve
-    the performance of connection creation by reducing the number of round
-    trips required to create the second and subsequent connections to the same
-    database.
-#)  Added support for shrinking the connection pool back to the specified
-    minimum size when the pool is idle for :data:`ConnectionPool.timeout`
-    seconds.
-#)  Added support for growing the connection pool back to the minimum number of
-    connections after connections are killed or otherwise made unusable.
-#)  A default connection class is now generated when DRCP is used with a
-    connection pool and no connection class was specified when the pool was
-    created. The default connection class will be of the form ``DPY:`` followed
-    by a 16-byte unique identifier converted to base64 encoding.
-#)  Changed internal connection feature negotiation for more accurate Oracle
-    Database version 23 support.
-#)  Added support for sending a generated connection identifier to the
-    database used for tracing. An application specific prefix is prepended to
-    this value if specified via a new ``connection_id_prefix`` parameter when
-    creating standalone connections or connection pools.
-#)  Added URL to the Oracle Database Error Help Portal in Oracle Database
-    error messages similar to when Thick mode uses Oracle Client version 23.
-#)  Added support for the ``ORA_SDTZ`` environment variable used to set the
-    session time zone used by the database.
-#)  Fixed bug when a dynamically sized connection pool is created with an
-    ``increment`` of zero and the pool needs to grow.
-#)  Fixed bug affecting connection reuse when connections were acquired from
-    the connection pool with a ``cclass`` different to the one used to
-    create the pool.
-#)  Fixed bug when a connection is discarded from the connection pool during
-    :meth:`ConnectionPool.acquire()` and the ping check fails due to the
-    connection being dead.
-#)  Fixed bug when an output type handler is used and the value of
-    :attr:`Cursor.prefetchrows` exceeds :attr:`Cursor.arraysize`
-    (`issue 173 <https://github.com/oracle/python-oracledb/issues/173>`__).
-#)  Fixed bug when an Application Continuity replay context is returned during
-    connection to the database
-    (`issue 176 <https://github.com/oracle/python-oracledb/issues/176>`__).
-#)  Fixed bug when socket is not closed immediately upon failure to establish a
-    connection to the database
-    (`issue 211 <https://github.com/oracle/python-oracledb/issues/211>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Added function :meth:`SodaCollection.listIndexes()` for getting the indexes
-    on a SODA collection.
-#)  Added support for specifying if documents should be locked when fetched
-    from SODA collections. A new non-terminal method
-    :meth:`~SodaOperation.lock()` was added which requires Oracle Client
-    21.3 or higher (or Oracle Client 19 from 19.11).
-#)  Relaxed restriction for end-to-end tracing string connection
-    attributes. These values can now be set to the value *None* which will be
-    treated the same as an empty string.
-#)  Fixed bug when using external authentication with an Easy Connect
-    connection string.
-#)  Fixed memory leak when accessing objects embedded within other objects.
-
-
-Common Changes
-++++++++++++++
-
-#)  Use of Python 3.6 and 3.7 is deprecated and support for them will be
-    removed in a future release. A warning is issued when these versions are
-    used but otherwise they will continue to function as usual. The warning can
-    be suppressed by importing `warnings
-    <https://docs.python.org/3/library/warnings.html>`__ and adding a call like
-    ``warnings.filterwarnings(action='ignore', module="oracledb")``
-    *before* importing ``oracledb``.
-#)  Added support for the :attr:`~Variable.outconverter` being called when a
-    null value is fetched from the database and the new parameter
-    ``convert_nulls`` to the method :meth:`Cursor.var()` is passed the value
-    ``True``
-    (`issue 107 <https://github.com/oracle/python-oracledb/issues/107>`__).
-#)  Replaced fixed 7-tuple for the cursor metadata found in
-    :data:`Cursor.description` with a class which provides additional
-    information such as the database object type and whether the column
-    contains JSON data.
-#)  Changed the signature for output type handlers to
-    ``handler(cursor, metadata)`` where the ``metadata`` parameter is a
-    :ref:`FetchInfo<fetchinfoobj>` object containing the same information found
-    in :data:`Cursor.description`. The original signature for output type
-    handlers is deprecated and will be removed in a future version.
-#)  Added support for fetching VARCHAR2 and LOB columns which contain JSON (and
-    have the "IS JSON" check constraint enabled) in the same way as columns of
-    type JSON (which requires Oracle Database 21c or higher) are fetched. In
-    Thick mode this requires Oracle Client 19c or higher. The attribute
-    ``oracledb.__future__.old_json_col_as_obj`` must be set to the value
-    ``True`` for this behavior to occur. In version 2.0 this will become the
-    normal behavior and setting this attribute will no longer be needed.
-#)  Added new property :attr:`Connection.instance_name` which provides the
-    Oracle Database instance name associated with the connection. This is the
-    same value as the SQL expression
-    ``sys_context('userenv', 'instance_name')``.
-#)  Added support for relational queries on the underlying tables of SODA
-    collections created in Oracle Database version 23 if they contain JSON
-    documents with embedded OIDs.
-#)  Automatically retry a query if the error ``ORA-00932: inconsistent data
-    types`` is raised (which can occur if a table or view is recreated with a
-    data type that is incompatible with the column's previous data type).
-#)  The ``repr()`` value of the DbObject class now shows the string "DbObject"
-    instead of the string "Object" for consistency with the name of the class
-    and the other ``repr()`` values for DbObjectType and DbObjectAttr.
-#)  Fixed bug when binding sequences other than lists and tuples
-    (`issue 205 <https://github.com/oracle/python-oracledb/issues/205>`__).
-#)  Added support for using the Cython 3.0 release
-    (`issue 204 <https://github.com/oracle/python-oracledb/issues/204>`__).
-#)  Improved test suite and documentation.
-
-oracledb `1.3.2 <https://github.com/oracle/python-oracledb/compare/v1.3.1...v1.3.2>`__ (June 2023)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug using :attr:`Cursor.arraysize` for tuning data fetches from REF
-    CURSORS.
-#)  Fixed bug connecting to databases with older 11g password verifiers
-    (`issue 189 <https://github.com/oracle/python-oracledb/issues/189>`__).
-#)  Fixed bugs in the implementation of the statement cache.
-#)  Fixed bug which caused a cursor leak if an error was thrown while
-    processing the execution of a query.
-#)  Eliminated unneeded round trip when using token authentication to connect
-    to the database.
-#)  Fixed bug which could cause a redirect loop with improperly configured
-    listener redirects.
-#)  Fixed bug when executing PL/SQL with a large number of binds.
-#)  Fixed bug when using DRCP with Oracle Database version 23
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug when using external authentication with a Net Service Name
-    connection string
-    (`issue 178 <https://github.com/oracle/python-oracledb/issues/178>`__).
-#)  Fixed bug when using external authentication with an Easy Connect
-    connection string.
-
-Common Changes
-++++++++++++++
-
-#)  When fetching rows from REF CURSORS, the cursor's
-    :attr:`~Cursor.prefetchrows` attribute is now ignored. Use
-    :attr:`Cursor.arraysize` for tuning these fetches. This change allows
-    consistency between Thin and Thick modes.
-
-
-oracledb `1.3.1 <https://github.com/oracle/python-oracledb/compare/v1.3.0...v1.3.1>`__ (April 2023)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Improved performance of regular expressions used for parsing SQL
-    (`issue 172 <https://github.com/oracle/python-oracledb/issues/172>`__).
-#)  Fixed bug with Oracle Database version 23 when SQL is executed after first
-    being parsed.
-#)  Fixed bug when :data:`ConnectionPool.timeout` is not *None* when creating a
-    connection pool
-    (`issue 166 <https://github.com/oracle/python-oracledb/issues/166>`__).
-#)  Fixed bug when a query is re-executed after an underlying table is dropped
-    and recreated, and the query select list contains LOBs or JSON data.
-#)  Fixed bug when warning message such as for impending password expiry is
-    encountered during connect
-    (`issue 171 <https://github.com/oracle/python-oracledb/issues/171>`__).
-
-Common Changes
-++++++++++++++
-
-#)  Improved test suite and samples.
-
-
-oracledb `1.3.0 <https://github.com/oracle/python-oracledb/compare/v1.2.2...v1.3.0>`__ (March 2023)
----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added direct support for the Oracle Database 21c JSON data type, removing
-    the need to use an output type handler.
-#)  Added implementation for :data:`ConnectionPool.timeout` to allow pools to
-    shrink to ``min`` connections.
-#)  Added check to prevent adding too many elements to bounded database
-    collections.
-#)  Removed internally set fixed size for database collections. Collections of
-    any size supported by the database can now be created.
-#)  Added support for connecting to databases that accept passwords longer than
-    30 UTF-8 encoded bytes.
-#)  Detect the time zone on the OS and set the session timezone using this
-    value to be consistent with Thick mode
-    (`issue 144 <https://github.com/oracle/python-oracledb/issues/144>`__).
-#)  Improved BOOLEAN handling.
-#)  Error ``DPY-6005: cannot connect to database`` is now raised for all
-    failures to connect to the database and the phrase ``cannot connect to
-    database`` is removed from all other error messages (since this can be
-    confusing when these errors are raised from
-    :meth:`ConnectParams.parse_connect_string()`).
-#)  Fixed bug when calling :meth:`Cursor.executemany()` with PL/SQL when the
-    size of the bound data increases on subsequent calls
-    (`issue 132 <https://github.com/oracle/python-oracledb/issues/132>`__).
-#)  Fixed bug when binding data of type TIMESTAMP WITH TIME ZONE but with
-    zero fractional seconds.
-#)  Fixed bug with incorrect values of :data:`Cursor.rowcount` when fetching
-    data
-    (`issue 147 <https://github.com/oracle/python-oracledb/issues/147>`__).
-#)  Fixed bug with SQL containing multibyte characters with certain database
-    character sets
-    (`issue 133 <https://github.com/oracle/python-oracledb/issues/133>`__).
-#)  Fixed bug with ordering of binds in SQL when the database version is 12.1
-    (`issue 135 <https://github.com/oracle/python-oracledb/issues/135>`__).
-#)  Fixed bug with ordering of binds in PL/SQL when the bind variable may
-    potentially exceed the 32767 byte limit but the actual value bound does not
-    (`issue 146 <https://github.com/oracle/python-oracledb/issues/146>`__).
-#)  Fixed bug connecting to an IPv6 address with IAM tokens.
-#)  Fixed bug determining RETURNING binds in a SQL statement when RETURNING and
-    INTO keywords are not separated by whitespace, but are separated by
-    parentheses.
-#)  The exception ``DPY-3022: named time zones are not supported in thin mode``
-    is now raised when attempting to fetch data of type TIMESTAMP WITH TIME
-    ZONE when the time zone associated with the data is a named time zone.
-    Previously invalid data was returned
-    (`disc 131 <https://github.com/oracle/python-oracledb/discussions/131>`__).
-#)  Internal implementation changes:
-
-    - Added internal support for prefetching the LOB size and chunk size,
-      thereby eliminating a :ref:`round-trip<roundtrips>` when calling
-      :meth:`LOB.size()` and :meth:`LOB.getchunksize()`.
-    - Made the pool implementation LIFO to improve locality, reduce the number
-      of times any session callback must be invoked, and allow connections to
-      be timed out.
-    - Removed packet for negotiating network services which are not supported
-      in Thin mode.
-    - Removed unneeded packet for changing the password of the connected user.
-
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Raise a more meaningful error when an unsupported type in a JSON value is
-    detected.
-#)  Added support for the "signed int", "signed long" and "decimal128" scalar
-    types in JSON (generally only seen when converting from MongoDB).
-#)  Defer raising an exception when calling :meth:`Connection.gettype()`
-    for a type containing an attribute or element with an unsupported data type
-    until the first attempt to reference the attribute or element with the
-    unsupported data type.
-#)  Fixed bug when attempting to create bequeath connections when the DSN
-    contains credentials.
-
-Common Changes
-++++++++++++++
-
-#)  Improved type annotations.
-#)  Added method :meth:`ConnectParams.parse_dsn_with_credentials()` for parsing
-    a DSN that contains credentials.
-#)  Error ``DPY-2038: element at index {index} does not exist`` is now raised
-    whenever an element in a database collection is missing. Previously, Thick
-    mode raised ``DPI-1024: element at index {index} does not exist`` and Thin
-    mode raised ``KeyError`` or ``IndexError``.
-#)  Error ``DPY-2039: given index {index} must be in the range of {min_index}
-    to {max_index}`` is now raised whenever an element in a database collection
-    is set outside the bounds of the collection. Previously, Thick mode raised
-    ``OCI-22165: given index [{index}] must be in the range of [{min_index}] to
-    [{max_index}]`` and Thin mode raised ``IndexError``.
-#)  Error ``DPY-2040: parameters "batcherrors" and "arraydmlrowcounts" may only
-    be true when used with insert, update, delete and merge statements`` is now
-    raised when either of the parameters ``batcherrors`` and
-    ``arraydmlrowcounts`` is set to the value `True` when calling
-    :meth:`Cursor.executemany()`. Previously, Thick mode raised ``DPI-1063:
-    modes DPI_MODE_EXEC_BATCH_ERRORS and DPI_MODE_EXEC_ARRAY_DML_ROWCOUNTS can
-    only be used with insert, update, delete and merge statements`` and Thin
-    mode raised ``ORA-03137: malformed TTC packet from client rejected``
-    (`issue 128 <https://github.com/oracle/python-oracledb/issues/128>`__).
-#)  Internal changes to ensure that errors taking place while raising
-    exceptions are handled more gracefully.
-
-
-oracledb `1.2.2 <https://github.com/oracle/python-oracledb/compare/v1.2.1...v1.2.2>`__ (January 2023)
------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Any exception raised while finding the operating system user for database
-    logging is now ignored (`issue 112
-    <https://github.com/oracle/python-oracledb/issues/112>`__).
-#)  Fixed bug when binding OUT a NULL boolean value.
-    (`issue 119 <https://github.com/oracle/python-oracledb/issues/119>`__).
-#)  Fixed bug when getting a record type based on a table (%ROWTYPE)
-    (`issue 123 <https://github.com/oracle/python-oracledb/issues/123>`__).
-#)  Fixed bug when using a `select * from table` query and columns are added to
-    the table
-    (`issue 125 <https://github.com/oracle/python-oracledb/issues/125>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug when attempting to create bequeath connections to a local
-    database
-    (`issue 114 <https://github.com/oracle/python-oracledb/issues/114>`__).
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug when attempting to populate an array variable with too many
-    elements.
-
-
-oracledb `1.2.1 <https://github.com/oracle/python-oracledb/compare/v1.2.0...v1.2.1>`__ (December 2022)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug determining RETURNING binds in a SQL statement when RETURNING and
-    INTO keywords are not separated by spaces, but are separated by other
-    whitespace characters
-    (`issue 104 <https://github.com/oracle/python-oracledb/issues/104>`__).
-#)  Fixed bug determining bind variables when found between two comment blocks
-    (`issue 105 <https://github.com/oracle/python-oracledb/issues/105>`__).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug creating a homogeneous connection pool with a proxy user
-    (`issue 101 <https://github.com/oracle/python-oracledb/issues/101>`__).
-#)  Fixed bug closing a SODA document cursor explicitly (instead of simply
-    allowing it to be closed automatically when it goes out of scope).
-#)  Fixed bug when calling :meth:`Subscription.registerquery()` with bind
-    values.
-#)  Fixed bug that caused :data:`Message.dbname` to always be the value *None*.
-
-Common Changes
-++++++++++++++
-
-#)  Corrected ``__repr__()`` of connections to include the actual class name
-    instead of a hard-coded ``oracledb``.
-
-
-oracledb `1.2.0 <https://github.com/oracle/python-oracledb/compare/v1.1.1...v1.2.0>`__ (November 2022)
-------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for binding and fetching data of type
-    :data:`~oracledb.DB_TYPE_OBJECT`. Note that some of the error codes and
-    messages have changed as a result: DPY errors are raised instead of ones
-    specific to ODPI-C and OCI
-    (`issue 43 <https://github.com/oracle/python-oracledb/issues/43>`__).
-#)  Added support for fetching SYS.XMLTYPE data as strings. Note that unlike
-    in Thick mode, fetching longer values does not require using
-    ``XMLTYPE.GETCLOBVAL()``.
-#)  Added support for using a wallet for one-way TLS connections, rather than
-    requiring OS recognition of certificates
-    (`issue 65 <https://github.com/oracle/python-oracledb/issues/65>`__).
-#)  Added support for connecting to CMAN using ``(SOURCE_ROUTE=YES)`` in the
-    connect string
-    (`issue 81 <https://github.com/oracle/python-oracledb/issues/81>`__).
-#)  Fixed bug when fetching nested cursors with more columns than the parent
-    cursor.
-#)  Fixed bug preventing a cursor from being reused after it was bound as a
-    REF CURSOR to a PL/SQL block that closes it.
-#)  Fixed bug preventing binding OUT data of type
-    :data:`~oracledb.DB_TYPE_UROWID` that exceeds 3950 bytes in length.
-#)  Fixed bug preventing correct parsing of connect descriptors with both
-    ``ADDRESS`` and ``ADDRESS_LIST`` components at the same level.
-#)  The complete connect string is now sent to the server instead of just the
-    actual components being used. This is important for some configurations.
-#)  Fixed bug resulting in an internal protocol error when handling database
-    responses.
-#)  Fixed bug when calling :meth:`Cursor.executemany()` with the `batcherrors`
-    parameter set to `True` multiple times with each call resulting in at least
-    one batch error.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Connections acquired from a homogeneous pool now show the username and dsn
-    to which they are connected in their repr().
-
-Common Changes
-++++++++++++++
-
-#)  Added support for Python 3.11.
-#)  Added attribute :attr:`DbObjectType.package_name` which contains the name
-    of the package if the type is a PL/SQL type (otherwise, it will be *None*).
-#)  Added sample for loading data from a CSV file.
-#)  Improved test suite and documentation.
-
-
-oracledb `1.1.1 <https://github.com/oracle/python-oracledb/compare/v1.1.0...v1.1.1>`__ (September 2022)
--------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Fixed bug that prevented binding data of types
-    :data:`~oracledb.DB_TYPE_ROWID` and :data:`~oracledb.DB_TYPE_UROWID`.
-#)  Fixed bug that caused :meth:`Connection.is_healthy()` to return `True`
-    after a connection has been killed.
-#)  Internally, before a connection is returned from a pool, perform additional
-    checks in order to avoid returning a dead connection from the pool.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed bug returning metadata of SODA documents inserted into a collection
-    using :meth:`SodaCollection.saveAndGet()`.
-
-Common Changes
-++++++++++++++
-
-#)  Fixed type checking errors
-    (`issue 52 <https://github.com/oracle/python-oracledb/issues/52>`__).
-#)  Enhanced type checking
-    (`issue 54 <https://github.com/oracle/python-oracledb/issues/54>`__),
-    (`issue 60 <https://github.com/oracle/python-oracledb/issues/60>`__).
-#)  The mode of python-oracledb is now fixed only after a call to
-    :meth:`oracledb.init_oracle_client()`, :meth:`oracledb.connect()` or
-    :meth:`oracledb.create_pool()` has completed successfully
-    (`issue 44 <https://github.com/oracle/python-oracledb/issues/44>`__).
-#)  Improved test suite and documentation.
-
-
-oracledb `1.1.0 <https://github.com/oracle/python-oracledb/compare/v1.0.3...v1.1.0>`__ (September 2022)
--------------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for getting the LOB chunk size
-    (`issue 14 <https://github.com/oracle/python-oracledb/issues/14>`__).
-#)  The error ``DPY-2030: LOB offset must be greater than zero`` is now raised
-    when the offset parameter to :func:`LOB.read()` is zero or negative
-    (`issue 13 <https://github.com/oracle/python-oracledb/issues/13>`__).
-#)  Internally, before a connection is returned from a pool, check for control
-    packets from the server (which may inform the client that the connection
-    needs to be closed and a new one established).
-#)  Internally make use of the `TCP_NODELAY` socket option to remove delays
-    in socket reads.
-#)  Fixed bug when calling :func:`Cursor.parse()` multiple times with the same
-    SQL statement.
-#)  Fixed bug that prevented connecting to Oracle Database 12.1.0.1.
-#)  Fixed bug that prevented the database error message from being returned
-    when connecting to a database that the listener configuration file states
-    exists but actually doesn't
-    (`issue 51 <https://github.com/oracle/python-oracledb/issues/51>`__).
-#)  The error ``DPY-3016: python-oracledb thin mode cannot be used because the
-    cryptography package is not installed`` is now raised when the cryptography
-    package is not installed, instead of an ImportError. This allows platforms
-    that are not capable of building the cryptography package to still use
-    Thick mode.
-#)  Fixed bug that prevented the `full_code` attribute from being populated on
-    the errors returned by :func:`Cursor.getbatcherrors()`.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Added support for getting the message id of the AQ message which generated
-    a notification.
-#)  Added support for enqueuing and dequeing AQ messages as JSON.
-#)  Added the ability to use `externalauth` as a connection parameter for
-    standalone connections in addition to creating pools. For standalone
-    connections, this parameter is optional.
-
-Common Changes
-++++++++++++++
-
-#)  Added support for Azure Active Directory OAuth 2.0 and Oracle Cloud
-    Infrastructure Identity and Access Management (IAM) token authentication
-    via the new parameter `access_token` to :func:`oracledb.connect()` and
-    :func:`oracledb.create_pool()`.
-#)  Added method :func:`oracledb.is_thin_mode()` to support determining whether
-    the driver is using Thin mode or not
-    (`issue 16 <https://github.com/oracle/python-oracledb/issues/10>`__).
-#)  Improved samples and documentation.
-
-
-oracledb `1.0.3 <https://github.com/oracle/python-oracledb/compare/v1.0.2...v1.0.3>`__ (August 2022)
-----------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  The error ``DPY-3015: password verifier type is not supported by
-    python-oracledb in thin mode`` is now raised when
-    the database sends a password challenge with a verifier type that is not
-    recognized, instead of `ORA-01017: invalid username/password`
-    (`issue 26 <https://github.com/oracle/python-oracledb/issues/26>`__).
-#)  Fixed bug with handling of redirect data returned by some SCAN listeners
-    (`issue 39 <https://github.com/oracle/python-oracledb/issues/39>`__).
-#)  Fixed bug with re-execution of SQL that requires a define, such as occurs
-    when setting :attr:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>` to
-    the value `False`
-    (`issue 41 <https://github.com/oracle/python-oracledb/issues/41>`__).
-#)  Fixed bug that prevented cursors from implicit results sets from being
-    closed.
-
-Common Changes
-++++++++++++++
-
-#)  Fixed bug with the deferral of type assignment when creating variables for
-    :func:`Cursor.executemany()`
-    (`issue 35 <https://github.com/oracle/python-oracledb/issues/35>`__).
-
-
-oracledb `1.0.2 <https://github.com/oracle/python-oracledb/compare/v1.0.1...v1.0.2>`__ (July 2022)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Connecting to a database with national character set `UTF8` is now
-    supported; an error is now raised only when the first attempt to use
-    NCHAR, NVARCHAR2 or NCLOB data is made
-    (`issue 16 <https://github.com/oracle/python-oracledb/issues/16>`__).
-#)  Fixed a bug when calling `cursor.executemany()` with a PL/SQL statement and
-    a single row of data
-    (`issue 30 <https://github.com/oracle/python-oracledb/issues/30>`__).
-#)  When using the connection parameter `https_proxy` while using protocol
-    `tcp`, a more meaningful exception is now raised:
-    `DPY-2029: https_proxy requires use of the tcps protocol`.
-#)  Fixed a bug that caused TLS renegotiation to be skipped in some
-    configurations, thereby causing the connection to fail to be established
-    (https://github.com/oracle/python-oracledb/discussions/34).
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed the ability to use external authentication with connection pools.
-
-Common Changes
-++++++++++++++
-
-#)  The compiler flag ``-arch x86_64`` no longer needs to be explicitly
-    specified when building from source code on macOS (Intel x86) without
-    Universal Python binaries.
-#)  Binary packages have been added for the Linux ARM 64-bit platform.
-#)  Improved samples and documentation.
-
-
-oracledb `1.0.1 <https://github.com/oracle/python-oracledb/compare/v1.0.0...v1.0.1>`__ (June 2022)
---------------------------------------------------------------------------------------------------
-
-Thin Mode Changes
-+++++++++++++++++
-
-#)  Added support for multiple aliases in one entry in tnsnames.ora
-    (`issue 3 <https://github.com/oracle/python-oracledb/issues/3>`__).
-#)  Fixed connection retry count handling to work in cases where the database
-    listener is running but the service is down
-    (`issue 3 <https://github.com/oracle/python-oracledb/issues/3>`__).
-#)  Return the same value for TIMESTAMP WITH TIME ZONE columns as Thick mode
-    (`issue 7 <https://github.com/oracle/python-oracledb/issues/7>`__).
-#)  Fixed order in which bind data is sent to the server when LONG and
-    non-LONG column data is interspersed
-    (`issue 12 <https://github.com/oracle/python-oracledb/issues/12>`__).
-#)  If an error occurs during the creation of a connection to the database, the
-    error is wrapped by DPY-6005 (so that it can be caught with an exception
-    handler on class oracledb.DatabaseError).
-#)  Ensured that errors occurring during fetch are detected consistently.
-#)  Fixed issue when fetching null values in implicit results.
-#)  Small performance optimization when sending column metadata.
-
-Thick Mode Changes
-++++++++++++++++++
-
-#)  Fixed the ability to create bequeath connections to a local database.
-#)  Fixed issue fetching NCLOB columns with
-    `oracledb.defaults.fetch_lobs = False`.
-
-Common Changes
-++++++++++++++
-
-#)  Fixed issue where unconstrained numbers containing integer values would be
-    fetched as floats when `oracledb.defaults.fetch_lobs = False`.
-    (`issue 15 <https://github.com/oracle/python-oracledb/issues/15>`__).
-#)  Ensured connection error messages contain the function name instead of
-    ``wrapped()``.
-#)  Improved samples, including adding a Dockerfile that starts a container
-    with a running database and the samples.
-#)  A binary package has been added for Python 3.7 on macOS (Intel x86).
-#)  Improved documentation.
-
-
-oracledb 1.0.0 (May 2022)
--------------------------
-
-#)  Renamed cx_Oracle to python-oracledb. See :ref:`upgrading83`.
-#)  Python-oracledb is a 'Thin' driver by default that connects directly
-    to Oracle Database.  Optional use of Oracle Client libraries enables a
-    :ref:`'Thick' mode <enablingthick>` with some additional functionality.
-    Both modes support the Python Database API v2.0 Specification.
-#)  Added a :attr:`Connection.thin` attribute which shows whether the
-    connection was established in python-oracledb Thin mode or Thick mode.
-#)  Creating connections or connection pools now requires keyword parameters be
-    passed. This brings python-oracledb into compliance with the Python
-    Database API specification PEP 249.
-#)  Threaded mode is now always enabled for standalone connections (Thick
-    mode).
-#)  The function :func:`oracledb.init_oracle_client()` must now always be
-    called to load Oracle Client libraries, which enables Thick mode.
-#)  Allow :meth:`oracledb.init_oracle_client` to be called multiple times in
-    each process as long as the same parameters are used each time.
-#)  Improved some :ref:`connection and binding error messages <errorhandling>`
-    (Thin mode only).
-#)  Added :ref:`oracledb.defaults <defaults>` containing attributes that can
-    be used to adjust the default behavior of the python-oracledb driver.  In
-    particular ``oracledb.defaults.fetch_lobs`` obsoletes the need for a
-    :ref:`LOB type handler <directlobs>` .
-#)  Added a :ref:`ConnectParams Class <connparam>` which provides the ability
-    to define connection parameters in one place.
-#)  Added a :ref:`PoolParams Class <poolparam>` which provides the ability to
-    define pool parameters in one place.
-#)  Added a :ref:`ConnectionPool Class <connpool>` which is equivalent to the
-    SessionPool class previously used in cx_Oracle.  The new
-    :func:`oracledb.create_pool()` function is now the preferred method for
-    creating connection pools.
-#)  Changed the default :func:`oracledb.create_pool()` ``getmode`` parameter
-    value to :data:`~oracledb.POOL_GETMODE_WAIT` to remove potential transient
-    errors when calling :meth:`ConnectionPool.acquire()` during pool growth.
-#)  Connection pools in python-oracledb Thin mode support all :ref:`connection
-    mode privileges <connection-authorization-modes>`.
-#)  Added new :ref:`Two-phase commit <tpc>` functionality.
-#)  Added :meth:`Connection.is_healthy()` to do a local check of a connection's
-    health.
-#)  Added a boolean parameter ``cache_statement`` to :meth:`Cursor.prepare()`,
-    giving applications control over statement caching.
-#)  Made improvements to statement cache invalidation (Thin mode only)
-#)  Added a :attr:`~Messageproperties.recipient` attribute to support recipient
-    lists in :ref:`Oracle Advanced Queuing <aq>`.
-#)  Added a :attr:`~oracledb._Error.full_code` attribute to the Error object
-    giving the top-level error prefix and the error number.
-#)  Added a :data:`~oracledb.DB_TYPE_LONG_NVARCHAR` constant.
-
-
-cx_Oracle 8.3 (November 2021)
------------------------------
-
-#)  Updated embedded ODPI-C to `version 4.3.0
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-3-november-4-2021>`__.
-#)  Added official support for Python 3.10.
-#)  Support for dequeuing messages from Oracle Transactional Event Queue (TEQ)
-    queues was restored.
-#)  Corrected calculation of attribute :data:`MessageProperties.msgid`. Note
-    that the attribute is now also read only.
-#)  Binary integer variables now explicitly convert values to integers (since
-    implicit conversion to integer has become an error in Python 3.10) and
-    values that are not `int`, `float` or `decimal.Decimal` are explicitly
-    rejected.
-#)  Improved samples and test suite.
-
-
-cx_Oracle 8.2.1 (June 2021)
----------------------------
-
-#)  Updated embedded ODPI-C to `version 4.2.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-2-1-june-1-2021>`__.
-#)  Added support for caching the database version in pooled connections with
-    Oracle Client 19 and earlier (later Oracle Clients handle this caching
-    internally). This optimization eliminates a round-trip previously often
-    required when reusing a pooled connection.
-#)  Fixed a regression with error messages when creating a connection fails.
-#)  Fixed crash when using the deprecated parameter name `keywordParameters`
-    with :meth:`Cursor.callproc()`.
-#)  Improved documentation and the test suite.
-
-
-cx_Oracle 8.2 (May 2021)
-------------------------
-
-#)  Updated embedded ODPI-C to `version 4.2.0
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-2-may-18-2021>`__.
-#)  Threaded mode is now always enabled when creating connection pools with
-    ``cx_Oracle.SessionPool()``. Any `threaded` parameter value is ignored.
-#)  Added ``SessionPool.reconfigure()`` to support pool reconfiguration.
-    This method provides the ability to change properties such as the size of
-    existing pools instead of having to restart the application or create a new
-    pool.
-#)  Added parameter `max_sessions_per_shard` to ``cx_Oracle.SessionPool()``
-    to allow configuration of the maximum number of sessions per shard in the
-    pool.  In addition, the attribute
-    ``SessionPool.max_sessions_per_shard`` was added in order to permit
-    making adjustments after the pool has been created. They are usable when
-    using Oracle Client version 18.3 and higher.
-#)  Added parameter `stmtcachesize` to ``cx_Oracle.connect()`` and
-    ``cx_Oracle.SessionPool()`` in order to permit specifying the size of
-    the statement cache during the creation of pools and standalone
-    connections.
-#)  Added parameter `ping_interval` to ``cx_Oracle.SessionPool()`` to
-    specify the ping interval when acquiring pooled connections. In addition,
-    the attribute ``SessionPool.ping_interval`` was added in order to
-    permit making adjustments after the pool has been created.  In previous
-    cx_Oracle releases a fixed ping interval of 60 seconds was used.
-#)  Added parameter `soda_metadata_cache` to ``cx_Oracle.SessionPool()``
-    for :ref:`SODA metadata cache <sodametadatacache>` support.  In addition,
-    the attribute ``SessionPool.soda_metadata_cache`` was added in order to
-    permit making adjustments after the pool has been created. This feature
-    significantly improves the performance of methods
-    :meth:`SodaDatabase.createCollection()` (when not specifying a value for
-    the metadata parameter) and :meth:`SodaDatabase.openCollection()`. Caching
-    is available when using Oracle Client version 21.3 and higher (or Oracle
-    Client 19 from 19.11).
-#)  Added support for supplying hints to SODA operations. A new non-terminal
-    method :meth:`~SodaOperation.hint()` was added and a `hint` parameter was
-    added to the methods :meth:`SodaCollection.insertOneAndGet()`,
-    :meth:`SodaCollection.insertManyAndGet()` and
-    :meth:`SodaCollection.saveAndGet()`. All of these require Oracle Client
-    21.3 or higher (or Oracle Client 19 from 19.11).
-#)  Added parameter `bypass_decode` to :meth:`Cursor.var()` in order to allow
-    the `decode` step to be bypassed when converting data from Oracle Database
-    into Python strings
-    (`issue 385 <https://github.com/oracle/python-cx_Oracle/issues/385>`__).
-    Initial work was done in `PR 549
-    <https://github.com/oracle/python-cx_Oracle/pull/549>`__.
-#)  Enhanced dead connection detection.  If an Oracle Database error indicates
-    that a connection is no longer usable, the error ``DPI-1080: connection was
-    closed by ORA-%d`` is now returned.  The `%d` will be the Oracle error
-    causing the connection to be closed.  Using the connection after this will
-    give ``DPI-1010: not connected``.  This behavior also applies for
-    :data:`Connection.call_timeout` errors that result in an unusable
-    connection.
-#)  Eliminated a memory leak when calling :meth:`SodaOperation.filter()` with a
-    dictionary.
-#)  The distributed transaction handle associated with the connection is now
-    cleared on commit or rollback (`issue 530
-    <https://github.com/oracle/python-cx_Oracle/issues/530>`__).
-#)  Added a check to ensure that when setting variables or object attributes,
-    the type of the temporary LOB must match the expected type.
-#)  A small number of parameter, method, and attribute names were updated to
-    follow the PEP 8 style guide. This brings better consistency to the
-    cx_Oracle API. The old names are still usable but may be removed in a
-    future release of cx_Oracle. See :ref:`_deprecations_8_2` for details.
-#)  Improved the test suite.
-
-
-cx_Oracle 8.1 (December 2020)
------------------------------
-
-#)  Updated embedded ODPI-C to `version 4.1.0
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-1-december-8-2020>`__.
-#)  Added support for new JSON data type available in Oracle Client and
-    Database 21 and higher.
-#)  Dropped support for Python 3.5. Added support for Python 3.9.
-#)  Added internal methods for getting/setting OCI attributes that are
-    otherwise not supported by cx_Oracle. These methods should only be used as
-    directed by Oracle.
-#)  Minor code improvement supplied by Alex Henrie
-    (`PR 472 <https://github.com/oracle/python-cx_Oracle/pull/472>`__).
-#)  Builds are now done with setuptools and most metadata has moved from
-    `setup.py` to `setup.cfg` in order to take advantage of Python packaging
-    improvements.
-#)  The ability to pickle/unpickle Database and API types has been restored.
-#)  Tests can now be run with tox in order to automate testing of the different
-    environments that are supported.
-#)  The value of prefetchrows for REF CURSOR variables is now honored.
-#)  Improved documentation, samples and test suite.
-
-
-cx_Oracle 8.0.1 (August 2020)
------------------------------
-
-#)  Updated embedded ODPI-C to `version 4.0.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-0-2-august-31-2020>`__. This includes the fix for binding and
-    fetching numbers with 39 or 40 decimal digits
-    (`issue 459 <https://github.com/oracle/python-cx_Oracle/issues/459>`__).
-#)  Added build metadata specifying that Python 3.5 and higher is required in
-    order to avoid downloading and failing to install with Python 2. The
-    exception message when running ``setup.py`` directly was updated to inform
-    those using Python 2 to use version 7.3 instead.
-#)  Documentation improvements.
-
-
-cx_Oracle 8.0 (June 2020)
--------------------------
-
-#)  Dropped support for Python 2.
-#)  Updated embedded ODPI-C to `version 4.0.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-4-0-1-june-26-2020>`__.
-#)  Reworked type management to clarify and simplify code
-
-    - Added :ref:`constants <dbtypes>` for all database types. The database
-      types ``cx_Oracle.DB_TYPE_BINARY_FLOAT``,
-      ``cx_Oracle.DB_TYPE_INTERVAL_YM``, ``cx_Oracle.DB_TYPE_TIMESTAMP_LTZ``
-      and ``cx_Oracle.DB_TYPE_TIMESTAMP_TZ`` are completely new. The other
-      types were found in earlier releases under a different name. These types
-      will be found in :data:`Cursor.description` and passed as the defaultType
-      parameter to the :data:`Connection.outputtypehandler` and
-      :data:`Cursor.outputtypehandler` functions.
-    - Added :ref:`synonyms <dbtypesynonyms>` from the old type names to the new
-      type names for backwards compatibility. They are deprecated and will be
-      removed in a future version of cx_Oracle.
-    - The DB API :ref:`constants <types>` are now a specialized constant that
-      matches to the corresponding database types, as recommended by the DB
-      API.
-    - The variable attribute :data:`~Variable.type` now refers to one of the
-      new database type constants if the variable does not contain objects
-      (previously it was *None* in that case).
-    - The attribute :data:`~LOB.type` was added to LOB values.
-    - The attribute ``type`` was added to attributes of object types.
-    - The attribute ``element_type`` was added to object types.
-    - Object types now compare equal if they were created
-      by the same connection or session pool and their schemas and names match.
-    - All variables are now instances of the same class (previously each type
-      was an instance of a separate variable type). The attribute
-      :data:`~Variable.type` can be examined to determine the database type it
-      is associated with.
-    - The string representation of variables has changed to include the type
-      in addition to the value.
-
-#)  Added function ``cx_Oracle.init_oracle_client()`` in order to enable
-    programmatic control of the initialization of the Oracle Client library.
-#)  The default encoding for all character data is now UTF-8 and any character
-    set specified in the environment variable ``NLS_LANG`` is ignored.
-#)  Added functions :meth:`SodaCollection.save()`,
-    :meth:`SodaCollection.saveAndGet()` and :meth:`SodaCollection.truncate()`
-    available in Oracle Client 20 and higher.
-#)  Added function :meth:`SodaOperation.fetchArraySize()` available in Oracle
-    Client 19.5 and higher.
-#)  Added attribute :attr:`Cursor.prefetchrows` to control the number of rows
-    that the Oracle Client library fetches into internal buffers when a query
-    is executed.
-#)  Internally make use of new mode available in Oracle Client 20 and higher in
-    order to avoid a round-trip when accessing :attr:`Connection.version` for
-    the first time.
-#)  Added support for starting up a database using a parameter file (PFILE),
-    as requested
-    (`issue 295 <https://github.com/oracle/python-cx_Oracle/issues/295>`__).
-#)  Fixed overflow issue when calling :meth:`Cursor.getbatcherrors()` with
-    row offsets exceeding 65536.
-#)  Eliminated spurious error when accessing :attr:`Cursor.lastrowid` after
-    executing an INSERT ALL statement.
-#)  Miscellaneous improvements supplied by Alex Henrie (pull requests
-    `419 <https://github.com/oracle/python-cx_Oracle/pull/419>`__,
-    `420 <https://github.com/oracle/python-cx_Oracle/pull/420>`__,
-    `421 <https://github.com/oracle/python-cx_Oracle/pull/421>`__,
-    `422 <https://github.com/oracle/python-cx_Oracle/pull/422>`__,
-    `423 <https://github.com/oracle/python-cx_Oracle/pull/423>`__,
-    `437 <https://github.com/oracle/python-cx_Oracle/pull/437>`__ and
-    `438 <https://github.com/oracle/python-cx_Oracle/pull/438>`__).
-#)  Python objects bound to boolean variables are now converted to True or
-    False based on whether they would be considered True or False in a Python
-    if statement. Previously, only True was treated as True and all other
-    Python values (including 1, 1.0, and "foo") were treated as False
-    (pull request
-    `435 <https://github.com/oracle/python-cx_Oracle/pull/435>`__).
-#)  Documentation, samples and test suite improvements.
-
-
-cx_Oracle 7.3 (December 2019)
------------------------------
-
-#)  Added support for Python 3.8.
-#)  Updated embedded ODPI-C to `version 3.3
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-3-december-2-2019>`__.
-#)  Added support for CQN and other subscription client initiated connections
-    to the database (as opposed to the default server initiated connections)
-    created by calling :meth:`Connection.subscribe()`.
-#)  Added :attr:`support <Cursor.lastrowid>` for returning the rowid of the
-    last row modified by an operation on a cursor (or *None* if no row was
-    modified).
-#)  Added support for setting the ``maxSessionsPerShard`` attribute when
-    creating connection pools.
-#)  Added check to ensure sharding key is specified when a super sharding key
-    is specified.
-#)  Improved error message when the Oracle Client library is loaded
-    successfully but the attempt to detect the version of that library fails,
-    either due to the fact that the library is too old or the method could not
-    be called for some reason (`node-oracledb issue 1168
-    <https://github.com/oracle/node-oracledb/issues/1168>`__).
-#)  Adjusted support for creating a connection using an existing OCI service
-    context handle. In order to avoid potential memory corruption and
-    unsupported behaviors, the connection will now use the same encoding as the
-    existing OCI service context handle when it was created.
-#)  Added ``ORA-3156: OCI call timed out`` to the list of error messages that
-    result in error DPI-1067.
-#)  Adjusted samples and the test suite so that they can be run against Oracle
-    Cloud databases.
-#)  Fixed bug when attempting to create a scrollable cursor on big endian
-    platforms like AIX on PPC.
-#)  Eliminated reference leak and ensure that memory is properly initialized in
-    case of error when using sharding keys.
-#)  Eliminated reference leak when splitting the password and DSN components
-    out of a full connect string.
-#)  Corrected processing of DATE sharding keys (sharding requires a slightly
-    different format to be passed to the server).
-#)  Eliminated reference leak when
-    :meth:`creating message property objects <Connection.msgproperties()>`.
-#)  Attempting to use proxy authentication with a homogeneous pool will now
-    raise a ``DatabaseError`` exception with the message
-    ``DPI-1012: proxy authentication is not possible with homogeneous pools``
-    instead of a ``ProgrammingError`` exception with the message
-    ``pool is homogeneous. Proxy authentication is not possible.`` since this
-    check is done by ODPI-C. An empty string (or *None*) for the user name will
-    no longer generate an exception.
-#)  Exception ``InterfaceError: not connected`` is now always raised when an
-    operation is attempted with a closed connection. Previously, a number of
-    different exceptions were raised depending on the operation.
-#)  Added ``ORA-40479: internal JSON serializer error`` to the list of
-    exceptions that result in ``cx_Oracle.IntegrityError``.
-#)  Improved documentation.
-
-
-cx_Oracle 7.2.3 (October 2019)
-------------------------------
-
-#)  Updated embedded ODPI-C to `version 3.2.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-2-2-october-1-2019>`__.
-#)  Restored support for setting numeric bind variables with boolean values.
-#)  Ensured that sharding keys are dedicated to the connection that is acquired
-    using them in order to avoid possible hangs, crashes or unusual errors.
-#)  Corrected support for PLS_INTEGER and BINARY_INTEGER types when used in
-    PL/SQL records
-    (`ODPI-C issue 112 <https://github.com/oracle/odpi/issues/112>`__).
-#)  Improved documentation.
-
-
-cx_Oracle 7.2.2 (August 2019)
------------------------------
-
-#)  Updated embedded ODPI-C to `version 3.2.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-2-1-august-12-2019>`__.
-#)  A more meaningful error is now returned when calling
-    :meth:`SodaCollection.insertMany()` with an empty list.
-#)  A more meaningful error is now returned when calling
-    :meth:`Subscription.registerquery()` with SQL that is not a SELECT
-    statement.
-#)  Eliminated segfault when a connection is closed after being created by a
-    call to ``cx_Oracle.connect()`` with the parameter ``cclass`` set to
-    a non-empty string.
-#)  Added user guide documentation.
-#)  Updated default connect strings to use 19c and XE 18c defaults.
-
-
-cx_Oracle 7.2.1 (July 2019)
----------------------------
-
-#)  Resolved ``MemoryError`` exception on Windows when using an output type
-    handler
-    (`issue 330 <https://github.com/oracle/python-cx_Oracle/issues/330>`__).
-#)  Improved test suite and samples.
-#)  Improved documentation.
-
-
-cx_Oracle 7.2 (July 2019)
--------------------------
-
-#)  Updated embedded ODPI-C to `version 3.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-2-july-1-2019>`__.
-#)  Improved AQ support
-
-    - added support for enqueue and dequeue of RAW payloads
-    - added support for bulk enqueue and dequeue of messages
-    - added new method :meth:`Connection.queue()` which creates a new
-      :ref:`queue object <queue>` in order to simplify AQ usage
-    - enhanced method :meth:`Connection.msgproperties()` to allow the writable
-      properties of the newly created object to be initialized.
-    - the original methods for enqueuing and dequeuing (Connection.deq(),
-      Connection.deqoptions(), Connection.enq() and Connection.enqoptions())
-      are now deprecated and will be removed in a future version.
-
-#)  Removed preview status from existing SODA functionality. See
-    `this tracking issue
-    <https://github.com/oracle/python-cx_Oracle/issues/309>`__ for known issues
-    with SODA.
-#)  Added support for a preview of SODA bulk insert, available in Oracle Client
-    18.5 and higher.
-#)  Added support for setting LOB object attributes, as requested
-    (`issue 299 <https://github.com/oracle/python-cx_Oracle/issues/299>`__).
-#)  Added mode ``cx_Oracle.DEFAULT_AUTH`` as requested
-    (`issue 293 <https://github.com/oracle/python-cx_Oracle/issues/293>`__).
-#)  Added support for using the LOB prefetch length indicator in order to
-    reduce the number of round trips when fetching LOBs and then subsequently
-    calling :meth:`LOB.size()`, :meth:`LOB.getchunksize()` or
-    :meth:`LOB.read()`. This is always enabled.
-#)  Added support for types BINARY_INTEGER, PLS_INTEGER, ROWID, LONG and LONG
-    RAW when used in PL/SQL.
-#)  Eliminated deprecation of attribute :attr:`Subscription.id`. It is now
-    populated with the value of ``REGID`` found in the database view
-    ``USER_CHANGE_NOTIFICATION_REGS`` or the value of ``REG_ID`` found in the
-    database view ``USER_SUBSCR_REGISTRATIONS``. For AQ subscriptions, the
-    value is 0.
-#)  Enabled PY_SSIZE_T_CLEAN, as required by Python 3.8
-    (`issue 317 <https://github.com/oracle/python-cx_Oracle/issues/317>`__).
-#)  Eliminated memory leak when fetching objects that are atomically null
-    (`issue 298 <https://github.com/oracle/python-cx_Oracle/issues/298>`__).
-#)  Eliminated bug when processing the string representation of numbers like
-    1e-08 and 1e-09 (`issue 300
-    <https://github.com/oracle/python-cx_Oracle/issues/300>`__).
-#)  Improved error message when the parent cursor is closed before a fetch is
-    attempted from an implicit result cursor.
-#)  Improved test suite and samples.
-#)  Improved documentation.
-
-
-cx_Oracle 7.1.3 (April 2019)
-----------------------------
-
-#)  Updated to `ODPI-C 3.1.4
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-1-4-april-24-2019>`__.
-#)  Added support for getting the row count for PL/SQL statements
-    (`issue 285 <https://github.com/oracle/python-cx_Oracle/issues/285>`__).
-#)  Corrected parsing of connect string so that the last @ symbol is searched
-    for instead of the first @ symbol; otherwise, passwords containing an @
-    symbol will result in the incorrect DSN being extracted
-    (`issue 290 <https://github.com/oracle/python-cx_Oracle/issues/290>`__).
-#)  Adjusted return value of cursor.callproc() to follow documentation (only
-    positional arguments are returned since the order of keyword parameters
-    cannot be guaranteed in any case)
-    (`PR 287 <https://github.com/oracle/python-cx_Oracle/pull/287>`__).
-#)  Corrected code getting sample and test parameters by user input when using
-    Python 2.7.
-
-
-cx_Oracle 7.1.2 (March 2019)
-----------------------------
-
-#)  Updated to `ODPI-C 3.1.3
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-1-3-march-12-2019>`__.
-#)  Ensured that the strings "-0" and "-0.0" are correctly handled as zero
-    values
-    (`issue 274 <https://github.com/oracle/python-cx_Oracle/issues/274>`__).
-#)  Eliminated error when startup and shutdown events are generated
-    (`ODPI-C issue 102 <https://github.com/oracle/odpi/issues/102>`__).
-#)  Enabled the types specified in :meth:`Cursor.setinputsizes()` and
-    :meth:`Cursor.callfunc()` to be an object type in addition to a Python
-    type, just like in :meth:`Cursor.var()`.
-#)  Reverted changes to return decimal numbers when the numeric precision was
-    too great to be returned accurately as a floating point number. This change
-    had too great an impact on existing functionality and an output type
-    handler can be used to return decimal numbers where that is desirable
-    (`issue 279 <https://github.com/oracle/python-cx_Oracle/issues/279>`__).
-#)  Eliminated discrepancies in character sets between an external connection
-    handle and the newly created connection handle that references the external
-    connection handle
-    (`issue 273 <https://github.com/oracle/python-cx_Oracle/issues/273>`__).
-#)  Eliminated memory leak when receiving messages received from subscriptions.
-#)  Improved test suite and documentation.
-
-
-cx_Oracle 7.1.1 (February 2019)
--------------------------------
-
-#)  Updated to `ODPI-C 3.1.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-1-2-february-19-2019>`__.
-#)  Corrected code for freeing CQN message objects when multiple queries are
-    registered
-    (`ODPI-C issue 96 <https://github.com/oracle/odpi/issues/96>`__).
-#)  Improved error messages and installation documentation.
-
-
-cx_Oracle 7.1 (February 2019)
------------------------------
-
-#)  Updated to `ODPI-C 3.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-1-january-21-2019>`__.
-#)  Improved support for session tagging in session pools by allowing a
-    session callback to be specified when creating a pool via
-    ``cx_Oracle.SessionPool()``. Callbacks can be written in Python or in
-    PL/SQL and can be used to improve performance by decreasing round trips to
-    the database needed to set session state. Callbacks written in Python will
-    be invoked for brand new connections (that have never been acquired from
-    the pool before) or when the tag assigned to the connection doesn't match
-    the one that was requested. Callbacks written in PL/SQL will only be
-    invoked when the tag assigned to the connection doesn't match the one that
-    was requested.
-#)  Added attribute :attr:`Connection.tag` to provide access to the actual tag
-    assigned to the connection. Setting this attribute will cause the
-    connection to be retagged when it is released back to the pool.
-#)  Added support for fetching SYS.XMLTYPE values as strings, as requested
-    (`issue 14 <https://github.com/oracle/python-cx_Oracle/issues/14>`__).
-    Note that this support is limited to the size of VARCHAR2 columns in the
-    database (either 4000 or 32767 bytes).
-#)  Added support for allowing the typename parameter in method
-    :meth:`Cursor.var()` to be *None* or a valid object type created by the
-    method :meth:`Connection.gettype()`, as requested
-    (`issue 231 <https://github.com/oracle/python-cx_Oracle/issues/231>`__).
-#)  Added support for getting and setting attributes of type RAW on Oracle
-    objects, as requested
-    (`ODPI-C issue 72 <https://github.com/oracle/odpi/issues/72>`__).
-#)  Added support for performing external authentication with proxy for
-    standalone connections.
-#)  Added support for mixing integers, floating point and decimal values in
-    data passed to :meth:`Cursor.executemany()`
-    (`issue 241 <https://github.com/oracle/python-cx_Oracle/issues/241>`__).
-    The error message raised when a value cannot be converted to an Oracle
-    number was also improved.
-#)  Adjusted fetching of numeric values so that no precision is lost. If an
-    Oracle number cannot be represented by a Python floating point number a
-    decimal value is automatically returned instead.
-#)  Corrected handling of multiple calls to method
-    :meth:`Cursor.executemany()` where all of the values in one of the columns
-    passed to the first call are all *None* and a subsequent call has a value
-    other than *None* in the same column
-    (`issue 236 <https://github.com/oracle/python-cx_Oracle/issues/236>`__).
-#)  Added additional check for calling :meth:`Cursor.setinputsizes()` with an
-    empty dictionary in order to avoid the error "cx_Oracle.ProgrammingError:
-    positional and named binds cannot be intermixed"
-    (`issue 199 <https://github.com/oracle/python-cx_Oracle/issues/199>`__).
-#)  Corrected handling of values that exceed the maximum value of a plain
-    integer object on Python 2 on Windows
-    (`issue 257 <https://github.com/oracle/python-cx_Oracle/issues/257>`__).
-#)  Added error message when attempting external authentication with proxy
-    without placing the user name in [] (proxy authentication was previously
-    silently ignored).
-#)  Exempted additional error messages from forcing a statement to be dropped
-    from the cache
-    (`ODPI-C issue 76 <https://github.com/oracle/odpi/issues/76>`__).
-#)  Improved dead session detection when using session pools for Oracle Client
-    12.2 and higher.
-#)  Ensured that the connection returned from a pool after a failed ping (such
-    as due to a killed session) is not itself marked as needing to be dropped
-    from the pool.
-#)  Eliminated memory leak under certain circumstances when pooled connections
-    are released back to the pool.
-#)  Eliminated memory leak when connections are dropped from the pool.
-#)  Eliminated memory leak when calling :meth:`Connection.close()` after
-    fetching collections from the database.
-#)  Adjusted order in which memory is freed when the last references to SODA
-    collections, documents, document cursors and collection cursors are
-    released, in order to prevent a segfault under certain circumstances.
-#)  Improved code preventing a statement from binding itself, in order to avoid
-    a potential segfault under certain circumstances.
-#)  Worked around OCI bug when attempting to free objects that are PL/SQL
-    records, in order to avoid a potential segfault.
-#)  Improved test suite and samples. Note that default passwords are no longer
-    supplied. New environment variables can be set to specify passwords if
-    desired, or the tests and samples will prompt for the passwords when
-    needed. In addition, a Python script is now available to create and drop
-    the schemas used for the tests and samples.
-#)  Improved documentation.
-
-
-cx_Oracle 7.0 (September 2018)
-------------------------------
-
-#)  Update to `ODPI-C 3.0
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-3-0-0-september-13-2018>`__.
-#)  Added support for Oracle Client 18 libraries.
-#)  Added support for SODA (as preview). See :ref:`SODA Database <sodadb>`,
-    :ref:`SODA Collection <sodacoll>` and :ref:`SODA Document <sodadoc>` for
-    more information.
-#)  Added support for call timeouts available in Oracle Client 18.1 and
-    higher. See :attr:`Connection.call_timeout`.
-#)  Added support for getting the contents of a SQL collection object as a
-    dictionary, where the keys are the indices of the collection and the values
-    are the elements of the collection. See function :meth:`Object.asdict()`.
-#)  Added support for closing a session pool via the function
-    ``SessionPool.close()``. Once closed, further attempts to use any
-    connection that was acquired from the pool will result in the error
-    "DPI-1010: not connected".
-#)  Added support for setting a LOB attribute of an object with a string or
-    bytes (instead of requiring a temporary LOB to be created).
-#)  Added support for the packed decimal type used by object attributes with
-    historical types DECIMAL and NUMERIC
-    (`issue 212 <https://github.com/oracle/python-cx_Oracle/issues/212>`__).
-#)  On Windows, first attempt to load oci.dll from the same directory as
-    the cx_Oracle module.
-#)  SQL objects that are created or fetched from the database are now tracked
-    and marked unusable when a connection is closed. This was done in order
-    to avoid a segfault under certain circumstances.
-#)  Re-enabled dead session detection functionality when using pools for Oracle
-    Client 12.2 and higher in order to handle classes of connection errors such
-    as resource profile limits.
-#)  Improved error messages when the Oracle Client or Oracle Database need to
-    be at a minimum version in order to support a particular feature.
-#)  When a connection is used as a context manager, the connection is now
-    closed when the block ends. Attempts to set
-    ``cx_Oracle.__future__.ctx_mgr_close`` are now ignored.
-#)  When a DML returning statement is executed, variables bound to it will
-    return an array when calling :meth:`Variable.getvalue()`. Attempts to set
-    ``cx_Oracle.__future__.dml_ret_array_val`` are now ignored.
-#)  Support for Python 3.4 has been dropped.
-#)  Added additional test cases.
-#)  Improved documentation.
-
-
-cx_Oracle 6.4.1 (July 2018)
----------------------------
-
-#)  Update to `ODPI-C 2.4.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-4-2-july-9-2018>`__.
-
-    - Avoid buffer overrun due to improper calculation of length byte when
-      converting some negative 39 digit numbers from string to the internal
-      Oracle number format
-      (`ODPI-C issue 67 <https://github.com/oracle/odpi/issues/67>`__).
-
-#)  Prevent error ``cx_Oracle.ProgrammingError: positional and named binds
-    cannot be intermixed`` when calling cursor.setinputsizes() without any
-    parameters and then calling cursor.execute() with named bind parameters
-    (`issue 199 <https://github.com/oracle/python-cx_Oracle/issues/199>`__).
-
-
-cx_Oracle 6.4 (July 2018)
--------------------------
-
-#)  Update to `ODPI-C 2.4.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-4-1-july-2-2018>`__.
-
-    - Added support for grouping subscriptions. See parameters groupingClass,
-      groupingValue and groupingType to function
-      :meth:`Connection.subscribe()`.
-    - Added support for specifying the IP address a subscription should use
-      instead of having the Oracle Client library determine the IP address on
-      its own. See parameter ipAddress to function
-      :meth:`Connection.subscribe()`.
-    - Added support for subscribing to notifications when messages are
-      available to dequeue in an AQ queue. The new constant
-      ``cx_Oracle.SUBSCR_NAMESPACE_AQ`` should be passed to the namespace
-      parameter of function :meth:`Connection.subscribe()` in order to get this
-      functionality. Attributes :attr:`Message.queueName` and
-      :attr:`Message.consumerName` will be populated in notification messages
-      that are received when this namespace is used.
-    - Added attribute :attr:`Message.registered` to let the notification
-      callback know when the subscription that generated the notification is no
-      longer registered with the database.
-    - Added support for timed waits when acquiring a session from a session
-      pool. Use the new constant ``cx_Oracle.SPOOL_ATTRVAL_TIMEDWAIT`` in
-      the parameter getmode to function ``cx_Oracle.SessionPool()`` along
-      with the new parameter ``waitTimeout``.
-    - Added support for specifying the timeout and maximum lifetime session for
-      session pools when they are created using function
-      ``cx_Oracle.SessionPool()``. Previously the pool had to be created
-      before these values could be changed.
-    - Avoid memory leak when dequeuing from an empty queue.
-    - Ensure that the row count for queries is reset to zero when the statement
-      is executed
-      (`issue 193 <https://github.com/oracle/python-cx_Oracle/issues/193>`__).
-    - If the statement should be deleted from the statement cache, first check
-      to see that there is a statement cache currently being used; otherwise,
-      the error ``ORA-24300: bad value for mode`` will be raised under certain
-      conditions.
-
-#)  Added support for using the cursor as a context manager
-    (`issue 190 <https://github.com/oracle/python-cx_Oracle/issues/190>`__).
-#)  Added parameter "encodingErrors" to function :meth:`Cursor.var()` in order
-    to add support for specifying the "errors" parameter to the decode() that
-    takes place internally when fetching strings from the database
-    (`issue 162 <https://github.com/oracle/python-cx_Oracle/issues/162>`__).
-#)  Added support for specifying an integer for the parameters argument to
-    :meth:`Cursor.executemany()`. This allows for batch execution when no
-    parameters are required or when parameters have previously been bound. This
-    replaces Cursor.executemanyprepared() (which is now deprecated and will be
-    removed in cx_Oracle 7).
-#)  Adjusted the binding of booleans so that outside of PL/SQL they are bound
-    as integers
-    (`issue 181 <https://github.com/oracle/python-cx_Oracle/issues/181>`__).
-#)  Added support for binding decimal.Decimal values to cx_Oracle.NATIVE_FLOAT
-    as requested
-    (`issue 184 <https://github.com/oracle/python-cx_Oracle/issues/184>`__).
-#)  Added checks on passing invalid type parameters to methods
-    :meth:`Cursor.arrayvar()`, :meth:`Cursor.callfunc()` and
-    :meth:`Cursor.setinputsizes()`.
-#)  Corrected handling of cursors and rowids in DML Returning statements.
-#)  Added sample from David Lapp demonstrating the use of GeoPandas with
-    SDO_GEOMETRY and a sample for demonstrating the use of REF cursors.
-#)  Adjusted samples and documentation for clarity.
-#)  Added additional test cases.
-
-
-cx_Oracle 6.3.1 (May 2018)
---------------------------
-
-#)  Update to `ODPI-C 2.3.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-3-2-may-7-2018>`__.
-
-    - Ensure that a call to unregister a subscription only occurs if the
-      subscription is still registered.
-    - Ensure that before a statement is executed any buffers used for DML
-      returning statements are reset.
-
-#)  Ensure that behavior with ``cx_Oracle.__future__.dml_ret_array_val`` not
-    set or False is the same as the behavior in cx_Oracle 6.2 (`issue 176
-    <https://github.com/oracle/python-cx_Oracle/issues/176>`__).
-
-
-cx_Oracle 6.3 (April 2018)
---------------------------
-
-#)  Update to `ODPI-C 2.3.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-3-1-april-25-2018>`__.
-
-    - Fixed binding of LONG data (values exceeding 32KB) when using the
-      function :meth:`Cursor.executemany()`.
-    - Added code to verify that a CQN subscription is open before permitting it
-      to be used. Error ``DPI-1060: subscription was already closed`` will now
-      be raised if an attempt is made to use a subscription that was closed
-      earlier.
-    - Stopped attempting to unregister a CQN subscription before it was
-      completely registered. This prevents errors encountered during
-      registration from being masked by an error stating that the subscription
-      has not been registered!
-    - Added error "DPI-1061: edition is not supported when a new password is
-      specified" to clarify the fact that specifying an edition and a new
-      password at the same time is not supported when creating a connection.
-      Previously the edition value was simply ignored.
-    - Improved error message when older OCI client libraries are being used
-      that don't have the method OCIClientVersion().
-    - Fixed the handling of ANSI types REAL and DOUBLE PRECISION as
-      implemented by Oracle. These types are just subtypes of NUMBER and are
-      different from BINARY_FLOAT and BINARY_DOUBLE
-      (`issue 163 <https://github.com/oracle/python-cx_Oracle/issues/163>`__).
-    - Fixed support for true heterogeneous session pools that use different
-      user/password combinations for each session acquired from the pool.
-    - Added error message indicating that setting either of the parameters
-      arraydmlrowcounts and batcherrors to True in :meth:`Cursor.executemany()`
-      is only supported with insert, update, delete and merge statements.
-
-#)  Fixed support for getting the OUT values of bind variables bound to a DML
-    Returning statement when calling the function :meth:`Cursor.executemany()`.
-    Note that the attribute dml_ret_array_val in ``cx_Oracle.__future__``
-    must be set to True first.
-#)  Added support for binding integers and floats as ``cx_Oracle.NATIVE_FLOAT``.
-#)  A ``cx_Oracle._Error`` object is now the value of all cx_Oracle
-    exceptions raised by cx_Oracle.
-    (`issue 51 <https://github.com/oracle/python-cx_Oracle/issues/51>`__).
-#)  Added support for building cx_Oracle with a pre-compiled version of ODPI-C,
-    as requested
-    (`issue 103 <https://github.com/oracle/python-cx_Oracle/issues/103>`__).
-#)  Default values are now provided for all parameters to
-    ``cx_Oracle.SessionPool()``.
-#)  Improved error message when an unsupported Oracle type is encountered.
-#)  The Python GIL is now prevented from being held while performing a round
-    trip for the call to get the attribute :attr:`Connection.version`
-    (`issue 158 <https://github.com/oracle/python-cx_Oracle/issues/158>`__).
-#)  Added check for the validity of the year for Python 2.x since it doesn't do
-    that itself like Python 3.x does
-    (`issue 166 <https://github.com/oracle/python-cx_Oracle/issues/166>`__).
-#)  Adjusted documentation to provide additional information on the use of
-    :meth:`Cursor.executemany()` as requested
-    (`issue 153 <https://github.com/oracle/python-cx_Oracle/issues/153>`__).
-#)  Adjusted documentation to state that batch errors and array DML row counts
-    can only be used with insert, update, delete and merge statements
-    (`issue 31 <https://github.com/oracle/python-cx_Oracle/issues/31>`__).
-#)  Updated tutorial to import common connection information from files in
-    order to make setup a bit more generic.
-
-
-cx_Oracle 6.2.1 (March 2018)
-----------------------------
-
-#)  Make sure cxoModule.h is included in the source archive
-    (`issue 155 <https://github.com/oracle/python-cx_Oracle/issues/155>`__).
-
-
-cx_Oracle 6.2 (March 2018)
---------------------------
-
-#)  Update to `ODPI-C 2.2.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-2-1-march-5-2018>`__.
-
-    - eliminate error ``DPI-1054: connection cannot be closed when open
-      statements or LOBs exist`` (`issue 138
-      <https://github.com/oracle/python-cx_Oracle/issues/138>`__).
-    - avoid a round trip to the database when a connection is released back to
-      the pool by preventing a rollback from being called when no transaction
-      is in progress.
-    - improve error message when the use of bind variables is attempted with
-      DLL statements, which is not supported by Oracle.
-    - if an Oracle object is retrieved from an attribute of another Oracle
-      object or a collection, prevent the "owner" from being destroyed until
-      the object that was retrieved has itself been destroyed.
-    - correct handling of boundary numbers 1e126 and -1e126
-    - eliminate memory leak when calling :meth:`Connection.enq()` and
-      :meth:`Connection.deq()`
-    - eliminate memory leak when setting NCHAR and NVARCHAR attributes of
-      objects.
-    - eliminate memory leak when fetching collection objects from the database.
-
-#)  Added support for creating a temporary CLOB, BLOB or NCLOB via the method
-    :meth:`Connection.createlob()`.
-#)  Added support for binding a LOB value directly to a cursor.
-#)  Added support for closing the connection when reaching the end of a
-    ``with`` code block controlled by the connection as a context manager, but
-    in a backwards compatible way
-    (`issue 113 <https://github.com/oracle/python-cx_Oracle/issues/113>`__).
-    See ``cx_Oracle.__future__`` for more information.
-#)  Reorganized code to simplify continued maintenance and consolidate
-    transformations to/from Python objects.
-#)  Ensure that the number of elements in the array is not lost when the
-    buffer size is increased to accommodate larger strings.
-#)  Corrected support in Python 3.x for cursor.parse() by permitting a string
-    to be passed, instead of incorrectly requiring a bytes object.
-#)  Eliminate reference leak with LOBs acquired from attributes of objects or
-    elements of collections.
-#)  Eliminate reference leak when extending an Oracle collection.
-#)  Documentation improvements.
-#)  Added test cases to the test suite.
-
-
-cx_Oracle 6.1 (December 2017)
------------------------------
-
-#)  Update to `ODPI-C 2.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-1-december-12-2017>`__.
-
-    - Support was added for accessing sharded databases via sharding keys (new
-      in Oracle 12.2). NOTE: the underlying OCI library has a bug when using
-      standalone connections. There is a small memory leak proportional to the
-      number of connections created/dropped. There is no memory leak when using
-      session pools, which is recommended.
-    - Added options for authentication with SYSBACKUP, SYSDG, SYSKM and SYSRAC,
-      as requested (`issue 101
-      <https://github.com/oracle/python-cx_Oracle/issues/101>`__).
-    - Attempts to release statements or free LOBs after the connection has been
-      closed (by, for example, killing the session) are now prevented.
-    - An error message was added when specifying an edition and a connection
-      class since this combination is not supported.
-    - Attempts to close the session for connections created with an external
-      handle are now prevented.
-    - Attempting to ping a database earlier than 10g results in ORA-1010:
-      invalid OCI operation, but that implies a response from the database and
-      therefore a successful ping, so treat it that way!
-      (see `<https://github.com/rana/ora/issues/224>`__ for more information).
-    - Support was added for converting numeric values in an object type
-      attribute to integer and text, as requested (`ODPI-C issue 35
-      <https://github.com/oracle/odpi/issues/35>`__).
-    - Setting attributes :attr:`DeqOptions.msgId` and
-      :attr:`MessageProperties.msgId` now works as expected.
-    - The overflow check when using double values (Python floats) as input
-      to float attributes of objects or elements of collections was removed as
-      it didn't work anyway and is a well-known issue that cannot be prevented
-      without removing desired functionality. The developer should ensure that
-      the source value falls within the limits of floats, understand the
-      consequent precision loss or use a different data type.
-    - Variables of string/raw types are restricted to 2 bytes less than 1 GB
-      (1,073,741,822 bytes), since OCI cannot handle more than that currently.
-    - Support was added for identifying the id of the transaction which spawned
-      a CQN subscription message, as requested
-      (`ODPI-C issue 32 <https://github.com/oracle/odpi/issues/32>`__).
-    - Corrected use of subscription port number (`issue 115
-      <https://github.com/oracle/python-cx_Oracle/issues/115>`__).
-    - Problems reported with the usage of FormatMessage() on Windows were
-      addressed (`ODPI-C issue 47
-      <https://github.com/oracle/odpi/issues/47>`__).
-    - On Windows, if oci.dll cannot be loaded because it is the wrong
-      architecture (32-bit vs 64-bit), attempt to find the offending DLL and
-      include the full path of the DLL in the message, as suggested.
-      (`ODPI-C issue 49 <https://github.com/oracle/odpi/issues/49>`__).
-    - Force OCI prefetch to always use the value 2; the OCI default is 1 but
-      setting the ODPI-C default to 2 ensures that single row fetches don't
-      require an extra round trip to determine if there are more rows to fetch;
-      this change also reduces the potential memory consumption when
-      fetchArraySize was set to a large value and also avoids performance
-      issues discovered with larger values of prefetch.
-
-#)  Fix build with PyPy 5.9.0-alpha0 in libpython mode
-    (`PR 54 <https://github.com/oracle/python-cx_Oracle/pull/54>`__).
-#)  Ensure that the edition is passed through to the database when a session
-    pool is created.
-#)  Corrected handling of Python object references when an invalid keyword
-    parameter is passed to ``cx_Oracle.SessionPool()``.
-#)  Corrected handling of :attr:`Connection.handle` and the handle parameter
-    to ``cx_Oracle.connect()`` on Windows.
-#)  Documentation improvements.
-#)  Added test cases to the test suite.
-
-
-cx_Oracle 6.0.3 (November 2017)
--------------------------------
-
-#)  Update to `ODPI-C 2.0.3
-    <https://oracle.github.io/odpi/doc/releasenotes.html#
-    version-2-0-3-november-6-2017>`__.
-
-    - Prevent use of uninitialized data in certain cases (`issue 77
-      <https://github.com/oracle/python-cx_Oracle/issues/77>`__).
-    - Attempting to ping a database earlier than 10g results in error
-      ``ORA-1010: invalid OCI operation``, but that implies a response from the
-      database and therefore a successful ping, so treat it that way!
-    - Correct handling of conversion of some numbers to NATIVE_FLOAT.
-    - Prevent use of NaN with Oracle numbers since it produces corrupt data
-      (`issue 91 <https://github.com/oracle/python-cx_Oracle/issues/91>`__).
-    - Verify that Oracle objects bound to cursors, fetched from cursors, set in
-      object attributes or appended to collection objects are of the correct
-      type.
-    - Correct handling of NVARCHAR2 when used as attributes of Oracle objects
-      or as elements of collections.
-
-#)  Ensure that a call to setinputsizes() with an invalid type prior to a call
-    to executemany() does not result in a type error, but instead gracefully
-    ignores the call to setinputsizes() as required by the DB API
-    (`issue 75 <https://github.com/oracle/python-cx_Oracle/issues/75>`__).
-#)  Check variable array size when setting variable values and raise
-    IndexError, as is already done for getting variable values.
-
-
-cx_Oracle 6.0.2 (August 2017)
------------------------------
-
-#)  Update to `ODPI-C 2.0.2
-    <https://oracle.github.io/odpi/doc/releasenotes.html
-    #version-2-0-2-august-30-2017>`__.
-
-    - Don't prevent connection from being explicitly closed when a fatal error
-      has taken place (`issue 67
-      <https://github.com/oracle/python-cx_Oracle/issues/67>`__).
-    - Correct handling of objects when dynamic binding is performed.
-    - Process deregistration events without an error.
-    - Eliminate memory leak when creating objects.
-
-#)  Added missing type check to prevent coercion of decimal to float
-    (`issue 68 <https://github.com/oracle/python-cx_Oracle/issues/68>`__).
-#)  On Windows, sizeof(long) = 4, not 8, which meant that integers between 10
-    and 18 digits were not converted to Python correctly
-    (`issue 70 <https://github.com/oracle/python-cx_Oracle/issues/70>`__).
-#)  Eliminate memory leak when repeatedly executing the same query.
-#)  Eliminate segfault when attempting to reuse a REF cursor that has been
-    closed.
-#)  Updated documentation.
-
-
-cx_Oracle 6.0.1 (August 2017)
------------------------------
-
-#)  Update to `ODPI-C 2.0.1
-    <https://oracle.github.io/odpi/doc/releasenotes.html
-    #version-2-0-1-august-18-2017>`__.
-
-    - Ensure that queries registered via :meth:`Subscription.registerquery()`
-      do not prevent the associated connection from being closed
-      (`ODPI-C issue 27 <https://github.com/oracle/odpi/issues/27>`__).
-    - Deprecated attribute :attr:`Subscription.id` as it was never intended to
-      be exposed (`ODPI-C issue 28
-      <https://github.com/oracle/odpi/issues/28>`__). It will be dropped in
-      version 6.1.
-    - Add support for DML Returning statements that require dynamically
-      allocated variable data (such as CLOBs being returned as strings).
-
-#)  Correct packaging of Python 2.7 UCS4 wheels on Linux
-    (`issue 64 <https://github.com/oracle/python-cx_Oracle/issues/64>`__).
-#)  Updated documentation.
-
-
-cx_Oracle 6.0 (August 2017)
----------------------------
-
-#)  Update to `ODPI-C 2.0 <https://oracle.github.io/odpi/doc/releasenotes.html
-    #version-2-0-august-14-2017>`__.
-
-    -   Prevent closing the connection when there are any open statements or
-        LOBs and add new error ``DPI-1054: connection cannot be closed when
-        open statements or LOBs exist`` when this situation is detected; this
-        is needed to prevent crashes under certain conditions when statements
-        or LOBs are being acted upon while at the same time (in another thread)
-        a connection is being closed; it also prevents leaks of statements and
-        LOBs when a connection is returned to a session pool.
-    -   On platforms other than Windows, if the regular method for loading the
-        Oracle Client libraries fails, try using $ORACLE_HOME/lib/libclntsh.so
-        (`ODPI-C issue 20 <https://github.com/oracle/odpi/issues/20>`__).
-    -   Use the environment variable ``DPI_DEBUG_LEVEL`` at runtime, not
-        compile time.
-    -   Added support for DPI_DEBUG_LEVEL_ERRORS (reports errors and has the
-        value 8) and DPI_DEBUG_LEVEL_SQL (reports prepared SQL statement text
-        and has the value 16) in order to further improve the ability to debug
-        issues.
-    -   Correct processing of :meth:`Cursor.scroll()` in some circumstances.
-
-#)  Delay initialization of the ODPI-C library until the first standalone
-    connection or session pool is created so that manipulation of the
-    environment variable ``NLS_LANG`` can be performed after the module has
-    been imported; this also has the added benefit of reducing the number of
-    errors that can take place when the module is imported.
-#)  Prevent binding of null values from generating the exception "ORA-24816:
-    Expanded non LONG bind data supplied after actual LONG or LOB column" in
-    certain circumstances
-    (`issue 50 <https://github.com/oracle/python-cx_Oracle/issues/50>`__).
-#)  Added information on how to run the test suite
-    (`issue 33 <https://github.com/oracle/python-cx_Oracle/issues/33>`__).
-#)  Documentation improvements.
-
-
-cx_Oracle 6.0 rc 2 (July 2017)
-------------------------------
-
-#)  Update to `ODPI-C rc 2 <https://oracle.github.io/odpi/doc/releasenotes.html
-    #version-2-0-0-rc-2-july-20-2017>`__.
-
-    -   Provide improved error message when OCI environment cannot be created,
-        such as when the oraaccess.xml file cannot be processed properly.
-    -   On Windows, convert system message to Unicode first, then to UTF-8;
-        otherwise, the error message returned could be in a mix of encodings
-        (`issue 40 <https://github.com/oracle/python-cx_Oracle/issues/40>`__).
-    -   Corrected support for binding decimal values in object attribute values
-        and collection element values.
-    -   Corrected support for binding PL/SQL boolean values to PL/SQL
-        procedures with Oracle client 11.2.
-
-#)  Define exception classes on the connection object in addition to at module
-    scope in order to simplify error handling in multi-connection environments,
-    as specified in the Python DB API.
-#)  Ensure the correct encoding is used for setting variable values.
-#)  Corrected handling of CLOB/NCLOB when using different encodings.
-#)  Corrected handling of TIMESTAMP WITH TIME ZONE attributes on objects.
-#)  Ensure that the array position passed to var.getvalue() does not exceed the
-    number of elements allocated in the array.
-#)  Reworked test suite and samples so that they are independent of each other
-    and so that the SQL scripts used to create/drop schemas are easily adjusted
-    to use different schema names, if desired.
-#)  Updated DB API test suite stub to support Python 3.
-#)  Added additional test cases and samples.
-#)  Documentation improvements.
-
-
-cx_Oracle 6.0 rc 1 (June 2017)
-------------------------------
-
-#)  Update to `ODPI-C rc 1 <https://oracle.github.io/odpi/doc/releasenotes.html
-    #version-2-0-0-rc-1-june-16-2017>`__.
-#)  The method :meth:`Cursor.setoutputsize` no longer needs to do anything,
-    since ODPI-C automatically manages buffer sizes of LONG and LONG RAW
-    columns.
-#)  Handle case when both precision and scale are zero, as occurs when
-    retrieving numeric expressions (`issue 34
-    <https://github.com/oracle/python-cx_Oracle/issues/34>`__).
-#)  OCI requires that both encoding and nencoding have values or that both
-    encoding and encoding do not have values. These parameters are used in
-    functions ``cx_Oracle.connect()`` and ``cx_Oracle.SessionPool()``. The
-    missing value is set to its default value if one of the values is set and
-    the other is not (`issue 36
-    <https://github.com/oracle/python-cx_Oracle/issues/36>`__).
-#)  Permit use of both string and unicode for Python 2.7 for creating session
-    pools and for changing passwords (`issue 23
-    <https://github.com/oracle/python-cx_Oracle/issues/23>`__).
-#)  Corrected handling of BFILE LOBs.
-#)  Add script for dropping test schemas.
-#)  Documentation improvements.
-
-
-cx_Oracle 6.0 beta 2 (May 2017)
--------------------------------
-
-#)  Added support for getting/setting attributes of objects or element values
-    in collections that contain LOBs, BINARY_FLOAT values, BINARY_DOUBLE values
-    and NCHAR and NVARCHAR2 values. The error message for any types that are
-    not supported has been improved as well.
-#)  Enable temporary LOB caching in order to avoid disk I/O as
-    `suggested <https://github.com/oracle/odpi/issues/10>`__.
-#)  Added support for setting the debug level in ODPI-C, if desirable, by
-    setting environment variable ``DPI_DEBUG_LEVEL`` prior to building cx_Oracle.
-#)  Correct processing of strings in :meth:`Cursor.executemany` when a
-    larger string is found after a shorter string in the list of data bound to
-    the statement.
-#)  Correct handling of long Python integers that cannot fit inside a 64-bit C
-    integer (`issue 18
-    <https://github.com/oracle/python-cx_Oracle/issues/18>`__).
-#)  Correct creation of pool using external authentication.
-#)  Handle edge case when an odd number of zeroes trail the decimal point in a
-    value that is effectively zero (`issue 22
-    <https://github.com/oracle/python-cx_Oracle/issues/22>`__).
-#)  Prevent segfault under load when the attempt to create an error fails.
-#)  Eliminate resource leak when a standalone connection or pool is freed.
-#)  Correct `typo <https://github.com/oracle/python-cx_Oracle/issues/24>`__.
-#)  Correct handling of REF cursors when the array size is manipulated.
-#)  Prevent attempts from binding the cursor being executed to itself.
-#)  Correct reference count handling of parameters when creating a cursor.
-#)  Correct determination of the names of the bind variables in prepared SQL
-    statements (which behaves a little differently from PL/SQL statements).
-
-
-cx_Oracle 6.0 beta 1 (April 2017)
----------------------------------
-
-#)  Simplify building cx_Oracle considerably by use of
-    `ODPI-C <https://oracle.github.io/odpi>`__. This means that cx_Oracle can
-    now be built without Oracle Client header files or libraries and that at
-    runtime cx_Oracle can adapt to Oracle Client 11.2, 12.1 or 12.2 libraries
-    without needing to be rebuilt. This also means that wheels can now be
-    produced and installed via pip.
-#)  Added attribute ``SessionPool.stmtcachesize`` to support getting and
-    setting the default statement cache size for connections in the pool.
-#)  Added attribute :attr:`Connection.dbop` to support setting the database
-    operation that is to be monitored.
-#)  Added attribute :attr:`Connection.handle` to facilitate testing the
-    creation of a connection using a OCI service context handle.
-#)  Added parameters tag and matchanytag to the ``cx_Oracle.connect()``
-    and ``SessionPool.acquire()`` methods and added parameters tag and retag
-    to the ``SessionPool.release`` method in order to support session
-    tagging.
-#)  Added parameter edition to the ``cx_Oracle.SessionPool()`` method.
-#)  Added support for universal rowids.
-#)  Added support for DML Returning of multiple rows.
-#)  Added attributes :attr:`Variable.actualElements` and
-    :attr:`Variable.values` to variables.
-#)  Added parameters region, sharding_key and super_sharding_key to the
-    ``cx_Oracle.makedsn()`` method to support connecting to a sharded
-    database (new in Oracle Database 12.2).
-#)  Added support for smallint and float data types in Oracle objects, as
-    `requested <https://github.com/oracle/python-cx_Oracle/issues/4>`__.
-#)  An exception is no longer raised when a collection is empty for methods
-    :meth:`Object.first()` and :meth:`Object.last()`. Instead, the value *None*
-    is returned to be consistent with the methods :meth:`Object.next()` and
-    :meth:`Object.prev()`.
-#)  If the environment variables NLS_LANG and NLS_NCHAR are being used, they
-    must be set before the module is imported. Using the encoding and nencoding
-    parameters to the ``cx_Oracle.connect()`` and
-    ``cx_Oracle.SessionPool()`` methods is a simpler alternative to setting
-    these environment variables.
-#)  Removed restriction on fetching LOBs across round trips to the database
-    (eliminates error "LOB variable no longer valid after subsequent fetch").
-#)  Removed requirement for specifying a maximum size when fetching LONG or
-    LONG raw columns. This also allows CLOB, NCLOB, BLOB and BFILE columns to
-    be fetched as strings or bytes without needing to specify a maximum size.
-#)  Dropped deprecated parameter twophase from the ``cx_Oracle.connect()``
-    method. Applications should set the :attr:`Connection.internal_name` and
-    :attr:`Connection.external_name` attributes instead to a value appropriate
-    to the application.
-#)  Dropped deprecated parameters action, module and clientinfo from the
-    ``cx_Oracle.connect()`` method. The appcontext parameter should be used
-    instead.
-#)  Dropped deprecated attribute numbersAsString from
-    :ref:`cursor objects <cursorobj>`. Use an output type handler instead.
-#)  Dropped deprecated attributes cqqos and rowids from
-    :ref:`subscription objects <subscrobj>`. Use the qos attribute instead.
-#)  Dropped deprecated parameters cqqos and rowids from the
-    :meth:`Connection.subscribe()` method. Use the qos parameter instead as
-    shown in the cx_Oracle sample cqn.py.
-
-
-cx_Oracle 5.3 (March 2017)
---------------------------
-
-#)  Added support for Python 3.6.
-#)  Dropped support for Python versions earlier than 2.6.
-#)  Dropped support for Oracle clients earlier than 11.2.
-#)  Added support for
-    :meth:`fetching implicit results<Cursor.getimplicitresults()>`
-    (available in Oracle 12.1)
-#)  Added support for :attr:`Transaction Guard <Connection.ltxid>` (available
-    in Oracle 12.1).
-#)  Added support for setting the maximum lifetime of pool connections
-    (available in Oracle 12.1).
-#)  Added support for large row counts (larger than 2 ** 32, available in
-    Oracle 12.1)
-#)  Added support for :meth:`advanced queuing <Connection.deq()>`.
-#)  Added support for :meth:`scrollable cursors <Cursor.scroll()>`.
-#)  Added support for :attr:`edition based redefinition <Connection.edition>`.
-#)  Added support for :meth:`creating <ObjectType.newobject()>`, modifying and
-    binding user defined types and collections.
-#)  Added support for creating, modifying and binding PL/SQL records and
-    collections (available in Oracle 12.1).
-#)  Added support for binding :data:`native integers <cx_Oracle.NATIVE_INT>`.
-#)  Enabled statement caching.
-#)  Removed deprecated variable attributes maxlength and allocelems.
-#)  Corrected support for setting the encoding and nencoding parameters when
-    :meth:`creating a connection <cx_Oracle.Connection>` and added support for
-    setting these when creating a session pool. These can now be used instead
-    of setting the environment variables ``NLS_LANG`` and ``NLS_NCHAR``.
-#)  Use *None* instead of *0* for items in the :attr:`Cursor.description` attribute
-    that do not have any validity.
-#)  Changed driver name to match informal driver name standard used by Oracle
-    for other drivers.
-#)  Add check for maximum of 10,000 parameters when calling a stored procedure
-    or function in order to prevent a possible improper memory access from
-    taking place.
-#)  Removed -mno-cygwin compile flag since it is no longer used in newer
-    versions of the gcc compiler for Cygwin.
-#)  Simplified test suite by combining Python 2 and 3 scripts into one script
-    and separated out 12.1 features into a single script.
-#)  Updated samples to use code that works on both Python 2 and 3.
-#)  Added support for pickling/unpickling error objects
-    (Bitbucket Issue #23).
-#)  Dropped support for callbacks on OCI functions.
-#)  Removed deprecated types UNICODE, FIXED_UNICODE and LONG_UNICODE (use
-    NCHAR, FIXED_NCHAR and LONG_NCHAR instead).
-#)  Increased default array size to 100 (from 50) to match other drivers.
-#)  Added support for setting the :attr:`~Connection.internal_name` and
-    :attr:`~Connection.external_name` on the connection directly. The use of
-    the twophase parameter is now deprecated.  Applications should set the
-    internal_name and external_name attributes directly to a value appropriate
-    to the application.
-#)  Added support for using application context when
-    :meth:`creating a connection <cx_Oracle.Connection>`. This should be used
-    in preference to the module, action and clientinfo parameters which are now
-    deprecated.
-#)  Reworked database change notification and continuous query notification to
-    more closely align with the PL/SQL implementation and prepare for sending
-    notifications for AQ messages. The following changes were made:
-
-    - added constant ``cx_Oracle.SUBSCR_QOS_BEST_EFFORT`` to replace
-      deprecated constant SUBSCR_CQ_QOS_BEST_EFFORT
-    - added constant ``cx_Oracle.SUBSCR_QOS_QUERY`` to replace
-      deprecated constant SUBSCR_CQ_QOS_QUERY
-    - added constant ``cx_Oracle.SUBSCR_QOS_DEREG_NFY`` to replace
-      deprecated constant SUBSCR_QOS_PURGE_ON_NTFN
-    - added constant ``cx_Oracle.SUBSCR_QOS_ROWIDS`` to replace parameter
-      rowids for method :meth:`Connection.subscribe()`
-    - deprecated parameter cqqos for method :meth:`Connection.subscribe()`. The
-      qos parameter should be used instead.
-    - dropped constants SUBSCR_CQ_QOS_CLQRYCACHE, SUBSCR_QOS_HAREG,
-      SUBSCR_QOS_MULTICBK, SUBSCR_QOS_PAYLOAD, SUBSCR_QOS_REPLICATE, and
-      SUBSCR_QOS_SECURE since they were never actually used
-#)  Deprecated use of the numbersAsStrings attribute on cursors. An output type
-    handler should be used instead.
-
-
-cx_Oracle 5.2.1 (January 2016)
-------------------------------
-
-#)  Added support for Python 3.5.
-#)  Removed password attribute from connection and session pool objects in
-    order to promote best security practices (if stored in RAM in cleartext it
-    can be read in process dumps, for example). For those who would like to
-    retain this feature, a subclass of Connection could be used to store the
-    password.
-#)  Added optional parameter ``externalauth`` to ``cx_Oracle.SessionPool()``
-    which enables wallet based or other external authentication mechanisms to
-    be used.
-#)  Use the national character set encoding when required (when char set form
-    is SQLCS_NCHAR); otherwise, the wrong encoding would be used if the
-    environment variable ``NLS_NCHAR`` is set.
-#)  Added support for binding boolean values to PL/SQL blocks and stored
-    procedures (available in Oracle 12.1).
-
-
-cx_Oracle 5.2 (June 2015)
--------------------------
-
-#)  Added support for strings up to 32k characters (new in Oracle 12c).
-#)  Added support for getting array DML row counts (new in Oracle 12c).
-#)  Added support for fetching batch errors.
-#)  Added support for LOB values larger than 4 GB.
-#)  Added support for connections as SYSASM.
-#)  Added support for building without any configuration changes to the machine
-    when using instant client RPMs on Linux.
-#)  Added types NCHAR, FIXED_NCHAR and LONG_NCHAR to replace the types UNICODE,
-    FIXED_UNICODE and LONG_UNICODE (which are now deprecated). These types are
-    available in Python 3 as well so they can be used to specify the use of
-    NCHAR type fields when binding or using setinputsizes().
-#)  Fixed binding of booleans in Python 3.x.
-#)  Test suite now sets NLS_LANG if not already set.
-#)  Enhanced documentation for connection.action attribute and added note
-    on cursor.parse() method to make clear that DDL statements are executed
-    when parsed.
-#)  Removed remaining remnants of support Oracle 9i.
-#)  Added __version__ attribute to conform with PEP 396.
-#)  Ensure that sessions are released to the pool when calling
-    connection.close().
-    (Bitbucket Issue #2).
-#)  Fixed handling of datetime intervals
-    (Bitbucket Issue #7).
-
-
-cx_Oracle 5.1.3 (May 2014)
---------------------------
-
-#)  Added support for Oracle 12c.
-#)  Added support for Python 3.4.
-#)  Added support for query result set change notification. Thanks to Glen
-    Walker for the patch.
-#)  Ensure that in Python 3.x that NCHAR and NVARCHAR2 and NCLOB columns are
-    retrieved properly without conversion issues. Thanks to Joakim Andersson
-    for pointing out the issue and the possible solution.
-#)  Fix bug when an exception is caught and then another exception is raised
-    while handling that exception in Python 3.x. Thanks to Boris Dzuba for
-    pointing out the issue and providing a test case.
-#)  Enhance performance returning integers between 10 and 18 digits on 64-bit
-    platforms that support it. Thanks for Shai Berger for the initial patch.
-#)  Fixed two memory leaks.
-#)  Fix to stop current_schema from throwing a MemoryError on 64-bit platforms
-    on occasion. Thanks to Andrew Horton for the fix.
-#)  Class name of cursors changed to real name cx_Oracle.Cursor.
-
-
-cx_Oracle 5.1.2 (July 2012)
----------------------------
-
-#)  Added support for LONG_UNICODE which is a type used to handle long unicode
-    strings. These are not explicitly supported in Oracle but can be used to
-    bind to NCLOB, for example, without getting the error "unimplemented or
-    unreasonable conversion requested".
-#)  Set the row number in a cursor when executing PL/SQL blocks as requested
-    by Robert Ritchie.
-#)  Added support for setting the module, action and client_info attributes
-    during connection so that logon triggers will see the supplied values, as
-    requested by Rodney Barnett.
-
-
-cx_Oracle 5.1.1 (October 2011)
-------------------------------
-
-#)  Simplify management of threads for callbacks performed by database change
-    notification and eliminate a crash that occurred under high load in
-    certain situations. Thanks to Calvin S. for noting the issue and suggesting
-    a solution and testing the patch.
-#)  Force server detach on close so that the connection is completely closed
-    and not just the session as before.
-#)  Force use of OCI_UTF16ID for NCLOBs as using the default character set
-    would result in ORA-03127 with Oracle 11.2.0.2 and UTF8 character set.
-#)  Avoid attempting to clear temporary LOBs a second time when destroying the
-    variable as in certain situations this results in spurious errors.
-#)  Added additional parameter service_name to makedsn() which can be used to
-    use the service_name rather than the SID in the DSN string that is
-    generated.
-#)  Fix cursor description in test suite to take into account the number of
-    bytes per character.
-#)  Added tests for NCLOBS to the test suite.
-#)  Removed redundant code in setup.py for calculating the library path.
-
-
-cx_Oracle 5.1 (March 2011)
---------------------------
-
-#)  Remove support for UNICODE mode and permit Unicode to be passed through in
-    everywhere a string may be passed in. This means that strings will be
-    passed through to Oracle using the value of the NLS_LANG environment
-    variable in Python 3.x as well. Doing this eliminated a bunch of problems
-    that were discovered by using UNICODE mode and also removed an unnecessary
-    restriction in Python 2.x that Unicode could not be used in connect strings
-    or SQL statements, for example.
-#)  Added support for creating an empty object variable via a named type, the
-    first step to adding full object support.
-#)  Added support for Python 3.2.
-#)  Account for lib64 used on x86_64 systems. Thanks to Alex Wood for supplying
-    the patch.
-#)  Clear up potential problems when calling cursor.close() ahead of the
-    cursor being freed by going out of scope.
-#)  Avoid compilation difficulties on AIX5 as OCIPing does not appear to be
-    available on that platform under Oracle 10g Release 2. Thanks to
-    Pierre-Yves Fontaniere for the patch.
-#)  Free temporary LOBs prior to each fetch in order to avoid leaking them.
-    Thanks to Uwe Hoffmann for the initial patch.
-
-
-cx_Oracle 5.0.4 (July 2010)
----------------------------
-
-#)  Added support for Python 2.7.
-#)  Added support for new parameter (port) for subscription() call which allows
-    the client to specify the listening port for callback notifications from
-    the database server. Thanks to Geoffrey Weber for the initial patch.
-#)  Fixed compilation under Oracle 9i.
-#)  Fixed a few error messages.
-
-
-cx_Oracle 5.0.3 (February 2010)
--------------------------------
-
-#)  Added support for 64-bit Windows.
-#)  Added support for Python 3.1 and dropped support for Python 3.0.
-#)  Added support for keyword parameters in cursor.callproc() and
-    cursor.callfunc().
-#)  Added documentation for the UNICODE and FIXED_UNICODE variable types.
-#)  Added extra link arguments required for Mac OS X as suggested by Jason
-    Woodward.
-#)  Added additional error codes to the list of error codes that raise
-    OperationalError rather than DatabaseError.
-#)  Fixed calculation of display size for strings with national database
-    character sets that are not the default AL16UTF16.
-#)  Moved the resetting of the setinputsizes flag before the binding takes
-    place so that if an error takes place and a new statement is prepared
-    subsequently, spurious errors will not occur.
-#)  Fixed compilation with Oracle 10g Release 1.
-#)  Tweaked documentation based on feedback from a number of people.
-#)  Added support for running the test suite using "python setup.py test"
-#)  Added support for setting the CLIENT_IDENTIFIER value in the v$session
-    table for connections.
-#)  Added exception when attempting to call executemany() with arrays which is
-    not supported by the OCI.
-#)  Fixed bug when converting from decimal would result in OCI-22062 because
-    the locale decimal point was not a period. Thanks to Amaury Forgeot d'Arc
-    for the solution to this problem.
-
-
-cx_Oracle 5.0.2 (May 2009)
---------------------------
-
-#)  Fix creation of temporary NCLOB values and the writing of NCLOB values in
-    non Unicode mode.
-#)  Re-enabled parsing of non select statements as requested by Roy Terrill.
-#)  Implemented a parse error offset as requested by Catherine Devlin.
-#)  Removed lib subdirectory when forcing RPATH now that the library directory
-    is being calculated exactly in setup.py.
-#)  Added an additional cast in order to support compiling by Microsoft
-    Visual C++ 2008 as requested by Marco de Paoli.
-#)  Added additional include directory to setup.py in order to support
-    compiling by Microsoft Visual Studio was requested by Jason Coombs.
-#)  Fixed a few documentation issues.
-
-
-cx_Oracle 5.0.1 (February 2009)
--------------------------------
-
-#)  Added support for database change notification available in Oracle 10g
-    Release 2 and higher.
-#)  Fix bug where NCLOB data would be corrupted upon retrieval (non Unicode
-    mode) or would generate exception ORA-24806 (LOB form mismatch). Oracle
-    insists upon differentiating between CLOB and NCLOB no matter which
-    character set is being used for retrieval.
-#)  Add new attributes size, bufferSize and numElements to variable objects,
-    deprecating allocelems (replaced by numElements) and maxlength (replaced
-    by bufferSize)
-#)  Avoid increasing memory allocation for strings when using variable width
-    character sets and increasing the number of elements in a variable during
-    executemany().
-#)  Tweaked code in order to ensure that cx_Oracle can compile with Python
-    3.0.1.
-
-
-cx_Oracle 5.0 (December 2008)
------------------------------
-
-#)  Added support for Python 3.0 with much help from Amaury Forgeot d'Arc.
-#)  Removed support for Python 2.3 and Oracle 8i.
-#)  Added support for full unicode mode in Python 2.x where all strings are
-    passed in and returned as unicode (module must be built in this mode)
-    rather than encoded strings
-#)  nchar and nvarchar columns now return unicode instead of encoded strings
-#)  Added support for an output type handler and/or an input type handler to be
-    specified at the connection and cursor levels.
-#)  Added support for specifying both input and output converters for variables
-#)  Added support for specifying the array size of variables that are created
-    using the cursor.var() method
-#)  Added support for events mode and database resident connection pooling
-    (DRCP) in Oracle 11g.
-#)  Added support for changing the password during construction of a new
-    connection object as well as after the connection object has been created
-#)  Added support for the interval day to second data type in Oracle,
-    represented as datetime.timedelta objects in Python.
-#)  Added support for getting and setting the current_schema attribute for a
-    session
-#)  Added support for proxy authentication in session pools as requested by
-    Michael Wegrzynek (and thanks for the initial patch as well).
-#)  Modified connection.prepare() to return a boolean indicating if a
-    transaction was actually prepared in order to avoid the error ORA-24756
-    (transaction does not exist).
-#)  Raise a cx_Oracle.Error instance rather than a string for column
-    truncation errors as requested by Helge Tesdal.
-#)  Fixed handling of environment handles in session pools in order to allow
-    session pools to fetch objects without exceptions taking place.
-
-
-cx_Oracle 4.4.1 (October 2008)
-------------------------------
-
-#)  Make the bind variables and fetch variables accessible although they need
-    to be treated carefully since they are used internally; support added for
-    forward compatibility with version 5.x.
-#)  Include the "cannot insert null value" in the list of errors that are
-    treated as integrity errors as requested by Matt Boersma.
-#)  Use a cx_Oracle.Error instance rather than a string to hold the error when
-    truncation (ORA-1406) takes place as requested by Helge Tesdal.
-#)  Added support for fixed char, old style varchar and timestamp attribute
-    values in objects.
-#)  Tweaked setup.py to check for the Oracle version up front rather than
-    during the build in order to produce more meaningful errors and simplify
-    the code.
-#)  In setup.py added proper detection for the instant client on Mac OS X as
-    recommended by Martijn Pieters.
-#)  In setup.py, avoided resetting the extraLinkArgs on Mac OS X as doing so
-    prevents simple modification where desired as expressed by Christian
-    Zagrodnick.
-#)  Added documentation on exception handling as requested by Andreas Mock, who
-    also graciously provided an initial patch.
-#)  Modified documentation indicating that the password attribute on connection
-    objects can be written.
-#)  Added documentation warning that parameters not passed in during subsequent
-    executions of a statement will retain their original values as requested by
-    Harald Armin Massa.
-#)  Added comments indicating that an Oracle client is required since so many
-    people find this surprising.
-#)  Removed all references to Oracle 8i from the documentation and version 5.x
-    will eliminate all vestiges of support for this version of the Oracle
-    client.
-#)  Added additional link arguments for Cygwin as requested by Rob Gillen.
-
-
-cx_Oracle 4.4 (June 2008)
--------------------------
-
-#)  Fix setup.py to handle the Oracle instant client and Oracle XE on both
-    Linux and Windows as pointed out by many. Thanks also to the many people
-    who also provided patches.
-#)  Set the default array size to 50 instead of 1 as the DB API suggests
-    because the performance difference is so drastic and many people have
-    recommended that the default be changed.
-#)  Added Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS around each blocking
-    call for LOBs as requested by Jason Conroy who also provided an initial
-    patch and performed a number of tests that demonstrate the new code is much
-    more responsive.
-#)  Add support for acquiring cursor.description after a parse.
-#)  Defer type assignment when performing executemany() until the last possible
-    moment if the value being bound in is null as suggested by Dragos Dociu.
-#)  When dropping a connection from the pool, ignore any errors that occur
-    during the rollback; unfortunately, Oracle decides to commit data even when
-    dropping a connection from the pool instead of rolling it back so the
-    attempt still has to be made.
-#)  Added support for setting CLIENT_DRIVER in V$SESSION_CONNECT_INFO in Oracle
-    11g and higher.
-#)  Use cx_Oracle.InterfaceError rather than the builtin RuntimeError when
-    unable to create the Oracle environment object as requested by Luke Mewburn
-    since the error is specific to Oracle and someone attempting to catch any
-    exception cannot simply use cx_Oracle.Error.
-#)  Translated some error codes to OperationalError as requested by Matthew
-    Harriger; translated if/elseif/else logic to switch statement to make it
-    more readable and to allow for additional translation if desired.
-#)  Transformed documentation to new format using restructured text. Thanks to
-    Waldemar Osuch for contributing the initial draft of the new documentation.
-#)  Allow the password to be overwritten by a new value as requested by Alex
-    VanderWoude; this value is retained as a convenience to the user and not
-    used by anything in the module; if changed externally it may be convenient
-    to keep this copy up to date.
-#)  Cygwin is on Windows so should be treated in the same way as noted by
-    Matthew Cahn.
-#)  Add support for using setuptools if so desired as requested by Shreya
-    Bhatt.
-#)  Specify that the version of Oracle 10 that is now primarily used is 10.2,
-    not 10.1.
-
-
-cx_Oracle 4.3.3 (October 2007)
-------------------------------
-
-#)  Added method ping() on connections which can be used to test whether or not
-    a connection is still active (available in Oracle 10g R2).
-#)  Added method cx_Oracle.clientversion() which returns a 5-tuple giving the
-    version of the client that is in use (available in Oracle 10g R2).
-#)  Added methods startup() and shutdown() on connections which can be used to
-    startup and shutdown databases (available in Oracle 10g R2).
-#)  Added support for Oracle 11g.
-#)  Added samples directory which contains a handful of scripts containing
-    sample code for more advanced techniques. More will follow in future
-    releases.
-#)  Prevent error "ORA-24333: zero iteration count" when calling executemany()
-    with zero rows as requested by Andreas Mock.
-#)  Added methods __enter__() and __exit__() on connections to support using
-    connections as context managers in Python 2.5 and higher. The context
-    managed is the transaction state. Upon exit the transaction is either
-    rolled back or committed depending on whether an exception took place or
-    not.
-#)  Make the search for the lib32 and lib64 directories automatic for all
-    platforms.
-#)  Tweak the setup configuration script to include all of the metadata and
-    allow for building the module within another setup configuration script
-#)  Include the Oracle version in addition to the Python version in the build
-    directories that are created and in the names of the binary packages that
-    are created.
-#)  Remove unnecessary dependency on win32api to build module on Windows.
-
-
-cx_Oracle 4.3.2 (August 2007)
------------------------------
-
-#)  Added methods open(), close(), isopen() and getchunksize() in order to
-    improve performance of reading/writing LOB values in chunks.
-#)  Fixed support for native doubles and floats in Oracle 10g; added new type
-    NATIVE_FLOAT to allow specification of a variable of that specific type
-    where desired. Thanks to D.R. Boxhoorn for pointing out the fact that this
-    was not working properly when the arraysize was anything other than 1.
-#)  When calling connection.begin(), only create a new transaction handle if
-    one is not already associated with the connection. Thanks to Andreas Mock
-    for discovering this and for Amaury Forgeot d'Arc for diagnosing the
-    problem and pointing the way to a solution.
-#)  Added attribute cursor.rowfactory which allows a method to be called for
-    each row that is returned; this is about 20% faster than calling the method
-    in Python using the idiom [method(\*r) for r in cursor].
-#)  Attempt to locate an Oracle installation by looking at the PATH if the
-    environment variable ``ORACLE_HOME`` is not set; this is of primary use on
-    Windows where this variable should not normally be set.
-#)  Added support for autocommit mode as requested by Ian Kelly.
-#)  Added support for connection.stmtcachesize which allows for both reading
-    and writing the size of the statement cache size. This parameter can make a
-    huge difference with the length of time taken to prepare statements. Added
-    support for setting the statement tag when preparing a statement. Both of
-    these were requested by Bjorn Sandberg who also provided an initial patch.
-#)  When copying the value of a variable, copy the return code as well.
-
-
-cx_Oracle 4.3.1 (April 2007)
-----------------------------
-
-#)  Ensure that if the client buffer size exceeds 4000 bytes that the server
-    buffer size does not as strings may only contain 4000 bytes; this allows
-    handling of multibyte character sets on the server as well as the client.
-#)  Added support for using buffer objects to populate binary data and made the
-    Binary() constructor the buffer type as requested by Ken Mason.
-#)  Fix potential crash when using full optimization with some compilers.
-    Thanks to Aris Motas for noticing this and providing the initial patch and
-    to Amaury Forgeot d'Arc for providing an even simpler solution.
-#)  Pass the correct charset form in to the write call in order to support
-    writing to national character set LOB values properly. Thanks to Ian Kelly
-    for noticing this discrepancy.
-
-
-cx_Oracle 4.3 (March 2007)
---------------------------
-
-#)  Added preliminary support for fetching Oracle objects (SQL types) as
-    requested by Kristof Beyls (who kindly provided an initial patch).
-    Additional work needs to be done to support binding and updating objects
-    but the basic structure is now in place.
-#)  Added connection.maxBytesPerCharacter which indicates the maximum number of
-    bytes each character can use; use this value to also determine the size of
-    local buffers in order to handle discrepancies between the client character
-    set and the server character set. Thanks to Andreas Mock for providing the
-    initial patch and working with me to resolve this issue.
-#)  Added support for querying native floats in Oracle 10g as requested by
-    Danny Boxhoorn.
-#)  Add support for temporary LOB variables created via PL/SQL instead of only
-    directly by cx_Oracle; thanks to Henning von Bargen for discovering this
-    problem.
-#)  Added support for specifying variable types using the builtin types int,
-    float, str and datetime.date which allows for finer control of what type of
-    Python object is returned from cursor.callfunc() for example.
-#)  Added support for passing booleans to callproc() and callfunc() as
-    requested by Anana Aiyer.
-#)  Fixed support for 64-bit environments in Python 2.5.
-#)  Thanks to Filip Ballegeer and a number of his co-workers, an intermittent
-    crash was tracked down; specifically, if a connection is closed, then the
-    call to OCIStmtRelease() will free memory twice. Preventing the call when
-    the connection is closed solves the problem.
-
-
-cx_Oracle 4.2.1 (September 2006)
---------------------------------
-
-#)  Added additional type (NCLOB) to handle CLOBs that use the national
-    character set as requested by Chris Dunscombe.
-#)  Added support for returning cursors from functions as requested by Daniel
-    Steinmann.
-#)  Added support for getting/setting the "get" mode on session pools as
-    requested by Anand Aiyer.
-#)  Added support for binding subclassed cursors.
-#)  Fixed binding of decimal objects with absolute values less than 0.1.
-
-
-cx_Oracle 4.2 (July 2006)
--------------------------
-
-#)  Added support for parsing an Oracle statement as requested by Patrick
-    Blackwill.
-#)  Added support for BFILEs at the request of Matthew Cahn.
-#)  Added support for binding decimal.Decimal objects to cursors.
-#)  Added support for reading from NCLOBs as requested by Chris Dunscombe.
-#)  Added connection attributes encoding and nencoding which return the IANA
-    character set name for the character set and national character set in use
-    by the client.
-#)  Rework module initialization to use the techniques recommended by the
-    Python documentation as one user was experiencing random segfaults due
-    to the use of the module dictionary after the initialization was complete.
-#)  Removed support for the OPT_Threading attribute. Use the threaded keyword
-    when creating connections and session pools instead.
-#)  Removed support for the OPT_NumbersAsStrings attribute. Use the
-    numbersAsStrings attribute on cursors instead.
-#)  Use type long rather than type int in order to support long integers on
-    64-bit machines as reported by Uwe Hoffmann.
-#)  Add cursor attribute "bindarraysize" which is defaulted to 1 and is used
-    to determine the size of the arrays created for bind variables.
-#)  Added repr() methods to provide something a little more useful than the
-    standard type name and memory address.
-#)  Added keyword parameter support to the functions that imply such in the
-    documentation as requested by Harald Armin Massa.
-#)  Treat an empty dictionary passed through to cursor.execute() as keyword
-    parameters the same as if no keyword parameters were specified at all, as
-    requested by Fabien Grumelard.
-#)  Fixed memory leak when a LOB read would fail.
-#)  Set the LDFLAGS value in the environment rather than directly in the
-    setup.py file in order to satisfy those who wish to enable the use of
-    debugging symbols.
-#)  Use __DATE__ and __TIME__ to determine the date and time of the build
-    rather than passing it through directly.
-#)  Use Oracle types and add casts to reduce warnings as requested by Amaury
-    Forgeot d'Arc.
-#)  Fixed typo in error message.
-
-
-cx_Oracle 4.1.2 (December 2005)
--------------------------------
-
-#)  Restore support of Oracle 9i features when using the Oracle 10g client.
-
-
-cx_Oracle 4.1.1 (December 2005)
--------------------------------
-
-#)  Add support for dropping a connection from a session pool.
-#)  Add support for write only attributes "module", "action" and "clientinfo"
-    which work only in Oracle 10g as requested by Egor Starostin.
-#)  Add support for pickling database errors.
-#)  Use the previously created bind variable as a template if available when
-    creating a new variable of a larger size. Thanks to Ted Skolnick for the
-    initial patch.
-#)  Fixed tests to work properly in the Python 2.4 environment where dates and
-    timestamps are different Python types. Thanks to Henning von Bargen for
-    pointing this out.
-#)  Added additional directories to search for include files and libraries in
-    order to better support the Oracle 10g instant client.
-#)  Set the internal fetch number to 0 in order to satisfy very picky source
-    analysis tools as requested by Amaury Fogeot d'Arc.
-#)  Improve the documentation for building and installing the module from
-    source as some people are unaware of the standard methods for building
-    Python modules using distutils.
-#)  Added note in the documentation indicating that the arraysize attribute
-    can drastically affect performance of queries since this seems to be a
-    common misunderstanding of first time users of cx_Oracle.
-#)  Add a comment indicating that on HP-UX Itanium with Oracle 10g the library
-    ttsh10 must also be linked against. Thanks to Bernard Delmee for the
-    information.
-
-
-cx_Oracle 4.1 (January 2005)
-----------------------------
-
-#)  Fixed bug where subclasses of Cursor do not pass the connection in the
-    constructor causing a segfault.
-#)  DDL statements must be reparsed before execution as noted by Mihai
-    Ibanescu.
-#)  Add support for setting input sizes by position.
-#)  Fixed problem with catching an exception during execute and then still
-    attempting to perform a fetch afterwards as noted by Leith Parkin.
-#)  Rename the types so that they can be pickled and unpickled. Thanks to Harri
-    Pasanen for pointing out the problem.
-#)  Handle invalid NLS_LANG setting properly (Oracle seems to like to provide a
-    handle back even though it is invalid) and determine the number of bytes
-    per character in order to allow for proper support in the future of
-    multibyte and variable width character sets.
-#)  Remove date checking from the native case since Python already checks that
-    dates are valid; enhance error message when invalid dates are encountered
-    so that additional processing can be done.
-#)  Fix bug executing SQL using numeric parameter names with predefined
-    variables (such as what takes place when calling stored procedures with out
-    parameters).
-#)  Add support for reading CLOB values using multibyte or variable length
-    character sets.
-
-
-cx_Oracle 4.1 beta 1 (September 2004)
--------------------------------------
-
-#)  Added support for Python 2.4. In Python 2.4, the datetime module is used
-    for both binding and fetching of date and timestamp data. In Python 2.3,
-    objects from the datetime module can be bound but the internal datetime
-    objects will be returned from queries.
-#)  Added pickling support for LOB and datetime data.
-#)  Fully qualified the table name that was missing in an alter table
-    statement in the setup test script as noted by Marc Gehling.
-#)  Added a section allowing for the setting of the RPATH linker directive in
-    setup.py as requested by Iustin Pop.
-#)  Added code to raise a programming error exception when an attempt is made
-    to access a LOB locator variable in a subsequent fetch.
-#)  The username, password and dsn (tnsentry) are stored on the connection
-    object when specified, regardless of whether or not a standard connection
-    takes place.
-#)  Added additional module level constant called "LOB" as requested by Joseph
-    Canedo.
-#)  Changed exception type to IntegrityError for constraint violations as
-    requested by Joseph Canedo.
-#)  If scale and precision are not specified, an attempt is made to return a
-    long integer as requested by Joseph Canedo.
-#)  Added workaround for Oracle bug which returns an invalid handle when the
-    prepare call fails. Thanks to alantam@hsbc.com for providing the code that
-    demonstrated the problem.
-#)  The cursor method arrayvar() will now accept the actual list so that it is
-    not necessary to call cursor.arrayvar() followed immediately by
-    var.setvalue().
-#)  Fixed bug where attempts to execute the statement *None* with bind
-    variables would cause a segmentation fault.
-#)  Added support for binding by position (paramstyle = "numeric").
-#)  Removed memory leak created by calls to OCIParamGet() which were not
-    mirrored by calls to OCIDescriptorFree(). Thanks to Mihai Ibanescu for
-    pointing this out and providing a patch.
-#)  Added support for calling cursor.executemany() with statement *None*
-    implying that the previously prepared statement ought to be executed.
-    Thanks to Mihai Ibanescu for providing a patch.
-#)  Added support for rebinding variables when a subsequent call to
-    cursor.executemany() uses a different number of rows. Thanks to Mihai
-    Ibanescu for supplying a patch.
-#)  The microseconds are now displayed in datetime variables when nonzero
-    similar to method used in the datetime module.
-#)  Added support for binary_float and binary_double columns in Oracle 10g.
-
-
-cx_Oracle 4.0.1 (February 2004)
--------------------------------
-
-#)  Fixed bugs on 64-bit platforms that caused segmentation faults and bus
-    errors in session pooling and determining the bind variables associated
-    with a statement.
-#)  Modified test suite so that 64-bit platforms are tested properly.
-#)  Added missing commit statements in the test setup scripts. Thanks to Keith
-    Lyon for pointing this out.
-#)  Fix setup.py for Cygwin environments. Thanks to Doug Henderson for
-    providing the necessary fix.
-#)  Added support for compiling cx_Oracle without thread support. Thanks to
-    Andre Reitz for pointing this out.
-#)  Added support for a new keyword parameter called threaded on connections
-    and session pools. This parameter defaults to False and indicates whether
-    threaded mode ought to be used. It replaces the module level attribute
-    OPT_Threading although examining the attribute will be retained until the
-    next release at least.
-#)  Added support for a new keyword parameter called twophase on connections.
-    This parameter defaults to False and indicates whether support for two
-    phase (distributed or global) transactions ought to be present. Note that
-    support for distributed transactions is buggy when crossing major version
-    boundaries (Oracle 8i to Oracle 9i for example).
-#)  Ensure that the rowcount attribute is set properly when an exception is
-    raised during execution. Thanks to Gary Aviv for pointing out this problem
-    and its solution.
-
-
-cx_Oracle 4.0 (December 2003)
------------------------------
-
-#)  Added support for subclassing connections, cursors and session pools. The
-    changes involved made it necessary to drop support for Python 2.1 and
-    earlier although a branch exists in CVS to allow for support of Python 2.1
-    and earlier if needed.
-#)  Connections and session pools can now be created with keyword parameters,
-    not just sequential parameters.
-#)  Queries now return integers whenever possible and long integers if the
-    number will overflow a simple integer. Floats are only returned when it is
-    known that the number is a floating point number or the integer conversion
-    fails.
-#)  Added initial support for user callbacks on OCI functions. See the
-    documentation for more details.
-#)  Add support for retrieving the bind variable names associated with a
-    cursor with a new method bindnames().
-#)  Add support for temporary LOB variables. This means that setinputsizes()
-    can be used with the values CLOB and BLOB to create these temporary LOB
-    variables and allow for the equivalent of empty_clob() and empty_blob()
-    since otherwise Oracle will treat empty strings as NULL values.
-#)  Automatically switch to long strings when the data size exceeds the
-    maximum string size that Oracle allows (4000 characters) and raise an
-    error if an attempt is made to set a string variable to a size that it
-    does not support. This avoids truncation errors as reported by Jon Franz.
-#)  Add support for global (distributed) transactions and two phase commit.
-#)  Force the NLS settings for the session so that test tables are populated
-    correctly in all circumstances; problems were noted by Ralf Braun and
-    Allan Poulsen.
-#)  Display error messages using the environment handle when the error handle
-    has not yet been created; this provides better error messages during this
-    rather rare situation.
-#)  Removed memory leak in callproc() that was reported by Todd Whiteman.
-#)  Make consistent the calls to manipulate memory; otherwise segfaults can
-    occur when the pymalloc option is used, as reported by Matt Hoskins.
-#)  Force a rollback when a session is released back to the session pool.
-    Apparently the connections are not as stateless as Oracle's documentation
-    suggests and this makes the logic consistent with normal connections.
-#)  Removed module method attach(). This can be replaced with a call to
-    Connection(handle=) if needed.
-
-
-cx_Oracle 3.1 (August 2003)
----------------------------
-
-#)  Added support for connecting with SYSDBA and SYSOPER access which is
-    needed for connecting as sys in Oracle 9i.
-#)  Only check the dictionary size if the variable is not NULL; otherwise, an
-    error takes place which is not caught or cleared; this eliminates a
-    spurious "Objects/dictobject.c:1258: bad argument to internal function" in
-    Python 2.3.
-#)  Add support for session pooling. This is only support for Oracle 9i but
-    is amazingly fast -- about 100 times faster than connecting.
-#)  Add support for statement caching when pooling sessions, this reduces the
-    parse time considerably. Unfortunately, the Oracle OCI does not allow this
-    to be easily turned on for normal sessions.
-#)  Add method trim() on CLOB and BLOB variables for trimming the size.
-#)  Add support for externally identified users; to use this feature leave the
-    username and password fields empty when connecting.
-#)  Add method cancel() on connection objects to cancel long running queries.
-    Note that this only works on non-Windows platforms.
-#)  Add method callfunc() on cursor objects to allow calling a function
-    without using an anonymous PL/SQL block.
-#)  Added documentation on objects that were not documented. At this point all
-    objects, methods and constants in cx_Oracle have been documented.
-#)  Added support for timestamp columns in Oracle 9i.
-#)  Added module level method makedsn() which creates a data source name given
-    the host, port and SID.
-#)  Added constant "buildtime" which is the time when the module was built as
-    an additional means of identifying the build that is in use.
-#)  Binding a value that is incompatible to the previous value that was bound
-    (data types do not match or array size is larger) will now result in a
-    new bind taking place. This is more consistent with the DB API although
-    it does imply a performance penalty when used.
-
-
-cx_Oracle 3.0a (June 2003)
---------------------------
-
-#)  Fixed bug where zero length PL/SQL arrays were being mishandled.
-#)  Fixed support for the data type "float" in Oracle; added one to the
-    display size to allow for the sign of the number, if necessary; changed
-    the display size of unconstrained numbers to 127, which is the largest
-    number that Oracle can handle.
-#)  Added support for retrieving the description of a bound cursor before
-    fetching it.
-#)  Fixed a couple of build issues on Mac OS X, AIX and Solaris (64-bit).
-#)  Modified documentation slightly based on comments from several people.
-#)  Included files in MANIFEST that are needed to generate the binaries.
-#)  Modified test suite to work within the test environment at Computronix
-    as well as within the packages that are distributed.
-
-
-cx_Oracle 3.0 (March 2003)
---------------------------
-
-#)  Removed support for connection to Oracle7 databases; it is entirely
-    possible that it will still work but I no longer have any way of testing
-    and Oracle has dropped any meaningful support for Oracle7 anyway.
-#)  Fetching of strings is now done with predefined memory areas rather than
-    dynamic memory areas; dynamic fetching of strings was causing problems
-    with Oracle 9i in some instances and databases using a different character
-    set other than US ASCII.
-#)  Fixed bug where segfault would occur if the '/' character preceded the '@'
-    character in a connect string.
-#)  Added two new cursor methods var() and arrayvar() in order to eliminate
-    the need for setinputsizes() when defining PL/SQL arrays and as a generic
-    method of acquiring bind variables directly when needed.
-#)  Fixed support for binding cursors and added support for fetching cursors
-    (these are known as ref cursors in PL/SQL).
-#)  Eliminated discrepancy between the array size used internally and the
-    array size specified by the interface user; this was done earlier to avoid
-    bus errors on 64-bit platforms but another way has been found to get
-    around that issue and a number of people were getting confused because of
-    the discrepancy.
-#)  Added support for the attribute "connection" on cursors, an optional
-    DB API extension.
-#)  Added support for passing a dictionary as the second parameter for the
-    cursor.execute() method in order to comply with the DB API more closely;
-    the method of passing parameters with keyword parameters is still supported
-    and is in fact preferred.
-#)  Added support for the attribute "statement" on cursors which is a
-    reference to the last SQL statement prepared or executed.
-#)  Added support for passing any sequence to callproc() rather than just
-    lists as before.
-#)  Fixed bug where segfault would occur if the array size was changed after
-    the cursor was executed but before it was fetched.
-#)  Ignore array size when performing executemany() and use the length of the
-    list of parameters instead.
-#)  Rollback when connection is closed or destroyed to follow DB API rather
-    than use the Oracle default (which is commit).
-#)  Added check for array size too large causing an integer overflow.
-#)  Added support for iterators for Python 2.2 and above.
-#)  Added test suite based on PyUnitTest.
-#)  Added documentation in HTML format similar to the documentation for the
-    core Python library.
-
-
-cx_Oracle 2.5a (August 2002)
-----------------------------
-
-#)  Fix problem with Oracle 9i and retrieving strings; it seems that Oracle 9i
-    uses the correct method for dynamic callback but Oracle 8i will not work
-    with that method so an #ifdef was added to check for the existence of an
-    Oracle 9i feature; thanks to Paul Denize for discovering this problem.
-
-
-cx_Oracle 2.5 (July 2002)
--------------------------
-
-#)  Added flag OPT_NoOracle7 which, if set, assumes that connections are being
-    made to Oracle8 or higher databases; this allows for eliminating the
-    overhead in performing this check at connect time.
-#)  Added flag OPT_NumbersAsStrings which, if set, returns all numbers as
-    strings rather than integers or floats; this flag is used when defined
-    variables are created (during select statements only).
-#)  Added flag OPT_Threading which, if set, uses OCI threading mode; there is a
-    significant performance degradation in this mode (about 15-20%) but it does
-    allow threads to share connections (threadsafety level 2 according to the
-    Python Database API 2.0); note that in order to support this, Oracle 8i or
-    higher is now required.
-#)  Added Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS pairs where
-    applicable to support threading during blocking OCI calls.
-#)  Added global method attach() to cx_Oracle to support attaching to an
-    existing database handle (as provided by PowerBuilder, for example).
-#)  Eliminated the cursor method fetchbinds() which was used for returning the
-    list of bind variables after execution to get the values of out variables;
-    the cursor method setinputsizes() was modified to return the list of bind
-    variables and the cursor method execute() was modified to return the list
-    of defined variables in the case of a select statement being executed;
-    these variables have three methods available to them: getvalue([<pos>]) to
-    get the value of a variable, setvalue(<pos>, <value>) to set its value and
-    copy(<var>, <src_pos>, <targ_pos>) to copy the value from a variable in a
-    more efficient manner than setvalue(getvalue()).
-#)  Implemented cursor method executemany() which expects a list of
-    dictionaries for the parameters.
-#)  Implemented cursor method callproc().
-#)  Added cursor method prepare() which parses (prepares) the statement for
-    execution; subsequent execute() or executemany() calls can pass *None* as
-    the statement which will imply use of the previously prepared statement;
-    used for high performance only.
-#)  Added cursor method fetchraw() which will perform a raw fetch of the cursor
-    returning the number of rows thus fetched; this is used to avoid the
-    overhead of generating result sets; used for high performance only.
-#)  Added cursor method executemanyprepared() which is identical to the method
-    executemany() except that it takes a single parameter which is the number
-    of times to execute a previously prepared statement and it assumes that the
-    bind variables already have their values set; used for high performance
-    only.
-#)  Added support for rowid being returned in a select statement.
-#)  Added support for comparing dates returned by cx_Oracle.
-#)  Integrated patch from Andre Reitz to set the null ok flag in the
-    description attribute of the cursor.
-#)  Integrated patch from Andre Reitz to setup.py to support compilation with
-    Python 1.5.
-#)  Integrated patch from Benjamin Kearns to setup.py to support compilation
-    on Cygwin.
-
-
-cx_Oracle 2.4 (January 2002)
-----------------------------
-
-#)  String variables can now be made any length (previously restricted to the
-    64K limit imposed by Oracle for default binding); use the type
-    cx_Oracle.LONG_STRING as the parameter to setinputsizes() for binding in
-    string values larger than 4000 bytes.
-#)  Raw and long raw columns are now supported; use the types cx_Oracle.BINARY
-    and cx_Oracle.LONG_BINARY as the parameter to setinputsizes() for binding
-    in values of these types.
-#)  Functions DateFromTicks(), TimeFromTicks() and TimestampFromTicks()
-    are now implemented.
-#)  Function cursor.setoutputsize() implemented
-#)  Added the ability to bind arrays as out parameters to procedures; use the
-    format [cx_Oracle.<DataType>, <NumElems>] as the input to the function
-    setinputsizes() for binding arrays
-#)  Discovered from the Oracle 8.1.6 version of the documentation of the OCI
-    libraries, that the size of the memory location required for the precision
-    variable is larger than the printed documentation says; this was causing a
-    problem with the code on the Sun platform.
-#)  Now support building RPMs for Linux.
-
-
-cx_Oracle 2.3 (October 2001)
-----------------------------
-
-#)  Incremental performance enhancements (dealing with reusing cursors and
-    bind handles).
-#)  Ensured that arrays of integers with a single float in them are all
-    treated as floats, as suggested by Martin Koch.
-#)  Fixed code dealing with scale and precision for both defining a numeric
-    variable and for providing the cursor description; this eliminates the
-    problem of an underflow error (OCI-22054) when retrieving data with
-    non-zero scale.
-
-
-cx_Oracle 2.2 (July 2001)
--------------------------
-
-#)  Upgraded thread safety to level 1 (according to the Python DB API 2.0) as
-    an internal project required the ability to share the module between
-    threads.
-#)  Added ability to bind ref cursors to PL/SQL blocks as requested by
-    Brad Powell.
-#)  Added function write(Value, [Offset]) to LOB variables as requested by
-    Matthias Kirst.
-#)  Procedure execute() on Cursor objects now permits a value *None* for the
-    statement which means that the previously prepared statement will be
-    executed and any input sizes set earlier will be retained. This was done to
-    improve the performance of scripts that execute one statement many times.
-#)  Modified module global constants BINARY and DATETIME to point to the
-    external representations of those types so that the expression
-    type(var) == cx_Oracle.DATETIME will work as expected.
-#)  Added global constant version to provide means of determining the current
-    version of the module.
-#)  Modified error checking routine to distinguish between an Oracle error and
-    invalid handles.
-#)  Added error checking to avoid setting the value of a bind variable to a
-    value that it cannot support and raised an exception to indicate this fact.
-#)  Added extra compile arguments for the AIX platform as suggested by Jehwan
-    Ryu.
-#)  Added section to the README to indicate the method for a binary
-    installation as suggested by Steve Holden.
-#)  Added simple usage example as requested by many people.
-#)  Added HISTORY file to the distribution.
diff --git a/doc/src/user_guide/appendix_a.rst b/doc/src/user_guide/appendix_a.rst
deleted file mode 100644
index e2b1e88c..00000000
--- a/doc/src/user_guide/appendix_a.rst
+++ /dev/null
@@ -1,518 +0,0 @@
-.. _featuresummary:
-
-.. currentmodule:: oracledb
-
-*****************************************************************
-Appendix A: Oracle Database Features Supported by python-oracledb
-*****************************************************************
-
-By default, python-oracledb runs in a 'Thin' mode which connects directly to
-Oracle Database.  This mode does not need Oracle Client libraries.  However,
-some additional functionality is available when python-oracledb uses them.
-Python-oracledb is said to be in 'Thick' mode when Oracle Client libraries are
-used.  Both modes have comprehensive functionality supporting the Python
-Database API v2.0 Specification `PEP 249
-<https://peps.python.org/pep-0249/>`__.  See :ref:`initialization` for how to
-enable Thick mode.
-
-The following table summarizes the Oracle Database features supported by
-python-oracledb Thin and Thick modes, and by the obsolete cx_Oracle driver.
-For more details see :ref:`driverdiff` and :ref:`upgrading83`.
-
-.. list-table-with-summary::  Features Supported by python-oracledb and cx_Oracle 8.3
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :summary: The first column displays the Oracle feature. The second column indicates whether the feature is supported in python-oracledb Thin mode. The third column indicates whether the feature is supported in python-oracledb Thick mode. The fourth column indicates if the feature is supported in the obsolete cx_Oracle driver.
-
-    * - Oracle Feature
-      - python-oracledb Thin Mode
-      - python-oracledb Thick Mode
-      - cx_Oracle 8.3
-    * - Oracle Client version
-      - Not applicable
-      - Release 11.2 and later
-      - Release 11.2 and later
-    * - Oracle Database version
-      - Release 12.1 and later
-      - Release 9.2 and later depending on Oracle Client library version
-      - Release 9.2 and later depending on Oracle Client library version
-    * - Standalone connections (see :ref:`standaloneconnection`)
-      - Yes - must use keyword arguments
-      - Yes - must use keyword arguments
-      - Yes
-    * - Connection Pooling - Heterogeneous and Homogeneous (see :ref:`Connection pooling <connpooling>`)
-      - Homogeneous only - must use keyword arguments
-      - Yes - must use keyword arguments
-      - Yes
-    * - Named Connection Pools (see :ref:`connpoolcache`)
-      - Yes
-      - Yes
-      - No
-    * - Connection Pool Connection Load Balancing (CLB) (see `Client-Side Load Balancing <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-10F7892A-92DD-482C-8D68-AE80CE956010>`__)
-      - Yes
-      - Yes
-      - Yes
-    * - Connection Pool Runtime Load Balancing (RLB) (see `Runtime Connection Load Balancing <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-25F85237-702B-4609-ACE2-1454EBC8284B>`__)
-      - No
-      - Yes
-      - Yes
-    * - Connection Pool draining (see `Prepare Applications for Planned Maintenance <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-9121F9FF-88E5-4DA2-9874-23A185CB2F82>`__)
-      - Yes
-      - Yes
-      - Yes
-    * - Connection Pool session state callback (see :ref:`sessioncallback`)
-      - Yes - Python functions but not PL/SQL functions
-      - Yes
-      - Yes
-    * - Connection pool session tagging (see :ref:`conntagging`)
-      - No
-      - Yes
-      - Yes
-    * - Password authentication
-      - Yes
-      - Yes
-      - Yes
-    * - External authentication (see :ref:`extauth`)
-      - No
-      - Yes
-      - Yes
-    * - Oracle Cloud Infrastructure (OCI) Identity and Access Management (IAM) Tokens (see :ref:`iamauth`)
-      - Yes
-      - Yes
-      - Yes - in connection string with appropriate Oracle Client
-    * - Open Authorization (OAuth 2.0) (see :ref:`oauth2`)
-      - Yes
-      - Yes
-      - Yes - in connection string with appropriate Oracle Client
-    * - Kerberos and Radius authentication
-      - No
-      - Yes
-      - Yes
-    * - Lightweight Directory Access Protocol (LDAP) connections (see :ref:`ldapconnections`)
-      - Yes - via a user function enabled with :meth:`oracledb.register_protocol()`
-      - Yes
-      - Yes
-    * - Proxy connections (see :ref:`proxyauth`)
-      - Yes
-      - Yes
-      - Yes
-    * - Socket Secure (SOCKS) Proxy connections
-      - No
-      - No
-      - No
-    * - Connection mode privileges (see :ref:`connection-authorization-modes`)
-      - Yes
-      - Yes - only :data:`~oracledb.AUTH_MODE_SYSDBA` is supported
-      - Yes - only :data:`~oracledb.AUTH_MODE_SYSDBA` is supported
-    * - Preliminary connections
-      - No
-      - Yes
-      - Yes
-    * - Set the current schema using an attribute
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Cloud Database connectivity (see :ref:`autonomousdb`)
-      - Yes
-      - Yes
-      - Yes
-    * - Real Application Clusters (RAC)
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Globally Distributed Database - previously known as Oracle Sharded Databases (see :ref:`connsharding`)
-      - No
-      - Yes - No TIMESTAMP support
-      - Yes - No TIMESTAMP support
-    * - Oracle Database Native Network Encryption (NNE) (see :ref:`nne`)
-      - No - use `TLS <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-8B82DD7E-7189-4FE9-8F3B-4E521706E1E4>`__ instead
-      - Yes
-      - Yes
-    * - Connection health check APIs (see :meth:`~Connection.is_healthy()` and :meth:`~Connection.ping()`)
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Net Services ``tnsnames.ora`` file (see :ref:`optnetfiles`)
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Net Services ``sqlnet.ora`` file (see :ref:`optnetfiles`)
-      - No - many values can be set at connection time
-      - Yes
-      - Yes
-    * - Oracle Client library configuration file ``oraaccess.xml`` (see :ref:`optclientfiles`)
-      - Not applicable
-      - Yes
-      - Yes
-    * - Easy Connect connection strings (see :ref:`easyconnect`)
-      - Yes - mostly supported. Unknown settings are ignored and not passed to Oracle Database.
-      - Yes
-      - Yes
-    * - Centralized Configuration Providers (see :ref:`configurationproviders`)
-      - Yes
-      - Yes
-      - No
-    * - One-way TLS connections (see :ref:`onewaytls`)
-      - Yes
-      - Yes
-      - Yes
-    * - Mutual TLS (mTLS) connections (see :ref:`twowaytls`)
-      - Yes
-      - Yes
-      - Yes
-    * - Secure External Password Store (SEPS) wallet (e.g. wallets created by mkstore)
-      - No
-      - Yes
-      - Yes
-    * - Oracle Database Dedicated Servers, Shared Servers and :ref:`drcp`.
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Database version 23 Implicit Connection Pooling with :ref:`DRCP <drcp>` and PRCP (see :ref:`implicitconnpool`)
-      - Yes
-      - Yes
-      - No
-    * - Multitenant Databases
-      - Yes
-      - Yes
-      - Yes
-    * - CMAN and CMAN-TDM connectivity
-      - Yes
-      - Yes
-      - Yes
-    * - Password changing (see :meth:`Connection.changepassword()`)
-      - Yes
-      - Yes
-      - Yes
-    * - Statement break/reset (see :meth:`Connection.cancel()`)
-      - Yes
-      - Yes
-      - Yes
-    * - Edition Based Redefinition (EBR) (see :ref:`ebr`)
-      - Yes
-      - Yes
-      - Yes
-    * - SQL execution (see :ref:`sqlexecution`)
-      - Yes
-      - Yes
-      - Yes
-    * - PL/SQL execution (see :ref:`plsqlexecution`)
-      - Yes for scalar types. Yes for collection types using array interface.
-      - Yes
-      - Yes
-    * - Simple Oracle Document Access (SODA) API (see :ref:`SODA <soda>`)
-      - No
-      - Yes
-      - Yes
-    * - Bind variables for data binding (see :ref:`bind`)
-      - Yes
-      - Yes
-      - Yes
-    * - Array DML binding for bulk DML and PL/SQL (see :ref:`batchstmnt`)
-      - Yes
-      - Yes
-      - Yes
-    * - SQL and PL/SQL type and collections (see :ref:`fetchobjects`)
-      - Yes
-      - Yes
-      - Yes
-    * - Query column metadata (see :ref:`querymetadata`)
-      - Yes
-      - Yes
-      - Yes
-    * - Client character set support (see :ref:`globalization`)
-      - UTF-8
-      - UTF-8
-      - Yes - can use Python encodings. Default in 8.0 is UTF-8
-    * - Globalization support (see :ref:`globalization`)
-      - Yes - via Python globalization support
-      - Yes - Oracle Database NLS environment variables are respected, excluding the character set in NLS_LANG
-      - Yes - Oracle Database NLS environment variables are respected, excluding the character set in NLS_LANG
-    * - Row prefetching on first query execute (see :ref:`tuningfetch`)
-      - Yes - unless the row contains LOBs or similar types
-      - Yes - unless the row contains LOBs or similar types
-      - Yes - unless the row contains LOBs or similar types
-    * - Array fetching for queries (see :ref:`tuningfetch`)
-      - Yes
-      - Yes
-      - Yes
-    * - Statement caching (see :ref:`stmtcache`)
-      - Yes - new driver also supports dropping from the cache
-      - Yes - new driver also supports dropping from the cache
-      - Yes
-    * - Client Result Caching (CRC) (see :ref:`clientresultcache`)
-      - No
-      - Yes
-      - Yes
-    * - Direct Path Loads (see :ref:`directpathloads`)
-      - Yes
-      - No
-      - No
-    * - Oracle Database version 23 JSON-Relational Duality Views (see :ref:`jsondualityviews`)
-      - Yes
-      - Yes
-      - No
-    * - Continuous Query Notification (CQN) (see :ref:`cqn`)
-      - No
-      - Yes
-      - Yes
-    * - Oracle Transactional Event Queues and Advanced Queuing (AQ) (see :ref:`aqusermanual`)
-      - Yes
-      - Yes
-      - Yes
-    * - Call timeouts (see :attr:`Connection.call_timeout`)
-      - Yes
-      - Yes
-      - Yes
-    * - Scrollable cursors (see :ref:`scrollablecursors`)
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Database startup and shutdown (see :ref:`startup`)
-      - No
-      - Yes
-      - Yes
-    * - Transaction management (see :ref:`txnmgmnt`)
-      - Yes
-      - Yes
-      - Yes
-    * - Events mode for notifications
-      - No
-      - Yes
-      - Yes
-    * - Fast Application Notification (FAN) (see :ref:`fan`)
-      - No
-      - Yes
-      - Yes
-    * - In-band notifications
-      - Yes
-      - Yes
-      - Yes
-    * - Transparent Application Failover (TAF)
-      - No
-      - Yes - no callback
-      - Yes - no callback
-    * - Transaction Guard (TG) (see :ref:`tg`)
-      - Yes
-      - Yes
-      - Yes
-    * - Data Guard (DG) and Active Data Guard (ADG)
-      - Yes
-      - Yes
-      - Yes
-    * - Application Continuity (AC) and Transparent Application Continuity (TAC) (see :ref:`appcont`)
-      - No
-      - Yes
-      - Yes
-    * - Concurrent programming with asyncio (see :ref:`concurrentprogramming`)
-      - Yes
-      - No
-      - No
-    * - Oracle Database version 23 Pipelining (see :ref:`pipelining`)
-      - Yes
-      - No
-      - No
-    * - End-to-end monitoring and tracing attributes (see :ref:`tracingsql`)
-      - Yes
-      - Yes
-      - Yes
-    * - Automatic Diagnostic Repository (ADR) (see `About Fault Diagnosability in OCI <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-A2945AF1-36DE-4C87-8C19-DA82B352F176>`__)
-      - No
-      - Yes
-      - Yes
-    * - Java Debug Wire Protocol for debugging PL/SQL (see :ref:`jdwp`)
-      - Yes
-      - Yes
-      - Yes
-    * - Oracle Database version 23 Sessionless Transactions (see :ref:`sessionlesstxns`)
-      - Yes
-      - Yes
-      - No
-    * - Two-phase Commit (TPC) (see :ref:`tpc`)
-      - Yes
-      - Yes
-      - Yes - limited support
-    * - REF CURSORs and Nested Cursors
-      - Yes
-      - Yes
-      - Yes
-    * - Pipelined tables
-      - Yes
-      - Yes
-      - Yes
-    * - Implicit Result Sets
-      - Yes
-      - Yes
-      - Yes
-    * - Application Contexts (see :ref:`appcontext`)
-      - Yes
-      - Yes
-      - Yes
-    * - Persistent and Temporary LOBs
-      - Yes
-      - Yes
-      - Yes
-    * - LOB length prefetching
-      - Yes
-      - Yes
-      - Yes
-    * - LOB locator operations such as trim
-      - Yes
-      - Yes
-      - Yes
-
-.. _supporteddbtypes:
-
-Supported Oracle Database Data Types
-====================================
-
-The following table lists the Oracle Database types that are supported in
-the python-oracledb driver.  See `Oracle Database Types <https://www.oracle.
-com/pls/topic/lookup?ctx=dblatest&id=GUID-A3C0D836-BADB-44E5-A5D4-
-265BA5968483>`__ and `PL/SQL Types <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-391C58FD-16AF-486C-AF28-173E309CDBA5>`__.  The
-python-oracledb constant shown is the common one.  In some python-oracledb
-APIs you may use other types, for example when binding numeric values.
-
-.. list-table-with-summary::  Oracle Database Data Types Supported
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :summary: The first column displays the database data type. The second column displays the python-oracledb constant Name. The third column shows Python types that can be used. The fourth column contains notes.
-
-    * - Oracle Database Type
-      - python-oracledb Constant Name
-      - Supported Python Types
-      - Notes
-    * - VARCHAR2
-      - :data:`~oracledb.DB_TYPE_VARCHAR`
-      - bytes, str
-      - No relevant notes
-    * - NVARCHAR2
-      - :data:`~oracledb.DB_TYPE_NVARCHAR`
-      - bytes, str
-      - No relevant notes
-    * - NUMBER, FLOAT
-      - :data:`~oracledb.DB_TYPE_NUMBER`
-      - bool, int, float, decimal.Decimal
-      - No relevant notes
-    * - DATE
-      - :data:`~oracledb.DB_TYPE_DATE`
-      - datetime.date, datetime.datetime
-      - No relevant notes
-    * - BOOLEAN (PL/SQL and Oracle Database version 23 SQL)
-      - :data:`~oracledb.DB_TYPE_BOOLEAN`
-      - Any type convertible to bool
-      - No relevant notes
-    * - BINARY_DOUBLE
-      - :data:`~oracledb.DB_TYPE_BINARY_DOUBLE`
-      - bool, int, float, decimal.Decimal
-      - No relevant notes
-    * - BINARY_FLOAT
-      - :data:`~oracledb.DB_TYPE_BINARY_FLOAT`
-      - bool, int, float, decimal.Decimal
-      - No relevant notes
-    * - TIMESTAMP
-      - :data:`~oracledb.DB_TYPE_TIMESTAMP`
-      - datetime.date, datetime.datetime
-      - No relevant notes
-    * - TIMESTAMP WITH TIME ZONE
-      - :data:`~oracledb.DB_TYPE_TIMESTAMP_TZ`
-      - datetime.date, datetime.datetime
-      - No relevant notes
-    * - TIMESTAMP WITH LOCAL TIME ZONE
-      - :data:`~oracledb.DB_TYPE_TIMESTAMP_LTZ`
-      - datetime.date, datetime.datetime
-      - No relevant notes
-    * - INTERVAL YEAR TO MONTH
-      - :data:`~oracledb.DB_TYPE_INTERVAL_YM`
-      - :ref:`oracledb.IntervalYM <interval_ym>`
-      - No relevant notes
-    * - INTERVAL DAY TO SECOND
-      - :data:`~oracledb.DB_TYPE_INTERVAL_DS`
-      - datetime.timedelta
-      - No relevant notes
-    * - RAW
-      - :data:`~oracledb.DB_TYPE_RAW`
-      - bytes, str
-      - No relevant notes
-    * - LONG
-      - :data:`~oracledb.DB_TYPE_LONG`
-      - bytes, str
-      - No relevant notes
-    * - LONG RAW
-      - :data:`~oracledb.DB_TYPE_LONG_RAW`
-      - bytes, str
-      - No relevant notes
-    * - ROWID
-      - :data:`~oracledb.DB_TYPE_ROWID`
-      - bytes, str
-      - No relevant notes
-    * - UROWID
-      - :data:`~oracledb.DB_TYPE_ROWID`, :data:`~oracledb.DB_TYPE_UROWID` (only supported in python-oracledb Thin mode)
-      - bytes, str
-      - May show :data:`~oracledb.DB_TYPE_UROWID` in metadata. See :ref:`Query Metadata Differences <querymetadatadiff>`.
-    * - CHAR
-      - :data:`~oracledb.DB_TYPE_CHAR`
-      - bytes, str
-      - No relevant notes
-    * - BLOB
-      - :data:`~oracledb.DB_TYPE_BLOB`
-      - :ref:`oracledb.LOB <lobobj>`, bytes, str
-      - No relevant notes
-    * - CLOB
-      - :data:`~oracledb.DB_TYPE_CLOB`
-      - :ref:`oracledb.LOB <lobobj>`, bytes, str
-      - No relevant notes
-    * - NCHAR
-      - :data:`~oracledb.DB_TYPE_NCHAR`
-      - bytes, str
-      - No relevant notes
-    * - NCLOB
-      - :data:`~oracledb.DB_TYPE_NCLOB`, :data:`~oracledb.DB_TYPE_LONG_NVARCHAR` (if fetching NCLOB as a string)
-      - :ref:`oracledb.LOB <lobobj>`, bytes, str
-      - No relevant notes
-    * - BFILE
-      - :data:`~oracledb.DB_TYPE_BFILE`
-      - :ref:`oracledb.LOB <lobobj>`, bytes
-      - Can fetch a BFILE object and insert that object in a table. Cannot create BFILE objects.
-    * - JSON
-      - :data:`~oracledb.DB_TYPE_JSON`
-      - Any type convertible to Oracle JSON
-      - No relevant notes
-    * - REF CURSOR (PL/SQL OR nested cursor)
-      - :data:`~oracledb.DB_TYPE_CURSOR`
-      - :ref:`oracledb.Cursor <cursorobj>`
-      - No relevant notes
-    * - PLS_INTEGER
-      - :data:`~oracledb.DB_TYPE_BINARY_INTEGER`
-      - bool, int, float, decimal.Decimal
-      - No relevant notes
-    * - BINARY_INTEGER
-      - :data:`~oracledb.DB_TYPE_BINARY_INTEGER`
-      - bool, int, float, decimal.Decimal
-      - No relevant notes
-    * - REF
-      - n/a
-      - n/a
-      - Not supported in python-oracledb Thin mode
-    * - XMLType
-      - :data:`~oracledb.DB_TYPE_XMLTYPE`
-      - bytes, str
-      - May need to use ``xmltype.getclobval()`` to fetch in python-oracledb Thick mode. See :ref:`xmldatatype`
-    * - User-defined types (object type, VARRAY, records, collections, SDO_*types)
-      - :data:`~oracledb.DB_TYPE_OBJECT`
-      - OBJECT of specific type
-      - No relevant notes
-    * - VECTOR
-      - :data:`~oracledb.DB_TYPE_VECTOR`
-      - array.array
-      - No relevant notes
-
-Binding of contiguous PL/SQL Index-by BINARY_INTEGER arrays of string, number, and date are
-supported in python-oracledb Thin and Thick modes. Use :meth:`Cursor.arrayvar()` to build
-these arrays.
-
-When fetching :ref:`data frames <dataframeformat>`, see :ref:`Data Frame Type
-Mapping <dftypemapping>` for type information.
diff --git a/doc/src/user_guide/appendix_b.rst b/doc/src/user_guide/appendix_b.rst
deleted file mode 100644
index 5c69ae37..00000000
--- a/doc/src/user_guide/appendix_b.rst
+++ /dev/null
@@ -1,282 +0,0 @@
-.. _driverdiff:
-
-.. currentmodule:: oracledb
-
-********************************************************************
-Appendix B: Differences between python-oracledb Thin and Thick Modes
-********************************************************************
-
-By default, python-oracledb runs in a 'Thin' mode which connects directly to
-Oracle Database.  This mode does not need Oracle Client libraries.  However,
-some :ref:`additional functionality <featuresummary>` is available when
-python-oracledb uses them.  Python-oracledb is said to be in 'Thick' mode when
-Oracle Client libraries are used.  See :ref:`enablingthick`.  Both modes have
-comprehensive functionality supporting the Python Database API v2.0
-Specification.
-
-This section details the differences between the python-oracledb Thin and Thick
-modes.  Also see the summary feature comparison table in :ref:`featuresummary`.
-
-Connection Handling Differences between Thin and Thick Modes
-============================================================
-
-Python-oracledb can create connections in either a Thin mode or a Thick
-mode. However, only one of these modes can be used in each Python process:
-
-- By default, python-oracledb runs in a Thin mode which connects directly to
-  Oracle Database.
-
-- If :func:`oracledb.init_oracle_client()` loads Oracle Client libraries before
-  any standalone connection or pool is created, then the python-oracledb mode
-  becomes Thick.  The client libraries handle communication with Oracle
-  Database. See :ref:`enablingthick`.
-
-- If an application opens a connection or creates a pool and then calls
-  :func:`oracledb.init_oracle_client()`, an error will occur.
-
-- Once a connection or pool has been opened, or
-  :func:`~oracledb.init_oracle_client()` has been called, you cannot change the
-  mode.
-
-.. note::
-
-    The parameters of connection and pool creation functions
-    :func:`oracledb.connect()` and :func:`oracledb.create_pool()` are keyword
-    and not positional. This makes the python-oracledb driver compliant with
-    the Python Database API specification PEP 249.  The old positional usage
-    possible in the obsolete cx_Oracle driver will cause an error, see
-    :ref:`connerrors`.
-
-Connections to a Local Database
--------------------------------
-
-In Thin mode, there is no concept of a local database.  Bequeath connections
-cannot be made since no Oracle Client libraries are used.  The Thin mode does
-not de-reference environment variables such as ``ORACLE_SID``, ``TWO_TASK``, or
-``LOCAL`` (the latter is specific to Windows).  A connection string, or
-equivalent, must always be used.
-
-.. _sqlnetclientconfig:
-
-Oracle Net Services and Client Configuration Files
---------------------------------------------------
-
-In python-oracledb Thin mode:
-
-- The location of any ``tnsnames.ora`` files must explicitly be passed to the
-  application.
-
-- Any ``sqlnet.ora`` file will not be read.  Instead, pass an equivalent
-  setting when connecting.
-
-- There is no support for ``oraaccess.xml`` since there are no Oracle Client
-  libraries.
-
-
-See :ref:`optnetfiles` and :ref:`optclientfiles` for more information.
-
-Token Based Authentication
---------------------------
-
-In python-oracledb Thin mode:
-
-- When connecting to Oracle Cloud Database with mutual TLS (mTLS) using OAuth2
-  tokens, you need to explicitly set the ``config_dir``, ``wallet_location``,
-  and ``wallet_password`` parameters of :func:`~oracledb.connect` or
-  :func:`~oracledb.create_pool()`. See, :ref:`autonomousdb`.
-
-- :ref:`Open Authorization (OAuth 2.0) token based authentication connection
-  strings <oauth2connstr>` and :ref:`Oracle Cloud Infrastructure (OCI) Identity
-  and Access Management (IAM) token based authentication connection strings
-  <iamauthconnstr>` are not supported. Use the ``access_token`` parameter of
-  :func:`oracledb.ConnectParams()` instead. See :ref:`tokenauth`.
-
-Transport Layer Security (TLS) Support
---------------------------------------
-
-When connecting with mutual TLS (mTLS) also known as two-way TLS, for example to
-Oracle Autonomous Database in Oracle Cloud using a wallet, the certificate must
-be in the correct format.
-
-For python-oracledb Thin mode, the certificate must be in a Privacy Enhanced
-Mail (PEM) ``ewallet.pem`` file.  In python-oracledb Thick mode the certificate
-must be in a ``cwallet.sso`` file.  See :ref:`autonomousdb` for more
-information.
-
-Native Network Encryption and Checksumming
-------------------------------------------
-
-The python-oracledb Thin mode does not support connections using Oracle
-Database Native Network Encryption (NNE) or checksumming. You can `enable TLS
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-8B82DD7E-7189-
-4FE9-8F3B-4E521706E1E4>`__ instead of using native network encryption. If
-native network encryption or checksumming are required, then use
-python-oracledb in Thick mode. See :ref:`enablingthick`.
-
-For example, if you use python-oracledb Thin mode and try to connect to an
-Oracle Cloud Infrastructure (OCI) Oracle Base Database (where Native Network
-Encryption is set to *REQUIRED* by default in the database ``sqlnet.ora``
-file), the connection will fail with an error like::
-
-  DPY-3001: Native Network Encryption and Data Integrity is only
-  supported in python-oracledb thick mode
-
-or::
-
-  DPY-4011: the database or network closed the connection
-
-or::
-
-  DPY-6000: cannot connect to database. Listener refused connection.
-  (Similar to ORA-12660)
-
-See :ref:`Troubleshooting DPY-3001 <dpy3001>` for more information.
-
-Connection Pooling Differences between Thin and Thick Modes
-===========================================================
-
-Python-oracledb introduced the :ref:`ConnectionPool Object <connpool>` class to
-replace ``SessionPool``.  A new :func:`oracledb.create_pool()` method is now
-the recommended way to create a connection pool.  The use of the equivalent
-``SessionPool()`` constructor is :ref:`deprecated <deprecations>`.
-
-The :func:`~oracledb.create_pool()` method in python-oracledb Thin mode differs
-from python-oracledb Thick mode in the following ways:
-
-* Not all the parameters of the :func:`oracledb.create_pool()` method are
-  applicable to both python-oracledb modes.  Each mode ignores unrecognized
-  parameters.  The parameters that are ignored in Thin mode include ``events``,
-  ``tag``, ``matchanytag``, ``shardingkey``, ``supershardingkey``, and
-  ``handle`` parameters.  The parameters that are ignored in Thick mode include
-  ``wallet_password``, ``disable_oob``, and ``debug_jdwp`` parameters.
-
-* The python-oracledb Thin mode only supports :ref:`homogeneous
-  <connpooltypes>` pools.
-
-* The python-oracledb Thin mode creates connections in a daemon thread and so
-  :func:`oracledb.create_pool()` returns before any or all minimum number of
-  connections are created. As soon as the pool is created, the
-  :attr:`ConnectionPool.opened` attribute will not be equal to
-  :attr:`ConnectionPool.min`. The :attr:`~ConnectionPool.opened` attribute will
-  increase to the minimum value over a short time as the connections are
-  established. Note that this behavior may also be true of recent versions of
-  the Oracle Call Interface (OCI) Session Pool used in the Thin mode.
-
-  If the new ``getmode`` default value of :data:`~oracledb.POOL_GETMODE_WAIT`
-  is used, then this behavior will not be an issue. With this new default
-  value, any immediate :meth:`ConnectionPool.acquire()` calls will wait for the
-  connections to be created by the daemon thread. This improves application
-  start up time when compared to python-oracledb Thick mode, where
-  :func:`oracledb.create_pool()` will not return control to the application
-  until all ``pool.min`` connections have been created.
-
-  If the old default value ``POOL_GETMODE_NOWAIT`` is required, then the
-  application could check if :attr:`ConnectionPool.opened` has reached
-  :attr:`ConnectionPool.min` and then continue with application start up.
-
-* In python-oracledb Thick mode, when you close a connection pool with the
-  parameter ``force=True``, the underlying Oracle Client libraries wait for the
-  current SQL executions to complete before closing the connections. All of the
-  connections are then dropped from the pool and the pool is closed. Closing
-  the pool in python-oracledb Thick mode could stop responding indefinitely,
-  depending on the network and Oracle Net Services timeout parameters. In
-  python-oracledb Thin mode, the parameter ``force=True`` disconnects each
-  connection's socket using a background thread, leaving the database to clean
-  up its end of the connections.
-
-* In python-oracledb Thin mode, the ``cclass`` parameter value is not used to
-  tag connections in the application connection pool. It is only used for
-  :ref:`drcp`.
-
-* In python-oracledb Thin mode, the connection pool supports all the
-  :ref:`connection mode privileges <connection-authorization-modes>`.
-
-* In python-oracledb Thick mode, when the ``thick_mode_dsn_passthrough`` value
-  in effect is *True*, the ``pool_name`` parameter can be used to specify a
-  DRCP pool name only if the ``dsn`` parameter is not set. If both of these
-  parameters are specified, then the ``pool_name`` parameter is ignored. In
-  python-oracledb Thin mode, both of these parameters can be set and the value
-  defined in the ``pool_name`` parameter will be used as the DRCP pool name.
-
-Supported Database Data Types in Thin and Thick Modes
-=====================================================
-
-The python-oracledb Thin and Thick mode support for the UROWID, REF, and
-XMLType database data types has some small differences. See
-:ref:`supporteddbtypes`.
-
-.. _querymetadatadiff:
-
-Query Metadata in Thin and Thick Modes
-======================================
-
-In python-oracledb Thin mode, :data:`Cursor.description` metadata can
-distinguish the ROWID and UROWID database types. The UROWID database type shows
-the new value ``DB_TYPE_UROWID`` and the database type ROWID uses the existing
-value ``DB_TYPE_ROWID``.
-
-In python-oracledb Thick mode, the value ``DB_TYPE_ROWID`` is shown for both
-ROWID and UROWID database types. In python-oracledb Thick and Thin modes,
-comparison with the type ``oracledb.ROWID`` (defined in the Python DB API) will
-match both ROWID and UROWID database types.
-
-.. _implicitresultsdiff:
-
-Implicit Results in Thin and Thick Modes
-========================================
-
-In python-oracledb Thick mode, the parent cursor that is used to get the
-:ref:`implicit results <implicitresults>` must remain open until all of the
-implicit result sets have been fetched or until the application no longer
-requires them. Closing the parent cursor before all the implicit result sets
-have been fetched will result in the automatic closure of the implicit result
-set cursors.
-
-In python-oracledb Thin mode, there is no requirement to leave the parent
-cursor open when fetching implicit result sets. The parent cursor and implicit
-cursors are independently handled in Thin mode.
-
-.. _stmtcaching:
-
-Statement Caching in Thin and Thick Modes
-=========================================
-
-The :ref:`statement cache <stmtcache>` implemented in python-oracledb Thin mode
-is capable of determining when different database data types are used for the
-same bind variables when a statement is re-executed.  This capability is not
-supported in the Oracle Client libraries that are used in python-oracledb Thick
-mode. Note changing the type of bind variables for the same SQL text is
-inappropriate and gives indeterminate results in both modes.
-
-Duplicate SQL Bind Variable Placeholders in Thin and Thick Modes
-================================================================
-
-To use python-oracledb Thin mode when you have duplicate bind variable
-placeholder names in a SQL statement and are :ref:`binding by position
-<bindbyposition>`, then supply a value for each use of the placeholders, see
-:ref:`dupbindplaceholders`.
-
-This does not apply to PL/SQL blocks.
-
-Error Handling in Thin and Thick Modes
-======================================
-
-Python-oracledb Thin and Thick modes handle some errors differently. See
-:ref:`errorhandling`.
-
-Globalization in Thin and Thick Modes
-=====================================
-
-All NLS environment variables, and the ``ORA_TZFILE`` environment variable, are
-ignored by python-oracledb Thin mode.  Use Python's capabilities instead.
-
-Python-oracledb Thin mode can only use NCHAR, NVARCHAR2, and NCLOB data when
-Oracle Database's secondary character set is AL16UTF16.
-
-See :ref:`globalization`.
-
-Tracing in Thin and Thick Modes
-===============================
-
-In python-oracledb Thin mode, low level tracing is different because there are
-no Oracle Client libraries. See :ref:`tracingsql`.
diff --git a/doc/src/user_guide/appendix_c.rst b/doc/src/user_guide/appendix_c.rst
deleted file mode 100644
index eafb03aa..00000000
--- a/doc/src/user_guide/appendix_c.rst
+++ /dev/null
@@ -1,572 +0,0 @@
-.. currentmodule:: oracledb
-
-*****************************************************
-Appendix C: The python-oracledb and cx_Oracle Drivers
-*****************************************************
-
-The python-oracledb driver is the renamed, successor to cx_Oracle. The
-python-oracledb driver has many :ref:`new features <releasenotes>` and some
-:ref:`deprecations` compared with cx_Oracle. The cx_Oracle driver is obsolete
-and should not be used for new development.
-
-.. _upgrading83:
-
-Upgrading from cx_Oracle 8.3 to python-oracledb
-===============================================
-
-Below is a list of some useful things to know before upgrading from cx_Oracle
-to python-oracledb:
-
-- You can have both cx_Oracle and python-oracledb installed, and can use both
-  in the same application.  Install python-oracledb like::
-
-      python -m pip install oracledb --upgrade
-
-  See :ref:`installation` for details.
-
-- By default, python-oracledb runs in a 'Thin' mode which connects directly to
-  Oracle Database.  This mode does not need Oracle Client libraries.
-  However, some :ref:`additional functionality <featuresummary>` is available
-  when python-oracledb uses them.  Python-oracledb is said to be in 'Thick'
-  mode when Oracle Client libraries are used.  See :ref:`enablingthick`.  Both
-  modes have comprehensive functionality supporting the Python Database API
-  v2.0 Specification. The Thick mode is equivalent to cx_Oracle.
-
-  cx_Oracle always runs in a Thick mode using Oracle Client libraries.  The
-  features in python-oracledb Thick mode and cx_Oracle 8.3 are the same,
-  subject to the :ref:`new features <releasenotes>`, some :ref:`deprecations
-  <deprecations>`, and to other changes noted in the documentation.
-
-- python-oracledb Thin and Thick modes have the same level of support for the
-  `Python Database API specification <https://peps.python.org/pep-0249/>`_ and
-  can be used to connect to on-premises databases and Oracle Cloud
-  databases. See :ref:`driverdiff`.
-
-  Examples can be found in the `GitHub samples directory
-  <https://github.com/oracle/python-oracledb/tree/main/samples>`__. A basic
-  example is:
-
-  .. code-block:: python
-
-      import oracledb
-      import getpass
-
-      pw = getpass.getpass(f"Enter password for hr@localhost/orclpdb: ")
-
-      with oracledb.connect(user="hr", password=userpwd, dsn="localhost/orclpdb") as connection:
-          with connection.cursor() as cursor:
-              for r in cursor.execute("select sysdate from dual"):
-                  print(r)
-
-- python-oracledb can be used in SQLAlchemy, Django, Pandas, Superset and other
-  frameworks and Object-relational Mappers (ORMs). See :ref:`frameworks`.
-
-- python-oracledb connection and pool creation calls require keyword arguments
-  to conform with the Python Database API specification.  For example you must
-  use:
-
-  .. code-block:: python
-
-       connection = oracledb.connect(user="scott", password=pw, dsn="localhost/orclpdb")
-
-  This no longer works:
-
-  .. code-block:: python
-
-       connection = oracledb.connect("scott", pw, "localhost/orclpdb")
-
-- New optional keyword arguments can be passed to connection and pool creation
-  functions. For example you can pass the hostname, port and servicename as
-  separate parameters instead of using an Easy Connect connection string. In
-  python-oracledb Thin mode, some of the new arguments replace :ref:`sqlnet.ora
-  <optnetfiles>` settings.
-
-- Some previously deprecated features are no longer available. See
-  :ref:`deprecations`.
-
-- There are many new features, see the :ref:`release notes <releasenotes>`.
-
-.. _commonupgrade:
-
-Steps to Upgrade to python-oracledb
------------------------------------
-
-If you are creating new applications, follow :ref:`installation` and refer to
-other sections of the documentation for usage information.
-
-To upgrade existing code from cx_Oracle to python-oracledb, perform the
-following steps:
-
-1. Install the new python-oracledb module::
-
-        python -m pip install oracledb --upgrade
-
-   See :ref:`installation` for more details.
-
-2. Import the new interface module. This can be done in two ways. You can change:
-
-   .. code-block:: python
-
-        import cx_Oracle
-
-   to:
-
-   .. code-block:: python
-
-        import oracledb as cx_Oracle
-
-   Alternatively, you can replace all references to the module ``cx_Oracle``
-   with ``oracledb``.  For example, change:
-
-   .. code-block:: python
-
-        import cx_Oracle
-        c = cx_Oracle.connect(...)
-
-   to:
-
-   .. code-block:: python
-
-        import oracledb
-        c = oracledb.connect(...)
-
-   Any new code being introduced during the upgrade should aim to use the
-   latter syntax.
-
-3. Use keyword parameters in calls to :func:`oracledb.connect()`,
-   ``oracledb.Connection()``, and ``oracledb.SessionPool()``.
-
-   You **must** replace positional parameters with keyword parameters, unless
-   only one parameter is being passed. Python-oracledb uses keyword parameters
-   exclusively unless a DSN containing the user, password, and connect string
-   combined, for example ``"un/pw@cs"``, is used. This change makes the driver
-   compliant with the Python Database API specification `PEP 249
-   <https://peps.python.org/pep-0249/>`_.
-
-   For example, the following code will fail:
-
-   .. code-block:: python
-
-       c = oracledb.connect("un", "pw", "cs")
-
-   and needs to be changed to:
-
-   .. code-block:: python
-
-       c = oracledb.connect(user="un", password="pw", dsn="cs")
-
-   The following example will continue to work without change:
-
-   .. code-block:: python
-
-       c = oracledb.connect("un/pw@cs")
-
-4. Review obsolete encoding parameters in calls to :func:`oracledb.connect()`,
-   ``oracledb.Connection()``, and ``oracledb.SessionPool()``:
-
-   - ``encoding`` and ``nencoding`` are desupported in python-oracledb and must
-     be removed. The python-oracledb driver uses UTF-8 exclusively.
-
-   - ``threaded`` is desupported in :func:`oracledb.connect()` and
-     ``oracledb.Connection()`` by python-oracledb and must be removed. This
-     parameter was already ignored in ``oracledb.SessionPool()`` from cx_Oracle
-     8.2.
-
-5. Remove all references to ``Cursor.fetchraw()`` as this method was deprecated
-   in cx_Oracle 8.2 and has been removed in python-oracledb.  Instead, use one
-   of the other fetch methods such as :meth:`Cursor.fetchmany()`.
-
-6. The default value of the ``oracledb.SessionPool()`` parameter ``getmode``
-   now waits for an available connection.  That is, the default is now
-   :data:`~oracledb.POOL_GETMODE_WAIT` instead of
-   :data:`~oracledb.POOL_GETMODE_NOWAIT`.  The new default value improves the
-   behavior for most applications.  If the pool is in the middle of growing,
-   the new value prevents transient connection creation errors from occurring
-   when using python-oracledb Thin mode, or when using Thick mode with recent
-   Oracle Client libraries.
-
-   If the old default value is required, modify any pool creation code to
-   explicitly specify ``getmode=oracledb.POOL_GETMODE_NOWAIT``.
-
-   Note a :ref:`ConnectionPool class <connpool>` deprecates the equivalent
-   SessionPool class. The method :meth:`oracledb.create_pool()` deprecates the
-   use of ``oracledb.SessionPool()``.  New pool parameter constant names such
-   as :data:`~oracledb.POOL_GETMODE_NOWAIT` and :data:`~oracledb.PURITY_SELF`
-   are now preferred.  The old namespaces still work.
-
-7. A Python `type() <https://docs.python.org/3/library/functions.html#type>`__
-   will show the class of a connection pool as ``oracledb.ConnectionPool``
-   instead of ``cx_Oracle.SessionPool``. Update code as needed.
-
-8. Use the new :ref:`Advanced Queuing (AQ) <aqusermanual>` API instead of the
-   older API which was deprecated in cx_Oracle 7.2 and is not available in
-   python-oracledb.
-
-   Replace:
-
-   - ``Connection.deq()`` with :meth:`Queue.deqone()` or :meth:`Queue.deqmany()`
-   - ``Connection.deqoptions()`` with attribute :attr:`Queue.deqoptions`
-   - ``Connection.enq()`` with :meth:`Queue.enqone()` or :meth:`Queue.enqmany()`
-   - ``Connection.enqoptions()`` with attribute :attr:`Queue.enqoptions`
-
-   See :ref:`aqusermanual`.
-
-9. Remove calls to ``Cursor.executemanyprepared()``. This method was previously
-   deprecated in cx_Oracle 6.4 and has been removed in
-   python-oracledb. Instead, use :meth:`Cursor.executemany()` by passing *None*
-   for the statement argument and an integer for the ``parameters`` argument.
-
-10. Remove the use of the ``Cursor.bindarraysize``. It is desupported and not
-    needed in the application code.
-
-11. In python-oracledb, VARCHAR2 and LOB columns that have the ``IS JSON``
-    constraint enabled are fetched by default as Python objects. These columns
-    are fetched in the same way that :ref:`JSON type columns <json21fetch>` are
-    fetched when using Oracle Database 21c (or later). The returned value
-    varies depending on the JSON data. If the JSON data is an object, then a
-    dictionary is returned.  If it is an array, then a list is returned. If it
-    is a scalar value, then that particular scalar value is returned.
-
-    In cx_Oracle, VARCHAR2 and LOB columns that have the ``IS JSON`` constraint
-    enabled are fetched by default as strings and LOB objects respectively. To
-    enable this same fetch behavior in python-oracledb, you can use an
-    :ref:`output type handler <outputtypehandlers>` as shown below.
-
-    .. code-block:: python
-
-        def type_handler(cursor, fetch_info):
-            if fetch_info.is_json:
-                return cursor.var(fetch_info.type_code, cursor.arraysize)
-
-12. Review uses of :attr:`Cursor.rowcount`. After :meth:`Cursor.execute()` or
-    :meth:`Cursor.executemany()` with PL/SQL statements, :attr:`Cursor.rowcount`
-    will return *0*. If the cursor or connection are not open, then the value
-    *-1* will be returned as required by the Python Database API.
-
-13. In python-oracledb Thick mode, error messages generated by the Oracle
-    Client libraries and the `ODPI-C <https://oracle.github.io/odpi/>`_ layer
-    used by cx_Oracle and python-oracledb in Thick mode are mostly returned
-    unchanged from cx_Oracle 8.3. Some exceptions shown below.
-
-    Note that the python-oracledb driver error messages can also vary between
-    Thin and Thick modes. See :ref:`errorhandling`.
-
-    **ConnectionPool.acquire() Message Differences**
-
-    :meth:`ConnectionPool.acquire()` ORA errors will be mapped to DPY errors.
-    For example::
-
-        DPY-4005: timed out waiting for the connection pool to return a connection
-
-    replaces the cx_Oracle 8.3 error::
-
-        ORA-24459: OCISessionGet() timed out waiting for pool to create new connections
-
-    **Dead Connection Detection and Timeout Message Differences**
-
-    Application code which detects connection failures or statement execution
-    timeouts will need to check for new errors, ``DPY-4011`` and ``DPY-4024``
-    respectively. The error ``DPY-1001`` is returned if an already dead connection
-    is attempted to be used.
-
-    The new Error object attribute :attr:`~oracledb._Error.full_code` may be
-    useful for checking the error code.
-
-    Example error messages are:
-
-    * Scenario 1: An already closed or dead connection was attempted to be used.
-
-      python-oracledb Thin mode Error::
-
-        DPY-1001: not connected to database
-
-      python-oracledb Thick mode Error::
-
-        DPY-1001: not connected to database
-
-      cx_Oracle Error::
-
-        not connected
-
-    * Scenario 2: The database side of the connection was terminated while the
-      connection was being used.
-
-      python-oracledb Thin mode Error::
-
-        DPY-4011: the database or network closed the connection
-
-      python-oracledb Thick mode Error::
-
-        DPY-4011: the database or network closed the connection
-        DPI-1080: connection was closed by ORA-%d
-
-      cx_Oracle Error::
-
-        DPI-1080: connection was closed by ORA-%d
-
-    * Scenario 3: Statement execution exceeded the :attr:`connection.call_timeout`
-      value.
-
-      python-oracledb Thin mode Error::
-
-        DPY-4024: call timeout of {timeout} ms exceeded
-
-      python-oracledb Thick mode Error::
-
-        DPY-4024: call timeout of {timeout} ms exceeded
-        DPI-1067: call timeout of %u ms exceeded with ORA-%d
-
-      cx_Oracle Error::
-
-        DPI-1067: call timeout of %u ms exceeded with ORA-%d
-
-14. If your code base uses an older cx_Oracle version, review
-    :ref:`deprecations` for additional changes that may be necessary.
-
-15. Modernize code to take advantage of new features, if desired. See the
-    :ref:`release notes <releasenotes>`.
-
-16. Review the following sections to see if your application requirements are
-    satisfied by python-oracledb Thin mode:
-
-    - :ref:`featuresummary`
-    - :ref:`driverdiff`
-
-    If so, then follow :ref:`upgradethin`.
-
-    If your application requirements are not supported by python-oracledb Thin
-    mode, then use Thick mode, see :ref:`upgradethick`.
-
-.. _upgradethin:
-
-Additional Upgrade Steps to use python-oracledb Thin Mode
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-To upgrade from cx_Oracle to python-oracledb Thin mode, the following changes
-need to be made in addition to the common :ref:`commonupgrade`:
-
-1. Remove calls to :func:`~oracledb.init_oracle_client` since this turns on
-   python-oracledb Thick mode.
-
-2. If the ``config_dir`` parameter of :func:`~oracledb.init_oracle_client` had
-   been used, then set the new
-   :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` attribute to the
-   desired value or set the ``config_dir`` parameter in your connection or pool
-   creation method call.  For example:
-
-   .. code-block:: python
-
-       oracledb.defaults.config_dir = "/opt/oracle/config"
-
-   or
-
-   .. code-block:: python
-
-       connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb",
-                                     config_dir="/opt/oracle/config")
-
-
-   Also, see :ref:`sqlnetclientconfig`.
-
-3. If the ``driver_name`` parameter of :func:`~oracledb.init_oracle_client` had
-   been used, then set the new
-   :attr:`oracledb.defaults.driver_name <Defaults.driver_name>` attribute to
-   the desired value or set the ``driver_name`` parameter when connecting.  The
-   convention for this parameter is to separate the product name from the
-   product version by a colon and single blank characters. For example:
-
-   .. code-block:: python
-
-       oracledb.defaults.driver_name = "python-oracledb : 1.2.0"
-
-   See :ref:`otherinit`.
-
-4. Remove calls to :func:`oracledb.clientversion()`.
-
-   The :func:`oracledb.clientversion()` function shows the version of the
-   Oracle Client libraries being used. Since Oracle Client libraries are not
-   used in python-oracledb Thin mode, this function cannot be called. If it is
-   called before calling :func:`oracledb.init_oracle_client()`, an exception is
-   thrown.
-
-5. To connect using a :ref:`TNS Alias <netservice>` from a ``tnsnames.ora``
-   file (see :ref:`optnetfiles`) in python-oracledb Thin mode, you should
-   explicitly set the environment variable ``TNS_ADMIN`` to the directory
-   containing the file, or set
-   :attr:`oracledb.defaults.config_dir <Defaults.config_dir>`, or set the
-   ``config_dir`` parameter when connecting.
-
-   A ``tnsnames.ora`` file in a "default" location such as the Instant Client
-   ``network/admin/`` subdirectory may not be automatically loaded in Thin mode
-   on some platforms. A ``tnsnames.ora`` file identified by the Windows
-   registry, or in ``$ORACLE_BASE/homes/XYZ/network/admin/`` (in a read-only
-   Oracle Database home) will never be automatically located by
-   python-oracledb Thin mode.
-
-   Only python-oracledb Thick mode will read :ref:`sqlnet.ora <optnetfiles>`
-   and :ref:`oraaccess.xml <optclientfiles>` files.  The Thin mode lets
-   equivalent properties be set in the application when connecting.
-
-6. To use python-oracledb Thin mode in an ``ORACLE_HOME`` database installation
-   environment, you must use an explicit connection string since the
-   ``ORACLE_SID``, ``TWO_TASK``, and ``LOCAL`` environment variables are not
-   used.  They are used in Thick mode.
-
-7. Ensure that any assumptions about when connections are created in the
-   connection pool are eliminated.  Python-oracledb Thin mode creates
-   connections in a daemon thread and so the attribute
-   :attr:`ConnectionPool.opened` will change over time and will not be equal
-   to :attr:`ConnectionPool.min` immediately after the pool is created.  Note
-   that this behavior is also similar in recent versions of the Oracle Call
-   Interface (OCI) Session Pool used by the Thick mode.  Unless the
-   ``oracledb.SessionPool()`` function's parameter ``getmode`` is
-   :data:`oracledb.POOL_GETMODE_WAIT`, then applications should not call
-   :meth:`ConnectionPool.acquire()` until sufficient time has passed for
-   connections in the pool to be created.
-
-8. Review locale and globalization usage. Python-oracledb Thin mode ignores
-   all NLS environment variables.  It also ignores the ``ORA_TZFILE``
-   environment variable.  Thick mode does use these variables.  See
-   :ref:`globalization`.
-
-9. If SQL statements contain repeated bind variable placeholder names, and you
-   are :ref:`binding by position <bindbyposition>`, then make sure that a value
-   is passed for each use of the placeholder, see :ref:`dupbindplaceholders`.
-
-.. _upgradethick:
-
-Additional Upgrade Steps to use python-oracledb Thick Mode
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-To upgrade from cx_Oracle to python-oracledb Thick mode, in addition to the
-common :ref:`commonupgrade`, the function :func:`oracledb.init_oracle_client()`
-*must* be called to enable the Thick mode.  It can be called anywhere before
-the first call to :func:`oracledb.connect()`, ``oracledb.Connection()``, or
-``oracledb.SessionPool()``. If a connection or pool is created first in the
-default Thin mode, then Thick mode cannot be enabled. See
-:ref:`enablingthick` for more details.
-
-The requirement to call :func:`~oracledb.init_oracle_client()` means that
-Oracle Client library loading is not automatically deferred until the driver
-is first used, such as when a connection is opened. To emulate the cx_Oracle
-behavior of deferring library loading until the creation of the first
-connection (in the case when :func:`~oracledb.init_oracle_client()` is not
-called), your application will need to explicitly defer calling
-:func:`~oracledb.init_oracle_client()` as appropriate.
-
-In python-oracledb, :func:`~oracledb.init_oracle_client()` can be called
-multiple times in a Python process as long as the arguments are the same.
-
-Note that on Linux and related operating systems, the
-:func:`~oracledb.init_oracle_client()` parameter ``lib_dir`` should not be
-passed. Instead, set the system library search path with ``ldconfig`` or
-``LD_LIBRARY_PATH`` prior to running Python.
-
-Modernizing Code
-----------------
-
-Many significant new features have been added to python-oracledb. You may want
-to take advantage of them when upgrading from cx_Oracle.  See the rest of the
-documentation, the :ref:`release notes <releasenotes>`, and
-:ref:`featuresummary`.
-
-The following points summarize some of the smaller changes that you may find
-interesting:
-
-- The :meth:`oracledb.makedsn()` method for creating the ``dsn`` value has been
-  deprecated.  New code should use keyword arguments when creating connections
-  or connection pools, or make use of a ``params`` object described below.
-
-- A new optional parameter ``params`` of type :ref:`ConnectParams <connparam>`
-  can be used to encapsulate connection properties.  Similarly a new optional
-  parameter ``params`` of type :ref:`PoolParams <poolparam>` can be used to
-  encapsulate pool creation properties. See :ref:`usingconnparams` for more
-  information.
-
-- The use of the class constructor method ``oracledb.Connection()`` to create
-  connections is no longer recommended for creating connections.  Use
-  :func:`~oracledb.connect()` instead.
-
-- The new method signature of :attr:`Connection.outputtypehandler` is
-  ``handler(cursor, metadata)``. The old signature ``handler(cursor, name,
-  default_type, length, precision, scale)`` was deprecated in python-oracledb
-  1.4 but will still work and will be removed in a future version.
-
-- The attribute :attr:`Connection.maxBytesPerCharacter` is deprecated. This
-  will return a constant value of *4* since encodings are always UTF-8.
-
-- In python-oracledb, the name of the size argument of
-  :meth:`Cursor.fetchmany()` is ``size``. This change was done to comply with
-  `PEP 249 <https://peps.python.org/pep- 0249/>`_. The previous keyword
-  argument name, ``numRows`` is deprecated.
-
-Code to Aid the Upgrade to python-oracledb
-------------------------------------------
-
-.. _toggling:
-
-Toggling between Drivers
-++++++++++++++++++++++++
-
-The sample `oracledb_upgrade.py <https://github.com/oracle/python-oracledb/
-tree/main/samples/oracledb_upgrade.py>`__ shows a way to toggle applications
-between cx_Oracle and the two python-oracledb modes.  Note this script cannot
-map some functionality such as obsolete cx_Oracle features or error message
-changes.
-
-An example application showing this module in use is:
-
-.. code-block:: python
-
-    # test.py
-
-    import oracledb_upgrade as cx_Oracle
-    import os
-
-    un = os.environ.get("PYTHON_USERNAME")
-    pw = os.environ.get("PYTHON_PASSWORD")
-    cs = os.environ.get("PYTHON_CONNECTSTRING")
-
-    connection = cx_Oracle.connect(user=un, password=pw, dsn=cs)
-    with connection.cursor() as cursor:
-        sql = """select unique client_driver
-                 from v$session_connect_info
-                 where sid = sys_context('userenv', 'sid')"""
-        for r, in cursor.execute(sql):
-            print(r)
-
-You can then choose what mode is in use by setting the environment variable
-``ORA_PYTHON_DRIVER_TYPE`` to one of "cx", "thin", or "thick"::
-
-    export ORA_PYTHON_DRIVER_TYPE=thin
-    python test.py
-
-Output shows that python-oracledb Thin mode was used::
-
-    python-oracledb thn : 3.0.0
-
-You can customize ``oracledb_upgrade.py`` to your needs.  For example, if your
-connection and pool creation calls always use keyword parameters, you can
-remove the shims that map from positional arguments to keyword arguments.
-
-The simplest form is shown in :ref:`frameworks`.
-
-Testing Which Driver is in Use
-++++++++++++++++++++++++++++++
-
-To know whether the driver is cx_Oracle or python-oracledb, you can use code
-similar to:
-
-.. code-block:: python
-
-    import oracledb as cx_Oracle
-    # or:
-    # import cx_Oracle
-
-    if cx_Oracle.__name__ == 'cx_Oracle':
-           print('cx_Oracle')
-    else:
-           print('oracledb')
-
-Another method that can be used to check which driver is in use is to query the
-view V$SESSION_CONNECT_INFO, see :ref:`vsessconinfo`.
diff --git a/doc/src/user_guide/appendix_d.rst b/doc/src/user_guide/appendix_d.rst
deleted file mode 100644
index 0149d33f..00000000
--- a/doc/src/user_guide/appendix_d.rst
+++ /dev/null
@@ -1,296 +0,0 @@
-.. _frameworks:
-
-.. currentmodule:: oracledb
-
-*******************************************************
-Appendix D: Python Frameworks, SQL Generators, and ORMs
-*******************************************************
-
-Python-oracledb's Thin and :ref:`Thick <enablingthick>` modes cover the feature
-needs of frameworks that depend upon the Python Database API.
-
-Using python-oracledb with Data Frame Libraries
-===============================================
-
-Python-oracledb can fetch directly to data frames that expose an Apache Arrow
-PyCapsule interface. This is an efficient way to work with data using Python
-libraries such as `Apache PyArrow
-<https://arrow.apache.org/docs/python/index.html>`__, `Pandas
-<https://pandas.pydata.org>`__, `Polars <https://pola.rs/>`__, `NumPy
-<https://numpy.org/>`__, `PyTorch <https://pytorch.org/>`__, or to write files
-in `Apache Parquet <https://parquet.apache.org/>`__ format.
-
-See :ref:`dataframeformat` for more information.
-
-.. _flask:
-
-Connecting with Flask
-=====================
-
-The Flask web application framework works well with python-oracledb, either
-directly or by using a library such as :ref:`SQLAlchemy <sqlalchemy>`.
-
-Examples using python-oracledb directly are available in `connection_pool.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/
-connection_pool.py>`__, `drcp_pool.py <https://github.com/oracle/
-python-oracledb/tree/main/samples/drcp_pool.py>`__, and `session_callback.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/
-session_callback.py>`__.
-
-.. _sqlalchemy:
-
-Connecting with SQLAlchemy
-==========================
-
-`SQLAlchemy <https://www.sqlalchemy.org/>`__, and libraries such as `Pandas
-<https://pandas.pydata.org>`__ that internally use SQLAlchemy, can connect
-easily in python-oracledb as shown in this section.
-
-Also, see `SQLAlchemy documentation on connecting <https://docs.sqlalchemy.org/
-en/20/dialects/oracle.html#module-sqlalchemy.dialects.oracle.oracledb>`__ and
-`SQLAlchemy general documentation about Oracle Database
-<https://docs.sqlalchemy.org/en/20/dialects/oracle.html#module-sqlalchemy.
-dialects.oracle.base>`__.
-
-Connecting with SQLAlchemy 2
-----------------------------
-
-SQLAlchemy 2 supports python-oracledb directly.
-
-Standalone Connections in SQLAlchemy
-++++++++++++++++++++++++++++++++++++
-
-An example of creating a standalone connection in SQLAlchemy 2 is:
-
-.. code-block:: python
-
-    # Using python-oracledb in SQLAlchemy 2
-
-    import os
-    import getpass
-    import oracledb
-    from sqlalchemy import create_engine
-    from sqlalchemy import text
-
-    # Uncomment to use python-oracledb Thick mode
-    # Review the doc for the appropriate parameters
-    #oracledb.init_oracle_client(<your parameters>)
-
-    un = os.environ.get("PYTHON_USERNAME")
-    cs = os.environ.get("PYTHON_CONNECTSTRING")
-    pw = getpass.getpass(f'Enter password for {un}@{cs}: ')
-
-    # Note the first argument is different for SQLAlchemy 1.4 and 2
-    engine = create_engine('oracle+oracledb://@',
-                           connect_args={
-                               # Pass any python-oracledb connect() parameters
-                               "user": un,
-                               "password": pw,
-                               "dsn": cs
-                           }
-             )
-
-    with engine.connect() as connection:
-        print(connection.scalar(text(
-               """select unique client_driver
-                  from v$session_connect_info
-                  where sid = sys_context('userenv', 'sid')""")))
-
-
-Note that the ``create_engine()`` argument driver declaration uses
-``oracle+oracledb://`` for SQLAlchemy 2 but ``oracle://`` for SQLAlchemy 1.4.
-
-The ``connect_args`` dictionary can use any appropriate
-:meth:`oracledb.connect()` parameter.
-
-.. _sqlalchemy2conpool:
-
-Pooled Connections in SQLAlchemy
-++++++++++++++++++++++++++++++++
-
-Most multi-user applications should use a :ref:`connection pool <connpooling>`.
-The python-oracledb pool is preferred because of its high availability
-support. Some single-user applications may also benefit from these availability
-features.
-
-To use a python-oracledb connection pool in SQLAlchemy:
-
-.. code-block:: python
-
-    # Using python-oracledb in SQLAlchemy 2
-
-    import os, platform
-    import getpass
-    import oracledb
-    from sqlalchemy import create_engine
-    from sqlalchemy import text
-    from sqlalchemy.pool import NullPool
-
-    # Uncomment to use python-oracledb Thick mode
-    # Review the doc for the appropriate parameters
-    #oracledb.init_oracle_client(<your parameters>)
-
-    un = os.environ.get("PYTHON_USERNAME")
-    cs = os.environ.get("PYTHON_CONNECTSTRING")
-    pw = getpass.getpass(f'Enter password for {un}@{cs}: ')
-
-    pool = oracledb.create_pool(user=un, password=pw, dsn=cs,
-                                min=4, max=4, increment=0)
-    engine = create_engine("oracle+oracledb://", creator=pool.acquire, poolclass=NullPool)
-
-    with engine.connect() as connection:
-        print(connection.scalar(text("""select unique client_driver
-                                        from v$session_connect_info
-                                        where sid = sys_context('userenv', 'sid')""")))
-
-
-.. _sqlalchemy1:
-
-Connecting with SQLAlchemy 1.4
-------------------------------
-
-SQLAlchemy 1.4 can use python-oracledb with the help of the module name mapping
-code shown in :ref:`boilerplatemapping`.  An example is:
-
-.. code-block:: python
-
-    # Using python-oracledb in SQLAlchemy 1.4
-
-    import os
-    import getpass
-    import oracledb
-    from sqlalchemy import create_engine
-    from sqlalchemy import text
-
-    import sys
-    oracledb.version = "8.3.0"
-    sys.modules["cx_Oracle"] = oracledb
-
-    # Uncomment to use python-oracledb Thick mode
-    # Review the doc for the appropriate parameters
-    #oracledb.init_oracle_client(<your parameters>)
-
-    un = os.environ.get("PYTHON_USERNAME")
-    cs = os.environ.get("PYTHON_CONNECTSTRING")
-    pw = getpass.getpass(f'Enter password for {un}@{cs}: ')
-
-    # Note the first argument is different for SQLAlchemy 1.4 and 2
-    engine = create_engine('oracle://@',
-                           connect_args={
-                               # Pass any python-oracledb connect() parameters
-                               "user": un,
-                               "password": pw,
-                               "dsn": cs
-                           }
-             )
-
-    with engine.connect() as connection:
-        print(connection.scalar(text(
-               """select unique client_driver
-                  from v$session_connect_info
-                  where sid = sys_context('userenv', 'sid')""")))
-
-
-Note that the ``create_engine()`` argument driver declaration uses
-``oracle://`` for SQLAlchemy 1.4 but ``oracle+oracledb://`` for SQLAlchemy 2.
-
-The ``connect_args`` dictionary can use any appropriate
-:meth:`oracledb.connect()` parameter.
-
-You can also use python-oracledb connection pooling with SQLAlchemy 1.4.  This
-is similar to :ref:`pooled connections in SQLAlchemy 2 <sqlalchemy2conpool>`
-but use the appropriate :ref:`name mapping code <boilerplatemapping>` and first
-argument to ``create_engine()``.
-
-.. _django:
-
-Connecting with Django
-======================
-
-Django 5 supports python-oracledb directly.  Earlier versions should use
-:ref:`name mapping code <boilerplatemapping>`.
-
-See `Django 5.2 documentation for Oracle Database
-<https://docs.djangoproject.com/en/5.2/ref/databases/#oracle-notes>`__.
-
-Standalone Connections
-----------------------
-
-To connect in Django 5, an example settings.py file is:
-
-.. code-block:: python
-
-    DATABASES = {
-      "default": {
-        "ENGINE": "django.db.backends.oracle",
-        "NAME": "example.com:1521/orclpdb",
-        "USER": "hr",
-        "PASSWORD": "the-hr-password"
-      }
-    }
-
-Pooled Connections
-------------------
-
-Django 5.2 supports python-oracledb :ref:`connection pools <connpooling>`.
-Most multi-user applications should use a connection pool. The python-oracledb
-pool is preferred because of its high availability support. Some single-user
-applications may also benfit from these availability features.
-
-.. _djangoconpool:
-
-To use a connection pool in Django 5.2, an example settings.py file is:
-
-.. code-block:: python
-
-    DATABASES = {
-      "default": {
-        "ENGINE": "django.db.backends.oracle",
-        "NAME": "example.com:1521/orclpdb",
-        "USER": "hr",
-        "PASSWORD": "the-hr-password"
-        "OPTIONS": {
-          "pool": {
-            "min": 0,
-            "max": 4,
-            "increment": 1,
-            # Additional python-oracledb pool parameters can be added here
-          }
-        }
-      },
-    }
-
-.. _boilerplatemapping:
-
-Older Versions of Python Frameworks, SQL Generators, and ORMs
-=============================================================
-
-For versions of SQLAlchemy, Django, Superset, other frameworks,
-object-relational mappers (ORMs), and libraries that support the obsolete
-cx_Oracle driver but do not have native support for python-oracledb, you can
-add code like this to use python-oracledb:
-
-.. code-block:: python
-
-    import sys
-    import oracledb
-    oracledb.version = "8.3.0"
-    sys.modules["cx_Oracle"] = oracledb
-
-.. note::
-
-    This must occur before any import of cx_Oracle by your code or the library.
-
-See :ref:`sqlalchemy1` for an example.
-
-To use Thick mode, for example, if you need to connect to Oracle Database
-11gR2, add a call to :meth:`oracledb.init_oracle_client()` with the appropriate
-parameters for your environment, see :ref:`enablingthick`.
-
-SQLAlchemy 2 and Django 5 have native support for python-oracledb so the above
-code snippet is not needed in those versions.  Check your preferred library for
-which Oracle Database driver it requires.
-
-For details on using Superset with python-oracledb, refer to the blog post
-`Steps to use Apache Superset and Oracle Database
-<https://medium.com/p/ae0858b4f134>`__.
diff --git a/doc/src/user_guide/aq.rst b/doc/src/user_guide/aq.rst
deleted file mode 100644
index 6d63a48f..00000000
--- a/doc/src/user_guide/aq.rst
+++ /dev/null
@@ -1,408 +0,0 @@
-.. _aqusermanual:
-
-.. currentmodule:: oracledb
-
-************************************************************
-Using Oracle Transactional Event Queues and Advanced Queuing
-************************************************************
-
-`Oracle Transactional Event Queues and Advanced Queuing
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADQUE>`__ are highly
-configurable and scalable messaging features of Oracle Database allowing
-data-driven and event-driven applications to stream events and communicate with
-each other. They have interfaces in various languages, letting you integrate
-multiple tools in your architecture. Both Oracle Transactional Event Queues
-(TxEventQ) and Advanced Queuing (AQ) "Classic" queues support sending and
-receiving of various payloads, such as RAW values, JSON, JMS, and objects.
-Transactional Event Queues use a highly optimized implementation of Advanced
-Queuing. They were previously called AQ Sharded Queues.
-
-.. note::
-
-    Transactional Event Queues with JMS payloads are only supported in
-    python-oracledb :ref:`Thick mode <enablingthick>`.
-
-Python-oracledb API calls are the same for Transactional Event Queues and
-Classic Queues, however there are differences in support for some payload
-types which are detailed below.
-
-.. list-table-with-summary:: Payload Differences Between Classic Queues and Transactional Event Queues
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 10 20 20
-    :summary: The first column displays the payload type. The second column displays whether the payload type is supported in Classic Queues. The third column displays whether the payload type is supported in Transactional Event Queues.
-
-    * - Payload Type
-      - Classic Queues
-      - Transactional Event Queues
-    * - RAW
-      - Supported
-      - Supported for single and array message enqueuing and dequeuing when using Oracle Database 19c (or later). In python-oracledb Thick mode, Oracle Client libraries 19c (or later) are needed.
-    * - Named Oracle Objects
-      - Supported
-      - Supported for single and array message enqueuing and dequeuing when using Oracle Database 19c (or later). In python-oracledb Thick mode, Oracle Client libraries 19c (or later) are needed.
-    * - JSON
-      - Supported when using Oracle Database 21c (or later). In python-oracle Thick mode, Oracle Client libraries 21c (or later) are also needed.
-
-        Buffered messaging using the :data:`~oracledb.MSG_BUFFERED` delivery mode is not supported for JSON payloads.
-      - Supported for single and array message enqueuing and dequeuing when using Oracle Database 21c (or later). In python-oracledb Thick mode, Oracle Client libraries 21c (or later) are needed.
-
-        Buffered messaging using the :data:`~oracledb.MSG_BUFFERED` delivery mode is not supported for JSON payloads.
-    * - JMS
-      - Supported
-      - Supported for single and array message enqueuing and dequeuing when using Oracle Client 19 (or later) and Oracle Database version 23 (or later).
-
-**Usage Notes**
-
-For Classic Queues and Transactional Event Queues, the use of
-:data:`oracledb.ENQ_IMMEDIATE` with bulk enqueuing, and JMS payloads are only
-supported in python-oracledb :ref:`Thick mode <enablingthick>`.
-
-The ``payload_type`` parameter in :meth:`Connection.queue()` must be
-specified when the payload is JSON or Named Oracle Objects. This parameter need
-not be specified for RAW payloads.
-
-Transactional Event Queues do not support :attr:`EnqOptions.transformation`,
-:attr:`DeqOptions.transformation`, or :ref:`Recipient Lists <reciplists>`.
-
-The delivery mode :data:`oracledb.MSG_BUFFERED` is not supported for bulk array
-operations in python-oracledb Thick mode.
-
-There are examples of AQ Classic Queues in the `GitHub samples
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__ directory.
-
-Creating a Queue
-================
-
-Before being used in applications, queues need to be created in the database.
-
-To experiment with queueing, you can grant yourself privileges, for example in
-SQL*Plus as a DBA user:
-
-.. code-block:: sql
-
-    grant aq_administrator_role, aq_user_role to &&username;
-    grant execute on dbms_aq to &&username;
-
-**Creating RAW Payload Queues**
-
-To use SQL*Plus to create a Classic Queue for the RAW payload which is suitable
-for sending string or bytes messages:
-
-.. code-block:: sql
-
-    begin
-        dbms_aqadm.create_queue_table('MY_QUEUE_TABLE', 'RAW');
-        dbms_aqadm.create_queue('DEMO_RAW_QUEUE', 'MY_QUEUE_TABLE');
-        dbms_aqadm.start_queue('DEMO_RAW_QUEUE');
-    end;
-    /
-
-To create a Transactional Event Queue for RAW payloads:
-
-.. code-block:: sql
-
-    begin
-        dbms_aqadm.create_sharded_queue('RAW_SHQ', queue_payload_type=>'RAW');
-        dbms_aqadm.start_queue('RAW_SHQ');
-    end;
-    /
-
-**Creating JSON Payload Queues**
-
-Queues can also be created for JSON payloads. For example, to create a Classic
-Queue in SQL*Plus:
-
-.. code-block:: sql
-
-    begin
-        dbms_aqadm.create_queue_table('JSON_QUEUE_TABLE', 'JSON');
-        dbms_aqadm.create_queue('DEMO_JSON_QUEUE', 'JSON_QUEUE_TABLE');
-        dbms_aqadm.start_queue('DEMO_JSON_QUEUE');
-    end;
-    /
-
-Enqueuing Messages
-==================
-
-To send messages in Python, you connect and get a :ref:`queue <queue>`. The
-queue can then be used for enqueuing, dequeuing, or for both.
-
-**Enqueuing RAW Payloads**
-
-You can connect to the database and get the queue that was created with RAW
-payload type by using :meth:`Connection.queue()` or
-:meth:`AsyncConnection.queue()`. For example:
-
-.. code-block:: python
-
-    queue = connection.queue("DEMO_RAW_QUEUE")
-
-Now messages can be queued using :meth:`Queue.enqone()` or
-:meth:`AsyncQueue.enqone()`.  For example, to send three messages:
-
-.. code-block:: python
-
-    PAYLOAD_DATA = [
-        "The first message",
-        "The second message",
-        "The third message"
-    ]
-    for data in PAYLOAD_DATA:
-        queue.enqone(connection.msgproperties(payload=data))
-    connection.commit()
-
-Since the queue is a RAW queue, strings are internally encoded to bytes using
-`encode() <https://docs.python.org/3/library/stdtypes.html#str.encode>`__
-before being enqueued.
-
-The use of :meth:`Connection.commit()` or :meth:`AsyncConnection.commit()`
-allows messages to be sent only when any database transaction related to them
-is committed. This default behavior can be altered, see :ref:`aqoptions`.
-
-**Enqueuing JSON Payloads**
-
-You can connect to the database and get the queue that was created with JSON
-payload type by using :meth:`Connection.queue()` or
-:meth:`AsyncConnection.queue()`. For example:
-
-.. code-block:: python
-
-    # The argument "JSON" indicates the queue is of JSON payload type
-    queue = connection.queue("DEMO_JSON_QUEUE", "JSON")
-
-Now the message can be enqueued using :meth:`Queue.enqone()` or
-:meth:`AsyncQueue.enqone()`, for example:
-
-.. code-block:: python
-
-    json_data = [
-        [
-            2.75,
-            True,
-            'Ocean Beach',
-            b'Some bytes',
-            {'keyA': 1.0, 'KeyB': 'Melbourne'},
-            datetime.datetime(2022, 8, 1, 0, 0)
-        ],
-        dict(name="John", age=30, city="New York")
-    ]
-    for data in json_data:
-        queue.enqone(connection.msgproperties(payload=data))
-    connection.commit()
-
-Dequeuing Messages
-==================
-
-Dequeuing is performed similarly as shown in the examples below. This returns a
-:ref:`MessageProperties <msgproperties>` object containing the message payload
-and related attributes.
-
-**Dequeuing RAW Payloads**
-
-To dequeue a message, call the method :meth:`Queue.deqone()` or
-:meth:`AsyncQueue.deqone()`. For example:
-
-.. code-block:: python
-
-    queue = connection.queue("DEMO_RAW_QUEUE")
-    message = queue.deqOne()
-    connection.commit()
-    print(message.payload.decode())
-
-Note that if the message is expected to be a string, the bytes must be decoded
-by the application using `decode()
-<https://docs.python.org/3/library/stdtypes.html#bytes.decode>`__, as shown.
-
-If there are no messages in the queue, :meth:`Queue.deqone()` or
-:meth:`AsyncQueue.deqone()` will wait for one to be enqueued.  This default
-behavior can be altered, see :ref:`aqoptions`.
-
-Various :ref:`message properties <msgproperties>` can be accessed.  For example
-to show the :attr:`~MessageProperties.msgid` of a dequeued message:
-
-.. code-block:: python
-
-    print(message.msgid.hex())
-
-**Dequeuing JSON Payloads**
-
-To dequeue a message, call the method :meth:`Queue.deqone()` or
-:meth:`AsyncQueue.deqone()`, for example:
-
-.. code-block:: python
-
-    queue = connection.queue("DEMO_JSON_QUEUE", "JSON")
-    message = queue.deqOne()
-    connection.commit()
-
-Using Object Queues
-===================
-
-Named Oracle objects can be enqueued and dequeued as well.  Given an object
-type called ``UDT_BOOK``:
-
-.. code-block:: sql
-
-    CREATE OR REPLACE TYPE udt_book AS OBJECT (
-        Title   VARCHAR2(100),
-        Authors VARCHAR2(100),
-        Price   NUMBER(5,2)
-    );
-    /
-
-And a queue that accepts this type:
-
-.. code-block:: sql
-
-    begin
-        dbms_aqadm.create_queue_table('BOOK_QUEUE_TAB', 'UDT_BOOK');
-        dbms_aqadm.create_queue('DEMO_BOOK_QUEUE', 'BOOK_QUEUE_TAB');
-        dbms_aqadm.start_queue('DEMO_BOOK_QUEUE');
-    end;
-    /
-
-You can enqueue messages using :meth:`Queue.enqone()` or
-:meth:`AsyncQueue.enqone()`, for example:
-
-.. code-block:: python
-
-    book_type = connection.gettype("UDT_BOOK")
-    queue = connection.queue("DEMO_BOOK_QUEUE", book_type)
-
-    book = book_type.newobject()
-    book.TITLE = "Quick Brown Fox"
-    book.AUTHORS = "The Dog"
-    book.PRICE = 123
-
-    queue.enqone(connection.msgproperties(payload=book))
-    connection.commit()
-
-Dequeuing can be done with :meth:`Queue.deqone()` or
-:meth:`AsyncQueue.deqone()`, for example:
-
-.. code-block:: python
-
-    book_type = connection.gettype("UDT_BOOK")
-    queue = connection.queue("DEMO_BOOK_QUEUE", book_type)
-
-    message = queue.deqone()
-    connection.commit()
-    print(message.payload.TITLE)   # will print Quick Brown Fox
-
-.. _reciplists:
-
-Using Recipient Lists
-=====================
-
-Classic Queues support Recipient Lists.  A list of recipient names can be
-associated with a message at the time a message is enqueued. This allows a
-limited set of recipients to dequeue each message. The recipient list
-associated with the message overrides the queue subscriber list, if there is
-one. The recipient names need not be in the subscriber list but can be, if
-desired.  Transactional Event Queues do not support Recipient Lists.
-
-To dequeue a message, the :attr:`~DeqOptions.consumername` attribute can be
-set to one of the recipient names. The original message recipient list is
-not available on dequeued messages. All recipients have to dequeue
-a message before it gets removed from the queue.
-
-Subscribing to a queue is like subscribing to a magazine: each
-subscriber can dequeue all the messages placed into a specific queue,
-just as each magazine subscriber has access to all its articles.
-However, being a recipient is like getting a letter: each recipient
-is a designated target of a particular message.
-
-For example::
-
-    props = self.connection.msgproperties(payload=book,recipients=["sub2", "sub3"])
-    queue.enqone(props)
-
-Later, when dequeuing messages, a specific recipient can be set to get the
-messages intended for that recipient using the ``consumername`` attribute::
-
-    queue.deqoptions.consumername = "sub3"
-    m = queue.deqone()
-
-.. _aqoptions:
-
-Changing Queue and Message Options
-==================================
-
-Refer to the :ref:`python-oracledb AQ API <aq>` and
-`Oracle Advanced Queuing documentation
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADQUE>`__ for details
-on all of the enqueue and dequeue options available.
-
-Enqueue options can be set.  For example, to make it so that an explicit call
-to :meth:`~Connection.commit()` on the connection is not needed to send
-messages:
-
-.. code-block:: python
-
-    queue = connection.queue("DEMO_RAW_QUEUE")
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-
-Dequeue options can also be set.  For example, to specify not to block on
-dequeuing if no messages are available:
-
-.. code-block:: python
-
-    queue = connection.queue("DEMO_RAW_QUEUE")
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-
-Message properties can be set when enqueuing.  For example, to set an
-expiration of 60 seconds on a message:
-
-.. code-block:: python
-
-    queue.enqone(connection.msgproperties(payload="Message", expiration=60))
-
-This means that if no dequeue operation occurs within 60 seconds then the
-message will be dropped from the queue.
-
-.. _bulkenqdeq:
-
-Bulk Enqueue and Dequeue
-========================
-
-The :meth:`Queue.enqmany()`, :meth:`Queue.deqmany()`,
-:meth:`AsyncQueue.enqmany()`, and :meth:`AsyncQueue.deqmany()` methods can be
-used for efficient bulk message handling.
-
-The bulk enqmany methods are similar to single message enqueue methods but
-accept an array of messages, for example:
-
-.. code-block:: python
-
-    messages = [
-        "The first message",
-        "The second message",
-        "The third message",
-    ]
-    queue = connection.queue("DEMO_RAW_QUEUE")
-    queue.enqmany(connection.msgproperties(payload=m) for m in messages)
-    connection.commit()
-
-.. warning::
-
-    In python-oracledb Thick mode using Oracle Client libraries prior to 21c,
-    calling :meth:`Queue.enqmany()` in parallel on different connections
-    acquired from the same connection pool may fail due to Oracle
-    bug 29928074. To avoid this, do one of: upgrade the client libraries,
-    ensure that :meth:`Queue.enqmany()` is not run in parallel, use standalone
-    connections or connections from different pools, or make multiple calls to
-    :meth:`Queue.enqone()`. The function :meth:`Queue.deqmany()` call is not
-    affected.
-
-To dequeue multiple messages at one time, use :meth:`Queue.deqmany()` or
-:meth:`AsyncQueue.deqmany()`.  These take an argument specifying the maximum
-number of messages to dequeue at one time, for example:
-
-.. code-block:: python
-
-    for message in queue.deqmany(10):
-        print(message.payload.decode())
-
-Depending on the queue properties and the number of messages available to
-dequeue, this code will print out from zero to ten messages.
diff --git a/doc/src/user_guide/asyncio.rst b/doc/src/user_guide/asyncio.rst
deleted file mode 100644
index 8c8a573d..00000000
--- a/doc/src/user_guide/asyncio.rst
+++ /dev/null
@@ -1,718 +0,0 @@
-.. _asyncio:
-
-.. currentmodule:: oracledb
-
-**************************************************
-Concurrent Programming with asyncio and Pipelining
-**************************************************
-
-:ref:`concurrentprogramming` and :ref:`Oracle Database Pipelining
-<pipelining>` significantly enhances the overall performance and responsiveness
-of applications.
-
-.. _concurrentprogramming:
-
-Concurrent Programming with asyncio
-===================================
-
-The `Asynchronous I/O (asyncio) <https://docs.python.org/3/library/asyncio.
-html>`__ Python library can be used with python-oracledb Thin mode for
-concurrent programming. This library allows you to run operations in parallel,
-for example to run a long-running operation in the background without blocking
-the rest of the application. With asyncio, you can easily write concurrent code
-with the ``async`` and ``await`` syntax. See Python's `Developing with asyncio
-<https://docs.python.org/3/library/asyncio-dev.html>`__ documentation for
-useful tips.
-
-The python-oracledb asynchronous API is a part of the standard python-oracledb
-module. All the synchronous methods that require a round-trip to the database
-have corresponding asynchronous counterparts. You can choose whether to use the
-synchronous API or the asynchronous API in your code. It is recommended to
-*not* use both at the same time in your application.
-
-The asynchronous API classes are :ref:`AsyncConnection <asyncconnobj>`,
-:ref:`AsyncConnectionPool <asyncconnpool>`,
-:ref:`AsyncCursor <asynccursorobj>`, and :ref:`AsyncLOB <asynclobobj>`.
-
-Unlike their synchronous counterparts, asynchronous connections and cursors are
-not automatically closed at the end of scope. These asynchronous resources
-should either be explicitly closed, or have been initially created via a
-`context manager
-<https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-``with`` block.
-
-.. note::
-
-    Concurrent programming with asyncio is only supported in
-    python-oracledb Thin mode.
-
-.. _connasync:
-
-Connecting to Oracle Database Asynchronously
---------------------------------------------
-
-With python-oracledb, you can create an asynchronous connection to Oracle
-Database using either :ref:`standalone connections <asyncstandalone>` or
-:ref:`pooled connections <asyncconnpool>`. (For discussion of synchronous
-programming, see :ref:`connhandling`.)
-
-.. _asyncstandalone:
-
-Standalone Connections
-++++++++++++++++++++++
-
-Standalone connections are useful for applications that need only a single
-connection to a database.
-
-An asynchronous standalone connection can be created by calling the
-asynchronous method :meth:`oracledb.connect_async()` which establishes a
-connection to the database and returns an :ref:`AsyncConnection Object
-<asyncconnobj>`. Once connections are created, all objects created by these
-connections follow the asynchronous programming model. Subject to appropriate
-use of ``await`` for calls that require a round-trip to the database,
-asynchronous connections are used in the same way that synchronous programs use
-:ref:`standaloneconnection`.
-
-Asynchronous connections should be released when they are no longer needed to
-ensure Oracle Database gracefully cleans up. A preferred method is to use an
-asynchronous context manager. For example:
-
-.. code-block:: python
-
-    import asyncio
-    import oracledb
-
-    async def main():
-
-        async with oracledb.connect_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb") as connection:
-            with connection.cursor() as cursor:
-                await cursor.execute("select user from dual")
-                async for result in cursor:
-                    print(result)
-
-    asyncio.run(main())
-
-This code ensures that once the block is completed, the connection is closed
-and resources are reclaimed by the database. In addition, any attempt to use
-the variable ``connection`` outside of the block will fail.
-
-If you do not use a context manager, you should explicitly close connections
-when they are no longer needed, for example:
-
-.. code-block:: python
-
-    connection = await oracle.connect_async(user="hr", password=userpwd,
-                                            dsn="localhost/orclpdb")
-
-    cursor = connection.cursor()
-
-    await cursor.execute("select user from dual")
-    async for result in cursor:
-        print(result)
-
-    cursor.close()
-    await connection.close()
-
-Note asynchronous connections are not automatically closed at the end of
-scope. This is different to synchronous connection behavior.
-
-.. _asyncconnpool:
-
-Connection Pools
-++++++++++++++++
-
-Connection pooling allows applications to create and maintain a pool of open
-connections to the database. Connection pooling is important for performance
-and scalability when applications need to handle a large number of users who do
-database work for short periods of time but have relatively long periods when
-the connections are not needed. The high availability features of pools also
-make small pools useful for applications that want a few connections available
-for infrequent use and requires them to be immediately usable when acquired.
-
-An asynchronous connection pool can be created by calling
-:meth:`oracledb.create_pool_async()` which returns an :ref:`AsyncConnectionPool
-Object <asyncconnpoolobj>`. Note that this method is *synchronous* and does not
-use ``await``. Once the pool has been created, your application can get a
-connection from it by calling :meth:`AsyncConnectionPool.acquire()`.  After
-your application has used a connection, it should be released back to the pool
-to make it available for other users. This can be done by explicitly closing
-the connection or by using an asynchronous context manager, for example:
-
-.. code-block:: python
-
-    import asyncio
-    import oracledb
-
-    async def main():
-
-        pool = oracle.create_pool_async(user="hr", password=userpwd,
-                                        dsn="localhost/orclpdb",
-                                        min=1, max=4, increment=1)
-
-        async with pool.acquire() as connection:
-            with connection.cursor() as cursor:
-                await cursor.execute("select user from dual")
-                async for result in cursor:
-                    print(result)
-
-        await pool.close()
-
-    asyncio.run(main())
-
-
-.. _sqlexecuteasync:
-
-Executing SQL Using Asynchronous Methods
-----------------------------------------
-
-This section covers executing SQL using the asynchronous programming model.
-For discussion of synchronous programming, see :ref:`sqlexecution`.
-
-Your application communicates with Oracle Database by executing SQL statements.
-Statements such as queries (statements beginning with SELECT or WITH), Data
-Manipulation Language (DML), and Data Definition Language (DDL) are executed
-using the asynchronous methods :meth:`AsyncCursor.execute()` or
-:meth:`AsyncCursor.executemany()`. Rows can be iterated over, or fetched using
-one of the methods :meth:`AsyncCursor.fetchone()`,
-:meth:`AsyncCursor.fetchone()`, :meth:`AsyncCursor.fetchmany()`, or
-:meth:`AsyncCursor.fetchall()`.  Note that explicitly opened asynchronous
-cursors are not automatically closed at the end of scope. This is different to
-synchronous behavior.  Asynchronous cursors should either be explicitly closed,
-or have been initially created via a `context manager
-<https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-``with`` block.
-
-You can also use shortcut methods on the :ref:`asyncconnobj` object such as
-:meth:`AsyncConnection.execute()` or
-:meth:`AsyncConnection.executemany()`. Rows can be fetched using one of the
-shortcut methods :meth:`AsyncConnection.fetchone()`,
-:meth:`AsyncConnection.fetchmany()`, :meth:`AsyncConnection.fetchall()`,
-:meth:`AsyncConnection.fetch_df_all()`, or
-:meth:`AsyncConnection.fetch_df_batches()`.
-
-An example of using :meth:`AsyncConnection.fetchall()`:
-
-.. code-block:: python
-
-    import asyncio
-    import oracledb
-
-    async def main():
-
-        async with oracledb.connect_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb") as connection:
-            res = await connection.fetchall("select * from locations")
-            print(res)
-
-    asyncio.run(main())
-
-An example that uses asyncio for parallelization and shows the execution of
-multiple coroutines:
-
-.. code-block:: python
-
-    import asyncio
-    import oracledb
-
-    # Number of coroutines to run
-    CONCURRENCY = 5
-
-    # Query the unique session identifier/serial number combination of a connection
-    SQL = """SELECT UNIQUE CURRENT_TIMESTAMP AS CT, sid||'-'||serial# AS SIDSER
-             FROM V$SESSION_CONNECT_INFO
-             WHERE sid = SYS_CONTEXT('USERENV', 'SID')"""
-
-    # Show the unique session identifier/serial number of each connection that the
-    # pool opens
-    async def init_session(connection, requested_tag):
-        res = await connection.fetchone(SQL)
-        print(res[0].strftime("%H:%M:%S.%f"), '- init_session with SID-SERIAL#', res[1])
-
-    # The coroutine simply shows the session identifier/serial number of the
-    # connection returned by the pool.acquire() call
-    async def query(pool):
-        async with pool.acquire() as connection:
-            await connection.callproc("dbms_session.sleep", [1])
-            res = await connection.fetchone(SQL)
-            print(res[0].strftime("%H:%M:%S.%f"), '- query with SID-SERIAL#', res[1])
-
-    async def main():
-
-        pool = oracledb.create_pool_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb",
-                                          min=1, max=CONCURRENCY,
-                                          session_callback=init_session)
-
-        coroutines = [ query(pool) for i in range(CONCURRENCY) ]
-
-        await asyncio.gather(*coroutines)
-
-        await pool.close()
-
-    asyncio.run(main())
-
-When you run this, you will see that multiple connections (identified by the
-unique Session Identifier and Serial Number combination) are opened and are
-used by ``query()``. For example::
-
-    12:09:29.711525 - init_session with SID-SERIAL# 36-38096
-    12:09:29.909769 - init_session with SID-SERIAL# 33-56225
-    12:09:30.085537 - init_session with SID-SERIAL# 14-31431
-    12:09:30.257232 - init_session with SID-SERIAL# 285-40270
-    12:09:30.434538 - init_session with SID-SERIAL# 282-32608
-    12:09:30.730166 - query with SID-SERIAL# 36-38096
-    12:09:30.933957 - query with SID-SERIAL# 33-56225
-    12:09:31.115008 - query with SID-SERIAL# 14-31431
-    12:09:31.283593 - query with SID-SERIAL# 285-40270
-    12:09:31.457474 - query with SID-SERIAL# 282-32608
-
-Your results may vary depending how fast your environment is.
-
-See `async_gather.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/async_gather.py>`__ for a runnable example.
-
-.. _txnasync:
-
-Managing Transactions Using Asynchronous Methods
-------------------------------------------------
-
-This section covers managing transactions using the asynchronous programming
-model. For discussion of synchronous programming, see :ref:`txnmgmnt`.
-
-When :meth:`AsyncCursor.execute()` or :meth:`AsyncCursor.executemany()`
-executes a SQL statement, a transaction is started or continued. By default,
-python-oracledb does not commit this transaction to the database. The methods
-:meth:`AsyncConnection.commit()` and :meth:`AsyncConnection.rollback()`
-methods can be used to explicitly commit or rollback a transaction:
-
-.. code-block:: python
-
-    async def main():
-        async with oracledb.connect_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb") as connection:
-
-            with connection.cursor as cursor:
-                await cursor.execute("INSERT INTO mytab (name) VALUES ('John')")
-                await connection.commit()
-
-When a database connection is closed, such as with
-:meth:`AsyncConnection.close()`, or when variables referencing the connection
-go out of scope, any uncommitted transaction will be rolled back.
-
-An alternative way to commit is to set the attribute
-:attr:`AsyncConnection.autocommit` of the connection to ``True``. This
-ensures all :ref:`DML <dml>` statements (INSERT, UPDATE, and so on) are
-committed as they are executed.
-
-Note that irrespective of the autocommit value, Oracle Database will always
-commit an open transaction when a DDL statement is executed.
-
-When executing multiple DML statements that constitute a single transaction, it
-is recommended to use autocommit mode only for the last DML statement in the
-sequence of operations. Unnecessarily committing causes extra database load,
-and can destroy transactional consistency.
-
-.. _sessionlesstxnasync:
-
-Managing Sessionless Transactions Using Asynchronous Methods
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-When :meth:`AsyncConnection.begin_sessionless_transaction()` is executed using
-a user-chosen or python-oracledb generated transaction identifier, a
-sessionless transaction is started. Once started, all the SQL statements are
-executed as a part of that sessionless transaction. Use
-:meth:`AsyncConnection.suspend_sessionless_transaction()` to explicitly
-suspend an active transaction once the database operations have been executed.
-This releases the connection which can be used by another user while the
-transaction remains open and can be resumed later by a connection using
-:meth:`AsyncConnection.resume_sessionless_transaction()`. The methods
-:meth:`AsyncConnection.commit()` and :meth:`AsyncConnection.rollback()` can be
-used to explicitly commit or roll back a transaction. For example:
-
-.. code-block:: python
-
-    async def main():
-        txn_id = b"new_sessionless_txn"
-        # Begin and suspend a sessionless transaction in a connection
-        async with oracledb.connect_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb") as connection1:
-            await connection1.begin_sessionless_transaction(transaction_id=txn_id, timeout=120)
-            await connection1.execute("INSERT INTO mytab (name) VALUES ('John')")
-            await connection1.suspend_sessionless_transaction()
-
-        # Resume the sessionless transaction in another connection
-        async with oracledb.connect_async(user="hr", password=userpwd,
-                                          dsn="localhost/orclpdb") as connection2:
-            await connection2.resume_sessionless_transaction(transaction_id=txn_id)
-            await connection2.commit()
-
-.. _pipelining:
-
-Pipelining Database Operations
-==============================
-
-Pipelining allows an application to send multiple, independent statements to
-Oracle Database with one call. The database can be kept busy without waiting
-for the application to receive a result set and send the next statement.  While
-the database processes the pipeline of statements, the application can continue
-with non-database work. When the database has executed all the pipelined
-operations, their results are returned to the application.
-
-Pipelined operations are executed sequentially by the database. They do not
-execute concurrently. It is local tasks that can be executed at the same time
-the database is working.
-
-Effective use of Oracle Database Pipelining can increase the responsiveness
-of an application and improve overall system throughput. Pipelining is useful
-when many small operations are being performed in rapid succession. It is most
-beneficial when the network to the database is slow. This is because of its
-reduction in :ref:`round-trips <roundtrips>` compared with those required if
-the equivalent SQL statements were individually executed with calls like
-:meth:`AsyncCursor.execute()`.
-
-Pipelining is only supported in python-oracledb Thin mode with
-:ref:`asyncio <concurrentprogramming>`.
-
-See `Oracle Call Interface Pipelining
-<https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-D131842B-354E-431D-A1B3-26A001289806>`__ for more information
-about Oracle Database Pipelining.
-
-.. note::
-
-    True pipelining only occurs when you are connected to Oracle AI Database
-    26ai, or later.
-
-    When you connect to an older database, operations are sequentially
-    executed by python-oracledb. Each operation concludes before the next is
-    sent to the database. There is no reduction in round-trips and no
-    performance benefit. This usage is only recommended for code portability
-    such as when preparing for a database upgrade.
-
-Using Pipelines
----------------
-
-To create a :ref:`pipeline <pipelineobj>` to process a set of database
-operations, use :meth:`oracledb.create_pipeline()`.
-
-.. code-block:: python
-
-    pipeline = oracledb.create_pipeline()
-
-You can then add various operations to the pipeline using
-:meth:`~Pipeline.add_callfunc()`, :meth:`~Pipeline.add_callproc()`,
-:meth:`~Pipeline.add_commit()`, :meth:`~Pipeline.add_execute()`,
-:meth:`~Pipeline.add_executemany()`, :meth:`~Pipeline.add_fetchall()`,
-:meth:`~Pipeline.add_fetchmany()`, and :meth:`~Pipeline.add_fetchone()`.  For
-example:
-
-.. code-block:: python
-
-    pipeline.add_execute("insert into mytable (mycol) values (1234)")
-    pipeline.add_fetchone("select user from dual")
-    pipeline.add_fetchmany("select employee_id from employees", num_rows=20)
-
-Note that queries that return results do not call ``add_execute()``.
-
-Only one set of query results can be returned from each query operation.  For
-example :meth:`~Pipeline.add_fetchmany()` will only fetch the first set of
-query records, up to the limit specified by the method's ``num_rows``
-parameter. Similarly for :meth:`~Pipeline.add_fetchone()` only the first row
-can ever be fetched. It is not possible to fetch more data from these
-operations. To prevent the database processing rows that cannot be fetched by
-the application, consider adding appropriate ``WHERE`` conditions or using a
-``FETCH NEXT`` clause in the statement, see :ref:`rowlimit`.
-
-Query results or :ref:`OUT binds <bind>` from one operation cannot be passed to
-subsequent operations in the same pipeline.
-
-To execute the pipeline, call :meth:`AsyncConnection.run_pipeline()`.
-
-.. code-block:: python
-
-    results = await connection.run_pipeline(pipeline)
-
-The operations are all sent to the database and executed.  The method returns a
-list of :ref:`PipelineOpResult objects <pipelineopresultobjs>`, one entry per
-operation. The objects contain information about the execution of the relevant
-operation, such as any error number, PL/SQL function return value, or any query
-rows and column metadata.
-
-The :attr:`Connection.call_timeout` value has no effect on pipeline operations.
-To limit the time for a pipeline, use an `asyncio timeout
-<https://docs.python.org/3/library/asyncio-task.html#timeouts>`__, available
-from Python 3.11.
-
-To tune fetching of rows with :meth:`Pipeline.add_fetchall()`, set
-:attr:`oracledb.defaults.arraysize <Defaults.arraysize>` or pass the
-``arraysize`` parameter.
-
-Pipelining Examples
-+++++++++++++++++++
-
-An example of pipelining is:
-
-.. code-block:: python
-
-    import asyncio
-    import oracledb
-
-    async def main():
-        # Create a pipeline and define the operations
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_fetchone("select temperature from weather")
-        pipeline.add_fetchall("select name from friends where active = true")
-        pipeline.add_fetchmany("select story from news order by popularity", num_rows=5)
-
-        connection = await oracle.connect_async(user="hr", password=userpwd,
-                                                dsn="localhost/orclpdb")
-
-        # Run the operations in the pipeline
-        result_1, result_2, result_3 = await connection.run_pipeline(pipeline)
-
-        # Print the database responses
-        print("Current temperature:", result_1.rows)
-        print("Active friends:", result_2.rows)
-        print("Top news stories:", result_3.rows)
-
-        await connection.close()
-
-    asyncio.run(main())
-
-See `pipelining_basic.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/pipelining_basic.py>`__
-for a runnable example.
-
-To allow an application to continue with non-database work before processing
-any responses from the database, use code similar to:
-
-.. code-block:: python
-
-    async def run_thing_one():
-        return "thing_one"
-
-    async def run_thing_two():
-        return "thing_two"
-
-    async def main():
-        connection = await oracle.connect_async(user="hr", password=userpwd,
-                                                dsn="localhost/orclpdb")
-
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_fetchone("select user from dual")
-        pipeline.add_fetchone("select sysdate from dual")
-
-        # Run the pipeline and non-database operations concurrently
-        return_values = await asyncio.gather(
-            run_thing_one(), run_thing_two(), connection.run_pipeline(pipeline)
-        )
-
-        for r in return_values:
-            if isinstance(r, list):  # the pipeline return list
-                for result in r:
-                    if result.rows:
-                        for row in result.rows:
-                            print(*row, sep="\t")
-            else:
-                print(r)             # a local operation result
-
-        await connection.close()
-
-    asyncio.run(main())
-
-Output will be like::
-
-    thing_one
-    thing_two
-    HR
-    2024-10-29 03:34:43
-
-See `pipelining_parallel.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/pipelining_parallel.py>`__
-for a runnable example.
-
-Using OUT Binds with Pipelines
-------------------------------
-
-To fetch :ref:`OUT binds <bind>` from executed statements, create an explicit
-cursor and use :meth:`Cursor.var()`.  These variables are associated with the
-connection and can be used by the other cursors created internally for each
-pipelined operation.  For example:
-
-.. code-block:: python
-
-    cursor = connection.cursor()
-    v1 = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    v2 = cursor.var(oracledb.DB_TYPE_VARCHAR)
-
-    pipeline = oracledb.create_pipeline()
-
-    pipeline.add_execute("""
-        begin
-          :1 := true;
-          :2 := 'Python';
-        end;
-        """, [v1, v2])
-    pipeline.add_fetchone("select 1234 from dual")
-
-    results = await connection.run_pipeline(pipeline)
-
-    for r in results:
-        if r.rows:
-            print(r.rows)
-
-    print(v1.getvalue(), v2.getvalue())
-
-This prints::
-
-    [(1234,)]
-    True Python
-
-OUT binds from one operation cannot be used in subsequent operations.  For
-example the following would print only ``True`` because the WHERE condition of
-the SQL statement is not matched:
-
-.. code-block:: python
-
-    cursor = connection.cursor()
-    v1 = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-
-    pipeline = oracledb.create_pipeline()
-
-    pipeline.add_execute("""
-        begin
-          :1 := TRUE;
-        end;
-        """, [v1])
-    pipeline.add_fetchone("select 1234 from dual where :1 = TRUE", [v1])
-
-    results = await connection.run_pipeline(pipeline)
-
-    for r in results:
-        if r.rows:
-            print(r.rows)
-
-    print(v1.getvalue())  # prints True
-
-Pipeline Error Handling
------------------------
-
-The ``continue_on_error`` parameter to :meth:`AsyncConnection.run_pipeline()`
-determines whether subsequent operations should continue to run after a failure
-in one operation has occurred. When set to the default value False, if any
-error is returned in any operation in the pipeline then the database terminates
-all subsequent operations.
-
-For example:
-
-.. code-block:: python
-
-    # Stop on error
-
-    pipeline.add_fetchall("select 1234 from does_not_exist")
-    pipeline.add_fetchone("select 5678 from dual")
-
-    r1, r2 = await connection.run_pipeline(pipeline)
-
-will only execute the first operation and will throw the failure message::
-
-    oracledb.exceptions.DatabaseError: ORA-00942: table or view "HR"."DOES_NOT_EXIST" does not exist
-    Help: https://docs.oracle.com/error-help/db/ora-00942/
-
-
-whereas this code:
-
-.. code-block:: python
-
-    # Continue on error
-
-    pipeline.add_fetchall("select 1234 from does_not_exist")
-    pipeline.add_fetchone("select 5678 from dual")
-
-    r1, r2 = await connection.run_pipeline(pipeline, continue_on_error=True)
-
-    print(r1.error)
-    print(r2.rows)
-
-will execute all operations and will display::
-
-    ORA-00942: table or view "HR"."DOES_NOT_EXIST" does not exist
-    Help: https://docs.oracle.com/error-help/db/ora-00942/
-    [(5678,)]
-
-.. _pipelinewarning:
-
-**PL/SQL Compilation Warnings**
-
-:ref:`plsqlwarning` can be identified by checking the :ref:`PipelineOpResult
-Attribute <pipelineopresultobjs>` :attr:`PipelineOpResult.warning`.  For
-example:
-
-.. code-block:: python
-
-    pipeline.add_execute(
-        """create or replace procedure myproc as
-           begin
-              bogus;
-           end;"""
-    )
-    (result,) = await connection.run_pipeline(pipeline)
-
-    print(result.warning.full_code)
-    print(result.warning)
-
-will print::
-
-    DPY-7000
-    DPY-7000: creation succeeded with compilation errors
-
-
-See `pipelining_error.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/pipelining_error.py>`__
-for a runnable example showing warnings and errors.
-
-
-Pipeline Cursor Usage
----------------------
-
-For each operation added to a pipeline, with the exception of
-:meth:`Pipeline.add_commit()`, a cursor will be opened when
-:meth:`AsyncConnection.run_pipeline()` is called.  For example, the following
-code will open two cursors:
-
-.. code-block:: python
-
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("insert into t1 (c1) values (1234)")
-    pipeline.add_fetchone("select user from dual")
-
-    await connection.run_pipeline(pipeline)
-
-Make sure your pipeline length does not exceed your cursor limit.  Set the
-database parameter `open_cursors
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-FAFD1247-06E5-4E64-917F-AEBD4703CF40>`__
-appropriately.
-
-Pipeline Round-trips
---------------------
-
-The complete set of operations in a pipeline will be performed in a single
-:ref:`round-trip <roundtrips>` when :meth:`AsyncConnection.run_pipeline()` is
-called, with the following exceptions:
-
-- Queries that contain :ref:`LOBs <asynclobobj>` require an additional
-  round-trip
-- Queries that contain :ref:`DbObject <dbobject>` values may require multiple
-  round-trips
-- Queries with :meth:`~Pipeline.add_fetchall()` may require multiple
-  round-trips
-
-The reduction in round-trips is the significant contributor to pipelining's
-performance improvement in comparison to explicitly executing the equivalent
-SQL statements individually.  With high-speed networks there may be little
-performance benefit to using pipelining, however the database and network
-efficiencies can help overall system scalability.
-
-Note that the traditional method of monitoring round-trips by taking snapshots
-of the V$SESSTAT view is not accurate for pipelines.
diff --git a/doc/src/user_guide/authentication_methods.rst b/doc/src/user_guide/authentication_methods.rst
deleted file mode 100644
index de2eada7..00000000
--- a/doc/src/user_guide/authentication_methods.rst
+++ /dev/null
@@ -1,1583 +0,0 @@
-.. _authenticationmethods:
-
-.. currentmodule:: oracledb
-
-**********************
-Authentication Options
-**********************
-
-Authentication allows only authorized users to access Oracle Database after
-successful verification of their identity. This section details the various
-Oracle Database authentication options supported in python-oracledb.
-
-The Oracle Client libraries used by python-oracledb Thick mode may support
-additional authentication options that are configured independently of the
-driver.
-
-.. _dbauthentication:
-
-Database Authentication
-=======================
-
-Database Authentication is the most basic authentication method that allows
-users to connect to Oracle Database by using a valid database username and
-their associated password. Oracle Database verifies the username and
-password specified in the python-oracledb connection method with the
-information stored in the database. See `Database Authentication of Users
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-1F783131-CD1C-
-4EA0-9300-C132651B0700>`__ for more information.
-
-:ref:`Standalone connections <standaloneconnection>` and
-:ref:`pooled connections <connpooling>` can be created in python-oracledb Thin
-and Thick modes using database authentication. This can be done by specifying
-the database username and the associated password in the ``user`` and
-``password`` parameters of :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()`. An example is:
-
-.. code-block:: python
-
-    import oracledb
-    import getpass
-
-    userpwd = getpass.getpass("Enter password: ")
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-.. _proxyauth:
-
-Proxy Authentication
-====================
-
-Proxy authentication allows a user (the "session user") to connect to Oracle
-Database using the credentials of a "proxy user".  Statements will run as the
-session user.  Proxy authentication is generally used in three-tier
-applications where one user owns the schema while multiple end-users access
-the data. For more information about proxy authentication, see the `Oracle
-documentation <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-D77D0D4A-7483-423A-9767-CBB5854A15CC>`__.
-
-An alternative to using proxy users is to set
-:attr:`Connection.client_identifier` after connecting and use its value in
-statements and in the database, for example for :ref:`monitoring
-<endtoendtracing>`.
-
-The following proxy examples use these schemas. The ``mysessionuser`` schema
-is granted access to use the password of ``myproxyuser``:
-
-.. code-block:: sql
-
-    CREATE USER myproxyuser IDENTIFIED BY myproxyuserpw;
-    GRANT CREATE SESSION TO myproxyuser;
-
-    CREATE USER mysessionuser IDENTIFIED BY itdoesntmatter;
-    GRANT CREATE SESSION TO mysessionuser;
-
-    ALTER USER mysessionuser GRANT CONNECT THROUGH myproxyuser;
-
-After connecting to the database, the following query can be used to show the
-session and proxy users:
-
-.. code-block:: sql
-
-    SELECT SYS_CONTEXT('USERENV', 'PROXY_USER'),
-           SYS_CONTEXT('USERENV', 'SESSION_USER')
-    FROM DUAL;
-
-Standalone connection examples:
-
-.. code-block:: python
-
-    # Basic Authentication without a proxy
-    connection = oracledb.connect(user="myproxyuser", password="myproxyuserpw",
-                                  dsn="dbhost.example.com/orclpdb")
-    # PROXY_USER:   None
-    # SESSION_USER: MYPROXYUSER
-
-    # Basic Authentication with a proxy
-    connection = oracledb.connect(user="myproxyuser[mysessionuser]", password="myproxyuserpw",
-                                  dsn="dbhost.example.com/orclpdb")
-    # PROXY_USER:   MYPROXYUSER
-    # SESSION_USER: MYSESSIONUSER
-
-Pooled connection examples:
-
-.. code-block:: python
-
-    # Basic Authentication without a proxy
-    pool = oracledb.create_pool(user="myproxyuser", password="myproxyuserpw",
-                                dsn="dbhost.example.com/orclpdb")
-    connection = pool.acquire()
-    # PROXY_USER:   None
-    # SESSION_USER: MYPROXYUSER
-
-    # Basic Authentication with proxy
-    pool = oracledb.create_pool(user="myproxyuser[mysessionuser]", password="myproxyuserpw",
-                                dsn="dbhost.example.com/orclpdb",
-                                homogeneous=False)
-
-    connection = pool.acquire()
-    # PROXY_USER:   MYPROXYUSER
-    # SESSION_USER: MYSESSIONUSER
-
-Note the use of a :ref:`heterogeneous <connpooltypes>` pool in the example
-above.  This is required in this scenario.
-
-.. _extauth:
-
-External Authentication
-=======================
-
-Instead of storing the database username and password in Python scripts or
-environment variables, database access can be authenticated by an outside
-system.  External Authentication allows applications to validate user access
-with an external password store (such as an
-:ref:`Oracle Wallet <extauthwithwallet>`), with the
-:ref:`operating system <opsysauth>`, or with an external authentication
-service.
-
-.. note::
-
-    Connecting to Oracle Database using external authentication is only
-    supported in python-oracledb Thick mode. See :ref:`enablingthick`.
-
-.. _extauthwithwallet:
-
-Using an Oracle Wallet for External Authentication
---------------------------------------------------
-
-The following steps give an overview of using an Oracle Wallet.  Wallets should
-be kept securely.  Wallets can be managed with `Oracle Wallet Manager
-<https://www.oracle.com/pls/topic/lookup?ctx=db21&id=GUID-E3E16C82-E174-4814-
-98D5-EADF1BCB3C37>`__.
-
-In this example the wallet is created for the ``myuser`` schema in the
-directory ``/home/oracle/wallet_dir``.  The ``mkstore`` command is available
-from a full Oracle Client or Oracle Database installation.  If you have been
-given wallet by your DBA, skip to step 3.
-
-1.  First create a new wallet as the ``oracle`` user::
-
-        mkstore -wrl "/home/oracle/wallet_dir" -create
-
-    This will prompt for a new password for the wallet.
-
-2.  Create the entry for the database user name and password that are currently
-    hardcoded in your Python scripts.  Use either of the methods shown below.
-    They will prompt for the wallet password that was set in the first step.
-
-    **Method 1 - Using an Easy Connect string**::
-
-        mkstore -wrl "/home/oracle/wallet_dir" -createCredential dbhost.example.com/orclpdb myuser myuserpw
-
-    **Method 2 - Using a connect name identifier**::
-
-        mkstore -wrl "/home/oracle/wallet_dir" -createCredential mynetalias myuser myuserpw
-
-    The alias key ``mynetalias`` immediately following the
-    ``-createCredential`` option will be the connect name to be used in Python
-    scripts.  If your application connects with multiple different database
-    users, you could create a wallet entry with different connect names for
-    each.
-
-    You can see the newly created credential with::
-
-        mkstore -wrl "/home/oracle/wallet_dir" -listCredential
-
-3.  Skip this step if the wallet was created using an Easy Connect String.
-    Otherwise, add an entry in :ref:`tnsnames.ora <optnetfiles>` for the
-    connect name as follows::
-
-        mynetalias =
-            (DESCRIPTION =
-                (ADDRESS = (PROTOCOL = TCP)(HOST = dbhost.example.com)(PORT = 1521))
-                (CONNECT_DATA =
-                    (SERVER = DEDICATED)
-                    (SERVICE_NAME = orclpdb)
-                )
-            )
-
-    The file uses the description for your existing database and sets the
-    connect name alias to ``mynetalias``, which is the identifier used when
-    adding the wallet entry.
-
-4.  Add the following wallet location entry in the :ref:`sqlnet.ora
-    <optnetfiles>` file, using the ``DIRECTORY`` you created the wallet in::
-
-        WALLET_LOCATION =
-            (SOURCE =
-                (METHOD = FILE)
-                (METHOD_DATA =
-                    (DIRECTORY = /home/oracle/wallet_dir)
-                )
-            )
-        SQLNET.WALLET_OVERRIDE = TRUE
-
-    Examine the Oracle documentation for full settings and values.
-
-5.  Ensure the configuration files are in a default location or TNS_ADMIN is
-    set to the directory containing them.  See :ref:`optnetfiles`.
-
-With an Oracle wallet configured, and readable by you, your scripts
-can connect to Oracle Database with:
-
-- Standalone connections by setting the ``externalauth`` parameter to *True*
-  in :meth:`oracledb.connect()`:
-
-  .. code-block:: python
-
-    connection = oracledb.connect(externalauth=True, dsn="mynetalias")
-
-- Or pooled connections by setting the ``externalauth`` parameter to *True*
-  in :meth:`oracledb.create_pool()`.  Additionally in python-oracledb Thick
-  mode, you must set the ``homogeneous`` parameter to *False* as shown below
-  since heterogeneous pools can only be used with external authentication:
-
-  .. code-block:: python
-
-    pool = oracledb.create_pool(externalauth=True, homogeneous=False,
-                                dsn="mynetalias")
-    pool.acquire()
-
-The ``dsn`` used in :meth:`oracledb.connect()` and
-:meth:`oracledb.create_pool()` must match the one used in the wallet.
-
-After connecting, the query::
-
-    SELECT SYS_CONTEXT('USERENV', 'SESSION_USER') FROM DUAL;
-
-will show::
-
-    MYUSER
-
-.. note::
-
-    Wallets are also used to configure Transport Layer Security (TLS) connections.
-    If you are using a wallet like this, you may need a database username and password
-    in :meth:`oracledb.connect()` and :meth:`oracledb.create_pool()` calls.
-
-**External Authentication and Proxy Authentication**
-
-The following examples show external wallet authentication combined with
-:ref:`proxy authentication <proxyauth>`.  These examples use the wallet
-configuration from above, with the addition of a grant to another user::
-
-    ALTER USER mysessionuser GRANT CONNECT THROUGH myuser;
-
-After connection, you can check who the session user is with:
-
-.. code-block:: sql
-
-    SELECT SYS_CONTEXT('USERENV', 'PROXY_USER'),
-           SYS_CONTEXT('USERENV', 'SESSION_USER')
-    FROM DUAL;
-
-Standalone connection example:
-
-.. code-block:: python
-
-    # External Authentication with proxy
-    connection = oracledb.connect(user="[mysessionuser]", dsn="mynetalias")
-    # PROXY_USER:   MYUSER
-    # SESSION_USER: MYSESSIONUSER
-
-You can also set the ``externalauth`` parameter to *True* in standalone
-connections:
-
-.. code-block:: python
-
-    # External Authentication with proxy when externalauth is set to True
-    connection = oracledb.connect(user="[mysessionuser]", dsn="mynetalias",
-                                  externalauth=True)
-    # PROXY_USER:   MYUSER
-    # SESSION_USER: MYSESSIONUSER
-
-A connection pool example is:
-
-.. code-block:: python
-
-    # External Authentication with proxy
-    pool = oracledb.create_pool(externalauth=True, homogeneous=False,
-                                dsn="mynetalias")
-    pool.acquire(user="[mysessionuser]")
-    # PROXY_USER:   MYUSER
-    # SESSION_USER: MYSESSIONUSER
-
-The following usage is not supported:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="[mysessionuser]", externalauth=True,
-                                homogeneous=False, dsn="mynetalias")
-    pool.acquire()
-
-.. _opsysauth:
-
-Operating System Authentication
--------------------------------
-
-With `Operating System <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-37BECE32-58D5-43BF-A098-97936D66968F>`__ authentication, Oracle allows
-user authentication to be performed by the operating system.  The following
-steps give an overview of how to implement OS Authentication on Linux.
-
-1.  Log in to your computer. The commands used in these steps assume the
-    operating system user name is "oracle".
-
-2.  Log in to SQL*Plus as the SYSTEM user and verify the value for the
-    ``OS_AUTHENT_PREFIX`` parameter::
-
-        SQL> SHOW PARAMETER os_authent_prefix
-
-        NAME                                 TYPE        VALUE
-        ------------------------------------ ----------- ------------------------------
-        os_authent_prefix                    string      ops$
-
-3.  Create an Oracle Database user using the ``os_authent_prefix`` determined
-    in step 2, and the operating system user name:
-
-   .. code-block:: sql
-
-        CREATE USER ops$oracle IDENTIFIED EXTERNALLY;
-        GRANT CONNECT, RESOURCE TO ops$oracle;
-
-In Python, connect using the following code:
-
-.. code-block:: python
-
-       connection = oracledb.connect(dsn="mynetalias")
-
-Your session user will be ``OPS$ORACLE``.
-
-If your database is not on the same computer as Python, you can perform testing
-by setting the database configuration parameter ``remote_os_authent=true``.
-Beware of security concerns because this is insecure.
-
-See `Oracle AI Database Security Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-37BECE32-58D5-43BF-A098-97936D66968F>`__ for more information about
-Operating System Authentication.
-
-.. _tokenauth:
-
-Token-Based Authentication
-==========================
-
-Token-Based Authentication allows users to connect to a database by using an
-encrypted authentication token without having to enter a database username and
-password.  The authentication token must be valid and not expired for the
-connection to be successful.  Users already connected will be able to continue
-work after their token has expired but they will not be able to reconnect
-without getting a new token.
-
-The two authentication methods supported by python-oracledb are
-:ref:`Open Authorization (OAuth 2.0) <oauth2>` and :ref:`Oracle
-Cloud Infrastructure (OCI) Identity and Access Management (IAM) <iamauth>`.
-These authentication methods can use Cloud Native Authentication with the
-support of the Azure SDK or OCI SDK to generate access tokens and connect to
-Oracle Database. Alternatively, these methods can use a Python script that
-contains a class to generate access tokens to connect to Oracle Database.
-
-.. _iamauth:
-
-OCI IAM Token-Based Authentication
-----------------------------------
-
-Oracle Cloud Infrastructure (OCI) Identity and Access Management (IAM) provides
-its users with a centralized database authentication and authorization system.
-Using this authentication method, users can use the database access token
-issued by OCI IAM to authenticate to the Oracle Autonomous Database. Both Thin
-and Thick modes of the python-oracledb driver support OCI IAM token-based
-authentication.
-
-When using python-oracledb in Thick mode, Oracle Client libraries 19.14 (or
-later), or 21.5 (or later) are needed.
-
-Standalone connections and pooled connections can be created in python-oracledb
-Thick and Thin modes using OCI IAM token-based authentication. This can be done
-by using a class like the sample :ref:`TokenHandlerIAM class <iamhandler>` or
-by using python-oracledb's :ref:`OCI Cloud Native Authentication Plugin
-(oci_tokens) <cloudnativeauthoci>`. Tokens can be specified using the
-connection parameter introduced in python-oracledb 1.1. Users of earlier
-python-oracledb versions can alternatively use :ref:`OCI IAM Token-Based
-Authentication Connection Strings <iamauthconnstr>`.
-
-OCI IAM Token Generation and Extraction
-+++++++++++++++++++++++++++++++++++++++
-
-Authentication tokens can be generated using python-oracledb's
-:ref:`oci_tokens <ocicloudnativeauthplugin>` plugin.
-
-Alternatively, authentication tokens can be generated through execution of an
-Oracle Cloud Infrastructure command line interface (OCI-CLI) command ::
-
-    oci iam db-token get
-
-On Linux, a folder ``.oci/db-token`` will be created in your home directory.
-It will contain the token and private key files needed by python-oracledb.
-
-.. _iamhandler:
-
-**Example of Generating an IAM Token**
-
-Here, as an example, we are using a Python script to automate the process of
-generating and reading OCI IAM tokens.
-
-.. code:: python
-
-    import os
-
-    import oracledb
-
-    class TokenHandlerIAM:
-
-        def __init__(self,
-                     dir_name="dir_name",
-                     command="oci iam db-token get"):
-            self.dir_name = dir_name
-            self.command = command
-            self.token = None
-            self.private_key = None
-
-        def __call__(self, refresh):
-            if refresh:
-                if os.system(self.command) != 0:
-                    raise Exception("token command failed!")
-            if self.token is None or refresh:
-                self.read_token_info()
-            return (self.token, self.private_key)
-
-        def read_token_info(self):
-            token_file_name = os.path.join(self.dir_name, "token")
-            pkey_file_name = os.path.join(self.dir_name, "oci_db_key.pem")
-            with open(token_file_name) as f:
-                self.token = f.read().strip()
-            with open(pkey_file_name) as f:
-                if oracledb.is_thin_mode():
-                    self.private_key = f.read().strip()
-                else:
-                    lines = [s for s in f.read().strip().split("\n")
-                             if s not in ('-----BEGIN PRIVATE KEY-----',
-                                          '-----END PRIVATE KEY-----')]
-                    self.private_key = "".join(lines)
-
-The TokenHandlerIAM class uses a callable to generate and read OCI IAM tokens.
-When the callable in the TokenHandlerIAM class is invoked for the first time
-to create a standalone connection or pool, the ``refresh`` parameter is
-*False* which allows the callable to return a cached token, if desired. The
-expiry date is then extracted from this token and compared with the current
-date. If the token has not expired, then it will be used directly. If the token
-has expired, the callable is invoked the second time with the ``refresh``
-parameter set to *True*.
-
-The TokenHandlerIAM class defined here is used in the examples shown in
-:ref:`conncreationociiam`.
-
-.. _conncreationociiam:
-
-Connection Creation with OCI IAM Access Tokens
-++++++++++++++++++++++++++++++++++++++++++++++
-
-For OCI IAM Token-Based Authentication with a class such as the sample
-:ref:`TokenHandlerIAM class <iamhandler>`, the ``access_token`` connection
-parameter must be specified. This parameter should be a 2-tuple (or a callable
-that returns a 2-tuple) containing the token and private key. In the examples
-used below, the ``access_token`` parameter is set to a callable.
-
-The examples used in the subsequent sections use the
-:ref:`TokenHandlerIAM class <iamhandler>` to generate OCI IAM tokens to connect
-to Oracle Autonomous Database with mutual TLS (mTLS). See :ref:`autonomousdb`.
-
-**Standalone Connections in Thin Mode Using OCI IAM Tokens**
-
-When using a class such as the :ref:`TokenHandlerIAM class <iamhandler>` to
-generate OCI IAM tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``access_token`` parameter of
-:func:`~oracledb.connect`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. For example:
-
-.. code:: python
-
-    connection = oracledb.connect(
-        access_token=TokenHandlerIAM(),
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp)
-
-**Connection Pools in Thin Mode Using OCI IAM Tokens**
-
-When using a class such as :ref:`TokenHandlerIAM class <iamhandler>` to
-generate OCI IAM tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``access_token`` parameter of
-:func:`~oracledb.create_pool`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. The ``homogeneous``
-parameter must be *True* (its default value). For example:
-
-.. code:: python
-
-    connection = oracledb.create_pool(
-        access_token=TokenHandlerIAM(),
-        homogeneous=True, # must always be True for connection pools
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp
-        min=1, max=5, increment=2)
-
-Note that the ``access_token`` parameter should be set to a callable. This is
-useful when the connection pool needs to expand and create new connections but
-the current token has expired. In such a case, the callable should return a
-string specifying the new, valid access token.
-
-**Standalone Connections in Thick Mode Using OCI IAM Tokens**
-
-When using a class such as :ref:`TokenHandlerIAM class <iamhandler>` to
-generate OCI IAM tokens to connect to Oracle Autonomous Database in Thick mode,
-you need to explicitly set the ``access_token`` and ``externalAuth`` parameters
-of :func:`~oracledb.connect`. For example:
-
-.. code:: python
-
-    connection = oracledb.connect(
-        access_token=TokenHandlerIAM(),
-        externalauth=True, # must always be True in Thick mode
-        dsn=mydb_low)
-
-**Connection Pools in Thick Mode Using OCI IAM Tokens**
-
-When using a class such as :ref:`TokenHandlerIAM class <iamhandler>` to
-generate OCI IAM tokens to connect to Oracle Autonomous Database in Thick mode,
-you need to explicitly set the ``access_token`` and ``externalauth`` parameters
-of :func:`oracledb.create_pool`. The ``homogeneous`` parameter must be *True*
-(its default value). For example:
-
-.. code:: python
-
-    pool = oracledb.create_pool(
-        access_token=TokenHandlerIAM(),
-        externalauth=True, # must always be True in Thick mode
-        homogeneous=True,  # must always be True for connection pools
-        dsn=mydb_low, min=1, max=5, increment=2)
-
-Note that the ``access_token`` parameter should be set to a callable. This is
-useful when the connection pool needs to expand and create new connections but
-the current token has expired. In such a case, the callable should return a
-string specifying the new, valid access token.
-
-.. _iamauthconnstr:
-
-OCI IAM Token-Based Authentication Connection Strings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-The connection string used by python-oracledb can specify the directory where
-the token and private key files are located. This syntax is usable with older
-versions of python-oracledb. However, it is recommended to use connection
-parameters introduced in python-oracledb 1.1 instead. See
-:ref:`OCI IAM Token-Based Authentication<iamauth>`.
-
-.. note::
-
-    OCI IAM Token-Based Authentication Connection Strings is only supported in
-    python-oracledb Thick mode. See :ref:`enablingthick`.
-
-The Oracle Cloud Infrastructure command line interface (OCI-CLI) can be used
-externally to get tokens and private keys from OCI IAM, for example with the
-OCI-CLI ``oci iam db-token get`` command.
-
-The Oracle Net parameter ``TOKEN_AUTH`` must be set when you are using the
-connection string syntax. Also, the ``PROTOCOL`` parameter must be ``tcps``
-and ``SSL_SERVER_DN_MATCH`` should be ``ON``.
-
-You can set ``TOKEN_AUTH=OCI_TOKEN`` in a ``sqlnet.ora`` file.  Alternatively,
-you can specify it in a :ref:`Connect Descriptor <conndescriptor>`, for example
-when using a :ref:`tnsnames.ora <optnetfiles>` file::
-
-    db_alias =
-        (DESCRIPTION =
-            (ADDRESS=(PROTOCOL=TCPS)(PORT=1522)(HOST=xxx.oraclecloud.com))
-            (CONNECT_DATA=(SERVICE_NAME=xxx.adb.oraclecloud.com))
-            (SECURITY =
-                (SSL_SERVER_CERT_DN="CN=xxx.oraclecloud.com, \
-                 O=Oracle Corporation,L=Redwood City,ST=California,C=US")
-                (TOKEN_AUTH=OCI_TOKEN)
-            )
-        )
-
-The default location for the token and private key is the same default location
-that the OCI-CLI tool writes to. For example ``~/.oci/db-token/`` on Linux.
-
-If the token and private key files are not in the default location then their
-directory must be specified with the ``TOKEN_LOCATION`` parameter in a
-:ref:`sqlnet.ora <optnetfiles>` file or in a :ref:`Connect Descriptor
-<conndescriptor>`, for example when using a :ref:`tnsnames.ora <optnetfiles>`
-file::
-
-    db_alias =
-        (DESCRIPTION =
-            (ADDRESS=(PROTOCOL=TCPS)(PORT=1522)(HOST=xxx.oraclecloud.com))
-            (CONNECT_DATA=(SERVICE_NAME=xxx.adb.oraclecloud.com))
-            (SECURITY =
-                (SSL_SERVER_CERT_DN="CN=xxx.oraclecloud.com, \
-                 O=Oracle Corporation,L=Redwood City,ST=California,C=US")
-                (TOKEN_AUTH=OCI_TOKEN)
-                (TOKEN_LOCATION="/path/to/token/folder")
-            )
-        )
-
-The ``TOKEN_AUTH`` and ``TOKEN_LOCATION`` values in a connection string take
-precedence over the ``sqlnet.ora`` settings.
-
-Standalone connection example:
-
-.. code-block:: python
-
-    connection = oracledb.connect(dsn=db_alias, externalauth=True)
-
-Connection pool example:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(dsn=db_alias, externalauth=True,
-                                homogeneous=False, min=1, max=2, increment=1)
-
-    connection = pool.acquire()
-
-.. _cloudnativeauthoci:
-
-OCI Cloud Native Authentication with the oci_tokens Plugin
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-With Cloud Native Authentication, python-oracledb's :ref:`oci_tokens
-<ocicloudnativeauthplugin>` plugin can automatically generate and refresh OCI
-IAM tokens when required with the support of the `Oracle Cloud Infrastructure
-(OCI) Software Development Kit (SDK)
-<https://docs.oracle.com/en-us/iaas/tools/python/latest/index.html>`__.
-
-The :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin can be imported
-like:
-
-.. code-block:: python
-
-    import oracledb.plugins.oci_tokens
-
-The plugin has a Python package dependency which needs to be installed
-separately before the plugin can be used, see :ref:`ocitokenmodules`.
-
-The ``oci_tokens`` plugin defines and registers a :ref:`parameter hook
-<registerparamshook>` function which uses the connection parameter
-``extra_auth_params`` passed to :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()`. Using this parameter's values, the hook
-function sets the ``access_token`` parameter of a :ref:`ConnectParams object
-<connparam>` to a callable which generates an OCI IAM token. Python-oracledb
-then acquires and uses a token to transparently complete connection or pool
-creation calls.
-
-For OCI Cloud Native Authentication connection and pool creation, the
-``extra_auth_params`` parameter should be a dictionary with keys as shown in
-the following table.
-
-.. list-table-with-summary:: OCI Cloud Native Authentication Configuration Keys
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 10 25 15
-    :name: _oci_configuration_parameters
-    :summary: The first column displays the name of the dictionary key. The second column displays its description. The third column displays whether the attribute is required or optional.
-
-    * - Key
-      - Description
-      - Required or Optional
-    * - ``auth_type``
-      - The authentication type. The value should be the string "ConfigFileAuthentication", "InstancePrincipal", "SecurityToken", "SecurityTokenSimple" or "SimpleAuthentication".
-
-        With Configuration File Authentication, the location of a configuration file containing the necessary information must be provided. By default, this file is located at */home/username/.oci/config*, unless a custom location is specified during OCI IAM setup.
-
-        With Instance Principal Authentication, OCI compute instances can be authorized to access services on Oracle Cloud such as Oracle Autonomous Database. Python-oracledb applications running on such a compute instance are automatically authenticated, eliminating the need to provide database user credentials. This authentication method will only work on compute instances where internal network endpoints are reachable. See :ref:`instanceprincipalauth`.
-
-        With Security Token authentication or Session Token-based authentication, the authentication happens using *security_token_file* parameter present in the configuration file. By default, this file is located at */home/username/.oci/config*, unless a custom location is specified during OCI IAM setup. You also need to specify the *profile* which contains the *security_token_file* parameter.
-
-        With Security Token Simple authentication or Session Token-based Simple authentication, the authentication happens using *security_token_file* parameter. The individual configuration parameters can be provided at runtime.
-
-        With Simple Authentication, the individual configuration parameters can be provided at runtime.
-
-        See `OCI SDK Authentication Methods <https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_authentication_methods.htm>`__ for more information.
-      - Required
-    * - ``user``
-      - The Oracle Cloud Identifier (OCID) of the user invoking the API. For example, *ocid1.user.oc1..<unique_ID>*.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication". This is not required when ``auth_type`` is "SecurityToken" or "SecurityTokenSimple"
-      - Required
-    * - ``key_file``
-      - The full path and filename of the private key.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication".
-      - Required
-    * - ``fingerprint``
-      - The fingerprint associated with the public key that has been added to this user.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication".
-      - Required
-    * - ``tenancy``
-      - The OCID of your tenancy. For example, *ocid1.tenancy.oc1..<unique_ID>*.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication".
-      - Required
-    * - ``region``
-      - The Oracle Cloud Infrastructure region. For example, *ap-mumbai-1*.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication".
-      - Required
-    * - ``profile``
-      - The configuration profile name to load.
-
-        Multiple profiles can be created, each with distinct values for necessary parameters. If not specified, the DEFAULT profile is used.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication" or "ConfigFileAuthentication". If it is not specified when using "ConfigFileAuthentication", the default value is taken.
-      - Required
-    * - ``file_location``
-      - The configuration file location. The default value is *~/.oci/config*.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "ConfigFileAuthentication".
-      - Optional
-    * - ``scope``
-      - This parameter identifies all databases in the cloud tenancy of the authenticated user. The default value is *urn:oracle:db::id::**.
-
-        A scope that authorizes access to all databases within a compartment has the format *urn:oracle:db::id::<compartment-ocid>*, for example, urn:oracle:db::id::ocid1.compartment.oc1..xxxxxxxx.
-
-        A scope that authorizes access to a single database within a compartment has the format *urn:oracle:db::id::<compartment-ocid>::<database-ocid>*, for example, urn:oracle:db::id::ocid1.compartment.oc1..xxxxxx::ocid1.autonomousdatabase.oc1.phx.xxxxxx.
-
-        This parameter can be specified when the value of the ``auth_type`` key is "SimpleAuthentication", "ConfigFileAuthentication", or "InstancePrincipal".
-      - Optional
-
-All keys and values other than ``auth_type`` are used by the `OCI SDK
-<https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm>`__ API
-calls in the plugin.  The plugin implementation can be seen in
-`plugins/oci_tokens.py
-<https://github.com/oracle/python-oracledb/blob/main/src/oracledb/plugins/oci_tokens.py>`__.
-
-For information on the OCI specific configuration parameters, see `OCI SDK
-<https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm>`__.
-
-The examples in the subsequent sections use the :ref:`oci_tokens
-<ocicloudnativeauthplugin>` plugin to generate OCI IAM tokens to connect to
-Oracle Autonomous Database with mutual TLS (mTLS). See :ref:`autonomousdb`.
-
-**Standalone Connections in Thin Mode Using OCI IAM Tokens**
-
-When using the :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin to generate
-OCI IAM tokens to connect to Oracle Autonomous Database in Thin mode, you need
-to explicitly set the ``extra_auth_params`` parameter of
-:func:`~oracledb.connect`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. For example:
-
-.. code:: python
-
-    import oracledb.plugins.oci_tokens
-
-    token_based_auth = {                             # OCI specific configuration
-        "auth_type": "ConfigFileAuthentication",     # parameters to be set when using
-        "profile": <profile>,                        # the oci_tokens plugin with
-        "file_location": <filelocation>,             # configuration file authentication
-    }
-
-    connection = oracledb.connect(
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp,
-        extra_auth_params=token_based_auth)
-
-**Connection Pools in Thin Mode Using OCI IAM Tokens**
-
-When using the :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin to generate
-OCI IAM tokens to connect to Oracle Autonomous Database in Thin mode, you need
-to explicitly set the ``extra_auth_params`` parameter of
-:func:`~oracledb.create_pool`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. The ``homogeneous``
-parameter must be *True* (its default value). For example:
-
-.. code:: python
-
-    import oracledb.plugins.oci_tokens
-
-    token_based_auth = {
-        "auth_type": "SimpleAuthentication", # OCI specific configuration
-        "user": <user>,                      # parameters to be set when using
-        "key_file": <key_file>,              # the oci_tokens plugin with
-        "fingerprint": <fingerprint>,        # simple authentication
-        "tenancy": <tenancy>,
-        "region": <region>,
-        "profile": <profile>
-    }
-
-    connection = oracledb.create_pool(
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        homogeneous=true,           # must always be True for connection pools
-        wallet_location="location_of_pem_file",
-        wallet_password=wp,
-        extra_auth_params=token_based_auth)
-
-**Standalone Connections in Thick Mode Using OCI IAM Tokens**
-
-When using the :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin to generate
-OCI IAM tokens to connect to Oracle Autonomous Database in Thick mode, you need
-to explicitly set the ``externalauth`` and ``extra_auth_params`` parameters of
-:func:`oracledb.connect`. For example:
-
-.. code:: python
-
-    import oracledb.plugins.oci_tokens
-
-    token_based_auth = {
-        "auth_type": "SimpleAuthentication", # OCI specific configuration
-        "user": <user>,                      # parameters to be set when using
-        "key_file": <key_file>,              # the oci_tokens plugin with
-        "fingerprint": <fingerprint>,        # simple authentication
-        "tenancy": <tenancy>,
-        "region": <region>,
-        "profile": <profile>
-    }
-    connection = oracledb.connect(
-        externalauth=True,
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth)
-
-**Connection Pools in Thick Mode Using OCI IAM Tokens**
-
-When using the :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin to generate
-OCI IAM tokens to connect to Oracle Autonomous Database in Thick mode, you need
-to explicitly set the ``extra_auth_params`` and ``externalauth`` parameters of
-:func:`~oracledb.create_pool`. The ``homogeneous`` parameter must be *True*
-(its default value). For example:
-
-.. code:: python
-
-    import oracledb.plugins.oci_tokens
-
-    token_based_auth = {                             # OCI specific configuration
-        "auth_type": "ConfigFileAuthentication",     # parameters to be set when using
-        "profile": <profile>,                        # the oci_tokens plugin with
-        "file_location": <filelocation>,             # configuration file authentication
-    }
-
-    connection = oracledb.create_pool(
-        externalauth=True, # must always be True in Thick mode
-        homogeneous=True,  # must always be True for connection pools
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth)
-
-.. _oauth2:
-
-OAuth 2.0 Token-Based Authentication
-------------------------------------
-
-Oracle Cloud Infrastructure (OCI) users can be centrally managed in a Microsoft
-Entra ID (formerly Microsoft Azure Active Directory) service. Open
-Authorization (OAuth 2.0) token-based authentication allows users to
-authenticate to Oracle Database using Entra ID OAuth2 tokens. Ensure that
-you have a Microsoft Azure account and your Oracle Database is registered
-with Microsoft Entra ID. See `Configuring the Oracle Database for Microsoft
-Entra ID Integration <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-0A60F22D-56A3-408D-8EC8-852C38C159C0>`_ for more information. Both Thin
-and Thick modes of the python-oracledb driver support OAuth 2.0 token-based
-authentication.
-
-When using python-oracledb in Thick mode, Oracle Client libraries 19.15 (or
-later), or 21.7 (or later) are needed.
-
-Standalone connections and pooled connections can be created in python-oracledb
-Thick and Thin modes using OAuth 2.0 token-based authentication. This can be
-done or by using a class such as the example :ref:`TokenHandlerOAuth Class
-<oauthhandler>` or by using python-oracledb's :ref:`Azure Cloud Native
-Authentication Plugin (azure_tokens) <cloudnativeauthoauth>`. Tokens can be
-specified using the connection parameter introduced in python-oracledb 1.1.
-Users of earlier python-oracledb versions can alternatively use :ref:`OAuth 2.0
-Token-Based Authentication Connection Strings <oauth2connstr>`.
-
-OAuth2 Token Generation And Extraction
-++++++++++++++++++++++++++++++++++++++
-
-There are different ways to retrieve Entra ID OAuth2 tokens. You can use
-python-oracledb's :ref:`azure_tokens <cloudnativeauthoauth>` plugin to generate
-tokens. Some of the other ways to retrieve OAuth2 tokens are detailed in
-`Examples of Retrieving Entra ID OAuth2 Tokens <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-3128BDA4-A233-48D8-A2B1-C8380DBDBDCF>`_. You
-can also retrieve Entra ID OAuth2 tokens by using `Azure Identity client
-library for Python <https://docs.microsoft.com/en-us/python/api/overview/azure/
-identity-readme?view=azure-python>`_.
-
-.. _oauthhandler:
-
-**Example of Generating an OAuth2 Token**
-
-An example of automating the process of generating and reading Entra ID OAuth2
-tokens is:
-
-.. code:: python
-
-    import json
-    import os
-
-    import oracledb
-    import requests
-
-    class TokenHandlerOAuth:
-
-        def __init__(self,
-                     file_name="cached_token_file_name",
-                     api_key="api_key",
-                     client_id="client_id",
-                     client_secret="client_secret"):
-            self.token = None
-            self.file_name = file_name
-            self.url = \
-                f"https://login.microsoftonline.com/{api_key}/oauth2/v2.0/token"
-            self.scope = \
-                f"https://oracledevelopment.onmicrosoft.com/{client_id}/.default"
-            if os.path.exists(file_name):
-                with open(file_name) as f:
-                    self.token = f.read().strip()
-            self.api_key = api_key
-            self.client_id = client_id
-            self.client_secret = client_secret
-
-        def __call__(self, refresh):
-            if self.token is None or refresh:
-                post_data = dict(client_id=self.client_id,
-                                 grant_type="client_credentials",
-                                 scope=self.scope,
-                                 client_secret=self.client_secret)
-                r = requests.post(url=self.url, data=post_data)
-                result = json.loads(r.text)
-                self.token = result["access_token"]
-                with open(self.file_name, "w") as f:
-                    f.write(self.token)
-            return self.token
-
-The TokenHandlerOAuth class uses a callable to generate and read OAuth2
-tokens. When the callable in the TokenHandlerOAuth class is invoked for the
-first time to create a standalone connection or pool, the ``refresh`` parameter
-is *False* which allows the callable to return a cached token, if desired. The
-expiry date is then extracted from this token and compared with the current
-date. If the token has not expired, then it will be used directly. If the token
-has expired, the callable is invoked the second time with the ``refresh``
-parameter set to *True*.
-
-The TokenHandlerOAuth class defined here is used in the examples shown in
-:ref:`conncreationoauth2`.
-
-**Example of Using a Curl Command**
-
-See using a :ref:`curl <curl>` command for an alternative way to generate the
-tokens.
-
-.. _conncreationoauth2:
-
-Connection Creation with OAuth2 Access Tokens
-+++++++++++++++++++++++++++++++++++++++++++++
-
-For OAuth 2.0 Token-Based Authentication using a class such as the sample
-:ref:`TokenHandlerOAuth class <oauthhandler>`, the ``access_token`` connection
-parameter must be specified. This parameter should be a string (or a callable
-that returns a string) specifying an Entra ID OAuth2 token. In the examples
-used below, the ``access_token`` parameter is set to a callable.
-
-The examples used in the subsequent sections use the
-:ref:`TokenHandlerOAuth class <oauthhandler>` to generate OAuth2 tokens to
-connect to Oracle Autonomous Database with mutual TLS (mTLS). See
-:ref:`autonomousdb`.
-
-**Standalone Connections in Thin Mode Using OAuth2 Tokens**
-
-When using a class such as the :ref:`TokenHandlerOAuth class <oauthhandler>` to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``access_token``, and also any desired
-``config_dir``, ``wallet_location``, and ``wallet_password`` parameters of
-:func:`~oracledb.connect`. For example:
-
-.. code:: python
-
-    connection = oracledb.connect(
-        access_token=TokenHandlerOAuth(),
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp)
-
-**Connection Pools in Thin Mode Using OAuth2 Tokens**
-
-When using a class such as the :ref:`TokenHandlerOAuth class <oauthhandler>` to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``access_token`` parameter of
-:func:`~oracledb.create_pool`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. The ``homogeneous``
-parameter must be *True* (its default value). For example:
-
-.. code:: python
-
-    connection = oracledb.create_pool(
-        access_token=TokenHandlerOAuth(),
-        homogeneous=True, # must always be True for connection pools
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp
-        min=1, max=5, increment=2)
-
-Note that the ``access_token`` parameter should be set to a callable. This is
-useful when the connection pool needs to expand and create new connections but
-the current token has expired. In such a case, the callable should return a
-string specifying the new, valid Entra ID OAuth2 token.
-
-**Standalone Connections Thick Mode Using OAuth2 Tokens**
-
-When using a class such as the :ref:`TokenHandlerOAuth class <oauthhandler>`
-to generate OAuth2 tokens to connect to Oracle Autonomous Database in Thick
-mode, you need to explicitly set the ``access_token`` and ``externalAuth``
-parameters of :func:`~oracledb.connect`. For example:
-
-.. code:: python
-
-    connection = oracledb.connect(
-        access_token=TokenHandlerOAuth(),
-        externalauth=True, # must always be True in Thick mode
-        dsn=mydb_low)
-
-**Connection Pools in Thick Mode Using OAuth2 Tokens**
-
-When using a class such as the :ref:`TokenHandlerOAuth class <oauthhandler>` to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thick mode,
-you need to explicitly set the ``access_token`` and ``externalauth`` parameters
-of :func:`~oracledb.create_pool`. The ``homogeneous`` parameter must be *True*
-(which is its default value). For example:
-
-.. code:: python
-
-    pool = oracledb.create_pool(
-        access_token=TokenHandlerOAuth(),
-        externalauth=True, # must always be True in Thick mode
-        homogeneous=True,  # must always be True for connection pools
-        dsn=mydb_low, min=1, max=5, increment=2)
-
-Note that the ``access_token`` parameter should be set to a callable. This is
-useful when the connection pool needs to expand and create new connections but
-the current token has expired. In such a case, the callable should return a
-string specifying the new, valid Entra ID OAuth2 token.
-
-.. _oauth2connstr:
-
-OAuth 2.0 Token-Based Authentication Connection Strings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-The connection string used by python-oracledb can specify the directory where
-the token file is located. This syntax is usable with older versions of
-python-oracledb. However, it is recommended to use connection parameters
-introduced in python-oracledb 1.1 instead. See
-:ref:`OAuth 2.0 Token-Based Authentication<oauth2>`.
-
-.. note::
-
-    OAuth 2.0 Token-Based Authentication Connection Strings is only supported
-    in python-oracledb Thick mode. See :ref:`enablingthick`.
-
-There are different ways to retrieve Entra ID OAuth2 tokens. Some of the ways to
-retrieve OAuth2 tokens are detailed in `Examples of Retrieving Entra ID OAuth2
-Tokens <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-3128BDA4-A233-48D8-A2B1-C8380DBDBDCF>`_. You can also retrieve Entra ID OAuth2
-tokens by using `Azure Identity client library for Python
-<https://docs.microsoft.com/en-us/python/api/overview/azure/identity-readme?view=
-azure-python>`_.
-
-.. _curl:
-
-**Example of Using a Curl Command**
-
-Here, as an example, we are using Curl with a Resource Owner
-Password Credential (ROPC) Flow, that is, a ``curl`` command is used against
-the Entra ID API to get the Entra ID OAuth2 token::
-
-    curl -X POST -H 'Content-Type: application/x-www-form-urlencoded'
-    https://login.microsoftonline.com/your_tenant_id/oauth2/v2.0/token
-    -d 'client_id=your_client_id'
-    -d 'grant_type=client_credentials'
-    -d 'scope=https://oracledevelopment.onmicrosoft.com/your_client_id/.default'
-    -d 'client_secret=your_client_secret'
-
-This command generates a JSON response with token type, expiration, and access
-token values. The JSON response needs to be parsed so that only the access
-token is written and stored in a file. You can save the value of
-``access_token`` generated to a file and set ``TOKEN_LOCATION`` to the location
-of token file. See :ref:`TokenHandlerOAuth class <oauthhandler>` for an example
-of generating tokens.
-
-The Oracle Net parameters ``TOKEN_AUTH`` and ``TOKEN_LOCATION`` must be set when
-you are using the connection string syntax. Also, the ``PROTOCOL``
-parameter must be ``tcps`` and ``SSL_SERVER_DN_MATCH`` should be ``ON``.
-
-You can set ``TOKEN_AUTH=OAUTH``. There is no default location set in this
-case, so you must set ``TOKEN_LOCATION`` to either of the following:
-
-*  A directory, in which case, you must create a file named ``token`` which
-   contains the token value
-*  A fully qualified file name, in which case, you must specify the entire path
-   of the file which contains the token value
-
-You can either set ``TOKEN_AUTH`` and ``TOKEN_LOCATION`` in a :ref:`sqlnet.ora
-<optnetfiles>` file or alternatively, you can specify it inside a :ref:`Connect
-Descriptor <conndescriptor>`, for example when using a :ref:`tnsnames.ora
-<optnetfiles>` file::
-
-    db_alias =
-        (DESCRIPTION =
-            (ADDRESS=(PROTOCOL=TCPS)(PORT=1522)(HOST=xxx.oraclecloud.com))
-            (CONNECT_DATA=(SERVICE_NAME=xxx.adb.oraclecloud.com))
-            (SECURITY =
-                (SSL_SERVER_CERT_DN="CN=xxx.oraclecloud.com, \
-                 O=Oracle Corporation,L=Redwood City,ST=California,C=US")
-                (TOKEN_AUTH=OAUTH)
-                (TOKEN_LOCATION="/home/user1/mytokens/oauthtoken")
-            )
-        )
-
-The ``TOKEN_AUTH`` and ``TOKEN_LOCATION`` values in a connection string take
-precedence over the ``sqlnet.ora`` settings.
-
-Standalone connection example:
-
-.. code-block:: python
-
-    connection = oracledb.connect(dsn=db_alias, externalauth=True)
-
-Connection pool example:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(dsn=db_alias, externalauth=True,
-                                homogeneous=False, min=1, max=2, increment=1)
-
-    connection = pool.acquire()
-
-.. _cloudnativeauthoauth:
-
-Azure Cloud Native Authentication with the azure_tokens Plugin
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-With Cloud Native Authentication, python-oracledb's :ref:`azure_tokens
-<azurecloudnativeauthplugin>` plugin can automatically generate and refresh
-OAuth2 tokens when required with the support of the `Microsoft Authentication
-Library (MSAL) <https://learn.microsoft.com/en-us/
-entra/msal/python/?view=msal-py-latest>`__.
-
-The :ref:`azure_tokens <azurecloudnativeauthplugin>` plugin can be imported
-like:
-
-.. code-block:: python
-
-    import oracledb.plugins.azure_tokens
-
-The plugin has a Python package dependency which needs to be installed
-separately before the plugin can be used, see :ref:`azuretokenmodules`.
-
-The ``azure_tokens`` plugin defines and registers a :ref:`parameter hook
-<registerparamshook>` function which uses the connection parameter
-``extra_auth_params`` passed to :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()`. Using this parameter's values, the hook
-function sets the ``access_token`` parameter of a :ref:`ConnectParams object
-<connparam>` to a callable which generates an OAuth2 token. Python-oracledb
-then acquires and uses a token to transparently complete connection or pool
-creation calls.
-
-For OAuth 2.0 Token-Based Authentication connection and pool creation, the
-``extra_auth_params`` parameter should be a dictionary with keys as shown in
-the following table.
-
-.. list-table-with-summary:: Azure Cloud Native Authentication Configuration Keys
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 10 30 10
-    :name: _azure_configuration_parameters
-    :summary: The first column displays the dictionary key. The second column displays the description of the key. The third column displays whether the parameter is required or optional.
-
-    * - Key
-      - Description
-      - Required or Optional
-    * - ``auth_type``
-      - The authentication type.
-
-        This must be the string "AzureServicePrincipal". This type makes the plugin acquire Azure service principal access tokens through a client credential flow.
-      - Required
-    * - ``authority``
-      - This parameter must be set as a string in the URI format with the tenant ID, for example ``https://{identity provider instance}/{tenantId}``.
-
-        The tenantId is the directory tenant against which the application operates, in either GUID or domain-name format.
-      - Required
-    * - ``client_id``
-      - The application ID that is assigned to your application.
-
-        This information can be found in the portal where the application was registered.
-      - Required
-    * - ``client_credential``
-      - The client secret that was generated for your application in the application registration portal.
-      - Required
-    * - ``scopes``
-      - This parameter represents the value of the scope for the request.
-
-        It should be the resource identifier (application ID URI) of the desired resource, with the suffix ".default". For example, ``https://{uri}/clientID/.default``.
-      - Required
-
-All keys and values other than ``auth_type`` are used by the `Microsoft
-Authentication Library (MSAL) <https://learn.microsoft.com/en-us/
-entra/msal/python/?view=msal-py-latest>`__ API calls in the plugin.  The plugin
-implementation can be seen in `plugins/azure_tokens.py
-<https://github.com/oracle/python-oracledb/blob/main/src/oracledb/plugins/azure_tokens.py>`__.
-
-For information on the Azure specific configuration parameters, see `MSAL
-<https://learn.microsoft.com/en-us/entra/identity-platform/v2-oauth2-client
--creds-grant-flow>`__.
-
-The examples in the subsequent sections use the :ref:`azure_tokens
-<azurecloudnativeauthplugin>` plugin to generate OAuth2 tokens to connect to
-Oracle Autonomous Database with mutual TLS (mTLS). See :ref:`autonomousdb`.
-
-**Standalone Connections in Thin Mode Using OAuth2 Tokens**
-
-When using the :ref:`azure_tokens <azurecloudnativeauthplugin>` plugin to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``extra_auth_params`` parameter, and also any
-required ``config_dir``, ``wallet_location``, and ``wallet_password``
-parameters of :func:`~oracledb.connect`. For example:
-
-.. code:: python
-
-    import oracledb.plugins.azure_tokens
-
-    token_based_auth = {
-        "auth_type": "AzureServicePrincipal", # Azure specific configuration
-        "authority": <authority>,             # parameters to be set when using
-        "client_id": <client_id>,             # the azure_tokens plugin
-        "client_credential": <client_credential>,
-        "scopes": <scopes>
-    }
-
-    connection = oracledb.connect(
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        wallet_location="location_of_pem_file",
-        wallet_password=wp,
-        extra_auth_params=token_based_auth)
-
-**Connection Pools in Thin Mode Using OAuth2 Tokens**
-
-When using the :ref:`azure_tokens <azurecloudnativeauthplugin>` plugin to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thin mode,
-you need to explicitly set the ``extra_auth_params`` parameter of
-:func:`~oracledb.create_pool`, and also any desired ``config_dir``,
-``wallet_location``, and ``wallet_password`` parameters. The ``homogeneous``
-parameter must be *True* (its default value). For example:
-
-.. code:: python
-
-    import oracledb.plugins.azure_tokens
-
-    token_based_auth = {
-        "auth_type": "AzureServicePrincipal", # Azure specific configuration
-        "authority": <authority>,             # parameters to be set when using
-        "client_id": <client_id>,             # the azure_tokens plugin
-        "client_credential": <client_credential>,
-        "scopes": <scopes>
-    }
-
-    connection = oracledb.create_pool(
-        dsn=mydb_low,
-        config_dir="path_to_unzipped_wallet",
-        homogeneous=true,          # must always be True for connection pools
-        wallet_location="location_of_pem_file",
-        wallet_password=wp,
-        extra_auth_params=token_based_auth)
-
-**Standalone Connections Thick Mode Using OAuth2 Tokens**
-
-When using the :ref:`azure_tokens <azurecloudnativeauthplugin>` plugin to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thick mode,
-you need to explicitly set the ``extra_auth_params`` and ``externalauth``
-parameters of :func:`~oracledb.connect`. For example:
-
-.. code:: python
-
-    import oracledb.plugins.azure_tokens
-
-    token_based_auth = {
-        "auth_type": "AzureServicePrincipal", # Azure specific configuration
-        "authority": <authority>,             # parameters to be set when using
-        "client_id": <client_id>,             # the azure_tokens plugin
-        "client_credential": <client_credential>,
-        "scopes": <scopes>
-    }
-
-    connection = oracledb.connect(
-        externalauth=True,  # must always be True in Thick mode
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth)
-
-**Connection Pools in Thick Mode Using OAuth2 Tokens**
-
-When using the :ref:`azure_tokens <azurecloudnativeauthplugin>` plugin to
-generate OAuth2 tokens to connect to Oracle Autonomous Database in Thick mode,
-you need to explicitly set the ``extra_auth_params`` and ``externalauth``
-parameters of :func:`~oracledb.create_pool`. The ``homogeneous`` parameter must
-be *True* (its default value). For example:
-
-.. code:: python
-
-    import oracledb.plugins.azure_tokens
-
-    token_based_auth = {
-        "auth_type": "AzureServicePrincipal", # Azure specific configuration
-        "authority": <authority>,             # parameters to be set when using
-        "client_id": <client_id>,             # the azure_tokens plugin
-        "client_credential": <client_credential>,
-        "scopes": <scopes>
-    }
-
-    connection = oracledb.create_pool(
-        externalauth=True, # must always be True in Thick mode
-        homogeneous=True,  # must always be True for connection pools
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth)
-
-.. _instanceprincipalauth:
-
-Instance Principal Authentication
-=================================
-
-With Instance Principal Authentication, Oracle Cloud Infrastructure (OCI)
-compute instances can be authorized to access services on Oracle Cloud such as
-Oracle Autonomous Database. Python-oracledb applications running on such a
-compute instance do not need to provide database user credentials.
-
-Each compute instance behaves as a distinct type of Identity and Access
-Management (IAM) Principal, that is, each compute instance has a unique
-identity in the form of a digital certificate which is managed by OCI. When
-using Instance Principal Authentication, a compute instance authenticates with
-OCI IAM using this identity and obtains a short-lived token. This token is
-then used to access Oracle Cloud services without storing or managing any
-secrets in your application.
-
-The example below demonstrates how to connect to Oracle Autonomous
-Database using Instance Principal authentication. To enable this, use
-python-oracledb's :ref:`oci_tokens <ocicloudnativeauthplugin>` plugin which
-is pre-installed with the ``oracledb`` module.
-
-**Step 1: Create an OCI Compute Instance**
-
-An `OCI compute instance <https://docs.oracle.com/en-us/iaas/compute-cloud-at-
-customer/topics/compute/compute-instances.htm>`__ is a virtual machine running
-within OCI that provides compute resources for your application. This compute
-instance will be used to authenticate access to Oracle Cloud services when
-using Instance Principal Authentication.
-
-To create an OCI compute instance, see the steps in `Creating an Instance
-<https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/
-launchinginstance.htm>`__ section of the Oracle Cloud Infrastructure
-documentation.
-
-For more information on OCI compute instances, see `Calling Services from a
-Compute Instance <https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/
-callingservicesfrominstances.htm>`__.
-
-**Step 2: Install the OCI CLI on your compute instance**
-
-The `OCI Command Line Interface (CLI) <https://docs.oracle.com/en-us/iaas/
-Content/API/Concepts/cliconcepts.htm>`__ that can be used on its own or with
-the Oracle Cloud console to complete OCI tasks.
-
-To install the OCI CLI on your compute instance, see the installation
-instructions in the `Installing the CLI <https://docs.oracle.com/en-us/iaas/
-Content/API/SDKDocs/cliinstall.htm>`__ section of Oracle Cloud Infrastructure
-documentation.
-
-**Step 3: Create a Dynamic Group**
-
-A Dynamic Group is used to define rules to group the compute instances that
-require access.
-
-To create a dynamic group using the Oracle Cloud console, see the steps in the
-`To create a dynamic group <https://docs.oracle.com/en-us/iaas/Content/
-Identity/Tasks/managingdynamicgroups.htm#>`__ section of the Oracle Cloud
-Infrastructure documentation.
-
-**Step 4: Create an IAM Policy**
-
-An IAM Policy is used to grant a dynamic group permission to access the
-required OCI services such as Oracle Autonomous Database. If the scope is not
-set, the policy should be for the specified tenancy.
-
-To create an IAM policy using Oracle Cloud console, see the steps in the
-`Create an IAM Policy <https://docs.oracle.com/en-us/iaas/application-
-integration/doc/creating-iam-policy.html>`__ section of the Oracle Cloud
-Infrastructure documentation.
-
-**Step 5: Map an Instance Principal to an Oracle Database User**
-
-You must map the Instance Principal to an Oracle Database user. For more
-information, see `Accessing the Database Using an Instance Principal
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-1B648FB0-BE86-
-4BCE-91D0-239D287C638B>`__.
-
-Also, make sure that external authentication is enabled on Oracle ADB and
-Oracle Database parameter ``IDENTITY_PROVIDER_TYPE`` is set to *OCI_IAM*.
-For the steps, see `Enable IAM Authentication on ADB <https://docs.oracle.com/
-en/cloud/paas/autonomous-database/serverless/adbsb/enable-iam-authentication
-.html>`__.
-
-**Step 6: Deploy your application on the Compute Instance**
-
-To use Instance Principal authentication, set ``extra_auth_params`` when
-creating a standalone connection or a connection pool. The defined IAM policy
-must allow access according to the specified scope. For information on the
-keys of the ``extra_auth_params`` parameter, see
-:ref:`_oci_configuration_parameters`.
-
-An example of connecting using Instance Principal:
-
-.. code-block:: python
-
-    import oracledb
-    import oracledb.plugins.oci_tokens
-
-    token_based_auth = {
-      "auth_type": "InstancePrincipal"
-    }
-
-    connection = oracledb.connect(
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth
-    )
-
-.. _configproviderauthmethods:
-
-Authentication Methods for Centralized Configuration Providers
-==============================================================
-
-You may need to provide authentication methods to access a centralized
-configuration provider. The authentication methods for the following
-centralized configuration providers are detailed in this section:
-
-- :ref:`OCI Object Storage Centralized Configuration Provider
-  <ociobjectstorageauthmethods>`
-
-- :ref:`Azure App Centralized Configuration Provider <azureappauthmethods>`
-
-.. _ociobjectstorageauthmethods:
-
-OCI Object Storage Configuration Provider Authentication Methods
-----------------------------------------------------------------
-
-An Oracle Cloud Infrastructure (OCI) authentication method can be used to
-access the OCI Object Storage centralized configuration provider. The
-authentication methood can be set in the ``<option>=<value>`` parameter of
-an :ref:`OCI Object Storage connection string <connstringoci>`. Depending on
-the specified authentication method, you must also set the corresponding
-authentication parameters in the connection string.
-
-You can specify one of the authentication methods listed below.
-
-**API Key-based Authentication**
-
-The authentication to OCI is done using API key-related values. This is the
-default authentication method. Note that this method is used when no
-authentication value is set or by setting the option value to *OCI_DEFAULT*.
-
-The optional authentication parameters that can be set for this method are
-*OCI_PROFILE*, *OCI_TENANCY*, *OCI_USER*, *OCI_FINGERPRINT*, *OCI_KEY_FILE*,
-and *OCI_PASS_PHRASE*. These authentication parameters can also be set in an
-OCI Authentication Configuration file which can be stored in a default
-location *~/.oci/config*, or in location *~/.oraclebmc/config*, or in the
-location specified by the OCI_CONFIG_FILE environment variable. See
-`Authentication Parameters for Oracle Cloud Infrastructure (OCI) Object
-Storage <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-EB94F084
--0F3F-47B5-AD77-D111070F7E8D>`__.
-
-**Instance Principal Authentication**
-
-The authentication to OCI is done using VM instance credentials running on
-OCI. To use this method, set the option value to *OCI_INSTANCE_PRINCIPAL*.
-There are no optional authentication parameters that can be set for this
-method.
-
-**Resource Principal Authentication**
-
-The authentication to OCI is done using OCI resource principals. To use this
-method, you must set the option value to OCI_RESOURCE_PRINCIPAL. There are no
-optional authentication parameters that can be set for this method.
-
-For more information on these authentication methods, see `OCI Authentication
-Methods <https://docs.oracle.com/en-us/iaas/Content/API/Concepts/
-sdk_authentication_methods.htm>`__.
-
-.. _azureappauthmethods:
-
-Azure App Configuration Provider Authentication Methods
--------------------------------------------------------
-
-A Microsoft Azure authentication method can be used to access the Azure App
-centralized configuration provider. The authentication methood can be set in
-the ``<option>=<value>`` parameter of an :ref:`Azure App connection string
-<connstringazure>`. Depending on the specified authentication method, you must
-also set the corresponding authentication parameters in the connection string.
-
-**Default Azure Credential**
-
-The authentication to Azure App Configuration is done as a service principal
-(using either a client secret or client certificate) or as a managed identity
-depending on which parameters are set. This authentication method also
-supports reading the parameters as environment variables. This is the default
-authentication method. This method is used when no authentication value is set
-or by setting the option value to *AZURE_DEFAULT*.
-
-The optional parameters that can be set for this option include
-*AZURE_CLIENT_ID*, *AZURE_CLIENT_SECRET*, *AZURE_CLIENT_CERTIFICATE_PATH*,
-*AZURE_TENANT_ID*, and *AZURE_MANAGED_IDENTITY_CLIENT_ID*. For more
-information on these parameters, see `Authentication Parameters for Azure App
-Configuration Store <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-1EECAD82-6CE5-4F4F-A844-C75C7AA1F907>`__.
-
-**Service Principal with Client Secret**
-
-The authentication to Azure App Configuration is done using the client secret.
-To use this method, you must set the option value to
-*AZURE_SERVICE_PRINCIPAL*. The required parameters that must be set for this
-option include *AZURE_SERVICE_PRINCIPAL*, *AZURE_CLIENT_ID*,
-*AZURE_CLIENT_SECRET*, and *AZURE_TENANT_ID*. For more
-information on these parameters, see `Authentication Parameters for Azure App
-Configuration Store <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-1EECAD82-6CE5-4F4F-A844-C75C7AA1F907>`__.
-
-**Service Principal with Client Certificate**
-
-The authentication to Azure App Configuration is done using the client
-certificate. To use this method, you must set the option value to
-*AZURE_SERVICE_PRINCIPAL*. The required parameters that must be set for this
-option are *AZURE_SERVICE_PRINCIPAL*, *AZURE_CLIENT_ID*,
-*AZURE_CLIENT_CERTIFICATE_PATH*, and *AZURE_TENANT_ID*. For more information
-on these parameters, see `Authentication Parameters for Azure App
-Configuration Store <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-1EECAD82-6CE5-4F4F-A844-C75C7AA1F907>`__.
-
-Note that the Service Principal with Client Certificate authentication method
-overrides Service Principal with Client Secret authentication method.
-
-**Managed Identity**
-
-The authentication to Azure App Configuration is done using managed identity
-or managed user identity credentials. To use this method, you must set the
-option value to *AZURE_MANAGED_IDENTITY*. If you want to use a user-assigned
-managed identity for authentication, then you must specify the required
-parameter *AZURE_MANAGED_IDENTITY_CLIENT_ID*. For more information on these
-parameters, see `Authentication Parameters for Azure App Configuration Store
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-1EECAD82-6CE5-
-4F4F-A844-C75C7AA1F907>`__.
diff --git a/doc/src/user_guide/batch_statement.rst b/doc/src/user_guide/batch_statement.rst
deleted file mode 100644
index 0d4338de..00000000
--- a/doc/src/user_guide/batch_statement.rst
+++ /dev/null
@@ -1,782 +0,0 @@
-.. _batchstmnt:
-
-.. currentmodule:: oracledb
-
-****************************************
-Batch Statement and Bulk Copy Operations
-****************************************
-
-Python-oracledb is perfect for large ETL ("Extract, Transform, Load") data
-operations.
-
-This chapter focuses on efficient data ingestion. Python-oracledb lets you
-easily optimize batch insertion, and also allows "noisy" data (values not in a
-suitable format) to be filtered for review while other, correct, values are
-inserted.
-
-In addition to Oracle Database "Array DML" batch loading,
-:ref:`directpathloads` can be used for very fast loading of large data sets if
-certain schema criteria can be met. Another option for frequent, small inserts
-is to load data using the Oracle Database :ref:`memoptimized`.
-
-Related topics include :ref:`tuning` and :ref:`dataframeformat`.
-
-Batch Statement Execution
-=========================
-
-Inserting, updating or deleting multiple rows can be performed efficiently with
-:meth:`Cursor.executemany()`, making it easy to work with large data sets with
-python-oracledb.  This method can significantly outperform repeated calls to
-:meth:`Cursor.execute()` by reducing network transfer costs and database
-overheads.  The :meth:`~Cursor.executemany()` method can also be used to
-execute a PL/SQL statement multiple times in one call.
-
-There are examples in the `GitHub examples
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__
-directory.
-
-The following tables will be used in the samples that follow:
-
-.. code-block:: sql
-
-    create table ParentTable (
-        ParentId              number(9) not null,
-        Description           varchar2(60) not null,
-        constraint ParentTable_pk primary key (ParentId)
-    );
-
-    create table ChildTable (
-        ChildId               number(9) not null,
-        ParentId              number(9) not null,
-        Description           varchar2(60) not null,
-        constraint ChildTable_pk primary key (ChildId),
-        constraint ChildTable_fk foreign key (ParentId)
-                references ParentTable
-    );
-
-
-Batch Execution of SQL
-----------------------
-
-The following example inserts five rows into the table ``ParentTable``:
-
-.. code-block:: python
-
-    data = [
-        (10, "Parent 10"),
-        (20, "Parent 20"),
-        (30, "Parent 30"),
-        (40, "Parent 40"),
-        (50, "Parent 50")
-    ]
-    cursor.executemany("insert into ParentTable values (:1, :2)", data)
-
-Each tuple value maps to one of the bind variable placeholders.
-
-This code requires only one :ref:`round-trip <roundtrips>` from the client to
-the database instead of the five round-trips that would be required for
-repeated calls to :meth:`~Cursor.execute()`.
-
-To insert a single column, make sure the bind variables are correctly created
-as tuples, for example:
-
-.. code-block:: python
-
-    data = [
-        (10,),
-        (20,),
-        (30,),
-    ]
-    cursor.executemany('insert into mytable (mycol) values (:1)', data)
-
-Named binds can be performed by passing an array of dicts, where the keys match
-the bind variable placeholder names:
-
-.. code-block:: python
-
-    data = [
-        {"pid": 10, "pdesc": "Parent 10"},
-        {"pid": 20, "pdesc": "Parent 20"},
-        {"pid": 30, "pdesc": "Parent 30"},
-        {"pid": 40, "pdesc": "Parent 40"},
-        {"pid": 50, "pdesc": "Parent 50"}
-    ]
-    cursor.executemany("insert into ParentTable values :pid, :pdesc)", data)
-
-
-A data frame can alternatively be passed to :meth:`Cursor.executemany()`, see
-:ref:`dfinsert`.
-
-.. _predefmemory:
-
-Predefining Memory Areas
-------------------------
-
-When multiple rows of data are being processed there is the possibility that
-the data is not uniform in type and size.  In such cases, python-oracledb makes
-some effort to accommodate such differences.  Type determination for each
-column is deferred until a value that is not ``None`` is found in the column's
-data.  If all values in a particular column are ``None``, then python-oracledb
-assumes the type is a string and has a length of 1.  Python-oracledb will also
-adjust the size of the buffers used to store strings and bytes when a longer
-value is encountered in the data.  These sorts of operations incur overhead as
-memory has to be reallocated and data copied.  To eliminate this overhead,
-using :meth:`~Cursor.setinputsizes()` tells python-oracledb about the type and
-size of the data that is going to be used.
-
-Consider the following code:
-
-.. code-block:: python
-
-    data = [
-        (110, "Parent 110"),
-        (2000, "Parent 2000"),
-        (30000, "Parent 30000"),
-        (400000, "Parent 400000"),
-        (5000000, "Parent 5000000")
-    ]
-    cursor.setinputsizes(None, 20)
-    cursor.executemany("""
-            insert into ParentTable (ParentId, Description)
-            values (:1, :2)""", data)
-
-If this example did not call :meth:`~Cursor.setinputsizes()`, then
-python-oracledb performs five allocations of increasing size and perform
-data copies as it discovers each new, longer string.  However,
-``cursor.setinputsizes(None, 20)`` tells python-oracledb that the maximum size
-of the strings that will be processed is 20 characters.  The first parameter of
-``None`` tells python-oracledb that its default processing will be sufficient
-since numeric data is already stored efficiently.  Since python-oracledb
-allocates memory for each row based on the supplied values, do not oversize
-them.
-
-If the size of the buffers allocated for any of the bind values exceeds 2 GB,
-you will receive the error ``DPI-1015: array size of <n> is too large``, where
-<n> varies with the size of each element being allocated in the buffer. If you
-receive this error, decrease the number of rows being inserted.
-
-With named bind variables, use named parameters when calling
-:meth:`~Cursor.setinputsizes()`:
-
-.. code-block:: python
-
-    data = [
-        {"pid": 110, "pdesc": "Parent 110"},
-        {"pid": 2000, "pdesc": "Parent 2000"},
-        {"pid": 30000, "pdesc": "Parent 30000"},
-        {"pid": 400000, "pdesc": "Parent 400000"},
-        {"pid": 5000000, "pdesc": "Parent 5000000"}
-    ]
-    cursor.setinputsizes(pdesc=20)
-    cursor.executemany("""
-            insert into ParentTable (ParentId, Description)
-            values (:pid, :pdesc)""", data)
-
-
-Batching of Large Datasets
---------------------------
-
-For very large data sets, there may be a buffer or network limit on how many
-rows can be processed. The limit is based on both the number of records as
-well as the size of each record that is being processed. In other cases, it may
-be faster to process smaller sets of records.
-
-To reduce the data sizes involved, you can either make repeated calls to
-:meth:`~Cursor.executemany()` as shown later in the CSV examples, or you can
-use the ``batch_size`` parameter to optimize transfer across the network to the
-database. For example:
-
-.. code-block:: python
-
-    data = [
-        (1, "Parent 1"),
-        (2, "Parent 2"),
-        . . .
-        (9_999_999, "Parent 9,999,999"),
-        (10_000_000, "Parent 10,000,000"),
-
-    ]
-
-    cursor.executemany("insert into ParentTable values (:1, :2)", data, batch_size=200_000)
-
-This will send the data to the database in batches of 200,000 records until all
-10,000,000 records have been inserted.
-
-If :attr:`Connection.autocommit` is ``True``, then a commit will take place per
-batch of records processed.
-
-.. _batchplsql:
-
-Batch Execution of PL/SQL
--------------------------
-
-Using :meth:`~Cursor.executemany()` can improve performance when PL/SQL
-functions, procedures, or anonymous blocks need to be called multiple times.
-
-Runnable examples are in `plsql_batch.py <https://github.com/oracle/python-
-oracledb/tree/main/samples/plsql_batch.py>`__.
-
-**IN Binds**
-
-An example using :ref:`bind by position <bindbyposition>` for IN binds is:
-
-.. code-block:: python
-
-    data = [
-        (10, "Parent 10"),
-        (20, "Parent 20"),
-        (30, "Parent 30"),
-        (40, "Parent 40"),
-        (50, "Parent 50")
-    ]
-    cursor.executemany("begin mypkg.create_parent(:1, :2); end;", data)
-
-Note that the ``batcherrors`` parameter of :meth:`~Cursor.executemany()`
-(discussed in :ref:`batcherrors`) cannot be used with PL/SQL block execution.
-
-**OUT Binds**
-
-When using OUT binds in PL/SQL, the input data omits entries for the OUT bind
-variable placeholders. An example PL/SQL procedure that returns OUT binds is:
-
-.. code-block:: sql
-
-    create or replace procedure myproc(p1 in number, p2 out number) as
-    begin
-        p2 := p1 * 2;
-    end;
-
-This can be called in python-oracledb using positional binds like:
-
-.. code-block:: python
-
-    data = [
-        (100,),
-        (200,),
-        (300,)
-    ]
-
-    outvals = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-    cursor.setinputsizes(None, outvals)
-
-    cursor.executemany("begin myproc(:1, :2); end;", data)
-    print(outvals.values)
-
-The output is::
-
-    [200, 400, 600]
-
-The equivalent code using named binds is:
-
-.. code-block:: python
-
-    data = [
-        {"p1bv": 100},
-        {"p1bv": 200},
-        {"p1bv": 300}
-    ]
-
-    outvals = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-    cursor.setinputsizes(p1bv=None, p2bv=outvals)
-
-    cursor.executemany("begin myproc(:p1bv, :p2bv); end;", data)
-    print(outvals.values)
-
-Note that in python-oracledb Thick mode, when :meth:`~Cursor.executemany()` is
-used for PL/SQL code that returns OUT binds, it will have the same performance
-characteristics as repeated calls to :meth:`~Cursor.execute()`.
-
-**IN/OUT Binds**
-
-An example PL/SQL procedure that returns IN/OUT binds is:
-
-.. code-block:: sql
-
-    create or replace procedure myproc2 (p1 in number, p2 in out varchar2) as
-    begin
-        p2 := p2 || ' ' || p1;
-    end;
-
-This can be called in python-oracledb using positional binds like:
-
-.. code-block:: python
-
-    data = [
-        (440, 'Gregory'),
-        (550, 'Haley'),
-        (660, 'Ian')
-    ]
-    outvals = cursor.var(oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data))
-    cursor.setinputsizes(None, outvals)
-
-    cursor.executemany("begin myproc2(:1, :2); end;", data)
-    print(outvals.values)
-
-The ``size`` parameter of :meth:`Cursor.var()` indicates the maximum length of
-the string that can be returned.
-
-Output is::
-
-    ['Gregory 440', 'Haley 550', 'Ian 660']
-
-The equivalent code using named binds is:
-
-.. code-block:: python
-
-    data = [
-        {"p1bv": 440, "p2bv": 'Gregory'},
-        {"p1bv": 550, "p2bv": 'Haley'},
-        {"p1bv": 660, "p2bv": 'Ian'}
-    ]
-    outvals = cursor.var(oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data))
-    cursor.setinputsizes(p1bv=None, p2bv=outvals)
-
-    cursor.executemany("begin myproc2(:p1bv, :p2bv); end;", data)
-    print(outvals.values)
-
-.. _batcherrors:
-
-Handling Data Errors
---------------------
-
-Large datasets may contain some invalid data.  When using batch execution as
-discussed above, the entire batch will be discarded if a single error is
-detected, potentially eliminating the performance benefits of batch execution
-and increasing the complexity of the code required to handle those errors. If
-the parameter ``batchErrors`` is set to the value ``True`` when calling
-:meth:`~Cursor.executemany()`, however, processing will continue even if there
-are data errors in some rows, and the rows containing errors can be examined
-afterwards to determine what course the application should take. Note that if
-any errors are detected, a transaction will be started but not committed, even
-if :attr:`Connection.autocommit` is set to ``True``. After examining the errors
-and deciding what to do with them, the application needs to explicitly commit
-or roll back the transaction with :meth:`Connection.commit()` or
-:meth:`Connection.rollback()`, as needed.
-
-This example shows how data errors can be identified:
-
-.. code-block:: python
-
-    data = [
-        (60, "Parent 60"),
-        (70, "Parent 70"),
-        (70, "Parent 70 (duplicate)"),
-        (80, "Parent 80"),
-        (80, "Parent 80 (duplicate)"),
-        (90, "Parent 90")
-    ]
-    cursor.executemany("insert into ParentTable values (:1, :2)", data,
-                       batcherrors=True)
-    for error in cursor.getbatcherrors():
-        print("Error", error.message, "at row offset", error.offset)
-
-The output is::
-
-    Error ORA-00001: unique constraint (PYTHONDEMO.PARENTTABLE_PK) violated at row offset 2
-    Error ORA-00001: unique constraint (PYTHONDEMO.PARENTTABLE_PK) violated at row offset 4
-
-The row offset is the index into the array of the data that could not be
-inserted due to errors.  The application could choose to commit or rollback the
-other rows that were successfully inserted.  Alternatively, it could correct
-the data for the two invalid rows and attempt to insert them again before
-committing.
-
-
-Identifying Affected Rows
--------------------------
-
-When executing a DML statement using :meth:`~Cursor.execute()`, the number of
-rows affected can be examined by looking at the attribute
-:attr:`~Cursor.rowcount`. When performing batch execution with
-:meth:`Cursor.executemany()`, the row count will return the *total*
-number of rows that were affected. If you want to know the total number of rows
-affected by each row of data that is bound you must set the parameter
-``arraydmlrowcounts`` to ``True``, as shown:
-
-.. code-block:: python
-
-    parent_ids_to_delete = [20, 30, 50]
-    cursor.executemany("delete from ChildTable where ParentId = :1",
-                       [(i,) for i in parent_ids_to_delete],
-                       arraydmlrowcounts=True)
-    row_counts = cursor.getarraydmlrowcounts()
-    for parent_id, count in zip(parent_ids_to_delete, row_counts):
-        print("Parent ID:", parent_id, "deleted", count, "rows.")
-
-Using the data found in the `GitHub samples
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__ the output
-is as follows::
-
-    Parent ID: 20 deleted 3 rows.
-    Parent ID: 30 deleted 2 rows.
-    Parent ID: 50 deleted 4 rows.
-
-
-DML RETURNING
--------------
-
-DML statements like INSERT, UPDATE, DELETE, and MERGE can return values by using
-the DML RETURNING syntax. A bind variable can be created to accept this data.
-See :ref:`bind` for more information.
-
-If, instead of merely deleting the rows as shown in the previous example, you
-also wanted to know some information about each of the rows that were deleted,
-you can use the following code:
-
-.. code-block:: python
-
-    parent_ids_to_delete = [20, 30, 50]
-    child_id_var = cursor.var(int, arraysize=len(parent_ids_to_delete))
-    cursor.setinputsizes(None, child_id_var)
-    cursor.executemany("""
-            delete from ChildTable
-            where ParentId = :1
-            returning ChildId into :2""",
-            [(i,) for i in parent_ids_to_delete])
-    for ix, parent_id in enumerate(parent_ids_to_delete):
-        print("Child IDs deleted for parent ID", parent_id, "are",
-              child_id_var.getvalue(ix))
-
-The output will be::
-
-    Child IDs deleted for parent ID 20 are [1002, 1003, 1004]
-    Child IDs deleted for parent ID 30 are [1005, 1006]
-    Child IDs deleted for parent ID 50 are [1012, 1013, 1014, 1015]
-
-Note that the bind variable created to accept the returned data must have an
-arraysize large enough to hold data for each row that is processed. Also, the
-call to :meth:`Cursor.setinputsizes()` binds this variable immediately so that
-it does not have to be passed in each row of data.
-
-Bulk Copy Operations
-====================
-
-Bulk copy operations are facilitated with the use of
-:meth:`Cursor.executemany()`, the use of appropriate SQL statements, and the
-use of Python modules.
-
-Also, see :ref:`dataframeformat` and :ref:`Oracle Database Pipelining
-<pipelining>`.
-
-Loading CSV Files into Oracle Database
---------------------------------------
-
-The :meth:`Cursor.executemany()` method and Python's `csv module
-<https://docs.python.org/3/library/csv.html#module-csv>`__ can be used to
-efficiently insert CSV (Comma Separated Values) data.  For example, consider
-the file ``data.csv``::
-
-    101,Abel
-    154,Baker
-    132,Charlie
-    199,Delta
-    . . .
-
-And the schema:
-
-.. code-block:: sql
-
-    create table test (id number, name varchar2(25));
-
-Data loading can be done in batches of records since Python memory limitations
-may prevent all the records being held in memory at once:
-
-.. code-block:: python
-
-    import oracledb
-    import csv
-
-    # CSV file
-    FILE_NAME = 'data.csv'
-
-    # Adjust the number of rows to be inserted in each iteration
-    # to meet your memory and performance requirements
-    BATCH_SIZE = 10000
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-    with connection.cursor() as cursor:
-
-        # Predefine the memory areas to match the table definition.
-        # This can improve performance by avoiding memory reallocations.
-        # Here, one parameter is passed for each of the columns.
-        # "None" is used for the ID column, since the size of NUMBER isn't
-        # variable.  The "25" matches the maximum expected data size for the
-        # NAME column
-        cursor.setinputsizes(None, 25)
-
-        with open(FILE_NAME, 'r') as csv_file:
-            csv_reader = csv.reader(csv_file, delimiter=',')
-            sql = "insert into test (id, name) values (:1, :2)"
-            data = []
-            for line in csv_reader:
-                data.append((line[0], line[1]))
-                if len(data) % BATCH_SIZE == 0:
-                    cursor.executemany(sql, data)
-                    data = []
-            if data:
-                cursor.executemany(sql, data)
-            connection.commit()
-
-Depending on data sizes and business requirements, database changes such as
-temporarily disabling redo logging on the table, or disabling indexes may also
-be beneficial.
-
-The PyArrow package's CSV methods may be more efficient than the default CSV
-module.
-
-See `samples/load_csv.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/load_csv.py>`__ for a runnable example showing both the CSV module and
-PyArrow's CSV functionality.
-
-You should also review whether Oracle's specialized data loading tools and
-features suit your environment. These can be faster than using Python. See
-`SQL*Loader <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-DD843EE2-1FAB-4E72-A115-21D97A501ECC>`__ and `External Tables
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-44323E01-7D72-45EC-915A-99E596769D9E>`__.
-
-
-Creating CSV Files from Oracle Database
----------------------------------------
-
-Python's `csv module <https://docs.python.org/3/library/csv.html#module-csv>`__
-can be used to efficiently create CSV (Comma Separated Values) files.  For
-example:
-
-.. code-block:: python
-
-    cursor.arraysize = 1000  # tune this for large queries
-    print(f"Writing to {FILE_NAME}")
-    with open(FILE_NAME, "w") as f:
-        writer = csv.writer(
-            f, lineterminator="\n", quoting=csv.QUOTE_NONNUMERIC
-        )
-        cursor.execute("""select rownum, sysdate, mycol from BigTab""")
-        writer.writerow(info.name for info in cursor.description)
-        writer.writerows(cursor)
-
-
-See `samples/write_csv.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/write_csv.py>`__ for a runnable example.
-
-
-Bulk Copying Data between Databases
------------------------------------
-
-The :meth:`Cursor.executemany()` function is useful for copying data from one
-database to another, for example in an ETL ("Extract, Transform, Load")
-workflow:
-
-.. code-block:: python
-
-    # Connect to both databases
-    source_connection = oracledb.connect(user=un1, password=pw1, dsn=cs1)
-    target_connection = oracledb.connect(user=un2, password=pw2, dsn=cs2)
-
-    # Setup cursors
-    source_cursor = source_connection.cursor()
-    source_cursor.arraysize = 1000              # tune this for query performance
-
-    target_cursor = target_connection.cursor()
-    target_cursor.setinputsizes(None, 25)       # set according to column types
-
-    # Perform bulk fetch and insertion
-    source_cursor.execute("select c1, c2 from MySrcTable")
-    while True:
-
-        # Extract the records
-        rows = source_cursor.fetchmany()
-        if not rows:
-            break
-
-        # Optionally transform the records here
-        # ...
-
-        # Load the records into the target database
-        target_cursor.executemany("insert into MyDestTable values (:1, :2)", rows)
-
-    target_connection.commit()
-
-The :attr:`~Cursor.arraysize` value alters how many rows each
-:meth:`Cursor.fetchmany()` call returns, see :ref:`tuningfetch`.  The
-:meth:`~Cursor.setinputsizes()` call is used to optimize memory allocation when
-inserting with :meth:`~Cursor.executemany()`, see :ref:`predefmemory`.  You
-may also want to tune the SDU setting for best nework performance, see
-:ref:`tuning`.
-
-If you are inserting back into the same database that the records originally
-came from, you do not need to open a second connection. Instead, both cursors
-can be obtained from one connection.
-
-**Avoiding Copying Data Over the Network**
-
-When copying data to another table in the same database, it may be preferable
-to use INSERT INTO SELECT or CREATE AS SELECT to avoid the overhead of copying
-data to, and back from, the Python process. This also avoids any data type
-changes.  For example to create a complete copy of a table:
-
-.. code-block:: python
-
-   cursor.execute("create table new_table as select * from old_table")
-
-Similarly, when copying to a different database, consider creating a `database
-link <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-D966642A-
-B19E-449D-9968-1121AF06D793>`__ between the databases and using
-INSERT INTO SELECT or CREATE AS SELECT.
-
-You can control the data transfer by changing your SELECT statement.
-
-.. _directpathloads:
-
-Direct Path Loads
-=================
-
-Direct Path Loads allow data being inserted into Oracle Database to bypass
-code layers such as the database buffer cache. Also there are no INSERT
-statements used. This can be very efficient for ingestion of huge amounts of
-data but, as a consequence of the architecture, there are restrictions on when
-Direct Path Loads can be used. For more information see Oracle Database
-documentation such as on SQL*Loader `Direct Path Loads
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-0D576DEF-7918-4DD2-A184-754D217C021F>`__ and on the Oracle Call Interface
-`Direct Path Load Interface
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-596F5F9B-47A1-48DB-8702-FEED7BE038B9>`__.
-
-The end-to-end insertion time when using Direct Path Loads for smaller data
-sets may not be faster than using :meth:`Cursor.executemany()`, however there
-can still be reduced load on the database.
-
-.. note::
-
-    Direct Path Loads are only supported in python-oracledb Thin mode.
-
-Direct Path Loading is performed by the :meth:`Connection.direct_path_load()`
-method. For example, if you have the table::
-
-    create table TestDirectPathLoad (
-        id    number(9),
-        name  varchar2(20)
-    );
-
-Then you can load data into it using the code:
-
-.. code-block:: python
-
-    SCHEMA_NAME = "HR"
-    TABLE_NAME = "TESTDIRECTPATHLOAD"
-    COLUMN_NAMES = ["ID", "NAME"]
-    DATA = [
-        (1, "A first row"),
-        (2, "A second row"),
-        (3, "A third row"),
-    ]
-
-    connection.direct_path_load(
-        schema_name=SCHEMA_NAME,
-        table_name=TABLE_NAME,
-        column_names=COLUMN_NAMES,
-        data=DATA
-    )
-
-The records are always implicitly committed.
-
-The ``data`` parameter can be a list of sequences, a :ref:`DataFrame
-<oracledataframeobj>` object, or a third-party DataFrame instance that supports
-the Apache Arrow PyCapsule Interface, see :ref:`dfppl`.
-
-To load into VECTOR columns, pass an appropriate `Python array.array()
-<https://docs.python.org/3/library/array.html>`__ value, or a list of values.
-For example, if you have the table::
-
-    create table TestDirectPathLoad (
-        id    number(9),
-        name  varchar2(20),
-        v64   vector(3, float64)
-    );
-
-Then you can load data into it using the code:
-
-.. code-block:: python
-
-    SCHEMA_NAME = "HR"
-    TABLE_NAME = "TESTDIRECTPATHLOAD"
-    COLUMN_NAMES = ["ID", "NAME", "V64"]
-    DATA = [
-        (1, "A first row", array.array("d", [1, 2, 3])),
-        (2, "A second row", [4, 5, 6]),
-        (3, "A third row", array.array("d", [7, 8, 9])),
-    ]
-
-    connection.direct_path_load(
-        schema_name=SCHEMA_NAME,
-        table_name=TABLE_NAME,
-        column_names=COLUMN_NAMES,
-        data=DATA
-    )
-
-
-For more on vectors, see :ref:`vectors`.
-
-Runnable Direct Path Load examples are in the `GitHub examples
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__ directory.
-
-**Notes on Direct Path Loads**
-
-- Data is implicitly committed.
-- Data being inserted into CLOB or BLOB columns must be strings or bytes, not
-  python-oracledb :ref:`LOB Objects <lobobj>`.
-- Insertion of python-oracledb :ref:`DbObjectType Objects <dbobjecttype>` is
-  not supported
-
-Review Oracle Database documentation for database requirements and
-restrictions.
-
-Batching of Direct Path Loads
------------------------------
-
-If buffer, network, or database limits make it desirable to process smaller
-sets of records, you can either make repeated calls to
-:meth:`Connection.direct_path_load()` or you can use the ``batch_size``
-parameter. For example:
-
-.. code-block:: python
-
-    SCHEMA_NAME = "HR"
-    TABLE_NAME = "TESTDIRECTPATHLOAD"
-    COLUMN_NAMES = ["ID", "NAME"]
-    DATA = [
-        (1, "A first row"),
-        (2, "A second row"),
-        . . .
-        (10_000_000, "Ten millionth row"),
-    ]
-
-    connection.direct_path_load(
-        schema_name=SCHEMA_NAME,
-        table_name=TABLE_NAME,
-        column_names=COLUMN_NAMES,
-        data=DATA,
-        batch_size=1_000_000
-    )
-
-This will send the data to the database in batches of 1,000,000 records until
-all 10,000,000 records have been inserted.
-
-.. _memoptimized:
-
-Memoptimized Rowstore
-=====================
-
-The Memoptimized Rowstore is another Oracle Database feature for data
-ingestion, particularly for frequent single row inserts. It can also aid query
-performance. Configuration and control is handled by database configuration and
-the use of specific SQL statements. As a result, there is no specific
-python-oracledb requirement or API needed to take advantage of the feature.
-
-To use the Memoptimized Rowstore see Oracle Database documentation `Enabling
-High Performance Data Streaming with the Memoptimized Rowstore
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-9752E93D-55A7-
-4584-B09B-9623B33B5CCF>`__.
diff --git a/doc/src/user_guide/bind.rst b/doc/src/user_guide/bind.rst
deleted file mode 100644
index 0f88427e..00000000
--- a/doc/src/user_guide/bind.rst
+++ /dev/null
@@ -1,1153 +0,0 @@
-.. _bind:
-
-.. currentmodule:: oracledb
-
-********************
-Using Bind Variables
-********************
-
-SQL and PL/SQL statements that pass data to and from Oracle Database should
-use placeholders in SQL and PL/SQL statements that mark where data is supplied
-or returned.  A bind variable placeholder is a colon-prefixed identifier or
-numeral. For example, ``:dept_id`` and ``:dept_name`` are the two bind variable
-placeholders in this SQL statement:
-
-.. code-block:: python
-
-    sql = """insert into departments (department_id, department_name)
-             values (:dept_id, :dept_name)"""
-    cursor.execute(sql, [280, "Facility"])
-
-As part of execution, the supplied bind variable values ``280`` and
-``"Facility"`` are substituted for the placeholders by the database.  This is
-called binding.
-
-Using bind variables is important for scalability and security.  They help avoid
-SQL Injection security problems because data is never treated as part of an
-executable statement when it is parsed.
-
-Bind variables reduce parsing and execution costs when statements are executed
-more than once with different data values.  If you do not use bind variables,
-Oracle must reparse and cache multiple statements.  When using bind variables,
-Oracle Database may be able to reuse the statement execution plan and context.
-
-.. important::
-
-    Never concatenate or interpolate user data into SQL statements:
-
-    .. code-block:: python
-
-        did = 280
-        dnm = "Facility"
-
-        # !! Never do this !!
-        sql = f"""insert into departments (department_id, department_name)
-                  values ({did}, '{dnm}')"""
-        cursor.execute(sql)
-
-    This is a security risk and can impact performance and scalability.
-
-Bind variables can be used to substitute data, but cannot be used to substitute
-the text of the statement.  You cannot, for example, use a bind variable
-placeholder where a column name or a table name is required.  Bind variable
-placeholders also cannot be used in Data Definition Language (DDL) statements,
-such as CREATE TABLE or ALTER statements.
-
-Binding by Name or Position
-===========================
-
-Binding can be done "by name" or "by position".
-
-.. _bindbyname:
-
-Bind by Name
-------------
-
-A named bind is performed when the bind variables in the Python statement use
-the names of placeholders in the SQL or PL/SQL statement. For example:
-
-.. code-block:: python
-
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:dept_id, :dept_name)""",
-            dept_id=280, dept_name="Facility")
-
-Alternatively, the parameters can be passed as a dictionary instead of as
-keyword parameters:
-
-.. code-block:: python
-
-    data = dict(dept_id=280, dept_name="Facility")
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:dept_id, :dept_name)""", data)
-
-In the above examples, the keyword parameter names or the keys of the
-dictionary must match the bind variable placeholder names.
-
-The advantages of named binding are that the order of the bind values in the
-``execute()`` parameter is not important, the names can be meaningful, and the
-placeholder names can be repeated while still only supplying the value once in
-the application.
-
-An example of reusing a bind variable placeholder is:
-
-.. code-block:: python
-
-    cursor.execute("""
-            update departments set department_id = :dept_id + 10
-            where department_id = :dept_id""",
-            dept_id=280)
-
-.. _bindbyposition:
-
-Bind by Position
-----------------
-
-Positional binding occurs when a list or tuple of bind values is passed to the
-``execute()`` call. For example:
-
-.. code-block:: python
-
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:1, :2)""", [280, "Facility"])
-
-The following example (which changes the order of the bind placeholder names)
-has exactly the same behavior.  The value used to substitute the placeholder
-":2" will be the first element of the list and ":1" will be replaced by the
-second element.  Bind by position works from left to right and pays no
-attention to the name of the bind variable:
-
-.. code-block:: python
-
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:2, :1)""", [280, "Facility"])
-
-The following example is also bind by position despite the bind placeholders
-having alphabetic names.  The actual process of binding uses the list positions
-of the input data to associate the data with the placeholder locations:
-
-.. code-block:: python
-
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:dept_id, :dept_name)""", [280, "Facility"])
-
-
-Python tuples can also be used for binding by position:
-
-.. code-block:: python
-
-    cursor.execute("""
-            insert into departments (department_id, department_name)
-            values (:1, :2)""", (280, "Facility"))
-
-If only a single bind placeholder is used in the SQL or PL/SQL statement, the
-data can be a list like ``[280]`` or a single element tuple like ``(280,)``.
-
-.. _dupbindplaceholders:
-
-Duplicate Bind Variable Placeholders
-====================================
-
-:ref:`Binding by name <bindbyname>` is recommended when bind variable
-placeholder names are repeated in statements.
-
-In python-oracledb Thin mode, when :ref:`binding by position <bindbyposition>`
-for SQL statements, the order of the bind values must exactly match the order
-of each bind variable placeholder and duplicated names must have their values
-repeated:
-
-.. code-block:: python
-
-    cursor.execute("""
-            select dname from dept1 where deptno = :1
-            union all
-            select dname from dept2 where deptno = :1 = """, [30, 30])
-
-In some cases python-oracledb Thick mode may allow non-duplicated values for
-SQL statements, but this usage is not consistent and is not recommended. It
-will result in an error in python-oracledb Thin mode.
-
-When binding by position for PL/SQL calls in python-oracledb Thin or Thick
-modes, the order of the bind values must exactly match the order of each
-**unique** placeholder found in the PL/SQL block and values should not be
-repeated.
-
-Binding by name does not have these issues.
-
-Bind Direction
-==============
-
-The caller can supply data to the database (IN), the database can return data
-to the caller (OUT) or the caller can supply initial data to the database and
-the database can supply the modified data back to the caller (IN/OUT). This is
-known as the bind direction.
-
-The examples shown above have all supplied data to the database and are
-therefore classified as IN bind variables. In order to have the database return
-data to the caller, a variable must be created. This is done by calling the
-method :func:`Cursor.var()`, which identifies the type of data that will be
-found in that bind variable and its maximum size among other things.
-
-Here is an example showing how to use OUT binds. It calculates the sum of the
-integers 8 and 7 and stores the result in an OUT bind variable of type integer:
-
-.. code-block:: python
-
-    out_val = cursor.var(int)
-    cursor.execute("""
-            begin
-                :out_val := :in_bind_var1 + :in_bind_var2;
-            end;""",
-            out_val=out_val, in_bind_var1=8, in_bind_var2=7)
-    print(out_val.getvalue())        # will print 15
-
-If instead of simply getting data back you wish to supply an initial value to
-the database, you can set the variable's initial value. This example is the
-same as the previous one but it sets the initial value first:
-
-.. code-block:: python
-
-    in_out_var = cursor.var(int)
-    in_out_var.setvalue(0, 25)
-    cursor.execute("""
-            begin
-                :in_out_bind_var := :in_out_bind_var + :in_bind_var1 +
-                        :in_bind_var2;
-            end;""",
-            in_out_bind_var=in_out_var, in_bind_var1=8, in_bind_var2=7)
-    print(in_out_var.getvalue())        # will print 40
-
-When binding data to parameters of PL/SQL procedures that are declared as OUT
-parameters, it is worth noting that any value that is set in the bind variable
-will be ignored. In addition, any parameters declared as IN/OUT that do not
-have a value set will start out with a value of ``null``.
-
-
-Binding Null Values
-===================
-
-To insert a NULL into a character column you can bind the Python singleton
-``None``. For example, with the table::
-
-    create table tab (id number, val varchar2(50));
-
-You can use:
-
-.. code-block:: python
-
-    cursor.execute("insert into tab (id, val) values (:i, :v)", i=280, v=None)
-
-Python-oracledb assumes the value will be a string (equivalent to a VARCHAR2
-column). If you need to use a different Oracle Database data type you will need
-to make a call to :func:`Cursor.setinputsizes()` or create a bind variable with
-the correct type by calling :func:`Cursor.var()`.
-
-For example, if the table had been created using an :ref:`Oracle Spatial
-SDO_GEOMETRY <spatial>` object column::
-
-    create table tab (id number, val sdo_geometry);
-
-Then the previous code would fail with::
-
-    ORA-00932: expression is of data type CHAR, which is incompatible with expected data type MDSYS.SDO_GEOMETRY
-
-To insert a NULL into the new table, use:
-
-.. code-block:: python
-
-    type_obj = connection.gettype("SDO_GEOMETRY")
-    var = cursor.var(type_obj)
-    cursor.execute("insert into tab (id, val) values (:i, :v)", i=280, v=var)
-
-Alternatively use:
-
-.. code-block:: python
-
-    type_obj = connection.gettype("SDO_GEOMETRY")
-    cursor.setinputsizes(i=None, v=type_obj)
-    cursor.execute("insert into tab (id, val) values (:i, :v)", i=280, v=None)
-
-
-Binding ROWID Values
-====================
-
-The pseudo-column ROWID uniquely identifies a row in a table.  In
-python-oracledb, ROWID values are represented as strings. The example below shows
-fetching a row and then updating that row by binding its rowid:
-
-.. code-block:: python
-
-    # fetch the row
-    cursor.execute("""
-            select rowid, manager_id
-            from departments
-            where department_id = :dept_id""", dept_id=280)
-    rowid, manager_id = cursor.fetchone()
-
-    # update the row by binding ROWID
-    cursor.execute("""
-            update departments set
-                manager_id = :manager_id
-            where rowid = :rid""", manager_id=205, rid=rowid)
-
-
-Binding UROWID Values
-=====================
-
-Universal rowids (UROWID) are used to uniquely identify rows in index
-organized tables. In python-oracledb, UROWID values are represented as strings.
-The example below shows fetching a row from index organized table
-``universal_rowids`` and then updating that row by binding its urowid:
-
-.. code-block:: sql
-
-    CREATE TABLE universal_rowids (
-        int_col number(9) not null,
-        str_col varchar2(250) not null,
-        date_col date not null,
-        CONSTRAINT universal_rowids_pk PRIMARY KEY(int_col, str_col, date_col)
-    ) ORGANIZATION INDEX
-
-
-.. code-block:: python
-
-    ridvar = cursor.var(oracledb.DB_TYPE_UROWID)
-
-    # fetch the row
-    cursor.execute("""
-            begin
-                select rowid into :rid from universal_rowids
-                where int_col = 3;
-            end;""", rid=ridvar)
-
-    # update the row by binding UROWID
-    cursor.execute("""
-            update universal_rowids set
-                str_col = :str_val
-            where rowid = :rowid_val""",
-            str_val="String #33", rowid_val=ridvar)
-
-Note that the type :attr:`oracledb.DB_TYPE_UROWID` is only supported in
-python-oracledb Thin mode. For python-oracledb Thick mode, the database type
-UROWID can be bound with type :attr:`oracledb.DB_TYPE_ROWID`.
-See :ref:`querymetadatadiff`.
-
-
-.. _dml-returning-bind:
-
-DML RETURNING Bind Variables
-============================
-
-When a RETURNING clause is used with a DML statement like UPDATE,
-INSERT, or DELETE, the values are returned to the application through
-the use of OUT bind variables. Consider the following example:
-
-.. code-block:: python
-
-    # The RETURNING INTO bind variable is a string
-    dept_name = cursor.var(str)
-
-    cursor.execute("""
-            update departments set
-                location_id = :loc_id
-            where department_id = :dept_id
-            returning department_name into :dept_name""",
-            loc_id=1700, dept_id=50, dept_name=dept_name)
-    print(dept_name.getvalue())     # will print ['Shipping']
-
-In the above example, since the WHERE clause matches only one row, the output
-contains a single item in the list. If the WHERE clause matched multiple rows,
-the output would contain as many items as there were rows that were updated.
-
-The same bind variable placeholder name cannot be used both before and after
-the RETURNING clause. For example, if the ``:dept_name`` bind variable is used
-both before and after the RETURNING clause:
-
-.. code-block:: python
-
-    # a variable cannot be used for both input and output in a DML returning
-    # statement
-    dept_name_var = cursor.var(str)
-    dept_name_var.setvalue(0, 'Input Department')
-    cursor.execute("""
-            update departments set
-                department_name = :dept_name || ' EXTRA TEXT'
-            returning department_name into :dept_name""",
-            dept_name=dept_name_var)
-
-The above example will not update the bind variable as expected, but no error
-will be raised if you are using python-oracledb Thick mode. With
-python-oracledb Thin mode, the above example returns the following error::
-
-    DPY-2048: the bind variable placeholder ":dept_name" cannot be used
-    both before and after the RETURNING clause in a DML RETURNING statement
-
-
-LOB Bind Variables
-==================
-
-Database CLOBs, NCLOBS, BLOBs, and BFILEs can be bound with types
-:attr:`oracledb.DB_TYPE_CLOB`, :attr:`oracledb.DB_TYPE_NCLOB`,
-:attr:`oracledb.DB_TYPE_BLOB` and :attr:`oracledb.DB_TYPE_BFILE`
-respectively. LOBs fetched from the database or created with
-:meth:`Connection.createlob()` can also be bound.
-
-LOBs may represent Oracle Database persistent LOBs (those stored in tables) or
-temporary LOBs (such as those created with :meth:`Connection.createlob()` or
-returned by some SQL and PL/SQL operations).
-
-LOBs can be used as IN, OUT, or IN/OUT bind variables.
-
-See :ref:`lobdata` for examples.
-
-.. _refcur:
-
-REF CURSOR Bind Variables
-=========================
-
-Python-oracledb provides the ability to bind and define PL/SQL REF cursors.  As an
-example, consider the PL/SQL procedure:
-
-.. code-block:: sql
-
-    CREATE OR REPLACE PROCEDURE find_employees (
-        p_query IN VARCHAR2,
-        p_results OUT SYS_REFCURSOR
-    ) AS
-    BEGIN
-        OPEN p_results FOR
-            SELECT employee_id, first_name, last_name
-            FROM employees
-            WHERE UPPER(first_name || ' ' || last_name || ' ' || email)
-                LIKE '%' || UPPER(p_query) || '%';
-    END;
-    /
-
-A newly opened cursor can be bound to the REF CURSOR parameter as shown in the
-following Python code. After the PL/SQL procedure has been called with
-:meth:`Cursor.callproc()`, the cursor can then be fetched just like any other
-cursor which had executed a SQL query:
-
-.. code-block:: python
-
-    ref_cursor = connection.cursor()
-    cursor.callproc("find_employees", ['Smith', ref_cursor])
-    for row in ref_cursor:
-        print(row)
-
-With Oracle's `sample HR schema
-<https://github.com/oracle/db-sample-schemas>`__ there are two
-employees with the last name 'Smith' so the result is::
-
-    (159, 'Lindsey', 'Smith')
-    (171, 'William', 'Smith')
-
-To return a REF CURSOR from a PL/SQL function, use ``oracledb.DB_TYPE_CURSOR`` for the
-return type of :meth:`Cursor.callfunc()`:
-
-.. code-block:: python
-
-    ref_cursor = cursor.callfunc('example_package.f_get_cursor',
-                                 oracledb.DB_TYPE_CURSOR)
-    for row in ref_cursor:
-        print(row)
-
-See :ref:`tuning` for information on how to tune REF CURSORS.
-
-Also see :ref:`Implicit Results <implicitresults>` which provides an
-alternative way to return query results from PL/SQL procedures.
-
-Binding PL/SQL Collections
-==========================
-
-PL/SQL Collections like Associative Arrays can be bound as IN, OUT, and IN/OUT
-variables.  When binding IN values, an array can be passed directly as shown in
-this example, which sums up the lengths of all of the strings in the provided
-array. First the PL/SQL package definition:
-
-.. code-block:: sql
-
-    create or replace package mypkg as
-
-        type udt_StringList is table of varchar2(100) index by binary_integer;
-
-        function DemoCollectionIn (
-            a_Values            udt_StringList
-        ) return number;
-
-    end;
-    /
-
-    create or replace package body mypkg as
-
-        function DemoCollectionIn (
-            a_Values            udt_StringList
-        ) return number is
-            t_ReturnValue       number := 0;
-        begin
-            for i in 1..a_Values.count loop
-                t_ReturnValue := t_ReturnValue + length(a_Values(i));
-            end loop;
-            return t_ReturnValue;
-        end;
-
-    end;
-    /
-
-Then the Python code:
-
-.. code-block:: python
-
-    values = ["String One", "String Two", "String Three"]
-    return_val = cursor.callfunc("mypkg.DemoCollectionIn", int, [values])
-    print(return_val)        # will print 32
-
-In order get values back from the database, a bind variable must be created
-using :meth:`Cursor.arrayvar()`. The first parameter to this method is a Python
-type that python-oracledb knows how to handle or one of the oracledb :ref:`types`.
-The second parameter is the maximum number of elements that the array can hold
-or an array providing the value (and indirectly the maximum length). The final
-parameter is optional and only used for strings and bytes. It identifies the
-maximum length of the strings and bytes that can be stored in the array. If not
-specified, the length defaults to 4000 bytes.
-
-Consider the following PL/SQL package:
-
-.. code-block:: sql
-
-    create or replace package mypkg as
-
-        type udt_StringList is table of varchar2(100) index by binary_integer;
-
-        procedure DemoCollectionOut (
-            a_NumElements       number,
-            a_Values            out nocopy udt_StringList
-        );
-
-        procedure DemoCollectionInOut (
-            a_Values            in out nocopy udt_StringList
-        );
-
-    end;
-    /
-
-    create or replace package body mypkg as
-
-        procedure DemoCollectionOut (
-            a_NumElements       number,
-            a_Values            out nocopy udt_StringList
-        ) is
-        begin
-            for i in 1..a_NumElements loop
-                a_Values(i) := 'Demo out element #' || to_char(i);
-            end loop;
-        end;
-
-        procedure DemoCollectionInOut (
-            a_Values            in out nocopy udt_StringList
-        ) is
-        begin
-            for i in 1..a_Values.count loop
-                a_Values(i) := 'Converted element #' || to_char(i) ||
-                        ' originally had length ' || length(a_Values(i));
-            end loop;
-        end;
-
-    end;
-    /
-
-The Python code to process an OUT collection will be as follows. Note the
-call to :meth:`Cursor.arrayvar()` which creates space for an array of strings.
-Each string permits up to 100 bytes and only 10 strings are permitted. If the
-PL/SQL block exceeds the maximum number of strings allowed the error
-``ORA-06513: PL/SQL: index for PL/SQL table out of range for host
-language array`` will be raised.
-
-.. code-block:: python
-
-    out_array_var = cursor.arrayvar(str, 10, 100)
-    cursor.callproc("mypkg.DemoCollectionOut", [5, out_array_var])
-    for val in out_array_var.getvalue():
-        print(val)
-
-This would produce the following output::
-
-    Demo out element #1
-    Demo out element #2
-    Demo out element #3
-    Demo out element #4
-    Demo out element #5
-
-The Python code to process IN/OUT collections is similar. Note the different
-call to :meth:`Cursor.arrayvar()` which creates space for an array of strings,
-but uses an array to determine both the maximum length of the array and its
-initial value.
-
-.. code-block:: python
-
-    in_values = ["String One", "String Two", "String Three", "String Four"]
-    in_out_array_var = cursor.arrayvar(str, in_values)
-    cursor.callproc("mypkg.DemoCollectionInOut", [in_out_array_var])
-    for val in in_out_array_var.getvalue():
-        print(val)
-
-This will produce the following output::
-
-    Converted element #1 originally had length 10
-    Converted element #2 originally had length 10
-    Converted element #3 originally had length 12
-    Converted element #4 originally had length 11
-
-If an array variable needs to have an initial value but also needs to allow
-for more elements than the initial value contains, the following code can be
-used instead:
-
-.. code-block:: python
-
-    in_out_array_var = cursor.arrayvar(str, 10, 100)
-    in_out_array_var.setvalue(0, ["String One", "String Two"])
-
-All of the collections that have been bound in preceding examples have used
-contiguous array elements. If an associative array with sparse array elements
-is needed, a different approach is required. Consider the following PL/SQL
-code:
-
-.. code-block:: sql
-
-    create or replace package mypkg as
-
-        type udt_StringList is table of varchar2(100) index by binary_integer;
-
-        procedure DemoCollectionOut (
-            a_Value                         out nocopy udt_StringList
-        );
-
-    end;
-    /
-
-    create or replace package body mypkg as
-
-        procedure DemoCollectionOut (
-            a_Value                         out nocopy udt_StringList
-        ) is
-        begin
-            a_Value(-1048576) := 'First element';
-            a_Value(-576) := 'Second element';
-            a_Value(284) := 'Third element';
-            a_Value(8388608) := 'Fourth element';
-        end;
-
-    end;
-    /
-
-Note that the collection element indices are separated by large values. The
-technique used above would fail with the exception ``ORA-06513: PL/SQL: index
-for PL/SQL table out of range for host language array``. The code required to
-process this collection looks like this instead:
-
-.. code-block:: python
-
-    collection_type = connection.gettype("MYPKG.UDT_STRINGLIST")
-    collection = collection_type.newobject()
-    cursor.callproc("mypkg.DemoCollectionOut", [collection])
-    print(collection.aslist())
-
-This produces the output::
-
-    ['First element', 'Second element', 'Third element', 'Fourth element']
-
-Note the use of :meth:`Object.aslist()` which returns the collection element
-values in index order as a simple Python list. The indices themselves are lost
-in this approach. The associative array can be turned into a Python dictionary
-using :meth:`Object.asdict()`. If that value was printed in the previous
-example instead, the output would be::
-
-    {-1048576: 'First element', -576: 'Second element', 284: 'Third element', 8388608: 'Fourth element'}
-
-If the elements need to be traversed in index order, the methods
-:meth:`Object.first()` and :meth:`Object.next()` can be used. The method
-:meth:`Object.getelement()` can be used to acquire the element at a particular
-index. This is shown in the following code:
-
-.. code-block:: python
-
-    ix = collection.first()
-    while ix is not None:
-        print(ix, "->", collection.getelement(ix))
-        ix = collection.next(ix)
-
-This produces the output::
-
-    -1048576 -> First element
-    -576 -> Second element
-    284 -> Third element
-    8388608 -> Fourth element
-
-Similarly, the elements can be traversed in reverse index order using the
-methods :meth:`Object.last()` and :meth:`Object.prev()` as shown in the
-following code:
-
-.. code-block:: python
-
-    ix = collection.last()
-    while ix is not None:
-        print(ix, "->", collection.getelement(ix))
-        ix = collection.prev(ix)
-
-This produces the output::
-
-    8388608 -> Fourth element
-    284 -> Third element
-    -576 -> Second element
-    -1048576 -> First element
-
-
-Binding PL/SQL Records
-======================
-
-PL/SQL record type objects can also be bound for IN, OUT, and IN/OUT
-bind variables.  For example:
-
-.. code-block:: sql
-
-    create or replace package mypkg as
-
-        type udt_DemoRecord is record (
-            NumberValue                     number,
-            StringValue                     varchar2(30),
-            DateValue                       date,
-            BooleanValue                    boolean
-        );
-
-        procedure DemoRecordsInOut (
-            a_Value                         in out nocopy udt_DemoRecord
-        );
-
-    end;
-    /
-
-    create or replace package body mypkg as
-
-        procedure DemoRecordsInOut (
-            a_Value                         in out nocopy udt_DemoRecord
-        ) is
-        begin
-            a_Value.NumberValue := a_Value.NumberValue * 2;
-            a_Value.StringValue := a_Value.StringValue || ' (Modified)';
-            a_Value.DateValue := a_Value.DateValue + 5;
-            a_Value.BooleanValue := not a_Value.BooleanValue;
-        end;
-
-    end;
-    /
-
-Then this Python code can be used to call the stored procedure which will
-update the record:
-
-.. code-block:: python
-
-    # create and populate a record
-    record_type = connection.gettype("MYPKG.UDT_DEMORECORD")
-    record = record_type.newobject()
-    record.NUMBERVALUE = 6
-    record.STRINGVALUE = "Test String"
-    record.DATEVALUE = datetime.datetime(2016, 5, 28)
-    record.BOOLEANVALUE = False
-
-    # show the original values
-    print("NUMBERVALUE ->", record.NUMBERVALUE)
-    print("STRINGVALUE ->", record.STRINGVALUE)
-    print("DATEVALUE ->", record.DATEVALUE)
-    print("BOOLEANVALUE ->", record.BOOLEANVALUE)
-    print()
-
-    # call the stored procedure which will modify the record
-    cursor.callproc("mypkg.DemoRecordsInOut", [record])
-
-    # show the modified values
-    print("NUMBERVALUE ->", record.NUMBERVALUE)
-    print("STRINGVALUE ->", record.STRINGVALUE)
-    print("DATEVALUE ->", record.DATEVALUE)
-    print("BOOLEANVALUE ->", record.BOOLEANVALUE)
-
-This will produce the following output::
-
-    NUMBERVALUE -> 6
-    STRINGVALUE -> Test String
-    DATEVALUE -> 2016-05-28 00:00:00
-    BOOLEANVALUE -> False
-
-    NUMBERVALUE -> 12
-    STRINGVALUE -> Test String (Modified)
-    DATEVALUE -> 2016-06-02 00:00:00
-    BOOLEANVALUE -> True
-
-Note that when manipulating records, all of the attributes must be set by the
-Python program in order to avoid an Oracle Client bug which will result in
-unexpected values or the Python application segfaulting.
-
-.. _spatial:
-
-Binding Spatial Data Types
-==========================
-
-Oracle Spatial data types objects can be represented by Python objects and
-their attribute values can be read and updated. The objects can further be
-bound and committed to database. This is similar to the examples above.
-
-An example of fetching SDO_GEOMETRY is in :ref:`Oracle Database Objects and
-Collections <fetchobjects>`.
-
-.. _sqlversioncount:
-
-Reducing the SQL Version Count
-==============================
-
-When repeated calls to :meth:`Cursor.execute()` or :meth:`Cursor.executemany()`
-bind different string data lengths, then using :meth:`Cursor.setinputsizes()`
-can help reduce Oracle Database's SQL "`version count
-<https://support.oracle.com/knowledge/Oracle%20Cloud/296377_1.html>`__" for the
-statement. The version count is the number of child cursors used for the same
-statement text. The database will have a parent cursor representing the text of
-a statement, and a number of child cursors for differing executions of the
-statement, for example when different bind variable types or lengths are used.
-
-For example, with a table created as::
-
-    create table mytab (c1 varchar2(25), c2 varchar2(100), c3 number);
-
-You can use :meth:`~Cursor.setinputsizes()` to help reduce the number of child
-cursors:
-
-.. code-block:: python
-
-    sql = "insert into mytab (c1, c2) values (:1, :2)"
-
-    cursor.setinputsizes(25, 15)
-
-    s1 = "abc"
-    s2 = "def"
-    cursor.execute(sql, [s1, s2])
-
-    s1 = "aaaaaaaaaaaaaaaaaaaaaaaaa"
-    s2 = "z"
-    cursor.execute(sql, [s1, s2])
-
-The :meth:`~Cursor.setinputsizes()` call indicates that the first value bound
-will be a Python string of no more than 25 characters and the second value
-bound will be a string of no more than 15 characters.  If the data string
-lengths exceed the :meth:`~Cursor.setinputsizes()` values, then python-oracledb
-will accept them but there will be no processing benefit.
-
-It is not uncommon for SQL statements to have low hundreds of
-versions. Sometimes this is expected and not a result of any issue. To
-determine the reason, find the SQL identifier of the statement and then query
-the Oracle Database view `V$SQL_SHARED_CURSOR <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-4993A6DE-5658-4745-B43E-F5AD9DB8DCCC>`__.
-
-The SQL identifier of a statement can be found in Oracle Database views like
-`V$SQLAREA <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-09D5169F-EE9E-4297-8E01-8D191D87BDF7>`__ after you have run a statement, or you
-can find it *before* you execute the statement by using the
-`DBMS_SQL_TRANSLATOR.SQL_ID() <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-DFFB611B-853A-434E-808D-D713671C3AA4>`__ function. Make sure
-to pass in exactly the same SQL text, including the same whitespace:
-
-.. code-block:: python
-
-    sql = "insert into mytab (c1, c2) values (:1, :2)"  # statement to examine
-
-    cursor.execute("select dbms_sql_translator.sql_id(:1) from dual", [sql])
-    (sqlid,) = cursor.fetchone();
-    print(sqlid)
-
-This might print a value like::
-
-    6h6gj3ztw2wd8
-
-Then, to find the SQL versions, run a query to see the child cursors. For
-example:
-
-.. code-block:: python
-
-    cursor.execute("""select child_number, reason
-                      from v$sql_shared_cursor
-                      where sql_id = :1 order by 1""", [sqlid])
-    col_names = [c.name for c in cursor.description]
-    for row in cursor.fetchall():
-        r = [dict(zip(col_names, row))]
-        print(r)
-
-With the earlier code that used :meth:`~Cursor.setinputsizes()` and inserted
-different data lengths you might see::
-
-    [{'CHILD_NUMBER': 0, 'REASON': ' '}]
-
-However if :meth:`~Cursor.setinputsizes()` had not been used, you would see two
-rows and REASON would include the text "Bind mismatch", for example::
-
-    [{'CHILD_NUMBER': 0, 'REASON': '<ChildNode><ChildNumber>0</ChildNumber><ID>39</ID><reason>Bind mismatch(22)</reason><size>4x8</size><bind_position>0</bind_position><original_oacflg>1</original_oacflg><original_oacmxl>32</original_oacmxl><upgradeable_new_oacmxl>128</upgradeable_new_oacmxl></ChildNode> '}]
-    [{'CHILD_NUMBER': 1, 'REASON': '<ChildNode><ChildNumber>1</ChildNumber><ID>39</ID><reason>Bind mismatch(22)</reason><size>4x8</size><bind_position>0</bind_position><original_oacflg>1</original_oacflg><original_oacmxl>128</original_oacmxl><upgradeable_new_oacmxl>32</upgradeable_new_oacmxl></ChildNode> '}]
-
-
-.. _inputtypehandlers:
-
-Changing Bind Data Types using an Input Type Handler
-====================================================
-
-Input Type Handlers allow applications to change how data is bound to
-statements, or even to enable new types to be bound directly.
-
-An input type handler is enabled by setting the attribute
-:attr:`Cursor.inputtypehandler` or :attr:`Connection.inputtypehandler`.
-
-**Inserting NaN values as NULL in NUMBER columns**
-
-To insert NaN values as NULLs in a NUMBER column, use an input type handler
-with an inconverter:
-
-.. code-block:: python
-
-    def input_type_handler(cursor, value, arraysize):
-      if isinstance(value, float):
-          return cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=arraysize,
-                            inconverter=lambda x: None if math.isnan(x) else x)
-
-    connection.inputtypehandler = input_type_handler
-
-Note that this is not needed for BINARY_FLOAT or BINARY_DOUBLE columns.
-
-**Binding Python Objects**
-
-Input type handlers can be combined with variable converters to bind Python
-objects seamlessly:
-
-.. code-block:: python
-
-    # A standard Python object
-    class Building:
-
-        def __init__(self, build_id, description, num_floors, date_built):
-            self.building_id = build_id
-            self.description = description
-            self.num_floors = num_floors
-            self.date_built = date_built
-
-    building = Building(1, "Skyscraper 1", 5, datetime.date(2001, 5, 24))
-
-    # Get Python representation of the Oracle user defined type UDT_BUILDING
-    obj_type = con.gettype("UDT_BUILDING")
-
-    # convert a Python Building object to the Oracle user defined type
-    # UDT_BUILDING
-    def building_in_converter(value):
-        obj = obj_type.newobject()
-        obj.BUILDINGID = value.building_id
-        obj.DESCRIPTION = value.description
-        obj.NUMFLOORS = value.num_floors
-        obj.DATEBUILT = value.date_built
-        return obj
-
-    def input_type_handler(cursor, value, num_elements):
-        if isinstance(value, Building):
-            return cursor.var(obj_type, arraysize=num_elements,
-                              inconverter=building_in_converter)
-
-
-    # With the input type handler, the bound Python object is converted
-    # to the required Oracle object before being inserted
-    cur.inputtypehandler = input_type_handler
-    cur.execute("insert into myTable values (:1, :2)", (1, building))
-
-
-Binding Multiple Values to a SQL WHERE IN Clause
-================================================
-
-To use a SQL IN list with multiple values, use one bind variable placeholder
-per value. You cannot directly bind a Python list or dictionary to a single
-bind variable. For example, to use two values in an IN clause your code should
-be like:
-
-.. code-block:: python
-
-    items = ["Smith", "Taylor"]
-    cursor.execute("""
-        select employee_id, first_name, last_name
-        from employees
-        where last_name in (:1, :2)""",
-        items)
-    for row in cursor:
-        print(row)
-
-This gives the output::
-
-    (159, 'Lindsey', 'Smith')
-    (171, 'William', 'Smith')
-    (176, 'Jonathon', 'Taylor')
-    (180, 'Winston', 'Taylor')
-
-If the query is executed multiple times with differing numbers of values, a
-bind variable placeholder should be included in the SQL statement for each of
-the maximum possible number of values. If the statement is executed with a
-lesser number of data values, then bind ``None`` for missing values. For
-example, if a query is used for up to five values, but only two values are used
-in a particular execution, the code could be:
-
-.. code-block:: python
-
-    items = ["Smith", "Taylor", None, None, None]
-    cursor.execute("""
-        select employee_id, first_name, last_name
-        from employees
-        where last_name in (:1, :2, :3, :4, :5)""",
-        items)
-    for row in cursor:
-        print(row)
-
-This will produce the same output as the original example.
-
-Reusing the same SQL statement like this for a variable number of values,
-instead of constructing a unique statement per set of values, allows best reuse
-of Oracle Database resources. Additionally, if a statement with a large
-number of bind variable placeholders is executed many times with varying string
-lengths for each execution, then consider using :func:`Cursor.setinputsizes()`
-to reduce Oracle Database's SQL ":ref:`version count <sqlversioncount>`" for
-the statement. For example, if the columns are VARCHAR2(25), then add this
-before the :meth:`Cursor.execute()` call:
-
-.. code-block:: python
-
-    cursor.setinputsizes(25,25,25,25,25)
-
-If other bind variables are required in the statement, adjust the bind variable
-placeholder numbers appropriately:
-
-.. code-block:: python
-
-    binds = [120]                                   # employee id
-    binds += ["Smith", "Taylor", None, None, None]  # IN list
-    cursor.execute("""
-        select employee_id, first_name, last_name
-        from employees
-        where employee_id > :1
-        and last_name in (:2, :3, :4, :5, :6)""",
-        binds)
-    for row in cursor:
-        print(row)
-
-If a statement containing WHERE IN is not going to be re-executed, or the
-number of values is only going to be known at runtime, then a SQL statement can
-be dynamically built:
-
-.. code-block:: python
-
-    bind_values = ["Gates", "Marvin", "Fay"]
-    bind_names = ",".join(":" + str(i + 1) for i in range(len(bind_values)))
-    sql = f"select first_name, last_name from employees where last_name in ({bind_names})"
-    cursor.execute(sql, bind_values)
-    for row in cursor:
-        print(row)
-
-Binding a Large Number of Items in an IN List
----------------------------------------------
-
-The number of items in an IN list is limited to 65535 in Oracle Database
-version 23, and to 1000 in earlier versions. If you exceed the limit, the
-database will return an error like ``ORA-01795: maximum number of expressions
-in a list is 65535``.
-
-To use more values in the IN clause list, you can add OR clauses like:
-
-.. code-block:: python
-
-    sql = """select . . .
-             where key in (:0,:1,:2,:3,:4,:5,:6,:7,:8,:9,:10,:11,...)
-                or key in (:50,:51,:52,:53,:54,:55,:56,:57,:58,:59,...)
-                or key in (:100,:101,:102,:103,:104,:105,:106,:107,:108,:109,...)"""
-
-A more general solution for a larger number of values is to construct a SQL
-statement like::
-
-    SELECT ... WHERE col IN ( <something that returns a list of values> )
-
-The best way to do the '<something that returns a list of values>' depends on
-how the data is initially represented and the number of items. For example you
-might look at using a global temporary table.
-
-One method for large IN lists is to use an Oracle Database collection with
-the ``TABLE()`` clause. For example, if the following type was created::
-
-    SQL> CREATE OR REPLACE TYPE name_array AS TABLE OF VARCHAR2(25);
-      2  /
-
-then the application could do:
-
-.. code-block:: python
-
-    type_obj = connection.gettype("NAME_ARRAY")
-    obj = type_obj.newobject()
-    obj.extend(["Smith", "Taylor"])
-    cursor.execute("""select employee_id, first_name, last_name
-                      from employees
-                      where last_name in (select * from table(:1))""",
-                   [obj])
-    for row in cursor:
-        print(row)
-
-When using this technique, it is important to review the database optimizer
-plan to ensure it is efficient.
-
-Since this ``TABLE()`` solution uses an object type, there is a performance
-impact because of the extra :ref:`round-trips <roundtrips>` required to get the
-type information. Unless you have a large number of binds you may prefer one of
-the previous solutions. For efficiency, retain the return value of
-:meth:`Connection.gettype()` for reuse where possible instead of making
-repeated calls to it.
-
-Some users employ the types SYS.ODCINUMBERLIST, SYS.ODCIVARCHAR2LIST, or
-SYS.ODCIDATELIST instead of creating their own type, but this should be used
-with the understanding that the database may remove these in a future version,
-and that their size is 32K - 1.
-
-Binding Column and Table Names
-==============================
-
-Table names cannot be bound in SQL queries.  You can concatenate text to build
-up a SQL statement, but ensure that you use an Allow List or other means to
-validate the data in order to avoid SQL Injection security issues:
-
-.. code-block:: python
-
-    table_allow_list = ['employees', 'departments']
-    table_name = get_table_name() #  get the table name from user input
-    if table_name.lower() not in table_allow_list:
-        raise Exception('Invalid table name')
-    sql = f'select * from {table_name}'
-
-Binding column names can be done either by using a similar method, or by using
-a CASE statement.  The example below demonstrates binding a column name in an
-ORDER BY clause:
-
-.. code-block:: python
-
-    sql = """
-        select *
-        from departments
-        order by
-            case :bindvar
-                when 'DEPARTMENT_ID' then
-                    department_id
-                else
-                    manager_id
-            end"""
-
-    col_name = get_column_name() # Obtain a column name from the user
-    cursor.execute(sql, [col_name])
-
-Depending on the name provided by the user, the query results will be
-ordered either by the column DEPARTMENT_ID or the column MANAGER_ID.
diff --git a/doc/src/user_guide/connection_handling.rst b/doc/src/user_guide/connection_handling.rst
deleted file mode 100644
index 51755120..00000000
--- a/doc/src/user_guide/connection_handling.rst
+++ /dev/null
@@ -1,4323 +0,0 @@
-.. _connhandling:
-
-.. currentmodule:: oracledb
-
-*****************************
-Connecting to Oracle Database
-*****************************
-
-Connections between python-oracledb and Oracle Database are used for
-executing :ref:`SQL <sqlexecution>` and :ref:`PL/SQL <plsqlexecution>`, for
-calling :ref:`SODA <sodausermanual>` functions, for receiving database
-:ref:`notifications <cqn>` and :ref:`messages <aqusermanual>`, and for
-:ref:`starting and stopping <startup>` the database.
-
-This chapter covers python-oracledb's synchronous programming model. For
-discussion of asynchronous programming, see :ref:`asyncio`.
-
-By default, python-oracledb runs in a 'Thin' mode which connects directly to
-Oracle Database.  This mode does not need Oracle Client libraries.  However,
-some :ref:`additional functionality <featuresummary>` is available when
-python-oracledb uses them.  Python-oracledb is said to be in 'Thick' mode when
-Oracle Client libraries are used.  See :ref:`enablingthick`.  Both modes have
-comprehensive functionality supporting the Python Database API v2.0
-Specification.
-
-If you intend to use the Thick mode, then you *must* call
-:func:`~oracledb.init_oracle_client()` in the application before any standalone
-connection or pool is created.  The python-oracledb Thick mode loads Oracle
-Client libraries which communicate over Oracle Net to an existing database.
-The Oracle Client libraries need to be installed separately.  See
-:ref:`installation`.  Oracle Net is not a separate product: it is how the
-Oracle Client and Oracle Database communicate.
-
-There are two ways to create a connection to Oracle Database using
-python-oracledb:
-
-* **Standalone connections**: :ref:`Standalone connections
-  <standaloneconnection>` are useful when the application needs a single
-  connection to a database.  Connections are created by calling
-  :meth:`oracledb.connect()`. For :ref:`asyncio <asyncio>`, use
-  :meth:`oracledb.connect_async()` instead, see :ref:`connasync`.
-
-* **Pooled connections**: :ref:`Connection pooling <connpooling>` is important
-  for performance when applications frequently connect and disconnect from the
-  database.  Pools support Oracle's :ref:`high availability <highavailability>`
-  features and are recommended for applications that must be reliable.  Small
-  pools can also be useful for applications that want a few connections
-  available for infrequent use.  Pools are created with
-  :meth:`oracledb.create_pool()` at application initialization time, and then
-  :meth:`ConnectionPool.acquire()` can be called to obtain a connection from a
-  pool. For :ref:`asyncio <asyncio>`, use :meth:`oracledb.create_pool_async()`
-  and :meth:`AsyncConnectionPool.acquire()` instead, see :ref:`asyncconnpool`.
-
-Many connection behaviors can be controlled by python-oracledb connection
-options.  Other settings can be configured in :ref:`optnetfiles` or in
-:ref:`optclientfiles`.  These include limiting the amount of time that opening
-a connection can take, or enabling :ref:`network encryption <netencrypt>`.
-
-.. _standaloneconnection:
-
-Standalone Connections
-======================
-
-Standalone connections are database connections that do not use a
-python-oracledb connection pool.  They are useful for simple applications that
-use a single connection to a database.  Simple connections are created by
-calling :meth:`oracledb.connect()` and passing:
-
-- A database username
-- The database password for that user
-- A 'data source name' connection string, see :ref:`connstr`
-
-Python-oracledb also supports :ref:`external authentication <extauth>` so
-passwords do not need to be in the application. For information on other
-authentication methods supported, see :ref:`authenticationmethods`.
-
-Creating a Standalone Connection
---------------------------------
-
-Standalone connections are created by calling :meth:`oracledb.connect()`.
-
-A simple standalone connection example:
-
-.. code-block:: python
-
-    import oracledb
-    import getpass
-
-    userpwd = getpass.getpass("Enter password: ")
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-You could alternatively read the password from an environment variable:
-
-.. code-block:: python
-
-    userpwd = os.environ.get("PYTHON_PASSWORD")
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="localhost/orclpdb")
-
-The :meth:`oracledb.connect()` method allows the database host name and
-database service name to be passed as separate parameters.  The database
-listener port can also be passed:
-
-.. code-block:: python
-
-    import os
-
-    userpwd = os.environ.get("PYTHON_PASSWORD")
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  host="localhost", port=1521, service_name="orclpdb")
-
-A single, combined connection string can be passed to ``connect()`` but this
-may cause complications if the password contains "@" or "/" characters:
-
-.. code-block:: python
-
-    username="hr"
-    userpwd = os.environ.get("PYTHON_PASSWORD")
-    host = "localhost"
-    port = 1521
-    service_name = "orclpdb"
-
-    dsn = f'{username}/{userpwd}@{host}:{port}/{service_name}'
-    connection = oracledb.connect(dsn)
-
-If you like to encapsulate values, parameters can be passed using a
-:ref:`ConnectParams Object <usingconnparams>`:
-
-.. code-block:: python
-
-    params = oracledb.ConnectParams(host="my_host", port=my_port, service_name="my_service_name")
-    conn = oracledb.connect(user="my_user", password="my_password", params=params)
-
-Some values such as the database host name can be specified as ``connect()``
-parameters, as part of the ``dsn`` connection string, and in the ``params``
-object. A final connection string is internally constructed from any ``dsn``,
-individual parameters, and ``params`` object values. The precedence is that
-values in a ``dsn`` parameter override values passed as individual parameters,
-which themselves override values set in the ``params`` object.
-
-Closing Connections
-+++++++++++++++++++
-
-Connections should be released when they are no longer needed. You may prefer
-to let connections be automatically cleaned up when references to them go out
-of scope. This lets python-oracledb close dependent resources in the correct
-order. For example, you can use a Python `context manager
-<https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-``with`` block:
-
-.. code-block:: python
-
-    with oracledb.connect(user="hr", password=userpwd, dsn="myhostname/orclpdb") as connection:
-        with connection.cursor() as cursor:
-            cursor.execute("insert into SomeTable values (:1)", ("Some string"))
-            connection.commit()
-
-This code ensures that once the block is completed, the connection is closed
-and resources have been reclaimed by the database. In addition, any attempt to
-use the variable ``connection`` outside of the block will simply fail.
-
-Alternatively, you can explicitly close a connection by calling.
-:meth:`Connection.close()`:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="localhost/orclpdb")
-
-    # do something with the connection
-    . . .
-
-    # close the connection
-    connection.close()
-
-If you explicitly close connections you may also need to close other resources
-first.
-
-.. _connerrors:
-
-Common Connection Errors
-------------------------
-
-Some of the common connection errors that you may encounter in the
-python-oracledb's default Thin mode are detailed below.  Also see
-:ref:`errorhandling`.
-
-Use keyword parameters
-++++++++++++++++++++++
-
-If you use:
-
-.. code-block:: python
-
-    connection = oracledb.connect("hr", userpwd, "localhost/orclpdb")
-
-then you will get the error::
-
-    TypeError: connect() takes from 0 to 1 positional arguments but 3 were given
-
-The :meth:`oracledb.connect()` method requires keyword parameters to be used
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="localhost/orclpdb")
-
-The exception passing a single argument containing the combined credential and
-connection string.  This is supported:
-
-.. code-block:: python
-
-    connection = oracledb.connect("hr/userpwd@localhost/orclpdb")
-
-Use the correct credentials
-+++++++++++++++++++++++++++
-
-If your username or password are not known by the database that you attempted
-to connect to, then you will get the error::
-
-    ORA-01017: invalid credential or not authorized; logon denied
-
-Find the correct username and password and try reconnecting.
-
-Use the correct connection string
-+++++++++++++++++++++++++++++++++
-
-If the hostname, port, or service name are incorrect, then the connection will fail
-with the error::
-
-    DPY-6001: cannot connect to database. Service "doesnotexist" is not
-    registered with the listener at host "localhost" port 1521. (Similar to
-    ORA-12514)
-
-This error means that Python successfully reached a computer (in this case,
-"localhost" using the default port 1521) that is running a database.  However,
-the database service you wanted ("doesnotexist") does not exist there.
-
-Technically, the error means the listener does not know about the service at the
-moment.  So you might also get this error if the database is currently restarting.
-
-This error is similar to the ``ORA-12514`` error that you may see when
-connecting with python-oracledb Thick mode, or with some other Oracle tools.
-
-The solution is to use a valid service name in the connection string. You can:
-
-- Check and fix any typos in the service name you used
-
-- Check if the hostname and port are correct
-
-- Ask your database administrator (DBA) for the correct values
-
-- Wait a few moments and re-try in case the database is restarting
-
-- Review the connection information in your cloud console or cloud wallet, if
-  you are using a cloud database
-
-- Run `lsnrctl status` on the database machine to find the known service names
-
-
-.. _connstr:
-
-Oracle Net Services Connection Strings
-======================================
-
-The data source name parameter ``dsn`` of :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, and
-:meth:`oracledb.create_pool_async()`, is the Oracle Database Oracle Net
-Services Connection String (commonly abbreviated as "connection string") that
-identifies which database service to connect to.  The ``dsn`` value can be one
-of Oracle Database's naming methods:
-
-* An Oracle :ref:`Easy Connect <easyconnect>` string
-* A :ref:`Connect Descriptor <conndescriptor>`
-* A :ref:`TNS Alias <netservice>` mapping to a Connect Descriptor stored in a
-  :ref:`tnsnames.ora <optnetfiles>` file
-* An :ref:`LDAP URL <ldapurl>`
-* A :ref:`Configuration Provider URL <configproviderurl>`
-
-Connection strings used for JDBC and Oracle SQL Developer need to be altered to
-be usable as the ``dsn`` value, see :ref:`jdbcconnstring`.
-
-For more information about naming methods, see the `Database Net Services
-Administrator's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-E5358DEA-D619-4B7B-A799-3D2F802500F1>`__.
-
-.. note::
-
-    Creating a connection in python-oracledb Thin mode always requires a
-    connection string, or the database host name and service name, to be
-    specified.  The Thin mode cannot use "bequeath" connections and does not
-    reference Oracle environment variables ``ORACLE_SID``, ``TWO_TASK``,
-    or ``LOCAL``.
-
-.. _easyconnect:
-
-Easy Connect Syntax for Connection Strings
-------------------------------------------
-
-An `Easy Connect <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-59956F00-4996-4943-8D8B-9720DC67AD5D>`__ string is often the simplest
-connection string to use in the data source name parameter ``dsn`` of
-connection functions such as :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, and
-:meth:`oracledb.create_pool_async()`.
-
-Using Easy Connect strings means that an external :ref:`tnsnames.ora
-<optnetfiles>` configuration file is not needed.
-
-The Easy Connect syntax in python-oracledb is::
-
-    [[protocol:]//]host1{,host12}[:port1]{,host2:port2}{;host1{,host12}[:port1]}[/[service_name][:server][/instance_name]][?parameter_name=value{&parameter_name=value}]
-
-See the `Database Net Services Administrator's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-8C85D289-6AF3-41BC-848B-BF39D32648BA>`__
-and the technical brief `Oracle Database Easy Connect Plus
-<https://download.oracle.com/ocomdocs/global/Oracle-Net-Easy
--Connect-Plus.pdf>`__ for more details.
-
-For example, to connect to the Oracle Database service ``orclpdb`` that is
-running on the host ``dbhost.example.com`` with the default Oracle
-Database port 1521, use:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-If the database is using a non-default port, it must be specified:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com:1984/orclpdb")
-
-The Easy Connect syntax supports Oracle Database service names.  It cannot
-be used with the older System Identifiers (SID).
-
-**Oracle Net Settings in Easy Connect Strings**
-
-The Easy Connect syntax allows some `Oracle Network and database
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-8C85D289-6AF3-41BC-848B-BF39D32648BA>`__ configuration options to be
-set. This means that a :ref:`sqlnet.ora <optnetfiles>` file is not needed for
-common connection scenarios.
-
-For example, to set a connection timeout and keep-alive value:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                 dsn="dbhost.example.com/orclpdb?transport_connect_timeout=10&expire_time=2")
-
-
-For more information, see :ref:`connectdesckeywords`. Any Easy Connect
-parameters that are not known to python-oracledb are ignored and not passed to
-the database.
-
-**Python-oracledb Settings in Easy Connect Strings**
-
-Many python-oracledb connection method API arguments can alternatively be
-passed as Easy Connect parameters with a "pyo."  prefix.  For example, to set
-the statement cache size used by connections:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb?pyo.stmtcachesize=50")
-
-See :ref:`pyoparams` for the usable attributes.
-
-.. _conndescriptor:
-
-Connect Descriptors
--------------------
-
-Connect Descriptors can be embedded directly in python-oracledb applications,
-or referenced via a :ref:`TNS Alias <netservice>`.
-
-An example of direct use is:
-
-.. code-block:: python
-
-    dsn = """(DESCRIPTION=
-                 (FAILOVER=on)
-                 (ADDRESS_LIST=
-                   (ADDRESS=(PROTOCOL=tcp)(HOST=sales1-svr)(PORT=1521))
-                   (ADDRESS=(PROTOCOL=tcp)(HOST=sales2-svr)(PORT=1521)))
-                 (CONNECT_DATA=(SERVICE_NAME=sales.example.com)))"""
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn=dsn)
-
-The :meth:`oracledb.ConnectParams()` and
-:meth:`ConnectParams.get_connect_string()` functions can be used to construct a
-connect descriptor from the individual components, see :ref:`usingconnparams`.
-For example:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(host="dbhost.example.com", port=1521, service_name="orclpdb")
-    dsn = cp.get_connect_string()
-    print(dsn)
-
-This prints::
-
-    (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=dbhost.example.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orclpdb)))
-
-Syntax is shown in the `Database Net Services Reference
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-012BCA50-70FC-4951-9473-B6089718FF1C>`__.
-
-Any ``DESCRIPTION``, ``CONNECT_DATA`` and ``SECURITY`` parameters of a full
-connect descriptor that are unrecognized by python-oracledb are passed to the
-database unchanged.
-
-.. _netservice:
-
-TNS Aliases for Connection Strings
-----------------------------------
-
-:ref:`Connect Descriptors <conndescriptor>` are commonly stored in a
-:ref:`tnsnames.ora <optnetfiles>` file and associated with a TNS Alias.  This
-alias can be used directly for the data source name parameter ``dsn`` of
-:meth:`oracledb.connect()`, :meth:`oracledb.create_pool()`,
-:meth:`oracledb.connect_async()`, and :meth:`oracledb.create_pool_async()`.
-For example, given a file ``/opt/oracle/config/tnsnames.ora`` with the
-following contents::
-
-    ORCLPDB =
-      (DESCRIPTION =
-        (ADDRESS = (PROTOCOL = TCP)(HOST = dbhost.example.com)(PORT = 1521))
-        (CONNECT_DATA =
-          (SERVER = DEDICATED)
-          (SERVICE_NAME = orclpdb)
-        )
-      )
-
-Then you could connect by passing the TNS Alias "ORCLPDB" (case insensitive) as
-the ``dsn`` value:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb",
-                                  config_dir="/opt/oracle/config")
-
-In python-oracledb Thick mode, the configuration directory can also be set
-during library initialization:
-
-.. code-block:: python
-
-    oracledb.init_oracle_client(config_dir="/opt/oracle/config")
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb")
-
-More options for how python-oracledb locates :ref:`tnsnames.ora <optnetfiles>`
-files are detailed in :ref:`usingconfigfiles`.
-
-TNS Aliases may also be resolved by :ref:`LDAP <ldapconnections>`.
-
-For more information about Net Service Names, see `Database Net Services
-Reference <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-12C94B15-2CE1-4B98-9D0C-8226A9DDF4CB>`__.
-
-.. _ldapurl:
-
-LDAP URL Connection Strings
----------------------------
-
-The python-oracledb connection string can be an LDAP URL like:
-
-.. code-block:: python
-
-    ldapurl = "ldaps://ldapserver.example.com/cn=orcl,cn=OracleContext,dc=example,dc=com"
-    connection = oracledb.connect(user="scott", password=pw, dsn=ldapurl)
-
-This syntax removes the need for external LDAP and ``sqlnet.ora`` configuration
-files. See the technical brief `Oracle Client 23ai LDAP URL Syntax
-<https://www.oracle.com/a/otn/docs/database/oracle-net-23ai-ldap-url.pdf>`__.
-
-In python-oracledb Thin mode, an additional :ref:`connection protocol hook
-function <registerprotocolhook>` is required to handle this connection
-protocol, see :ref:`ldapconnections`. A connection protocol hook function is
-also required in python-oracledb Thick mode if
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` is *False*.
-
-To use LDAP URLs in python-oracledb Thick mode applications when
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` is *True*, the Oracle Client libraries
-must be 23.4, or later.
-
-
-.. _configproviderurl:
-
-Centralized Configuration Provider URL Connection Strings
----------------------------------------------------------
-
-A :ref:`Centralized Configuration Provider <configurationproviders>` URL
-connection string allows python-oracledb configuration information to be stored
-centrally in OCI Object Storage, in Azure App Configuration, or in a local
-file. Given a provider URL, python-oracledb will access the information stored
-in the configuration provider and use it to connect to Oracle Database.
-
-The database connect descriptor and any database credentials stored in a
-configuration provider will be used by any language driver that accesses the
-configuration. Other driver-specific sections can exist. Python-oracledb will
-take settings that are in a section with the prefix "pyo", and will ignore
-other sections.
-
-For example, to use connection configuration stored in a local file
-``/opt/oracle/my-config.json``:
-
-.. code-block:: json
-
-    {
-      "connect_descriptor": "localhost/orclpdb",
-      "pyo": {
-        "min": 5,
-        "max": 10,
-        "increment": 2
-        "stmtcachesize": 4
-      }
-    }
-
-You could use this to create a connection pool by specifying the ``dsn``
-connection string parameter as:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                dsn="config-file:///opt/oracle/my-config.json")
-
-
-The pool will be created using the pool settings from the configuration.
-
-The Centralized Configuration Provider URL must begin with
-"config-<configuration-provider>://" where the configuration-provider value can
-be set to *ociobject*, *azure*, or *file*, depending on the location of your
-configuration information.
-
-See :ref:`configurationproviders` for more information, particularly regarding
-using python-oracledb Thick mode.
-
-The valid keys for the "pyo" object are shown in :ref:`pyoparams`.
-
-.. _jdbcconnstring:
-
-JDBC and Oracle SQL Developer Connection Strings
-------------------------------------------------
-
-The python-oracledb connection string syntax is different from Java JDBC and
-the common Oracle SQL Developer syntax.  If these JDBC connection strings
-reference a service name like::
-
-    jdbc:oracle:thin:@hostname:port/service_name
-
-For example::
-
-    jdbc:oracle:thin:@dbhost.example.com:1521/orclpdb
-
-then use Oracle's Easy Connect syntax in python-oracledb:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com:1521/orclpdb")
-
-You may need to remove JDBC-specific parameters from the connection string and
-use python-oracledb alternatives.
-
-If a JDBC connection string uses an old-style Oracle Database SID "system
-identifier", and the database does not have a service name::
-
-    jdbc:oracle:thin:@hostname:port:sid
-
-For example::
-
-    jdbc:oracle:thin:@dbhost.example.com:1521:orcl
-
-then connect by using the ``sid`` parameter:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  host="dbhost.example.com", port=1521, sid="orcl")
-
-Alternatively, create a ``tnsnames.ora`` entry (see :ref:`optnetfiles`), for
-example::
-
-    finance =
-     (DESCRIPTION =
-       (ADDRESS = (PROTOCOL = TCP)(HOST = dbhost.example.com)(PORT = 1521))
-       (CONNECT_DATA =
-         (SID = ORCL)
-       )
-     )
-
-This can be referenced in python-oracledb:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="finance")
-
-.. _connectdesckeywords:
-
-Oracle Net Connect Descriptor and Easy Connect Keywords
--------------------------------------------------------
-
-Easy Connect syntax is described in :ref:`easyconnect`.
-
-Connect Descriptor keywords are shown in the `Database Net Services Reference
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-7F967CE5-5498-
-427C-9390-4A5C6767ADAA>`__.
-
-**Notes on specific keywords**
-
-The ``POOL_CONNECTION_CLASS`` or ``POOL_PURITY`` values will only work when
-connected to Oracle Database 21c, or later. Note if ``POOL_PURITY=SELF`` is
-used in a connect string, then python-oracledb Thick mode applications will
-ignore the action to drop the session when attempting to remove an unusable
-connections from a pool in some uncommon error cases. It is recommended to
-avoid using ``POOL_PURITY=SELF`` in a connect string with python-oracledb Thick
-mode. Instead, code python-oracledb Thick mode applications to explicitly
-specify the purity and connection class as attributes.
-
-The ``ENABLE=BROKEN`` connect descriptor option is not supported by
-python-oracledb Thin mode. Use ``EXPIRE_TIME`` instead.
-
-If a name is given as a connect string, then python-oracledb will consider it
-as a Net Service Name and not as the minimal Easy Connect string of a hostname.
-The given connect string will be looked up in a :ref:`tnsnames.ora
-<optnetfiles>` file. If supporting a bare name as a hostname is important to
-you in python-oracledb, then you can alter the connection string to include a
-protocol such as ``tcp://hostname``, or a port number such as
-``hostname:1521``.
-
-In python-oracledb Thick mode, when
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` is *False*, any ``DESCRIPTION``,
-``CONNECT_DATA`` and ``SECURITY`` parameters of a full connect descriptor that
-are unrecognized by python-oracledb are passed to the database unchanged. Any
-Easy Connect parameters that are not known to python-oracledb are discarded and
-not passed to the database.
-
-.. _pyoparams:
-
-Python-oracledb Parameters Settable in Easy Connect Strings or Centralized Configuration Providers
---------------------------------------------------------------------------------------------------
-
-Some python-oracledb connection and pool creation parameters can be set in
-:ref:`Easy Connect strings <easyconnect>` or via a :ref:`Centralized
-Configuration Provider <configurationproviders>`.  This is an alternative to
-passing explicit arguments to :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()`. This allows application behavior to be
-changed without needing application code to be updated.
-
-The parameters are shown below in :ref:`this table
-<params_ez_config_provider>`.  Parameters have a "pyo." prefix or are under a
-"pyo" key. Each of these parameters that is defined in an Easy Connect string
-or via a Centralized Configuration Provider will take precedence over the value
-passed as the equivalent python-oracledb API parameter.
-
-Parameters that apply to :ref:`pool creation <connpooling>` will be ignored if
-they are used in the context of :ref:`standalone connections
-<standaloneconnection>`.  Parameters with unknown names will be ignored in both
-cases.
-
-**Python-oracledb Parameters in Easy Connect Strings**
-
-The Easy Connect parameter names are similar to the python-oracledb method
-argument names, but have a "pyo."  prefix. For example:
-
-.. code-block:: python
-
-    cs = "host.example.com:1522/orclpdb?pyo.stmtcachesize=30&pyo.mode=SYSDBA"
-    connection = oracledb.connect(user="hr", password=userpwd, dsn=cs)
-
-is the same as:
-
-.. code-block:: python
-
-    cs = "host.example.com:1522/orclpdb"
-    connection = oracledb.connect(user="hr", password=userpwd, dsn=cs,
-                       stmtcachesize=30, mode=oracledb.AuthMode.SYSDBA)
-
-If a parameter is specified multiple times in an Easy Connect string, then the
-last value of that parameter is used. For example, in
-"localhost/orclpdb?pyo.sdu=10&pyo.sdu=20" the SDU is set to 20.
-
-Note some Oracle Net parameters can also be prefixed with "pyo.".
-
-Parameters with the prefix "pyo." can only be used in Easy Connect strings and
-not in :ref:`Connect Descriptors <conndescriptor>`.
-
-**Python-oracledb Parameters in Configuration Providers**
-
-With the :ref:`File Centralized Configuration Provider <fileconfigprovider>` or
-:ref:`OCI Object Storage Centralized Configuration Provider
-<ociobjstorageprovider>`, the settable python-oracledb driver attributes should
-be in the JSON file under the key "pyo". An example is:
-
-.. code-block:: json
-
-    {
-      "connect_descriptor": "localhost/orclpdb",
-      "pyo": {
-        "min": 5,
-        "max": 10,
-        "increment": 2
-        "stmtcachesize": 4
-      }
-    }
-
-With :ref:`Azure App Configuration <azureappstorageprovider>`, values are set
-using a key such as "<prefix>/pyo/<key name>". This is similar to how `Oracle
-Call Interface <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=LNOCI>`__ settings use the key "<prefix>/oci/<key name>" as shown in
-`Oracle Net Service Administrator’s Guide <https://www.oracle.com/pls/topic
-/lookup?ctx=dblatest&id=GUID-97E22A68-6FE3-4FE9-98A9-90E5BF83E9EC>`__.
-
-.. _params_ez_config_provider:
-
-**Parameter Names**
-
-When used in Easy Connect Strings, the parameter names should be prefixed with
-"pyo.".  When used in a Centralized Configuration Provider, the parameter
-names are used to form the key names under a parent "pyo" key or with a "pyo/"
-prefix. The names are case insensitive.
-
-.. list-table-with-summary:: Python-oracledb parameters usable in Easy Connect Strings or Centralized Configuration Providers
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :name:  _params_ez_config_provider_table
-    :summary: The first column displays the base parameter name. The second column displays the type of the parameter. The third column displays the equivalent API parameter name. The fourth column contains notes.
-
-    * - Base Parameter Name
-      - Type/Value
-      - Equivalent python-oracledb Connection Parameter Name
-      - Notes
-    * - ``CCLASS``
-      - String
-      - ``cclass``
-      - No relevant notes
-    * - ``CONNECTION_ID_PREFIX``
-      - String
-      - ``connection_id_prefix``
-      - No relevant notes
-    * - ``DISABLE_OOB``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``disable_oob``
-      - No relevant notes
-    * - ``DRIVER_NAME``
-      - String
-      - ``driver_name``
-      - No relevant notes
-    * - ``EDITION``
-      - String
-      - ``edition``
-      - No relevant notes
-    * - ``EVENTS``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``events``
-      - No relevant notes
-    * - ``EXPIRE_TIME``
-      - Integer
-      - ``expire_time``
-      - No relevant notes
-    * - ``EXTERNALAUTH``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``externalauth``
-      - No relevant notes
-    * - ``EXTRA_AUTH_PARAMS``
-      - A dictionary containing the configuration parameters necessary for Oracle Database authentication using :ref:`OCI <cloudnativeauthoci>` or :ref:`Azure <cloudnativeauthoauth>` cloud native authentication plugins.
-      - ``extra_auth_params``
-      - For use by Centralized Configuration Providers only
-    * - ``GETMODE``
-      - String, values may be one of *FORCEGET*, *NOWAIT*, *WAIT*, or *TIMEDWAIT* mapping to :ref:`connpoolmodes`.
-      - ``getmode``
-      - Pool creation only
-    * - ``HOMOGENEOUS``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``homogeneous``
-      - Pool creation only
-    * - ``HTTPS_PROXY``
-      - String
-      - ``https_proxy``
-      - No relevant notes
-    * - ``HTTPS_PROXY_PORT``
-      - Integer
-      - ``https_proxy_port``
-      - No relevant notes
-    * - ``INCREMENT``
-      - Integer
-      - ``increment``
-      - Pool creation only
-    * - ``MACHINE``
-      - String
-      - ``machine``
-      - No relevant notes
-    * - ``MAX``
-      - Integer
-      - ``max``
-      - Pool creation only
-    * - ``MAX_LIFETIME_SESSION``
-      - Integer
-      - ``max_lifetime_session``
-      - Pool creation only
-    * - ``MAX_SESSIONS_PER_SHARD``
-      - Integer
-      - ``max_sessions_per_shard``
-      - Pool creation only
-    * - ``MIN``
-      - Integer
-      - ``min``
-      - Pool creation only
-    * - ``MODE``
-      - String, values may be one of *DEFAULT*, *PRELIM*, *SYSASM*, *SYSBKP*, *SYSDBA*, *SYSDGD*, *SYSKMT*, *SYSOPER*, or *SYSRAC* mapping to :ref:`connection-authorization-modes`.
-      - ``mode``
-      - No relevant notes
-    * - ``OSUSER``
-      - String
-      - ``osuser``
-      - No relevant notes
-    * - ``PING_INTERVAL``
-      - Integer
-      - ``ping_interval``
-      - Pool creation only
-    * - ``PING_TIMEOUT``
-      - Integer
-      - ``ping_timeout``
-      - Pool creation only
-    * - ``POOL_BOUNDARY``
-      - String
-      - ``pool_boundary``
-      - No relevant notes
-    * - ``PROGRAM``
-      - String
-      - ``program``
-      - No relevant notes
-    * - ``PURITY``
-      - String, values may be one of *DEFAULT*, *NEW*, or *SELF* mapping to :ref:`drcppurityconsts`.
-      - ``purity``
-      - No relevant notes
-    * - ``RETRY_COUNT``
-      - Integer
-      - ``retry_count``
-      - No relevant notes
-    * - ``RETRY_DELAY``
-      - Integer
-      - ``retry_delay``
-      - No relevant notes
-    * - ``SDU``
-      - Integer
-      - ``sdu``
-      - No relevant notes
-    * - ``SODA_METADATA_CACHE``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``soda_metadata_cache``
-      - Pool creation only
-    * - ``SSL_SERVER_CERT_DN``
-      - String
-      - ``ssl_server_cert_dn``
-      - No relevant notes
-    * - ``SSL_SERVER_DN_MATCH``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``ssl_server_dn_match``
-      - No relevant notes
-    * - ``STMTCACHESIZE``
-      - Integer
-      - ``stmtcachesize``
-      - No relevant notes
-    * - ``TCP_CONNECT_TIMEOUT``
-      - Integer
-      - ``tcp_connect_timeout``
-      - No relevant notes
-    * - ``TERMINAL``
-      - String
-      - ``terminal``
-      - No relevant notes
-    * - ``TIMEOUT``
-      - Integer
-      - ``timeout``
-      - Pool creation only
-    * - ``USE_TCP_FAST_OPEN``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``use_tcp_fast_open``
-      - No relevant notes
-    * - ``USE_SNI``
-      - String representing a boolean. Values may be one of *on* or *off*, *true* or *false*, *yes* or *no* (case insensitive).
-      - ``use_sni``
-      - No relevant notes
-    * - ``WAIT_TIMEOUT``
-      - Integer
-      - ``wait_timeout``
-      - Pool creation only
-    * - ``WALLET_LOCATION``
-      - String
-      - ``wallet_location``
-      - Not recommended for use in Configuration Providers because the path name may not be valid on any particular application host.
-
-.. _authentication:
-
-Authenticating to Oracle Database
-=================================
-
-When connecting to Oracle Database, authentication plays a key role in
-establishing an authorized connection. Python-oracledb supports various Oracle
-Database authentication methods which are listed below:
-
-- :ref:`dbauthentication`
-- :ref:`proxyauth`
-- :ref:`extauth`
-- :ref:`tokenauth`
-- :ref:`instanceprincipalauth`
-
-The Oracle Client libraries used by python-oracledb Thick mode may support
-additional authentication methods that are configured independently of the
-driver.
-
-.. _configurationproviders:
-
-Centralized Configuration Providers
-===================================
-
-`Centralized Configuration Providers <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-E5D6E5D9-654C-4A11-90F8-2A79C58ABD38>`__ allow the storage
-and management of database connection credentials and application configuration
-information in a central location. Providers allow you to separately store
-configuration information from the code of your application. The values that
-can be stored includes the database connection string, database credentials, a
-cache time, and python-oracledb specific attributes such as connection pool
-settings. Python-oracledb can use the centrally stored information to connect
-to Oracle Database with :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, and
-:meth:`oracledb.create_pool_async()`.
-
-The following configuration providers are supported by python-oracledb:
-
-- :ref:`File Centralized Configuration Provider <fileconfigprovider>`
-- :ref:`Oracle Cloud Infrastructure (OCI) Object Storage Centralized
-  Configuration Provider <ociobjstorageprovider>`
-- :ref:`Microsoft Azure App Centralized Configuration Provider
-  <azureappstorageprovider>`
-
-To use :ref:`Centralized Configuration Provider <configurationproviders>`
-functionality in python-oracledb Thick mode, you should set
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` to *False*. Alternatively use
-:meth:`ConnectParams.parse_connect_string()`, see :ref:`usingconnparams`.
-
-Note: In Thick mode, when :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` is *True*, it is the Oracle Client
-libraries that access the configuration provider when python-oracledb
-connection or pool creation methods are invoked. Any python-oracledb parameter
-section will be ignored. Any Oracle Client Interface parameter section should
-be *removed* from the configuration because its values may be different to
-those that python-oracledb assumes, and will cause undefined behavior.
-
-**Precedence of Attributes**
-
-Defining attributes in multiple places is not recommended. However, if
-you have defined the values of ``user`` and ``password`` in both the
-application and the configuration provider, then the values defined in the
-application will have the higher precedence. If the ``externalauth`` parameter
-is set to *True*, then the ``user`` and ``password`` values specified in the
-configuration provider are ignored.
-
-If other python-oracledb connection attributes have been defined in both the
-application and the configuration provider, then the values defined in the
-configuration provider will have higher precedence.
-
-If you are using Thick mode, and have defined python-oracledb attributes in an
-``oraaccess.xml`` file (see :ref:`optclientfiles`), the configuration provider,
-and the application, then the values defined in the configuration provider will
-have the higher precedence followed by the ``oraaccess.xml`` file settings, and
-then application settings.
-
-.. _fileconfigprovider:
-
-Using a File Centralized Configuration Provider
------------------------------------------------
-
-The File Centralized Configuration Provider enables the storage and management
-of Oracle Database connection information using local files.
-
-To use a File Centralized Configuration Provider, you must:
-
-1. Store the connection information in a JSON file on your local file system.
-
-2. Set the path to the file in the ``dsn`` parameter of connection and pool
-   creation methods.
-
-**File Centralized Configuration Provider JSON File Syntax**
-
-The configuration file must contain at least a ``connect_descriptor`` key to
-specify the database connection string. Optionally, you can store the database
-user name, password, a cache time, and :ref:`python-oracledb settings
-<pyoparams>`. The keys that can be stored in the file are:
-
-.. list-table-with-summary:: JSON keys for the File Configuration Provider
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 15 25 15
-    :name: _file_configuration_provider
-    :summary: The first column displays the name of the key. The second column displays its description. The third column displays whether the key is required or optional.
-
-    * - Key
-      - Description
-      - Required or Optional
-    * - ``user``
-      - The database user name.
-      - Optional
-    * - ``password``
-      - The password of the database user as a dictionary containing the key "type" and password type-specific keys.
-
-        .. warning::
-
-            Storing passwords in the configuration file should only ever be used in development or test environments.
-
-      - Optional
-    * - ``connect_descriptor``
-      - The database :ref:`connection string <connstr>`.
-      - Required
-    * - ``config_time_to_live``
-      - The number of seconds the configuration is cached for. Defaults to 86,400 seconds (24 hours).
-      - Optional
-    * - ``config_time_to_live_grace_period``
-      - The number of seconds an expired configuration can still be used if a new configuration cannot be obtained. Defaults to 1,800 seconds (30 minutes).
-      - Optional
-    * - ``pyo``
-      - See :ref:`pyoparams`.
-      - Optional
-
-See the `Oracle Net Service Administrator’s Guide <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-B43EA22D-5593-40B3-87FC-C70D6DAF780E>`__ for
-more information on the generic provider sub-objects usable in JSON files.
-
-Multiple configurations can be defined by specifying the above keys under
-user-chosen, top-level keys, see the example further below.
-
-**File Centralized Configuration Provider DSN Syntax**
-
-To use a file provider, specify the ``dsn`` parameter of
-:meth:`oracledb.connect()`, :meth:`oracledb.create_pool()`,
-:meth:`oracledb.connect_async()`, or :meth:`oracledb.create_pool_async()` using
-the following format::
-
-    config-file://<file-path-and-name>[?key=<key_name>]
-
-The elements of the ``dsn`` parameter are detailed in the table below.
-
-.. list-table-with-summary:: Connection String Parameters for File Configuration Provider
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 20 60
-    :name: _connection_string_for_file_configuration_provider
-    :summary: The first column displays the name of the connection string parameter. The second column displays the description of the connection string parameter.
-
-    * - Parameter
-      - Description
-    * - ``config-file``
-      - Indicates that the centralized configuration provider is a file in your
-        local system.
-    * - <file-name>
-      - The file path and name of the JSON file that contains the configuration
-        information. For relative paths, python-oracledb will use the
-        connection or pool creation ``config_dir`` parameter, or
-        :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` value, to
-        create an absolute path.
-    * - ``key``
-      - The connection key name used to identify a specific configuration. If
-        this parameter is specified, the file is assumed to contain multiple
-        configurations that are indexed by the key value. If not specified, the
-        file is assumed to contain a single configuration. See the example
-        further below.
-
-**File Configuration Provider Examples**
-
-An example of File Configuration Provider file syntax is::
-
-    {
-        "user": "scott",
-        "password": {
-            "type": "base64",
-            "value": "dGlnZXI="
-        },
-        "connect_descriptor": "dbhost.example.com:1522/orclpdb",
-        "pyo": {
-            "stmtcachesize": 30,
-            "min": 2,
-            "max": 10
-        }
-    }
-
-This encodes the password as base64.  See :ref:`ociobjstorageprovider` for
-other password examples. Plaintext passwords are not supported.
-
-Note that python-oracledb caches configurations by default, see
-:ref:`conncaching`.
-
-If you have this configuration file in ``/opt/oracle/my-config1.json``, you
-could use it like:
-
-.. code-block:: python
-
-    connection = oracledb.connect(dsn="config-file:///opt/oracle/my-config1.json")
-
-Multiple configurations can be defined by specifying user-chosen top-level
-keys::
-
-    {
-        "production": {
-            "connect_descriptor": "localhost/orclpdb"
-        },
-        "testing": {
-            "connect_descriptor": "localhost/orclpdb",
-            "user": "scott",
-            "password": {
-                "type": "base64",
-                "value": "dGlnZXI="
-            }
-        }
-    }
-
-If you have this configuration file in ``/opt/oracle/my-config2.json``, you
-could use it like:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                 dsn="config-file:///opt/oracle/my-config2.json?key=production")
-
-
-.. _ociobjstorageprovider:
-
-Using an OCI Object Storage Centralized Configuration Provider
---------------------------------------------------------------
-
-The Oracle Cloud Infrastructure (OCI) `Object Storage configuration provider
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-B43EA22D-5593-
-40B3-87FC-C70D6DAF780E>`__ enables the storage and management of Oracle
-Database connection information as JSON in `OCI Object Storage <https://docs.
-oracle.com/en-us/iaas/Content/Object/Concepts/objectstorageoverview.htm>`__.
-
-To use an OCI Object Storage Centralized Configuration Provider, you must:
-
-1. Upload a JSON file that contains the connection information into an OCI
-   Object Storage Bucket. See `Uploading an Object Storage Object to a Bucket
-   <https://docs.oracle.com/en-us/iaas/Content/Object/Tasks/managingobjects_
-   topic-To_upload_objects_to_a_bucket.htm>`__ and the `Oracle Net Service
-   Administrator’s Guide <https://www.oracle.com/pls/topic/lookup?ctx=
-   dblatest&id=GUID-B43EA22D-5593-40B3-87FC-C70D6DAF780E>`__ for the steps.
-   See :ref:`OCI Object Storage Centralized Configuration Provider Parameters
-   <ociconfigparams>` for the configuration information that can be added.
-
-2. Install the Python `OCI <https://pypi.org/project/oci/>`__ module, see
-   :ref:`ociccpmodules`.
-
-3. Import the :ref:`oracledb.plugins.oci_config_provider <configociplugin>`
-   plugin in your application.
-
-4. :ref:`Use an OCI Object Storage connection string URL <connstringoci>`
-   in the ``dsn`` parameter of connection and pool creation methods.
-
-.. _ociconfigparams:
-
-**OCI Object Storage Centralized Configuration Provider JSON File Syntax**
-
-The stored JSON configuration file must contain a ``connect_descriptor`` key.
-Optionally, you can specify the database user name, password, a cache time, and
-python-oracledb attributes. The database password can also be stored securely
-using `OCI Vault <https://docs.oracle.com/en-us/iaas/Content/
-KeyManagement/Tasks/managingsecrets.htm>`__ or `Azure Key Vault
-<https://learn.microsoft.com/en-us /azure/key-vault/general/overview>`__. The
-keys that can be in the JSON file are listed below.
-
-.. list-table-with-summary:: JSON Keys for OCI Object Storage Configuration Provider
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 15 25 15
-    :name: _oci_object_storage_sub-objects
-    :summary: The first column displays the name of the key. The second column displays the description of the key. The third column displays whether the key is required or optional.
-
-    * - Key
-      - Description
-      - Required or Optional
-    * - ``user``
-      - The database user name.
-      - Optional
-    * - ``password``
-      - The password of the database user as a dictionary containing the key "type" and password type-specific keys.
-      - Optional
-    * - ``connect_descriptor``
-      - The database :ref:`connection string <connstr>`.
-      - Required
-    * - ``config_time_to_live``
-      - The number of seconds the configuration is cached for. Defaults to 86,400 seconds (24 hours).
-      - Optional
-    * - ``config_time_to_live_grace_period``
-      - The number of seconds an expired configuration can still be used if a new configuration cannot be obtained. Defaults to 1,800 seconds (30 minutes).
-      - Optional
-    * - ``pyo``
-      - See :ref:`pyoparams`.
-      - Optional
-
-.. _connstringoci:
-
-**OCI Object Storage Centralized Configuration Provider DSN Syntax**
-
-The ``dsn`` parameter for :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()` calls should use a connection string URL
-in the format::
-
-    config-ociobject:<objectstorage-name>/n/{namespaceName}/b/{bucketName}/o/
-    <objectName>[/c/<networkServiceName>][?<option1>=<value1>&<option2>=<value2>...]
-
-The elements of the connection string are detailed in the table below.
-
-.. list-table-with-summary:: Connection String Parameters for OCI Object Storage
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 15 25 15
-    :name: _connection_string_for_oci_object_storage
-    :summary: The first row displays the name of the connection string parameter. The second row displays the description of the connection string parameter. The third row displays whether the connection string parameter is required or optional.
-
-    * - Parameter
-      - Description
-      - Required or Optional
-    * - ``config-ociobject``
-      - Indicates that the configuration provider is OCI Object Storage.
-      - Required
-    * - <objectstorage-name>
-      - The URL of OCI Object Storage endpoint.
-      - Required
-    * - <namespaceName>
-      - The OCI Object Storage namespace where the JSON file is stored.
-      - Required
-    * - <bucketName>
-      - The OCI Object Storage bucket name where the JSON file is stored.
-      - Required
-    * - <objectName>
-      - The JSON file name.
-      - Required
-    * - <networkServiceName>
-      - The network service name or alias if the JSON file contains one or more network service names.
-      - Optional
-    * - <option>=<value>
-      - The authentication method and its corresponding parameters to access the OCI Object Storage configuration provider. You can specify one of the following authentication methods: API Key-based authentication, Instance Principal Authentication, and Resource Principal Authentication. See :ref:`ociobjectstorageauthmethods` for more information.
-      - Optional
-
-**OCI Object Storage Centralized Configuration Provider Examples**
-
-An example of OCI Object Centralized Storage Configuration Provider JSON file
-syntax is::
-
-    {
-        "user": "scott",
-        "password": {
-            "type": "ocivault",
-            "value": "oci.vaultsecret.my-secret-id"
-            "authentication": {
-                "method": "OCI_INSTANCE_PRINCIPAL"
-            }
-        },
-        "connect_descriptor": "dbhost.example.com:1522/orclpdb",
-        "pyo": {
-            "stmtcachesize": 30,
-            "min": 2,
-            "max": 10
-        }
-    }
-
-Passwords can optionally be stored using the Azure Key Vault. To do this,
-you must import the :ref:`oracledb.plugins.azure_config_provider
-<configazureplugin>` python-oracledb plugin in your application and you must
-define the Azure Key Vault credentials in the ``password`` key. In this, the
-``azure_client_id`` and ``azure_tenant_id`` must be specified. Also, either
-``azure_client_secret`` or ``azure_client_certificate_path`` should be
-specified. For example::
-
-    "password": {
-        "type": "azurevault",
-        "value": "<Azure Key Vault URI>",
-        "authentication": {
-            "azure_tenant_id": "<tenant_id>",
-            "azure_client_id": "<client_id>",
-            "azure_client_secret": "<secret value>"
-        }
-    }
-
-Or::
-
-    "password": {
-        "type": "azurevault",
-        "value": "<Azure Key Vault URI>",
-        "authentication": {
-            "azure_tenant_id": "<tenant_id>",
-            "azure_client_id": "<client_id>",
-            "azure_client_certificate_path": "<azure_client_certificate_path>"
-        }
-    }
-
-Note that python-oracledb caches configurations by default, see
-:ref:`conncaching`.
-
-An example of a connection string for the OCI Object Centralized Storage
-configuration provider is:
-
-.. code-block:: python
-
-    configociurl = "config-ociobject://abc.oraclecloud.com/n/abcnamespace/b/abcbucket/o/abcobject?authentication=oci_default&oci_tenancy=abc123&oci_user=ociuser1&oci_fingerprint=ab:14:ba:13&oci_key_file=ociabc/ocikeyabc.pem"
-
-To create a :ref:`standalone connection <standaloneconnection>` you could use
-this like:
-
-.. code-block:: python
-
-    import oracledb.plugins.oci_config_provider
-
-    configociurl = "config-ociobject://abc.oraclecloud.com/n/abcnamespace/b/abcbucket/o/abcobject?authentication=oci_default&oci_tenancy=abc123&oci_user=ociuser1&oci_fingerprint=ab:14:ba:13&oci_key_file=ociabc/ocikeyabc.pem"
-
-    connection = oracledb.connect(dsn=configociurl)
-
-The configuration can also be used to create a :ref:`connection pool
-<connpooling>`, for example:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(dsn=configociurl)
-
-.. _azureappstorageprovider:
-
-Using an Azure App Centralized Configuration Provider
------------------------------------------------------
-
-`Azure App Configuration <https://learn.microsoft.com/en-us/azure/azure-app-
-configuration/overview>`__ is a cloud-based service provided by Microsoft
-Azure. It can be used for storage and management of Oracle Database connection
-information as key-value pairs.
-
-To use python-oracledb with Azure App Configuration, you must:
-
-1. Save your configuration information in your Azure App Configuration
-   Provider. See :ref:`Azure App Centralized Configuration Provider Parameters
-   <azureconfigparams>`.
-
-2. Install the Azure App modules, see :ref:`azureccpmodules`.
-
-3. Import the :ref:`oracledb.plugins.azure_config_provider <configazureplugin>`
-   plugin in your application.
-
-4. :ref:`Use an Azure App Configuration connection string URL
-   <connstringazure>` in the ``dsn`` parameter of connection and pool creation
-   methods.
-
-.. _azureconfigparams:
-
-**Azure App Centralized Configuration Provider Parameters**
-
-Key-value pairs for stored connection information can be added using the
-Configuration explorer page of your Azure App Configuration. See `Create a
-key-value in Azure App Configuration <https://learn.microsoft.com/
-en-us/azure/azure-app-configuration/quickstart-azure-app-configuration-create?
-tabs=azure-portal#create-a-key-value>`__ for more information.  Alternatively,
-they can be set by making `REST <https://learn.microsoft.com/en-us/python
-/api/azure-appconfiguration/azure.appconfiguration.azureappconfigurationclient
-?view=azure-python#azure-appconfiguration-azureappconfigurationclient-add-
-configuration-setting>`__ calls.  Also see the `Oracle Net Service
-Administrator’s Guide <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id
-=GUID-FCCF1C8D-E4E9-4061-BEE5-5F21654BAC18>`__.
-
-You can organize the key-value pairs under a prefix based on your
-application's needs. For example, if you have two applications, Sales and
-Human Resources, then you can store the relevant configuration information
-under the prefix *sales* and the prefix *hr*.
-
-The key-value pairs must contain the key ``connect_descriptor`` which specifies
-the database connection string. This can be set using a prefix as
-"<prefix>/connect_descriptor", for example, *sales/connect_descriptor*.
-
-You can additionally store the database user name using a key such as
-"<prefix>/user", and store the password using "<prefix>/password". For example,
-*sales/user* and *sales/password*. The database password can also be stored
-securely using `Azure Key Vault <https://learn.microsoft.com/en-us
-/azure/key-vault/general/overview>`__.  A cache time can optionally be stored
-using "<prefix>/config_time_to_live". For example, *sales/60000*. See
-:ref:`conncaching`.
-
-Optional python-oracledb settings can be set using a key such as
-"<prefix>/pyo/<key name>", for example *sales/pyo/min*. This is similar to how
-`Oracle Call Interface <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=LNOCI>`__ settings use keys like "<prefix>/oci/<key name>" as shown in
-`Oracle Net Service Administrator’s Guide <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-97E22A68-6FE3-4FE9-98A9-90E5BF83E9EC>`__.
-
-The keys that can be added in Azure App Configuration are listed below:
-
-.. list-table-with-summary:: Keys for Azure App Configuration
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 15 25 15
-    :name: _azure_app_configuration_keys
-    :summary: The first column displays the name of the key. The second column displays the description of the key. The third column displays whether the key is required or optional.
-
-    * - Key
-      - Description
-      - Required or Optional
-    * - ``user``
-      - The database user name.
-      - Optional
-    * - ``password``
-      - The password of the database user as a dictionary containing the key "type" and password type-specific keys. If using Azure Key Vault, this can be the URI to the vault containing the secret key, specified using the key "uri"
-      - Optional
-    * - ``connect_descriptor``
-      - The database :ref:`connection string <connstr>`.
-      - Required
-    * - ``config_time_to_live``
-      - The number of seconds the configuration is cached for. Defaults to 86,400 seconds (24 hours).
-      - Optional
-    * - ``config_time_to_live_grace_period``
-      - The number of seconds an expired configuration can still be used if a new configuration cannot be obtained. Defaults to 1,800 seconds (30 minutes).
-      - Optional
-    * - ``pyo``
-      - See :ref:`pyoparams`.
-      - Optional
-
-.. _connstringazure:
-
-**Azure App Centralized Configuration Provider DSN Syntax**
-
-You must define a connection string URL in a specific format in the ``dsn``
-parameter of :meth:`oracledb.connect()`, :meth:`oracledb.create_pool()`,
-:meth:`oracledb.connect_async()`, or :meth:`oracledb.create_pool_async()` to
-access the information stored in Azure App Configuration. The syntax is::
-
-    config-azure://<appconfigname>[?key=<prefix>&label=<value>&<option1>=<value1>&<option2>=<value2>...]
-
-The elements of the connection string are detailed in the table below.
-
-.. list-table-with-summary:: Connection String Parameters for Azure App Centralized Configuration Provider
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :widths: 15 25 15
-    :name: _connection_string_for_azure_app
-    :summary: The first row displays the name of the connection string parameter. The second row displays the description of the connection string parameter. The third row displays whether the connection string parameter is required or optional.
-
-    * - Parameter
-      - Description
-      - Required or Optional
-    * - config-azure
-      - Indicates that the configuration provider is Azure App Configuration.
-      - Required
-    * - <appconfigname>
-      - The URL of the Azure App Configuration endpoint. The suffix ".azconfig.io" in the name is optional.
-      - Required
-    * - key=<prefix>
-      - A key prefix to identify the connection. You can organize configuration information under a prefix as per application requirements.
-      - Required
-    * - label=<value>
-      - The Azure App Configuration label name.
-      - Optional
-    * - <option>=<value>
-      - The authentication method and its corresponding parameters to access the Azure App Configuration provider. You can specify one of the following authentication methods: Default Azure Credential, Service Principal with Client Secret, Service Principal with Client Certificate, and Managed Identity. See :ref:`azureappauthmethods` for more information on these authentication methods and their corresponding parameters.
-      - Optional
-
-**Azure App Centralized Configuration Examples**
-
-.. _azureappconfigexample:
-
-The following table shows sample configuration information defined using the
-Configuration explorer page of your Azure App Configuration provider. The
-example uses the prefix ``test/``.
-
-.. list-table-with-summary::
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :widths: 30 70
-    :name: _azure_app_configuration_keys_and_values
-    :summary: The first row displays the name of the key defined in Azure App Configuration. The second row displays the value of the key defined in Azure App Configuration.
-
-    * - Sample Azure App Configuration Key
-      - Sample Value
-    * - test/connect_descriptor
-      - ``dbhost.example.com:1522/orclpdb``
-    * - test/user
-      - ``scott``
-    * - test/password
-      - ``{"uri":"https://mykeyvault.vault.azure.net/secrets/passwordsales"}``
-    * - test/pyo/max
-      - ``20``
-
-Note that python-oracledb caches configurations by default, see
-:ref:`conncaching`.
-
-An example of a connection string for the Azure App Configuration provider is:
-
-.. code-block:: python
-
-    configazureurl = "config-azure://aznetnamingappconfig.azconfig.io/?key=test/&azure_client_id=123-456&azure_client_secret=MYSECRET&azure_tenant_id=789-123"
-
-.. _useazureconfigprovider:
-
-An example using a :ref:`standalone connection <standaloneconnection>` is:
-
-.. code-block:: python
-
-    import oracledb.plugins.azure_config_provider
-
-    configazureurl = "config-azure://aznetnamingappconfig.azconfig.io/?key=test/&azure_client_id=123-456&azure_client_secret=MYSECRET&azure_tenant_id=789-123"
-
-    oracledb.connect(dsn=configazureurl)
-
-The configuration can also be used to create a :ref:`connection pool
-<connpooling>`, for example:
-
-.. code-block:: python
-
-    oracledb.create_pool(dsn=configazureurl)
-
-.. _conncaching:
-
-Caching Configuration Information
----------------------------------
-
-Python-oracledb caches configurations obtained from Centralized Configuration
-Providers to reduce access overheads.
-
-You can use the ``config_time_to_live`` configuration key to specify the number
-of seconds that python-oracledb should keep the information cached. The default
-time is 86,400 seconds (24 hours).
-
-When ``config_time_to_live`` is reached, the configuration is considered to be
-"softly expired" and subsequent python-oracledb connections will attempt to
-obtain the configuration again from the configuration provider. If it cannot be
-retrieved, python-oracledb will continue to use the previous configuration for
-up to ``config_time_to_live_grace_period`` seconds which defaults to 1,800
-seconds (30 minutes). After this grace period the cached configuration fully
-expires. Future connection attempts will try to retrieve the configuration from
-the provider but will fail if the new configuration cannot be obtained.
-
-An example of changing the cache time to 12 hours with an additional grace time
-of 10 minutes for the File or OCI Object Storage Centralized Configuration
-Providers is::
-
-    {
-        "connect_descriptor": "dbhost.example.com:1522/orclpdb",
-        "config_time_to_live": 43200,
-        "config_time_to_live_grace_period": 600,
-        "pyo": {
-            "stmtcachesize": 30,
-            "min": 2,
-            "max": 10
-        }
-    }
-
-.. _usingconnparams:
-
-Using the ConnectParams Builder Class
-======================================
-
-The :ref:`ConnectParams class <connparam>` allows you to define connection
-parameters in a single place.  The :func:`oracledb.ConnectParams()` function
-returns a :ref:`ConnectParams <connparam>` object.  The object can be passed to
-:func:`oracledb.connect()` or :meth:`oracledb.connect_async()`. For example:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(user="hr", password=userpwd,
-                                host="dbhost", port=1521, service_name="orclpdb")
-    connection = oracledb.connect(params=cp)
-
-For connection pools, see :ref:`usingpoolparams`.
-
-The use of the ConnectParams class is optional because you can pass the same
-parameters directly to :func:`~oracledb.connect()`.  For example, the code
-above is equivalent to:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  host="dbhost", port=1521, service_name="orclpdb")
-
-
-If you want to keep credentials separate, you can use ConnectParams just to
-encapsulate connection string components:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(host="dbhost", port=1521, service_name="orclpdb")
-    connection = oracledb.connect(user="hr", password=userpwd, params=cp)
-
-You can use :meth:`ConnectParams.get_connect_string()` to get a connection
-string from a ConnectParams object:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(host="dbhost", port="my_port", service_name="my_service_name")
-    dsn = cp.get_connect_string()
-    connection = oracledb.connect(user="hr", password=userpwd, dsn=dsn)
-
-Some values such as the database host name can be specified as ``connect()``
-parameters, as part of the ``dsn`` connection string, and in the ``params``
-object. A final connection string is internally constructed from any ``dsn``,
-individual parameters, and ``params`` object values. The precedence is that
-values in a ``dsn`` parameter override values passed as individual parameters,
-which themselves override values set in the ``params`` object.
-
-To parse a connection string and store its components as attributes of a
-ConnectParams instance, use :meth:`ConnectParams.parse_connect_string()`. For
-example:
-
-.. code-block:: python
-
-    dsn = "host.example.com:1522/orclpdb?transport_connect_timeout=15&pyo.stmtcachesize=30"
-    cp = oracledb.ConnectParams()
-    cp.parse_connect_string(dsn)
-
-    connection = oracledb.connect(user="hr", password=userpwd, params=cp)
-
-Most parameter values of :func:`oracledb.ConnectParams()` are gettable as
-attributes. For example, to get the stored host name:
-
-.. code-block:: python
-
-    print(cp.host)
-
-Attributes such as the password are not gettable.
-
-You can set individual default attributes using :meth:`ConnectParams.set()`:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(host="localhost", port=1521, service_name="orclpdb")
-
-    # set a new port
-    cp.set(port=1522)
-
-    # change both the port and service name
-    cp.set(port=1523, service_name="orclpdb")
-
-Note :meth:`ConnectParams.set()` has no effect after
-:meth:`ConnectParams.parse_connect_string()` has been called.
-
-The method :meth:`ConnectParams.parse_dsn_with_credentials()` can be used to
-extract the username, password, and connection string from a DSN:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams()
-    (un,pw,cs) = cp.parse_dsn_with_credentials("scott/tiger@localhost/orclpdb")
-
-    print(un)   # scott
-    print(pw)   # tiger
-    print(cs)   # localhost/orclpdb
-
-Any component not found in the DSN is returned as *None*.
-
-The method :meth:`ConnectParams.get_network_service_names()` can be used to get
-a list of the network service names that are defined in the :ref:`tnsnames.ora
-<optnetfiles>` file. The directory that contains file can be specified in the
-:attr:`~ConnectParams.config_dir` attribute.
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams(host="my_host", port=my_port, dsn="orclpdb",
-                                config_dir="/opt/oracle/config")
-    cp.get_network_service_names()
-
-If :meth:`ConnectParams.get_network_service_names()` is called but a
-:ref:`tnsnames.ora <optnetfiles>` file does not exist, then an error such as
-the following is returned::
-
-    DPY-4026: file tnsnames.ora not found in /opt/oracle/config
-
-If :attr:`~ConnectParams.config_dir` is not specified, then the following
-error is returned::
-
-    DPY-4027: no configuration directory specified
-
-When creating a standalone connection (or connection pool with a
-:ref:`PoolParams class <poolparam>`) the equivalent internal extraction is done
-automatically when a value is passed for the ``dsn`` parameter of
-:meth:`oracledb.connect()`, :meth:`oracledb.connect_async()`,
-:meth:`oracledb.create_pool()`, or :meth:`oracledb.create_pool_async()` but no
-value is passed for the ``user`` parameter.
-
-.. _connectionhook:
-
-Connection Hook Functions
-=========================
-
-Python-oracledb supports protocol, password, and parameter hook functions that
-can be used to customize connection logic.
-
-.. _registerprotocolhook:
-
-Using Protocol Hook Functions
------------------------------
-
-The :meth:`oracledb.register_protocol()` method registers a user protocol hook
-function that will be called internally by python-oracledb Thin mode prior to
-connection or pool creation.  The hook function will be invoked when
-:func:`oracledb.connect`, :func:`oracledb.create_pool`,
-:meth:`oracledb.connect_async()`, or :meth:`oracledb.create_pool_async()` are
-called with a ``dsn`` parameter value prefixed with a specified protocol.  Your
-hook function is expected to construct valid connection details, which
-python-oracledb will use to complete the connection or pool creation.
-
-You can also make use of a protocol hook function in python-oracledb Thick mode
-connection calls by setting :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` to *False*. Alternatively use
-:meth:`ConnectParams.parse_connect_string()`, see :ref:`usingconnparams`.
-
-For example, the following hook function handles connection strings prefixed
-with the ``tcp://`` protocol. When :func:`oracledb.connect()` is called, the
-sample hook is invoked internally. It prints the parameters, and sets the
-connection information in the ``params`` parameter (without passing the
-``tcp://`` prefix to :meth:`~ConnectParams.parse_connect_string()` otherwise
-recursion would occur).  This modified ConnectParams object is used by
-python-oracledb to establish the database connection:
-
-.. code-block:: python
-
-    def myprotocolhook(protocol, arg, params):
-        print(f"In myprotocolhook: protocol={protocol} arg={arg}")
-        params.parse_connect_string(arg)
-
-    oracledb.register_protocol("tcp", myprotocolhook)
-
-    connection = oracledb.connect(user="scott", password=userpwd,
-                                  dsn="tcp://localhost/orclpdb")
-
-    with connection.cursor() as cursor:
-        for (r,) in cursor.execute("select user from dual"):
-            print(r)
-
-The output would be::
-
-    In myprotocolhook: protocol=tcp arg=localhost/orclpdb
-    SCOTT
-
-The ``params`` :ref:`attributes <connparamsattr>` can be set with
-:meth:`ConnectParams.parse_connect_string()`, as shown, or by using
-:meth:`ConnectParams.set()`.
-
-See :ref:`ldapconnections` for a fuller example.
-
-Internal protocol hook functions for the "tcp" and "tcps" protocols are
-pre-registered but can be overridden, if needed.  If any other protocol has not
-been registered, then connecting will result in an error.
-
-Calling :meth:`~oracledb.register_protocol()` with the ``hook_function``
-parameter set to None will result in a previously registered user function
-being removed and the default behavior restored.
-
-**Connection Hooks and parse_connect_string()**
-
-A registered user protocol hook function will also be invoked in
-python-oracledb Thin or Thick modes when
-:meth:`ConnectParams.parse_connect_string()` is called with a
-``connect_string`` parameter beginning with the registered protocol.  The hook
-function ``params`` value will be the invoking ConnectParams instance that you
-can update using :meth:`ConnectParams.set()` or
-:meth:`ConnectParams.parse_connect_string()`.
-
-For example, with the hook ``myprotocolhook`` shown previously, then the code:
-
-.. code-block:: python
-
-    cp = oracledb.ConnectParams()
-    cp.set(port=1234)
-    print(f"host is {cp.host}, port is {cp.port}, service name is {cp.service_name}")
-    cp.parse_connect_string("tcp://localhost/orclpdb")
-    print(f"host is {cp.host}, port is {cp.port}, service name is {cp.service_name}")
-
-prints::
-
-    host is None, port is 1234, service name is None
-    In myprotocolhook: protocol=tcp arg=localhost/orclpdb
-    host is localhost, port is 1234, service name is orclpdb
-
-If you have an application that can run in either python-oracledb Thin or Thick
-modes, and you want a registered connection protocol hook function to be used
-in both modes, your connection code can be like:
-
-.. code-block:: python
-
-    dsn = "tcp://localhost/orclpdb"
-
-    cp = oracledb.ConnectParams()
-    cp.parse_connect_string(dsn)
-    connection = oracledb.connect(user="hr", password=userpwd, params=cp)
-
-.. _registerpasswordtype:
-
-Using Password Hook Functions
------------------------------
-
-The :meth:`oracledb.register_password_type()` method registers a user password
-hook function that will be called internally by python-oracledb prior to
-connection or pool creation when :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()` are called. If the ``password``,
-``newpassword``, or ``wallet_password`` parameters to those methods are a
-dictionary containing the key "type", then the registered user password hook
-function for the specific type will be invoked.  Your hook function is expected
-to accept the dictionary and return the actual password string.
-
-Below is an example of a password hook function that handles passwords of type
-base64 stored in a dict like "dict(type='base64', value='dGlnZXI=')".  Note
-this specific hook function is already included and registered in
-python-oracledb:
-
-.. code-block:: python
-
-    def mypasswordhook(args):
-        return base64.b64decode(args["value"].encode()).decode()
-
-    oracledb.register_password_type("base64", mypasswordhook)
-
-When :meth:`oracledb.connect()` is called as shown below, the sample hook is
-invoked internally. It decodes the base64-encoded string in the key "value" and
-returns the password which is then used by python-oracledb to establish a
-connection to the database:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="scott",
-                                  password=dict(type="base64", value="dGlnZXI="),
-                                  dsn="localhost/orclpdb")
-
-Calling :meth:`~oracledb.register_password_type()` with the ``hook_function``
-parameter set to *None* will result in a previously registered user function
-being removed.
-
-.. _registerparamshook:
-
-Using Parameter Hook Functions
-------------------------------
-
-The :meth:`oracledb.register_params_hook()` method registers a user parameter
-hook function that will be called internally by python-oracledb prior to
-connection or pool creation when :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()` are called. Your parameter hook function
-should accept a copy of the parameters that will be used to create the pool or
-standalone connections. The function can access and modify them in any way
-necessary to allow python-oracledb to subsequently complete the connection or
-pool creation request.
-
-Pre-supplied python-oracledb plugins such as the :ref:`OCI Cloud Native
-Authentication Plugin (oci_tokens) <cloudnativeauthoci>` make use of
-:meth:`oracledb.register_params_hook()`. This plugin uses the information found
-in a connection method's ``extra_auth_params`` parameter and modifies the
-``access_token`` parameter with a function that will acquire the authentication
-token needed to complete a connection. Refer to the complete plugin
-implementation in `oci_tokens.py <https://github.com/oracle/python-oracledb/
-blob/main/src/oracledb/plugins/oci_tokens.py>`__. The key code section showing
-registering of a parameter hook function is:
-
-.. code-block:: python
-
-    def oci_token_hook(params: oracledb.ConnectParams):
-
-      if params.extra_auth_params is not None:
-
-        def token_callback(refresh):
-          return generate_token(params.extra_auth_params, refresh)
-
-        params.set(access_token=token_callback)
-
-    oracledb.register_params_hook(oci_token_hook)
-
-Your code might then try to connect like:
-
-.. code-block:: python
-
-    token_based_auth = {
-        "auth_type": "SimpleAuthentication",
-        "user": <user>,
-        "key_file": <key_file>,
-        "fingerprint": <fingerprint>,
-        "tenancy": <tenancy>,
-        "region": <region>,
-        "profile": <profile>
-    }
-
-    connection = oracledb.connect(
-        dsn=mydb_low,
-        extra_auth_params=token_based_auth)
-
-To unregister a user function that was earlier registered, you can use
-:meth:`oracledb.unregister_params_hook`.
-
-If you have registered user hook methods with
-:meth:`oracledb.register_protocol()` and
-:meth:`oracledb.register_params_hook`, then the method registered with
-:meth:`oracledb.register_protocol()` is invoked first during connection or pool
-creation calls. If you call :meth:`ConnectParams.parse_connect_string()`, the
-registered protocol hook method will be called but the parameter hook will not
-be.
-
-..
-   Note to doc writers: do not change the following heading because it is used
-   for a link emitted by ldap_hook() in src/oracledb/builtin_hooks.py
-
-.. _ldapconnections:
-
-LDAP Directory Naming
-=====================
-
-Directory Naming centralizes the network names and addresses used for
-connections in a single place. More details can be found in `Configuring Oracle
-Database Clients for OID and OUD Directory Naming
-<https://www.oracle.com/a/otn/docs/database/oracle-net-oud-oid-directory-naming.pdf>`__
-and `Configuring Oracle Database Clients for Microsoft Active Directory Naming
-<https://www.oracle.com/a/otn/docs/database/oracle-net-active-directory-naming.pdf>`__.
-
-The DSN for LDAP connections can be an alias, as shown in the above references.
-Alternatively it can be an LDAP URL. The URL syntax removes the need for
-external LDAP and ``sqlnet.ora`` configuration files. See the technical brief
-`Oracle Client 23ai LDAP URL Syntax
-<https://www.oracle.com/a/otn/docs/database/oracle-net-23ai-ldap-url.pdf>`__.
-
-**Python-oracledb Thick Mode LDAP Aliases**
-
-Once a directory server is configured, and necessary configuration files have
-been created as explained in the above references, python-oracledb Thick mode
-applications can use the LDAP alias as the python-oracledb connection DSN:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="scott", password=pw, dsn="myLdapAlias")
-
-**Python-oracledb Thick Mode LDAP URLs**
-
-Python-oracledb Thick mode applications using Oracle Client 23.4, or later, can
-connect with an LDAP URL. For example:
-
-.. code-block:: python
-
-    ldapurl = "ldaps://ldapserver.example.com/cn=orcl,cn=OracleContext,dc=example,dc=com"
-    connection = oracledb.connect(user="scott", password=pw, dsn=ldapurl)
-
-To use an LDAP URL in python-oracledb Thick mode when
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough
-<Defaults.thick_mode_dsn_passthrough>` is *False*, a connection hook function
-is required as shown below for Thin mode. This lets LDAP URLs be utilized when
-python-oracledb uses any supported Oracle Client library version.
-
-**Python-oracledb Thin Mode LDAP URLs**
-
-To use LDAP in python-oracledb Thin mode, call
-:meth:`oracledb.register_protocol()` to register your own user :ref:`connection
-protocol hook function <registerprotocolhook>` that gets the database
-connection string from your LDAP server. Your application can then specify an
-LDAP URL as the DSN in connection and pool creation calls.
-
-For example:
-
-.. code-block:: python
-
-    import ldap3
-    import re
-
-    # Get the Oracle Database connection string from an LDAP server when
-    # connection calls use an LDAP URL.
-    # In this example, "protocol"' will have the value "ldap", and "arg" will
-    # be "ldapserver/dbname,cn=OracleContext,dc=dom,dc=com"
-
-    def ldap_hook(protocol, arg, params):
-        pattern = r"^(.+)\/(.+)\,(cn=OracleContext.*)$"
-        match = re.match(pattern, arg)
-        ldap_server, db, ora_context = match.groups()
-
-        server = ldap3.Server(ldap_server)
-        conn = ldap3.Connection(server)
-        conn.bind()
-        conn.search(ora_context, f"(cn={db})", attributes=['orclNetDescString'])
-        connect_string = conn.entries[0].orclNetDescString.value
-        params.parse_connect_string(connect_string)
-
-    oracledb.register_protocol("ldap", ldap_hook)
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                 dsn="ldap://ldapserver/dbname,cn=OracleContext,dc=dom,dc=com")
-
-You can modify or extend this as needed, for example to use an LDAP module that
-satisfies your business and security requirements, to handled LDAPS, or to
-cache the response from the LDAP server.
-
-.. _appcontext:
-
-Connection Metadata and Application Contexts
-============================================
-
-During connection you can set additional metadata properties that can be
-accessed in the database for tracing and for enforcing fine-grained data
-access, for example with Oracle Virtual Private Database policies. Values may
-appear in logs and audit trails.
-
-**End-to-End Tracing Attributes**
-
-The connection attributes :attr:`Connection.client_identifier`,
-:attr:`Connection.clientinfo`, :attr:`Connection.dbop`,
-:attr:`Connection.module`, and :attr:`Connection.action` set metadata about the
-connection.
-
-It is recommended to always set at least :attr:`~Connection.client_identifier`,
-:attr:`~Connection.module`, and :attr:`~Connection.action` for all applications
-because their availability in the database can greatly aid future
-troubleshooting.
-
-See :ref:`endtoendtracing` for more information.
-
-**Application Contexts**
-
-An application context stores user identification that can enable or prevent a
-user from accessing data in the database.  See the Oracle AI Database
-documentation `About Application Contexts <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-6745DB10-F540-45D7-9761-9E8F342F1435>`__.
-
-A context has a namespace and a key-value pair. The namespace CLIENTCONTEXT is
-reserved for use with client session-based application contexts. Contexts are
-set during connection as an array of 3-tuples containing string values for the
-namespace, key, and value.  For example:
-
-.. code-block:: python
-
-    myctx = [
-        ("clientcontext", "loc_id", "1900")
-    ]
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                  appcontext=myctx)
-
-Context values set during connection can be directly queried in your
-applications. For example:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-        sql = """select * from locations
-                 where location_id = sys_context('clientcontext', 'loc_id')"""
-        for r in cursor.execute(sql):
-            print(r)
-
-This will print::
-
-    (1900, '6092 Boxwood St', 'YSW 9T2', 'Whitehorse', 'Yukon', 'CA')
-
-Multiple context values can be set when connecting. For example:
-
-.. code-block:: python
-
-    myctx = [
-        ("clientcontext", "loc_id", "1900"),
-        ("clientcontext", "my_world", "earth"),
-    ]
-
-    connection = oracledb.connect(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                  appcontext=myctx)
-
-    with connection.cursor() as cursor:
-        sql = """select sys_context('clientcontext', 'loc_id'),
-                        sys_context('clientcontext', 'my_world')
-                 from dual"""
-        for r in cursor.execute(sql):
-            print(r)
-
-will display::
-
-    ('1900', 'earth')
-
-You can use contexts to set up restrictive policies that are automatically
-applied to any query executed. See Oracle AI Database documentation `Oracle
-Virtual Private Database (VPD) <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-06022729-9210-4895-BF04-6177713C65A7>`__.
-
-.. _connpooling:
-
-Connection Pooling
-==================
-
-Connection pooling can significantly improve application performance and
-scalability by allowing resource sharing. Pools also let applications use
-optional advanced Oracle High Availability features.
-
-Opening a connection to a database can be expensive: the connection string must
-be parsed, a network connection must be established, the Oracle Database
-network listener needs to be invoked, user authentication must be performed, a
-database server process must be created, and session memory must be allocated
-(and then the process is destroyed when the connection is closed). Connection
-pools remove the overhead of repeatedly opening and closing :ref:`standalone
-connections <standaloneconnection>` by establishing a pool of open connections
-that can be reused throughout the life of an application process.
-
-Various Oracle Database authentication methods are supported in
-python-oracledb, see :ref:`authenticationmethods`.
-
-The pooling solutions available to python-oracledb applications are:
-
-- :ref:`Driver Connection Pools <driverconnpool>`: These are managed by the
-  driver layer. They provide readily available database connections that can be
-  shared by multiple users and are quick for applications to obtain.  They help
-  make applications scalable and highly available. They are created with
-  :meth:`oracledb.create_pool()` or :meth:`oracledb.create_pool_async()`.
-
-  The main use case is for applications that hold connections for relatively
-  short durations while doing database work, and that acquire and release
-  connections back to the pool as needed to do those database operations.
-  Using a driver pool is recommended for applications that need to support
-  multiple users. High availability benefits also make driver pools useful for
-  single-user applications that do infrequent database operations.
-
-- :ref:`drcp`: This is pooling of server processes on the database host so they
-  can be shared between application connections. This reduces the number of
-  server processes that the database host needs to manage.
-
-  DRCP is useful if there are large number of application connections,
-  typically from having multiple application processes, and those applications
-  do frequent connection acquire and release calls as needed to do database
-  operations.  It is recommended to use DRCP in conjunction with a driver
-  connection pool, since this reduces the number of re-authentications and
-  session memory re-allocations.
-
-- `Proxy Resident Connection Pooling (PRCP)
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-E0032017-03B1-
-  4F14-AF9B-BCC87C982DA8>`__: This is connection pooling handled by Oracle's
-  mid-tier connection proxy solution, `CMAN-TDM <https://download.oracle.com/
-  ocomdocs/global/
-  CMAN_TDM_Oracle_DB_Connection_Proxy_for_scalable_apps.pdf>`__.
-
-  PRCP is useful for applications taking advantage of CMAN-TDM.
-
-- :ref:`implicitconnpool`: This can add pooling benefits to applications that
-  connect when they start, and only close the connection when the application
-  terminates — but relatively infrequently do database work. It makes use of
-  DRCP or PRCP, but instead of relying on the application to explicitly acquire
-  and release connections, Implicit Connection Pooling automatically detects
-  when applications are not performing database work. It then allows the
-  associated database server process to be used by another connection that
-  needs to do a database operation.
-
-  Implicit Connection Pooling is useful for legacy applications or third-party
-  code that cannot be updated to use a driver connection pool.
-
-Python-oracledb :ref:`driver connection pools <driverconnpool>` are the first
-choice for performance, scalability, and high availability.  If your database
-is under memory pressure from having too many applications opening too many
-connections, then consider either :ref:`DRCP <drcp>` or :ref:`Implicit
-Connection Pooling <implicitconnpool>`, depending on your application’s
-connection life-cycle. If you are utilizing CMAN-TDM, then using `PRCP
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-E0032017-03B1-4F14-AF9B-BCC87C982DA8>`__ can be considered.
-
-.. _driverconnpool:
-
-Driver Connection Pooling
--------------------------
-
-Python-oracledb's driver connection pooling lets applications create and
-maintain a pool of open connections to the database.  Connection pooling is
-available in both Thin and :ref:`Thick <enablingthick>` modes.  Connection
-pooling is important for performance and scalability when applications need to
-handle a large number of users who do database work for short periods of time
-but have relatively long periods when the connections are not needed.  The high
-availability features of pools also make small pools useful for applications
-that want a few connections available for infrequent use and requires them to
-be immediately usable when acquired.  Applications that would benefit from
-connection pooling but are too difficult to modify from the use of
-:ref:`standalone connections <standaloneconnection>` can take advantage of
-:ref:`implicitconnpool`.
-
-In python-oracledb Thick mode, the pool implementation uses Oracle's `session
-pool technology <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-F9662FFB-EAEF-495C-96FC-49C6D1D9625C>`__ which supports additional
-Oracle Database features, for example some advanced :ref:`high availability
-<highavailability>` features.
-
-.. note::
-
-    Python-oracledb driver connection pools must be created, used, and closed
-    within the same process. Sharing pools or connections across processes has
-    unpredictable behavior.
-
-    Using connection pools in multi-threaded architectures is supported.
-
-    Multi-process architectures that cannot be converted to threading may get
-    some benefit from :ref:`drcp`.
-
-Creating a Connection Pool
-++++++++++++++++++++++++++
-
-A driver connection pool is created by calling :meth:`oracledb.create_pool()`.
-Various pool options can be specified as described in
-:meth:`~oracledb.create_pool()` and detailed below.
-
-For example, to create a pool that initially contains one connection but
-can grow up to five connections:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                min=1, max=5, increment=1)
-
-Getting Connections from a Pool
-+++++++++++++++++++++++++++++++
-
-After a pool has been created, your application can get a connection from
-it by calling :meth:`ConnectionPool.acquire()`:
-
-.. code-block:: python
-
-    connection = pool.acquire()
-
-These connections can be used in the same way that :ref:`standaloneconnection`
-are used.
-
-By default, :meth:`~ConnectionPool.acquire()` calls wait for a connection
-to be available before returning to the application.  A connection will be
-available if the pool currently has idle connections, when another user
-returns a connection to the pool, or after the pool grows.  Waiting allows
-applications to be resilient to temporary spikes in connection load.  Users
-may have to wait a brief time to get a connection but will not experience
-connection failures.
-
-You can change the behavior of :meth:`~ConnectionPool.acquire()` by setting the
-``getmode`` option during pool creation.  For example, the option can be
-set so that if all the connections are currently in use by the application, any
-additional :meth:`~ConnectionPool.acquire()` call will return an error
-immediately.
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                min=2, max=5, increment=1,
-                                getmode=oracledb.POOL_GETMODE_NOWAIT)
-
-Note that when using this option value in python-oracledb Thick mode with
-Oracle Client libraries 12.2 or earlier, the :meth:`~ConnectionPool.acquire()`
-call will still wait if the pool can grow.  However, you will get an error
-immediately if the pool is at its maximum size.  With newer Oracle Client
-libraries and with Thin mode, an error will be returned if the pool has to, or
-cannot, grow.
-
-Returning Connections to a Pool
-+++++++++++++++++++++++++++++++
-
-When your application has finished performing all required database operations,
-the pooled connection should be released back to the pool to make it available
-for other users. For example, you can use a Python `context manager
-<https://docs.python.org/3/library/stdtypes.html#context-manager-types>`__
-``with`` block which lets pooled connections be closed implicitly at the end of
-scope and cleans up dependent resources:
-
-.. code-block:: python
-
-    with pool.acquire() as connection:
-        with connection.cursor() as cursor:
-            for result in cursor.execute("select * from mytab"):
-                print(result)
-
-Alternatively, you can explicitly return connections with
-:meth:`ConnectionPool.release()` or :meth:`Connection.close()`, however you may
-also need to close other resources first.
-
-If you need to force a connection to be closed and its associated database
-server process to be released, use :meth:`ConnectionPool.drop()`:
-
-.. code-block:: python
-
-    with pool.acquire() as connection:
-
-        . . .
-
-        pool.drop(connection)
-
-Avoid doing this unnecessarily because it shrinks the pool. A future
-:meth:`~ConnectionPool.acquire()` call may suffer the overhead of establishing
-a new connection to the database, instead of being able to reuse a connection
-already available in the pool.
-
-Closing a Connection Pool
-+++++++++++++++++++++++++
-
-At application shutdown, the connection pool can be completely closed using
-:meth:`ConnectionPool.close()`:
-
-.. code-block:: python
-
-    pool.close()
-
-To force immediate pool termination when connections are still in use, execute:
-
-.. code-block:: python
-
-    pool.close(force=True)
-
-See `connection_pool.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/connection_pool.py>`__ for a runnable example of connection pooling.
-
-.. _connpoolcache:
-
-Using the Connection Pool Cache
--------------------------------
-
-When your application architecture makes it difficult to pass a
-:ref:`ConnectionPool object <connpool>` between your code layers, you can use
-the python-oracledb connection pool cache. This lets you store and retrieve
-pools by name.
-
-**Adding a pool to the python-oracledb connection pool cache**
-
-To use the python-oracledb pool cache, specify the ``pool_alias`` parameter
-when you create a pool during application initialization. Its value should be a
-user-chosen string. For example:
-
-.. code-block:: python
-
-    import oracledb
-
-    NAME = "my_pool"
-
-    oracledb.create_pool(
-        user="hr",
-        password=userpwd,
-        dsn="dbhost.example.com/orclpdb",
-        pool_alias=NAME
-    )
-
-This creates a pool and stores it in the cache under the name "my_pool". The
-application does not need to store or manage the reference to the pool so the
-:meth:`~oracledb.create_pool()` return value is not saved.
-
-If a pool already exists with the name "my_pool", the following error will
-be raised::
-
-    DPY-2055: connection pool with name "my_pool" already exists
-
-**Getting a connection from a cached pool**
-
-Applications can get a connection from a cached pool by passing its name
-directly to :meth:`oracledb.connect()`:
-
-.. code-block:: python
-
-    import oracledb
-
-    NAME = "my_pool"
-
-    connection = oracledb.connect(pool_alias=NAME)
-
-This is equivalent to calling :meth:`ConnectionPool.acquire()`. You can pass
-additional parameters to :meth:`~oracledb.connect()` that are allowed for
-:meth:`~ConnectionPool.acquire()`. For example, with a :ref:`heterogeneous
-<connpooltypes>` pool you can pass the username and password:
-
-.. code-block:: python
-
-    import oracledb
-
-    NAME = "my_pool"
-
-    connection = oracledb.connect(pool_alias=NAME, user="toto", password=pw)
-
-If there is no pool named ``my_pool`` in the cache, you will get the following
-error::
-
-    DPY-2054: connection pool with name "my_pool" does not exist
-
-You cannot pass ``pool_alias`` and the deprecated ``pool`` parameter together
-to :meth:`oracledb.connect()` or :meth:`oracledb.connect_async()`. If you do,
-the following error is raised::
-
-    DPY-2014: "pool_alias" and "pool" cannot be specified together
-
-**Getting a pool from the connection pool cache**
-
-You can use :meth:`oracledb.get_pool()` to retrieve a pool and then access it
-directly:
-
-.. code-block:: python
-
-    import oracledb
-
-    NAME = "my_pool"
-
-    pool = oracledb.get_pool(NAME)
-    connection = pool.acquire()
-
-This allows any connection pool :ref:`method <connpoolmethods>` or
-:ref:`attribute <connpoolattr>` from a cached pool to be used, as normal.
-
-If there is no pool named ``my_pool`` in the cache, then
-:meth:`~oracledb.get_pool()` will return None.
-
-**Removing a pool from the cache**
-
-A pool is automatically removed from the cache when the pool is closed:
-
-.. code-block:: python
-
-    import oracledb
-
-    NAME = "my_pool"
-
-    pool = oracledb.get_pool(NAME)
-    pool.close()
-
-.. _connpoolsize:
-
-Connection Pool Sizing
-----------------------
-
-The Oracle Real-World Performance Group's recommendation is to use fixed size
-connection pools.  The values of ``min`` and ``max`` should be the same.  When
-using older versions of Oracle Client libraries the ``increment`` parameter
-will need to be zero (which is internally treated as a value of one), but
-otherwise you may prefer a larger size since this will affect how the
-connection pool is re-established after, for example, a network dropout
-invalidates all connections.
-
-Fixed size pools avoid connection storms on the database which can decrease
-throughput.  See `Guideline for Preventing Connection Storms: Use Static Pools
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-7DFBA826-7CC0-
-4D16-B19C-31D168069B54>`__, which contains more details about sizing of pools.
-Having a fixed size will also guarantee that the database can handle the upper
-pool size.  For example, if a dynamically sized pool needs to grow but the
-database resources are limited, then :meth:`ConnectionPool.acquire()` may
-return errors such as `ORA-28547 <https://docs.oracle.com/error-help/db/ora-
-28547/>`__, or the database may simply drop connection attempts and
-python-oracledb will show :ref:`DPY-4011 <dpy4011>`. With a fixed pool size,
-this class of error will generally occur when the pool is created, allowing you
-to change the pool size or reconfigure the database before users access the
-application.  With a dynamically growing pool, the error may occur much later
-while the application is in use.
-
-The Real-World Performance Group also recommends keeping pool sizes small
-because they often can perform better than larger pools. The pool attributes
-should be adjusted to handle the desired workload within the bounds of
-available resources in python-oracledb and the database.
-
-Connection Pool Growth
-++++++++++++++++++++++
-
-At pool creation, ``min`` connections are established to the database.  When a
-pool needs to grow, new connections are created automatically limited by the
-``max`` size.  The pool ``max`` size restricts the number of application users
-that can do work in parallel on the database.
-
-The number of connections opened by a pool can shown with the attribute.
-:attr:`ConnectionPool.opened`.  The number of connections the application has
-obtained with :meth:`~ConnectionPool.acquire()` can be shown with
-:attr:`ConnectionPool.busy`.  The difference in values is the number of
-connections unused or 'idle' in the pool.  These idle connections may be
-candidates for the pool to close, depending on the pool configuration.
-
-Pool growth is normally initiated when :meth:`~ConnectionPool.acquire()` is
-called and there are no idle connections in the pool that can be returned to
-the application.  The number of new connections created internally will be the
-value of the :meth:`~oracledb.create_pool()` parameter ``increment``.
-
-Depending on whether Thin or Thick mode is used and on the pool creation
-``getmode`` value that is set, any :meth:`~ConnectionPool.acquire()` call that
-initiates pool growth may wait until all ``increment`` new connections are
-internally opened.  However, in this case the cost is amortized because later
-:meth:`~ConnectionPool.acquire()` calls may not have to wait and can
-immediately return an available connection.  Some users set larger
-``increment`` values even for fixed-size pools because it can help a pool
-re-establish itself if all connections become invalid, for example after a
-network dropout.  In the common case of Thin mode with the default ``getmode``
-of :data:`oracledb.POOL_GETMODE_WAIT`, any :meth:`~ConnectionPool.acquire()`
-call that initiates pool growth will return after the first new connection is
-created, regardless of how big ``increment`` is.  The pool will then continue
-to re-establish connections in a background thread.
-
-A connection pool can shrink back to its minimum size ``min`` when connections
-opened by the pool are not used by the application. This frees up database
-resources while allowing pools to retain open connections for active users. If
-there are more than ``min`` connections open, and connections are idle in the
-pool (i.e. not currently acquired by the application) and unused for longer
-than the pool creation attribute ``timeout`` value, then they will be closed.
-The check occurs every ``timeout`` interval and hence in the worst case it may
-take twice the ``timeout`` time to close the idle connections. The default
-``timeout`` is *0* seconds signifying an infinite time and meaning idle
-connections will never be closed.
-
-The pool creation parameter ``max_lifetime_session`` also allows pools to
-shrink. This parameter bounds the total length of time that a connection can
-exist starting from the time that it was created in the pool. It is mostly used
-for defensive programming to mitigate against unforeseeable problems that may
-occur with connections. If a connection was created ``max_lifetime_session`` or
-longer seconds ago, then it will be a candidate for being closed. In the case
-when ``timeout`` and ``max_lifetime_session`` are both set, the connection will
-be terminated if either the idle timeout happens or the maximum lifetime
-setting is exceeded. Note that when using python-oracledb in Thick mode with
-Oracle Client libraries prior to 21c, pool shrinkage is only initiated when the
-pool is accessed so pools in fully dormant applications will not shrink until
-the application is next used. In Thick mode, Oracle Client libraries 12.1, or
-later, are needed to use ``max_lifetime_session``.
-
-For pools created with :ref:`external authentication <extauth>`, with
-:ref:`homogeneous <connpooltypes>` set to False, or when using :ref:`drcp` (in
-python-oracledb Thick mode), then the number of connections opened at pool
-creation is zero even if a larger value is specified for ``min``.  Also, in
-these cases the pool increment unit is always 1 regardless of the value of
-``increment``.
-
-.. _poolhealth:
-
-Pool Connection Health
-----------------------
-
-Before :meth:`ConnectionPool.acquire()` returns, python-oracledb does a
-lightweight check similar to :meth:`Connection.is_healthy()` to see if the
-network transport for the selected connection is still open.  If it is not,
-then :meth:`~ConnectionPool.acquire()` will clean up the connection and return
-a different one.
-
-This check will not detect cases such as where the database session has been
-terminated by the DBA, or reached a database resource manager quota limit.  To
-help in those cases, :meth:`~ConnectionPool.acquire()` will also do a full
-:ref:`round-trip <roundtrips>` database ping similar to
-:meth:`Connection.ping()` when it is about to return a connection that was idle
-in the pool (i.e. not acquired by the application) for
-:data:`ConnectionPool.ping_interval` seconds.  If the ping fails, the
-connection will be discarded and another one obtained before
-:meth:`~ConnectionPool.acquire()` returns to the application.  The
-``ping_timeout`` parameter to :meth:`oracledb.create_pool()` limits the amount
-of time that any internal ping is allowed to take. If it is exceeded, perhaps
-due to a network hang, the connection is considered unusable and a different
-connection is returned to the application.
-
-Because this full ping is time based and may not occur for each
-:meth:`~ConnectionPool.acquire()`, the application may still get an unusable
-connection.  Also, network timeouts and session termination may occur between
-the calls to :meth:`~ConnectionPool.acquire()` and :meth:`Cursor.execute()`.
-To handle these cases, applications need to check for errors after each
-:meth:`~Cursor.execute()` and make application-specific decisions about
-retrying work if there was a connection failure.  When using python-oracledb in
-Thick mode, Oracle Database features like :ref:`Application Continuity
-<highavailability>` can do this automatically in some cases.
-
-You can explicitly initiate a full round-trip ping at any time with
-:meth:`Connection.ping()` to check connection liveness but the overuse will
-impact performance and scalability.  To avoid pings hanging due to network
-errors, use :attr:`Connection.call_timeout` to limit the amount of time
-:meth:`~Connection.ping()` is allowed to take.
-
-The :meth:`Connection.is_healthy()` method is an alternative to
-:meth:`Connection.ping()`.  It has lower overheads and may suit some uses, but
-it does not perform a full connection check.
-
-If the ``getmode`` parameter in :meth:`oracledb.create_pool()` is set to
-:data:`oracledb.POOL_GETMODE_TIMEDWAIT`, then the maximum amount of time an
-:meth:`~ConnectionPool.acquire()` call will wait to get a connection from the
-pool is limited by the value of the :data:`ConnectionPool.wait_timeout`
-parameter.  A call that cannot be immediately satisfied will wait no longer
-than ``wait_timeout`` regardless of the value of ``ping_timeout``.
-
-Connection pool health can be impacted by :ref:`firewalls <hanetwork>`,
-`resource managers <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-2BEF5482-CF97-4A85-BD90-9195E41E74EF>`__ or user profile `IDLE_TIME
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-ABC7AE4D-64A8-
-4EA9-857D-BEF7300B64C3>`__ values. For best efficiency, ensure these do not
-expire idle sessions since this will require connections to be recreated which
-will impact performance and scalability.
-
-A pool's internal connection re-establishment after lightweight and full pings
-can mask performance-impacting configuration issues such as firewalls
-terminating connections.  You should monitor `AWR <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-56AEF38E-9400-427B-A818-EDEC145F7ACD>`__
-reports for an unexpectedly large connection rate.
-
-.. _poolreconfiguration:
-
-Connection Pool Reconfiguration
--------------------------------
-
-Some pool settings can be changed dynamically with
-:meth:`ConnectionPool.reconfigure()`.  This allows the pool size and other
-attributes to be changed during application runtime without needing to restart
-the pool or application.
-
-For example a pool's size can be changed like:
-
-.. code-block:: python
-
-    pool.reconfigure(min=10, max=10, increment=0)
-
-After any size change has been processed, reconfiguration on the other
-parameters is done sequentially. If an error such as an invalid value occurs
-when changing one attribute, then an exception will be generated but any already
-changed attributes will retain their new values.
-
-During reconfiguration of a pool's size, the behavior of
-:meth:`ConnectionPool.acquire()` depends on the pool creation ``getmode`` value
-in effect when :meth:`~ConnectionPool.acquire()` is called, see
-:meth:`ConnectionPool.reconfigure()`.  Closing connections or closing the pool
-will wait until after pool reconfiguration is complete.
-
-Calling ``reconfigure()`` is the only way to change a pool's ``min``, ``max``
-and ``increment`` values.  Other attributes such as
-:data:`~ConnectionPool.wait_timeout` can be passed to ``reconfigure()`` or they
-can be set directly, for example:
-
-.. code-block:: python
-
-    pool.wait_timeout = 1000
-
-.. _sessioncallback:
-
-Session Callbacks for Setting Pooled Connection State
------------------------------------------------------
-
-Applications can set "session" state in each connection.  Examples of session
-state are :ref:`NLS globalization <globalization>` settings from ``ALTER
-SESSION`` statements.  Pooled connections will retain their session state after
-they have been released back to the pool.  However, because pools can grow or
-connections in the pool can be recreated, there is no guarantee a subsequent
-:meth:`~ConnectionPool.acquire()` call will return a database connection that
-has any particular state.
-
-The :meth:`~oracledb.create_pool()` parameter ``session_callback`` enables
-efficient setting of session state so that connections have a known session
-state, without requiring that state to be explicitly set after every
-:meth:`~ConnectionPool.acquire()` call.  The callback is internally invoked
-when :meth:`~ConnectionPool.acquire()` is called and runs first.
-
-The session callback can be a Python function or a PL/SQL procedure.
-
-Connections can also be tagged when they are released back to the pool.  The
-tag is a user-defined string that represents the session state of the
-connection.  When acquiring connections, a particular tag can be requested.  If
-a connection with that tag is available, it will be returned.  If not, then
-another session will be returned.  By comparing the actual and requested tags,
-applications can determine what exact state a session has, and make any
-necessary changes.
-
-Connection tagging and PL/SQL callbacks are only available in python-oracledb
-Thick mode.  Python callbacks can be used in python-oracledb Thin and Thick
-modes.
-
-There are three common scenarios for ``session_callback``:
-
-- When all connections in the pool should have the same state, use a
-  Python callback without tagging.
-
-- When connections in the pool require different state for different users, use
-  a Python callback with tagging.
-
-- With :ref:`drcp`, use a PL/SQL callback with tagging.
-
-Python Callback
-+++++++++++++++
-
-If the ``session_callback`` parameter is a Python procedure, it will be called
-whenever :meth:`~ConnectionPool.acquire()` will return a newly created database
-connection that has not been used before.  It is also called when connection
-tagging is being used and the requested tag is not identical to the tag in the
-connection returned by the pool.
-
-An example is:
-
-.. code-block:: python
-
-    # Set the NLS_DATE_FORMAT for a session
-    def init_session(connection, requested_tag):
-        with connection.cursor() as cursor:
-            cursor.execute("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI'")
-
-    # Create the pool with session callback defined
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="localhost/orclpdb",
-                                session_callback=init_session)
-
-    # Acquire a connection from the pool (will always have the new date format)
-    connection = pool.acquire()
-
-If needed, the ``init_session()`` procedure is called internally before
-:meth:`~ConnectionPool.acquire()` returns.  It will not be called when
-previously used connections are returned from the pool.  This means that the
-ALTER SESSION does not need to be executed after every
-:meth:`~ConnectionPool.acquire()` call.  This improves performance and
-scalability.
-
-In this example tagging was not being used, so the ``requested_tag`` parameter
-is ignored.
-
-Note that if you need to execute multiple SQL statements in the callback, use an
-anonymous PL/SQL block to save :ref:`round-trips <roundtrips>` of repeated
-``execute()`` calls.  With ALTER SESSION, pass multiple settings in the one
-statement:
-
-.. code-block:: python
-
-    cursor.execute("""
-            begin
-                execute immediate
-                        'alter session set nls_date_format = ''YYYY-MM-DD''
-                                           nls_language = AMERICAN';
-                -- other SQL statements could be put here
-            end;""")
-
-.. _conntagging:
-
-Connection Tagging
-++++++++++++++++++
-
-Connection tagging is used when connections in a pool should have differing
-session states.  In order to retrieve a connection with a desired state, the
-``tag`` attribute in :meth:`~ConnectionPool.acquire()` needs to be set.
-
-.. note::
-
-    Connection tagging is only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick` .
-
-When python-oracledb is using Oracle Client libraries 12.2 or later, then
-python-oracledb uses 'multi-property tags' and the tag string must be of the
-form of one or more "name=value" pairs separated by a semi-colon, for example
-``"loc=uk;lang=cy"``.
-
-When a connection is requested with a given tag, and a connection with that tag
-is not present in the pool, then a new connection, or an existing connection
-with cleaned session state, will be chosen by the pool and the session callback
-procedure will be invoked.  The callback can then set desired session state and
-update the connection's tag.  However, if the ``matchanytag`` parameter of
-:meth:`~ConnectionPool.acquire()` is True, then any other tagged connection may
-be chosen by the pool and the callback procedure should parse the actual and
-requested tags to determine which bits of session state should be reset.
-
-The example below demonstrates connection tagging:
-
-.. code-block:: python
-
-    def init_session(connection, requested_tag):
-        if requested_tag == "NLS_DATE_FORMAT=SIMPLE":
-            sql = "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'"
-        elif requested_tag == "NLS_DATE_FORMAT=FULL":
-            sql = "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI'"
-        cursor = connection.cursor()
-        cursor.execute(sql)
-        connection.tag = requested_tag
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="orclpdb",
-                                 session_callback=init_session)
-
-    # Two connections with different session state:
-    connection1 = pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE")
-    connection2 = pool.acquire(tag="NLS_DATE_FORMAT=FULL")
-
-See `session_callback.py
-<https://github.com/oracle/python-oracledb/tree/main/
-samples/session_callback.py>`__ for an example.
-
-PL/SQL Callback
-+++++++++++++++
-
-.. note::
-
-    PL/SQL Callbacks are only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick`.
-
-When python-oracledb uses Oracle Client 12.2 or later, the session callback can
-also be the name of a PL/SQL procedure.  A PL/SQL callback will be initiated
-only when the tag currently associated with a connection does not match the tag
-that is requested.  A PL/SQL callback is most useful when using :ref:`drcp`
-because DRCP does not require a :ref:`round-trip <roundtrips>` to invoke a
-PL/SQL session callback procedure.
-
-The PL/SQL session callback should accept two VARCHAR2 arguments:
-
-.. code-block:: sql
-
-    PROCEDURE myPlsqlCallback (
-        requestedTag IN  VARCHAR2,
-        actualTag    IN  VARCHAR2
-    );
-
-The logic in this procedure can parse the actual tag in the session that has
-been selected by the pool and compare it with the tag requested by the
-application.  The procedure can then change any state required before the
-connection is returned to the application from
-:meth:`~ConnectionPool.acquire()`.
-
-If the ``matchanytag`` attribute of :meth:`~ConnectionPool.acquire()` is
-*True*, then a connection with any state may be chosen by the pool.
-
-Oracle 'multi-property tags' must be used.  The tag string must be of the form
-of one or more "name=value" pairs separated by a semi-colon, for example
-``"loc=uk;lang=cy"``.
-
-In python-oracledb set ``session_callback`` to the name of the PL/SQL
-procedure. For example:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                 dsn="dbhost.example.com/orclpdb:pooled",
-                                 session_callback="MyPlsqlCallback")
-
-    connection = pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE",
-                              # DRCP options, if you are using DRCP
-                              cclass='MYCLASS',
-                              purity=oracledb.PURITY_SELF)
-
-See `session_callback_plsql.py
-<https://github.com/oracle/python-oracledb/tree/main/
-samples/session_callback_plsql.py>`__ for an example.
-
-.. _connpooltypes:
-
-Heterogeneous and Homogeneous Connection Pools
-----------------------------------------------
-
-**Homogeneous Pools**
-
-By default, connection pools are 'homogeneous', meaning that all connections
-use the same database credentials.  Both python-oracledb Thin and :ref:`Thick
-<enablingthick>` modes support homogeneous pools.
-
-**Heterogeneous Pools**
-
-The python-oracledb Thick mode additionally supports Heterogeneous pools,
-allowing different user names and passwords to be passed to each
-:meth:`~ConnectionPool.acquire()` call.
-
-To create an heterogeneous pool, set the :meth:`~oracledb.create_pool()`
-parameter ``homogeneous`` to False:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(dsn="dbhost.example.com/orclpdb", homogeneous=False)
-    connection = pool.acquire(user="hr", password=userpwd)
-
-.. _usingpoolparams:
-
-Using the PoolParams Builder Class
-----------------------------------
-
-The :ref:`PoolParams class <poolparam>` allows you to define connection and
-pool parameters in a single place.  The :func:`oracledb.PoolParams()` function
-returns a :ref:`PoolParams <poolparam>` object.  This is a subclass of the
-:ref:`ConnectParams class <connparam>` (see :ref:`usingconnparams`) with
-additional pool-specific attributes such as the maximum pool size. A
-``PoolParams`` object can be passed to :func:`oracledb.create_pool()`. For
-example:
-
-.. code-block:: python
-
-    pp = oracledb.PoolParams(min=1, max=2, increment=1)
-    pool = oracledb.create_pool(user="hr", password=userpw, dsn="dbhost.example.com/orclpdb",
-                                params=pp)
-
-The use of the PoolParams class is optional because you can pass the same
-parameters directly to :func:`~oracledb.create_pool()`.  For example, the code
-above is equivalent to:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpw, dsn="dbhost.example.com/orclpdb",
-                                min=1, max=2, increment=1)
-
-Some values such as the database host name can be specified as
-:func:`oracledb.create_pool()` parameters, as part of the ``dsn`` connection
-string, and in the ``params`` object. A final connection string is internally
-constructed from any ``dsn``, individual parameters, and ``params`` object
-values. The precedence is that values in a ``dsn`` parameter override values
-passed as individual parameters, which themselves override values set in the
-``params`` object.
-
-Most PoolParams arguments are gettable as properties.  They may be set
-individually using the ``set()`` method:
-
-.. code-block:: python
-
-    pp = oracledb.PoolParams()
-    pp.set(min=5)
-    print(pp.min) # 5
-
-.. _drcp:
-
-Database Resident Connection Pooling (DRCP)
-===========================================
-
-`Database Resident Connection Pooling (DRCP)
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-015CA8C1-2386-4626-855D-CC546DDC1086>`__ enables database resource
-sharing for applications which use a large number of connections that run in
-multiple client processes or run on multiple middle-tier application servers.
-By default, each connection from Python will use one database server process.
-DRCP allows pooling of these server processes.  This reduces the amount of
-memory required on the database host.  A DRCP pool can be shared by multiple
-applications.
-
-DRCP is useful for applications which share the same database credentials, have
-similar session settings (for example date format settings or PL/SQL package
-state), and where the application gets a database connection, works on it for a
-relatively short duration, and then releases it.
-
-For efficiency, it is recommended that DRCP connections should be used in
-conjunction with python-oracledb's local :ref:`connection pool <connpooling>`.
-Using DRCP with :ref:`standalone connections <standaloneconnection>` is not as
-efficient but does allow the database to reuse database server processes which
-can provide a performance benefit for applications that cannot use a local
-connection pool. In this scenario, make sure to configure enough DRCP
-authentication servers to handle the connection load.
-
-Although applications can choose whether or not to use DRCP pooled connections
-at runtime, care must be taken to configure the database appropriately for the
-number of expected connections, and also to stop inadvertent use of non-DRCP
-connections leading to a database server resource shortage. Conversely, avoid
-using DRCP connections for long-running operations.
-
-For more information about DRCP, see the technical brief `Extreme Oracle
-Database Connection Scalability with Database Resident Connection Pooling
-(DRCP) <https://www.oracle.com/docs/tech/drcp-technical-brief.pdf>`__, the user
-documentation `Oracle AI Database Concepts Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-531EEE8A-B00A-4C03-A2ED-D45D92B3F797>`__, and for DRCP Configuration
-see `Oracle AI Database Administrator's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-82FF6896-F57E-41CF-89F7-755F3BC9C924>`__.
-
-Using DRCP with python-oracledb applications involves the following steps:
-
-1. Enabling DRCP in the database
-2. Configuring the application to use DRCP pooled servers
-
-Enabling DRCP in Oracle Database
---------------------------------
-
-Oracle Database versions prior to 21c can have a single DRCP connection pool.
-From Oracle Database 21c, each pluggable database can optionally have its own
-pool, or can use the container level pool. From Oracle Database 23.4, you can
-create multiple pools at the pluggable, or container, database level. This
-multi-pool feature is useful where different applications connect to the same
-database, but there is a concern that one application's use of the pool may
-impact other applications. If this is not the case, a single pool may allow
-best resource sharing on the database host.
-
-Note that DRCP is already enabled in Oracle Autonomous Database and pool
-management is different to the steps below.
-
-In the basic scenario, DRCP pools can be configured and administered by a DBA
-using the ``DBMS_CONNECTION_POOL`` package:
-
-.. code-block:: sql
-
-    EXECUTE DBMS_CONNECTION_POOL.CONFIGURE_POOL(
-        pool_name => 'SYS_DEFAULT_CONNECTION_POOL',
-        minsize => 4,
-        maxsize => 40,
-        incrsize => 2,
-        session_cached_cursors => 20,
-        inactivity_timeout => 300,
-        max_think_time => 600,
-        max_use_session => 500000,
-        max_lifetime_session => 86400)
-
-Alternatively, the method ``DBMS_CONNECTION_POOL.ALTER_PARAM()`` can
-set a single parameter:
-
-.. code-block:: sql
-
-    EXECUTE DBMS_CONNECTION_POOL.ALTER_PARAM(
-        pool_name => 'SYS_DEFAULT_CONNECTION_POOL',
-        param_name => 'MAX_THINK_TIME',
-        param_value => '1200')
-
-The ``inactivity_timeout`` setting terminates idle pooled servers, helping
-optimize database resources.  To avoid pooled servers permanently being held
-onto by a selfish Python script, the ``max_think_time`` parameter can be set.
-The parameters ``num_cbrok`` and ``maxconn_cbrok`` can be used to distribute
-the persistent connections from the clients across multiple brokers.  This may
-be needed in cases where the operating system per-process descriptor limit is
-small.  Some customers have found that having several connection brokers
-improves performance.  The ``max_use_session`` and ``max_lifetime_session``
-parameters help protect against any unforeseen problems affecting server
-processes.  The default values will be suitable for most users.  See the
-`Oracle DRCP documentation
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-015CA8C1-2386-4626-855D-CC546DDC1086>`__ for details on parameters.
-
-In general, if pool parameters are changed, then the pool should be restarted.
-Otherwise, server processes will continue to use old settings.
-
-There is a ``DBMS_CONNECTION_POOL.RESTORE_DEFAULTS()`` procedure to
-reset all values.
-
-When DRCP is used with `Oracle RAC
-<https://www.oracle.com/database/real-application-clusters/>`__, each database
-instance has its own connection broker and pool of servers.  Each pool has the
-identical configuration.  For example, all pools start with ``minsize`` server
-processes.  A single DBMS_CONNECTION_POOL command will alter the pool of each
-instance at the same time.  The pool needs to be started before connection
-requests begin.  The command below does this by bringing up the broker, which
-registers itself with the database listener:
-
-.. code-block:: sql
-
-    EXECUTE DBMS_CONNECTION_POOL.START_POOL()
-
-Once enabled this way, the pool automatically restarts when the database
-instance restarts, unless explicitly stopped with the
-``DBMS_CONNECTION_POOL.STOP_POOL()`` command:
-
-.. code-block:: sql
-
-    EXECUTE DBMS_CONNECTION_POOL.STOP_POOL()
-
-Oracle Database version 23 allows a ``DRAINTIME`` argument to be passed to
-``STOP_POOL()``, indicating that the pool will only be closed after the
-specified time.  This allows in-progress application work to continue. A
-draintime value of 0 can be used to immediately close the pool. See the
-database documentation on `DBMS_CONNECTION_POOL.STOP_POOL()
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-3FF5F327-7BE3-
-4EA8-844F-29554EE00B5F>`__.
-
-In older database versions, the pool cannot be stopped while connections are
-open.
-
-Coding Applications to use DRCP
--------------------------------
-
-To use DRCP, application connection establishment must request a DRCP pooled
-server and should specify a user-chosen connection class name. A 'purity' of
-the connection session state can optionally be specified. See the Oracle
-Database documentation on `benefiting from scalability
-<https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-661BB906-74D2-4C5D-9C7E-2798F76501B3>`__ for more information
-on purity and connection classes.
-
-The best practice is to use DRCP in conjunction with a local driver
-:ref:`connection pool <connpooling>` created with
-:meth:`oracledb.create_pool()` or :meth:`oracledb.create_pool_async()`. The
-python-oracledb connection pool size does not need to match the DRCP pool size.
-The limit on overall execution parallelism is determined by the DRCP pool
-size. Note that when using DRCP with a python-oracledb local connection pool in
-Thick mode, the local connection pool ``min`` value is ignored and the pool
-will be created with zero connections.
-
-See `drcp_pool.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/drcp_pool.py>`__
-for a runnable example of DRCP.
-
-**Requesting Pooled Servers be Used**
-
-To enable connections to use DRCP pooled servers, you can:
-
-- Use a specific connection string in :meth:`oracledb.create_pool()` or
-  :meth:`oracledb.connect()` to request a pooled server. For example with the
-  :ref:`Easy Connect syntax <easyconnect>`:
-
-  .. code-block:: python
-
-        pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb:pooled",
-                                    min=2, max=5, increment=1,
-                                    cclass="MYAPP")
-
-- Alternatively, add ``(SERVER=POOLED)`` to the :ref:`Connect Descriptor
-  <conndescriptor>` such as used in an Oracle Network configuration file
-  :ref:`tnsnames.ora <optnetfiles>`::
-
-    customerpool = (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)
-              (HOST=dbhost.example.com)
-              (PORT=1521))(CONNECT_DATA=(SERVICE_NAME=CUSTOMER)
-              (SERVER=POOLED)))
-
-- Another way to use a DRCP pooled server is to set the ``server_type``
-  parameter during standalone connection creation or python-oracledb
-  connection pool creation.  For example:
-
-  .. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                min=2, max=5, increment=1,
-                                server_type="pooled",
-                                cclass="MYAPP")
-
-**DRCP Connection Classes**
-
-The best practice is to specify a ``cclass`` class name when creating a
-python-oracledb connection pool.  This user-chosen name provides some
-partitioning of DRCP session memory so reuse is limited to similar
-applications.  It provides maximum pool sharing if multiple application
-processes are started and use the same class name.  A class name also allows
-better DRCP usage tracking in the database.  In the database monitoring views,
-the class name shown will be the value specified in the application prefixed
-with the user name.
-
-If ``cclass`` was not specified during pool creation, then python-oracledb Thin
-mode generates a unique connection class with the prefix "DPY" while
-python-oracledb Thick mode generates a unique connection class with the prefix
-"OCI".
-
-To create a connection pool requesting DRCP pooled servers be used, and
-specifying a class name, you can call:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb:pooled",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP")
-
-If ``cclass`` is not set, then the pooled server sessions will not be reused
-optimally, and the :ref:`DRCP statistic views <monitoringdrcp>` may record
-large values for NUM_MISSES.
-
-**DRCP Connection Purity**
-
-DRCP allows the connection session memory to be reused or cleaned each time a
-connection is acquired from the pool.  The pool or connection creation
-``purity`` parameter can be one of ``PURITY_NEW``, ``PURITY_SELF``, or
-``PURITY_DEFAULT``.  The value ``PURITY_SELF`` allows reuse of both the pooled
-server process and session memory, giving maximum benefit from DRCP.  By
-default, python-oracledb pooled connections use ``PURITY_SELF`` and standalone
-connections use ``PURITY_NEW``.
-
-To limit session sharing, you can explicitly require that new session memory be
-allocated each time :meth:`~ConnectionPool.acquire()` is called. Do this when
-creating a driver connection pool by specifying the ``purity`` as
-``PURITY_NEW``:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb:pooled",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP", purity=oracledb.PURITY_NEW)
-
-The overheads can impact ultimate scalability.
-
-.. _poolnames:
-
-**DRCP Pool Names**
-
-From Oracle Database 23.4, multiple DRCP pools can be created by setting a pool
-name at DRCP pool creation time. Applications using python-oracledb Thin mode
-can specify which DRCP pool to use by passing the ``pool_name`` parameter
-during connection or connection pool creation, for example:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                dsn="dbhost.example.com/orclpdb:pooled",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP", pool_name="MYPOOL")
-
-When specifying a pool name, you should still set a connection class name to
-allow efficient use of the pool's resources.
-
-If you are using python-oracledb Thick mode and the
-``thick_mode_dsn_passthrough`` value in effect is *True*, you can use the
-``pool_name`` parameter only if the ``dsn`` parameter is not specified when
-creating a standalone or pooled connection, for example:
-
-.. code-block:: python
-
-    oracledb.init_oracle_client()
-
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                host="localhost", service_name="orclpdb",
-                                server_type="pooled", min=2, max=5,
-                                increment=1, cclass="MYAPP",
-                                pool_name="MYPOOL")
-
-If both the ``pool_name`` and ``dsn`` parameters are set when using Thick mode,
-the ``pool_name`` parameter is ignored.
-
-For Thick mode, you may prefer to set the Oracle Net
-Services parameter `POOL_NAME <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-C2DA6A42-C30A-4E4C-9833-51CB383FE08B>`__ parameter in the
-:ref:`easy connect string <easyconnect>` or
-:ref:`connect descriptor <conndescriptor>`, for example:
-
-.. code-block:: python
-
-    oracledb.init_oracle_client()
-
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                dsn="dbhost.example.com/orclpdb:pooled?pool_name=mypool",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP")
-
-You can also define the DRCP pool name with the
-:ref:`ConnectParams class <connparam>` when using python-oracledb Thin or Thick
-mode. See :ref:`usingconnparams`.
-
-**Acquiring a DRCP Connection**
-
-Once DRCP has been enabled and the driver connection pool has been created with
-the appropriate connection string, then your application can get a connection
-that uses DRCP by calling:
-
-.. code-block:: python
-
-    connection = pool.acquire()
-
-Connection class names can also be passed to :meth:`~ConnectionPool.acquire()`
-if you want to use a connection with a different class:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb:pooled",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP")
-
-    connection = mypool.acquire(cclass="OTHERAPP")
-
-If a pooled server of a requested class is not available, a server with new
-session state is used.  If the DRCP pool cannot grow, a server with a different
-class may be used and its session state cleared.
-
-**Closing Connections when using DRCP**
-
-Similar to using a python-oracledb connection pool, Python scripts where
-python-oracledb connections do not go out of scope quickly (which releases
-them), or do not currently use :meth:`Connection.close()` or
-:meth:`ConnectionPool.release()` should be examined to see if the connections
-can be closed earlier.  This allows maximum reuse of DRCP pooled servers by
-other users:
-
-.. code-block:: python
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb:pooled",
-                                min=2, max=5, increment=1,
-                                cclass="MYAPP")
-
-    # Do some database operations
-    connection = mypool.acquire()
-    . . .
-    connection.close()              # <- Add this to release the DRCP pooled server
-
-    # Do lots of non-database work
-    . . .
-
-    # Do some more database operations
-    connection = mypool.acquire()   # <- And get a new pooled server only when needed
-    . . .
-    connection.close()
-
-Setting DRCP Parameters in Connection Strings
----------------------------------------------
-
-Setting the DRCP connection class, purity, and pool name as function parameters
-in the application is preferred, but sometimes it is not possible to modify an
-existing code base. For these applications, you can specify the values along
-with the pooled server option in the connection string.
-
-You can specify the class and purity options in connection strings when using
-Oracle Database 21c, or later. You can specify the pool name when using Oracle
-Database 23.4, or later.
-
-For example with the :ref:`Easy Connect <easyconnect>` syntax::
-
-    dbhost.example.com/orclpdb:pooled?pool_connection_class=MYAPP&pool_purity=self&pool_name=MYPOOL
-
-Or by using a :ref:`TNS Alias <netservice>` in a
-:ref:`tnsnames.ora <optnetfiles>` file::
-
-    customerpool = (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)
-              (HOST=dbhost.example.com)
-              (PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orclpdb)
-              (SERVER=POOLED)
-              (POOL_CONNECTION_CLASS=MYAPP)
-              (POOL_PURITY=SELF)
-              (POOL_NAME=MYPOOL)))
-
-Explicitly specifying the purity as *SELF* in a connection string may cause
-some unusable connections in a python-oracledb Thick mode connection pool to
-not be terminated, potentially eventually rendering all connections in the pool
-to be unusable. If you cannot programmatically set the class name and purity,
-or cannot use python-oracledb Thin mode, then avoid explicitly setting the
-purity as a connection string parameter when using a local python-oracledb
-Thick mode connection pool.
-
-.. _monitoringdrcp:
-
-Monitoring DRCP
----------------
-
-Data dictionary views are available to monitor the performance of DRCP.
-Database administrators can check statistics such as the number of busy and
-free servers, and the number of hits and misses in the pool against the total
-number of requests from clients. The views include:
-
-* DBA_CPOOL_INFO
-* V$PROCESS
-* V$SESSION
-* V$CPOOL_STATS
-* V$CPOOL_CC_STATS
-* V$CPOOL_CONN_INFO
-
-**DBA_CPOOL_INFO View**
-
-DBA_CPOOL_INFO displays configuration information about the DRCP pool.  The
-columns are equivalent to the ``dbms_connection_pool.configure_pool()``
-settings described in the table of DRCP configuration options, with the
-addition of a STATUS column.  The status is ``ACTIVE`` if the pool has been
-started and ``INACTIVE`` otherwise.  Note that the pool name column is called
-CONNECTION_POOL.  This example checks whether the pool has been started and
-finds the maximum number of pooled servers::
-
-    SQL> SELECT connection_pool, status, maxsize FROM dba_cpool_info;
-
-    CONNECTION_POOL              STATUS        MAXSIZE
-    ---------------------------- ---------- ----------
-    SYS_DEFAULT_CONNECTION_POOL  ACTIVE             40
-
-**V$PROCESS and V$SESSION Views**
-
-The V$SESSION view shows information about the currently active DRCP
-sessions.  It can also be joined with V$PROCESS through
-``V$SESSION.PADDR = V$PROCESS.ADDR`` to correlate the views.
-
-**V$CPOOL_STATS View**
-
-The V$CPOOL_STATS view displays information about the DRCP statistics for
-an instance.  The V$CPOOL_STATS view can be used to assess how efficient the
-pool settings are.  This example query shows an application using the pool
-effectively.  The low number of misses indicates that servers and sessions were
-reused.  The wait count shows just over 1% of requests had to wait for a pooled
-server to become available::
-
-    NUM_REQUESTS   NUM_HITS NUM_MISSES  NUM_WAITS
-    ------------ ---------- ---------- ----------
-           10031      99990         40       1055
-
-If ``cclass`` was set (allowing pooled servers and sessions to be
-reused), then NUM_MISSES will be low.  If the pool maxsize is too small for
-the connection load, then NUM_WAITS will be high.
-
-**V$CPOOL_CC_STATS View**
-
-The view V$CPOOL_CC_STATS displays information about the connection class
-level statistics for the pool per instance::
-
-    SQL> select cclass_name, num_requests, num_hits, num_misses
-         from v$cpool_cc_stats;
-
-    CCLASS_NAME                      NUM_REQUESTS   NUM_HITS NUM_MISSES
-    -------------------------------- ------------ ---------- ----------
-    HR.MYCLASS                             100031      99993         38
-
-
-The class name columns shows the database user name appended with the
-connection class name.
-
-**V$CPOOL_CONN_INFO View**
-
-The V$POOL_CONN_INFO view gives insight into client processes that are
-connected to the connection broker, making it easier to monitor and trace
-applications that are currently using pooled servers or are idle. This view was
-introduced in Oracle 11gR2.
-
-You can monitor the view V$CPOOL_CONN_INFO to, for example, identify
-misconfigured machines that do not have the connection class set correctly.
-This view maps the machine name to the class name.  In python-oracledb Thick
-mode, the class name will be default to one like shown below::
-
-    SQL> select cclass_name, machine from v$cpool_conn_info;
-
-    CCLASS_NAME                             MACHINE
-    --------------------------------------- ------------
-    CJ.OCI:SP:wshbIFDtb7rgQwMyuYvodA        cjlinux
-
-In this example, you would examine applications on ``cjlinux`` and make them
-set ``cclass``.
-
-When connecting to Oracle Autonomous Database on Shared Infrastructure (ADB-S),
-the V$CPOOL_CONN_INFO view can be used to track the number of connection
-hits and misses to show the pool efficiency.
-
-.. _implicitconnpool:
-
-Implicit Connection Pooling
-===========================
-
-`Implicit connection pooling <https://
-www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-A9D74994-D81A-47BF-BAF2-
-E4E1A354CA99>`__ is useful for applications that cause excess database server
-load due to the number of :ref:`standalone connections <standaloneconnection>`
-opened.  When these applications cannot be rewritten to use
-:ref:`python-oracledb connection pooling <connpooling>`, then implicit
-connection pooling may be an option to reduce the load on the database system.
-
-Implicit connection pooling allows application connections to share pooled
-servers in :ref:`DRCP <drcp>` or Oracle Connection Manager in Traffic Director
-Mode's (CMAN-TDM) `Proxy Resident Connection Pooling (PRCP)
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-E0032017-03B1-
-4F14-AF9B-BCC87C982DA8>`__.  Applications do not need to be modified.  The
-feature is enabled by adding a ``pool_boundary`` parameter to the application's
-:ref:`connection string <connstr>`.  Applications do not need to explicitly
-acquire, or release, connections to be able use a DRCP or PRCP pool.
-
-Implicit connection pooling is available in python-oracledb Thin and
-:ref:`Thick <enablingthick>` modes. It requires Oracle Database
-version 23. Python-oracledb Thick mode additionally requires Oracle Client
-version 23 libraries.
-
-With implicit connection pooling, connections are internally acquired from the
-DRCP or PRCP pool when they are actually used by the application to do database
-work.  They are internally released back to pool when not in use.  This may
-occur between the application's explicit :meth:`oracledb.connect()` call and
-:meth:`Connection.close()` (or the application's equivalent connection release
-at end-of-scope).  The internal connection release can be controlled by the
-value of the ``pool_boundary`` connection string parameter, which can be
-either:
-
-- *statement*: If this boundary is specified, then the connection is released
-  back to the DRCP or PRCP connection pool when the connection is implicitly
-  stateless.  A connection is implicitly stateless when there are no active
-  cursors in the connection (that is, all the rows of the cursors have been
-  internally fetched), no active transactions, no temporary tables, and no
-  temporary LOBs.
-
-- *transaction*: If this boundary is specified, then the connection is released
-  back to the DRCP or PRCP connection pool when either one of the methods
-  :meth:`Connection.commit()` or :meth:`Connection.rollback()` are
-  called. It is recommended to not set the :attr:`Connection.autocommit`
-  attribute to *true* when using implicit connection pooling.  If you do set
-  this attribute, then you will be unable to:
-
-  - Fetch any data that requires multiple :ref:`round-trips <roundtrips>` to
-    the database
-  - Run queries that fetch :ref:`LOB <lobdata>` and :ref:`JSON <jsondatatype>`
-    data
-
-Inline with DRCP and PRCP best practices regarding session sharing across
-differing applications, you should add a connection string
-``pool_connection_class`` parameter, using the same value for all applications
-that are alike.
-
-The DRCP and PRCP "purity" used by Implicit Connection Pooling defaults to
-SELF, which allows reuse of the server process session memory for best
-performance. Adding the connection string parameter ``pool_purity=new`` will
-change this and cause each use of a connection to recreate the session memory.
-
-.. _useimplicitconnpool:
-
-**Configuring Implicit Connection Pooling**
-
-To use implicit connection pooling in python-oracledb with DRCP:
-
-1. Enable DRCP in the database. For example in SQL*Plus::
-
-       SQL> EXECUTE DBMS_CONNECTION_POOL.START_POOL()
-
-2. Specify to use a pooled server in:
-
-   - The ``dsn`` parameter of :meth:`oracledb.connect()` or
-     :meth:`oracledb.create_pool()`. For example with the
-     :ref:`Easy Connect syntax <easyconnect>`:
-
-     .. code-block:: python
-
-        cs = "dbhost.example.com/orclpdb:pooled"
-
-        pool = oracledb.create_pool(user="hr", password=userpwd,
-                                    dsn=cs,
-                                    min=2, max=5, increment=1,
-                                    cclass="MYAPP")
-
-   - Or in the :ref:`Connect Descriptor <conndescriptor>` used in an Oracle
-     Network configuration file such as :ref:`tnsnames.ora <optnetfiles>` by
-     adding ``(SERVER=POOLED)``. For example::
-
-        customerpool = (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)
-              (HOST=dbhost.example.com)
-              (PORT=1521))(CONNECT_DATA=(SERVICE_NAME=CUSTOMER)
-              (SERVER=POOLED)))
-
-   - Or in the ``server_type`` parameter during
-     :meth:`standalone connection creation <oracledb.connect>`
-     or :meth:`connection pool creation <oracledb.create_pool>`.  For example:
-
-     .. code-block:: python
-
-        pool = oracledb.create_pool(user="hr", password=userpwd,
-                                    host="dbhost.example.com", service_name="orclpdb",
-                                    min=2, max=5, increment=1, server_type="pooled",
-                                    cclass="MYAPP")
-
-3. Set the pool boundary to either *statement* or *transaction* in:
-
-   - The :ref:`Easy Connect string <easyconnect>`. For example, to use the
-     *statement* boundary::
-
-        dsn = "localhost:1521/orclpdb:pooled?pool_boundary=statement"
-
-   - Or the ``CONNECT_DATA`` section of the :ref:`Connect Descriptor
-     <conndescriptor>`. For example, to use the *transaction* boundary::
-
-        tnsalias = (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=mymachine.example.com)
-                    (PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl)
-                    (SERVER=POOLED)(POOL_BOUNDARY=TRANSACTION)))
-
-   - Or the ``pool_boundary`` parameter in :meth:`oracledb.connect()` or
-     :meth:`oracledb.create_pool()`
-
-   .. note::
-
-        Implicit connection pooling is not enabled if the application sets the
-        ``pool_boundary`` attribute to *transaction* or *statement* but does
-        not specify to use a pooled server.
-
-4. Set the connection class in:
-
-    - The :ref:`Easy Connect string <easyconnect>`. For example, to use a class
-      name 'myapp'::
-
-        dsn = "localhost:1521/orclpdb:pooled?pool_boundary=statement&pool_connection_class=myapp"
-
-    - Or the ``CONNECT_DATA`` section of the :ref:`Connect Descriptor
-      <conndescriptor>`. For example, to use a class name 'myapp'::
-
-        tnsalias = (DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=mymachine.example.com)
-                    (PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl)
-                    (SERVER=POOLED)(POOL_BOUNDARY=TRANSACTION)
-                    (POOL_CONNECTION_CLASS=myapp)))
-
-   Use the same connection class name for application processes of the same
-   type where you want session memory to be reused for connections.
-
-   The pool purity can also optionally be changed by adding ``POOL_PURITY=NEW``
-   to the Easy Connect string or Connect Descriptor.
-
-Similar steps can be used with PRCP.  For general information on PRCP, see the
-technical brief `CMAN-TDM — An Oracle Database connection proxy for scalable
-and highly available applications <https://download.oracle.com/
-ocomdocs/global/CMAN_TDM_Oracle_DB_Connection_Proxy_for_scalable_apps.pdf>`__.
-
-**Implicit Pooling Notes**
-
-You should thoroughly test your application when using implicit connection
-pooling to ensure that the internal reuse of database servers does not cause
-any problems. For example, any session state such as the connection `session id
-and serial number
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-9F0DCAEA-A67E
--4183-89E7-B1555DC591CE>`__ will vary throughout the lifetime of the
-application connection because different servers may be used at different
-times. Another example is when using a statement boundary of *transaction*. In
-this scenario, any commit can invalidate open cursors.
-
-It is recommended to use python-oracledb's local :ref:`connpooling` where
-possible instead of implicit connection pooling.  This gives multi-user
-applications more control over pooled server reuse.
-
-Privileged Connections
-======================
-
-The ``mode`` parameter of the function :meth:`oracledb.connect()` specifies
-the database privilege that you want to associate with the user.
-
-The example below shows how to connect to Oracle Database as SYSDBA:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="sys", password=syspwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  mode=oracledb.AuthMode.SYSDBA)  # or mode=oracledb.AUTH_MODE_SYSDBA
-
-    with connection.cursor() as cursor:
-        cursor.execute("GRANT SYSOPER TO hr")
-
-This is equivalent to executing the following in SQL*Plus:
-
-.. code-block:: sql
-
-    CONNECT sys/syspwd@dbhost.example.com/orclpdb AS SYSDBA
-    GRANT SYSOPER TO hr;
-
-
-In python-oracledb Thick mode, when python-oracledb uses Oracle Client
-libraries from a database software installation, you can use "bequeath"
-connections to databases that are also using the same Oracle libraries.  Do
-this by setting the standard Oracle environment variables such as
-``ORACLE_HOME`` and ``ORACLE_SID`` and connecting in Python like:
-
-.. code-block:: python
-
-    oracledb.init_oracle_client()
-
-    conn = oracledb.connect(mode=oracledb.AuthMode.SYSDBA)
-
-This is equivalent to executing the following in SQL*Plus:
-
-.. code-block:: sql
-
-    CONNECT / AS SYSDBA
-
-.. _netencrypt:
-
-Securely Encrypting Network Traffic to Oracle Database
-======================================================
-
-You can encrypt data transferred between the Oracle Database and
-python-oracledb so that unauthorized parties are not able to view plain text
-values as the data passes over the network.
-
-Both python-oracledb Thin and Thick modes support TLS. Refer to the `Oracle
-Database Security Guide <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-41040F53-D7A6-48FA-A92A-0C23118BC8A0>`__ for more configuration
-information.
-
-.. _nne:
-
-Native Network Encryption
--------------------------
-
-The python-oracledb :ref:`Thick mode <enablingthick>` can additionally use
-Oracle Database's `native network encryption <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-7F12066A-2BA1-476C-809B-BB95A3F727CF>`__.
-
-With native network encryption, the client and database server negotiate a key
-using Diffie-Hellman key exchange.  This provides protection against
-man-in-the-middle attacks.
-
-Native network encryption can be configured by editing Oracle Net's optional
-:ref:`sqlnet.ora <optnetfiles>` configuration file.  The file on either the
-database server and/or on each python-oracledb 'client' machine can be
-configured.  Parameters control whether data integrity checking and encryption
-is required or just allowed, and which algorithms the client and server should
-consider for use.
-
-As an example, to ensure all connections to the database are checked for
-integrity and are also encrypted, create or edit the Oracle Database
-``$ORACLE_HOME/network/admin/sqlnet.ora`` file.  Set the checksum negotiation
-to always validate a checksum and set the checksum type to your desired value.
-The network encryption settings can similarly be set.  For example, to use the
-SHA512 checksum and AES256 encryption use::
-
-    SQLNET.CRYPTO_CHECKSUM_SERVER = required
-    SQLNET.CRYPTO_CHECKSUM_TYPES_SERVER = (SHA512)
-    SQLNET.ENCRYPTION_SERVER = required
-    SQLNET.ENCRYPTION_TYPES_SERVER = (AES256)
-
-If you definitely know that the database server enforces integrity and
-encryption, then you do not need to configure python-oracledb separately.  However,
-you can also, or alternatively do so, depending on your business needs.  Create
-a ``sqlnet.ora`` on your client machine and locate it with other
-:ref:`optnetfiles`::
-
-    SQLNET.CRYPTO_CHECKSUM_CLIENT = required
-    SQLNET.CRYPTO_CHECKSUM_TYPES_CLIENT = (SHA512)
-    SQLNET.ENCRYPTION_CLIENT = required
-    SQLNET.ENCRYPTION_TYPES_CLIENT = (AES256)
-
-The client and server sides can negotiate the protocols used if the settings
-indicate more than one value is accepted.
-
-Note that these are example settings only. You must review your security
-requirements and read the documentation for your Oracle version. In particular,
-review the available algorithms for security and performance.
-
-The NETWORK_SERVICE_BANNER column of the database view
-`V$SESSION_CONNECT_INFO <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-9F0DCAEA-A67E-4183-89E7-B1555DC591CE>`__ can be used to verify the
-encryption status of a connection. For example with SQL*Plus::
-
-    SQL> select network_service_banner from v$session_connect_info;
-
-If the connection is encrypted, then this query prints an output that includes
-the available encryption service, the crypto-checksumming service, and the
-algorithms in use, such as::
-
-    NETWORK_SERVICE_BANNER
-    -------------------------------------------------------------------------------------
-    TCP/IP NT Protocol Adapter for Linux: Version 19.0.0.0.0 - Production
-    Encryption service for Linux: Version 19.0.1.0.0 - Production
-    AES256 Encryption service adapter for Linux: Version 19.0.1.0.0 - Production
-    Crypto-checksumming service for Linux: Version 19.0.1.0.0 - Production
-    SHA256 Crypto-checksumming service adapter for Linux: Version 19.0.1.0.0 - Production
-
-If the connection is unencrypted, then the query will only print the
-available encryption and crypto-checksumming services in the output. For example::
-
-    NETWORK_SERVICE_BANNER
-    -------------------------------------------------------------------------------------
-    TCP/IP NT Protocol Adapter for Linux: Version 19.0.0.0.0 - Production
-    Encryption service for Linux: Version 19.0.1.0.0 - Production
-    Crypto-checksumming service for Linux: Version 19.0.1.0.0 - Production
-
-For more information about Oracle Data Network Encryption and Integrity,
-and for information about configuring TLS network encryption, refer to
-the `Oracle AI Database Security Guide <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=DBSEG>`__.
-
-Resetting Passwords
-===================
-
-After connecting to Oracle Database, passwords can be changed by calling
-:meth:`Connection.changepassword()`:
-
-.. code-block:: python
-
-    # Get the passwords from somewhere, such as prompting the user
-    oldpwd = getpass.getpass(f"Old Password for {username}: ")
-    newpwd = getpass.getpass(f"New Password for {username}: ")
-
-    connection.changepassword(oldpwd, newpwd)
-
-When a password has expired and you cannot connect directly, you can connect
-and change the password in one operation by using the ``newpassword`` parameter
-of the function :meth:`oracledb.connect()` constructor:
-
-.. code-block:: python
-
-    # Get the passwords from somewhere, such as prompting the user
-    oldpwd = getpass.getpass(f"Old Password for {username}: ")
-    newpwd = getpass.getpass(f"New Password for {username}: ")
-
-    connection = oracledb.connect(user=username, password=oldpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  newpassword=newpwd)
-
-.. _autonomousdb:
-
-Connecting to Oracle Cloud Autonomous Databases
-================================================
-
-Python applications can connect to Oracle Autonomous Database (ADB) in Oracle
-Cloud using one-way TLS (Transport Layer Security) or mutual TLS (mTLS),
-depending on how the database instance is configured. One-way TLS and mTLS
-provide enhanced security for authentication and encryption.
-
-A database username and password are still required for your application
-connections. Refer to the relevant Oracle Cloud documentation, for example see
-`Create Database Users <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-B5846072-995B-4B81-BDCB-AF530BC42847>`__.
-
-.. _onewaytls:
-
-One-way TLS Connection to Oracle Autonomous Database
-----------------------------------------------------
-
-With one-way TLS, the python-oracledb host machine must be in the Access
-Control List (ACL) of the ADB instance. Applications then connect to Oracle ADB
-by passing the database username, password, and appropriate connection
-string. A wallet is not used.
-
-Both python-oracledb Thin and Thick modes support one-way TLS.
-
-Allowing One-way TLS Access to Oracle Autonomous Database
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-To create an ADB instance that allows one-way TLS, choose the access setting
-*Secure access from allowed IPs and VCNs only* in the Oracle Cloud console
-during instance creation. Then specify the IP addresses, hostnames, CIDR
-blocks, Virtual Cloud networks (VCN), or Virtual Cloud network OCIDs where
-Python will be running. The ACL limits access to only the resources that have
-been defined and blocks all other incoming traffic.
-
-Alternatively, to enable one-way TLS on an existing database, complete the
-following steps in the Oracle Cloud console in the **Autonomous Database
-Information** section of the ADB instance:
-
-1. Click the **Edit** link next to *Access Control List* to update the Access
-   Control List (ACL).
-
-2. In the displayed **Edit Access Control List** dialog box, select the type of
-   address list entries and the corresponding values. You can include the IP
-   addresses, hostnames, CIDR blocks, Virtual Cloud networks (VCN), or Virtual
-   Cloud network OCIDs where Python will be running.
-
-3. Navigate back to the ADB instance details page and click the **Edit** link
-   next to *Mutual TLS (mTLS) Authentication*.
-
-4. In the displayed **Edit Mutual TLS Authentication** dialog box, deselect the
-   **Require mutual TLS (mTLS) authentication** check box to disable the mTLS
-   requirement on Oracle ADB and click **Save Changes**.
-
-Connecting with python-oracledb Thin or Thick modes using One-way TLS
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-When your database has been enabled to allow one-way TLS, you can connect with
-python-oracledb by following these steps:
-
-1. Navigate to the ADB instance details page on the Cloud console and click
-   **Database connection** at the top of the page.
-
-2. In the displayed **Database Connection** dialog box, select TLS from the
-   **Connection Strings** drop-down list.
-
-3. Copy the appropriate Connection String for the connection service level you
-   want.
-
-Applications can connect using database credentials and the copied
-:ref:`connection string <conndescriptor>`. Do *not* pass wallet parameters. For
-example, to connect as the ADMIN user:
-
-.. code-block:: python
-
-    cs = '''(description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1521)
-            (host=adb.abcdef.oraclecloud.com))
-            (connect_data=(service_name=abcde_mydb_high.adb.oraclecloud.com))
-            (security=(ssl_server_dn_match=yes)))'''
-
-    connection = oracledb.connect(user="admin", password=pw, dsn=cs)
-
-
-If you prefer to keep connection descriptors out of application code, you can
-add the descriptor with a :ref:`TNS Alias <netservice>` to a :ref:`tnsnames.ora
-<optnetfiles>` file, and use the TNS alias as the ``dsn`` value.
-
-Not having the ACL correctly configured is a common cause of connection
-errors. To aid troubleshooting, remove ``(retry_count=20)(retry_delay=3)`` from
-the connect descriptor so that errors are returned faster. If network
-configuration issues are suspected then, for initial troubleshooting with a
-disposable database, you can update the ACL to contain a CIDR block of
-``0.0.0.0/0``, however this means *anybody* can attempt to connect to your
-database so you should recreate the database immediately after identifying a
-working, more restrictive ACL.
-
-To connect with python-oracledb Thick mode requires Oracle Client library
-versions 19.14 (or later), or 21.5 (or later), or 23.3 (or later). If you have
-also been experimenting with mTLS and your environment has ``sqlnet.ora`` and
-``tnsnames.ora`` files set up, then remove these before using python-oracledb
-Thick mode with one-way TLS to avoid configuration clashes.
-
-.. _twowaytls:
-
-Mutual TLS (mTLS) Connection to Oracle Autonomous Database
-----------------------------------------------------------
-
-To enable python-oracledb connections to Oracle Autonomous Database in Oracle
-Cloud using mTLS, a wallet needs to be downloaded from the cloud console.  mTLS
-is sometimes called Two-way TLS.
-
-Allowing mTLS Access to Oracle Autonomous Database
-++++++++++++++++++++++++++++++++++++++++++++++++++
-
-When creating an ADB instance in the Oracle Cloud console, choose the access
-setting "Secure access from everywhere".
-
-.. _getwallet:
-
-Downloading the Database Wallet
-+++++++++++++++++++++++++++++++
-
-After your Autonomous Database has been enabled to allow mTLS, download its
-``wallet.zip`` file which contains the certificate and network configuration
-files:
-
-1. Navigate to the ADB instance details page on the Oracle Cloud console and
-   click **Database connection** at the top of the page.
-
-2. In the displayed **Database Connection** dialog box, select the "Download
-   Wallet" button in the *Download client credentials (Wallet)* section. The
-   cloud console will ask you to create a wallet password. This password is
-   required by python-oracledb in Thin mode, but not used in Thick mode.
-
-**Note**: Keep wallet files in a secure location and only share them and the
-password with authorized users.
-
-Connecting with python-oracledb Thin mode using mTLS
-++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-For python-oracledb Thin mode, unzip the :ref:`wallet.zip <getwallet>` file.
-Only two files from it are needed:
-
-- ``tnsnames.ora`` - Maps TNS Aliases used for application connection strings
-  to your database services
-- ``ewallet.pem`` - Enables SSL/TLS connections in Thin mode. Keep this file
-  secure
-
-If you do not have a PEM file, see :ref:`createpem`.
-
-Move the two files to a directory that is accessible by your application. In
-this example, the files are located in the same directory,
-``/opt/OracleCloud/MYDB``.
-
-A connection can be made by using your database credentials and setting the
-``dsn`` parameter to the desired :ref:`TNS Alias <netservice>` from the
-:ref:`tnsnames.ora <optnetfiles>` file. The ``config_dir`` parameter indicates
-the directory containing :ref:`tnsnames.ora <optnetfiles>`. The
-``wallet_location`` parameter is the directory containing the PEM file. The
-``wallet_password`` parameter should be set to the password created in the
-cloud console when downloading the wallet. It is not the database user or ADMIN
-password. For example, to connect as the ADMIN user using the ``mydb_low`` TNS
-Alias:
-
-.. code-block:: python
-
-    connection = oracledb.connect(
-        user="admin",
-        password=pw,                               # database password for ADMIN
-        dsn="mydb_low",                            # TNS Alias from tnsnames.ora
-        config_dir="/opt/OracleCloud/MYDB",        # directory with tnsnames.ora
-        wallet_location="/opt/OracleCloud/MYDB",   # directory with ewallet.pem
-        wallet_password=wp                         # not a database user password
-    )
-
-Connecting with python-oracledb Thick mode using mTLS
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-For python-oracledb Thick mode, unzip the :ref:`wallet.zip <getwallet>` file.
-Only three files from it are needed:
-
-- ``tnsnames.ora`` - Maps :ref:`TNS Aliases <netservice>` used for application
-  connection strings to your database services
-- ``sqlnet.ora`` - Configures Oracle Network settings
-- ``cwallet.sso`` - Enables SSL/TLS connections in python-oracledb Thick mode.
-  Keep this file secure
-
-There are two options for placing the required files:
-
-1. Move the three files to the ``network/admin`` directory of the client
-   libraries used by your application. For example, if you are using Oracle
-   Instant Client version 23 and it is in ``$HOME/instantclient_23_9``, then
-   you would put the wallet files in
-   ``$HOME/instantclient_23_9/network/admin/``.
-
-   A connection can be made using your database credentials and setting the
-   ``dsn`` parameter to the desired :ref:`TNS Alias <netservice>` from the
-   :ref:`tnsnames.ora <optnetfiles>` file.  For example, to connect as the ADMIN
-   user using the ``mydb_low`` TNS Alias:
-
-   .. code-block:: python
-
-        connection = oracledb.connect(user="admin", password=pw, dsn="mydb_low")
-
-2. Alternatively, move the three files to any accessible directory, for example
-   ``/opt/OracleCloud/MYDB``.
-
-   Then edit ``sqlnet.ora`` and change the wallet location directory to the
-   directory containing the ``cwallet.sso`` file.  For example::
-
-     WALLET_LOCATION = (SOURCE = (METHOD = file) (METHOD_DATA = (DIRECTORY="/opt/OracleCloud/MYDB")))
-     SSL_SERVER_DN_MATCH=yes
-
-   Since the ``tnsnames.ora`` and ``sqlnet.ora`` files are not in the default
-   location, your application needs to indicate where they are, either with the
-   ``config_dir`` parameter to :meth:`oracledb.init_oracle_client()`, or by
-   using the ``TNS_ADMIN`` environment variable.  See :ref:`Optional Oracle Net
-   Configuration Files <optnetfiles>`.  (Neither of these settings are needed,
-   and you do not need to edit ``sqlnet.ora``, if you have put all the files in
-   the ``network/admin`` directory.)
-
-   For example, to connect as the ADMIN user using the ``mydb_low`` TNS
-   alias:
-
-   .. code-block:: python
-
-        oracledb.init_oracle_client(config_dir="/opt/OracleCloud/MYDB")
-
-        connection = oracledb.connect(user="admin", password=pw, dsn="mydb_low")
-
-
-In python-oracle Thick mode, to create mTLS connections in one Python process
-to two or more Oracle Autonomous Databases, move each ``cwallet.sso`` file to
-its own directory.  For each connection use different connection string
-``WALLET_LOCATION`` parameters to specify the directory of each ``cwallet.sso``
-file.  It is recommended to use Oracle Client libraries 19.17 (or later) when
-using :ref:`multiple wallets <connmultiwallets>`.
-
-If you are behind a firewall, see :ref:`firewallproxy`.
-
-Using the Easy Connect Syntax with Oracle Autonomous Database
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-When python-oracledb is using Oracle Client libraries 19c, or later, you can
-optionally use :ref:`Easy Connect <easyconnect>` syntax to connect to Oracle
-Autonomous Database.
-
-This section discuss the parameters for mTLS connection.
-
-The mapping from the cloud :ref:`tnsnames.ora <optnetfiles>` entries to an Easy
-Connect string is::
-
-    protocol://host:port/service_name?wallet_location=/my/dir&retry_count=N&retry_delay=N
-
-For example, if your ``tnsnames.ora`` file had an entry::
-
-    cjjson_high = (description=(retry_count=20)(retry_delay=3)
-        (address=(protocol=tcps)(port=1522)
-        (host=xxx.oraclecloud.com))
-        (connect_data=(service_name=abc_cjjson_high.adb.oraclecloud.com))
-        (security=(ssl_server_cert_dn="CN=xxx.oraclecloud.com,O=Oracle Corporation,L=Redwood City,ST=California,C=US")))
-
-Then your applications can connect using the connection string:
-
-.. code-block:: python
-
-    dsn = "tcps://xxx.oraclecloud.com:1522/abc_cjjson_high.adb.oraclecloud.com?wallet_location=/Users/cjones/Cloud/CJJSON&retry_count=20&retry_delay=3"
-    connection = oracledb.connect(user="hr", password=userpwd, dsn=dsn)
-
-The ``wallet_location`` parameter needs to be set to the directory containing
-the ``cwallet.sso`` or ``ewallet.pem`` file extracted from the :ref:`wallet.zip
-<getwallet>` file. The other files, including ``tnsnames.ora``, are not needed
-when you use the Easy Connect syntax.
-
-You can add other Easy Connect parameters to the connection string, for
-example::
-
-    dsn = dsn + "&https_proxy=myproxy.example.com&https_proxy_port=80"
-
-With python-oracledb Thin mode, the wallet password needs to be passed as a
-connection parameter.
-
-.. _createpem:
-
-Creating a PEM File for python-oracledb Thin Mode
-+++++++++++++++++++++++++++++++++++++++++++++++++
-
-For mutual TLS in python-oracledb Thin mode, the certificate must be Privacy
-Enhanced Mail (PEM) format. If you are using Oracle Autonomous Database your
-wallet zip file will already include a PEM file.
-
-If you have a PKCS12 ``ewallet.p12`` file and need to create PEM file, you can
-use third party tools or the script below to do a conversion. For example, you
-can invoke the script by passing the wallet password and the directory
-containing the PKCS12 file::
-
-    python create_pem.py --wallet-password 'xxxxx' /Users/scott/cloud_configs/MYDBDIR
-
-Once the PEM file has been created, you can use it by passing its directory
-location as the ``wallet_location`` parameter to :func:`oracledb.connect()` or
-:func:`oracledb.create_pool()`.  These methods also accept a
-``wallet_password`` parameter.  See :ref:`twowaytls`.
-
-**Script to convert from PKCS12 to PEM**
-
-.. code-block:: python
-
-    # create_pem.py
-
-    import argparse
-    import getpass
-    import os
-
-    from cryptography.hazmat.primitives.serialization \
-            import pkcs12, Encoding, PrivateFormat, BestAvailableEncryption, \
-                   NoEncryption
-
-    # parse command line
-    parser = argparse.ArgumentParser(description="convert PKCS#12 to PEM")
-    parser.add_argument("wallet_location",
-                        help="the directory in which the PKCS#12 encoded "
-                             "wallet file ewallet.p12 is found")
-    parser.add_argument("--wallet-password",
-                        help="the password for the wallet which is used to "
-                             "decrypt the PKCS#12 encoded wallet file; if not "
-                             "specified, it will be requested securely")
-    parser.add_argument("--no-encrypt",
-                        dest="encrypt", action="store_false", default=True,
-                        help="do not encrypt the converted PEM file with the "
-                             "wallet password")
-    args = parser.parse_args()
-
-    # validate arguments and acquire password if one was not specified
-    pkcs12_file_name = os.path.join(args.wallet_location, "ewallet.p12")
-    if not os.path.exists(pkcs12_file_name):
-        msg = f"wallet location {args.wallet_location} does not contain " \
-               "ewallet.p12"
-        raise Exception(msg)
-    if args.wallet_password is None:
-        args.wallet_password = getpass.getpass()
-
-    pem_file_name = os.path.join(args.wallet_location, "ewallet.pem")
-    pkcs12_data = open(pkcs12_file_name, "rb").read()
-    result = pkcs12.load_key_and_certificates(pkcs12_data,
-                                              args.wallet_password.encode())
-    private_key, certificate, additional_certificates = result
-    if args.encrypt:
-        encryptor = BestAvailableEncryption(args.wallet_password.encode())
-    else:
-        encryptor = NoEncryption()
-    with open(pem_file_name, "wb") as f:
-        f.write(private_key.private_bytes(Encoding.PEM, PrivateFormat.PKCS8,
-                                          encryptor))
-        f.write(certificate.public_bytes(Encoding.PEM))
-        for cert in additional_certificates:
-            f.write(cert.public_bytes(Encoding.PEM))
-    print("PEM file", pem_file_name, "written.")
-
-.. _firewallproxy:
-
-Connecting Through a Firewall via a Proxy
-=========================================
-
-If you are behind a firewall, you can tunnel TLS/SSL connections via a proxy by
-setting connection attributes, or by making `HTTPS_PROXY <https://www.oracle.
-com/pls/topic/lookup?ctx=dblatest&id=GUID-C672E92D-CE32-4759-9931-
-92D7960850F7>`__ proxy name and `HTTPS_PROXY_PORT <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-E69D27B7-2B59-4946-89B3-5DDD491C2D9A>`__
-port parameters available in your :ref:`connection string <connstr>`.
-
-.. note::
-
-    Oracle does not recommend connecting through a firewall via a proxy when
-    performance is critical.
-
-**In python-oracledb Thin mode**
-
-- Proxy settings ``https_proxy`` and ``https_proxy_port`` can be passed during
-  connection or pool creation.  Use appropriate values for your proxy:
-
-  .. code-block:: python
-
-      connection = oracledb.connect(user="admin", password=pw, dsn="mydb_low",
-                                    config_dir="/opt/OracleCloud/MYDB",
-                                    wallet_location="/opt/OracleCloud/MYDB", wallet_password=wp,
-                                    https_proxy="myproxy.example.com", https_proxy_port=80)
-
-- Alternatively, add the parameters to your :ref:`Easy Connect <easyconnect>`
-  string::
-
-      localhost/orclpdb&https_proxy=myproxy.example.com&https_proxy_port=80
-
-- Alternatively, update the :ref:`Connect Descriptor <conndescriptor>` (either
-  being passed directly during connection or contained in your
-  :ref:`tnsnames.ora <optnetfiles>` file). If you are using a
-  :ref:`tnsnames.ora <optnetfiles>` file, a modified entry might look like::
-
-      mydb_low = (description=
-                   (address=
-                     (https_proxy=myproxy.example.com)(https_proxy_port=80)
-                     (protocol=tcps)(port=1522)(host= . . . )
-
-**In python-oracledb Thick mode**
-
-- If you are using an :ref:`Easy Connect <easyconnect>` string, add
-  ``HTTPS_PROXY`` and ``HTTPS_PROXY_PORT`` parameters with appropriate values for
-  your proxy. For example, you might pass parameters like::
-
-      localhost/orclpdb&https_proxy=myproxy.example.com&https_proxy_port=80
-
-- Alternatively, update the :ref:`Connect Descriptor <conndescriptor>` (either
-  being passed directly during connection or contained in your
-  :ref:`tnsnames.ora <optnetfiles>` file). If you are using a
-  :ref:`tnsnames.ora <optnetfiles>` file, a modified entry might look like::
-
-      mydb_low = (description=
-                   (address=
-                     (https_proxy=myproxy.example.com)(https_proxy_port=80)
-                     (protocol=tcps)(port=1522)(host= . . . )
-
-  Additionally create, or edit, a :ref:`sqlnet.ora <optnetfiles>` file and add
-  a line::
-
-      SQLNET.USE_HTTPS_PROXY=on
-
-.. _connmultiwallets:
-
-Connecting using Multiple Wallets
-=================================
-
-You can make multiple connections with different wallets in one Python
-process.
-
-**In python-oracledb Thin mode**
-
-To use multiple wallets in python-oracledb Thin mode, pass the different
-connection strings, wallet locations, and wallet password (if required) in each
-:meth:`oracledb.connect()` call or when creating a :ref:`connection pool
-<connpooling>`:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user=user_name, password=userpw, dsn=dsn,
-                                  config_dir="path_to_unzipped_wallet",
-                                  wallet_location="location_of_pem_file",
-                                  wallet_password=walletpw)
-
-The ``config_dir`` parameter is the directory containing the :ref:`tnsnames.ora
-<optnetfiles>` file. The ``wallet_location`` parameter is the directory
-containing the ``ewallet.pem`` file. If you are using Oracle Autonomous
-Database, both of these paths are typically the same directory where the
-:ref:`wallet.zip <getwallet>` file was extracted. The ``dsn`` should specify a
-TCPS connection.
-
-**In python-oracledb Thick mode**
-
-To use multiple wallets in python-oracledb Thick mode, a TCPS connection string
-containing the ``MY_WALLET_DIRECTORY`` option needs to be created:
-
-.. code-block:: python
-
-    dsn = "mydb_high"   # one of the TNS Aliases from tnsnames.ora
-    params = oracledb.ConnectParams(config_dir="path_to_unzipped_wallet",
-                                    wallet_location="path_location_of_sso_file")
-    params.parse_connect_string(dsn)
-    dsn = params.get_connect_string()
-    connection = oracledb.connect(user=user_name, password=password, dsn=dsn)
-
-The ``config_dir`` parameter should be the directory containing the
-:ref:`tnsnames.ora <optnetfiles>` and ``sqlnet.ora`` files. The
-``wallet_location`` parameter is the directory containing the ``cwallet.sso``
-file. If you are using Oracle Autonomous Database, both of these paths are
-typically the same directory where the :ref:`wallet.zip <getwallet>` file was
-extracted.
-
-.. note::
-
-       Use Oracle Client libraries 19.17, or later, or use Oracle Client
-       version 21 or 23. These contain important bug fixes for using multiple
-       wallets in the one process.
-
-.. _connsharding:
-
-Connecting to Oracle Globally Distributed Database
-==================================================
-
-`Oracle Globally Distributed Database
-<https://www.oracle.com/database/distributed-database/>`__ is a feature of
-Oracle Database that lets you automatically distribute and replicate data
-across a pool of Oracle databases that share no hardware or software.  It was
-previously known as Oracle Sharding.  It allows a database table to be split so
-each database contains a table with the same columns but a different subset of
-rows.  These tables are known as sharded tables.  From the perspective of an
-application, a sharded table in Oracle Globally Distributed AI Database looks
-like a single table: the distribution of data across those shards is completely
-transparent to the application.
-
-Sharding is configured in Oracle Database, see the `Oracle Globally Distributed
-AI Database <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=SHARD>`__
-manual.  It requires Oracle Database and Oracle Client libraries 12.2, or
-later.
-
-.. note::
-
-    Oracle Globally Distributed Database is only supported in python-oracledb
-    Thick mode.  See :ref:`enablingthick`.
-
-The :meth:`oracledb.connect()` and :meth:`ConnectionPool.acquire()` functions
-accept ``shardingkey`` and ``supershardingkey`` parameters that are a sequence
-of values used to route the connection directly to a given shard.  A sharding
-key is always required.  A super sharding key is additionally required when
-using composite sharding, which is when data has been partitioned by a list or
-range (the super sharding key), and then further partitioned by a sharding key.
-
-When creating a connection pool, the :meth:`oracledb.create_pool()` attribute
-``max_sessions_per_shard`` can be set.  This is used to balance connections in
-the pool equally across shards.  It requires Oracle Client libraries 18.3 or
-later.
-
-Shard key values may be of type string (mapping to VARCHAR2 shard keys), number
-(NUMBER), bytes (RAW), or date (DATE).  Multiple types may be used in each
-array.  Sharding keys of TIMESTAMP type are not supported.
-
-When connected to a shard, queries will only return data from that shard.  For
-queries that need to access data from multiple shards, connections can be
-established to the coordinator shard catalog database.  In this case, no shard
-key or super shard key is used.
-
-As an example of direct connection, if sharding had been configured on a single
-VARCHAR2 column like:
-
-.. code-block:: sql
-
-    CREATE SHARDED TABLE customers (
-      cust_id NUMBER,
-      cust_name VARCHAR2(30),
-      class VARCHAR2(10) NOT NULL,
-      signup_date DATE,
-      cust_code RAW(20),
-      CONSTRAINT cust_name_pk PRIMARY KEY(cust_name))
-      PARTITION BY CONSISTENT HASH (cust_name)
-      PARTITIONS AUTO TABLESPACE SET ts1;
-
-then direct connection to a shard can be made by passing a single sharding key:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  shardingkey=["SCOTT"])
-
-Numbers keys can be used in a similar way:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  shardingkey=[110])
-
-When sharding by DATE, you can connect like:
-
-.. code-block:: python
-
-    import datetime
-
-    d = datetime.datetime(2014, 7, 3)
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  shardingkey=[d])
-
-When sharding by RAW, you can connect like:
-
-.. code-block:: python
-
-    b = b'\x01\x04\x08';
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  shardingkey=[b])
-
-Multiple keys can be specified, for example:
-
-.. code-block:: python
-
-    key_list = [70, "SCOTT", "gold", b'\x00\x01\x02']
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  shardingkey=key_list)
-
-A super sharding key example is:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb",
-                                  supershardingkey=["goldclass"],
-                                  shardingkey=["SCOTT"])
diff --git a/doc/src/user_guide/cqn.rst b/doc/src/user_guide/cqn.rst
deleted file mode 100644
index 3339f045..00000000
--- a/doc/src/user_guide/cqn.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-.. _cqn:
-
-.. currentmodule:: oracledb
-
-************************************************
-Working with Continuous Query Notification (CQN)
-************************************************
-
-`Continuous Query Notification (CQN)
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-373BAF72-3E63-42FE-8BEA-8A2AEFBF1C35>`__ allows applications to receive
-notifications when a table changes, such as when rows have been updated,
-regardless of the user or the application that made the change.  This can be
-useful in many circumstances, such as near real-time monitoring, auditing
-applications, or for such purposes as mid-tier cache invalidation.  A cache
-might hold some values that depend on data in a table.  If the data in the
-table changes, the cached values must then be updated with the new information.
-
-.. note::
-
-    Continuous Query Notification (CQN) is only supported in python-oracledb
-    Thick mode.  See :ref:`enablingthick`.
-
-CQN notification behavior is widely configurable.  Choices include specifying
-what types of SQL should trigger a notification, whether notifications should
-survive database loss, and control over unsubscription.  You can also choose
-whether notification messages will include ROWIDs of affected rows.
-
-By default, object-level notification (previously known as Database Change
-Notification) occurs.  With this mode, a Python notification method is invoked
-whenever a database transaction is committed that changes an object referenced
-by a registered query.  However if the :meth:`subscription
-<Connection.subscribe>` option ``qos`` is :data:`oracledb.SUBSCR_QOS_QUERY`
-then query-level notification occurs.  In this mode, the database notifies the
-application whenever a committed transaction changes the result of a registered
-query.
-
-CQN is best used to track infrequent data changes.
-
-
-Requirements
-============
-
-Before using CQN, users must have appropriate permissions:
-
-.. code-block:: sql
-
-    GRANT CHANGE NOTIFICATION TO <user-name>;
-
-To use CQN, connections must have ``events`` mode set to True, for
-example:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user=user, password=password,
-                                   dsn="dbhost.example.com/orclpdb",
-                                   events=True)
-
-The default CQN connection mode means the database must be able to connect back
-to the application using python-oracledb in order to receive notification events.
-Alternatively, when using Oracle Database and Oracle Client libraries 19.4, or
-later, subscriptions can set the optional ``client_initiated`` parameter to
-True, see ``Connection.subscribe()`` below.
-
-The default CQN connection mode typically means that the machine running
-python-oracledb needs a fixed IP address.  Note :meth:`Connection.subscribe()`
-does not verify that this reverse connection is possible.  If there is any
-problem sending a notification, then the callback method will not be invoked.
-Configuration options can include an IP address and port on which
-python-oracledb will listen for notifications; otherwise, the database chooses
-values.
-
-
-Creating a Subscription
-=======================
-
-Subscriptions allow Python to receive notifications for events that take place
-in the database that match the given parameters.
-
-For example, a basic CQN subscription might be created like:
-
-.. code-block:: python
-
-    connection.subscribe(callback=my_callback)
-
-See :meth:`Connection.subscribe()` for details on all of the parameters.
-
-See :ref:`cqn-operation-codes` for the types of operations that are supported.
-
-See :ref:`subscr-qos` for the quality of service values that are supported.
-
-See :ref:`subscr-namespaces` and :ref:`subscr-protocols` for the namespaces and
-protocols that are supported.
-
-See :ref:`Subscription Objects <subscrobj>` for more details on the
-subscription object that is created.
-
-When using Oracle Database and Oracle Client libraries 19.4, or later, the
-optional subscription parameter ``client_initiated`` can be set:
-
-.. code-block:: python
-
-    connection.subscribe(callback=my_callback, client_initiated=True)
-
-This enables CQN "client initiated" connections which internally use the same
-approach as normal python-oracledb connections to the database, and do not
-require the database to be able to connect back to the application.  Since
-client initiated connections do not need special network configuration they
-have ease-of-use and security advantages.
-
-
-Registering Queries
-===================
-
-Once a subscription has been created, one or more queries must be registered by
-calling :meth:`Subscription.registerquery()`.  Registering a query behaves
-similarly to :meth:`Cursor.execute()`, but only queries are permitted and the
-``args`` parameter must be a sequence or dictionary.
-
-An example script to receive query notifications when the 'REGIONS' table data
-changes is:
-
-.. code-block:: python
-
-    def cqn_callback(message):
-        print("Notification:")
-        for query in message.queries:
-            for tab in query.tables:
-                print("Table:", tab.name)
-                print("Operation:", tab.operation)
-                for row in tab.rows:
-                    if row.operation & oracledb.OPCODE_INSERT:
-                        print("INSERT of rowid:", row.rowid)
-                    if row.operation & oracledb.OPCODE_DELETE:
-                        print("DELETE of rowid:", row.rowid)
-
-    subscr = connection.subscribe(callback=cqn_callback,
-                                  operations=oracledb.OPCODE_INSERT | oracledb.OPCODE_DELETE,
-                                  qos=oracledb.SUBSCR_QOS_QUERY | oracledb.SUBSCR_QOS_ROWIDS)
-    subscr.registerquery("select * from regions")
-    input("Hit enter to stop CQN demo\n")
-
-Running the above script shows the initial output as::
-
-    Hit enter to stop CQN demo
-
-Use SQL*Plus or another tool to commit a change to the table:
-
-.. code-block:: sql
-
-    insert into regions values(120, 'L');
-    commit;
-
-When the commit is executed, a notification will be received by the callback
-which should print something like the following::
-
-    Hit enter to stop CQN demo
-    Notification:
-    Table: HR.REGIONS
-    Operation: 2
-    INSERT of rowid: AAA7EsAAHAAAFS/AAA
-
-See `GitHub Samples
-<https://github.com/oracle/python-oracledb/blob/main/samples/cqn.py>`__
-for a runnable CQN example.
diff --git a/doc/src/user_guide/dataframes.rst b/doc/src/user_guide/dataframes.rst
deleted file mode 100644
index 04389bc4..00000000
--- a/doc/src/user_guide/dataframes.rst
+++ /dev/null
@@ -1,909 +0,0 @@
-.. _dataframeformat:
-
-.. currentmodule:: oracledb
-
-************************
-Working with Data Frames
-************************
-
-Python-oracledb can query directly to a data frame format, and can also insert
-data frames into Oracle Database. This can improve performance and reduce
-memory requirements when your application uses Python data frame libraries such
-as `Apache PyArrow <https://arrow.apache.org/docs/python/index.html>`__,
-`Pandas <https://pandas.pydata.org>`__, `Polars <https://pola.rs/>`__, `NumPy
-<https://numpy.org/>`__, `Dask <https://www.dask.org/>`__, `PyTorch
-<https://pytorch.org/>`__, or writes files in `Apache Parquet
-<https://parquet.apache.org/>`__ format.
-
-Python-oracledb has a :ref:`DataFrame <oracledataframeobj>` object that exposes
-an Apache Arrow ArrowArrayStream PyCapsule Interface. This enables zero-copy
-data interchanges to the data frame objects of other libraries.
-
-.. _dfquery:
-
-Fetching Data Frames
-====================
-
-Data frames can be fetched by using a standard SQL query with :ref:`Connection
-<connobj>` or :ref:`AsyncConnection <asyncconnobj>` methods.
-
-Data Frame Queries
-------------------
-
-The python-oracledb methods for fetching rows into data frames are:
-
-- :meth:`Connection.fetch_df_all()` fetches all rows from a query
-- :meth:`Connection.fetch_df_batches()` implements an iterator for fetching
-  batches of rows
-
-These methods can also be called from :ref:`AsyncConnection
-<asyncconnobj>`. The methods all return python-oracledb :ref:`DataFrame
-<oracledataframeobj>` objects.
-
-For example, to fetch all rows from a query and print some information about
-the results:
-
-.. code-block:: python
-
-    sql = "select * from departments where department_id > :1"
-    # Adjust arraysize to tune the query fetch performance
-    odf = connection.fetch_df_all(statement=sql, parameters=[100], arraysize=100)
-
-    print(odf.column_names())
-    print(f"{odf.num_columns()} columns")
-    print(f"{odf.num_rows()} rows")
-
-With Oracle Database's standard DEPARTMENTS table, this would display::
-
-    ['DEPARTMENT_ID', 'DEPARTMENT_NAME', 'MANAGER_ID', 'LOCATION_ID']
-    4 columns
-    17 rows
-
-To fetch in batches, use an iterator:
-
-.. code-block:: python
-
-    import pyarrow
-
-    sql = "select * from departments where department_id < :1"
-    # Adjust "size" to tune the query fetch performance
-    # Here it is small to show iteration
-    for odf in connection.fetch_df_batches(statement=sql, parameters=[80], size=4):
-        df = pyarrow.table(odf).to_pandas()
-        print(df)
-
-With Oracle Database's standard DEPARTMENTS table, this would display::
-
-       DEPARTMENT_ID  DEPARTMENT_NAME  MANAGER_ID  LOCATION_ID
-    0             10   Administration         200         1700
-    1             20        Marketing         201         1800
-    2             30       Purchasing         114         1700
-    3             40  Human Resources         203         2400
-       DEPARTMENT_ID   DEPARTMENT_NAME  MANAGER_ID  LOCATION_ID
-    0             50          Shipping         121         1500
-    1             60                IT         103         1400
-    2             70  Public Relations         204         2700
-
-Converting to other data frame formats is :ref:`shown later <convertingodf>` in
-this chapter.
-
-**Asynchronous Data Frame Queries**
-
-With :ref:`asynchronous programming <asyncio>`, use the appropriate syntax. For
-example, to fetch all rows at once:
-
-.. code-block:: python
-
-    connection = await oracledb.connect_async(...)
-    odf = await connection.fetch_df_all(sql="select ...", parameters=..., arraysize=...)
-
-Or to iterate:
-
-.. code-block:: python
-
-    connection = await oracledb.connect_async(...)
-    async for odf in connection.fetch_df_batches(sql="select ...", parameters=..., size=...):
-        do_something(odf)
-
-.. _dftypemapping:
-
-Data Frame Type Mapping
------------------------
-
-Default Data Frame Type Mapping
-+++++++++++++++++++++++++++++++
-
-Internally, python-oracledb's :ref:`DataFrame <oracledataframeobj>` support
-makes use of `Apache nanoarrow <https://arrow.apache.org/nanoarrow/>`__
-libraries to build data frames.
-
-When querying, the following default data type mapping occurs from Oracle
-Database types to the Arrow types used in python-oracledb DataFrame
-objects. Querying any other data types from Oracle Database will result in
-an exception. :ref:`Output type handlers <outputtypehandlers>` cannot be used
-to map data types.
-
-.. list-table-with-summary:: Mapping from Oracle Database to Apache Arrow data types
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 1 1
-    :width: 100%
-    :align: left
-    :summary: The first column is the Oracle Database type. The second column is the Apache Arrow data type used in the python-oracledb DataFrame object.
-
-    * - Oracle Database Type
-      - Apache Arrow Data Type
-    * - :attr:`DB_TYPE_BINARY_DOUBLE`
-      - DOUBLE
-    * - :attr:`DB_TYPE_BINARY_FLOAT`
-      - FLOAT
-    * - :attr:`DB_TYPE_BLOB`
-      - LARGE_BINARY
-    * - :attr:`DB_TYPE_BOOLEAN`
-      - BOOLEAN
-    * - :attr:`DB_TYPE_CHAR`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_CLOB`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_DATE`
-      - TIMESTAMP
-    * - :attr:`DB_TYPE_LONG`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_LONG_RAW`
-      - LARGE_BINARY
-    * - :attr:`DB_TYPE_NCHAR`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_NCLOB`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_NUMBER`
-      - DECIMAL128, INT64, or DOUBLE
-    * - :attr:`DB_TYPE_NVARCHAR`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_RAW`
-      - LARGE_BINARY
-    * - :attr:`DB_TYPE_TIMESTAMP`
-      - TIMESTAMP
-    * - :attr:`DB_TYPE_TIMESTAMP_LTZ`
-      - TIMESTAMP
-    * - :attr:`DB_TYPE_TIMESTAMP_TZ`
-      - TIMESTAMP
-    * - :attr:`DB_TYPE_VARCHAR`
-      - LARGE_STRING
-    * - :attr:`DB_TYPE_VECTOR`
-      - List or struct with DOUBLE, FLOAT, INT8, or UINT8 values
-
-**Numbers**
-
-When converting Oracle Database NUMBERs:
-
-- If the column has been created without a precision and scale, or you are
-  querying an expression that results in a number without precision or scale,
-  then the Apache Arrow data type will be DOUBLE.
-
-- If :attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>` is set
-  to *True*, then the Apache Arrow data type is DECIMAL128.
-
-- If the column has been created with a scale of *0*, and a precision value
-  that is less than or equal to *18*, then the Apache Arrow data type is INT64.
-
-- In all other cases, the Apache Arrow data type is DOUBLE.
-
-**Strings**
-
-When converting Oracle Database character types:
-
-- If the number of records being fetched by :meth:`Connection.fetch_df_all()`,
-  or fetched in each batch by :meth:`Connection.fetch_df_batches()`, can be
-  handled by 32-bit offsets, you can use an :ref:`explicit mapping
-  <explicitmapping>` to fetch as STRING instead of the default
-  LARGE_STRING. This will save 4 bytes per record.
-
-**Vectors**
-
-When converting Oracle Database VECTORs:
-
-- Dense vectors are fetched as lists.
-
-- Sparse vectors are fetched as structs with fields ``num_dimensions``,
-  ``indices`` and ``values`` similar to :ref:`SparseVector objects
-  <sparsevectorsobj>`.
-
-- Fixed and flexible dimensions are supported for dense VECTOR columns. For
-  sparse VECTOR columns, the dimension of each vector must be the same.
-
-- VECTOR columns with flexible formats are not supported. Each vector value
-  must have the same storage format data type.
-
-- Vector values are fetched as the following types:
-
-  .. list-table-with-summary::
-      :header-rows: 1
-      :class: wy-table-responsive
-      :widths: 1 1
-      :align: left
-      :summary: The first column is the Oracle Database VECTOR format. The second column is the resulting Apache Arrow data type in the list.
-
-      * - Oracle Database VECTOR format
-        - Apache Arrow data type
-      * - FLOAT64
-        - DOUBLE
-      * - FLOAT32
-        - FLOAT
-      * - INT8
-        - INT8
-      * - BINARY
-        - UINT8
-
-See :ref:`dfvector` for more information.
-
-**CLOB and NCLOB**
-
-When converting Oracle Database CLOBs and NCLOBs:
-
-- LOBs must be no more than 1 GB in length.
-
-- If the number of records being fetched by :meth:`Connection.fetch_df_all()`,
-  or fetched in each batch by :meth:`Connection.fetch_df_batches()`, can be
-  handled by 32-bit offsets, you can use an :ref:`explicit mapping
-  <explicitmapping>` to fetch CLOBs and NCLOBs as STRING instead of the default
-  LARGE_STRING. This will save 4 bytes per record.
-
-**BLOB**
-
-When converting Oracle Database BLOBs:
-
-- LOBs must be no more than 1 GB in length.
-
-- If the number of records being fetched by :meth:`Connection.fetch_df_all()`,
-  or fetched in each batch by :meth:`Connection.fetch_df_batches()`, can be
-  handled by 32-bit offsets, you can use an :ref:`explicit mapping
-  <explicitmapping>` to fetch BLOBs as BINARY instead of the default
-  LARGE_BINARY. This will save 4 bytes per record.
-
-**Dates and Timestamps**
-
-When converting Oracle Database DATEs and TIMESTAMPs:
-
-- Apache Arrow TIMESTAMPs will not have timezone data.
-
-- For Oracle Database DATE columns, the Apache Arrow TIMESTAMP will have a time
-  unit of "seconds".
-
-- For Oracle Database TIMESTAMP types, the Apache Arrow TIMESTAMP time unit
-  depends on the Oracle type's fractional precision as shown in the table
-  below:
-
-  .. list-table-with-summary::
-      :header-rows: 1
-      :class: wy-table-responsive
-      :widths: 1 1
-      :align: left
-      :summary: The first column is the Oracle Database TIMESTAMP-type fractional second precision. The second column is the resulting Apache Arrow TIMESTAMP time unit.
-
-      * - Oracle Database TIMESTAMP fractional second precision range
-        - Apache Arrow TIMESTAMP time unit
-      * - 0
-        - seconds
-      * - 1 - 3
-        - milliseconds
-      * - 4 - 6
-        - microseconds
-      * - 7 - 9
-        - nanoseconds
-
-.. _explicitmapping:
-
-Explicit Data Frame Type Mapping
-++++++++++++++++++++++++++++++++
-
-You can explicitly set the data types and names that a :ref:`DataFrame
-<oracledataframeobj>` will use for query results. This provides fine-grained
-control over the physical data representation of the resulting Arrow arrays. It
-allows you to specify a representation that is more efficient for its specific
-use case. This can reduce memory consumption and improve processing speed.
-
-The parameter ``requested_schema`` parameter to
-:meth:`Connection.fetch_df_all()`, :meth:`Connection.fetch_df_batches()`,
-:meth:`AsyncConnection.fetch_df_all()`, or
-:meth:`AsyncConnection.fetch_df_batches()` should be an object implementing the
-`Arrow PyCapsule schema interface
-<https://arrow.apache.org/docs/python/generated/pyarrow.Schema.html>`__.
-
-For example, the ``pyarrow.schema()`` factory function can be used to create a
-new schema. This takes a list of field definitions as input. Each field can be
-a tuple of ``(name, DataType)``:
-
-.. code-block:: python
-
-    import pyarrow
-
-    # Default fetch
-
-    odf = connection.fetch_df_all(
-        "select 123 c1, 'Scott' c2 from dual"
-    )
-    tab = pyarrow.table(odf)
-    print("Default Output:", tab)
-
-    # Fetching with an explicit schema
-
-    schema = pyarrow.schema([
-        ("col_1", pyarrow.int16()),
-        ("C2", pyarrow.string())
-    ])
-
-    odf = connection.fetch_df_all(
-        "select 456 c1, 'King' c2 from dual",
-        requested_schema=schema
-    )
-    tab = pyarrow.table(odf)
-    print("\nNew Output:", tab)
-
-The schema should have an entry for each queried column.
-
-Running the example shows that the number column with the explicit schema was
-fetched into the requested type INT16. Its name has also changed::
-
-    Default Output: pyarrow.Table
-    C1: double
-    C2: string
-    ----
-    C1: [[123]]
-    C2: [["Scott"]]
-
-    New Output: pyarrow.Table
-    col_1: int16
-    C2: string
-    ----
-    col_1: [[456]]
-    C2: [["King"]]
-
-**Supported Explicit Type Mapping**
-
-The following table shows the explicit type mappings that are supported. The
-Oracle Database types in each row can be converted to any of the Apache Arrow
-types in the same row. An error will occur if the database type or the data
-cannot be represented in the requested schema type.
-
-  .. list-table-with-summary::
-      :header-rows: 1
-      :class: wy-table-responsive
-      :widths: 1 1
-      :align: left
-      :summary: The first column is the Oracle Database data types. The second column shows supported Apache Arrow data types.
-
-      * - Oracle Database Types
-        - Apache Arrow Data Types
-      * - :attr:`DB_TYPE_NUMBER`
-        - DECIMAL128(p, s)
-          DOUBLE
-          FLOAT
-          INT8
-          INT16
-          INT32
-          INT64
-          UINT8
-          UINT16
-          UINT32
-          UINT64
-      * - :attr:`DB_TYPE_BLOB`
-          :attr:`DB_TYPE_LONG_RAW`
-          :attr:`DB_TYPE_RAW`
-        - BINARY
-          FIXED SIZE BINARY
-          LARGE_BINARY
-      * - :attr:`DB_TYPE_BOOLEAN`
-        - BOOLEAN
-      * - :attr:`DB_TYPE_DATE`
-          :attr:`DB_TYPE_TIMESTAMP`
-          :attr:`DB_TYPE_TIMESTAMP_LTZ`
-          :attr:`DB_TYPE_TIMESTAMP_TZ`
-        - DATE32
-          DATE64
-          TIMESTAMP
-      * - :attr:`DB_TYPE_BINARY_DOUBLE`
-          :attr:`DB_TYPE_BINARY_FLOAT`
-        - DOUBLE
-          FLOAT
-      * - :attr:`DB_TYPE_CHAR`
-          :attr:`DB_TYPE_CLOB`
-          :attr:`DB_TYPE_LONG`
-          :attr:`DB_TYPE_NCHAR`
-          :attr:`DB_TYPE_NCLOB`
-          :attr:`DB_TYPE_NVARCHAR`
-          :attr:`DB_TYPE_VARCHAR`
-        - LARGE_STRING
-          STRING
-
-.. _convertingodf:
-
-Converting python-oracledb's DataFrame to Other Data Frames
------------------------------------------------------------
-
-To use data frames in your chosen analysis library, :ref:`DataFrame objects
-<oracledataframeobj>` can be converted. Examples for some libraries are shown
-in the following sections. Other libraries will have similar methods.
-
-**Conversion Overview**
-
-Guidelines for converting python-oracledb :ref:`DataFrame objects
-<oracledataframeobj>` to data frames for other libraries are:
-
-- To convert to a `PyArrow Table <https://arrow.apache.org/docs/python/
-  generated/pyarrow.Table.html>`__, use `pyarrow.table()
-  <https://arrow.apache.org/docs/python/generated/pyarrow.table.html
-  #pyarrow.table>`__ which leverages the Arrow PyCapsule interface.
-
-- To convert to a `Pandas DataFrame <https://pandas.pydata.org/docs/reference/
-  api/pandas.DataFrame.html#pandas.DataFrame>`__, use
-  `pyarrow.table().to_pandas() <https://arrow.apache.org/docs/python/generated/
-  pyarrow.Table.html#pyarrow.Table.to_pandas>`__.
-
-- If you want to use a library other than Pandas or PyArrow, use the library's
-  ``from_arrow()`` method to convert a PyArrow Table to the applicable data
-  frame, if your library supports this.  For example, with `Polars
-  <https://pola.rs/>`__ use `polars.from_arrow() <https://docs.pola.rs/api/
-  python/dev/reference/api/polars.from_arrow.html>`__.
-
-You should test and benchmark to find the best option for your applications.
-
-Creating PyArrow Tables
-+++++++++++++++++++++++
-
-An example that creates and uses a `PyArrow Table
-<https://arrow.apache.org/docs/python/generated/pyarrow.Table.html>`__ is:
-
-.. code-block:: python
-
-    import pyarrow
-
-    # Get a python-oracledb DataFrame
-    # Adjust arraysize to tune the query fetch performance
-    sql = "select id, name from mytable order by id"
-    odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-    # Create a PyArrow table
-    pyarrow_table = pyarrow.table(odf)
-
-    print("\nNumber of rows and columns:")
-    (r, c) = pyarrow_table.shape
-    print(f"{r} rows, {c} columns")
-
-Internally `pyarrow.table()
-<https://arrow.apache.org/docs/python/generated/
-pyarrow.table.html#pyarrow.table>`__
-leverages the Apache Arrow PyCapsule interface that python-oracledb
-:ref:`DataFrame <oracledataframeobj>` objects expose.
-
-See `samples/dataframe_pyarrow.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/dataframe_pyarrow.py>`__ for a runnable example.
-
-.. _pandasdf:
-
-Creating Pandas DataFrames
-++++++++++++++++++++++++++
-
-An example that creates and uses a `Pandas DataFrame <https://pandas.pydata.
-org/docs/reference/api/pandas.DataFrame.html#pandas.DataFrame>`__ is:
-
-.. code-block:: python
-
-    import pandas
-    import pyarrow
-
-    # Get a python-oracledb DataFrame
-    # Adjust arraysize to tune the query fetch performance
-    sql = "select * from mytable where id = :1"
-    myid = 12345  # the bind variable value
-    odf = connection.fetch_df_all(statement=sql, parameters=[myid], arraysize=1000)
-
-    # Get a Pandas DataFrame from the data.
-    pdf = pyarrow.table(odf).to_pandas()
-
-    # Perform various Pandas operations on the DataFrame
-    print(pdf.T)        # transform
-    print(pdf.tail(3))  # last three rows
-
-The `to_pandas() <https://arrow.apache.org/docs/python/generated/pyarrow.Table.
-html#pyarrow.Table.to_pandas>`__ method supports arguments like
-``types_mapper=pandas.ArrowDtype`` and ``deduplicate_objects=False``, which may
-be useful for some data sets.
-
-See `samples/dataframe_pandas.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/dataframe_pandas.py>`__ for a runnable example.
-
-Creating Polars DataFrames
-++++++++++++++++++++++++++
-
-An example that creates and uses a `Polars DataFrame
-<https://docs.pola.rs/api/python/stable/reference/dataframe/index.html>`__ is:
-
-.. code-block:: python
-
-    import polars
-    import pyarrow
-
-    # Get a python-oracledb DataFrame
-    # Adjust arraysize to tune the query fetch performance
-    sql = "select id from mytable order by id"
-    odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-    # Convert to a Polars DataFrame
-    pdf = polars.from_arrow(odf)
-
-    # Perform various Polars operations on the DataFrame
-    r, c = pdf.shape
-    print(f"{r} rows, {c} columns")
-    print(pdf.sum())
-
-See `samples/dataframe_polars.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/dataframe_polars.py>`__ for a runnable example.
-
-Writing Apache Parquet Files
-++++++++++++++++++++++++++++
-
-To write output in `Apache Parquet <https://parquet.apache.org/>`__ file
-format, you can use data frames as an efficient intermediary. Use the
-:meth:`Connection.fetch_df_batches()` iterator and convert to a `PyArrow Table
-<https://arrow.apache.org/docs/python/generated/
-pyarrow.table.html#pyarrow.table>`__ that can be written by the PyArrow
-library.
-
-.. code-block:: python
-
-    import pyarrow
-    import pyarrow.parquet as pq
-
-    FILE_NAME = "sample.parquet"
-
-    # Tune the fetch batch size for your query
-    BATCH_SIZE = 10000
-
-    sql = "select * from mytable"
-    pqwriter = None
-    for odf in connection.fetch_df_batches(statement=sql, size=BATCH_SIZE):
-
-        # Get a PyArrow table from the query results
-        pyarrow_table = pyarrow.table(odf)
-
-        if not pqwriter:
-            pqwriter = pq.ParquetWriter(FILE_NAME, pyarrow_table.schema)
-
-        pqwriter.write_table(pyarrow_table)
-
-    pqwriter.close()
-
-See `samples/dataframe_parquet_write.py <https://github.com/oracle/
-python-oracledb/blob/main/samples/dataframe_parquet_write.py>`__
-for a runnable example.
-
-The DLPack Protocol
-+++++++++++++++++++
-
-The DataFrame format facilitates working with query results as
-tensors. Conversion can be done using the standard `DLPack Protocol
-<https://arrow.apache.org/docs/python/dlpack.html>`__ implemented by PyArrow.
-
-**Using NumPy Arrays**
-
-For example, to convert to `NumPy <https://numpy.org/>`__ ``ndarray`` format:
-
-.. code-block:: python
-
-    import numpy
-    import pyarrow
-
-    SQL = "select id from mytable order by id"
-
-    # Get a python-oracledb DataFrame
-    # Adjust arraysize to tune the query fetch performance
-    odf = connection.fetch_df_all(statement=SQL, arraysize=100)
-
-    # Convert to an ndarray via the Python DLPack specification
-    pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-    np = numpy.from_dlpack(pyarrow_array)
-
-    # Perform various numpy operations on the ndarray
-
-    print(numpy.sum(np))
-    print(numpy.log10(np))
-
-See `samples/dataframe_numpy.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/dataframe_numpy.py>`__ for a runnable example.
-
-Using Torch
-+++++++++++
-
-An example of working with data as a `Torch tensor
-<https://pytorch.org/docs/stable/tensors.html>`__ is:
-
-.. code-block:: python
-
-    import pyarrow
-    import torch
-
-    SQL = "select id from mytable order by id"
-
-    # Get a python-oracledb DataFrame
-    # Adjust arraysize to tune the query fetch performance
-    odf = connection.fetch_df_all(statement=SQL, arraysize=100)
-
-    # Convert to a Torch tensor via the Python DLPack specification
-    pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-    tt = torch.from_dlpack(pyarrow_array)
-
-    # Perform various Torch operations on the tensor
-
-    print(torch.sum(tt))
-    print(torch.log10(tt))
-
-See `samples/dataframe_torch.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/dataframe_torch.py>`__ for a runnable example.
-
-.. _dfvector:
-
-Fetching VECTOR columns to Data Frames
---------------------------------------
-
-Columns of the `VECTOR <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-746EAA47-9ADA-4A77-82BB-64E8EF5309BE>`__ data type can be fetched with
-the methods :meth:`Connection.fetch_df_all()` and
-:meth:`Connection.fetch_df_batches()`. VECTOR columns can have flexible
-dimensions, but flexible storage formats are not supported: each vector value
-must have the same format data type. Vectors can be dense or sparse.
-
-See :ref:`dftypemapping` for the type mapping for VECTORs.
-
-**Dense Vectors**
-
-By default, Oracle Database vectors are "dense".  These are fetched in
-python-oracledb as Arrow lists. For example, if the table::
-
-    create table myvec (v64 vector(3, float64));
-
-contains these two vectors::
-
-    [4.1, 5.2, 6.3]
-    [7.1, 8.2, 9.3]
-
-then the code:
-
-.. code-block:: python
-
-    odf = connection.fetch_df_all("select v64 from myvec")
-    pyarrow_table = pyarrow.table(odf)
-
-will result in a PyArrow table containing lists of doubles. The table can be
-converted to a data frame of your chosen library.
-
-For example, to convert the PyArrow table to Pandas:
-
-.. code-block:: python
-
-    pdf = pyarrow_table.to_pandas()
-
-Or you can convert the python-oracledb :ref:`DataFrame <oracledataframeobj>`
-directly if the library supports it. For example, to fetch to Pandas the syntax
-is the same as shown in :ref:`Creating Pandas DataFrames <pandasdf>`:
-
-.. code-block:: python
-
-    odf = connection.fetch_df_all("select v64 from myvec")
-    pdf = pyarrow.table(odf).to_pandas()
-    print(pdf)
-
-The output will be::
-
-                   V64
-    0  [4.1, 5.2, 6.3]
-    1  [7.1, 8.2, 9.3]
-
-**Sparse Vectors**
-
-Sparse vectors (where many of the values are 0) are fetched as structs with
-fields ``num_dimensions``, ``indices``, and ``values`` similar to
-:ref:`SparseVector objects <sparsevectorsobj>` which are discussed in a
-non-data frame context in :ref:`sparsevectors`.
-
-If the table::
-
-    create table myvec (v64 vector(3, float64, sparse));
-
-contains these two vectors::
-
-    [3, [1,2], [4.1, 5.2]]
-    [3, [0], [9.3]]
-
-then the code to fetch as data frames:
-
-.. code-block:: python
-
-    import pyarrow
-
-    odf = connection.fetch_df_all("select v64 from myvec")
-    pdf = pyarrow.table(odf).to_pandas()
-
-    print(pdf)
-
-    print("First row:")
-
-    num_dimensions = pdf.iloc[0].V64['num_dimensions']
-    print(f"num_dimensions={num_dimensions}")
-
-    indices = pdf.iloc[0].V64['indices']
-    print(f"indices={indices}")
-
-    values = pdf.iloc[0].V64['values']
-    print(f"values={values}")
-
-will display::
-
-                                                     V64
-    0  {'num_dimensions': 3, 'indices': [1, 2], 'valu...
-    1  {'num_dimensions': 3, 'indices': [0], 'values'...
-
-    First row:
-    num_dimensions=3
-    indices=[1 2]
-    values=[4.1 5.2]
-
-You can convert each struct as needed.  One way to convert into `Pandas
-dataframes with sparse values
-<https://pandas.pydata.org/docs/user_guide/sparse.html>`__ is via a `SciPy
-coordinate format matrix <https://docs.scipy.org/doc/scipy/reference/generated/
-scipy.sparse.coo_array.html#scipy.sparse.coo_array>`__. The Pandas method
-`from_spmatrix() <https://pandas.pydata.org/docs/reference/api/
-pandas.DataFrame.sparse.from_spmatrix.html>`__ can then be used to create the
-final sparse dataframe:
-
-.. code-block:: python
-
-    import numpy
-    import pandas
-    import pyarrow
-    import scipy
-
-    def convert_to_sparse_array(val):
-        dimensions = val["num_dimensions"]
-        col_indices = val["indices"]
-        row_indices = numpy.zeros(len(col_indices))
-        values = val["values"]
-        sparse_matrix = scipy.sparse.coo_matrix(
-            (values, (col_indices, row_indices)), shape=(dimensions, 1))
-        return pandas.arrays.SparseArray.from_spmatrix(sparse_matrix)
-
-    odf = connection.fetch_df_all("select v64 from myvec")
-    pdf = pyarrow.table(odf).to_pandas()
-
-    pdf["SPARSE_ARRAY_V64"] = pdf["V64"].apply(convert_to_sparse_array)
-
-    print(pdf.SPARSE_ARRAY_V64)
-
-The code will print::
-
-    0    [0.0, 4.1, 5.2]
-    Fill: 0.0
-    IntIndex
-    Indices: ar...
-    1    [9.3, 0.0, 0.0]
-    Fill: 0.0
-    IntIndex
-    Indices: ar...
-    Name: SPARSE_ARRAY_V64, dtype: object
-
-.. _dfinsert:
-
-Inserting Data Frames
-=====================
-
-Python-oracledb :ref:`DataFrame <oracledataframeobj>` instances, or third-party
-DataFrame instances that support the Apache Arrow PyCapsule Interface, can be
-inserted into Oracle Database by passing them directly to
-:meth:`Cursor.executemany()` or :meth:`AsyncCursor.executemany()`.  They can
-also be passed to :meth:`Connection.direct_path_load()` and
-:meth:`AsyncConnection.direct_path_load()`.
-
-Inserting Data Frames with executemany()
-----------------------------------------
-
-For example, with the table::
-
-    create table t (col1 number, col2 number);
-
-The following code will insert a Pandas DataFrame:
-
-.. code-block:: python
-
-    import pandas
-
-    d = {'A': [1.2, 2.4, 8.9], 'B': [3.333, 4.9, 0.0]}
-    pdf = pandas.DataFrame(data=d)
-
-    cursor.executemany("insert into t (col1, col2) values (:1, :2)", pdf)
-
-Inserting to a dense VECTOR column::
-
-    create table SampleVectorTab (v64 vector(3, float64));
-
-Can be done like:
-
-.. code-block:: python
-
-    import pandas
-
-    d = {"v": [[3.3, 1.32, 5.0], [2.2, 2.32, 2.0]]}
-    pdf = pandas.DataFrame(data=d)
-
-    cursor.executemany("insert into SampleVectorTab (v64) values (:1)", pdf)
-
-See `dataframe_insert.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/dataframe_insert.py>`__ for a runnable example.
-
-For general information about fast data ingestion, and discussion of
-:meth:`Cursor.executemany()` and :meth:`AsyncCursor.executemany()` options, see
-:ref:`batchstmnt`.
-
-.. _dfppl:
-
-Inserting Data Frames with Direct Path Loads
---------------------------------------------
-
-Very large :ref:`DataFrame <oracledataframeobj>` objects can be efficiently
-inserted using Oracle Database Direct Path Loading by passing them to
-:meth:`Connection.direct_path_load()`. You can also pass third-party DataFrame
-instances that support the Apache Arrow PyCapsule Interface.
-
-See :ref:`directpathloads` for general information about Direct Path Loads.
-
-For example, if the user "HR" has the table::
-
-    create table mytab (
-                   id   number(9),
-                   name varchar2(100));
-
-The following code will insert a Pandas DataFrame:
-
-.. code-block:: python
-
-    import pandas
-
-    d = [
-        (1, "Abigail"),
-        (2, "Anna"),
-        (3, "Janey"),
-        (4, "Jessica"),
-    ]
-    pdf = pandas.DataFrame(data=d)
-
-    connection.direct_path_load(
-        schema_name="hr",
-        table_name="mytab",
-        column_names=["id", "name"],
-        data=pdf
-    )
-
-Explicit Conversion to DataFrame or ArrowArray
-==============================================
-
-Data frames that support the Apache Arrow PyCapsule Interface can be explicitly
-converted to :ref:`DataFrame <oracledataframeobj>` and :ref:`ArrowArray
-<oraclearrowarrayobj>` objects by calling :func:`oracledb.from_arrow()`.  The
-resulting object depends on what interface is supported by the source object.
-
-For example:
-
-.. code-block:: python
-
-    import pandas
-
-    d = {'A': [1.2, 2.4, 8.9], 'B': [3.333, 4.9, 0.0]}
-    pdf = pandas.DataFrame(data=d)
-    print(type(pdf))
-
-    odf = oracledb.from_arrow(pdf)
-    print(type(odf))
-
-will print::
-
-    <class 'pandas.core.frame.DataFrame'>
-    <class 'oracledb.dataframe.DataFrame'>
diff --git a/doc/src/user_guide/exception_handling.rst b/doc/src/user_guide/exception_handling.rst
deleted file mode 100644
index 4c715732..00000000
--- a/doc/src/user_guide/exception_handling.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-.. _exception:
-
-.. currentmodule:: oracledb
-
-*******************
-Catching Exceptions
-*******************
-
-All exceptions raised by python-oracledb are inherited from
-:attr:`oracledb.Error`.  See :ref:`exceptions` and :ref:`exchandling` for
-information about attributes.
-
-See :ref:`errorhandling` for differences between python-oracledb Thin and
-:ref:`Thick <enablingthick>` modes.
-
-Applications can catch exceptions as needed. For example, when trying to add a
-customer that already exists in the database, the following could be used to
-catch the exception:
-
-.. code-block:: python
-
-    try:
-        cursor.execute("insert into customer values (101, 'Customer A')")
-    except oracledb.IntegrityError:
-        print("Customer ID already exists")
-    else:
-        print("Customer added")
-
-If information about the exception needs to be processed instead, the following
-code can be used:
-
-.. code-block:: python
-
-    try:
-        cursor.execute("insert into customer values (101, 'Customer A')")
-    except oracledb.IntegrityError as e:
-        error_obj, = e.args
-        print("Customer ID already exists")
-        print("Error Code:", error_obj.code)
-        print("Error Full Code:", error_obj.full_code)
-        print("Error Message:", error_obj.message)
-    else:
-        print("Customer added")
-
-This will print output like::
-
-    Customer ID already exists
-    Error Code: 1
-    Error Full Code: ORA-00001
-    Error Message: ORA-00001: unique constraint (CJ.PK) violated
-
-.. _errorhandling:
-
-Error Handling in Thin and Thick Modes
-======================================
-
-The Thin and Thick modes of python-oracledb return some errors differently.
-
-The python-oracledb Thin mode generates error messages with the prefix "DPY".
-
-In python-oracledb :ref:`Thick <enablingthick>` mode:
-
-- The Oracle Call Interface (OCI) libraries generate error messages with the
-  prefix "ORA".
-
-- The `ODPI-C <https://oracle.github.io/odpi/>`__ code layer generates error
-  messages with the prefix "DPI".
-
-- The python-oracledb Thick mode generates error messages with the prefix
-  "DPY".
-
-Errors generated by the Oracle Database itself commonly have the error prefix
-"ORA".
-
-Some differences between python-oracledb Thin and Thick mode errors are shown
-in the examples below:
-
-* Binding: When binding is incorrect, python-oracledb Thick mode may generate
-  an Oracle Client library error such as::
-
-    ORA-01008: not all variables bound
-
-  In contrast, the python-oracledb Thin mode might generate::
-
-    DPY-4010: a bind variable replacement value for placeholder ":1" was not provided
-
-* Connection messages: The python-oracledb Thin mode connection and networking
-  is handled by Python itself.  Some errors portable across operating systems
-  and Python versions have DPY-prefixed errors displayed by python-oracledb.
-  Other messages are returned directly from Python and may vary accordingly.
-  The traditional Oracle connection errors with prefix "ORA" are not shown. For
-  example, the scenarios detailed below show how the connection and network
-  error messages might differ between python-oracledb Thin and Thick modes.
-
-  * Scenario 1: The given host does not have a database listener running.
-
-    python-oracledb Thin mode Error::
-
-      DPY-6005: cannot connect to database. Connection failed with "[Errno 61]
-      Connection refused"
-
-    python-oracledb Thick mode Error::
-
-      ORA-12541: TNS:no listener
-
-  * Scenario 2: The requested connection alias was not found in the tnsnames.ora file.
-
-    python-oracledb Thin mode Error::
-
-      DPY-4000: cannot connect to database. Unable to find "{name}" in {file_name}
-
-    python-oracledb Thick mode Error::
-
-      ORA-12154: TNS:could not resolve the connect identifier specified
-
-  * Scenario 3: The Oracle Database listener does not know of the requested
-    service name.
-
-    python-oracledb Thin mode Error::
-
-      DPY-6001: cannot connect to database.  Service "{service_name}" is not
-      registered with the listener at host "{host}" port {port}.  (Similar to
-      ORA-12514)
-
-    python-oracledb Thick mode Error::
-
-      ORA-12514: TNS:listener does not currently know of service requested in
-      connect descriptor
-
-* Connection Pooling: The python-oracledb Thin mode pool is not based on the
-  Oracle Call Interface (OCI) Session Pool and has its own DPY messages.
diff --git a/doc/src/user_guide/extending.rst b/doc/src/user_guide/extending.rst
deleted file mode 100644
index 8b8ec11b..00000000
--- a/doc/src/user_guide/extending.rst
+++ /dev/null
@@ -1,311 +0,0 @@
-.. _extendingpython-oracledb:
-
-.. currentmodule:: oracledb
-
-*************************
-Extending python-oracledb
-*************************
-
-You can extend the capabilities of python-oracledb by using standard Python
-functionality for :ref:`subclassing python-oracledb classes <subclassconn>`.
-You can also use :ref:`python-oracledb plugins <customplugins>`,
-:ref:`connection protocol hooks <protocolhook>`, :ref:`connection password
-hooks <passwordhook>`, and :ref:`connection parameter hooks <paramshook>`.
-
-.. _subclassconn:
-
-Subclassing Connections
-=======================
-
-Subclassing enables applications to change python-oracledb, for example by
-extending connection and statement execution behavior. This can be used to
-alter, or log, connection and execution parameters, or to further change
-python-oracledb functionality.
-
-The example below demonstrates subclassing a connection to log SQL execution
-to a file.  This example also shows how connection credentials can be embedded
-in the custom subclass, so application code does not need to supply them.
-
-.. code-block:: python
-
-    class Connection(oracledb.Connection):
-        log_file_name = "log.txt"
-
-        def __init__(self):
-            connect_string = "hr/hr_password@dbhost.example.com/orclpdb"
-            self._log("Connect to the database")
-            return super(Connection, self).__init__(connect_string)
-
-        def _log(self, message):
-            with open(self.log_file_name, "a") as f:
-                print(message, file=f)
-
-        def execute(self, sql, parameters):
-            self._log(sql)
-            cursor = self.cursor()
-            try:
-                return cursor.execute(sql, parameters)
-            except oracledb.Error as e:
-                error_obj, = e.args
-                self._log(error_obj.message)
-                raise
-
-    connection = Connection()
-    connection.execute("""
-            select department_name
-            from departments
-            where department_id = :id""", dict(id=270))
-
-The messages logged in ``log.txt`` are::
-
-    Connect to the database
-
-                select department_name
-                from departments
-                where department_id = :id
-
-If an error occurs, perhaps due to a missing table, the log file would contain
-instead::
-
-    Connect to the database
-
-                select department_name
-                from departments
-                where department_id = :id
-    ORA-00942: table or view "HR"."DEPARTMENTS" does not exist
-
-In production applications, be careful not to log sensitive information.
-
-See `Subclassing.py
-<https://github.com/oracle/python-oracledb/blob/main/
-samples/subclassing.py>`__ for an example.
-
-.. _plugins:
-
-Python-oracledb Plugins
-=======================
-
-Plugins simplify extending python-oracledb functionality, and optionally allow
-the distribution of such extensions as modules. The plugin mechanism provides a
-loose coupling for python-oracledb, permitting different python-oracledb
-configurations.
-
-Examples are the pre-supplied plugins for :ref:`Centralized Configuration
-Providers <configurationproviders>`. The loose coupling allows these plugins to
-be included with all python-oracledb installations but the large Python SDK
-modules used by the plugins are not installed as python-oracledb
-dependencies. Only users who want to use a specific configuration provider
-plugin need to install its required SDK.
-
-All python-oracledb installations bundle the following plugins:
-
-- ``oci_config_provider`` which allows connection and pool creation calls to
-  access connection configuration information stored in OCI Object Storage. See
-  :ref:`ociobjstorageprovider`.
-
-- ``azure_config_provider`` which allows connection and pool creation calls to
-  access connection configuration information stored using Azure App
-  Configuration. See :ref:`azureappstorageprovider`.
-
-- ``oci_tokens`` which uses the `Oracle Cloud Infrastructure (OCI) Software
-  Development Kit (SDK) <https://docs.oracle.com/en-us/iaas/Content/API/
-  Concepts/sdkconfig.htm>`__ to generate access tokens when authenticating with
-  OCI Identity and Access Management (IAM) token-based authentication. See
-  :ref:`cloudnativeauthoci`.
-
-- ``azure_tokens`` which uses the `Microsoft Authentication Library (MSAL)
-  <https://learn.microsoft.com/en-us/entra/msal/python/?view=msal-py-
-  latest>`__ to generate access tokens when authenticating with OAuth 2.0
-  token-based authentication. See :ref:`cloudnativeauthoauth`.
-
-To import these python-oracledb plugins in your application, use
-``import oracledb.plugins.<name of plugin>``, for example::
-
-    import oracledb.plugins.oci_tokens
-
-Note that the namespace ``oracledb.plugins.ldap_support`` is reserved for
-future use by the python-oracledb project.
-
-.. _customplugins:
-
-Building Custom Plugins
------------------------
-
-If you want to use the :ref:`plugin mechanism <oracledbplugins>` for your own
-packages, you can create a `namespace package <https://packaging.python.org/en
-/latest/guides/packaging-namespace-packages/#native-namespace-packages>`__. You
-can distribute plugin packages either internally within your organization, or
-on a package repository such as `PyPI <https://pypi.org/>`__.
-
-**Example 1**
-
-The following example creates a plugin that uses a :ref:`connection protocol
-hook function <registerprotocolhook>` to do special processing of connection
-strings prefixed with "myprefix://".
-
-1. In a terminal or IDE, create a working directory, for example ``myplugin``::
-
-    mkdir myplugin
-
-2. In the ``myplugin`` directory, create the following files:
-
-   - A ``README`` file::
-
-           My sample connection plugin.
-
-   - A ``pyproject.toml`` file::
-
-           [build-system]
-           requires = ["setuptools"]
-           build-backend = "setuptools.build_meta"
-
-   - A ``setup.cfg`` file::
-
-           [metadata]
-           name = myplugin
-           version = 1.0.0
-           description = Sample connection plugin for python-oracleb
-           long_description = file: README
-           long_description_content_type = text/markdown
-           author = Your Name
-           author_email = youremail@example.com
-           license = Apache Software License
-
-           [options]
-           zip_safe = False
-           package_dir =
-               =src
-           install_requires = oracledb
-
-           [options.packages.find]
-           where = src
-
-3. In the ``myplugin`` directory, create the subdirectory hierarchy
-   ``src/oracledb/plugins/``:
-
-   .. code-block:: shell
-
-        mkdir -p src/oracledb/plugins
-
-4. Create the plugin's code in ``myplugin/src/oracledb/plugins/myplugin.py``:
-
-  .. code-block:: python
-
-        import oracledb
-
-        def myhookfunc(protocol, arg, params):
-            print(f"In myhookfunc: protocol={protocol} arg={arg}")
-            params.parse_connect_string(arg)
-
-        oracledb.register_protocol("myprefix", myhookfunc)
-
-5. In the ``myplugin`` directory, build the sample package:
-
-   .. code-block:: shell
-
-        python -m pip install build
-        python -m build
-
-   This creates your plugin package wheel in the ``dist`` subdirectory with a
-   name like ``myplugin-1.0.0-py3-none-any.whl``. You can distribute and
-   install this package.
-
-6. Install the sample package:
-
-   .. code-block:: shell
-
-        python -m pip install dist/myplugin-1.0.0-py3-none-any.whl
-
-7. To show the plugin in use, create an application file in a working directory
-   containing:
-
-   .. code-block:: python
-
-        import oracledb
-        import oracledb.plugins.myplugin
-
-        cs = "myprefix://localhost/orclpdb"
-
-        cp = oracledb.ConnectParams()
-        cp.parse_connect_string(cs)
-
-        print(f"host={cp.host}, port={cp.port}, service name={cp.service_name}")
-
-   Running this will print::
-
-        In myhookfunc: protocol=myprefix arg=localhost/orclpdb
-        host=localhost, port=1521, service name=orclpdb
-
-8. To uninstall the plugin, remove the package:
-
-   .. code-block:: shell
-
-       python -m pip uninstall myplugin
-
-**Example 2**
-
-The following sample plugin shows how all connection creations can be logged,
-regardless of the connection string. If the plugin
-``myplugin/src/oracledb/plugins/myplugin.py`` created above contained code to
-register a :ref:`connection parameter hook <paramshook>`:
-
-.. code-block:: python
-
-    import oracledb
-
-    def my_params_hook(params: oracledb.ConnectParams):
-        print(f"Connecting to the database as {params.user}")
-
-    oracledb.register_params_hook(my_params_hook)
-
-Then running an application that contains:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-will print the trace output::
-
-    Connecting to the database as hr
-
-.. _connectionhooks:
-
-Connection Hooks
-================
-
-Connection hooks allow you to modify the connection logic based on your needs.
-The hooks supported by python-oracledb are listed in this section.
-
-.. _protocolhook:
-
-Connection Protocol Hooks
--------------------------
-
-The :meth:`oracledb.register_protocol()` method registers a user protocol hook
-function that can be called internally by python-oracledb prior to connection
-or pool creation.
-
-See :ref:`registerprotocolhook` for usage information.
-
-.. _passwordhook:
-
-Connection Password Hooks
--------------------------
-
-The :meth:`oracledb.register_password_type()` method registers a user password
-hook function that will be called internally by python-oracledb prior to
-connection or pool creation.
-
-See :ref:`registerpasswordtype` for usage information.
-
-.. _paramshook:
-
-Connection Parameter Hooks
---------------------------
-
-The :meth:`oracledb.register_params_hook()` method registers a user parameter
-hook function that will be called internally by python-oracledb prior to
-connection or pool creation.
-
-See :ref:`registerparamshook` for usage information.
diff --git a/doc/src/user_guide/globalization.rst b/doc/src/user_guide/globalization.rst
deleted file mode 100644
index 84a0260a..00000000
--- a/doc/src/user_guide/globalization.rst
+++ /dev/null
@@ -1,374 +0,0 @@
-.. _globalization:
-
-.. currentmodule:: oracledb
-
-********************************
-Character Sets and Globalization
-********************************
-
-Character Sets
-==============
-
-Database Character Set
-----------------------
-
-Data fetched from and sent to Oracle Database will be mapped between the
-`database character set <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-EA913CC8-C5BA-4FB3-A1B8-882734AF4F43>`__ and the "Oracle client"
-character set of the Oracle Client libraries used by python-oracledb. If data
-cannot be correctly mapped between client and server character sets, then it
-may be corrupted or queries may fail with
-:ref:`"codec can't decode byte" <codecerror>`.
-
-All database character sets are supported by python-oracledb.
-
-.. _findingcharset:
-
-To find the database character set, execute the query:
-
-.. code-block:: sql
-
-    SELECT value AS db_charset
-    FROM nls_database_parameters
-    WHERE parameter = 'NLS_CHARACTERSET';
-
-Database National Character Set
--------------------------------
-
-For the secondary `national character set <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-4E12D991-C286-4F1A-AFC6-F35040A5DE4F>`__ used for
-NCHAR, NVARCHAR2, and NCLOB data types:
-
-- AL16UTF16 is supported by both python-oracledb Thin and Thick modes
-- UTF8 is not supported by python-oracledb Thin mode
-
-To find the database's national character set, execute the query:
-
-.. code-block:: sql
-
-     SELECT value AS db_ncharset
-     FROM nls_database_parameters
-     WHERE parameter = 'NLS_NCHAR_CHARACTERSET';
-
-Setting the Client Character Set
---------------------------------
-
-In python-oracledb, the encoding used for all character data is "UTF-8".  Older
-versions of the driver allowed ``encoding`` and ``nencoding`` parameters to be
-passed to the :meth:`oracledb.connect` and :meth:`oracledb.create_pool` methods
-but these parameters are now desupported.
-
-.. _timezonefiles:
-
-Time Zone Files
-===============
-
-This section applies to python-oracledb Thick mode.
-
-Oracle Client libraries and the Oracle Database use time zone files for date
-operations. The files are versioned, but do not always have to be the same
-version on the database and client. However, if you use the TIMESTAMP WITH
-TIMEZONE data type and have a named time zone, you will get the error `ORA-1805
-<https://docs.oracle.com/en/error-help/db/ora-01805/>`__ when the database and
-the client time zone file versions differ.
-
-Finding the Time Zone Files in Use
-----------------------------------
-
-You can find the time zone file used by the database itself by executing a
-query, for example:
-
-.. code-block:: sql
-
-    SQL> select * from v$timezone_file;
-
-    FILENAME                VERSION     CON_ID
-    -------------------- ---------- ----------
-    timezlrg_43.dat              43          0
-
-
-The time zone files on the client side can be shown by running the utility
-``genezi -v``.  In Instant Client, this is in the Basic and Basic Light
-packages.  The output will be like::
-
-    $ genezi -v
-
-    . . .
-
-    TIMEZONE INFORMATION
-    --------------------
-    Operating in Instant Client mode.
-
-    Small timezone file = /opt/oracle/instantclient/oracore/zoneinfo/timezone_43.dat
-    Large timezone file = /opt/oracle/instantclient/oracore/zoneinfo/timezlrg_43.dat
-
-With Instant Client, the paths refer to a virtual file system in the Oracle
-libraries. These files are not present on the operating system file system.
-
-The larger file ``timezlrg_<n>.dat`` contains all time zone information. This
-is the file used by default.  The smaller ``timezone_<n>.dat`` file contains
-only the most commonly used time zones.
-
-The filenames shows the version of the time zone files, in this example it is
-version 43.
-
-The Oracle Database documentation contains more information about time zone
-files, see `Choosing a Time Zone File <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-805AB986-DE12-4FEA-AF56-5AABCD2132DF>`__.
-
-Changing the Oracle Database Time Zone File
--------------------------------------------
-
-To control the database time zone file in on-premise databases, use the
-`DBMS_DST <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-55300506-481A-4957-A67D-0183D3D986DF>`__ package.
-
-For Oracle Autonomous Database, use ``AUTO_DST_UPGRADE`` and
-``AUTO_DST_UPGRADE_EXCL_DATA`` as shown in the documentation `Manage Time Zone
-File Updates on Autonomous AI Database <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-BACC9C4A-C0FA-4912-862A-1A2A24D6A0C2>`__.
-
-Changing the Oracle Client Time Zone File
------------------------------------------
-
-You can get updated time zone files from a full Oracle Database installation,
-or by downloading a patch from `Oracle Support <https://support.oracle.com/>`_.
-For use with Instant Client, unzip the patch and copy the necessary files:
-installing the patch itself will not work.
-
-**Using a New Time Zone File in Instant Client**
-
-From Oracle Instant Client 12.2, you can use an external time zone file,
-allowing you to update time zone information without updating the complete
-Instant Client installation.  Changing the file in earlier versions of Instant
-Client is not possible.
-
-To change the time zone file, do one of the following:
-
-- Create a subdirectory ``oracore/zoneinfo`` under the Instant Client
-  directory and move the file into it.  Then set ``ORA_TZFILE`` to the file
-  name, without any absolute or relative directory prefix prefix.  For
-  example, if Instant Client is in ``/opt/oracle/instantclient``::
-
-    mkdir -p /opt/oracle/instantclient/oracore/zoneinfo
-    cp timezone_43.dat /opt/oracle/instantclient/oracore/zoneinfo/
-    export ORA_TZFILE=timezone_43.dat
-
-- Alternatively, from Oracle Instant Client 19.18, you can place the external
-  time zone file in any directory and then set the ``ORA_TZFILE`` environment
-  variable to the absolute path of the file. For example::
-
-    mkdir -p /opt/oracle/myconfig
-    cp timezone_43.dat /opt/oracle/myconfig/
-    export ORA_TZFILE=/opt/oracle/myconfig/timezone_43.dat
-
-After installing a new client time zone file, run ``genezi -v`` again to check
-if it is readable.
-
-**Using the Embedded Small Time Zone File in Instant Client**
-
-By default, Instant Client uses its larger embedded ``timezlrg_<n>.dat`` file.
-If you want to use the smaller embedded ``timezone_<n>.dat`` file, then set the
-``ORA_TZFILE`` environment variable to the name of the file without any
-absolute or relative directory prefix. For example::
-
-    export ORA_TZFILE=timezone_43.dat
-
-**Using a New Time Zone File in a Full Oracle Client**
-
-If python-oracledb Thick mode is using Oracle Client libraries from a full
-Oracle Client software installation (such as installed with Oracle's GUI
-installer), and you want to use a non-default time zone file, then set
-``ORA_TZFILE`` to the file name with an absolute path directory prefix. For
-example::
-
-    export ORA_TZFILE=/opt/oracle/myconfig/timezone_43.dat
-
-This also works if python-oracledb Thick mode is using libraries from an Oracle
-Database installation.
-
-Setting the Client Locale
-=========================
-
-Thick Mode Oracle Database National Language Support (NLS)
-----------------------------------------------------------
-
-The python-oracledb Thick mode uses Oracle Database's National Language Support
-(NLS) functionality to assist in globalizing applications, for example to
-convert numbers and dates to strings in the locale specific format.
-
-You can use the ``NLS_LANG`` environment variable to set the language and
-territory used by the Oracle Client libraries.  For example, on Linux you could
-set::
-
-    export NLS_LANG=JAPANESE_JAPAN
-
-The language ("JAPANESE" in this example) specifies conventions such as the
-language used for Oracle Database messages, sorting, day names, and month
-names.  The territory ("JAPAN") specifies conventions such as the default date,
-monetary, and numeric formats. If the language is not specified, then the value
-defaults to AMERICAN.  If the territory is not specified, then the value is
-derived from the language value.  See `Choosing a Locale with the NLS_LANG
-Environment Variable <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-86A29834-AE29-4BA5-8A78-E19C168B690A>`__.
-
-If the ``NLS_LANG`` environment variable is set in the application with
-``os.environ['NLS_LANG']``, it must be set before any connection pool is
-created, or before any standalone connections are created.
-
-Any client character set value in the ``NLS_LANG`` variable, for example
-``JAPANESE_JAPAN.JA16SJIS``, is ignored by python-oracledb.  See `Setting the
-Client Character Set`_.
-
-Other Oracle globalization variables, such as ``NLS_DATE_FORMAT`` can also be
-set to change the behavior of python-oracledb Thick, see `Setting NLS
-Parameters <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-6475CA50-6476-4559-AD87-35D431276B20>`__.
-
-For more information, see the `Database Globalization Support Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=NLSPG>`__.
-
-.. _thindatenumber:
-
-Thin Mode Locale-aware Number and Date Conversions
---------------------------------------------------
-
-.. note::
-
-    All NLS environment variables are ignored by python-oracledb Thin mode.
-    Also the ``ORA_TZFILE`` variable is ignored.
-
-.. note::
-
-    Trying to access TIMESTAMP WITH TIME ZONE data that contains a named time
-    zone will throw ``DPY-3022: named time zones are not supported in thin
-    mode``.  Data stored with a numeric offset such as ``+00:00`` can be
-    fetched.
-
-In python-oracledb Thin mode, output type handlers need to be used to perform
-date and number localizations. The examples below show a simple conversion and
-also how the Python locale module can be used.  Type handlers like those below
-can also be used in python-oracledb Thick mode.
-
-To convert numbers:
-
-.. code-block:: python
-
-    import locale
-    import oracledb
-
-    # use this if the environment variable LANG is already set
-    #locale.setlocale(locale.LC_ALL, '')
-
-    # use this for programmatic setting of locale
-    locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8')
-
-    # simple naive conversion
-    def type_handler1(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=cursor.arraysize,
-                              outconverter=lambda v: v.replace('.', ','))
-
-    # locale conversion
-    def type_handler2(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(metadata.type_code, arraysize=cursor.arraysize,
-                              outconverter=lambda v: locale.format_string("%g", v))
-
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-    with connection.cursor() as cursor:
-
-        print("no type handler...")
-        cursor.execute("select 2.5 from dual")
-        for row in cursor:
-            print(row)       # gives 2.5
-        print()
-
-        print("with naive type handler...")
-        connection.outputtypehandler = type_handler1
-        cursor.execute("select 2.5 from dual")
-        for row in cursor:
-            print(row)       # gives '2,5'
-        print()
-
-        print("with locale type handler...")
-        connection.outputtypehandler = type_handler2
-        cursor.execute("select 2.5 from dual")
-        for row in cursor:
-            print(row)       # gives '2,5'
-        print()
-
-
-To convert dates:
-
-.. code-block:: python
-
-    import locale
-    import oracledb
-
-    # use this if the environment variable LANG is already set
-    #locale.setlocale(locale.LC_ALL, '')
-
-    # use this for programmatic setting of locale
-    locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8')
-    locale_date_format = locale.nl_langinfo(locale.D_T_FMT)
-
-    # simple naive conversion
-    def type_handler3(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_DATE:
-            return cursor.var(metadata.type_code, arraysize=cursor.arraysize,
-                              outconverter=lambda v: v.strftime("%Y-%m-%d %H:%M:%S"))
-
-    # locale conversion
-    def type_handler4(cursor, name, default_type, size, precision, scale):
-        if metadata.type_code is oracledb.DB_TYPE_DATE:
-            return cursor.var(metadata.type_code, arraysize=cursor.arraysize,
-                              outconverter=lambda v: v.strftime(locale_date_format))
-
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="dbhost.example.com/orclpdb")
-
-    with connection.cursor() as cursor:
-
-         print("no type handler...")
-         cursor.execute("select sysdate from dual")
-         for row in cursor:
-             print(row)       # gives datetime.datetime(2021, 12, 15, 19, 49, 37)
-         print()
-
-         print("with naive type handler...")
-         connection.outputtypehandler = type_handler3
-         cursor.execute("select sysdate from dual")
-         for row in cursor:
-             print(row)       # gives '2021-12-15 19:49:37'
-         print()
-
-         print("with locale type handler...")
-         connection.outputtypehandler = type_handler4
-         cursor.execute("select sysdate from dual")
-         for row in cursor:
-             print(row)       # gives 'Mi 15 Dez 19:57:56 2021'
-         print()
-
-Inserting NVARCHAR2 and NCHAR Data
-----------------------------------
-
-To bind NVARCHAR2 data, use :func:`Cursor.setinputsizes()` or create a bind
-variable with the correct type by calling :func:`Cursor.var()`.  This removes
-an internal character set conversion to the standard `Database Character Set`_
-that may corrupt data.  By binding as :data:`oracledb.DB_TYPE_NVARCHAR`, the
-data is inserted directly as the `Database National Character Set`_. For
-example, to insert into a table containing two NVARCHAR2 columns:
-
-.. code-block:: python
-
-    sql = "insert into mytable values (:1, :2)"
-    bv = ['data1', 'data2']
-    cursor.setinputsizes(oracledb.DB_TYPE_NVARCHAR, oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(sql, bv)
-
-For NCHAR data, bind as :data:`oracledb.DB_TYPE_NCHAR`.
diff --git a/doc/src/user_guide/ha.rst b/doc/src/user_guide/ha.rst
deleted file mode 100644
index 7eb41df7..00000000
--- a/doc/src/user_guide/ha.rst
+++ /dev/null
@@ -1,252 +0,0 @@
-.. _highavailability:
-
-.. currentmodule:: oracledb
-
-**************************************
-High Availability with python-oracledb
-**************************************
-
-Applications can use many features for high availability (HA) during planned
-and unplanned outages in order to:
-
-*  Reduce application downtime
-*  Eliminate compromises between high availability and performance
-*  Increase operational productivity
-
-.. _harecommend:
-
-General HA Recommendations
---------------------------
-
-General recommendations for creating highly available python-oracledb programs
-are:
-
-* Tune operating system and Oracle Network parameters to avoid long TCP
-  timeouts, to prevent firewalls killing connections, and to avoid connection
-  storms.
-* Implement application error handling and recovery.
-* Use the most recent version of the Oracle Client libraries.  New versions
-  have improvements to features such as dead database server detection, and
-  make it easier to set connection options.
-* Use the most recent version of Oracle Database.  New database versions
-  introduce, and enhance, features such as Application Continuity (AC) and
-  Transparent Application Continuity (TAC).
-* Use Oracle Database technologies such as `RAC <https://www.oracle.com/pls/
-  topic/lookup?ctx=dblatest&id=RACAD>`__ or standby databases.
-* Configure database services to emit :ref:`FAN <fan>` events.
-* Use a :ref:`connection pool <connpooling>` because pools can handle database
-  events and take proactive and corrective action for draining, run time load
-  balancing, and fail over.  Set the minimum and maximum pool sizes to the
-  same values to avoid connection storms. Remove resource manager or user
-  profiles that prematurely close sessions.
-* Test all scenarios thoroughly.
-
-.. _hanetwork:
-
-Network Configuration
----------------------
-
-The operating system TCP and :ref:`Oracle Net configuration <optnetfiles>`
-should be configured for performance and availability.
-
-Options such as `SQLNET.OUTBOUND_CONNECT_TIMEOUT <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-0857C817-675F-4CF0-BFBB-C3667F119176>`__,
-`SQLNET.RECV_TIMEOUT <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-4A19D81A-75F0-448E-B271-24E5187B5909>`__ and `SQLNET.SEND_TIMEOUT
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-48547756-9C0B-
-4D14-BE85-E7ADDD1A3A66>`__ can be explored.
-
-`Oracle Net Services <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-NETRF>`__ options may also be useful for high availability and performance
-tuning.  For example, the database's ``listener.ora`` file can have `RATE_LIMIT
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-F302BF91-64F2-
-4CE8-A3C7-9FDB5BA6DCF8>`__ and `QUEUESIZE <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-FF87387C-1779-4CC3-932A-79BB01391C28>`__ parameters
-that can help handle connection storms.
-
-With Oracle Client 19c, `EXPIRE_TIME <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-6140611A-83FC-4C9C-B31F-A41FC2A5B12D>`__ can be used in
-:ref:`Connect Descriptors <conndescriptor>` to prevent firewalls from
-terminating idle connections and to adjust keepalive timeouts.  The general
-recommendation for ``EXPIRE_TIME`` is to use a value that is slightly less than
-half of the termination period.  In older versions of Oracle Client, a connect
-descriptor option `ENABLE=BROKEN <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-7A18022A-E40D-4880-B3CE-7EE9864756CA>`_ can be used instead
-of ``EXPIRE_TIME``.  These settings can also aid detection of a terminated
-remote database server.
-
-When python-oracledb uses :ref:`Oracle Client libraries 19c <thickarchfig>`, or
-later, then the :ref:`Easy Connect <easyconnect>` syntax enables some options
-to be used without needing a ``sqlnet.ora`` file.  For example, if your
-firewall times out every 4 minutes, and you cannot alter the firewall settings,
-then you may decide to use ``EXPIRE_TIME`` in your connect string to send a
-probe every 2 minutes to the database to keep connections 'alive'::
-
-    connection = oracledb.connect("hr", userpwd, "dbhost.example.com/orclpdb?expire_time=2")
-
-.. _fan:
-
-Fast Application Notification (FAN)
------------------------------------
-
-Users of `Oracle Database FAN <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-EB0E1525-D3B3-469C-BE22-A569C76864A6>`__ must connect to a
-FAN-enabled database service.  The application should have ``events`` set to
-`True` when connecting.  This value can also be changed via
-:ref:`Oracle Client Configuration <optclientfiles>`.
-
-.. note::
-
-    FAN is only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick`.
-
-FAN support is useful for planned and unplanned outages. It provides immediate
-notification to python-oracledb following outages related to the database,
-computers, and networks. Without FAN, python-oracledb can hang until a TCP
-timeout occurs and an error is returned, which might be several minutes.
-
-FAN allows python-oracledb to provide high availability features without the
-application being aware of an outage.  Unused, idle connections in a
-:ref:`connection pool <connpooling>` will be automatically cleaned up.  A
-future :meth:`ConnectionPool.acquire()` call will establish a fresh connection
-to a surviving database instance without the application being aware of any
-service disruption.
-
-To handle errors that affect active connections, you can add application logic
-to re-connect (this will connect to a surviving database instance) and replay
-application logic without having to return an error to the application user.
-
-FAN benefits users of Oracle Database's clustering technology `Oracle RAC
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-D04AA2A7-2E68-
-4C5C-BD6E-36C62427B98E>`__ because connections to surviving database instances
-can be immediately made.  Users of Oracle's Data Guard with a broker will get
-FAN events generated when the standby database goes online.  Standalone
-databases will send FAN events when the database restarts.
-
-For more information on FAN, see the `white paper on Fast Application
-Notification <https://www.oracle.com/technetwork/database/options/clustering/
-applicationcontinuity/learnmore/fastapplicationnotification12c-2538999.pdf>`__.
-
-.. _appcont:
-
-Application Continuity (AC)
----------------------------
-
-Oracle Application Continuity (AC) and Transparent Application Continuity (TAC)
-are Oracle Database technologies that record application interaction with the
-database and, in the event of a database instance outage, attempt to replay the
-interaction on a surviving database instance. If successful, users will
-be unaware of any database issue. AC and TAC are best suited for OLTP
-applications.
-
-.. note::
-
-    Oracle AC and TAC functionality is only supported in python-oracledb Thick
-    mode.  See :ref:`enablingthick`.
-
-When AC or TAC are configured on the database service, they are transparently
-available to python-oracledb applications.
-
-You must thoroughly test your application because not all lower level calls in
-the python-oracledb implementation can be replayed.
-
-See `OCI and Application Continuity <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-A8DD9422-2F82-42A9-9555-134296416E8F>`__ for more
-information.
-
-.. _tg:
-
-Transaction Guard
------------------
-
-Python-oracledb supports `Transaction Guard <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-F7E968E4-EE8F-4563-91F3-CD44B5D2E747>`__ which
-enables Python application to verify the success or failure of the last
-transaction in the event of an unplanned outage. This feature requires Oracle
-Database 12.1 or higher. When using python-oracledb Thick mode, Oracle Client
-12.1 or higher is additionally required.
-
-Using Transaction Guard helps to:
-
-*  Preserve the commit outcome
-*  Ensure a known outcome for every transaction
-
-See `Oracle AI Database Development Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-6C5880E5-C45F-4858-A069-A28BB25FD1DB>`__ for more information about
-using Transaction Guard.
-
-When an error occurs during commit, the Python application can acquire the
-logical transaction id (``ltxid``) from the connection and then call a
-procedure to determine the outcome of the commit for this logical transaction
-id.
-
-The steps below show how to use Transaction Guard in python-oracledb in a
-single-instance database. Refer to Oracle documentation if you are using `RAC
-<https://www.oracle.com/pls/ topic/lookup?ctx=dblatest&id=RACAD>`__ or standby
-databases.
-
-1.  Grant execute privileges to the database users who will be checking the
-    outcome of the commit. Log in as SYSDBA and run the following command:
-
-    .. code-block:: sql
-
-        GRANT EXECUTE ON DBMS_APP_CONT TO <username>;
-
-2.  Create a new service by calling `DBMS_SERVICE.CREATE_SERVICE
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-386E183E-D83C-48A7-8BA3-40248CFB89F4>`__
-    as SYSDBA.  Replace the ``<service-name>``, ``<network-name>`` and
-    ``<retention-value>`` values with suitable values. It is important that the
-    ``COMMIT_OUTCOME`` parameter be set to true for Transaction Guard to
-    function properly.
-
-    .. code-block:: sql
-
-        DECLARE
-            t_Params dbms_service.svc_parameter_array;
-        BEGIN
-            t_Params('COMMIT_OUTCOME') := 'true';
-            t_Params('RETENTION_TIMEOUT') := <retention-value>;
-            DBMS_SERVICE.CREATE_SERVICE('<service-name>', '<network-name>', t_Params);
-        END;
-        /
-
-3.  Start the service by calling `DBMS_SERVICE.START_SERVICE
-    <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-140B93AC-9021-4091-B797-7CA3AAB446FE>`__
-    as SYSDBA:
-
-    .. code-block:: sql
-
-        BEGIN
-            DBMS_SERVICE.START_SERVICE('<service-name>');
-        END;
-        /
-
-Ensure that the service is running by examining the output of the following
-query:
-
-    .. code-block:: sql
-
-        SELECT name, network_name FROM V$ACTIVE_SERVICES ORDER BY 1;
-
-
-**Python Application code requirements to use Transaction Guard**
-
-In the Python application code:
-
-* Connect to the appropriately enabled database service. If the connection is
-  TAF, AC or TAC enabled, then do not proceed with TG.
-* Check :attr:`oracledb._Error.isrecoverable` to confirm the error is
-  recoverable. If not, do not proceed with TG.
-* Use the connection attribute :attr:`Connection.ltxid` to find the
-  logical transaction id.
-* Call the `DBMS_APP_CONT.GET_LTXID_OUTCOME
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-03CEB530-D3A5-40B1-87C8-5BF1BB5D5D54>`__
-  PL/SQL procedure with the logical transaction id.  This returns a boolean
-  value indicating if the last transaction was committed and whether the last
-  call was completed successfully or not.
-* Take any necessary action to re-do uncommitted work.
-
-See the `Transaction Guard Sample
-<https://github.com/oracle/python-oracledb/blob/main/
-samples/transaction_guard.py>`__ for further details.
diff --git a/doc/src/user_guide/initialization.rst b/doc/src/user_guide/initialization.rst
deleted file mode 100644
index e1264fe1..00000000
--- a/doc/src/user_guide/initialization.rst
+++ /dev/null
@@ -1,735 +0,0 @@
-.. _initialization:
-
-.. currentmodule:: oracledb
-
-****************************
-Initializing python-oracledb
-****************************
-
-By default, python-oracledb runs in a 'Thin' mode which connects directly to
-Oracle Database.  This mode does not need Oracle Client libraries.  However,
-some :ref:`additional functionality <featuresummary>` is available when
-python-oracledb uses them.  Python-oracledb is said to be in 'Thick' mode when
-Oracle Client libraries are used.  Both modes have comprehensive functionality
-supporting the Python Database API v2.0 Specification.
-
-Most applications can use python-oracledb Thin mode. The common reasons to use
-Thick mode are:
-
-- Your Oracle Database is version 11, or older
-- Your database connections require :ref:`Native Network Encryption (NNE) or
-  checksumming <nne>`
-- You desire to use :ref:`Application Continuity (AC) or Transparent
-  Application Continuity (TAC) <appcont>`
-
-All connections in an application use the same mode.  See :ref:`vsessconinfo`
-to verify which mode is in use.
-
-If you are upgrading from the obsolete cx_Oracle driver to python-oracledb,
-then refer to :ref:`upgrading83` for changes that may be needed.
-
-.. _enablingthick:
-
-Enabling python-oracledb Thick mode
-===================================
-
-To change from the default python-oracledb Thin mode to Thick mode:
-
-1. Oracle Client libraries must be available to handle communication to your
-   database.  These need to be installed separately, see :ref:`installation`.
-
-   Oracle Client libraries from one of the following can be used:
-
-  - An `Oracle Instant Client
-    <https://www.oracle.com/database/technologies/instant-client.html>`__ Basic
-    or Basic Light package. This is generally the easiest if you do not already
-    have Oracle software installed.
-
-  - A full Oracle Client installation (installed by running the Oracle
-    Universal installer ``runInstaller``)
-
-  - An Oracle Database installation, if Python is running on the same machine
-    as the database
-
-  The Client library version does not always have to match the Oracle Database
-  version.
-
-2. Your application *must* call the function
-   :meth:`oracledb.init_oracle_client()` to load the client libraries. For
-   example, if the Oracle Instant Client libraries are in
-   ``C:\oracle\instantclient_23_5`` on Windows or
-   ``$HOME/Downloads/instantclient_23_3`` on macOS, then you can use:
-
-   .. code-block:: python
-
-      import os
-      import platform
-
-      import oracledb
-
-      d = None                               # On Linux, no directory should be passed
-      if platform.system() == "Darwin":      # macOS
-        d = os.environ.get("HOME")+("/Downloads/instantclient_23_3")
-      elif platform.system() == "Windows":   # Windows
-        d = r"C:\oracle\instantclient_23_5"
-      oracledb.init_oracle_client(lib_dir=d)
-
-  The use of a ‘raw’ string ``r"..."`` on Windows means that backslashes are
-  treated as directory separators.  On Linux, the libraries must be in the
-  system library search path *before* the Python process starts, preferably
-  configured with ``ldconfig``.
-
-More details and options are shown in the later sections:
-
-- :ref:`wininit`
-
-- :ref:`macinit`
-
-- :ref:`linuxinit`
-
-**Notes on calling init_oracle_client()**
-
-- The :meth:`~oracledb.init_oracle_client()` function must be called before
-  any :ref:`standalone connection <standaloneconnection>` or
-  :ref:`connection pool <connpooling>` is created. If a connection or pool
-  is first created, then the Thick mode cannot be enabled.
-
-- If you call :meth:`~oracledb.init_oracle_client()` with a ``lib_dir``
-  parameter, the Oracle Client libraries are loaded immediately from that
-  directory. If you call :meth:`~oracledb.init_oracle_client()` but do *not*
-  set the ``lib_dir`` parameter, the Oracle Client libraries are loaded
-  immediately using the search heuristics discussed in later sections. Note if
-  you set ``lib_dir`` on Linux and related platforms, you must still have
-  configured the system library search path to include that directory *before*
-  starting Python.
-
-- Once the Thick mode is enabled, you cannot go back to the Thin mode except by
-  removing calls to :meth:`~oracledb.init_oracle_client()` and restarting the
-  application.
-
-- If Oracle Client libraries cannot be loaded then
-  :meth:`~oracledb.init_oracle_client()` will raise an error ``DPI-1047:
-  Oracle Client library cannot be loaded``.  To resolve this, review the
-  platform-specific instructions below or see :ref:`DPI-1047 <dpi1047>`.
-  Alternatively, remove the call to :meth:`~oracledb.init_oracle_client()` and
-  use Thin mode. The features supported by Thin mode can be found in
-  :ref:`featuresummary`.
-
-- On any operating system, if you set the ``lib_dir`` parameter to the library
-  directory of a full database or full client installation (such as from
-  running ``runInstaller``), you will need to have previously set the Oracle
-  environment, for example by setting the ``ORACLE_HOME`` environment
-  variable. Otherwise you will get errors like ``ORA-1804``. You should set
-  this variable, and other Oracle environment variables, before starting
-  Python, as shown in :ref:`Oracle Environment Variables <envset>`.
-
-- The :meth:`~oracledb.init_oracle_client()` function may be called multiple
-  times in your application but must always pass the same arguments.
-
-.. _wininit:
-
-Enabling python-oracledb Thick Mode on Windows
-----------------------------------------------
-
-On Windows, the alternative ways to enable Thick mode are:
-
-- By passing the ``lib_dir`` parameter in a call to
-  :meth:`~oracledb.init_oracle_client()`, for example:
-
-  .. code-block:: python
-
-      import oracledb
-
-      oracledb.init_oracle_client(lib_dir=r"C:\instantclient_23_5")
-
-  On Windows, when the path contains backslashes, use a 'raw' string like
-  ``r"C:\instantclient_23_5"``.
-
-  This directory should contain the libraries from an unzipped `Instant Client
-  'Basic' or 'Basic Light' <https://www.oracle.com/au/database/technologies/
-  instant-client.html>`__ package.  If you pass the library directory from a
-  full client or database installation, such as `Oracle Database “XE” Express
-  Edition <https://www.oracle.com/database/technologies/appdev/xe.html>`__,
-  then you will need to have previously set your environment to use that same
-  software installation. Otherwise, files such as message files will not be
-  located and you may have library version clashes.
-
-  If the Oracle Client libraries cannot be loaded, then an exception is
-  raised.
-
-- Alternatively, you can call :meth:`~oracledb.init_oracle_client()` without
-  passing a ``lib_dir`` parameter:
-
-  .. code-block:: python
-
-      import oracledb
-
-      oracledb.init_oracle_client()
-
-  In this case, Oracle Client libraries are first looked for in the directory
-  where the python-oracledb binary module is installed.  This directory should
-  contain the libraries from an unzipped `Instant Client 'Basic' or 'Basic
-  Light' <https://www.oracle.com/au/database/technologies/instant-client
-  .html>`__ package.
-
-  If the libraries are not found there, the search looks at the directories
-  on the system library search path, for example, the ``PATH`` environment
-  variable.
-
-  If the Oracle Client libraries cannot be loaded, then an exception is
-  raised.
-
-.. _macinit:
-
-Enabling python-oracledb Thick Mode on macOS
---------------------------------------------
-
-On macOS, the alternative ways to enable Thick mode are:
-
-- By passing the ``lib_dir`` parameter in a call to
-  :meth:`~oracledb.init_oracle_client()`, for example:
-
-  .. code-block:: python
-
-      import oracledb
-
-      oracledb.init_oracle_client(lib_dir="/Users/your_username/Downloads/instantclient_23_3")
-
-  This directory should contain the libraries from an unzipped `Instant Client
-  'Basic' or 'Basic Light' <https://www.oracle.com/au/database/technologies/
-  instant-client.html>`__ package.
-
-- Alternatively, you can call :meth:`~oracledb.init_oracle_client()` without
-  passing a ``lib_dir`` parameter:
-
-  .. code-block:: python
-
-      import oracledb
-
-      oracledb.init_oracle_client()
-
-  In this case, the Oracle Client libraries are first looked for in the
-  directory where the python-oracledb Thick mode binary module is installed.
-  This directory should contain the libraries from an unzipped `Instant Client
-  'Basic' or 'Basic Light'
-  <https://www.oracle.com/au/database/technologies/instant-client.html>`__
-  package, or a symbolic link to the main Oracle Client library if Instant
-  Client is in a different directory.
-
-  You can find the directory containing the Thick mode binary module by calling
-  the python CLI without specifying a Python script, executing ``import
-  oracledb``, and then typing ``oracledb`` at the prompt.  For example this
-  might show
-  ``/Users/yourname/.pyenv/versions/3.9.6/lib/python3.9/site-packages/oracledb/__init__.py``.
-  After checking that
-  ``/Users/yourname/.pyenv/versions/3.9.6/lib/python3.9/site-packages/oracledb``
-  contains the binary module ``thick_impl.cpython-39-darwin.so`` you could then
-  run these commands in a terminal window::
-
-      CLIENT_DIR=~/Downloads/instantclient_23_3
-      DPY_DIR=~/.pyenv/versions/3.9.6/lib/python3.9/site-packages/oracledb
-      ln -s $CLIENT_DIR/libclntsh.dylib $DPY_DIR
-
-  This can be automated in Python with:
-
-  .. code-block:: python
-
-      CLIENT_DIR = "~/Downloads/instantclient_23_3"
-      LIB_NAME = "libclntsh.dylib"
-
-      import os
-      import oracledb
-
-      target_dir = oracledb.__path__[0]
-      os.symlink(os.path.join(CLIENT_DIR, LIB_NAME),
-                 os.path.join(target_dir, LIB_NAME))
-
-  If python-oracledb does not find the Oracle Client library in that directory,
-  the directories on the system library search path may be used, for example,
-  ``~/lib/`` and ``/usr/local/lib``, or in ``$DYLD_LIBRARY_PATH``.  These paths
-  will vary with macOS version and Python version.  Any value in
-  ``DYLD_LIBRARY_PATH`` will not propagate to a sub-shell, so do not rely on
-  setting it.
-
-  If the Oracle Client libraries cannot be loaded, then an exception is
-  raised.
-
-Ensure that the Python process has directory and file access permissions for
-the Oracle Client libraries.
-
-.. _linuxinit:
-
-Enabling python-oracledb Thick Mode on Linux and Related Platforms
-------------------------------------------------------------------
-
-On Linux and related platforms, enable Thick mode by calling
-:meth:`~oracledb.init_oracle_client()` without passing a ``lib_dir``
-parameter.
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.init_oracle_client()
-
-Oracle Client libraries are looked for in the operating system library search
-path, such as configured with ``ldconfig`` or set in the environment variable
-``LD_LIBRARY_PATH``.  This must be configured *prior* to running the Python
-process. Web servers and other daemons commonly reset environment variables so
-using ``ldconfig`` is generally preferred instead.  On some UNIX platforms an
-OS specific equivalent, such as ``LIBPATH`` or ``SHLIB_PATH``, is used instead
-of ``LD_LIBRARY_PATH``.
-
-If libraries are not found in the system library search path, then libraries
-in ``$ORACLE_HOME/lib`` will be used.  Note that the environment variable
-``ORACLE_HOME`` should only ever be set when you have a full database
-installation or full client installation (such as installed with the Oracle
-GUI installer).  It should not be set if you are using `Oracle Instant Client
-<https://www.oracle.com/au/database/technologies/instant-client.html>`__. If
-being used, ``ORACLE_HOME`` and other necessary Oracle environment variables
-should be set before starting Python.  See :ref:`envset`.
-
-If the Oracle Client libraries cannot be loaded, then an exception is
-raised.
-
-On Linux, python-oracledb Thick mode will not automatically load Oracle Client
-library files from the directory where the python-oracledb binary module is
-located.  One of the above methods should be used instead.
-
-Ensure that the Python process has directory and file access permissions for
-the Oracle Client libraries.  OS restrictions may prevent the opening of Oracle
-Client libraries installed in unsafe paths, such as from a user directory.  You
-may need to install the Oracle Client libraries under a directory like ``/opt``
-or ``/usr/local``.
-
-Tracing Oracle Client Library Loading
--------------------------------------
-
-To trace the loading of Oracle Client libraries, the environment variable
-``DPI_DEBUG_LEVEL`` can be set to 64 before starting Python.  At a Windows
-command prompt, this could be done with::
-
-    set DPI_DEBUG_LEVEL=64
-
-On Linux and macOS, you might use::
-
-    export DPI_DEBUG_LEVEL=64
-
-When your python-oracledb application is run, logging output is shown on the
-terminal.
-
-.. _enablingthin:
-
-Explicitly Enabling python-oracledb Thin Mode
-=============================================
-
-Python-oracledb defaults to Thin mode but can be changed to use Thick mode. In
-one special case, you may wish to explicitly enable Thin mode by calling
-:meth:`oracledb.enable_thin_mode()` which will prevent Thick mode from ever
-being used. Most applications will not need to call this method.
-
-To allow application portability, the driver's internal logic allows
-applications to initially attempt :ref:`standalone connection
-<standaloneconnection>` creation in Thin mode, but then lets them :ref:`enable
-Thick mode <enablingthick>` if that connection is unsuccessful.  An example is
-when trying to connect to an Oracle Database that turns out to be an old
-version that requires Thick mode.  This heuristic means Thin mode is not
-enforced until the initial connection is successful.  Since all connections
-must be the same mode, any second and subsequent concurrent Thin mode
-connection attempt will wait for the initial standalone connection to succeed,
-meaning the driver mode is no longer potentially changeable to Thick mode, thus
-letting those additional connections be established in Thin mode.
-
-If you have multiple threads concurrently creating standalone Thin mode
-connections, you may wish to call :meth:`oracledb.enable_thin_mode()` as part
-of your application initialization. This is not required but avoids the mode
-determination delay.
-
-The mode determination delay does not affect the following cases, so calling
-:meth:`~oracledb.enable_thin_mode()` is not needed for them:
-
-- Single-threaded applications using :ref:`standalone connections
-  <standaloneconnection>`.
-- Single or multi-threaded applications using
-  :ref:`connection pools <connpooling>` (even with ``min`` of 0).
-
-The delay also does not affect applications that have already called
-:func:`oracledb.init_oracle_client()` to enable Thick mode.
-
-To explicitly enable Thin mode, call :meth:`~oracledb.enable_thin_mode()`, for
-example:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.enable_thin_mode()
-
-Once this method is called, then python-oracledb Thick mode cannot be enabled.
-If you call :func:`oracledb.init_oracle_client()`, you will get the following
-error::
-
-    DPY-2019: python-oracledb thick mode cannot be used because thin mode has
-    already been enabled or a thin mode connection has already been created
-
-If you have already enabled Thick mode by calling
-:func:`oracledb.init_oracle_client()` and then call
-:meth:`oracledb.enable_thin_mode()`, you will get the following error::
-
-    DPY-2053: python-oracledb thin mode cannot be used because thick mode has
-    already been enabled
-
-.. _optconfigfiles:
-
-Optional Oracle Configuration Files
-===================================
-
-.. _optnetfiles:
-
-Optional Oracle Net Configuration Files
----------------------------------------
-
-Optional Oracle Net configuration files may be read when connecting or creating
-connection pools. These files affect connection behavior. The common files are:
-
-* ``tnsnames.ora``: A configuration file that defines databases aliases and
-  their related connection configuration information used for establishing
-  connections. See :ref:`TNS Aliases for Connection Strings <netservice>`.
-
-* ``sqlnet.ora``: A configuration file that contains settings for features such
-  as connection failover, network encryption, logging, and tracing. The
-  ``sqlnet.ora`` file is only used in python-oracledb Thick mode. See
-  :ref:`enablingthick`. In python-oracledb Thin mode, many of the equivalent
-  settings can be defined as connection time parameters.
-
-See :ref:`usingconfigfiles` to understand how python-oracledb locates the
-files.
-
-.. _optclientfiles:
-
-Optional Oracle Client Configuration File
------------------------------------------
-
-When python-oracledb Thick mode uses Oracle Client libraries version 12.1 or
-later, an optional client parameter file called ``oraaccess.xml`` can be used
-to configure some behaviors of those libraries, such as statement caching and
-prefetching.  This can be useful to change application behavior if the
-application code cannot be altered.
-
-A sample ``oraaccess.xml`` file that sets the Oracle client ':ref:`prefetch
-<tuningfetch>`' value to 1000 rows for every query in the application is::
-
-    <?xml version="1.0"?>
-     <oraaccess xmlns="http://xmlns.oracle.com/oci/oraaccess"
-      xmlns:oci="http://xmlns.oracle.com/oci/oraaccess"
-      schemaLocation="http://xmlns.oracle.com/oci/oraaccess
-      http://xmlns.oracle.com/oci/oraaccess.xsd">
-      <default_parameters>
-        <prefetch>
-          <rows>1000</rows>
-        </prefetch>
-      </default_parameters>
-    </oraaccess>
-
-The ``oraaccess.xml`` file has other uses including:
-
-- Changing the value of Fast Application Notification :ref:`FAN <fan>` events
-  which affects notifications and Runtime Load Balancing (RLB).
-- Configuring `Client Result Caching <https://www.oracle.com/pls/topic/lookup?
-  ctx=dblatest&id=GUID-D2FA7B29-301B-4AB8-8294-2B1B015899F9>`__ parameters.
-- Turning on `Client Statement Cache Auto-tuning <https://www.oracle.com/pls/
-  topic/lookup?ctx=dblatest&id=GUID-75169FE4-DE2C-431F-BBA7-3691C7C33360>`__.
-
-Refer to the documentation on `oraaccess.xml <https://www.oracle.com/pls/topic
-/lookup?ctx=dblatest&id=GUID-9D12F489-EC02-46BE-8CD4-5AECED0E2BA2>`__
-for more details.
-
-See :ref:`usingconfigfiles` to understand how python-oracledb locates the
-file.
-
-For another way to set some python-oracledb behaviors without changing
-application code, see :ref:`pyoparams`.
-
-.. _usingconfigfiles:
-
-Using Optional Oracle Configuration Files
------------------------------------------
-
-If you use optional Oracle configuration files such as ``tnsnames.ora``,
-``sqlnet.ora``, or ``oraaccess.xml`` to configure your connections, then put
-the files in a directory accessible to python-oracledb and follow steps shown
-below.
-
-Note that the :ref:`Easy Connect syntax <easyconnect>` can set many common
-configuration options without needing ``tnsnames.ora``, ``sqlnet.ora``, or
-``oraaccess.xml`` files.
-
-**Locating tnsnames.ora in python-oracledb Thin mode**
-
-Python-oracledb will read a ``tnsnames.ora`` file when a :ref:`TNS Alias
-<netservice>` is used for the ``dsn`` parameter of :meth:`oracledb.connect()`,
-:meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, or
-:meth:`oracledb.create_pool_async()`. Only one ``tnsnames.ora`` file is
-read. If the TNS Alias is not found in that file, then connection will fail.
-Thin mode does not read other configuration files such as ``sqlnet.ora`` or
-``oraaccess.xml``.
-
-In python-oracledb Thin mode, you should explicitly specify the directory
-because some traditional "default" locations such as
-``$ORACLE_BASE/homes/XYZ/network/admin/`` (in a read-only Oracle Database home)
-or the Windows registry are not automatically used.
-
-The directory used to locate ``tnsnames.ora`` is determined as follows (first
-one wins):
-
-- the value of the method parameter ``config_dir``
-
-  .. code-block:: python
-
-      connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb",
-                                    config_dir="/opt/oracle/config")
-
-- the value in the ``config_dir`` attribute of the method parameter ``params``
-
-  .. code-block:: python
-
-      params = oracledb.ConnectParams(config_dir="/opt/oracle/config")
-      connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb", params=params)
-
-- the value of :attr:`oracledb.defaults.config_dir <Defaults.config_dir>`,
-  which may have been set explicitly to a directory, or internally set during
-  initialization to ``$TNS_ADMIN`` or ``$ORACLE_HOME/network/admin``.
-
-  .. code-block:: python
-
-      oracledb.defaults.config_dir = "/opt/oracle/config"
-      connection = oracledb.connect(user="hr", password=userpwd, dsn="orclpdb")
-
-This order also applies to python-oracledb Thick mode when
-:attr:`oracledb.defaults.thick_mode_dsn_passthrough` is *False*.
-
-**Locating tnsnames.ora, sqlnet.ora or oraaccess.xml in python-oracledb Thick mode**
-
-In python-oracledb Thick mode, the directory containing the optional Oracle
-Client configuration files such as ``tnsnames.ora``, ``sqlnet.ora``, and
-``oraaccess.xml`` can be explicitly specified, otherwise the Oracle Client
-libraries will use a heuristic to locate the directory.
-
-If :attr:`oracledb.defaults.thick_mode_dsn_passthrough` is *False*, then the
-following applies to all files except ``tnsnames.ora``.
-
-The configuration file directory is determined as follows:
-
-- From the ``config_dir`` parameter in the
-  :meth:`oracledb.init_oracle_client()` call:
-
-  .. code-block:: python
-
-        oracledb.init_oracle_client(config_dir="/opt/oracle/config")
-
-  On Windows, when the path contains backslashes, use a 'raw' string like
-  ``r"C:\instantclient_23_5"``.
-
-- If :meth:`~oracledb.init_oracle_client()` is called to enable Thick mode but
-  ``config_dir`` is not specified, then default directories are searched for
-  the configuration files. This is platform specific and controlled by Oracle
-  Client. Directories include:
-
-  - Your home directory, using ``$HOME/.tnsnames.ora`` and ``$HOME/.sqlnet.ora``
-
-  - The directory ``/var/opt/oracle`` on Solaris, and ``/etc`` on other UNIX
-    platforms.
-
-  - The directory specified by the `TNS_ADMIN <https://www.oracle.com/pls/
-    topic/lookup?ctx=dblatest&id=GUID-12C94B15-2CE1-4B98-9D0C-8226A9DDF4CB>`__
-    environment variable.
-
-  - For Oracle Instant Client ZIP files, the ``network/admin`` subdirectory of
-    Instant Client, for example
-    ``/opt/oracle/instantclient_23_5/network/admin``.
-
-  - For Oracle Instant Client RPMs, the ``network/admin`` subdirectory of
-    Instant Client, for example
-    ``/usr/lib/oracle/23.5/client64/lib/network/admin``.
-
-  - When using libraries from a local Oracle Database or full client
-    installation, in ``$ORACLE_HOME/network/admin`` or
-    ``$ORACLE_BASE_HOME/network/admin``.
-
-On Windows, in a full database install, the Windows registry may be also be
-consulted by Oracle Client.
-
-For information about the search path see `Oracle Net Services Reference
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-19423B71-3F6C-430F-84CC-18145CC2A818>`__ for more information.
-
-The documentation :ref:`Network Configuration <hanetwork>` has additional
-information about some specific Oracle Net configuration useful for
-applications.
-
-**Setting thick_mode_dsn_passthrough**
-
-When :ref:`oracledb.defaults.thick_mode_dsn_passthrough <defaults>` is *True*,
-it is the Oracle Client libraries that locate and read any optional
-``tnsnames.ora`` configuration. This was always the behavior of python-oracledb
-Thick mode in versions prior to 3.0, and is the default in python-oracledb 3.0
-and later.
-
-Setting :ref:`oracledb.defaults.thick_mode_dsn_passthrough <defaults>` to
-*False* makes Thick mode use the same heuristics as Thin mode regarding
-connection string parameter handling and reading any optional ``tnsnames.ora``
-configuration file.
-
-Files such as ``sqlnet.ora`` and ``oraaccess.xml`` are only used by Thick
-mode. They are always located and read by Oracle Client libraries regardless of
-the :ref:`oracledb.defaults.thick_mode_dsn_passthrough <defaults>` value. The
-directory search heuristic is determined by the Oracle Client libraries at the
-time :meth:`oracledb.init_oracle_client()` is called, as shown above.
-
-The :ref:`oracledb.defaults.thick_mode_dsn_passthrough <defaults>` value is
-ignored in Thin mode.
-
-.. _envset:
-
-Oracle Environment Variables for python-oracledb
-================================================
-
-Some common environment variables that influence python-oracledb are shown
-below.  The variables that may be needed depend on how Python is installed, how
-you connect to the database, and what optional settings are desired.  It is
-recommended to set Oracle variables in the environment before calling Python.
-However, they may also be set in the application with ``os.putenv()`` before the
-first connection is established.
-
-.. note::
-
-    System environment variables such as ``LD_LIBRARY_PATH`` must be set before
-    Python starts.
-
-The common environment variables listed below are supported in python-oracledb.
-
-.. list-table-with-summary:: Common Oracle environment variables supported by python-oracledb
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 20 40 10
-    :name: _oracle_environment_variables
-    :summary: The first column displays the Oracle Environment Variable. The second column, Purpose, describes what the environment variableis used for. The third column displays whether the environment variable can be used in python-oracledb Thin mode, Thick mode or both.
-
-    * - Oracle Environment Variable
-      - Purpose
-      - Python-oracledb Mode
-    * - LD_LIBRARY_PATH
-      - The library search path for platforms like Linux should include the Oracle libraries, for example ``$ORACLE_HOME/lib`` or ``/opt/instantclient_23_5``.
-
-        This variable is not needed if the libraries are located by an alternative method, such as with ``ldconfig``. On other UNIX platforms, you may need to set an OS specific equivalent such as ``LIBPATH`` or ``SHLIB_PATH``.
-      - Thick
-    * - NLS_DATE_FORMAT, NLS_TIMESTAMP_FORMAT
-      - Often set in Python applications to force a consistent date format independent of the locale.
-
-        These variables are ignored if the environment variable ``NLS_LANG`` is not set.
-      - Thick
-    * - NLS_LANG
-      - Determines the 'national language support' globalization options for python-oracledb.
-
-        Note that the character set component is ignored and only the language and territory components of ``NLS_LANG`` are used. The character set can instead be specified during connection or connection pool creation. See :ref:`globalization`.
-      - Thick
-    * - ORA_SDTZ
-      - The default session time zone.
-      - Both
-    * - ORA_TZFILE
-      - The name of the Oracle time zone file to use. See :ref:`timezonefiles`.
-      - Thick
-    * - ORACLE_HOME
-      - The directory containing the Oracle Database software.
-
-        The directory and various configuration files must be readable by the Python process.  This variable should not be set if you are using Oracle Instant Client.
-      - Thick
-    * - PATH
-      - The library search path for Windows should include the location where ``OCI.DLL`` is found.
-
-        This variable is not needed if you set ``lib_dir`` in a call to :meth:`oracledb.init_oracle_client()`.
-      - Thick
-    * - TNS_ADMIN
-      - The directory of optional Oracle Client configuration files such as ``tnsnames.ora`` and ``sqlnet.ora``.
-
-        Generally not needed if the configuration files are in a default location, or if ``config_dir`` was not used in :meth:`oracledb.init_oracle_client()`.  See :ref:`optnetfiles`.
-      - Both
-
-.. _otherinit:
-
-Other python-oracledb Thick Mode Initialization
-===============================================
-
-The :meth:`oracledb.init_oracle_client()` function allows ``driver_name`` and
-``error_url`` parameters to be set.  These are useful for applications whose
-end-users are not aware that python-oracledb is being used.  An example of
-setting the parameters is:
-
-.. code-block:: python
-
-    oracledb.init_oracle_client(driver_name="My Great App : 3.1.4",
-                                error_url="https://example.com/MyInstallInstructions.html")
-
-The convention for ``driver_name`` is to separate the product name from the
-product version by a colon and single blank characters.  The value will be
-shown in Oracle Database views like V$SESSION_CONNECT_INFO.  If this parameter
-is not specified, then the value specified in the
-:attr:`oracledb.defaults.driver_name <defaults.driver_name>` attribute is used.
-If the value of this attribute is None, then a value like
-``python-oracledb thk : 3.0.0`` is shown, see :ref:`vsessconinfo`.
-
-The ``error_url`` string will be shown in the exception raised if
-``init_oracle_client()`` cannot load the Oracle Client libraries.  This allows
-applications that use python-oracledb in Thick mode to refer users to
-application-specific installation instructions.  If this value is not
-specified, then the :ref:`installation` URL is used.
-
-.. _thicktothin:
-
-Migrating from python-oracledb Thick Mode to python-oracledb Thin Mode
-======================================================================
-
-Changing an application that currently uses :ref:`Thick mode <enablingthick>`
-to use Thin mode requires the removal of calls to
-:func:`oracledb.init_oracle_client()` and an application restart.  Other small
-changes may be required:
-
-1. Remove *all* calls to :func:`oracledb.init_oracle_client` from the
-   application.
-
-2. Review :ref:`featuresummary` and :ref:`driverdiff` for code changes that
-   may be needed.
-
-3. Restart your application.
-
-4. Test and validate your application behavior.
-
-When you are satisfied, you can optionally remove Oracle Client libraries. For
-example, delete your Oracle Instant Client directory.
-
-You can validate the python-oracledb mode by checking :attr:`Connection.thin`,
-:attr:`ConnectionPool.thin`, or by querying the CLIENT_DRIVER column of
-V$SESSION_CONNECT_INFO and verifying if the value of the column begins with the
-text ``python-oracledb thn``. See :ref:`vsessconinfo`.
-
-Note all connections in a python-oracledb application must use the same mode.
-
-.. _settingdefaults:
-
-Changing python-oracledb Default Settings
-=========================================
-
-Python-oracledb has a singleton :ref:`Defaults <defaults>` object with
-attributes that set default behaviors of the driver. The object is accessed
-using the :data:`defaults` attribute of the imported driver.
-
-For example, to return queried LOB columns directly as strings or bytes:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.defaults.fetch_lobs = False
-
-
-See :ref:`defaultsattributes` for the attributes that can be set.
diff --git a/doc/src/user_guide/installation.rst b/doc/src/user_guide/installation.rst
deleted file mode 100644
index a94be074..00000000
--- a/doc/src/user_guide/installation.rst
+++ /dev/null
@@ -1,1205 +0,0 @@
-.. _installation:
-
-.. currentmodule:: oracledb
-
-***************************
-Installing python-oracledb
-***************************
-
-The python-oracledb driver allows Python applications to connect to Oracle
-Database with no extra libraries needed.
-
-.. figure:: /images/python-oracledb-thin-arch.png
-   :alt: architecture of the python-oracledb driver
-
-   Architecture of the python-oracledb driver
-
-By default, python-oracledb runs in a 'Thin' mode which connects directly to
-Oracle Database.  This mode does not need Oracle Client libraries.  However,
-some :ref:`additional functionality <featuresummary>` is available when
-python-oracledb uses them.  Python-oracledb is said to be in 'Thick' mode when
-Oracle Client libraries are used.  See :ref:`enablingthick`. Both modes have
-comprehensive functionality supporting the Python Database API v2.0
-Specification.
-
-.. _quickstart:
-
-Quick Start python-oracledb Installation
-========================================
-
-Python-oracledb is typically installed from Python's package repository `PyPI
-<https://pypi.org/project/oracledb/>`__ using `pip
-<https://pip.pypa.io/en/latest/installation/>`__ or `uv
-<https://pypi.org/project/uv/>`__.
-
-1. Install `Python 3 <https://www.python.org/downloads>`__ if it is not already
-   available.
-
-   Use any version from Python 3.9 through 3.14.
-
-   Previous versions of python-oracledb supported older Python versions.
-
-2. Install python-oracledb, for example:
-
-  .. code-block:: shell
-
-      python -m pip install oracledb --upgrade --user
-
-  Note the module name is simply ``oracledb``.
-
-  On some platforms the Python binary may be called ``python3`` instead of
-  ``python``.
-
-  If you are behind a proxy, use the ``--proxy`` option. For example:
-
-  .. code-block:: shell
-
-      python -m pip install oracledb --upgrade --user --proxy=http://proxy.example.com:80
-
-  By default, python-oracledb connects directly to Oracle Database.  This lets
-  it be used immediately without needing any additional installation of Oracle
-  Client libraries.
-
-3. Create a file ``test.py`` such as:
-
-  .. code-block:: python
-
-      import oracledb
-      import getpass
-
-      un = "scott"
-      cs = "localhost/orclpdb"
-      # cs = "localhost/freepdb1"   # for Oracle AI Database Free users
-      # cs = "localhost/orclpdb1"   # some databases may have this service
-      pw = getpass.getpass(f"Enter password for {un}@{cs}: ")
-
-      with oracledb.connect(user=un, password=pw, dsn=cs) as connection:
-          with connection.cursor() as cursor:
-              sql = "select sysdate from dual"
-              for r in cursor.execute(sql):
-                  print(r)
-
-4. Edit ``test.py`` and set the ``un`` and ``cs`` variables to your own
-   database username and the database connection string, respectively.
-
-   A simple :ref:`connection <connhandling>` to the database requires an Oracle
-   Database `user name and password
-   <https://www.youtube.com/watch?v=WDJacg0NuLo>`_ and a database
-   :ref:`connection string <connstr>`.  For python-oracledb, a common
-   connection string format is ``hostname:port/servicename``, using the host
-   name where the database is running, the Oracle Database service name of the
-   database instance, and the port that the database is using. If the default
-   port 1521 is being used, then this component of the connection string is
-   often omitted.
-
-   The database can be on-premises or in the :ref:`Cloud <autonomousdb>`.  The
-   python-oracledb driver does not include a database.
-
-5. Run the program:
-
-   .. code-block:: shell
-
-      python test.py
-
-   Enter the database password when prompted and the queried date will be shown,
-   for example:
-
-   .. code-block:: shell
-
-      Enter password for cj@localhost/orclpdb: xxxxxxxxxx
-      (datetime.datetime(2024, 4, 30, 8, 24, 4),)
-
-If you have trouble installing, refer to detailed instructions below, or see
-:ref:`troubleshooting`.
-
-You can learn more about python-oracledb from the `python-oracledb
-documentation <https://python-oracledb.readthedocs.io/en/latest/index.html>`__
-and `samples <https://github.com/oracle/python-oracledb/tree/main/samples>`__.
-
-Supported Oracle Database Versions
-==================================
-
-When python-oracledb is used in the default Thin mode, it connects directly to
-the Oracle Database and does not require Oracle Client libraries.  Connections
-in this mode can be made to Oracle Database 12.1 or later.
-
-To connect to older Oracle Database releases you must have Oracle Client
-libraries installed, and enable python-oracledb's :ref:`Thick mode
-<enablingthick>`.
-
-In python-oracledb Thick mode, Oracle Database's standard client-server
-network interoperability allows connections between different versions of
-Oracle Client libraries and Oracle Database.  For current or previously
-certified configurations, see Oracle Support's `Doc ID 207303.1
-<https://support.oracle.com/knowledge/Oracle%20Database%20Products/207303_1.html>`__.
-In summary:
-
-- Oracle Client 23 can connect to Oracle Database 19 or later
-- Oracle Client 21 can connect to Oracle Database 12.1 or later
-- Oracle Client 19, 18 and 12.2 can connect to Oracle Database 11.2 or later
-- Oracle Client 12.1 can connect to Oracle Database 10.2 or later
-- Oracle Client 11.2 can connect to Oracle Database 9.2 or later
-
-Any attempt to use Oracle Database features that are not supported by a
-particular mode or client library/database combination will result in runtime
-errors.  The python-oracledb attribute :attr:`Connection.thin` can be used to
-see what mode a connection is in.  In the Thick mode, the function
-:func:`oracledb.clientversion()` can be used to determine which Oracle Client
-version is in use. The attribute :attr:`Connection.version` can be used to
-determine which Oracle Database version a connection is accessing. These
-attributes can then be used to adjust the application behavior accordingly.
-
-Note Oracle maintains a list of database versions that problem resolution and
-error correction can be obtained for, see `Release Schedule of Current Database
-Releases <https://support.oracle.com/epmos/faces/DocumentDisplay?
-id=742060.1>`__.
-
-.. _instreq:
-
-Installation Requirements
-=========================
-
-To use python-oracledb, you need:
-
-- Python 3.9, 3.10, 3.11, 3.12, 3.13, or 3.14
-
-- The Python cryptography package. This package is automatically installed as a
-  dependency of python-oracledb.  It is strongly recommended that you keep the
-  cryptography package up to date whenever new versions are released.  If the
-  cryptography package is not available, you can still install python-oracledb
-  but can only use it in Thick mode, see :ref:`nocrypto`.
-
-- Optionally, Oracle Client libraries can be installed to enable some
-  additional advanced functionality. These can be from the free `Oracle Instant
-  Client <https://www.oracle.com/database/technologies/instant-client.html>`__
-  Basic or Basic Light packages, from a full Oracle Client installation (such
-  as installed by Oracle's GUI installer), or from those included in Oracle
-  Database if Python is on the same machine as the database.  Oracle Client
-  libraries versions 23, 21, 19, 18, 12, and 11.2 can be used where available
-  on Linux, Windows, and macOS.  Oracle's standard client-server version
-  interoperability allows connection to both older and newer databases.
-
-- An Oracle Database either local or remote, on-premises or in the Cloud.
-
-Installing python-oracledb on Linux
-===================================
-
-This section discusses the generic installation methods on Linux.
-
-Install python-oracledb
-------------------------
-
-The generic way to install python-oracledb on Linux is to use Python's `pip
-<https://pip.pypa.io/en/latest/>`__ package to install from Python's package
-repository `PyPI <https://pypi.org/project/oracledb/>`__:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade
-
-This will download and install a pre-compiled binary from `PyPI
-<https://pypi.org/project/oracledb/>`__ if one is available for your
-architecture.  Otherwise, the source will be downloaded, compiled, and the
-resulting binary installed.  Compiling python-oracledb requires the
-``Python.h`` header file.  If you are using the default ``python`` package,
-this file is in the ``python-devel`` package or equivalent.
-
-On some platforms the Python binary may be called ``python3`` instead of
-``python``.
-
-The installation ``--user`` option is useful when you do not have permission to
-write to system directories:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --user
-
-If you are behind a proxy, use the ``--proxy`` option. For example:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --proxy=http://proxy.example.com:80
-
-
-Optionally Install Oracle Client
---------------------------------
-
-By default, python-oracledb runs in a Thin mode which connects directly to
-Oracle Database so no further installation steps are required.  However, to use
-additional features available in :ref:`Thick mode <featuresummary>` you need
-Oracle Client libraries installed.  Oracle Client versions 23, 21, 19, 18, 12,
-and 11.2 can be used.
-
-- If your database is on a remote computer, then download the free `Oracle
-  Instant Client
-  <https://www.oracle.com/database/technologies/instant-client.html>`__ "Basic"
-  or "Basic Light" package for your operating system architecture.
-
-- Alternatively, use the client libraries already available in a locally
-  installed database such as the free `Oracle AI Database Free
-  <https://www.oracle.com/database/free/>`__ release.
-
-To use python-oracledb in Thick mode you must call
-:meth:`oracledb.init_oracle_client()` in your application, see
-:ref:`enablingthick`. For example:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.init_oracle_client()
-
-On Linux, do not pass the ``lib_dir`` parameter to
-:meth:`~oracledb.init_oracle_client()`.  The Oracle Client libraries on Linux
-must be in the system library search path *before* the Python process starts.
-
-
-Oracle Instant Client Zip Files
-+++++++++++++++++++++++++++++++
-
-To use python-oracledb Thick mode with Oracle Instant Client zip files:
-
-1. Download an Oracle 23, 21, 19, 18, 12, or 11.2 "Basic" or "Basic Light" zip
-   file matching your Python 64-bit or 32-bit architecture:
-
-  - `Linux 64-bit (x86-64)
-    <https://www.oracle.com/database/technologies/instant-client/linux-x86-64-downloads.html>`__
-  - `Linux 32-bit (x86)
-    <https://www.oracle.com/database/technologies/instant-client/linux-x86-32-downloads.html>`__
-  - `Linux Arm 64-bit (aarch64)
-    <https://www.oracle.com/database/technologies/instant-client/linux-arm-aarch64-downloads.html>`__
-
-  Oracle Instant Client version 23 will connect to Oracle Database 19 or later.
-  Oracle Instant Client version 19 will connect to Oracle Database 11.2 or
-  later.
-
-  Oracle Database versions 23 and 19 are Long Term Support Releases. Note
-  32-bit clients are not available on any platform for Oracle Database version
-  23, however you can use older 32-bit clients to connect to this version of
-  the database.
-
-  It is recommended to keep up to date with the latest Oracle Instant Client
-  release updates of your desired major version.
-
-2. Unzip the package into a single directory that is accessible to your
-   application. For example:
-
-   .. code-block:: shell
-
-       mkdir -p /opt/oracle
-       cd /opt/oracle
-       unzip instantclient-basic-linux.x64-21.6.0.0.0.zip
-
-   Note OS restrictions may prevent the opening of Oracle Client libraries
-   installed in unsafe paths, such as from a user directory.  You may need to
-   install under a directory like ``/opt`` or ``/usr/local``.
-
-3. Install the ``libaio`` package with sudo or as the root user. For example:
-
-   .. code-block:: shell
-
-       sudo dnf install libaio
-
-   On some Linux distributions this package is called ``libaio1`` or
-   ``libaio1t64`` instead.
-
-   If you have ``libaio1t64`` installed but Instant Client still fails to find
-   ``libaio.so.1``, you may need to create a symbolic link from
-   ``libaio.so.1t64`` to ``libaio.so.1`` (similar to `the patch here
-   <https://git.hadrons.org/cgit/debian/pkgs/libaio.git/commit/?id=
-   26cf01e7c7f79e9838932fa7cb6d3203c6d7e6c5>`__).
-
-4. When using Oracle Instant Client 19 on Linux versions such as Oracle Linux
-   8, you may need to manually install the ``libnsl`` package to make
-   ``libnsl.so`` available:
-
-   .. code-block:: shell
-
-       sudo dnf install libnsl
-
-5. If there is no other Oracle software on the machine that will be
-   impacted, permanently add Instant Client to the runtime link
-   path. For example, with sudo or as the root user:
-
-   .. code-block:: shell
-
-       sudo sh -c "echo /opt/oracle/instantclient_21_6 > /etc/ld.so.conf.d/oracle-instantclient.conf"
-       sudo ldconfig
-
-   Alternatively, set the environment variable ``LD_LIBRARY_PATH`` to
-   the appropriate directory for the Instant Client version. For
-   example:
-
-   .. code-block:: shell
-
-       export LD_LIBRARY_PATH=/opt/oracle/instantclient_21_6:$LD_LIBRARY_PATH
-
-  Make sure this is set in each shell that invokes Python.  Web servers and
-  other daemons commonly reset environment variables so using ``ldconfig`` is
-  generally preferred instead.
-
-6. If you use optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora``, or ``oraaccess.xml`` with Instant Client, then put the files
-   in an accessible directory, for example in
-   ``/opt/oracle/your_config_dir``. Then use:
-
-   .. code-block:: python
-
-       import oracledb
-
-       oracledb.init_oracle_client(config_dir="/home/your_username/oracle/your_config_dir")
-
-   or set the environment variable ``TNS_ADMIN`` to that directory name.
-
-   Alternatively, put the files in the ``network/admin`` subdirectory of Instant
-   Client, for example in ``/opt/oracle/instantclient_21_6/network/admin``.
-   This is the default Oracle configuration directory for executables linked
-   with this Instant Client.
-
-7. Call :meth:`oracledb.init_oracle_client()` in your application, if it is not
-   already used.
-
-Oracle Instant Client RPMs
-++++++++++++++++++++++++++
-
-To use python-oracledb with Oracle Instant Client RPMs:
-
-1a. Download and install Oracle Instant Client "Basic" or "Basic Light"
-
-    Download and install an Oracle 23, 21, 19, 18, 12, or 11.2 "Basic" or "Basic
-    Light" RPM matching your Python architecture from:
-
-    - `Linux 64-bit (x86-64) <https://www.oracle.com/database/technologies/
-      instant-client/linux-x86-64-downloads.html>`__
-    - `Linux Arm 64-bit (aarch64) <https://www.oracle.com/database/technologies
-      /instant-client/linux-arm-aarch64-downloads.html>`__
-
-    Install the downloaded RPM with sudo or as the root user. For example:
-
-    .. code-block:: shell
-
-        sudo dnf install oracle-instantclient-basic-23.9.0.25.07-1.el9.x86_64.rpm
-
-    Dnf will automatically install required dependencies, such as ``libaio``.
-
-    It is recommended to keep up to date with the latest Oracle Instant Client
-    release updates of your desired major version.
-
-    Oracle Database versions 23 and 19 are Long Term Support Releases. Oracle
-    Instant Client version 23 will connect to Oracle Database 19 or
-    later. Oracle Instant Client version 19 will connect to Oracle Database
-    version 11.2 or later.
-
-    Note 32-bit clients are not available on any platform for Oracle Database
-    version 23, however you can use older 32-bit clients to connect to this
-    version of the database.
-
-1b. Alternatively, install Instant Client from Oracle's yum server
-
-    See `Oracle Database Instant Client for Oracle Linux
-    <https://yum.oracle.com/oracle-instant-client.html>`__ instructions. The
-    repositories are:
-
-    - Instant Client version 23 on Oracle Linux 9
-
-      - `Instant Client 23 for Oracle Linux 9 (x86-64) <https://yum.oracle.com/
-        repo/OracleLinux/OL9/oracle/instantclient23/x86_64/index.html>`__
-
-      - `Instant Client 23 for Oracle Linux 9 (aarch64) <https://yum.oracle.com
-        /repo/OracleLinux/OL9/oracle/instantclient23/aarch64/index.html>`__
-
-      .. code-block:: shell
-
-          sudo dnf install oracle-instantclient-release-23ai-el9
-          sudo dnf install oracle-instantclient-basic
-
-    - Instant Client version 19 on Oracle Linux 9:
-
-      - `Instant Client 19 for Oracle Linux 9 (x86-64) <https://yum.oracle.com/
-        repo/OracleLinux/OL9/oracle/instantclient/x86_64/index.html>`__
-
-      - `Instant Client 19 for Oracle Linux 9 (aarch64) <https://yum.oracle.com
-        /repo/OracleLinux/OL9/oracle/instantclient/aarch64/index.html>`__
-
-      .. code-block:: shell
-
-          sudo dnf install oracle-instantclient-release-el9
-          sudo dnf install oracle-instantclient19.XX-basic
-
-    - Instant Client version 23 on Oracle Linux 8
-
-      - `Instant Client 23 for Oracle Linux 8 (x86-64) <https://yum.oracle.com/
-        repo/OracleLinux/OL8/oracle/instantclient23/x86_64/index.html>`__
-
-      - `Instant Client 23 for Oracle Linux 8 (aarch64) <https://yum.oracle.com
-        /repo/OracleLinux/OL8/oracle/instantclient23/aarch64/index.html>`__
-
-      .. code-block:: shell
-
-          sudo dnf install oracle-instantclient-release-23ai-el8
-          sudo dnf install oracle-instantclient-basic
-
-    - Instant Client version 19 on Oracle Linux 8:
-
-      - `Instant Client 19 for Oracle Linux 8 (x86-64) <https://yum.oracle.com/
-        repo/OracleLinux/OL8/oracle/instantclient/x86_64/index.html>`__
-
-      - `Instant Client 19 for Oracle Linux 8 (aarch64) <https://yum.oracle.com
-        /repo/OracleLinux/OL8/oracle/instantclient/aarch64/index.html>`__
-
-      .. code-block:: shell
-
-          sudo dnf install -y oracle-release-el8
-          sudo dnf install -y oracle-instantclient19.XX-basic
-
-2. When using Oracle Instant Client 19 on Linux versions such as Oracle Linux
-   8, you may need to manually install the ``libnsl`` package to make
-   ``libnsl.so`` available:
-
-   .. code-block:: shell
-
-       sudo dnf install libnsl
-
-3. For Instant Client 19 or later, the system library search path is
-   automatically configured during installation.
-
-   For older versions, if there is no other Oracle software on the machine that
-   will be impacted, permanently add Instant Client to the runtime link
-   path. For example, with sudo or as the root user:
-
-   .. code-block:: shell
-
-       sudo sh -c "echo /usr/lib/oracle/18.5/client64/lib > /etc/ld.so.conf.d/oracle-instantclient.conf"
-       sudo ldconfig
-
-   Alternatively, for version 18 and earlier, every shell running
-   Python will need to have the environment variable
-   ``LD_LIBRARY_PATH`` set to the appropriate directory for the
-   Instant Client version. For example:
-
-   .. code-block:: shell
-
-       export LD_LIBRARY_PATH=/usr/lib/oracle/18.5/client64/lib:$LD_LIBRARY_PATH
-
-  Web servers and other daemons commonly reset environment variables so using
-  ``ldconfig`` is generally preferred instead.
-
-4. If you use optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora`` or ``oraaccess.xml`` with Instant Client, then put the files
-   in an accessible directory, for example in
-   ``/opt/oracle/your_config_dir``. Then your application code can use:
-
-   .. code-block:: python
-
-       import oracledb
-
-       oracledb.init_oracle_client(config_dir="/opt/oracle/your_config_dir")
-
-   or you can set the environment variable ``TNS_ADMIN`` to that directory
-   name.
-
-   Alternatively, put the files in the ``network/admin`` subdirectory of Instant
-   Client, for example in ``/usr/lib/oracle/21/client64/lib/network/admin``.
-   This is the default Oracle configuration directory for executables linked
-   with this Instant Client.
-
-5. Call :meth:`oracledb.init_oracle_client()` in your application, if it is not
-   already used.
-
-Local Database or Full Oracle Client
-++++++++++++++++++++++++++++++++++++
-
-Python-oracledb applications can use Oracle Client 23, 21, 19, 18, 12, or 11.2
-libraries from a local Oracle Database or full Oracle Client installation (such
-as installed by Oracle's GUI installer).
-
-The libraries must be either 32-bit or 64-bit, matching your Python
-architecture. Note 32-bit clients are not available on any platform for Oracle
-Database version 23, however you can use older 32-bit clients to connect to
-this version of the database.
-
-1. Set required Oracle environment variables, such as ``ORACLE_HOME``, by
-   running the Oracle environment script. For example:
-
-   .. code-block:: shell
-
-       source /usr/local/bin/oraenv
-
-   For Oracle Database Express Edition ("XE") 11.2, run:
-
-   .. code-block:: shell
-
-       source /u01/app/oracle/product/11.2.0/xe/bin/oracle_env.sh
-
-2. Optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora``, or ``oraaccess.xml`` can be placed in
-   ``$ORACLE_HOME/network/admin``.
-
-   Alternatively, Oracle configuration files can be put in another, accessible
-   directory.  Then set the environment variable ``TNS_ADMIN`` to that
-   directory name.
-
-3. Call :meth:`oracledb.init_oracle_client()` in your application, if it is not
-   already used.
-
-
-.. _wininstall:
-
-Installing python-oracledb on Windows
-=====================================
-
-Install python-oracledb
-------------------------
-
-Use Python's `pip <https://pip.pypa.io/en/latest/installation/>`__ package
-to install python-oracledb from Python's package repository `PyPI
-<https://pypi.org/project/oracledb/>`__:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade
-
-If you are behind a proxy, use the ``--proxy`` option. For example:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --proxy=http://proxy.example.com:80
-
-This will download and install a pre-compiled binary `if one is available
-<https://pypi.org/project/oracledb/>`__ for your architecture.  If a
-pre-compiled binary is not available, the source will be downloaded, compiled,
-and the resulting binary installed.
-
-Optionally Install Oracle Client
---------------------------------
-
-By default, python-oracledb runs in a Thin mode which connects directly to
-Oracle Database so no further installation steps are required.  However, to use
-additional features available in :ref:`Thick mode <featuresummary>` you need
-Oracle Client libraries installed.  Oracle Client versions 21, 19, 18, 12, and
-11.2 can be used.
-
-- If your database is on a remote computer, then download the free `Oracle
-  Instant Client <https://www.oracle.com/database/technologies/instant-client.
-  html>`__ "Basic" or "Basic Light" package for your operating system
-  architecture.
-
-- Alternatively, use the client libraries already available in a locally
-  installed database such as the free `Oracle Database Express Edition ("XE")
-  <https://www.oracle.com/database/technologies/appdev/xe.html>`__ release.
-
-To use python-oracledb in Thick mode you must call
-:meth:`oracledb.init_oracle_client()` in your application, see
-:ref:`enablingthick`. For example:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.init_oracle_client()
-
-On Windows, you may prefer to pass the ``lib_dir`` parameter in the call as
-shown below.
-
-Oracle Instant Client Zip Files
-+++++++++++++++++++++++++++++++
-
-To use python-oracledb in Thick mode with Oracle Instant Client zip files:
-
-1. Download an Oracle 21, 19, 18, 12, or 11.2 "Basic" or "Basic Light" zip
-   file: `64-bit <https://www.oracle.com/database/technologies/instant-client/
-   winx64-64-downloads.html>`__ or `32-bit <https://www.oracle.com/database/
-   technologies/instant-client/microsoft-windows-32-downloads.html>`__,
-   matching your Python architecture.  Note 32-bit clients are not available on
-   any platform for Oracle Database version 23, however you can use older
-   32-bit clients to connect to this version of the database.
-
-   The latest version is recommended.  Oracle Instant Client 19 will connect to
-   Oracle Database 11.2 or later.
-
-2. Unzip the package into a directory that is accessible to your
-   application. For example unzip
-   ``instantclient-basic-windows.x64-19.22.0.0.0dbru.zip`` to
-   ``C:\oracle\instantclient_19_22``.
-
-3. Oracle Instant Client libraries require a Visual Studio redistributable with
-   a 64-bit or 32-bit architecture to match Instant Client's architecture.
-   Each Instant Client version requires a different redistributable version:
-
-  - For Instant Client 21, install `VS 2019 <https://docs.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170>`__ or later
-  - For Instant Client 19, install `VS 2017 <https://docs.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170>`__
-  - For Instant Client 18 or 12.2, install `VS 2013 <https://docs.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2013-vc-120>`__
-  - For Instant Client 12.1, install `VS 2010 <https://docs.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2010-vc-100-sp1-no-longer-supported>`__
-  - For Instant Client 11.2, install `VS 2005 64-bit <https://docs.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170#visual-studio-2005-vc-80-sp1-no-longer-supported>`__
-
-Configure Oracle Instant Client
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-1. There are several alternative ways to tell python-oracledb where your Oracle
-   Client libraries are, see :ref:`initialization`.
-
-  * With Oracle Instant Client you can use
-    :meth:`oracledb.init_oracle_client()` in your application, for example:
-
-    .. code-block:: python
-
-        import oracledb
-
-        oracledb.init_oracle_client(lib_dir=r"C:\oracle\instantclient_19_22")
-
-    Note that a 'raw' string is used because backslashes occur in the path.
-
-  * Alternatively, add the Oracle Instant Client directory to the ``PATH``
-    environment variable.  The directory must occur in ``PATH`` before any
-    other Oracle directories.  Restart any open command prompt windows.
-
-    Update your application to call ``init_oracle_client()``, which enables
-    python-oracledb Thick mode:
-
-    .. code-block:: python
-
-        import oracledb
-
-        oracledb.init_oracle_client()
-
-  * Another way to set ``PATH`` is to use a batch file that sets it before
-    Python is executed, for example:
-
-    .. code-block:: shell
-
-        REM mypy.bat
-        SET PATH=C:\oracle\instantclient_19_22;%PATH%
-        python %*
-
-    Invoke this batch file every time you want to run Python.
-
-    Update your application to call ``init_oracle_client()``, which enables
-    python-oracledb Thick mode:
-
-    .. code-block:: python
-
-        import oracledb
-
-        oracledb.init_oracle_client()
-
-2. If you use optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora``, or ``oraaccess.xml`` with Instant Client, then put the files
-   in an accessible directory, for example in
-   ``C:\oracle\your_config_dir``. Then use:
-
-   .. code-block:: python
-
-       import oracledb
-
-       oracledb.init_oracle_client(lib_dir=r"C:\oracle\instantclient_19_22",
-                                   config_dir=r"C:\oracle\your_config_dir")
-
-   or set the environment variable ``TNS_ADMIN`` to that directory name.
-
-   Alternatively, put the files in a ``network\admin`` subdirectory of Instant
-   Client, for example in ``C:\oracle\instantclient_19_22\network\admin``.
-   This is the default Oracle configuration directory for executables linked
-   with this Instant Client.
-
-Local Database or Full Oracle Client
-++++++++++++++++++++++++++++++++++++
-
-Python-oracledb Thick mode applications can use Oracle Client 21, 19, 18, 12,
-or 11.2 libraries from a local Oracle Database or full Oracle Client (such as
-installed by Oracle's GUI installer).
-
-The Oracle libraries must be either 32-bit or 64-bit, matching your Python
-architecture. Note 32-bit clients are not available on any platform for Oracle
-Database version 23, however you can use older 32-bit clients to connect to
-this version of the database.
-
-1. Set the environment variable ``PATH`` to include the path that contains
-   ``OCI.DLL``, if it is not already set.
-
-   Restart any open command prompt windows.
-
-2. Optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora``, or ``oraaccess.xml`` can be placed in the
-   ``network\admin`` subdirectory of the Oracle Database software installation.
-
-   Alternatively, pass ``config_dir`` to :meth:`oracledb.init_oracle_client()`
-   as shown in the previous section, or set ``TNS_ADMIN`` to the directory
-   name.
-
-3. To use python-oracledb in Thick mode you must call
-   :meth:`oracledb.init_oracle_client()` in your application, see
-   :ref:`enablingthick`.
-
-   .. code-block:: python
-
-       import oracledb
-
-       oracledb.init_oracle_client()
-
-Installing python-oracledb on macOS
-===================================
-
-Python-oracledb is available as a Universal binary for Python 3.9, or later, on
-Apple macOS Intel x86-64 and Apple macOS ARM64 (M1, M2, M3, M4) architectures.
-
-Install python-oracledb
------------------------
-
-Use Python's `pip <https://pip.pypa.io/en/latest/installation/>`__ package
-to install python-oracledb from Python's package repository `PyPI
-<https://pypi.org/project/oracledb/>`__:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade
-
-The ``--user`` option may be useful if you do not have permission to write to
-system directories:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --user
-
-If you are behind a proxy, use the ``--proxy`` option. For example:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --user --proxy=http://proxy.example.com:80
-
-To install into the system Python, you may need to use ``/usr/bin/python3``
-instead of ``python``:
-
-.. code-block:: shell
-
-    /usr/bin/python3 -m pip install oracledb --upgrade --user
-
-Optionally Install Oracle Client
---------------------------------
-
-By default, python-oracledb runs in a Thin mode which connects directly to
-Oracle Database so no further installation steps are required.  However, to use
-additional features available in :ref:`Thick mode <featuresummary>` you need
-Oracle Client libraries installed.
-
-You can get the libraries from either the Oracle Instant Client **Basic** or
-**Basic Light** package.  The steps below show installing **Basic**.
-
-Instant Client Scripted Installation on macOS ARM64
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Instant Client installation can be scripted. Open a terminal window and run:
-
-.. code-block:: shell
-
-    cd $HOME/Downloads
-    curl -O https://download.oracle.com/otn_software/mac/instantclient/233023/instantclient-basic-macos.arm64-23.3.0.23.09.dmg
-    hdiutil mount instantclient-basic-macos.arm64-23.3.0.23.09.dmg
-    /Volumes/instantclient-basic-macos.arm64-23.3.0.23.09/install_ic.sh
-    hdiutil unmount /Volumes/instantclient-basic-macos.arm64-23.3.0.23.09
-
-Note you should use the latest DMG available.
-
-If you have multiple Instant Client DMG packages mounted, you only need to run
-``install_ic.sh`` once.  It will copy all mounted Instant Client DMG packages at
-the same time.
-
-The Instant Client directory will be like
-``$HOME/Downloads/instantclient_23_3``.  Applications may not have access to
-the ``Downloads`` directory, so you should move Instant Client somewhere
-convenient.
-
-Instant Client Manual Installation on macOS ARM64
-+++++++++++++++++++++++++++++++++++++++++++++++++
-
-* Download the latest Instant Client **Basic** ARM64 package DMG from `Oracle
-  <https://www.oracle.com/database/technologies/instant-client/macos-arm64-
-  downloads.html>`__.
-
-* Using Finder, double-click the DMG to mount it.
-
-* Open a terminal window and run the install script in the mounted package,
-  for example if you downloaded version 23.3:
-
-  .. code-block:: shell
-
-    /Volumes/instantclient-basic-macos.arm64-23.3.0.23.09/install_ic.sh
-
-  The Instant Client directory will be like
-  ``$HOME/Downloads/instantclient_23_3``.  Applications may not have access to
-  the ``Downloads`` directory, so you should move Instant Client somewhere
-  convenient.
-
-* Using Finder, eject the mounted Instant Client package.
-
-If you have multiple Instant Client DMG packages mounted, you only need to run
-``install_ic.sh`` once.  It will copy all mounted Instant Client DMG packages
-at the same time.
-
-Instant Client Scripted Installation on macOS Intel x86-64
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Instant Client installation can be scripted. Open a terminal window and run:
-
-.. code-block:: shell
-
-    cd $HOME/Downloads
-    curl -O https://download.oracle.com/otn_software/mac/instantclient/1916000/instantclient-basic-macos.x64-19.16.0.0.0dbru.dmg
-    hdiutil mount instantclient-basic-macos.x64-19.16.0.0.0dbru.dmg
-    /Volumes/instantclient-basic-macos.x64-19.16.0.0.0dbru/install_ic.sh
-    hdiutil unmount /Volumes/instantclient-basic-macos.x64-19.16.0.0.0dbru
-
-Note you should use the latest DMG available.
-
-If you have multiple Instant Client DMG packages mounted, you only need to run
-``install_ic.sh`` once.  It will copy all mounted Instant Client DMG packages at
-the same time.
-
-The Instant Client directory will be ``$HOME/Downloads/instantclient_19_16``.
-Applications may not have access to the ``Downloads`` directory, so you should
-move Instant Client somewhere convenient.
-
-Instant Client Manual Installation on macOS Intel x86-64
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-* Download the latest Instant Client **Basic** Intel 64-bit package DMG from
-  `Oracle <https://www.oracle.com/database/technologies/instant-client/macos-
-  intel-x86-downloads.html>`__.
-
-* Using Finder, double-click the DMG to mount it.
-
-* Open a terminal window and run the install script in the mounted package, for example:
-
-  .. code-block:: shell
-
-    /Volumes/instantclient-basic-macos.x64-19.16.0.0.0dbru/install_ic.sh
-
-  The Instant Client directory will be ``$HOME/Downloads/instantclient_19_16``.
-  Applications may not have access to the ``Downloads`` directory, so you
-  should move Instant Client somewhere convenient.
-
-* Using Finder, eject the mounted Instant Client package.
-
-If you have multiple Instant Client DMG packages mounted, you only need to run
-``install_ic.sh`` once.  It will copy all mounted Instant Client DMG packages at
-the same time.
-
-Configure Oracle Instant Client
--------------------------------
-
-Your application must load the installed Oracle Instant Client libraries. It
-can optionally indicate external configuration files.
-
-1. Call :meth:`oracledb.init_oracle_client()` in your application:
-
-   .. code-block:: python
-
-        import oracledb
-
-        oracledb.init_oracle_client(lib_dir="/Users/your_username/Downloads/instantclient_23_3")
-
-2. If you use optional Oracle configuration files such as ``tnsnames.ora``,
-   ``sqlnet.ora``, or ``oraaccess.xml`` with Oracle Instant Client, then put the
-   files in an accessible directory, for example in
-   ``/Users/your_username/oracle/your_config_dir``. Then use:
-
-   .. code-block:: python
-
-       import oracledb
-
-       oracledb.init_oracle_client(lib_dir="/Users/your_username/Downloads/instantclient_23_3",
-                                   config_dir="/Users/your_username/oracle/your_config_dir")
-
-   Or set the environment variable ``TNS_ADMIN`` to that directory name.
-
-   Alternatively, put the files in the ``network/admin`` subdirectory of Oracle
-   Instant Client, for example in
-   ``/Users/your_username/Downloads/instantclient_23_3/network/admin``.  This is the
-   default Oracle configuration directory for executables linked with this
-   Instant Client.
-
-Installing python-oracledb without Internet Access
-===================================================
-
-To install python-oracledb on a computer that is not connected to the internet,
-download a python-oracledb wheel package from Python's package repository `PyPI
-<https://pypi.org/project/oracledb/#files>`__. Use the file appropriate for
-your operating system and python version. Transfer this file to the offline
-computer and install it with:
-
-.. code-block:: shell
-
-    python -m pip install "<file_name>"
-
-You will also need to use a similar step to install the required cryptography
-package and its dependencies.
-
-Then follow the general python-oracledb platform installation instructions to
-install Oracle Client libraries. This is only necessary if you intend to use
-python-oracledb :ref:`Thick mode <initialization>`.
-
-.. _nocrypto:
-
-Installing python-oracledb without the Cryptography Package
-===========================================================
-
-If the Python cryptography package is not available, python-oracledb can still
-be installed but can only be used in Thick mode.  Trying to use Thin mode will
-give the error ``DPY-3016: python-oracledb thin mode cannot be used because the
-cryptography package is not installed``.
-
-To use python-oracledb without the cryptography package:
-
-- Install python-oracledb using pip's ``--no-deps`` option, for example:
-
-  .. code-block:: python
-
-      python -m pip install oracledb --no-deps
-
-- Oracle Client libraries must then be installed.  See previous sections.
-
-- Add a call to :meth:`oracledb.init_oracle_client()` in your application, see
-  :ref:`enablingthick`.
-
-.. _installsrc:
-
-Installing from Source Code
-===========================
-
-For platforms that do not have pre-built binaries on `PyPI
-<https://pypi.org/project/oracledb/>`__, using the normal ``python -m pip
-install oracledb`` command will download the python-oracledb source bundle,
-build, and install it.
-
-Alternatively, to create your own package files for installation, you can build
-and install python-oracledb either :ref:`locally from source code <installgh>`,
-or by using a :ref:`presupplied GitHub Action <installghactions>` which builds
-packages for all architectures and Python versions.
-
-.. _installgh:
-
-Building a python-oracledb package locally
-------------------------------------------
-
-1. Install a C99 compliant C compiler.
-
-2. Download the source code using one of the following options:
-
-   - You can clone the source code from `GitHub
-     <https://github.com/oracle/python-oracledb>`__:
-
-     .. code-block:: shell
-
-         git clone --recurse-submodules https://github.com/oracle/python-oracledb.git
-
-   - Alternatively, you can manually download a `source zip
-     <https://github.com/oracle/python-oracledb/archive/refs/heads/main.zip>`__
-     file from GitHub.
-
-     In this case, you will also need to download an `ODPI-C
-     <https://github.com/oracle/odpi>`__ source zip file and put the
-     extracted contents inside the ``odpi`` subdirectory, for example in
-     ``python-oracledb-main/src/oracledb/impl/thick/odpi``.
-
-   - Alternatively, clone the source from `opensource.oracle.com
-     <https://opensource.oracle.com/>`__, which mirrors GitHub:
-
-     .. code-block:: shell
-
-         git clone --recurse-submodules https://opensource.oracle.com/git/oracle/python-oracledb.git
-         git checkout main
-
-   - Alternatively, a python-oracledb source package can manually be downloaded
-     from PyPI.
-
-     Navigate to the `PyPI python-oracledb download files
-     <https://pypi.org/project/oracledb/#files>`__ page, download the source
-     package archive, and extract it.
-
-3. With the source code available, build a python-oracledb package by running:
-
-   .. code-block:: shell
-
-       cd python-oracledb               # the name may vary depending on the download
-       python -m pip install build --upgrade
-       # export PYO_COMPILE_ARGS='-g0'  # optionally set any compilation arguments
-       python -m build
-
-   A python-oracledb wheel package is created in the ``dist`` subdirectory.
-   For example when using Python 3.12 on macOS you might have the file
-   ``dist/oracledb-3.1.0-cp312-cp312-macosx_14_0_arm64.whl``.
-
-4. Install this package:
-
-   .. code-block:: shell
-
-       python -m pip install dist/oracledb-3.1.0-cp312-cp312-macosx_14_0_arm64.whl
-
-   The package can also be installed on any computer which has the same
-   architecture and Python version as the build machine.
-
-.. _installghactions:
-
-Building python-oracledb packages using GitHub Actions
-------------------------------------------------------
-
-The python-oracledb GitHub repository has a builder Action that uses GitHub
-infrastructure to build python-oracledb packages for all architectures and
-Python versions.
-
-1. Fork the `python-oracledb repository
-   <https://github.com/oracle/python-oracledb/fork>`__.  Additionally fork the
-   `ODPI-C repository <https://github.com/oracle/odpi/fork>`__, keeping the
-   default name.
-
-2. In your python-oracledb fork, go to the Actions tab
-   ``https://github.com/<your name>/python-oracledb/actions/``.  If this is
-   your first time using Actions, confirm enabling them.
-
-3. In the "All workflows" list on the left-hand side, select the "Build
-   python-oracledb packages" entry.
-
-4. Navigate to the "Run workflow" drop-down, select the branch to build from
-   (for example, "main"), and run the workflow.
-
-5. Optionally edit the input field list of package targets and remove targets
-   you do not want to build. For example, remove "Linux" if you do not want
-   Linux packages.
-
-6. When the build has completed, download the "python-oracledb-wheels"
-   artifact, unzip it, and install the one for your architecture and Python
-   version.  For example, when using Python 3.12 on macOS, install:
-
-   .. code-block:: shell
-
-       python -m pip install oracledb-3.1.0-cp312-cp312-macosx_10_13_universal2.whl
-
-.. _docker:
-
-Using python-oracledb Containers
-================================
-
-Dockerfiles showing installation of Python and python-oracledb on Oracle Linux
-are available from
-`github.com/oracle/docker-images/tree/main/OracleLinuxDevelopers
-<https://github.com/oracle/docker-images/tree/main/OracleLinuxDevelopers>`__.
-
-Containers built from these Dockerfiles can be pulled from the GitHub Container
-Registry:
-
-- `oraclelinux9-python <https://github.com/oracle/docker-images/pkgs/container/
-  oraclelinux9-python>`__
-- `oraclelinux8-python <https://github.com/oracle/docker-images/pkgs/container/
-  oraclelinux8-python>`__
-
-For example, you can pull a container for Python 3.12 on Oracle Linux 9 using:
-
-.. code-block:: shell
-
-    docker pull ghcr.io/oracle/oraclelinux9-python:3.12-oracledb
-
-Or use it in a Dockerfile like:
-
-.. code-block:: shell
-
-    FROM ghcr.io/oracle/oraclelinux9-python:3.12-oracledb
-
-**Sample Containers**
-
-There are two python-oracledb containers with samples located in
-`/samples/containers
-<https://github.com/oracle/python-oracledb/tree/main/samples/containers>`__.
-
-.. _configprovidermodules:
-
-Installing Centralized Configuration Provider Modules for python-oracledb
-=========================================================================
-
-To use python-oracledb with a :ref:`centralized configuration provider
-<configurationproviders>`, you must install the necessary modules for your
-preferred provider as detailed below.
-
-.. _ociccpmodules:
-
-Install Modules for the OCI Object Storage Centralized Configuration Provider
------------------------------------------------------------------------------
-
-For python-oracledb to use an :ref:`Oracle Cloud Infrastructure (OCI) Object
-Storage configuration provider <ociobjstorageprovider>`, you must install the
-`OCI <https://pypi.org/project/oci/>`__ package by using the optional
-``[oci_config]`` dependency:
-
-  .. code-block:: shell
-
-    python -m pip install oracledb[oci_config]
-
-See :ref:`ociobjstorageprovider` for information on using this configuration
-provider with python-oracledb.
-
-.. _azureccpmodules:
-
-Install Modules for the Azure App Centralized Configuration Provider
---------------------------------------------------------------------
-
-For python-oracledb to use an :ref:`Azure App Configuration Provider
-<azureappstorageprovider>`, you must install the `Azure App Configuration
-<https://pypi.org/project/azure-appconfiguration/>`__, `Azure Identity
-<https://pypi.org/project/azure-identity/>`__, and `Azure Key Vault Secrets
-<https://pypi.org/project/azure-keyvault-secrets/>`__ packages by using the
-optional ``[azure_config]`` dependency:
-
-.. code-block:: shell
-
-    python -m pip install oracledb[azure_config]
-
-See :ref:`azureappstorageprovider` for information on using this configuration
-provider with python-oracledb.
-
-.. _cloudnativemodules:
-
-Installing Cloud Native Authentication Modules for python-oracledb
-==================================================================
-
-To use a python-oracledb Cloud Native Authentication plugin, you must install
-the necessary modules for your preferred plugin, as detailed below.
-
-.. _ocitokenmodules:
-
-Install Modules for the OCI Cloud Native Authentication Plugin
---------------------------------------------------------------
-
-For python-oracledb to use the OCI Cloud Native Authentication Plugin, you must
-install the `Python SDK for Oracle Cloud Infrastructure
-<https://pypi.org/project/oci/>`__ package by using the ``[oci_auth]``
-dependency:
-
-.. code-block:: shell
-
-    python -m pip install oracledb[oci_auth]
-
-Review the `OCI SDK installation instructions
-<https://docs.oracle.com/en-us/iaas/tools/python/latest/installation.html>`__
-as needed.
-
-See :ref:`cloudnativeauthoci` for more information on using the plugin in
-python-oracledb.
-
-.. _azuretokenmodules:
-
-Install Modules for the Azure Cloud Native Authentication Plugin
-----------------------------------------------------------------
-
-For python-oracledb to use the Azure Cloud Native Authentication Plugin, you
-must install the `Microsoft Authentication Library (MSAL) for Python
-<https://pypi.org/project/msal/>`__ package by using the optional
-``[azure_auth]`` dependency:
-
-.. code-block:: shell
-
-    python -m pip install oracledb[azure_auth]
-
-Review the `Microsoft MSAL installation instructions
-<https://learn.microsoft.com/en-us/entra/msal/python/?view=msal-py-latest#install-the-package>`__
-as needed.
-
-See :ref:`cloudnativeauthoauth` for more information on using the plugin in
-python-oracledb.
diff --git a/doc/src/user_guide/introduction.rst b/doc/src/user_guide/introduction.rst
deleted file mode 100644
index ce338f84..00000000
--- a/doc/src/user_guide/introduction.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-.. _introduction:
-
-.. currentmodule:: oracledb
-
-*****************************************************
-Introduction to the Python Driver for Oracle Database
-*****************************************************
-
-The python-oracledb driver is an :ref:`open source <license>` Python module
-that enables access to Oracle Database with no extra libraries needed. The
-module is built with Cython for safety and speed. It is lightweight and
-high-performance. It is stable, well tested, and has comprehensive
-documentation. The module is maintained by Oracle.
-
-The module conforms to the `Python Database API v2.0 Specification
-<https://www.python.org/dev/peps/pep-0249/>`__ with a considerable number of
-additions and a couple of minor exclusions. It is used by many Python
-frameworks, SQL generators, ORMs, and libraries.
-
-Python-oracledb has a rich feature set which is easy to use. It gives you
-control over SQL and PL/SQL statement execution; for working with data frames;
-for fast data ingestion; for calling NoSQL-style document APIs; for message
-queueing; for receiving database notifications; and for starting and stopping
-the database. It also has high availability and security features. Synchronous
-and concurrent coding styles are supported. Database operations can optionally
-be pipelined.
-
-The module is available from standard package repositories including `PyPI
-<https://pypi.org/project/oracledb/>`__, `conda-forge
-<https://anaconda.org/conda-forge/oracledb>`__, and `yum.oracle.com
-<https://yum.oracle.com/oracle-linux-python.html>`__.  The source code is
-hosted at `github.com/oracle/python-oracledb
-<https://github.com/oracle/python-oracledb>`__.
-
-This module is currently tested with Python 3.9, 3.10, 3.11, 3.12, 3.13, and
-3.14 against Oracle Database version 23, 21, 19, 18, 12, and 11.2. Previous
-versions of python-oracledb supported older Python versions.
-
-Changes in python-oracledb releases can be found in the :ref:`release notes
-<releasenotes>`.
-
-The python-oracledb driver is the renamed, successor to cx_Oracle. The
-cx_Oracle driver is obsolete and should not be used for new development. For
-upgrade information, see :ref:`upgrading83`.
-
-Getting Started
-===============
-
-See :ref:`quickstart`.
-
-Runnable examples are in the `GitHub samples directory
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__.
-A tutorial `Python and Oracle Database Tutorial: The New Wave of Scripting
-<https://oracle.github.io/python-oracledb
-/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html>`__
-is also available.
-
-Architecture
-============
-
-Python-oracledb is a 'Thin' driver with an optional 'Thick' mode enabled by an
-application setting.
-
-python-oracledb Thin Mode Architecture
---------------------------------------
-
-By default, python-oracledb allows connecting directly to Oracle Database 12.1
-or later.  This Thin mode does not need Oracle Client libraries.
-
-.. _thinarchfig:
-.. figure:: /images/python-oracledb-thin-arch.png
-   :alt: architecture of the python-oracledb driver in Thin mode
-
-   Architecture of the python-oracledb driver in Thin mode
-
-The figure shows the architecture of python-oracledb.  Users interact with a
-Python application, for example by making web requests. The application program
-makes calls to python-oracledb functions. The connection from python-oracledb
-Thin mode to Oracle Database is established directly by python-oracledb over
-the Oracle Net protocol. The database can be on the same machine as Python, or
-it can be remote.
-
-The behavior of Oracle Net can optionally be configured with application
-settings, or by using a ``tnsnames.ora`` file, see :ref:`optnetfiles`.
-
-python-oracledb Thick Mode Architecture
----------------------------------------
-
-Python-oracledb is said to be in 'Thick' mode when it links with Oracle Client
-libraries.  An application script runtime option enables this mode by loading
-the libraries, see :ref:`enablingthick`.  This gives you some :ref:`additional
-functionality <featuresummary>`. Depending on the version of the Oracle Client
-libraries, this mode of python-oracledb can connect to Oracle Database 9.2 or
-later.
-
-.. _thickarchfig:
-.. figure:: /images/python-oracledb-thick-arch.png
-   :alt: architecture of the python-oracledb driver in Thick mode
-
-   Architecture of the python-oracledb driver in Thick mode
-
-The figure shows the architecture of the python-oracledb Thick mode.  Users
-interact with a Python application, for example by making web requests. The
-application program makes calls to python-oracledb functions. Internally,
-python-oracledb dynamically loads Oracle Client libraries. Connections from
-python-oracledb Thick mode to Oracle Database are established by the Oracle
-Client libraries over the Oracle Net protocol. The database can be on the same
-machine as Python, or it can be remote.
-
-To use python-oracledb Thick mode, the Oracle Client libraries must be
-installed separately, see :ref:`installation`.  The libraries can be from an
-installation of `Oracle Instant Client
-<https://www.oracle.com/database/technologies/instant-client.html>`__, from a
-full Oracle Client installation (such as installed by Oracle's GUI installer),
-or even from an Oracle Database installation (if Python is running on the
-same machine as the database). Oracle's standard client-server version
-interoperability allows connection to both older and newer databases from
-different Oracle Client library versions.
-
-Some behaviors of the Oracle Client libraries can optionally be configured with
-an ``oraaccess.xml`` file, for example to enable auto-tuning of a statement
-cache.  See :ref:`optclientfiles`.
-
-The behavior of Oracle Net can optionally be configured with files such as
-``tnsnames.ora`` and ``sqlnet.ora``, for example to enable :ref:`network
-encryption <netencrypt>`. See :ref:`optnetfiles`.
-
-Oracle environment variables that are set before python-oracledb first creates
-a database connection may affect python-oracledb Thick mode behavior.  See
-:ref:`envset`.
-
-
-Feature Highlights of python-oracledb
-======================================
-
-The python-oracledb feature highlights are:
-
-    *   Easy installation from PyPI and other repositories
-    *   Support for multiple Oracle Database versions
-    *   Supports the `Python Database API v2.0 Specification <https://www.
-        python.org/dev/peps/pep-0249/>`__ with a considerable number of
-        additions and a couple of exclusions
-    *   Works with common frameworks and ORMs
-    *   Execution of SQL and PL/SQL statements
-    *   Extensive Oracle data type support, including JSON, VECTOR, large
-        objects (``CLOB`` and ``BLOB``) and binding of SQL objects
-    *   Connection management, including connection pooling
-    *   Oracle Database High Availability features
-    *   Full use of Oracle Network Service infrastructure, including encrypted
-        network traffic
-
-See :ref:`featuresummary` for more information.
diff --git a/doc/src/user_guide/json_data_type.rst b/doc/src/user_guide/json_data_type.rst
deleted file mode 100644
index 0cc7ad9d..00000000
--- a/doc/src/user_guide/json_data_type.rst
+++ /dev/null
@@ -1,520 +0,0 @@
-.. _jsondatatype:
-
-.. currentmodule:: oracledb
-
-***************
-Using JSON Data
-***************
-
-JSON data can be used with relational database features, including
-transactions, indexing, declarative querying, and views. You can project JSON
-data relationally, making it available for relational processes and
-tools. :ref:`JSON-Relational Duality Views <jsondualityviews>` provide the
-benefits of the relational model and SQL access, while also allowing read and
-write access to data as JSON documents. Also see :ref:`Simple Oracle Document
-Access (SODA) <sodausermanual>`, which allows access to JSON documents through
-a set of NoSQL-style APIs.
-
-Support for JSON was introduced in Oracle Database 12c. For more information
-about using JSON in Oracle Database see the `Database JSON Developer's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN>`__.
-
-Using the Oracle Database JSON Type in python-oracledb
-======================================================
-
-Oracle Database 21c introduced a dedicated JSON data type with a new `binary
-storage format OSON <https://blogs.oracle.com/jsondb/osonformat>`__ that
-improves performance and functionality compared with earlier releases. Both
-python-oracledb Thin and Thick modes support the JSON data type.  With Thick
-mode, the Oracle Client libraries should be version 21, or later.
-
-To create a table with a column called JSON_DATA for JSON data you might
-use:
-
-.. code-block:: sql
-
-    create table CustomersAsJson (
-        id integer not null primary key,
-        json_data json
-    );
-
-
-With Oracle Database 21c (or later), when using python-oracledb Thin mode or
-when using Thick mode with Oracle Client 21c (or later), you can insert JSON
-data by binding directly:
-
-.. code-block:: python
-
-    data = dict(name="Sally", dept="Sales", location="France")
-    insert_sql = "insert into CustomersAsJson values (:1, :2)"
-
-    # Take advantage of direct binding
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.execute(insert_sql, [1, data])
-
-The call to :meth:`Cursor.setinputsizes()` uses None to indicate that the type
-for the first bind variable placeholder should be inferred from the data value
-(that is, it is numeric), and uses ``oracledb.DB_TYPE_JSON`` to indicate that
-the second placeholder in the SQL statement should be bound as a JSON type.
-
-.. _json21fetch:
-
-Fetching a JSON column automatically returns a Python object:
-
-.. code-block:: python
-
-    for row in cursor.execute("select * from CustomersAsJson"):
-        print(row)
-
-This gives::
-
-    (1, {'name': 'Sally', 'dept': 'Sales', 'location': 'France'})
-
-See `json_direct.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/json_direct.py>`__
-for a runnable example.  The example also shows how to use this type when
-python-oracledb Thick mode uses older Oracle Client libraries.
-
-Using JSON stored in BLOB, CLOB or VARCHAR2 columns
-===================================================
-
-In Oracle Database 12c, or later, JSON can be stored in BLOB, CLOB or VARCHAR2
-relational table columns. All of these types can be used with python-oracledb
-in Thin or Thick modes. BLOB is preferred to avoid character set conversion
-overheads.
-
-The syntax to create a table with a JSON column using BLOB storage is like:
-
-.. code-block:: sql
-
-    create table CustomersAsBlob (
-        id integer not null primary key,
-        json_data blob check (json_data is json)
-    );
-
-The check constraint with the clause ``IS JSON`` ensures only JSON data is
-stored in that column.
-
-This older syntax can still be used in Oracle Database 21c (and later).
-However the recommendation is to move to the new JSON type.
-
-When using Oracle Database 12c or later with JSON using BLOB storage, you can
-insert JSON strings like:
-
-.. code-block:: python
-
-    import json
-
-    data = dict(name="Rod", dept="Sales", location="Germany")
-    inssql = "insert into CustomersAsBlob values (:1, :2)"
-
-    cursor.setinputsizes(None, oracledb.DB_TYPE_LONG_RAW)
-    cursor.execute(inssql, [1, json.dumps(data)])
-
-You can fetch VARCHAR2 and LOB columns that contain JSON data in the same way
-that :ref:`JSON type columns <json21fetch>` are fetched when using Oracle
-Database 21c or later. If you are using python-oracledb Thick mode, you must
-use Oracle Client 19c (or later). For example:
-
-.. code-block:: python
-
-    for row in cursor.execute("select * from CustomersAsBlob"):
-        print(row)
-
-.. versionchanged:: 2.0
-
-    The behavior when fetching JSON data stored in VARCHAR2 and LOB columns
-    which have the check constraint ``IS JSON`` changed in python-oracledb
-    versions 1.4 and 2.0.
-
-    In python-oracledb 2.0, fetching from these columns in Oracle Database 12c
-    (or later) has the same behavior as fetching from a column of type JSON in
-    Oracle Database 21c (or later): a Python object is returned
-    automatically. You do not need to explicitly invoke ``json.loads()``.
-
-    In python-oracledb 1.4 you could set the attribute
-    ``oracledb.__future__.old_json_col_as_obj`` to change how these columns
-    were returned. When set to False (its default value), your application
-    needed to invoke ``json.loads()`` on the fetched values.  When the
-    attribute was True, the data was automatically returned as Python objects.
-    The attribute provided a forward migration path to python-oracledb 2.0.
-
-    With all python-oracledb version prior to 1.4 your application always
-    needed to call ``json.loads()`` on the returned data.
-
-    The attribute ``oracledb.__future__.old_json_col_as_obj`` was added in
-    python-oracledb 1.4 and removed in version 2.0.
-
-See `json_blob.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/json_blob.py>`__
-for a runnable example.
-
-Using OSON storage
-------------------
-
-When using JSON with VARCHAR or LOB storage in databases that support `OSON
-<https://blogs.oracle.com/jsondb/osonformat>`__, Oracle's optimized binary JSON
-format, you can set this as the storage option:
-
-.. code-block:: sql
-
-     create table mytab (json_data blob check (json_data is json format oson));
-
-To insert into this table, encode the data using
-:meth:`Connection.encode_oson()`, and use :meth:`Cursor.setinputsizes()` to
-specify that the bind variable placeholder represents JSON:
-
-.. code-block:: python
-
-     data = dict(name="Sally", dept="Sales", location="France")
-
-     oson = connection.encode_oson(data)
-     cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-     cursor.execute("insert into mytab (json_data) values (:1)", [oson])
-
-When fetching, use :meth:`Connection.decode_json()` to extract the values:
-
-.. code-block:: python
-
-     for (o,) in cursor.execute("select * from mytab"):
-         d = connection.decode_oson(o)
-         print(d)
-
-IN Bind Type Mapping
-====================
-
-When binding to a JSON value, the ``type`` parameter for the variable must be
-specified as :data:`oracledb.DB_TYPE_JSON`. Python values are converted to
-JSON values as shown in the following table.  The 'SQL Equivalent' syntax can
-be used in SQL INSERT and UPDATE statements if specific attribute types are
-needed but there is no direct mapping from Python.
-
-.. list-table-with-summary::
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 1 1 1
-    :summary: The first column is the Python Type or Value. The second column is the equivalent JSON Attribute Type or Value. The third column is the SQL Equivalent syntax.
-    :align: left
-
-    * - Python Type or Value
-      - JSON Attribute Type or Value
-      - SQL Equivalent Example
-    * - None
-      - null
-      - NULL
-    * - True
-      - true
-      - n/a
-    * - False
-      - false
-      - n/a
-    * - int
-      - NUMBER
-      - json_scalar(1)
-    * - float
-      - NUMBER
-      - json_scalar(1)
-    * - decimal.Decimal
-      - NUMBER
-      - json_scalar(1)
-    * - str
-      - VARCHAR2
-      - json_scalar('String')
-    * - datetime.date
-      - TIMESTAMP
-      - json_scalar(to_timestamp('2020-03-10', 'YYYY-MM-DD'))
-    * - datetime.datetime
-      - TIMESTAMP
-      - json_scalar(to_timestamp('2020-03-10', 'YYYY-MM-DD'))
-    * - bytes
-      - RAW
-      - json_scalar(utl_raw.cast_to_raw('A raw value'))
-    * - list
-      - Array
-      - json_array(1, 2, 3 returning json)
-    * - dict
-      - Object
-      - json_object(key 'Fred' value json_scalar(5), key 'George' value json_scalar('A string') returning json)
-    * - n/a
-      - CLOB
-      - json_scalar(to_clob('A short CLOB'))
-    * - n/a
-      - BLOB
-      - json_scalar(to_blob(utl_raw.cast_to_raw('A short BLOB')))
-    * - n/a
-      - DATE
-      - json_scalar(to_date('2020-03-10', 'YYYY-MM-DD'))
-    * - :ref:`oracledb.IntervalYM <interval_ym>`
-      - INTERVAL YEAR TO MONTH
-      - json_scalar(to_yminterval('+5-9'))
-    * - datetime.timedelta
-      - INTERVAL DAY TO SECOND
-      - json_scalar(to_dsinterval('P25DT8H25M'))
-    * - n/a
-      - BINARY_DOUBLE
-      - json_scalar(to_binary_double(25))
-    * - n/a
-      - BINARY_FLOAT
-      - json_scalar(to_binary_float(15.5))
-
-An example of creating a CLOB attribute with key ``mydocument`` in a JSON column
-using SQL is:
-
-.. code-block:: python
-
-    cursor.execute("""
-        insert into mytab (
-            myjsoncol
-        ) values (
-            json_object(key 'mydocument' value json_scalar(to_clob(:b)) returning json)
-        )""",
-        ['A short CLOB'])
-
-When `mytab` is queried in python-oracledb, the CLOB data will be returned as a
-Python string, as shown by the following table.  Output might be like::
-
-    {mydocument: 'A short CLOB'}
-
-Query and OUT Bind Type Mapping
-===============================
-
-When getting Oracle Database 21 JSON values from the database, the following
-attribute mapping occurs:
-
-.. list-table-with-summary::
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 1 1
-    :align: left
-    :summary: The first column is the Database JSON Attribute Type or Value. The second column is the corresponding Python Type or Value mapped.
-
-
-    * - Database JSON Attribute Type or Value
-      - Python Type or Value
-    * - null
-      - None
-    * - false
-      - False
-    * - true
-      - True
-    * - NUMBER
-      - decimal.Decimal
-    * - VARCHAR2
-      - str
-    * - RAW
-      - bytes
-    * - CLOB
-      - str
-    * - BLOB
-      - bytes
-    * - DATE
-      - datetime.datetime
-    * - TIMESTAMP
-      - datetime.datetime
-    * - INTERVAL YEAR TO MONTH
-      - :ref:`oracledb.IntervalYM <interval_ym>`
-    * - INTERVAL DAY TO SECOND
-      - datetime.timedelta
-    * - BINARY_DOUBLE
-      - float
-    * - BINARY_FLOAT
-      - float
-    * - Arrays
-      - list
-    * - Objects
-      - dict
-
-SQL/JSON Path Expressions
-=========================
-
-Oracle Database provides SQL access to JSON data using SQL/JSON path
-expressions.  A path expression selects zero or more JSON values that match, or
-satisfy, it.  Path expressions can use wildcards and array ranges.  A simple
-path expression is ``$.friends`` which is the value of the JSON field
-``friends``.
-
-For example, the previously created CUSTOMERS table with JSON column
-JSON_DATA can be queried like:
-
-.. code-block:: sql
-
-    select c.json_data.location FROM customers c
-
-With the JSON ``'{"name":"Rod","dept":"Sales","location":"Germany"}'`` stored
-in the table, the queried value would be ``Germany``.
-
-The JSON_EXISTS functions tests for the existence of a particular value within
-some JSON data.  To look for JSON entries that have a ``location`` field:
-
-.. code-block:: python
-
-    import json
-
-    for blob, in cursor.execute("""
-        select
-            json_data
-        from
-            customers
-        where
-            json_exists(json_data,
-            '$.location')"""):
-        data = json.loads(blob.read())
-        print(data)
-
-This query might display::
-
-    {'name': 'Rod', 'dept': 'Sales', 'location': 'Germany'}
-
-The SQL/JSON functions ``JSON_VALUE`` and ``JSON_QUERY`` can also be used.
-
-Note that the default error-handling behavior for these functions is
-``NULL ON ERROR``, which means that no value is returned if an error occurs.
-To ensure that an error is raised, use ``ERROR ON ERROR``.
-
-For more information, see `SQL/JSON Path Expressions
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-2DC05D71-3D62-4A14-855F-76E054032494>`__
-in the Oracle JSON Developer's Guide.
-
-Accessing Relational Data as JSON
-=================================
-
-In Oracle Database 12.2 or later, the `JSON_OBJECT <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-1EF347AE-7FDA-4B41-AFE0-DD5A49E8B370>`__
-function is a great way to convert relational table data to JSON:
-
-.. code-block:: python
-
-    cursor.execute("""
-        select
-            json_object('deptId' is d.department_id,
-                        'name' is d.department_name) department
-        from
-            departments d
-        where
-            department_id < :did
-        order by
-            d.department_id""",
-            [50]);
-    for row in cursor:
-        print(row)
-
-This produces::
-
-    ('{"deptId":10,"name":"Administration"}',)
-    ('{"deptId":20,"name":"Marketing"}',)
-    ('{"deptId":30,"name":"Purchasing"}',)
-    ('{"deptId":40,"name":"Human Resources"}',)
-
-To select a result set from a relational query as a single object you can use
-`JSON_ARRAYAGG
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-6D56077D-78DE-4CC0-9498-225DDC42E054>`__,
-for example:
-
-.. code-block:: python
-
-    cursor.execute("""
-        select
-            json_arrayagg(
-                json_object('deptid' is d.department_id,
-                            'name' is d.department_name) returning clob)
-        from
-            departments d
-        where
-            department_id < :did""",
-       [50],
-       fetch_lobs=False)
-    j, = cursor.fetchone()
-    print(j)
-
-
-This produces::
-
-    [{"deptid":10,"name":"Administration"},{"deptid":20,"name":"Marketing"},{"deptid":30,"name":"Purchasing"},{"deptid":40,"name":"Human Resources"}]
-
-.. _jsondualityviews:
-
-JSON-Relational Duality Views
-=============================
-
-Oracle AI Database 26ai JSON-Relational Duality Views allow data to be
-stored as rows in tables to provide the benefits of the relational model and
-SQL access, while also allowing read and write access to data as JSON documents
-for application simplicity. See the `JSON-Relational Duality Developer's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=JSNVU>`__ for more
-information.
-
-For example, if the tables ``AuthorTab`` and ``BookTab`` exist::
-
-    create table AuthorTab (
-        AuthorId number generated by default on null as identity primary key,
-        AuthorName varchar2(100)
-    );
-
-    create table BookTab (
-        BookId number generated by default on null as identity primary key,
-        BookTitle varchar2(100),
-        AuthorId number references AuthorTab (AuthorId)
-    );
-
-Then a JSON Duality View over the tables could be created in SQL*Plus::
-
-    create or replace json relational duality view BookDV as
-    BookTab @insert @update @delete
-    {
-        _id: BookId,
-        book_title: BookTitle,
-        author: AuthorTab @insert @update
-        {
-            author_id: AuthorId,
-            author_name: AuthorName
-        }
-    };
-
-Applications can choose whether to use relational access to the underlying
-tables, or use the duality view.
-
-You can use SQL/JSON to query the view and return JSON. The query uses the
-special column DATA:
-
-.. code-block:: python
-
-    sql = """select b.data.book_title, b.data.author.author_name
-             from BookDV b
-             where b.data.author.author_id = :1"""
-    for r in cursor.execute(sql, [1]):
-        print(r)
-
-Inserting JSON into the view will update the base relational tables:
-
-.. code-block:: python
-
-    data = dict(_id=1000, book_title="My New Book",
-                author=dict(author_id=2000, author_name="John Doe"))
-    cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-    cursor.execute("insert into BookDV values (:1)", [data])
-
-See `json_duality.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/json_duality.py>`__
-for a runnable example.
-
-.. _sodadv:
-
-You can also access a duality view directly using :ref:`SODA <sodausermanual>`
-NoSQL-style document APIs by opening the view as if it were a SODA
-collection. For example, to run a query-by-example on book titles:
-
-.. code-block:: python
-
-    soda = connection.getSodaDatabase()
-    collection = soda.openCollection('BOOKDV')
-
-    qbe = {'book_title': {'$like': 'The%'}}
-    for doc in collection.find().filter(qbe).getDocuments():
-        content = doc.getContent()
-        print(content["book_title"])
-
-
-See `soda_json_duality.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/soda_json_duality.py>`__
-for a runnable example.
diff --git a/doc/src/user_guide/lob_data.rst b/doc/src/user_guide/lob_data.rst
deleted file mode 100644
index 658e888f..00000000
--- a/doc/src/user_guide/lob_data.rst
+++ /dev/null
@@ -1,312 +0,0 @@
-.. _lobdata:
-
-.. currentmodule:: oracledb
-
-***************************************
-Using CLOB, BLOB, NCLOB, and BFILE Data
-***************************************
-
-Oracle Database uses :ref:`LOB objects <lobobj>` to store large data such as
-text, images, videos, and other multimedia formats.  The maximum size of a LOB
-(large object) is limited to the size of the tablespace storing it.
-
-There are `four types of LOBs <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-0A692C1B-1C95-4121-8F95-25BE465B87F6>`__:
-
-    * CLOB - Character Large Object, used for storing strings in the database
-      character set format. python-oracledb uses the type
-      :attr:`oracledb.DB_TYPE_CLOB`.
-    * BLOB - Binary Large Object, used for storing binary data. python-oracledb
-      uses the type :attr:`oracledb.DB_TYPE_BLOB`.
-    * NCLOB - National Character Large Object, used for storing strings in the
-      national character set format. python-oracledb uses the type
-      :attr:`oracledb.DB_TYPE_NCLOB`.
-    * BFILE - External Binary File, used for referencing a file stored on the
-      host operating system outside of the database. python-oracledb uses the
-      type :attr:`oracledb.DB_TYPE_BFILE`.
-
-LOBs can be permanent or temporary. They can be inserted into, and fetched
-from, Oracle Database in chunks, as necessary.
-
-LOBs up to 1 GB in length can be also be handled directly as strings or bytes
-in python-oracledb.  This makes LOBs easy to work with, and has significant
-performance benefits over streaming.  However, it requires the entire LOB
-data to be present in Python memory, which may not be possible.
-
-See `GitHub <https://github.com/oracle/python-oracledb/tree/main/samples>`__
-for LOB examples.
-
-Simple Insertion of LOBs
-========================
-
-Consider a table with CLOB and BLOB columns:
-
-.. code-block:: sql
-
-    CREATE TABLE lob_tbl (
-        id NUMBER,
-        c CLOB,
-        b BLOB
-    );
-
-With python-oracledb, LOB data can be inserted in the table by binding strings
-or bytes as needed:
-
-.. code-block:: python
-
-    with open('example.txt', 'r') as f:
-        text_data = f.read()
-
-    with open('image.png', 'rb') as f:
-        img_data = f.read()
-
-    cursor.execute("""
-            insert into lob_tbl (id, c, b)
-            values (:lobid, :clobdata, :blobdata)""",
-            lobid=10, clobdata=text_data, blobdata=img_data)
-
-Note that with this approach, LOB data is limited to 1 GB in size.
-
-.. _directlobs:
-
-Fetching LOBs as Strings and Bytes
-==================================
-
-CLOBs and BLOBs smaller than 1 GB can queried from the database directly as
-strings and bytes.  This can be much faster than streaming a :ref:`LOB Object
-<lobobj>`.  Support is enabled by setting :attr:`oracledb.defaults.fetch_lobs
-<Defaults.fetch_lobs>`, or by setting the ``fetch_lobs`` parameter at statement
-execution:
-
-.. code-block:: python
-
-    import oracledb
-
-    . . .
-
-    id_val = 1
-    text_data = "The quick brown fox jumps over the lazy dog"
-    binary_data = b"Some binary data"
-    cursor.execute("insert into lob_tbl (id, c, b) values (:1, :2, :3)",
-                   [id_val, text_data, binary_data])
-
-    cursor.execute("select c, b from lob_tbl where id = :1", [id_val], fetch_lobs=False)
-    clob_data, blob_data = cursor.fetchone()
-    print("CLOB length:", len(clob_data))
-    print("CLOB data:", clob_data)
-    print("BLOB length:", len(blob_data))
-    print("BLOB data:", blob_data)
-
-This displays::
-
-    CLOB length: 43
-    CLOB data: The quick brown fox jumps over the lazy dog
-    BLOB length: 16
-    BLOB data: b'Some binary data'
-
-An older alternative to using ``fetch_lobs`` is to use a type handler:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(oracledb.DB_TYPE_LONG, arraysize=cursor.arraysize)
-        if metadata.type_code is oracledb.DB_TYPE_BLOB:
-            return cursor.var(oracledb.DB_TYPE_LONG_RAW, arraysize=cursor.arraysize)
-        if metadata.type_code is oracledb.DB_TYPE_NCLOB:
-            return cursor.var(oracledb.DB_TYPE_LONG_NVARCHAR, arraysize=cursor.arraysize)
-
-    connection.outputtypehandler = output_type_handler
-
-Streaming LOBs (Read)
-=====================
-
-Without setting :attr:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>` or
-equivalent execution parameter to *False*, or without using an output type
-handler, then the CLOB and BLOB values are fetched as :ref:`LOB
-objects<lobobj>`. The size of the LOB object can be obtained by calling
-:meth:`LOB.size()` and the data can be read by calling :meth:`LOB.read()`:
-
-.. code-block:: python
-
-    id_val = 1
-    text_data = "The quick brown fox jumps over the lazy dog"
-    binary_data = b"Some binary data"
-    cursor.execute("insert into lob_tbl (id, c, b) values (:1, :2, :3)",
-                   [id_val, text_data, binary_data])
-
-    cursor.execute("select b, c from lob_tbl where id = :1", [id_val])
-    b, c = cursor.fetchone()
-    print("CLOB length:", c.size())
-    print("CLOB data:", c.read())
-    print("BLOB length:", b.size())
-    print("BLOB data:", b.read())
-
-This approach produces the same results as the previous example but it will
-perform more slowly because it requires more :ref:`round-trips <roundtrips>` to
-Oracle Database and has higher overhead. It is needed, however, if the LOB data
-cannot be fetched as one block of data from the server.
-
-To stream the BLOB column, the :meth:`LOB.read()` method can be called
-repeatedly until all of the data has been read, as shown below:
-
-.. code-block:: python
-
-    cursor.execute("select b from lob_tbl where id = :1", [10])
-    blob, = cursor.fetchone()
-    offset = 1
-    num_bytes_in_chunk = 65536
-    with open("image.png", "wb") as f:
-        while True:
-            data = blob.read(offset, num_bytes_in_chunk)
-            if data:
-                f.write(data)
-            if len(data) < num_bytes_in_chunk:
-                break
-            offset += len(data)
-
-
-Streaming LOBs (Write)
-======================
-
-If a row containing a LOB is being inserted or updated, and the quantity of
-data that is to be inserted or updated cannot fit in a single block of data,
-the data can be streamed using the method :meth:`LOB.write()` instead as shown
-in the following code:
-
-.. code-block:: python
-
-    id_val = 9
-    lob_var = cursor.var(oracledb.DB_TYPE_BLOB)
-    cursor.execute("""
-            insert into lob_tbl (id, b)
-            values (:1, empty_blob())
-            returning b into :2""", [id_val, lob_var])
-    blob, = lobVar.getvalue()
-    offset = 1
-    num_bytes_in_chunk = 65536
-    with open("image.png", "rb") as f:
-        while True:
-            data = f.read(num_bytes_in_chunk)
-            if data:
-                blob.write(data, offset)
-            if len(data) < num_bytes_in_chunk:
-                break
-            offset += len(data)
-    connection.commit()
-
-Temporary LOBs
-==============
-
-All of the examples shown thus far have made use of permanent LOBs. These are
-LOBs that are stored in the database. Oracle also supports temporary LOBs that
-are not stored in the database but can be used to pass large quantities of
-data. These LOBs use space in the temporary tablespace until all variables
-referencing them go out of scope or the connection in which they are created is
-explicitly closed.
-
-When calling PL/SQL procedures with data that exceeds 32,767 bytes in length,
-python-oracledb automatically creates a temporary LOB internally and passes
-that value through to the procedure. If the data that is to be passed to the
-procedure exceeds that which can fit in a single block of data, however, you
-can use the method :meth:`Connection.createlob()` to create a temporary LOB.
-This LOB can then be read and written just like in the examples shown above for
-persistent LOBs.
-
-.. _bfiles:
-
-Using BFILEs
-============
-
-`BFILEs <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-D4642C92
--F343-4700-9F1F-486F82249FB8>`__ are objects stored in a directory in the
-Oracle Database server file system, not in the database. The database column of
-type BFILE stores a reference to this external binary file. Each BFILE column
-can reference a single external file. BFILEs are read-only data types and
-hence you cannot modify the file from within your application.
-
-Before using the BFILE data type, you must:
-
-- Create a `DIRECTORY <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-  F7440C27-C7F0-4874-8C3C-F3BC1534CBE0>`__ object which is an alias for the
-  full path to the directory containing BFILE data in the database server file
-  system. For example, you can create a DIRECTORY object by using:
-
-  .. code-block:: sql
-
-        create or replace directory my_bfile_dir as '/demo/bfiles'
-
-  In the above example, "my_bfile_dir" is the directory alias.
-  "/demo/bfiles" is the physical directory in the database server file
-  system that contains the files. It is a string containing the full path name
-  of the directory and follows the operating system rules.
-
-  To allow non-privileged users to access this directory, you can grant access
-  using:
-
-  .. code-block:: sql
-
-    grant read on directory my_bfile_dir to hr;
-
-  Ensure that the Oracle Server processes have read access to the directory.
-
-- Store the physical binary file in the directory in the database server file
-  system. For example, the binary file "my_bfile.txt" is stored in the
-  directory "/demo/bfiles".
-
-Consider the file, "/demo/bfiles/my_bfile.txt", exists on the server and
-contains the text, "This is my BFILE data". You can access the "my_bfile.txt"
-file as detailed below.
-
-The following table will be used in the subsequent examples.
-
-.. code-block:: sql
-
-    create table bfile_tbl(
-        id number,
-        bfile_data bfile
-    );
-
-**Inserting BFILEs**
-
-You must use the `BFILENAME <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-1F767077-7C26-4962-9833-1433F1749621>`__ function in an INSERT
-statement to associate a file and a BFILE column. The ``BFILENAME`` function
-takes two arguments, the directory alias and the file name. To insert a BFILE
-reference, for example:
-
-.. code-block:: python
-
-    cursor.execute("""
-        insert into bfile_tbl (id, bfile_data) values
-        (:id, bfilename(:bfiledir, :bfilename))""",
-        id=102, bfiledir="my_bfile_dir", bfilename="my_bfile.txt")
-
-    connection.commit()
-
-This inserts a reference to the file "my_bfile.txt" located in the directory
-referenced by the alias "my_bfile_dir" into the bfile_tbl table.
-
-**Fetching BFILEs**
-
-To query the bfile_tbl table and fetch the BFILE LOB locator, you can use
-the `BFILENAME <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-1F767077-7C26-4962-9833-1433F1749621>`__ function as shown below:
-
-.. code-block:: python
-
-    cursor.execute("select bfilename(:bfiledir, :bfilename) from bfile_tbl where id = :id",
-        id=102, bfiledir="my_bfile_dir", bfilename="my_bfile.txt")
-    bfile, = cursor.fetchone()
-    print(bfile.read())
-
-This will display::
-
-    This is my BFILE data
-
-This fetched LOB can use :meth:`LOB.fileexists()` to check if the file
-referenced by the BFILE type LOB exists.
-
-You can get the directory alias and file name of this fetched LOB by using
-:meth:`LOB.getfilename()`. Also, you can set the directory alias and file name
-for this fetched LOB by using :meth:`LOB.setfilename()`.
diff --git a/doc/src/user_guide/plsql_execution.rst b/doc/src/user_guide/plsql_execution.rst
deleted file mode 100644
index 897f7294..00000000
--- a/doc/src/user_guide/plsql_execution.rst
+++ /dev/null
@@ -1,570 +0,0 @@
-.. _plsqlexecution:
-
-.. currentmodule:: oracledb
-
-****************
-Executing PL/SQL
-****************
-
-PL/SQL is a procedural language used for creating user-defined procedures,
-functions, and anonymous blocks. PL/SQL program units are compiled and run
-inside Oracle Database, letting them efficiently work on data. Procedures and
-functions can be stored in the database, encapsulating business logic for reuse
-in other applications.
-
-PL/SQL code can be stored in the database, and executed using python-oracledb.
-
-Examples in this chapter show single invocations using
-:meth:`Cursor.callproc()`, :meth:`Cursor.callfunc()`, or
-:meth:`Cursor.execute()`. Examples of repeated calls using
-:meth:`Cursor.executemany()` are shown in :ref:`batchplsql`.
-
-**User-defined procedures in JavaScript**
-
-You may also be interested in creating user-defined procedures in JavaScript
-instead of PL/SQL, see `Introduction to Oracle Database Multilingual Engine for
-JavaScript <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-6AEC4D40-BE51-4DC6-9B8E-22396B5B16DD>`__. These procedures can be invoked in
-python-oracledb the same way PL/SQL is.
-
-.. _plsqlproc:
-
-PL/SQL Stored Procedures
-------------------------
-
-The :meth:`Cursor.callproc()` method is used to call PL/SQL procedures.
-
-If a procedure with the following definition exists:
-
-.. code-block:: sql
-
-    create or replace procedure myproc (
-        a_Value1                            number,
-        a_Value2                            out number
-    ) as
-    begin
-        a_Value2 := a_Value1 * 2;
-    end;
-
-then the following Python code can be used to call it:
-
-.. code-block:: python
-
-    out_val = cursor.var(int)
-    cursor.callproc('myproc', [123, out_val])
-    print(out_val.getvalue())        # will print 246
-
-Calling :meth:`Cursor.callproc()` internally generates an :ref:`anonymous PL/SQL
-block <anonplsql>` and executes it.  This is equivalent to the application code:
-
-.. code-block:: python
-
-    cursor.execute("begin myproc(:1,:2); end;", [123, out_val])
-
-See :ref:`bind` for information on binding.
-
-
-.. _plsqlfunc:
-
-PL/SQL Stored Functions
------------------------
-
-The :meth:`Cursor.callfunc()` method is used to call PL/SQL functions.
-
-The first parameter to :meth:`~Cursor.callfunc()` is the function name. The
-second parameter represents the PL/SQL function return value and is expected to
-be a Python type, one of the :ref:`oracledb types <types>` or an :ref:`Object
-Type <dbobjecttype>`. Any following sequence of values or named parameters are
-passed as PL/SQL function arguments.
-
-If a PL/SQL function with the following definition exists:
-
-.. code-block:: sql
-
-    create or replace function myfunc (
-        a_StrVal varchar2,
-        a_NumVal number,
-        a_Date out date
-    ) return number as
-    begin
-        select sysdate into a_Date from dual;
-        return length(a_StrVal) + a_NumVal * 2;
-    end;
-
-then the following Python code can be used to call it:
-
-.. code-block:: python
-
-    d = cursor.var(oracledb.DB_TYPE_DATE)   # for the a_Date OUT parameter
-    return_val = cursor.callfunc("myfunc", int, ["a string", 15, d])
-    print(return_val)        # prints 38
-    print(d.getvalue())      # like 2024-12-04 22:35:23
-
-A more complex example that returns a spatial (SDO) object can be seen below.
-First, the SQL statements necessary to set up the example:
-
-.. code-block:: sql
-
-    create table MyPoints (
-        id number(9) not null,
-        point sdo_point_type not null
-    );
-
-    insert into MyPoints values (1, sdo_point_type(125, 375, 0));
-
-    create or replace function spatial_queryfn (
-        a_Id     number
-    ) return sdo_point_type is
-        t_Result sdo_point_type;
-    begin
-        select point
-        into t_Result
-        from MyPoints
-        where Id = a_Id;
-
-        return t_Result;
-    end;
-    /
-
-The Python code that will call this procedure looks as follows:
-
-.. code-block:: python
-
-    obj_type = connection.gettype("SDO_POINT_TYPE")
-    cursor = connection.cursor()
-    return_val = cursor.callfunc("spatial_queryfn", obj_type, [1])
-    print(f"({return_val.X}, {return_val.Y}, {return_val.Z})")
-    # will print (125, 375, 0)
-
-See :ref:`bind` for information on binding.
-
-
-.. _anonplsql:
-
-Anonymous PL/SQL Blocks
------------------------
-
-An `anonymous PL/SQL block <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-826B070B-4888-4398-889B-61A3C6B91349>`__ can be called as
-shown:
-
-.. code-block:: python
-
-    var = cursor.var(int)
-    cursor.execute("""
-            begin
-                :out_val := length(:in_val);
-            end;""", in_val="A sample string", out_val=var)
-    print(var.getvalue())        # will print 15
-
-See :ref:`bind` for information on binding.
-
-
-.. _plsqlnull:
-
-Passing NULL values to PL/SQL
------------------------------
-
-Oracle Database requires a type, even for null values. When you pass the value
-None, then python-oracledb assumes its type is a string. If this is not the
-desired type, you can explicitly set it.  For example, to pass a NULL
-:ref:`Oracle Spatial SDO_GEOMETRY <spatial>` object to a PL/SQL stored
-procedure with the signature::
-
-    procedure myproc(p in sdo_geometry)
-
-You can use:
-
-.. code-block:: python
-
-    type_obj = connection.gettype("SDO_GEOMETRY")
-    var = cursor.var(type_obj)
-    cursor.callproc("myproc", [var])
-
-
-Creating Stored Procedures and Packages
----------------------------------------
-
-To create PL/SQL stored procedures and packages, use :meth:`Cursor.execute()`
-with a CREATE command. For example:
-
-.. code-block:: python
-
-    cursor.execute("""
-            create or replace procedure myprocedure
-            (p_in in number, p_out out number) as
-            begin
-                p_out := p_in * 2;
-            end;""")
-
-.. _plsqlwarning:
-
-PL/SQL Compilation Warnings
-+++++++++++++++++++++++++++
-
-When creating PL/SQL procedures, functions, or types in python-oracledb, the
-statement might succeed without throwing an error but there may be additional
-informational messages. These messages are sometimes known in Oracle as
-"success with info" messages. If your application needs to show such messages,
-they must be explicitly looked for using :attr:`Cursor.warning`. A subsequent
-query from a table like ``USER_ERRORS`` will show more details. For example:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-
-        cursor.execute("""
-                create or replace procedure badproc as
-                begin
-                    WRONG WRONG WRONG
-                end;""")
-
-        if cursor.warning and cursor.warning.full_code == "DPY-7000":
-            print(cursor.warning)
-
-            # Get details
-            cursor.execute("""
-                    select line, position, text
-                    from user_errors
-                    where name = 'BADPROC' and type = 'PROCEDURE'
-                    order by line, position""")
-            for info in cursor:
-                print("Error at line {} position {}:\n{}".format(*info))
-
-The output would be::
-
-    DPY-7000: creation succeeded with compilation errors
-    Error at line 3 position 23:
-    PLS-00103: Encountered the symbol "WRONG" when expecting one of the following:
-
-       := . ( @ % ;
-
-
-Using the %ROWTYPE Attribute
-----------------------------
-
-In PL/SQL, the `%ROWTYPE attribute
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-4E0B9FE2-909D-444A-9B4A-E0243B7FCB99>`__
-lets you declare a record that represents either a full or partial row of a
-database table or view.
-
-To work with %ROWTYPE in python-oracledb, use :meth:`Connection.gettype()` to
-get the relevant attribute type information.
-
-**Getting a %ROWTYPE value from PL/SQL**
-
-Given a PL/SQL function that returns a row of the LOCATIONS table:
-
-.. code-block:: sql
-
-    create or replace function TestFuncOUT return locations%rowtype as
-      p locations%rowtype;
-    begin
-       select * into p from locations where rownum < 2;
-       return p;
-    end;
-    /
-
-You can use :meth:`~Connection.gettype()` to get the type of the PL/SQL
-function return value, and specify this as the :meth:`~Cursor.callfunc()`
-return type.  For example:
-
-.. code-block:: python
-
-    rt = connection.gettype("LOCATIONS%ROWTYPE")
-    r = cursor.callfunc("TESTFUNCOUT", rt)
-
-The variable ``r`` will contain the return value of the PL/SQL function as an
-:ref:`Object Type <dbobjecttype>`. You can access its contents using the
-methods discussed in :ref:`Fetching Oracle Database Objects and Collections
-<fetchobjects>`.  The helper function ``dump_object()`` defined there is a
-convenient example:
-
-.. code-block:: python
-
-    dump_object(r)
-
-Output will be::
-
-    {
-      LOCATION_ID: 1000
-      STREET_ADDRESS: '1297 Via Cola di Rie'
-      POSTAL_CODE: '00989'
-      CITY: 'Roma'
-      STATE_PROVINCE: None
-      COUNTRY_ID: 'IT'
-    }
-
-
-**Constructing a %ROWTYPE value in python-oracledb**
-
-You can construct a similar object directly in python-oracledb by using
-:meth:`DbObjectType.newobject()` and setting any desired fields.  For example:
-
-.. code-block:: python
-
-    rt = connection.gettype("LOCATIONS%ROWTYPE")
-    r = rt.newobject()
-    r.CITY = 'Roma'
-
-**Passing a %ROWTYPE value into PL/SQL**
-
-Given the PL/SQL procedure:
-
-.. code-block:: sql
-
-    create or replace procedure TestProcIN(p in locations%rowtype, city out varchar2) as
-    begin
-        city := p.city;
-    end;
-
-you can call :meth:`~Cursor.callproc()` passing the variable ``r`` from the
-previous :meth:`~Cursor.callfunc()` or :meth:`~DbObjectType.newobject()`
-examples in the appropriate parameter position, for example:
-
-.. code-block:: python
-
-    c = cursor.var(oracledb.DB_TYPE_VARCHAR)
-    cursor.callproc("TESTPROCIN", [r, c])
-    print(c.getvalue())
-
-This prints::
-
-    Roma
-
-
-See `plsql_rowtype.py
-<https://github.com/oracle/python-oracledb/tree/main/samples/plsql_rowtype.py>`__
-for a runnable example.
-
-
-Using DBMS_OUTPUT
------------------
-
-The standard way to print output from PL/SQL is with the package `DBMS_OUTPUT
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-C1400094-18D5-4F36-A2C9-D28B0E12FD8C>`__.  Note, PL/SQL code that uses
-``DBMS_OUTPUT`` runs to completion before any output is available to the user.
-Also, other database connections cannot access the buffer.
-
-To use DBMS_OUTPUT:
-
-* Call the PL/SQL procedure ``DBMS_OUTPUT.ENABLE()`` to enable output to be
-  buffered for the connection.
-* Execute some PL/SQL that calls ``DBMS_OUTPUT.PUT_LINE()`` to put text in the
-  buffer.
-* Call ``DBMS_OUTPUT.GET_LINE()`` or ``DBMS_OUTPUT.GET_LINES()`` repeatedly to
-  fetch the text from the buffer until there is no more output.
-
-
-For example:
-
-.. code-block:: python
-
-    # enable DBMS_OUTPUT
-    cursor.callproc("dbms_output.enable")
-
-    # execute some PL/SQL that calls DBMS_OUTPUT.PUT_LINE
-    cursor.execute("""
-            begin
-                dbms_output.put_line('This is the python-oracledb manual');
-                dbms_output.put_line('Demonstrating how to use DBMS_OUTPUT');
-            end;""")
-
-    # tune this size for your application
-    chunk_size = 100
-
-    # create variables to hold the output
-    lines_var = cursor.arrayvar(str, chunk_size)
-    num_lines_var = cursor.var(int)
-    num_lines_var.setvalue(0, chunk_size)
-
-    # fetch the text that was added by PL/SQL
-    while True:
-        cursor.callproc("dbms_output.get_lines", (lines_var, num_lines_var))
-        num_lines = num_lines_var.getvalue()
-        lines = lines_var.getvalue()[:num_lines]
-        for line in lines:
-            print(line or "")
-        if num_lines < chunk_size:
-            break
-
-This will produce the following output::
-
-    This is the python-oracledb manual
-    Demonstrating use of DBMS_OUTPUT
-
-An alternative is to call ``DBMS_OUTPUT.GET_LINE()`` once per output line,
-which may be much slower:
-
-.. code-block:: python
-
-    text_var = cursor.var(str)
-    status_var = cursor.var(int)
-    while True:
-        cursor.callproc("dbms_output.get_line", (text_var, status_var))
-        if status_var.getvalue() != 0:
-            break
-        print(text_var.getvalue())
-
-.. _implicitresults:
-
-Implicit Results
-----------------
-
-Implicit results permit a Python program to consume cursors returned by a
-PL/SQL block without the requirement to use OUT :ref:`REF CURSOR <refcur>`
-parameters. The method :meth:`Cursor.getimplicitresults()` can be used for this
-purpose. It needs Oracle Database 12.1 (or later). For python-oracledb
-:ref:`Thick <enablingthick>` mode, Oracle Client 12.1 (or later) is
-additionally required.
-
-An example using implicit results is as shown:
-
-.. code-block:: python
-
-    cursor.execute("""
-            declare
-                cust_cur sys_refcursor;
-                sales_cur sys_refcursor;
-            begin
-                open cust_cur for SELECT * FROM cust_table;
-                dbms_sql.return_result(cust_cur);
-
-                open sales_cur for SELECT * FROM sales_table;
-                dbms_sql.return_result(sales_cur);
-            end;""")
-
-    for implicit_cursor in cursor.getimplicitresults():
-        for row in implicit_cursor:
-            print(row)
-
-Data from both the result sets are returned::
-
-    (1, 'Tom')
-    (2, 'Julia')
-    (1000, 1, 'BOOKS')
-    (2000, 2, 'FURNITURE')
-
-When using python-oracledb Thick mode, you must leave the parent cursor open
-until all of the implicit result sets have been fetched or until your
-application no longer requires them. Closing the parent cursor before
-fetching all of the implicit result sets will result in the closure of the
-implicit result set cursors. If you try to fetch from an implicit result set
-after its parent cursor is closed, the following error will be thrown::
-
-    DPI-1039: statement was already closed
-
-Note that the requirement mentioned above is not applicable for
-python-oracledb Thin mode. See :ref:`implicitresultsdiff`.
-
-.. _ebr:
-
-Edition-Based Redefinition (EBR)
---------------------------------
-
-Oracle Database's `Edition-Based Redefinition <https://www.oracle.com/pls/topic
-/lookup?ctx=dblatest&id=GUID-58DE05A0-5DEF-4791-8FA8-F04D11964906>`__ feature
-enables upgrading of the database component of an application while it is in
-use, thereby minimizing or eliminating down time. This feature allows multiple
-versions of views, synonyms, PL/SQL objects and SQL Translation profiles to be
-used concurrently. Different versions of the database objects are associated
-with an "edition".
-
-The simplest way to set the edition used by your applications is to pass the
-``edition`` parameter to :meth:`oracledb.connect()` or
-:meth:`oracledb.create_pool()`:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                   dsn="dbhost.example.com/orclpdb",
-                                   edition="newsales")
-
-
-The edition can also be set by executing the SQL statement:
-
-.. code-block:: sql
-
-    alter session set edition = <edition name>;
-
-You can also set the environment variable ``ORA_EDITION`` to your edition name.
-
-Regardless of which method sets the edition, the value that is in use can be
-seen by examining the attribute :attr:`Connection.edition`. If no value has
-been set, the value will be None. This corresponds to the database default
-edition ``ORA$BASE``.
-
-Consider an example where one version of a PL/SQL function ``Discount`` is
-defined in the database default edition ``ORA$BASE`` and the other version of
-the same function is defined in a user created edition ``DEMO``.  In your SQL
-editor run:
-
-.. code-block:: sql
-
-    connect <username>/<password>
-
-    -- create function using the database default edition
-    CREATE OR REPLACE FUNCTION Discount(price IN NUMBER) RETURN NUMBER IS
-    BEGIN
-        return price * 0.9;
-    END;
-    /
-
-A new edition named 'DEMO' is created and the user given permission to use
-editions. The use of ``FORCE`` is required if the user already contains one or
-more objects whose type is editionable and that also have non-editioned
-dependent objects.
-
-.. code-block:: sql
-
-    connect system/<password>
-
-    CREATE EDITION demo;
-    ALTER USER <username> ENABLE EDITIONS FORCE;
-    GRANT USE ON EDITION demo to <username>;
-
-The ``Discount`` function for the demo edition is as follows:
-
-.. code-block:: sql
-
-    connect <username>/<password>
-
-    alter session set edition = demo;
-
-    -- Function for the demo edition
-    CREATE OR REPLACE FUNCTION Discount(price IN NUMBER) RETURN NUMBER IS
-    BEGIN
-        return price * 0.5;
-    END;
-    /
-
-A Python application can then call the required version of the PL/SQL function
-as shown:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user=user, password=password,
-                                   dsn="dbhost.example.com/orclpdb")
-    print("Edition is:", repr(connection.edition))
-
-    cursor = connection.cursor()
-    discounted_price = cursor.callfunc("Discount", int, [100])
-    print("Price after discount is:", discounted_price)
-
-    # Use the edition parameter for the connection
-    connection = oracledb.connect(user=user, password=password,
-                                   dsn="dbhost.example.com/orclpdb",
-                                   edition="demo")
-    print("Edition is:", repr(connection.edition))
-
-    cursor = connection.cursor()
-    discounted_price = cursor.callfunc("Discount", int, [100])
-    print("Price after discount is:", discounted_price)
-
-The output of the function call for the default and demo edition is as shown::
-
-    Edition is: None
-    Price after discount is:  90
-    Edition is: 'DEMO'
-    Price after discount is:  50
diff --git a/doc/src/user_guide/soda.rst b/doc/src/user_guide/soda.rst
deleted file mode 100644
index b7c6ba47..00000000
--- a/doc/src/user_guide/soda.rst
+++ /dev/null
@@ -1,219 +0,0 @@
-.. _sodausermanual:
-
-.. currentmodule:: oracledb
-
-*************************************************
-Working with Simple Oracle Document Access (SODA)
-*************************************************
-
-Oracle Database Simple Oracle Document Access (SODA) allows documents to be
-inserted, queried, and retrieved from Oracle Database using a set of
-NoSQL-style python-oracledb methods. Documents are generally JSON data, but
-they can be any data at all (including video, images, sounds, or other binary
-content).  Documents can be fetched from the database by key lookup or by using
-query-by-example (QBE) pattern-matching. You can also use SODA APIs to access
-existing :ref:`JSON-Relational Duality Views <jsondualityviews>`.
-
-.. note::
-
-    SODA is only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick`.
-
-SODA uses a SQL schema to store documents, but you do not need to know SQL or
-how the documents are stored. However, access through SQL does allow use of
-advanced Oracle Database functionality such as analytics for reporting.
-
-Oracle SODA implementations are also available in `Node.js
-<https://oracle.github.io/node-oracledb/doc/api.html#sodaoverview>`__,
-`Java <https://docs.oracle.com/en/database/oracle/simple-oracle-document-access
-/java/adsda/index.html>`__, `PL/SQL <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=ADSDP>`__, `Oracle Call Interface <https://www.oracle.com/pls/
-topic/lookup?ctx=dblatest&id=GUID-23206C89-891E-43D7-827C-5C6367AD62FD>`__, and
-through `REST <https://docs.oracle.com/en/database/oracle/simple-oracle-
-document-access/rest/index.html>`__.
-
-For general information on SODA, see the `SODA home page
-<https://docs.oracle.com/en/database/oracle/simple-oracle-document-access/
-index.html>`__ and the Oracle Database `Introduction to Simple Oracle Document
-Access (SODA) <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-ADSDI>`__ manual.
-
-For specific requirements, see the python-oracledb :ref:`SODA requirements
-<sodarequirements>`.
-
-Python-oracledb uses the following objects for SODA:
-
-* :ref:`SODA Database Object <sodadb>`: The top-level object for
-  python-oracledb SODA operations. This is acquired from an Oracle Database
-  connection.  A 'SODA database' is an abstraction, allowing access to SODA
-  collections in that 'SODA database', which then allow access to documents in
-  those collections.  A SODA database is analogous to an Oracle Database
-  user or schema, a collection is analogous to a table, and a document is
-  analogous to a table row with one column for a unique document key, a column
-  for the document content, and other columns for various document attributes.
-
-* :ref:`SODA Collection Object <sodacoll>`: Represents a collection of SODA
-  documents.  By default, collections allow JSON documents to be stored.  This
-  is recommended for most SODA users.  However, optional metadata can set
-  various details about a collection, such as its database storage, whether it
-  should track version and time stamp document components, how such components
-  are generated, and what document types are supported. By default, the name of
-  the Oracle Database table storing a collection is the same as the collection
-  name. Note: do not use SQL to drop the database table, since SODA metadata
-  will not be correctly removed.  Use the :meth:`SodaCollection.drop()` method
-  instead.
-
-* :ref:`SODA Document Object <sodadoc>`: Represents a document.  Typically the
-  document content will be JSON.  The document has properties including the
-  content, a key, timestamps, and the media type.  By default, document keys
-  are automatically generated.  See :ref:`SODA Document objects <sodadoc>` for
-  the forms of SodaDoc.
-
-* :ref:`SODA Document Cursor <sodadoccur>`: A cursor object representing the
-  result of the :meth:`SodaOperation.getCursor()` method from a
-  :meth:`SodaCollection.find()` operation.  It can be iterated over to access
-  each SodaDoc.
-
-* :ref:`SODA Operation Object <sodaop>`: An internal object used with
-  :meth:`SodaCollection.find()` to perform read and write operations on
-  documents.  Chained methods set properties on a SodaOperation object which is
-  then used by a terminal method to find, count, replace, or remove documents.
-  This is an internal object that should not be directly accessed.
-
-
-SODA Examples
-=============
-
-Creating and adding documents to a collection can be done as follows:
-
-.. code-block:: python
-
-    soda = connection.getSodaDatabase()
-
-    # create a new SODA collection; this will open an existing collection, if
-    # the name is already in use
-    collection = soda.createCollection("mycollection")
-
-    # insert a document into the collection; for the common case of a JSON
-    # document, the content can be a simple Python dictionary which will
-    # internally be converted to a JSON document
-    content = {'name': 'Matilda', 'address': {'city': 'Melbourne'}}
-    returned_doc = collection.insertOneAndGet(content)
-    key = returned_doc.key
-    print('The key of the new SODA document is: ', key)
-
-By default, a system generated key is created when documents are inserted.
-With a known key, you can retrieve a document:
-
-.. code-block:: python
-
-    # this will return a dictionary (as was inserted in the previous code)
-    content = collection.find().key(key).getOne().getContent()
-    print(content)
-
-You can also search for documents using query-by-example syntax:
-
-.. code-block:: python
-
-    # Find all documents with names like 'Ma%'
-    print("Names matching 'Ma%'")
-    qbe = {'name': {'$like': 'Ma%'}}
-    for doc in collection.find().filter(qbe).getDocuments():
-        content = doc.getContent()
-        print(content["name"])
-
-See the `samples directory
-<https://github.com/oracle/python-oracledb/tree/main/samples>`__
-for runnable SODA examples.
-
-
-.. _sodametadatacache:
-
-Using the SODA Metadata Cache
-=============================
-
-SODA metadata can be cached to improve the performance of
-:meth:`SodaDatabase.createCollection()` and
-:meth:`SodaDatabase.openCollection()` by reducing :ref:`round-trips
-<roundtrips>` to the database. Caching is available with Oracle Client 21.3 (or
-later). The feature is also available in Oracle Client 19 from 19.11 onwards.
-
-The metadata cache can be turned on when creating a connection pool with
-:meth:`oracledb.create_pool()`. Each pool has its own cache:
-
-.. code-block:: python
-
-    # Create the connection pool
-    pool = oracledb.create_pool(user="hr", password=userpwd,
-                                 dsn="dbhost.example.com/orclpdb",
-                                 soda_metadata_cache=True)
-
-The cache is not available for standalone connections. Applications using these
-should retain and reuse the :ref:`collection <sodacoll>` returned from
-``createCollection()`` or ``openCollection()`` wherever possible, instead of
-making repeated calls to those methods.
-
-The cache is not used by ``createCollection()`` when explicitly passing
-metadata. In this case, instead of using only ``createCollection()`` and
-relying on its behavior of opening an existing collection like:
-
-.. code-block:: python
-
-    mymetadata = { . . . }
-
-    # open an existing collection, or create a new collection
-    collection = soda.createCollection("mycollection", mymetadata)
-
-    collection.insertOne(mycontent)
-
-you will find it more efficient to use logic similar to:
-
-.. code-block:: python
-
-    collection = soda.openCollection("mycollection")
-    if collection is None:
-        mymetadata = { . . . }
-        collection = soda.createCollection("mycollection", mymetadata)
-    collection.insertOne(mycontent)
-
-If collection metadata changes are made externally, the cache can become
-invalid. If this happens, the cache can be cleared by calling
-:meth:`ConnectionPool.reconfigure()` with ``soda_metadata_cache`` set to False,
-or by setting the attribute :attr:`ConnectionPool.soda_metadata_cache` to False.
-Use a second call to ``reconfigure()`` or set ``soda_metadata_cache`` to
-re-enable the cache.
-
-Committing SODA Work
-====================
-
-The general recommendation for SODA applications is to turn on
-:attr:`~Connection.autocommit` globally:
-
-.. code-block:: python
-
-    connection.autocommit = True
-
-If your SODA document write operations are mostly independent of each other,
-this removes the overhead of application transaction management and the need for
-explicit :meth:`Connection.commit()` calls.
-
-When deciding how to commit transactions, beware of transactional consistency
-and performance requirements.  If you are using individual SODA calls to insert
-or update a large number of documents with individual calls, you should turn
-:attr:`~Connection.autocommit` off and issue a single, explicit
-:meth:`~Connection.commit()` after all documents have been processed.  Also
-consider using :meth:`SodaCollection.insertMany()` or
-:meth:`SodaCollection.insertManyAndGet()` which have performance benefits.
-
-If you are not autocommitting, and one of the SODA operations in your
-transaction fails, then previous uncommitted operations will not be rolled back.
-Your application should explicitly roll back the transaction with
-:meth:`Connection.rollback()` to prevent any later commits from committing a
-partial transaction.
-
-Note:
-
-- SODA DDL operations do not commit an open transaction the way that SQL always does for DDL statements.
-- When :attr:`~Connection.autocommit` is True, most SODA methods will issue a commit before successful return.
-- SODA provides optimistic locking. See :meth:`SodaOperation.version()`.
-- When mixing SODA and relational access, any commit or rollback on the connection will affect all work.
diff --git a/doc/src/user_guide/sql_execution.rst b/doc/src/user_guide/sql_execution.rst
deleted file mode 100644
index c5b9eca7..00000000
--- a/doc/src/user_guide/sql_execution.rst
+++ /dev/null
@@ -1,1159 +0,0 @@
-.. _sqlexecution:
-
-.. currentmodule:: oracledb
-
-*************
-Executing SQL
-*************
-
-Executing SQL statements is the primary way in which a Python application
-communicates with Oracle Database. Statements include queries, Data
-Manipulation Language (DML), and Data Definition Language (DDL).  A few other
-`specialty statements <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-E1749EF5-2264-44DF-99EF-AEBEB943BED6>`__ can also be
-executed. Statements are executed using one of these methods
-:meth:`Cursor.execute()`, :meth:`Cursor.executemany()`,
-:meth:`Connection.fetch_df_all()`, :meth:`Connection.fetch_df_batches()`,
-:meth:`AsyncCursor.execute()`, :meth:`AsyncCursor.executemany()`,
-:meth:`AsyncConnection.execute()`, :meth:`AsyncConnection.executemany()`,
-:meth:`AsyncConnection.fetch_df_all()`,
-:meth:`AsyncConnection.fetch_df_batches()`, or
-:meth:`AsyncConnection.run_pipeline()`.
-
-This chapter discusses python-oracledb's synchronous methods. The asynchronous
-methods and pipelining functionality are discussed in detail in :ref:`asyncio`.
-
-PL/SQL statements are discussed in :ref:`plsqlexecution`. The following
-chapters contain information on specific data types and features:
-
-- :ref:`batchstmnt`
-- :ref:`pipelining`
-- :ref:`lobdata`
-- :ref:`jsondatatype`
--  :ref:`xmldatatype`
-
-To help you create SQL and PL/SQL statements, Oracle hosts `FreeSQL.com
-<https://freesql.com/>`__ which gives you an online editor immediately
-connected to a database. It also has tutorials and a library of statements.
-
-**Executing SQL Scripts**
-
-Python-oracledb can be used to execute individual statements, one at a time.
-Once a statement has finished execution, only then will the next statement
-execute. If you try to execute statements concurrently in a single connection,
-the statements are queued and run consecutively in the order they are executed
-in the application code. This includes :ref:`Pipelined statements
-<pipelining>`.
-
-Python-oracledb does not read SQL*Plus ".sql" files.  To read SQL files, use a
-technique like the one in ``run_sql_script()`` in `samples/sample_env.py
-<https://github.com/oracle/python-oracledb/blob/main/samples/sample_env.py>`__.
-
-**SQL Statement Syntax**
-
-SQL statements executed in python-oracledb should not contain a trailing
-semicolon (";") or forward slash ("/"). This will fail:
-
-.. code-block:: python
-
-    cursor.execute("select * from MyTable;")   # fails due to semicolon
-
-This is correct:
-
-.. code-block:: python
-
-    cursor.execute("select * from MyTable")
-
-.. IMPORTANT::
-
-    Interpolating or concatenating user data with SQL statements, for example
-    ``cursor.execute("SELECT * FROM mytab WHERE mycol = '" + myvar + "'")`` is
-    a security risk and impacts performance.  Use :ref:`bind variables <bind>`
-    instead, for example ``cursor.execute("SELECT * FROM mytab WHERE mycol =
-    :mybv", mybv=myvar)``.
-
-
-SQL Queries
-===========
-
-Queries (statements beginning with SELECT or WITH) can be executed using the
-method :meth:`Cursor.execute()`.  Rows can then be iterated over, or can be
-fetched using one of the methods :meth:`Cursor.fetchone()`,
-:meth:`Cursor.fetchmany()` or :meth:`Cursor.fetchall()`. This lets you handle
-rows directly or stream them if needed. There is a :ref:`default type mapping
-<defaultfetchtypes>` to Python types that can be optionally :ref:`overridden
-<outputtypehandlers>`.
-
-.. _fetching:
-
-Fetch Methods
--------------
-
-Rows can be fetched in various ways.
-
-- After :meth:`Cursor.execute()`, the cursor is returned as a convenience. This
-  allows code to iterate over rows like:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-      for row in cursor.execute("select * from MyTable"):
-          print(row)
-
-- Rows can also be fetched one at a time using the method
-  :meth:`Cursor.fetchone()`:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-      cursor.execute("select * from MyTable")
-      while True:
-          row = cursor.fetchone()
-          if row is None:
-              break
-          print(row)
-
-- If rows need to be streamed or processed in batches, the method
-  :meth:`Cursor.fetchmany()` can be used. The size of the batch is controlled
-  by the ``size`` parameter, which defaults to the value of
-  :attr:`Cursor.arraysize`.
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-      cursor.execute("select * from MyTable")
-      num_rows = 10
-      while True:
-          rows = cursor.fetchmany(size=num_rows)
-          if not rows:
-              break
-          for row in rows:
-              print(row)
-
-  Note the ``size`` parameter only affects the number of rows returned to the
-  application, not to the internal buffer size used for tuning fetch
-  performance. That internal buffer size is controlled only by changing
-  :attr:`Cursor.arraysize` or :attr:`oracledb.defaults.arraysize
-  <Defaults.arraysize>`, see :ref:`tuningfetch`.
-
-- If all of the rows need to be fetched and can be contained in memory, the
-  method :meth:`Cursor.fetchall()` can be used.
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-      cursor.execute("select * from MyTable")
-      rows = cursor.fetchall()
-      for row in rows:
-          print(row)
-
-  The fetch methods return data as tuples.  To return results as dictionaries, see
-  :ref:`rowfactories`.
-
-- Data can also be fetched in data frame format, see :ref:`dataframeformat`.
-
-Closing Cursors
----------------
-
-Once cursors are no longer needed, they should be closed in order to reclaim
-resources in the database.  Note cursors may be used to execute multiple
-statements before being closed.
-
-Cursors can be closed in various ways:
-
-- A cursor will be closed automatically when the variable referencing it goes
-  out of scope (and no further references are retained). A ``with`` context
-  manager block is a convenient and preferred way to ensure this. For example:
-
-  .. code-block:: python
-
-      with connection.cursor() as cursor:
-          for row in cursor.execute("select * from MyTable"):
-              print(row)
-
-  This code ensures that once the block is completed, the cursor is closed and
-  database resources can be reclaimed. In addition, any attempt to use the
-  variable ``cursor`` outside of the block will fail.
-
-- Cursors can be explicitly closed by calling :meth:`Cursor.close()`:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-
-      ...
-
-      cursor.close()
-
-
-.. _querymetadata:
-
-Query Column Metadata
----------------------
-
-After executing a query, the column metadata such as column names and data types
-can be obtained using :attr:`Cursor.description`:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-        cursor.execute("select * from MyTable")
-        for column in cursor.description:
-            print(column)
-
-This could result in metadata like::
-
-    ('ID', <class 'oracledb.DB_TYPE_NUMBER'>, 39, None, 38, 0, 0)
-    ('NAME', <class 'oracledb.DB_TYPE_VARCHAR'>, 20, 20, None, None, 1)
-
-To extract the column names from a query you can use code like:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-        cursor.execute("select * from locations")
-        columns = [col.name for col in cursor.description]
-        print(columns)
-        for r in cursor:
-            print(r)
-
-This will print::
-
-    ['LOCATION_ID', 'STREET_ADDRESS', 'POSTAL_CODE', 'CITY', 'STATE_PROVINCE', 'COUNTRY_ID']
-    (1000, '1297 Via Cola di Rie', '00989', 'Roma', None, 'IT')
-    (1100, '93091 Calle della Testa', '10934', 'Venice', None, 'IT')
-    . . .
-
-**Changing Column Names to Lowercase**
-
-To change all column names to lowercase you could do:
-
-.. code-block:: python
-
-    cursor.execute("select * from locations where location_id = 1000")
-
-    columns = [col.name.lower() for col in cursor.description]
-    print(columns)
-
-The output is::
-
-    ['location_id', 'street_address', 'postal_code', 'city', 'state_province',
-    'country_id']
-
-.. _defaultfetchtypes:
-
-Fetch Data Types
-----------------
-
-The following table provides a list of all of the data types that python-oracledb
-knows how to fetch. The middle column gives the type that is returned in the
-:ref:`query metadata <querymetadata>`.  The last column gives the type of
-Python object that is returned by default. Python types can be changed with
-:ref:`Output Type Handlers <outputtypehandlers>`.
-
-.. list-table-with-summary::
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 1 1 1
-    :align: left
-    :summary: The first column is the Oracle Database Type. The second column is the oracledb Database Type that is returned in the query metadata. The third column is the type of Python object that is returned by default.
-
-    * - Oracle Database Type
-      - oracledb Database Type
-      - Default Python type
-    * - BFILE
-      - :attr:`oracledb.DB_TYPE_BFILE`
-      - :ref:`oracledb.LOB <lobobj>`
-    * - BINARY_DOUBLE
-      - :attr:`oracledb.DB_TYPE_BINARY_DOUBLE`
-      - float
-    * - BINARY_FLOAT
-      - :attr:`oracledb.DB_TYPE_BINARY_FLOAT`
-      - float
-    * - BLOB
-      - :attr:`oracledb.DB_TYPE_BLOB`
-      - :ref:`oracledb.LOB <lobobj>`
-    * - CHAR
-      - :attr:`oracledb.DB_TYPE_CHAR`
-      - str
-    * - CLOB
-      - :attr:`oracledb.DB_TYPE_CLOB`
-      - :ref:`oracledb.LOB <lobobj>`
-    * - CURSOR
-      - :attr:`oracledb.DB_TYPE_CURSOR`
-      - :ref:`oracledb.Cursor <cursorobj>`
-    * - DATE
-      - :attr:`oracledb.DB_TYPE_DATE`
-      - datetime.datetime
-    * - INTERVAL DAY TO SECOND
-      - :attr:`oracledb.DB_TYPE_INTERVAL_DS`
-      - datetime.timedelta
-    * - INTERVAL YEAR TO MONTH
-      - :data:`oracledb.DB_TYPE_INTERVAL_YM`
-      - :ref:`oracledb.IntervalYM <interval_ym>`
-    * - JSON
-      - :attr:`oracledb.DB_TYPE_JSON`
-      - dict, list or a scalar value [4]_
-    * - LONG
-      - :attr:`oracledb.DB_TYPE_LONG`
-      - str
-    * - LONG RAW
-      - :attr:`oracledb.DB_TYPE_LONG_RAW`
-      - bytes
-    * - NCHAR
-      - :attr:`oracledb.DB_TYPE_NCHAR`
-      - str
-    * - NCLOB
-      - :attr:`oracledb.DB_TYPE_NCLOB`
-      - :ref:`oracledb.LOB <lobobj>`
-    * - NUMBER
-      - :attr:`oracledb.DB_TYPE_NUMBER`
-      - float or int [1]_
-    * - NVARCHAR2
-      - :attr:`oracledb.DB_TYPE_NVARCHAR`
-      - str
-    * - OBJECT [3]_
-      - :attr:`oracledb.DB_TYPE_OBJECT`
-      - :ref:`oracledb.Object <dbobjecttype>`
-    * - RAW
-      - :attr:`oracledb.DB_TYPE_RAW`
-      - bytes
-    * - ROWID
-      - :attr:`oracledb.DB_TYPE_ROWID`
-      - str
-    * - TIMESTAMP
-      - :attr:`oracledb.DB_TYPE_TIMESTAMP`
-      - datetime.datetime
-    * - TIMESTAMP WITH LOCAL TIME ZONE
-      - :attr:`oracledb.DB_TYPE_TIMESTAMP_LTZ`
-      - datetime.datetime [2]_
-    * - TIMESTAMP WITH TIME ZONE
-      - :attr:`oracledb.DB_TYPE_TIMESTAMP_TZ`
-      - datetime.datetime [2]_
-    * - UROWID
-      - :attr:`oracledb.DB_TYPE_ROWID`, :attr:`oracledb.DB_TYPE_UROWID`
-      - str
-    * - VARCHAR2
-      - :attr:`oracledb.DB_TYPE_VARCHAR`
-      - str
-
-.. [1] If the precision and scale obtained from query column metadata indicate
-       that the value can be expressed as an integer, the value will be
-       returned as an int. If the column is unconstrained (no precision and
-       scale specified), the value will be returned as a float or an int
-       depending on whether the value itself is an integer. In all other cases
-       the value is returned as a float.
-.. [2] The timestamps returned are naive timestamps without any time zone
-       information present.
-.. [3] These include all user-defined types such as VARRAY, NESTED TABLE, etc.
-
-.. [4] If the JSON is an object, then a dict is returned. If it is an array,
-       then a list is returned. If it is a scalar value, then that particular
-       scalar value is returned.
-
-
-.. _changingdata:
-
-Changing Fetched Data
----------------------
-
-Data returned by python-oracledb queries can be changed by using output type
-handlers, by using "outconverters", or by using row factories.
-
-.. _outputtypehandlers:
-
-Changing Fetched Data Types with Output Type Handlers
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Sometimes the default conversion from an Oracle Database type to a Python type
-must be changed in order to prevent data loss or to fit the purposes of the
-Python application. In such cases, an output type handler can be specified for
-queries.  This asks the database to do a conversion from the column type to a
-different type before the data is returned from the database to
-python-oracledb.  If the database does not support such a mapping, an error
-will be returned.  Output type handlers only affect query output and do not
-affect values returned from :meth:`Cursor.callfunc()` or
-:meth:`Cursor.callproc()`.
-
-Output type handlers can be specified on a :attr:`connection
-<Connection.outputtypehandler>` or on a :attr:`cursor
-<Cursor.outputtypehandler>`. If specified on a cursor, fetch type handling is
-only changed on that particular cursor. If specified on a connection, all
-cursors created by that connection will have their fetch type handling changed.
-
-The output type handler is expected to be a function with the following
-signature::
-
-    handler(cursor, metadata)
-
-The metadata parameter is a :ref:`FetchInfo object<fetchinfoobj>`, which is the
-same value found in :attr:`Cursor.description`.
-
-The function is called once for each column that is going to be
-fetched. The function is expected to return a :ref:`variable object <varobj>`
-(generally by a call to :func:`Cursor.var()`) or the value ``None``. The value
-``None`` indicates that the default type should be used.
-
-For example:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=cursor.arraysize)
-
-This output type handler is called once for each column in the SELECT query.
-For each numeric column, the database will now return a string representation
-of each row's value.  Using it in a query:
-
-.. code-block:: python
-
-    cursor.outputtypehandler = output_type_handler
-
-    cursor.execute("select 123 from dual")
-    r = cursor.fetchone()
-    print(r)
-
-prints ``('123',)`` showing the number was converted to a string.  Without the
-type handler, the output would have been ``(123,)``.
-
-When creating variables using :meth:`Cursor.var()` in a handler, the
-``arraysize`` parameter should be the same as the :attr:`Cursor.arraysize` of
-the query cursor.  In python-oracledb Thick mode, the query (and ``var()``)
-arraysize multiplied by the byte size of the particular column must be less
-than INT_MAX.
-
-To unset an output type handler, set it to ``None``.  For example if you had
-previously set a type handler on a cursor, you can remove it with:
-
-.. code-block:: python
-
-    cursor.outputtypehandler = None
-
-Other examples of output handlers are shown in :ref:`numberprecision`,
-:ref:`directlobs`, and :ref:`fetching-raw-data`.  Also see samples such as
-`samples/type_handlers_json_strings.py
-<https://github.com/oracle/python-oracledb/blob/main/samples/type_handlers_
-json_strings.py>`__.
-
-.. _outconverters:
-
-Changing Query Results with Outconverters
-+++++++++++++++++++++++++++++++++++++++++
-
-Python-oracledb "outconverters" can be used with :ref:`output type handlers
-<outputtypehandlers>` to change returned data.
-
-For example, to convert numbers to strings:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-
-        def out_converter(d):
-            if isinstance(d, str):
-                return f"{d} was a string"
-            else:
-                return f"{d} was not a string"
-
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(oracledb.DB_TYPE_VARCHAR,
-                 arraysize=cursor.arraysize, outconverter=out_converter)
-
-The output type handler is called once for each column in the SELECT query.
-For each numeric column, the database will now return a string representation
-of each row's value, and the outconverter will be called for each of those
-values.
-
-Using it in a query:
-
-.. code-block:: python
-
-    cursor.outputtypehandler = output_type_handler
-
-    cursor.execute("select 123 as col1, 'abc' as col2 from dual")
-    for r in cursor.fetchall():
-        print(r)
-
-prints::
-
-    ('123 was a string', 'abc')
-
-This shows that the number was first converted to a string by the database, as
-requested in the output type handler.  The ``out_converter`` function then
-appended "was a string" to the data before the value was returned to the
-application.
-
-Note outconverters are not called for NULL data values unless the
-:meth:`Cursor.var()` parameter ``convert_nulls`` is *True*.
-
-Another example of an outconverter is shown in :ref:`fetching VECTORs as lists
-<vecoutputtypehandlerlist>`.
-
-.. _rowfactories:
-
-Changing Query Results with Rowfactories
-++++++++++++++++++++++++++++++++++++++++
-
-Python-oracledb "rowfactories" are methods called for each row retrieved from
-the database. The :meth:`Cursor.rowfactory` method is called with the tuple
-fetched from the database before it is returned to the application.  The method
-can convert the tuple to a different value or representation.
-
-A rowfactory should be set on a cursor after a call to :meth:`Cursor.execute()`
-before fetching data from the cursor. Calling :meth:`~Cursor.execute()` again
-will clear any previous rowfactory.
-
-**Fetching Rows using a Data Class**
-
-Python `Data Classes <https://docs.python.org/3/library/dataclasses.html>`__
-provide a simple way to encapsulate data. An example of using them with a query
-rowfactory is:
-
-.. code-block:: python
-
-    import dataclasses
-    import datetime
-
-    . . .
-
-    @dataclasses.dataclass
-    class MyRow:
-        employee_id: int
-        last_name: str
-        hire_date: datetime.datetime
-
-    cursor.execute(
-        """select employee_id, last_name, hire_date
-           from employees
-           where employee_id < 105
-           order by employee_id""")
-
-    cursor.rowfactory = MyRow
-
-    for row in cursor:
-        print("Number:", row.employee_id)
-        print("Name:", row.last_name)
-        print("Hire Date:", row.hire_date)
-
-The output is::
-
-    Number: 100
-    Name: King
-    Hire Date: 2003-06-17 00:00:00
-    Number: 101
-    Name: Kochhar
-    Hire Date: 2005-09-21 00:00:00
-    Number: 102
-    Name: De Haan
-    Hire Date: 2001-01-13 00:00:00
-
-**Fetching Rows as Dictionaries**
-
-To fetch each row of a query as a dictionary, you can use
-:meth:`Cursor.rowfactory` like:
-
-.. code-block:: python
-
-    cursor.execute("select * from locations where location_id = 1000")
-
-    columns = [col.name for col in cursor.description]
-    cursor.rowfactory = lambda *args: dict(zip(columns, args))
-    data = cursor.fetchone()
-    print(data)
-
-The output is::
-
-    {'LOCATION_ID': 1000, 'STREET_ADDRESS': '1297 Via Cola di Rie',
-    'POSTAL_CODE': '00989', 'CITY': 'Roma', 'STATE_PROVINCE': None,
-    'COUNTRY_ID': 'IT'}
-
-Also see how ``JSON_OBJECT`` is used in :ref:`jsondatatype`, since querying
-directly as JSON may be preferable.
-
-If you join tables where the same column name occurs in both tables with
-different meanings or values, then use a column alias in the query.  Otherwise,
-only one of the similarly named columns will be included in the dictionary:
-
-.. code-block:: sql
-
-    select
-        cat_name,
-        cats.color as cat_color,
-        dog_name,
-        dogs.color
-    from cats, dogs
-
-**Example with an Output Type Handler, Outconverter, and Row Factory**
-
-An example showing an :ref:`output type handler <outputtypehandlers>`, an
-:ref:`outconverter <outconverters>`, and a :ref:`row factory <rowfactories>`
-is:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-
-        def out_converter(d):
-            if type(d) is str:
-                return f"{d} was a string"
-            else:
-                return f"{d} was not a string"
-
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(oracledb.DB_TYPE_VARCHAR,
-                arraysize=cursor.arraysize, outconverter=out_converter)
-
-    cursor.outputtypehandler = output_type_handler
-
-    cursor.execute("select 123 as col1, 'abc' as col2 from dual")
-
-    columns = [col.name.lower() for col in cursor.description]
-    cursor.rowfactory = lambda *args: dict(zip(columns, args))
-    for r in cursor.fetchall():
-        print(r)
-
-The database converts the number to a string before it is returned to
-python-oracledb. The outconverter appends "was a string" to this value. The
-column names are converted to lowercase. Finally, the row factory changes the
-complete row to a dictionary. The output is::
-
-    {'col1': '123 was a string', 'col2': 'abc'}
-
-.. _numberprecision:
-
-Fetched Number Precision
-------------------------
-
-Oracle Database uses decimal numbers and these cannot be converted seamlessly
-to binary number representations like Python floats. In addition, the range of
-Oracle numbers exceeds that of floating point numbers. Python has decimal
-objects which do not have these limitations. In python-oracledb you can set
-:attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>` so that
-Decimals are returned to the application, ensuring that numeric precision is
-not lost when fetching certain numbers.
-
-The following code sample demonstrates the issue:
-
-.. code-block:: python
-
-    cursor.execute("create table test_float (X number(5, 3))")
-    cursor.execute("insert into test_float values (7.1)")
-
-    cursor.execute("select * from test_float")
-    val, = cursor.fetchone()
-    print(val, "* 3 =", val * 3)
-
-This displays ``7.1 * 3 = 21.299999999999997``
-
-Using Python decimal objects, however, there is no loss of precision:
-
-.. code-block:: python
-
-    oracledb.defaults.fetch_decimals = True
-
-    cursor.execute("select * from test_float")
-    val, = cursor.fetchone()
-    print(val, "* 3 =", val * 3)
-
-This displays ``7.1 * 3 = 21.3``
-
-See `samples/return_numbers_as_decimals.py
-<https://github.com/oracle/python-oracledb/blob/main/samples/return_numbers_as_decimals.py>`__
-
-An equivalent, longer, older coding idiom to setting
-:attr:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>` is to use an
-:ref:`output type handler <outputtypehandlers>` to do the conversion.
-
-.. code-block:: python
-
-    import decimal
-
-    def number_to_decimal(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-            return cursor.var(decimal.Decimal, arraysize=cursor.arraysize)
-
-    cursor.outputtypehandler = number_to_decimal
-
-    cursor.execute("select * from test_float")
-    val, = cursor.fetchone()
-    print(val, "* 3 =", val * 3)
-
-This displays ``7.1 * 3 = 21.3``
-
-The Python ``decimal.Decimal`` converter gets called with the string
-representation of the Oracle number.  The output from ``decimal.Decimal`` is
-returned in the output tuple.
-
-.. _scrollablecursors:
-
-Scrollable Cursors
-------------------
-
-Scrollable cursors enable applications to move backwards, forwards, to skip
-rows, and to move to a particular row in a query result set. The result set is
-cached on the database server until the cursor is closed. In contrast, regular
-cursors are restricted to moving forward.
-
-A scrollable cursor is created by setting the parameter ``scrollable=True``
-when creating the cursor. The method :meth:`Cursor.scroll()` is used to move to
-different locations in the result set.
-
-Examples are:
-
-.. code-block:: python
-
-    cursor = connection.cursor(scrollable=True)
-    cursor.execute("select * from ChildTable order by ChildId")
-
-    cursor.scroll(mode="last")
-    print("LAST ROW:", cursor.fetchone())
-
-    cursor.scroll(mode="first")
-    print("FIRST ROW:", cursor.fetchone())
-
-    cursor.scroll(8, mode="absolute")
-    print("ROW 8:", cursor.fetchone())
-
-    cursor.scroll(6)
-    print("SKIP 6 ROWS:", cursor.fetchone())
-
-    cursor.scroll(-4)
-    print("SKIP BACK 4 ROWS:", cursor.fetchone())
-
-See `samples/scrollable_cursors.py <https://github.com/oracle/python-oracledb/
-blob/main/samples/scrollable_cursors.py>`__ for a runnable example.
-
-
-.. _fetchobjects:
-
-Fetching Oracle Database Objects and Collections
-------------------------------------------------
-
-Oracle Database named object types and user-defined types can be fetched
-directly in queries.  Each item is represented as a :ref:`Python object
-<dbobjecttype>` corresponding to the Oracle Database object.  This Python
-object can be traversed to access its elements.  Attributes including
-:attr:`DbObjectType.name` and :attr:`DbObjectType.iscollection`, and methods
-including :meth:`DbObject.aslist` and :meth:`DbObject.asdict` are available.
-
-For example, if a table MYGEOMETRYTAB contains a column GEOMETRY of
-Oracle's predefined Spatial object type `SDO_GEOMETRY
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-683FF8C5-A773-4018-932D-2AF6EC8BC119>`__,
-then it can be queried and printed:
-
-.. code-block:: python
-
-    cursor.execute("select geometry from mygeometrytab")
-    for obj, in cursor:
-        dumpobject(obj)
-
-Where ``dumpobject()`` is defined as:
-
-.. code-block:: python
-
-    def dumpobject(obj, prefix = ""):
-        if obj.type.iscollection:
-            print(prefix, "[")
-            for value in obj.aslist():
-                if isinstance(value, oracledb.Object):
-                    dumpobject(value, prefix + "  ")
-                else:
-                    print(prefix + "  ", repr(value))
-            print(prefix, "]")
-        else:
-            print(prefix, "{")
-            for attr in obj.type.attributes:
-                value = getattr(obj, attr.name)
-                if isinstance(value, oracledb.Object):
-                    print(prefix + "   " + attr.name + ":")
-                    dumpobject(value, prefix + "  ")
-                else:
-                    print(prefix + "   " + attr.name + ":", repr(value))
-            print(prefix, "}")
-
-This might produce output like::
-
-    {
-      SDO_GTYPE: 2003
-      SDO_SRID: None
-      SDO_POINT:
-      {
-        X: 1
-        Y: 2
-        Z: 3
-      }
-      SDO_ELEM_INFO:
-      [
-        1
-        1003
-        3
-      ]
-      SDO_ORDINATES:
-      [
-        1
-        1
-        5
-        7
-      ]
-    }
-
-Other information on using Oracle objects is in :ref:`Using Bind Variables
-<bind>`.
-
-Performance-sensitive applications should consider using scalar types instead of
-objects. If you do use objects, avoid calling :meth:`Connection.gettype()`
-unnecessarily, and avoid objects with large numbers of attributes.
-
-.. _rowlimit:
-
-Limiting Rows
--------------
-
-Query data is commonly broken into one or more sets:
-
-- To give an upper bound on the number of rows that a query has to process,
-  which can help improve database scalability.
-
-- To perform 'Web pagination' that allows moving from one set of rows to a
-  next, or previous, set on demand.
-
-- For fetching of all data in consecutive small sets for batch processing.
-  This happens because the number of records is too large for Python to handle
-  at one time.
-
-The latter can be handled by calling :meth:`Cursor.fetchmany()` with one
-execution of the SQL query.
-
-'Web pagination' and limiting the maximum number of rows are detailed in this
-section.  For each 'page' of results, a SQL query is executed to get the
-appropriate set of rows from a table.  Since the query may be executed more
-than once, ensure to use :ref:`bind variables <bind>` for row numbers and
-row limits.
-
-Oracle Database 12c SQL introduced an ``OFFSET`` / ``FETCH`` clause which is
-similar to the ``LIMIT`` keyword of MySQL.  In Python, you can fetch a set of
-rows using:
-
-.. code-block:: python
-
-    myoffset = 0       # do not skip any rows (start at row 1)
-    mymaxnumrows = 20  # get 20 rows
-
-    sql =
-      """SELECT last_name
-         FROM employees
-         ORDER BY last_name
-         OFFSET :offset ROWS FETCH NEXT :maxnumrows ROWS ONLY"""
-
-    with connection.cursor() as cursor:
-
-        cursor.prefetchrows = mymaxnumrows + 1
-        cursor.arraysize = mymaxnumrows
-
-        for row in cursor.execute(sql, offset=myoffset, maxnumrows=mymaxnumrows):
-            print(row)
-
-In applications where the SQL query is not known in advance, this method
-sometimes involves appending the ``OFFSET`` clause to the 'real' user query. Be
-very careful to avoid SQL injection security issues.
-
-For Oracle Database 11g and earlier there are several alternative ways
-to limit the number of rows returned.  The old, canonical paging query
-is::
-
-    SELECT *
-    FROM (SELECT a.*, ROWNUM AS rnum
-          FROM (YOUR_QUERY_GOES_HERE -- including the order by) a
-          WHERE ROWNUM <= MAX_ROW)
-    WHERE rnum >= MIN_ROW
-
-Here, ``MIN_ROW`` is the row number of first row and ``MAX_ROW`` is the row
-number of the last row to return.  For example::
-
-   SELECT *
-   FROM (SELECT a.*, ROWNUM AS rnum
-         FROM (SELECT last_name FROM employees ORDER BY last_name) a
-         WHERE ROWNUM <= 20)
-   WHERE rnum >= 1
-
-This always has an 'extra' column, here called RNUM.
-
-An alternative and preferred query syntax for Oracle Database 11g uses the
-analytic ``ROW_NUMBER()`` function. For example, to get the 1st to 20th names
-the query is::
-
-    SELECT last_name FROM
-    (SELECT last_name,
-            ROW_NUMBER() OVER (ORDER BY last_name) AS myr
-            FROM employees)
-    WHERE myr BETWEEN 1 and 20
-
-Ensure to use :ref:`bind variables <bind>` for the upper and lower limit
-values.
-
-.. _parallelqueries:
-
-Fetching Data in Parallel
--------------------------
-
-The performance benefit of selecting table data in parallel from Oracle
-Database compared with a executing a single query depends on many
-factors. Partitioning the table and reading one partition per connection is
-usually the most efficient database-side solution. However, even if a parallel
-solution appears to be faster, it could be inefficient, thereby impacting, or
-eventually being limited by, everyone else. Only benchmarking in your
-environment will determine whether to use this technique.
-
-A naive example using multiple threads is:
-
-.. code-block:: python
-
-    # A naive example for fetching data in parallel.
-    # Many factors affect whether this is beneficial
-
-    # The degree of parallelism / number of connections to open
-    NUM_THREADS = 10
-
-    # How many rows to fetch in each thread
-    BATCH_SIZE = 1000
-
-    # Internal buffer size: Tune for performance
-    oracledb.defaults.arraysize = 1000
-
-    # Note OFFSET/FETCH is not particularly efficient.
-    # It would be better to use a partitioned table
-    SQL = """
-        select data
-        from demo
-        order by id
-        offset :rowoffset rows fetch next :maxrows rows only
-        """
-
-    def do_query(tn):
-        with pool.acquire() as connection:
-            with connection.cursor() as cursor:
-                cursor.execute(SQL, rowoffset=(tn*BATCH_SIZE), maxrows=BATCH_SIZE)
-                while True:
-                    rows = cursor.fetchmany()
-                    if not rows:
-                        break
-                    print(f'Thread {tn}', rows)
-
-
-    pool = oracledb.create_pool(user="hr", password=userpwd, dsn="dbhost.example.com/orclpdb",
-                                min=NUM_THREADS, max=NUM_THREADS)
-
-    thread = []
-    for i in range(NUM_THREADS):
-        t = threading.Thread(target=do_query, args=(i,))
-        t.start()
-        thread.append(t)
-
-    for i in range(NUM_THREADS):
-        thread[i].join()
-
-When considering to parallelize queries from a table, some of the many factors
-include:
-
-- Each connection to Oracle Database can only execute one statement at a time,
-  so to parallelize queries requires using multiple connections.
-
-- Python's threading behavior and impact of the Python's Global Interpreter
-  Lock (GIL) may have an impact. You may need to spread work over multiple
-  processes.
-
-- What level of parallelism is most efficient?
-
-- How many rows to fetch in each batch?
-
-- What is your application doing with the data - can the receiving end
-  efficiently process it, or write it to a disk?
-
-- The OFFSET FETCH syntax will still cause database table blocks to be scanned
-  even though not all data is returned to the application.  Can the table be
-  partitioned instead?
-
-- There will be extra load on the database, both from the additional
-  connections, and the work they are performing.
-
-- Do your queries use up all of the database's parallel servers?
-
-- Is the data in the database spread across multiple disk spindles or is it the
-  one disk which continually has to seek?
-
-- Are Oracle Database zone maps being used?
-
-- Is Oracle Exadata with storage indexes being used?
-
-- Do you have function based indexes that are being invoked for every row?
-
-.. _fetching-raw-data:
-
-Fetching Raw Data
------------------
-
-Sometimes python-oracledb may have problems converting data stored in the database to
-Python strings. This can occur if the data stored in the database does not match
-the character set defined by the database. The ``encoding_errors`` parameter to
-:meth:`Cursor.var()` permits the data to be returned with some invalid data
-replaced, but for additional control the parameter ``bypass_decode`` can be set
-to True and python-oracledb will bypass the decode step and return `bytes` instead
-of `str` for data stored in the database as strings. The data can then be
-examined and corrected as required. This approach should only be used for
-troubleshooting and correcting invalid data, not for general use!
-
-The following sample demonstrates how to use this feature:
-
-    .. code-block:: python
-
-        # define output type handler
-        def return_strings_as_bytes(cursor, metadata):
-            if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-                return cursor.var(str, arraysize=cursor.arraysize,
-                                  bypass_decode=True)
-
-        # set output type handler on cursor before fetching data
-        with connection.cursor() as cursor:
-            cursor.outputtypehandler = return_strings_as_bytes
-            cursor.execute("select content, charset from SomeTable")
-            data = cursor.fetchall()
-
-This will produce output as::
-
-    [(b'Fianc\xc3\xa9', b'UTF-8')]
-
-
-Note that last ``\xc3\xa9`` is é in UTF-8. Since this is valid UTF-8 you can then
-perform a decode on the data (the part that was bypassed):
-
-    .. code-block:: python
-
-        value = data[0][0].decode("UTF-8")
-
-This will return the value "Fiancé".
-
-If you want to save ``b'Fianc\xc3\xa9'`` into the database directly without
-using a Python string, you will need to create a variable using
-:meth:`Cursor.var()` that specifies the type as
-:data:`oracledb.DB_TYPE_VARCHAR` (otherwise the value will be treated as
-:data:`oracledb.DB_TYPE_RAW`). The following sample demonstrates this:
-
-    .. code-block:: python
-
-        with oracledb.connect(user="hr", password=userpwd,
-                               dsn="dbhost.example.com/orclpdb") as conn:
-            with conn.cursor() cursor:
-                var = cursor.var(oracledb.DB_TYPE_VARCHAR)
-                var.setvalue(0, b"Fianc\xc4\x9b")
-                cursor.execute("""
-                    update SomeTable set
-                        SomeColumn = :param
-                    where id = 1""",
-                    param=var)
-
-.. warning::
-
-    The database will assume that the bytes provided are in the character set
-    expected by the database so only use this for troubleshooting or as
-    directed.
-
-
-.. _codecerror:
-
-Querying Corrupt Data
----------------------
-
-If queries fail with the error "codec can't decode byte" when you select data,
-then:
-
-* Check if your :ref:`character set <globalization>` is correct.  Review the
-  :ref:`database character sets <findingcharset>`.  Check
-  :ref:`fetching-raw-data`. Note that the encoding used for all character
-  data in python-oracledb is "UTF-8".
-
-* Check for corrupt data in the database and fix it.  For example, if you have
-  a table MYTABLE with a character column MYVALUE that you suspect has some
-  corrupt values, then you may be able to identify the problem data by using a
-  query like ``select id from mytable where
-  utl_i18n.validate_character_encoding(myvalue) > 0`` which will print out the
-  keys of the rows with invalid data.
-
-If corrupt data cannot be modified, you can pass options to the internal
-`decode() <https://docs.python.org/3/library/stdtypes.html#bytes.decode>`__
-used by python-oracledb to allow it to be selected and prevent the whole query
-failing.  Do this by creating an :ref:`outputtypehandler <outputtypehandlers>`
-and setting ``encoding_errors``.  For example, to replace corrupt characters in
-character columns:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-            return cursor.var(metadata.type_code, size,
-                              arraysize=cursor.arraysize,
-                              encoding_errors="replace")
-
-    cursor.outputtypehandler = output_type_handler
-
-    cursor.execute("select column1, column2 from SomeTableWithBadData")
-
-Other codec behaviors can be chosen for ``encoding_errors``, see `Error Handlers
-<https://docs.python.org/3/library/codecs.html#error-handlers>`__.
-
-.. _dml:
-
-
-INSERT and UPDATE Statements
-============================
-
-SQL Data Manipulation Language statements (DML) such as INSERT and UPDATE can
-easily be executed with python-oracledb.  For example:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-      cursor.execute("insert into MyTable values (:idbv, :nmbv)", [1, "Fredico"])
-
-Do not concatenate or interpolate user data into SQL statements.  See
-:ref:`bind` instead.
-
-When handling multiple data values, use :meth:`Cursor.executemany()` or
-:meth:`Connection.direct_path_load()` for performance. See :ref:`batchstmnt`
-
-By default data is not committed to the database and other users will not be
-able to see your changes until your connection commits them by calling
-:meth:`Connection.commit()`. You can optionally rollback changes by calling
-:meth:`Connection.rollback()`. An implicit rollback will occur if your
-application finishes and does not explicitly commit any work.
-
-To commit your changes, call:
-
-.. code-block:: python
-
-    connection.commit()
-
-Note that the commit occurs on the connection, not the cursor.
-
-If the attribute :attr:`Connection.autocommit` is ``True``, then each statement
-executed is automatically committed without the need to call
-:meth:`Connection.commit()`. However overuse of the attribute causes extra
-database load, and can destroy transactional consistency.
-
-See :ref:`txnmgmnt` for best practices on committing and rolling back data
-changes.
-
-Inserting NULLs
----------------
-
-Oracle Database requires a type, even for null values. When you pass the value
-None, then python-oracledb assumes its type is a string.  If this is not the
-desired type, you can explicitly set it.  For example, to insert a null
-:ref:`Oracle Spatial SDO_GEOMETRY <spatial>` object:
-
-.. code-block:: python
-
-    type_obj = connection.gettype("SDO_GEOMETRY")
-    cursor = connection.cursor()
-    cursor.setinputsizes(type_obj)
-    cursor.execute("insert into sometable values (:1)", [None])
diff --git a/doc/src/user_guide/startup.rst b/doc/src/user_guide/startup.rst
deleted file mode 100644
index 634cf075..00000000
--- a/doc/src/user_guide/startup.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-.. _startup:
-
-.. currentmodule:: oracledb
-
-*************************************
-Starting and Stopping Oracle Database
-*************************************
-
-This chapter covers how to start up and shut down Oracle Database using
-python-oracledb.
-
-.. note::
-
-    Database start up and shut down functionality is only supported in
-    python-oracledb Thick mode.  See :ref:`enablingthick`.
-
-===========================
-Starting Oracle Database Up
-===========================
-
-Python-oracledb can start up a database instance. A privileged connection is
-required. This example shows a script that could be run as the 'oracle'
-operating system user who administers a local database installation on Linux.
-It assumes that the environment variable ``ORACLE_SID`` has been set to the SID
-of the database that should be started:
-
-.. code-block:: python
-
-    # the connection must be in PRELIM_AUTH mode to perform startup
-    connection = oracledb.connect(mode=oracledb.SYSDBA | oracledb.PRELIM_AUTH)
-    connection.startup()
-
-    # the following statements must be issued in normal SYSDBA mode
-    connection = oracledb.connect(mode=oracledb.SYSDBA)
-    cursor = connection.cursor()
-    cursor.execute("alter database mount")
-    cursor.execute("alter database open")
-
-To start up a remote database, you may need to configure the Oracle Net
-listener to use `static service registration
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-0203C8FA-A4BE-44A5-9A25-3D1E578E879F>`_
-by adding a ``SID_LIST_LISTENER`` entry to the database `listener.ora` file.
-
-
-=============================
-Shutting Oracle Database Down
-=============================
-
-Python-oracledb has the ability to shut down the database using a privileged
-connection. This example also assumes that the environment variable
-``ORACLE_SID`` has been set:
-
-.. code-block:: python
-
-    # need to connect as SYSDBA or SYSOPER
-    connection = oracledb.connect(mode=oracledb.SYSDBA)
-
-    # first shutdown() call must specify the mode, if DBSHUTDOWN_ABORT is used,
-    # there is no need for any of the other steps
-    connection.shutdown(mode=oracledb.DBSHUTDOWN_IMMEDIATE)
-
-    # now close and dismount the database
-    cursor = connection.cursor()
-    cursor.execute("alter database close normal")
-    cursor.execute("alter database dismount")
-
-    # perform the final shutdown call
-    connection.shutdown(mode=oracledb.DBSHUTDOWN_FINAL)
diff --git a/doc/src/user_guide/tracing.rst b/doc/src/user_guide/tracing.rst
deleted file mode 100644
index 37061e40..00000000
--- a/doc/src/user_guide/tracing.rst
+++ /dev/null
@@ -1,721 +0,0 @@
-.. _tracingsql:
-
-.. currentmodule:: oracledb
-
-***********************
-Tracing python-oracledb
-***********************
-
-.. _applntracing:
-
-Application Tracing
-===================
-
-There are multiple approaches for application tracing and monitoring:
-
-- :ref:`End-to-end database tracing <endtoendtracing>` attributes such as
-  :attr:`Connection.action` and :attr:`Connection.module` are supported in the
-  python-oracledb Thin and Thick modes.  Using these attributes is recommended
-  since they aid application monitoring and troubleshooting.
-
-- You can :ref:`subclass python-oracledb classes <subclassconn>` and implement
-  your own driver API call tracing and logging. Also, the standard `Python
-  tracing capabilities <https://docs.python.org/3/library/trace.html>`__ can be
-  used.
-
-- The Java Debug Wire Protocol (JDWP) for debugging PL/SQL can be used. See
-  :ref:`jdwp`.
-
-- Instrumentation libraries such as OpenTelemetry allow sophisticated
-  monitoring, see :ref:`opentelemetry`.
-
-- Python-oracledb in Thick mode can dump a trace of SQL statements
-  executed. See :ref:`lowlevelsqltrace`.
-
-- The unique connection identifiers that appear in connection error messages,
-  and in Oracle Database traces and logs, can be used to resolve connectivity
-  errors. See :ref:`connectionid`.
-
-.. _endtoendtracing:
-
-Oracle Database End-to-End Tracing
-----------------------------------
-
-Oracle Database end-to-end application tracing simplifies diagnosing
-application code flow and performance problems in multi-tier or multi-user
-environments.
-
-The connection attributes :attr:`Connection.client_identifier`,
-:attr:`Connection.clientinfo`, :attr:`Connection.dbop`,
-:attr:`Connection.module`, and :attr:`Connection.action` set metadata for
-end-to-end tracing. The values can be queried from data dictionary and dynamic
-performance views to monitor applications, or you can use tracing
-utilities. Values may appear in logs and audit trails.
-
-Also see :ref:`appcontext` for information about setting Application Contexts.
-
-The :attr:`Connection.client_identifier` attribute is typically set to the name
-(or identifier) of the actual end user initiating a query.  This allows the
-database to distinguish, and trace, end users for applications that connect
-using a common database username. It can also be used by `Oracle Virtual
-Private Database (VPD)
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-06022729-9210-4895-BF04-6177713C65A7>`__ policies to automatically limit
-data access. Oracle Database’s `DBMS_MONITOR
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-951568BF-D798-4456-8478-15FEEBA0C78E>`__ package can take advantage of the
-client identifer to enable statistics and tracing at an individual level.
-
-The :attr:`Connection.module` and :attr:`Connection.action` attributes can be
-set to user-chosen, descriptive values identifying your code architecture.
-
-After attributes are set, the values are sent to the database when the next
-:ref:`round-trip <roundtrips>` to the database occurs, for example when the
-next SQL statement is executed.
-
-The attribute values will remain set in connections released back to a
-connection pool.  When the application re-acquires a connection from the pool,
-it should initialize the values to a desired state before using that
-connection.
-
-The example below shows setting the action, module, and client identifier
-attributes on a connection object, and then querying a view to see the recorded
-values.  The example both sets and queries the values, but typically monitoring
-is done externally to the application.
-
-.. code-block:: python
-
-    # Set the tracing metadata
-    connection.client_identifier = "pythonuser"
-    connection.action = "Query Session tracing parameters"
-    connection.module = "End-to-end Demo"
-
-    for row in cursor.execute("""
-            SELECT username, client_identifier, module, action
-            FROM V$SESSION
-            WHERE sid = SYS_CONTEXT('USERENV', 'SID')"""):
-        print(row)
-
-The output will be like::
-
-    ('SYSTEM', 'pythonuser', 'End-to-end Demo', 'Query Session tracing parameters')
-
-The values can also be manually set by calling `DBMS_APPLICATION_INFO
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-14484F86-44F2-4B34-B34E-0C873D323EAD>`__ procedures or
-`DBMS_SESSION.SET_IDENTIFIER <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-988EA930-BDFE-4205-A806-E54F05333562>`__. These incur
-round-trips to the database which reduces application scalability:
-
-.. code-block:: sql
-
-    BEGIN
-        DBMS_SESSION.SET_IDENTIFIER('pythonuser');
-        DBMS_APPLICATION_INFO.set_module('End-to-End Demo');
-        DBMS_APPLICATION_INFO.set_action(action_name => 'Query Session tracing parameters');
-    END;
-
-The :attr:`Connection.dbop` attribute can be used for Real-Time SQL Monitoring,
-see `Monitoring Database Operations <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-C941CE9D-97E1-42F8-91ED-4949B2B710BF>`__. The value will
-be shown in the DBOP_NAME column of the `V$SQL_MONITOR <https://www.oracle.com
-/pls/topic/lookup?ctx=dblatest&id=GUID-79E97A84-9C27-4A5E-AC0D-C12CB3E748E6>`__
-view:
-
-.. code-block:: python
-
-    connection.dbop = "my op"
-
-    for row in cursor.execute("""
-            SELECT dbop_name
-            FROM V$SQL_MONITOR
-            WHERE sid = SYS_CONTEXT('USERENV', 'SID')"""):
-        print(row)
-
-.. _jdwp:
-
-Debugging PL/SQL with the Java Debug Wire Protocol
---------------------------------------------------
-
-The Java Debug Wire Protocol (JDWP) for debugging PL/SQL can be used with
-python-oracledb.
-
-Python-oracledb applications that call PL/SQL can step through that PL/SQL code
-using JDWP in a debugger. This allows Python and PL/SQL code to be debugged in
-the same debugger environment. You can enable PL/SQL debugging in
-python-oracledb as follows:
-
-- In python-oracledb Thin or Thick modes, set the ``ORA_DEBUG_JDWP``
-  environment variable to `host=hostname;port=portnum` indicating where the
-  PL/SQL debugger is running.  Then run the application.
-
-- In python-oracledb Thin mode, you can alternatively set the connection
-  parameter ``debug_jdwp`` during connection.  This variable defaults to the
-  value of the ``ORA_DEBUG_JDWP`` environment variable.
-
-See the documentation on `DBMS_DEBUG_JDWP
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-AFF566A0-9E90-
-4218-B5C6-A74C3BF1CE14>`_, the video `PL/SQL debugging with Visual Studio and
-Visual Studio Code <https://www.youtube.com/watch?v=wk-3hLe30kk>`_, and the
-blog post `Debugging PL/SQL with Visual Studio Code (and more)
-<https://medium.com/oracledevs/debugging-pl-sql-with-visual-studio-code-and-
-more-45631f3952cf>`_.
-
-.. _lowlevelsqltrace:
-
-Low Level SQL Tracing
----------------------
-
-The Thick mode of python-oracledb is implemented using the
-`ODPI-C <https://oracle.github.io/odpi>`__ wrapper on top of the Oracle Client
-libraries.  The ODPI-C tracing capability can be used to log executed
-python-oracledb statements to the standard error stream. Before executing
-Python, set the environment variable ``DPI_DEBUG_LEVEL`` to 16 in your terminal
-window.
-
-On Linux, you might use::
-
-    export DPI_DEBUG_LEVEL=16
-
-On Windows, this could be done with::
-
-    set DPI_DEBUG_LEVEL=16
-
-After setting the variable, run the Python Script, for example on Linux::
-
-    python end-to-endtracing.py 2> log.txt
-
-For an application that does a single query, the log file might contain a
-tracing line consisting of the prefix 'ODPI', a thread identifier, a timestamp,
-and the SQL statement executed::
-
-    ODPI [23389068] 2025-06-25 12:07:55.405: ODPI-C 5.5.1
-    ODPI [23389068] 2025-06-25 12:07:55.405: debugging messages initialized at level 16
-    ODPI [23389068] 2025-06-25 12:08:01.363: SQL select name from jobs
-
-See `ODPI-C Debugging
-<https://oracle.github.io/odpi/doc/user_guide/debugging.html>`__ for
-documentation on ``DPI_DEBUG_LEVEL``.
-
-.. _connectionid:
-
-Using Connection Identifiers
-----------------------------
-
-A unique connection identifier (``CONNECTION_ID``) is generated for each
-connection to the Oracle Database. The connection identifier is shown in some
-Oracle Network error messages and logs, which helps in better tracing and
-diagnosing of connection failures. For example::
-
-    DPY-6005: cannot connect to database (CONNECTION_ID=m0PfUY6hYSmWPcgrHZCQIQ==)
-
-Depending on the Oracle Database version in use, the information that is shown
-in logs varies.
-
-You can define a prefix value which is added to the beginning of the
-``CONNECTION_ID`` value. This prefix aids in identifying the connections from a
-specific application.
-
-See `Troubleshooting Oracle Net Services <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-3F42D057-C9AC-4747-B48B-5A5FF7672E5D>`_ for more
-information on connection identifiers.
-
-**Python-oracledb Thin mode**
-
-In python-oracledb Thin mode, you can specify a prefix using the
-``connection_id_prefix`` parameter when creating :meth:`standalone connections
-<oracledb.connect()>` or :meth:`pooled connections <oracledb.create_pool()>`,
-or alternatively set a prefix when calling :meth:`oracledb.ConnectParams()` or
-:meth:`oracledb.PoolParams()`. For example:
-
-.. code-block:: python
-
-    connection = oracledb.connect(user="hr", password=userpwd,
-                                  dsn="localhost/orclpdb",
-                                  connection_id_prefix="MYAPP")
-
-If this connection to the database fails, ``MYAPP`` is added as a prefix to the
-``CONNECTION_ID`` value shown in the error message, for example::
-
-    DPY-6005: cannot connect to database (CONNECTION_ID=MYAPPm0PfUY6hYSmWPcgrHZCQIQ==).
-
-**Python-oracledb Thick mode**
-
-In python-oracledb Thick mode, you can specify the connection identifier prefix
-in the connection string or connect descriptor. For example::
-
-    mydb = (DESCRIPTION =
-             (ADDRESS_LIST= (ADDRESS=...) (ADDRESS=...))
-             (CONNECT_DATA=
-                (SERVICE_NAME=sales.us.example.com)
-                (CONNECTION_ID_PREFIX=MYAPP)
-             )
-           )
-
-.. _tracingbind:
-
-Tracing Bind Values
--------------------
-
-Several methods for tracing bind variable values can be used. When tracing bind
-variable values, be careful not to leak information and create a security
-problem.
-
-In Oracle Database, the view `V$SQL_BIND_CAPTURE <https://www.oracle.com/
-pls/topic/lookup?ctx=dblatest&id=GUID-D353F4BE-5943-4F5B-A99B-BC9505E9579C>`__
-can capture bind information. Tracing with Oracle Database’s `DBMS_MONITOR
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-951568BF-D798-4456-8478-15FEEBA0C78E>`__
-package may also be useful.
-
-You can additionally :ref:`subclass python-oracledb classes <subclassconn>` and
-log any bind values.
-
-OpenTelemetry can also be used, see :ref:`opentelemetry`.
-
-.. _dbviews:
-
-Database Views for Tracing python-oracledb
-------------------------------------------
-
-This section shows some of the Oracle Database views useful for tracing and
-monitoring python-oracledb. Other views and columns not described here also
-contain useful information, such as the :ref:`drcp` views discussed in
-:ref:`monitoringdrcp`, and the views discussed in :ref:`endtoendtracing` and
-:ref:`tracingbind`.
-
-V$SESSION
-+++++++++
-
-The following table shows sample values for some `V$SESSION
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-28E2DC75-E157-4C0A-94AB-117C205789B9>`__ columns. You may see other values
-if you have changed the defaults using the :ref:`Defaults object <defaults>`
-before connecting, set the equivalent connection or pool creation parameters,
-or set the attribute :attr:`Connection.module` as shown in
-:ref:`endtoendtracing`.
-
-.. list-table-with-summary:: Sample V$SESSION column values
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 10 15 15
-    :name: V$SESSION_COLUMN_VALUES
-    :summary: The first column is the name of the column. The second column lists a sample python-oracledb Thick mode value. The third column lists a sample python-oracledb Thin mode value.
-
-    * - Column
-      - Sample Thin mode value
-      - Sample Thick mode value
-    * - MACHINE
-      - "myusername-mac"
-      - "myusername-mac"
-    * - MODULE
-      - The value of Python's ``sys.executable``, such as `/Users/myusername/.pyenv/versions/3.13.3/bin/python`
-      - Similar to `python@myusername-mac (TNS V1-V3)`
-    * - OSUSER
-      - "myusername"
-      - "myusername"
-    * - PROGRAM
-      - The value of Python's ``sys.executable``, such as `/Users/myusername/.pyenv/versions/3.13.3/bin/python`
-      - Similar to `python@myusername-mac (TNS V1-V3)`
-    * - TERMINAL
-      - "unknown"
-      - Similar to `ttys001`
-
-V$SESSION_CONNECT_INFO
-++++++++++++++++++++++
-
-The following table shows sample values for some `V$SESSION_CONNECT_INFO
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-9F0DCAEA-A67E-4183-89E7-B1555DC591CE>`__ columns. You may see other
-values if you have changed the defaults using the :ref:`Defaults object
-<defaults>` before connecting, set the equivalent connection or pool creation
-parameters, or set the ``driver_name`` parameter in
-:meth:`oracledb.init_oracle_client()`.
-
-.. list-table-with-summary:: Sample V$SESSION_CONNECT_INFO column values
-    :header-rows: 1
-    :class: wy-table-responsive
-    :widths: 10 15 15
-    :name: V$SESSION_CONNECT_INFO
-    :summary: The first column is the name of V$SESSION_CONNECT_INFO view's column. The second column lists a sample python-oracledb Thick mode value. The third column list a sample python-oracledb Thin mode value.
-
-    * - Column
-      - Sample Thin mode value
-      - Sample Thick mode value
-    * - CLIENT_DRIVER
-      - "python-oracledb thn : 3.2.0"
-      - "python-oracledb thk : 3.2.0"
-    * - CLIENT_OCI_LIBRARY
-      - "Unknown"
-      - The Oracle Client or Instant Client type, such as "Full Instant Client"
-    * - CLIENT_VERSION
-      - "3.2.0.0.0" (the python-oracledb version number with an extra .0.0)
-      - The Oracle Client library version number
-    * - OSUSER
-      - "myusername"
-      - "myusername"
-
-.. _opentelemetry:
-
-Using python-oracledb with OpenTelemetry
-========================================
-
-The OpenTelemetry observability framework is useful for monitoring applications
-and identifying bottlenecks. Python-oracledb conforms to the `Python DB API
-specification <https://peps.python.org/pep-0249/>`__ allowing the OpenTelemetry
-Database API Instrumentation package `opentelemetry-instrumentation-dbapi
-<https://pypi.org/project/opentelemetry-instrumentation-dbapi/>`__ to
-automatically instrument your applications.
-
-OpenTelemetry's `backend trace exporters
-<https://opentelemetry.io/docs/languages/python/exporters/>`__ can provide
-graphic and intuitive representation of OpenTelemetry trace
-information. Recording and reporting tools include Zipkin, Jaeger, Grafana, and
-Prometheus. These make database query relationships and timings easier to
-analyze. Simple tracing can also be directed to the console by making use of
-the exporter ``ConsoleSpanExporter`` from the ``opentelemetry-sdk`` package, as
-shown in the example below.
-
-For details on using OpenTelemetry in Python, see `Python OpenTelemetry
-documentation <https://opentelemetry.io/docs/languages/python/>`_.
-
-Example of Using python-oracledb with OpenTelemetry
----------------------------------------------------
-
-This example shows a python-oracledb application using OpenTelemetry's
-``ConsoleSpanExporter`` exporter to display trace information to the console.
-
-**Installing OpenTelemetry Modules**
-
-For this example, install::
-
-    python -m pip install opentelemetry-sdk opentelemetry-api opentelemetry-instrumentation-dbapi
-
-**Sample Application**
-
-This simple application performs two queries in a custom span. It also sets the
-service name and system attributes to user-chosen values. It uses the
-``capture_parameters`` option to enable bind variable tracing.
-
-.. warning::
-
-   The trace integration setting ``capture_parameters=True`` captures
-   :ref:`bind variable values <bind>` and is a security risk.
-
-The sample code is:
-
-.. code-block:: python
-
-    import oracledb
-
-    from opentelemetry import trace
-    from opentelemetry.sdk.trace import TracerProvider
-    from opentelemetry.sdk.trace.export import (
-        BatchSpanProcessor,
-        ConsoleSpanExporter,
-    )
-    from opentelemetry.sdk.resources import Resource
-
-    user = "hr"
-    password = userpwd
-    host = "dbhost.example.com"
-    service_name = "orclpdb"
-
-    resource = Resource(attributes={
-        "service.name": service_name,   # displayed as a resource attribute "service.name"
-    })
-
-    provider = TracerProvider(resource=resource)
-    processor = BatchSpanProcessor(ConsoleSpanExporter())
-    provider.add_span_processor(processor)
-    trace.set_tracer_provider(provider)
-
-    from opentelemetry.instrumentation.dbapi import trace_integration
-
-    trace_integration(
-        oracledb,
-        connect_method_name="connect",
-        database_system="oracle",  # displayed as attribute "db.system"
-        capture_parameters=True,   # displays bind values as attribute "db.statement.parameters"
-                                   # SECURITY WARNING: this shows bind variable values
-    )
-
-    connection = oracledb.connect(user=user, password=password,
-                                  host=host, service_name=service_name)
-
-    with connection.cursor() as cursor:
-        tracer = trace.get_tracer("HR-tracer-name")
-        with tracer.start_as_current_span("HR-span-1") as span:
-            sql = "select city from locations where location_id = :1"
-            for r, in cursor.execute(sql, [2200]):
-                print(r)
-            sql = "select 'Hello World!' from dual"
-            for r, in cursor.execute(sql):
-                print(r)
-
-**Sample Output**
-
-The sample output will be like::
-
-    Sydney
-    Hello World!
-    {
-        "name": "select",
-        "context": {
-            "trace_id": "0xb24817cd2ea38ffa523c2ee2778508f7",
-            "span_id": "0xacfd82ed60e8976d",
-            "trace_state": "[]"
-        },
-        "kind": "SpanKind.CLIENT",
-        "parent_id": "0x19027598c301cfac",
-        "start_time": "2025-05-29T08:40:10.194645Z",
-        "end_time": "2025-05-29T08:40:10.209815Z",
-        "status": {
-            "status_code": "UNSET"
-        },
-        "attributes": {
-            "db.system": "oracle",
-            "db.name": "",
-            "db.statement": "select city from locations where location_id = :1",
-            "db.statement.parameters": "[2200]"
-        },
-        "events": [],
-        "links": [],
-        "resource": {
-            "attributes": {
-                "service.name": "orclpdb"
-            },
-            "schema_url": ""
-        }
-    }
-    {
-        "name": "select",
-        "context": {
-            "trace_id": "0xb24817cd2ea38ffa523c2ee2778508f7",
-            "span_id": "0x376dff430f66b14f",
-            "trace_state": "[]"
-        },
-        "kind": "SpanKind.CLIENT",
-        "parent_id": "0x19027598c301cfac",
-        "start_time": "2025-05-29T08:40:10.210799Z",
-        "end_time": "2025-05-29T08:40:10.214694Z",
-        "status": {
-            "status_code": "UNSET"
-        },
-        "attributes": {
-            "db.system": "oracle",
-            "db.name": "",
-            "db.statement": "select 'Hello World!' from dual"
-        },
-        "events": [],
-        "links": [],
-        "resource": {
-            "attributes": {
-                "service.name": "orclpdb"
-            },
-            "schema_url": ""
-        }
-    }
-    {
-        "name": "HR-span-1",
-        "context": {
-            "trace_id": "0xb24817cd2ea38ffa523c2ee2778508f7",
-            "span_id": "0x19027598c301cfac",
-            "trace_state": "[]"
-        },
-        "kind": "SpanKind.INTERNAL",
-        "parent_id": null,
-        "start_time": "2025-05-29T08:40:10.194536Z",
-        "end_time": "2025-05-29T08:40:10.214732Z",
-        "status": {
-            "status_code": "UNSET"
-        },
-        "attributes": {},
-        "events": [],
-        "links": [],
-        "resource": {
-            "attributes": {
-                "service.name": "orclpdb"
-            },
-            "schema_url": ""
-        }
-    }
-
-The two query results precede OpenTelemetry's tracing. The console tracing then
-shows:
-
-- The start and end time of each operation.
-
-- Each "select" trace block's association to the span "HR-span-1" via their
-  ``parent_id`` values, which match the span's ``span_id`` value. If you had
-  alternatively exported to a recording and tracing system like Zipkin, you
-  would be able to conveniently drill down into the spans.
-
-- The bind variable value *2200* in the attribute
-  ``db.statement.parameters``. *Warning*: it is a security risk to monitor bind
-  variable values this way. Keep the ``capture_parameters`` option set to
-  *False* in production applications.
-
-- The system and service name as set in the application.
-
-The Python OpenTelemetry modules allow further customization for tracing. See
-their documentation for more information.
-
-OpenTelemetry and extended python-oracledb functionality
---------------------------------------------------------
-
-Python-oracledb calls that are part of the Python DB API standard are
-automatically instrumented by ``opentelemetry-instrumentation-dbapi``.  For
-python-oracledb's great functionality that extends the standard, you can add
-explicit instrumentation. For example, to monitor a call to
-:meth:`Connection.fetch_df_all()`, add a tracer like:
-
-.. code-block:: python
-
-    tracer = trace.get_tracer(__name__)
-    with tracer.start_as_current_span("myDFQuery"):
-        sql = "select city from locations where country_id = :1"
-        odf = connection.fetch_df_all(sql, ['UK'])
-        print(odf.num_rows())
-
-The new OpenTelemetry span will be like::
-
-    {
-        "name": "myDFQuery",
-        "context": {
-            "trace_id": "0x8512a9fac568c07fc16cd872f68d0346",
-            "span_id": "0x03f424111825540f",
-            "trace_state": "[]"
-        },
-        "kind": "SpanKind.INTERNAL",
-        "parent_id": null,
-        "start_time": "2025-10-06T01:20:34.200129Z",
-        "end_time":   "2025-10-06T01:20:39.212618Z",
-        "status": {
-            "status_code": "UNSET"
-        },
-        "attributes": {},
-        "events": [],
-        "links": [],
-        "resource": {
-            "attributes": {
-                "service.name": "orclepdb",
-                "db.name": ""
-            },
-            "schema_url": ""
-        }
-    }
-
-.. _vsessconinfo:
-
-Finding the python-oracledb Mode
-================================
-
-The boolean attributes :attr:`Connection.thin` and :attr:`ConnectionPool.thin`
-can be used to find whether python-oracledb is in Thin or Thick mode.
-
-For example, to show the current python-oracledb mode:
-
-.. code-block:: python
-
-    print(connection.thin)
-
-The method :meth:`oracledb.is_thin_mode()` can also be used to find the
-mode. Immediately after python-oracledb is imported,
-:meth:`oracledb.is_thin_mode()` will return *True* indicating that
-python-oracledb defaults to Thin mode.  However if a call to
-:meth:`oracledb.init_oracle_client()` is made and it returns successfully, then
-:meth:`oracledb.is_thin_mode()` will return *False*, indicating that Thick mode
-is enabled.  Once the first standalone connection or connection pool is
-created, or a successful call to :meth:`~oracledb.init_oracle_client()` is
-made, or :meth:`oracledb.enable_thin_mode()` is called, then python-oracledb’s
-mode is fixed and the value returned by :meth:`oracledb.is_thin_mode()` will
-never change for the lifetime of the process.
-
-For example:
-
-.. code-block:: python
-
-    print(oracledb.is_thin_mode())
-    oracledb.init_oracle_client()
-    print(oracledb.is_thin_mode())
-
-If the call to :meth:`~oracledb.init_oracle_client()`, succeeds, the code above
-prints::
-
-    True
-    False
-
-Mode and version information can also be seen in the Oracle Database data
-dictionary table `V$SESSION_CONNECT_INFO
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-9F0DCAEA-A67E-4183-89E7-B1555DC591CE>`__:
-
-.. code-block:: python
-
-    with connection.cursor() as cursor:
-        sql = """SELECT UNIQUE client_driver
-                 FROM V$SESSION_CONNECT_INFO
-                 WHERE sid = SYS_CONTEXT('USERENV', 'SID')"""
-        for r, in cursor.execute(sql):
-            print(r)
-
-In python-oracledb Thin mode, the output will be like::
-
-    python-oracledb thn : 3.4.0
-
-In python-oracledb Thick mode, the output will be like::
-
-    python-oracledb thk : 3.4.0
-
-Note that you may not see these values if you have set
-:attr:`oracledb.defaults.driver_name <defaults.driver_name>` or the
-``driver_name`` parameter in :meth:`oracledb.init_oracle_client()`.
-
-The python-oracledb version can also be shown with
-:data:`oracledb.__version__`:
-
-.. code-block:: python
-
-    print(oracledb.__version__)
-
-Low Level Python-oracledb Driver Tracing
-========================================
-
-Low level tracing is mostly useful to maintainers of python-oracledb.
-
-- For python-oracledb Thin mode, packets can be traced by setting the
-  environment variable PYO_DEBUG_PACKETS in your terminal window before running
-  your application.
-
-  For example, on Linux, you might use::
-
-      export PYO_DEBUG_PACKETS=1
-
-  On Windows you might set the variable like::
-
-      set PYO_DEBUG_PACKETS=1
-
-  Alternatively, the variable can be set in the application:
-
-  .. code-block:: python
-
-      import os
-      os.environ["PYO_DEBUG_PACKETS"] = "1"
-      import oracledb
-
-  The output goes to stdout. The information logged is roughly similar to an
-  Oracle Net trace of level 16, see `Oracle Net Services TRACE_LEVEL_CLIENT
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-  GUID-1CC6424E-B3B5-4D55-A605-0C558496CBE0>`__.
-
-- Python-oracledb Thick mode can be traced using:
-
-  - DPI_DEBUG_LEVEL as documented in `ODPI-C Debugging
-    <https://odpi-c.readthedocs.io/en/latest/user_guide/debugging.html>`__.
-
-  - Oracle Call Interface (OCI) tracing as directed by Oracle Support.
-
-  - Oracle Net services tracing as documented in `Oracle Net Services Tracing
-    Parameters <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-    GUID-619D46BB-FE40-4EE1-8D5F-9E7666B23276>`__.
diff --git a/doc/src/user_guide/troubleshooting.rst b/doc/src/user_guide/troubleshooting.rst
deleted file mode 100644
index 824ccaec..00000000
--- a/doc/src/user_guide/troubleshooting.rst
+++ /dev/null
@@ -1,587 +0,0 @@
-.. _troubleshooting:
-
-.. currentmodule:: oracledb
-
-**********************
-Troubleshooting Errors
-**********************
-
-Use the troubleshooting information documented in this section to address
-common errors that may appear while :ref:`installing <instllntroubleshooting>`
-or :ref:`using <runtimetroubleshooting>` python-oracledb.
-
-This chapter does not list all possible errors.
-
-.. _instllntroubleshooting:
-
-Installation Errors
-===================
-
-You may encounter issues while installing python-oracledb. Review the
-python-oracledb :ref:`instreq`. To understand the problem better, you can
-display more output by using the ``-v`` option with the pip install command.
-Review your output and logs.
-
-If you need to modify your system version of Python and do not have the
-necessary access to modify it, then use:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --user
-
-Or you can use the venv module (built into Python 3.x).
-
-This section covers some specific errors or problems that you may run into
-during python-oracledb installation, and possible solutions to resolve them.
-
-If the installation problem still persists, then try to install
-python-oracledb using a different method. **Google anything that looks like an
-error.** Try some potential solutions.
-
-.. _wheelerr:
-
-"Not a supported wheel on this platform" Error
-----------------------------------------------
-
-**Cause:**  The python-oracledb installation failed with this error because
-you may be using an older version of ``pip``.
-
-**Action:** Upgrade your pip version with the following command:
-
-.. code-block:: shell
-
-    python -m pip install pip --upgrade --user
-
-.. _networkerr:
-
-Network Connection Error
-------------------------
-
-**Cause:**  The python-oracledb installation failed because of a network
-connection error.
-
-**Action:** To resolve this issue:
-
-- Check if you need to set the environment variables ``http_proxy`` and/or
-  ``https_proxy``.
-
-- Or try the following command:
-
-  .. code-block:: shell
-
-        python -m pip install --proxy=http://proxy.example.com:80 oracledb --upgrade
-
-.. _upgradeerr:
-
-Upgrade to Latest Version Failed Without Any Errors
----------------------------------------------------
-
-**Cause:**  The upgrade to the latest python-oracledb version failed without
-any errors because the old version is still installed.
-
-**Action:** To reinstall the latest version, try the following command:
-
-.. code-block:: shell
-
-    python -m pip install oracledb --upgrade --force-reinstall
-
-.. _nomodpiperr:
-
-"No module named pip" Error
----------------------------
-
-**Cause:**  The python-oracledb installation failed with this error because
-the pip module that is built into Python may sometimes be removed by the OS.
-
-**Action:** Instead, use the venv module (built into Python 3.x) or virtualenv
-module.
-
-.. _dpiherr:
-
-"fatal error: dpi.h: No such file or directory" Error
------------------------------------------------------
-
-**Cause:**  The python-oracledb installation from source code failed because a
-subdirectory called "odpi" may be missing.
-
-**Action:** Check if your source installation has a subdirectory called
-"odpi" containing files. If this is missing, review the section on
-:ref:`installgh`.
-
-.. _warningmsgs:
-
-Warning Messages
-================
-
-Some warnings may appear while using python-oracledb in Thick or Thin mode.
-
-.. _pythwarning:
-
-Deprecated Python Version Warning
----------------------------------
-
-**Warning:** ``Python 3.6 is no longer supported by the Python core team.
-Therefore, support for it is deprecated in python-oracledb and will be removed
-in a future release.`` (A similar warning will also be displayed for Python
-versions 3.7 and 3.8.)
-
-**Cause:** ``import oracledb`` gives this warning because you are using a
-version of Python that is longer maintained by the Python core team.
-
-**Action:**  You can either:
-
-- Upgrade your Python version to 3.9 or later.
-
-- Or you can temporarily suppress the warning by importing the
-  `warnings <https://docs.python.org/3/library/warnings.html>`__ module and
-  adding a call like ``warnings.filterwarnings(action='ignore',
-  module="oracledb")`` *before* importing ``oracledb``.
-
-- Install an older version of python-oracledb
-
-.. _runtimetroubleshooting:
-
-Error Messages
-==============
-
-While using python-oracledb in Thin or Thick mode, you may encounter
-errors. Some common :ref:`DPI <dpierr>`, :ref:`DPY <dpyerr>`, and :ref:`ORA
-<oraerr>` errors are detailed in this section with information about the
-probable cause of the error, and the recommended action which may resolve the
-error.
-
-If you have multiple versions of Python installed, ensure that you are
-using the correct python and pip (or python3 and pip3) executables.
-
-.. _dpierr:
-
-DPI Error Messages
-------------------
-
-The error messages with prefix ``DPI`` are generated by the
-`ODPI-C <https://oracle.github.io/odpi/>`_ code which is used by the
-python-oracledb Thick mode.
-
-Some common DPI error messages are discussed below.
-
-.. _dpi1047:
-
-DPI-1047
-++++++++
-
-**Message:** ``DPI-1047: Oracle Client library cannot be loaded``
-
-**Cause:**   The connection to Oracle Database failed because the Oracle Client
-library could not be loaded.
-
-**Action:**  Perform the following steps:
-
-- Review the :ref:`features available in python-oracledb's default Thin mode
-  <featuresummary>`. If Thin mode suits your requirements, then remove the
-  calls in your application to :meth:`oracledb.init_oracle_client()` since
-  this loads the Oracle Client library to :ref:`enable Thick mode
-  <enablingthick>`.
-
-- On Windows and macOS, pass the ``lib_dir`` library directory parameter
-  in your :meth:`oracledb.init_oracle_client()` call. The parameter
-  should be the location of your Oracle Client libraries. Do not pass
-  this parameter on Linux.
-
-- Check if the Python process has permission to open the Oracle Client
-  libraries. OS restrictions may prevent the opening of libraries installed
-  in unsafe paths, such as from a user directory. On Linux you may need to
-  install the Oracle Client libraries under a directory like ``/opt`` or
-  ``/usr/local``.
-
-- Check if Python and your Oracle Client libraries are both 64-bit or
-  both 32-bit. The ``DPI-1047`` message will tell you whether the 64-bit
-  or 32-bit Oracle Client is needed for your Python.
-
-- If you are using Oracle Instant Client libraries (and not using a full
-  Oracle Database installation or a full Oracle Instant Client installation
-  (such as installed by Oracle's GUI installer)), check whether the
-  ``ORACLE_HOME`` environment variable is set. If it is, unset this variable.
-
-- Set the environment variable ``DPI_DEBUG_LEVEL`` to 64 and restart
-  python-oracledb. The trace messages will show how and where
-  python-oracledb is looking for the Oracle Client libraries.
-
-  At a Windows command prompt, this could be done with::
-
-        set DPI_DEBUG_LEVEL=64
-
-  On Linux and macOS, you might use::
-
-        export DPI_DEBUG_LEVEL=64
-
-- On Windows:
-
-  - If you have a full database installation, ensure that this database is the
-    `currently configured database <https://docs.oracle.com/pls/topic/lookup?
-    ctx=db21&id=RIWIN-GUID-33D575DD-47FF-42B1-A82F-049D3F2A8791>`__.
-
-  - If you are not passing a library directory parameter to
-    :meth:`oracledb.init_oracle_client()`, then restart your command prompt
-    and use ``set PATH`` to check if the environment variable has the correct
-    Oracle Client listed before any other Oracle directories.
-
-  - Use the ``DIR`` command to verify that ``OCI.DLL`` exists in the directory
-    passed to :meth:`oracledb.init_oracle_client()` or set in ``PATH``.
-
-  - Check if the correct `Windows Redistributables <https://oracle.github.io/odpi/
-    doc/installation.html#windows>`__ have been installed.
-
-- On Linux:
-
-  - Check if the ``LD_LIBRARY_PATH`` environment variable contains the Oracle
-    Client library directory. Some environments such as web servers and
-    daemons reset environment variables.
-
-  - If you are using Oracle Instant Client, a preferred alternative to
-    ``LD_LIBRARY_PATH`` is to ensure that a file in the ``/etc/ld.so.conf.d``
-    directory contains the path to the Instant Client directory, and then run
-    ``ldconfig``.
-
-DPI-1072
-++++++++
-
-**Message:** ``DPI-1072: the Oracle Client library version is unsupported``
-
-**Cause:**  The connection to Oracle Database failed because the Oracle Client
-library version used is not supported by python-oracledb Thick mode. The Thick
-mode needs Oracle Client library 11.2 or later.
-
-**Action:** Review the :ref:`instreq`. You can either:
-
-- Follow the steps documented in :ref:`DPI-1047 <dpi1047>` which may help.
-
-- Or may be use python-oracledb Thin mode which can be done by removing calls
-  to :meth:`oracledb.init_oracle_client()` from your code.
-
-.. _dpyerr:
-
-DPY Error Messages
-------------------
-
-The python-oracledb Thin mode code and python-oracledb Thick mode code
-generates error messages with the prefix ``DPY``.
-
-Some common DPY error messages are discussed below.
-
-.. _dpy3001:
-
-DPY-3001
-++++++++
-
-**Message:** ``DPY-3001: <feature> is only supported in python-oracledb <mode>``
-
-This error is diplayed when you attempt to use a feature in a python-oracledb
-driver mode that does not support it.
-
-Some common examples are listed below.
-
-Native Network Encryption and Data Integrity Error
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Message:** ``DPY-3001: Native Network Encryption and Data Integrity is only
-supported in python-oracledb thick mode``
-
-**Cause:** The connection to Oracle Database failed because NNE or checksumming
-may be enabled in your Oracle Database and python-oracledb Thin mode does not
-support NNE.
-
-**Action:** To verify if NNE or checksumming are enabled, you can use the
-following query::
-
-    SELECT network_service_banner FROM v$session_connect_info;
-
-If NNE is enabled, then this query prints output that includes the
-available encryption service, the crypto-checksumming service, and the
-algorithms in use, such as::
-
-    NETWORK_SERVICE_BANNER
-    -------------------------------------------------------------------------------------
-    TCP/IP NT Protocol Adapter for Linux: Version 19.0.0.0.0 - Production
-    Encryption service for Linux: Version 19.0.1.0.0 - Production
-    AES256 Encryption service adapter for Linux: Version 19.0.1.0.0 - Production
-    Crypto-checksumming service for Linux: Version 19.0.1.0.0 - Production
-    SHA256 Crypto-checksumming service adapter for Linux: Version 19.0.1.0.0 - Production
-
-If NNE is not enabled, then the query will only print the available encryption
-and crypto-checksumming services in the output. For example::
-
-    NETWORK_SERVICE_BANNER
-    -------------------------------------------------------------------------------------
-    TCP/IP NT Protocol Adapter for Linux: Version 19.0.0.0.0 - Production
-    Encryption service for Linux: Version 19.0.1.0.0 - Production
-
-If NNE or checksumming are enabled, you can resolve this error by either:
-
-- Changing the architecture to use Transport Layer Security (TLS), which is
-  supported in python-oracledb Thin and Thick modes. See `Configuring
-  Transport Layer Security Encryption
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-8B82DD7E-7189-4FE9-8F3B-4E521706E1E4>`__.
-- Or :ref:`enabling python-oracledb Thick mode <enablingthick>`.
-
-.. seealso::
-
-    `Oracle AI Database Security Guide <https://www.oracle.com/pls/topic/lookup?
-    ctx=dblatest&id=DBSEG>`__ for more information about Oracle Data Network
-    Encryption and Integrity, and for information about configuring TLS
-    network encryption.
-
-Bequeath Error
-^^^^^^^^^^^^^^
-
-**Message:** ``DPY-3001: Bequeath is only supported in python-oracledb thick
-mode``
-
-**Cause:** The connection to Oracle Database failed because python-oracledb
-Thin mode does not support bequeath connections or because the connection
-string was not specified in the  ``dsn`` parameter during connection creation.
-
-**Action:** You can either:
-
-- Specify a valid connection string in the ``dsn`` parameter during connection
-  creation to continue using python-oracledb Thin mode.
-
-- Or :ref:`enable python-oracledb Thick mode <enablingthick>` since this mode
-  can use bequeath connections. For Thick mode, you need to install Oracle
-  Client libraries and call :meth:`oracledb.init_oracle_client()` in your code.
-
-DPY-3010
-++++++++
-
-**Message:** ``DPY-3010: connections to this database server version are not
-supported by python-oracledb in thin mode``
-
-**Cause:**  The connection to Oracle Database with python-oracledb Thin mode
-failed because you are using Oracle Database version 11.2 or earlier. Using
-python-oracledb Thin mode, you can connect directly to Oracle Database 12.1
-or later.
-
-**Action:** You can either:
-
-- :ref:`Enable python-oracledb Thick mode <enablingthick>` since this mode can
-  connect to Oracle Database 9.2 or later. For Thick mode, you need to install
-  Oracle Client libraries and call :meth:`oracledb.init_oracle_client()` in
-  your code.
-
-- Upgrade Oracle Database to 12.1, or later, if you want to use python-oracledb
-  Thin mode.
-
-DPY-3015
-++++++++
-
-**Message:** ``DPY-3015: password verifier type 0x939 is not supported by
-python-oracledb in thin mode``
-
-**Cause:** The connection to Oracle Database with python-oracledb Thin mode
-failed because your database user account was only created with the Oracle
-Database 10G password verifier. Python-oracledb Thin mode supports password
-verifiers 11G and later.
-
-**Action:** You can either:
-
-- :ref:`Enable Thick mode <enablingthick>` since python-oracledb Thick mode
-  supports password verifiers 10G and later.
-
-- Or you can:
-
-  1. Ensure that the database initialization parameter
-     ``sec_case_sensitive_logon`` is not *FALSE*. To check the value, connect
-     as SYSDBA in SQL*Plus and run::
-
-        show parameter sec_case_sensitive_logon
-
-    Note this parameter was `removed in Oracle Database 21c
-    <https://docs.oracle.com/en/database/oracle/oracle-database/21/nfcon/
-    security-solutions.html#GUID-FAF4C7A6-A2CD-4B9B-9A64-3705F693ECF0>`__
-    so only step 2 is required for this, or subsequent, database versions.
-
-  2. Regenerate passwords for users who have old password verifiers. You can
-     find such users with the query:
-
-     .. code-block:: sql
-
-        select username from dba_users
-        where (password_versions = '10G ' or password_versions = '10G HTTP ')
-        and username <> 'ANONYMOUS';
-
-     You can reset passwords for these users with commands like::
-
-        alter user x identified by y;
-
-     .. seealso::
-
-        `Finding and Resetting User Passwords That Use the 10G Password
-        Version <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-        GUID-D7B09DFE-F55D-449A-8F8A-174D89936304>`__ for more information.
-
-DPY-3029
-++++++++
-
-**Message:** ``DPY-3029: "{name}" includes characters that are not allowed``
-
-**Cause:** Characters were used that are not supported by Oracle Net in the
-shown connection or configuration parameter or attribute.
-
-**Action:** Values should be ASCII letters or digits. Allowed special
-characters are ``'<>/,.:;-_$+*#&!%?@``. Values should not contain enclosing
-quotes. Also remove trailing commas and trailing backslashes.
-
-.. _dpy4011:
-
-DPY-4011
-++++++++
-
-**Message:** ``DPY-4011: the database or network closed the connection``
-
-**Cause:** If this occurs when using an already opened connection, additional
-messages may indicate a reason.
-
-If the error occurs when creating a connection or connection pool with
-python-oracledb 2 or earlier in Thin mode, the common cause is that Oracle
-Database has Native Network Encryption (NNE) enabled. Later versions of
-python-oracledb give the error :ref:`dpy3001` for this scenario. NNE and Oracle
-Net checksumming are only supported in python-oracledb Thick mode.
-
-The error has been seen to occur if the database cannot handle the number of
-connections being opened.
-
-**Action:** Review if NNE or checksumming are enabled. See
-:ref:`DPY-3001 <dpy3001>` for solutions.
-
-If connection load is an issue, then reconfigure the database or reduce
-connection load. Review the :ref:`connpoolsize` best practices and keep pool
-sizes small. When multiple python process need to open connection pools, then
-:ref:`drcp` may be a solution.
-
-If additional messages indicate a reason, follow their guidance.
-
-DPY-4027
-++++++++
-
-**Message:** ``DPY-4027: no configuration directory specified``
-
-**Cause:** The :ref:`connection string <connstr>` specified in your connection
-or pool creation ``dsn`` parameter was interpreted by python-oracledb to be a
-:ref:`TNS Alias <netservice>` which it needed to look up in a
-:ref:`tnsnames.ora <optnetfiles>` file. However, python-oracledb did not know
-where to find that file.
-
-**Action:** You need to either tell python-oracledb where to find the
-:ref:`tnsnames.ora <optnetfiles>` file, or use a different connection string
-syntax. Perform one of the following:
-
-- Use the equivalent :ref:`Easy Connect syntax <easyconnect>` or :ref:`Connect
-  Descriptor <conndescriptor>`:
-
-  .. code-block:: python
-
-      c = oracledb.connect(user="hr", password=userpw, dsn="localhost:1521/orclpdb")
-
-  Or:
-
-  .. code-block:: python
-
-      c = oracledb.connect(user="hr", password=userpw, dsn="(DESCRIPTION=(ADDRESS=(...))")
-
-- Review the :attr:`oracledb.defaults.config_dir <Defaults.config_dir>`
-  documentation for the heuristics used by python-oracledb to automatically
-  locate :ref:`tnsnames.ora <optnetfiles>`. Ensure that your file is in an
-  expected location, that the file is readable by Python, and that any
-  necessary environment variables such as ``TNS_ADMIN`` are accessible by the
-  Python process.
-
-- If you have problems with the heuristics, then you can explicitly specify the
-  location of :ref:`tnsnames.ora <optnetfiles>`. For example, if the file is at
-  ``/opt/myconfigdir/tnsnames.ora``, then:
-
-  - In python-oracledb's default Thin mode, or when
-    :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-    <Defaults.thick_mode_dsn_passthrough>` is *False*, you can use:
-
-    .. code-block:: python
-
-        c = oracledb.connect(user="hr", password=userpw, dsn="MYDB",
-                             config_dir="/opt/myconfigdir")
-
-  - In python-oracledb's :ref:`Thick mode <enablingthick>` (which is the mode
-    when your application calls :func:`oracledb.init_oracle_client()`), then you
-    can use:
-
-    .. code-block:: python
-
-        oracledb.init_oracle_client(config_dir="/opt/myconfigdir")
-        c = oracledb.connect(user="hr", password=userpw, dsn="MYDB")
-
-.. _oraerr:
-
-ORA Error Messages
-------------------
-
-Some common ORA error messages are discussed below.
-
-ORA-00933
-+++++++++
-
-**Message:** ``ORA-00933: SQL command not properly ended`` or
-``ORA-00933: unexpected keyword at or near <keyword_value>``
-
-**Cause:** Commonly this error occurs when the SQL statement passed to Oracle
-Database contains a trailing semicolon.
-
-**Action:** If your code is like:
-
-.. code-block:: python
-
-    cursor.execute("select * from dept;")
-
-Then remove the trailing semi-colon:
-
-.. code-block:: python
-
-    cursor.execute("select * from dept")
-
-Note with Oracle Database version 23 this incorrect usage gives the message
-``ORA-03048: SQL reserved word ';' is not syntactically valid following
-'select * from dept'``.
-
-.. seealso::
-
-   For other causes and solutions see `Database Error Messages ORA-00933
-   <https://docs.oracle.com/error-help/db/ora-00933/>`__
-
-ORA-01805
-+++++++++
-
-**Message:** ``ORA-01805: possible error in date/time operation``
-
-**Cause:** This error occurs in python-oracledb Thick mode when you use the
-TIMESTAMP WITH TIMEZONE data type, and use a named time zone offset, and the
-time zone file version of the client libraries and the database are different.
-
-**Action:** Use the same time zone file version with the client libraries and
-the database, see :ref:`timezonefiles`.
-
-The use of a numeric time zone offset can be a workaround to the problem, but
-this can lead to undesired values being used when Daylight Savings Time begins
-or ends.
-
-ORA-28009
-+++++++++
-
-**Message:** ``ORA-28009: connection as SYS should be as SYSDBA or SYSOPER``
-
-**Cause:** Commonly this error occurs when you try to create a connection pool
-using :data:`oracledb.AUTH_MODE_SYSDBA` in python-oracledb Thick mode.
-
-**Action:** Use a :ref:`standalone connection <standaloneconnection>`.
-Alternatively, use python-oracledb Thin mode by removing all calls to
-:func:`oracledb.init_oracle_client()`.
-
-.. seealso::
-
-   For other causes and solutions see `Database Error Messages ORA-28009
-   <https://docs.oracle.com/error-help/db/ora-28009/>`__
diff --git a/doc/src/user_guide/tuning.rst b/doc/src/user_guide/tuning.rst
deleted file mode 100644
index 4fdf4aca..00000000
--- a/doc/src/user_guide/tuning.rst
+++ /dev/null
@@ -1,690 +0,0 @@
-.. _tuning:
-
-.. currentmodule:: oracledb
-
-***********************
-Tuning python-oracledb
-***********************
-
-Some general tuning tips are:
-
-* Tune your application architecture.
-
-  A general application goal is to reduce the number of :ref:`round-trips
-  <roundtrips>` between python-oracledb and the database.
-
-  For multi-user applications, make use of connection pooling.  Create the pool
-  once during application initialization.  Do not oversize the pool, see
-  :ref:`connpooling`.  Use a session callback function to set session state,
-  see
-  :ref:`Session Callbacks for Setting Pooled Connection State <sessioncallback>`.
-
-  Make use of efficient python-oracledb functions. For example, to insert
-  multiple rows use :meth:`Cursor.executemany()` instead of
-  :meth:`Cursor.execute()`. Alternatively use
-  :meth:`Connection.direct_path_load()` for inserting very large
-  datasets. Another example is to fetch data directly as :ref:`data frames
-  <dataframeformat>` instead of using the traditional query code path when
-  working with packages like Pandas and NumPy.
-
-* Tune your SQL statements.  See the `SQL Tuning Guide
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=TGSQL>`__.
-
-  Use :ref:`bind variables <bind>` to avoid statement reparsing.
-
-  Tune :attr:`Cursor.arraysize` and :attr:`Cursor.prefetchrows` for each SELECT
-  query, see :ref:`Tuning Fetch Performance <tuningfetch>`.
-
-  Do simple optimizations like :ref:`limiting the number of rows <rowlimit>`
-  and avoiding selecting columns not used in the application.
-
-  It may be faster to work with simple scalar relational values than to use
-  Oracle Database object types.
-
-  Make good use of PL/SQL to avoid executing many individual statements from
-  python-oracledb.
-
-  Tune the :ref:`Statement Cache <stmtcache>`.
-
-  Enable :ref:`Client Result Caching <clientresultcache>` for small lookup
-  tables.
-
-* Tune your database.  See the `Database Performance Tuning Guide
-  <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=TGDBA>`__.
-
-* Tune your network.  For example, when inserting or retrieving a large number
-  of rows (or for large data), or when using a slow network, then tune the
-  Oracle Network Session Data Unit (SDU) and socket buffer sizes, see
-  `Configuring Session Data Unit <https://www.oracle.com/pls/topic/lookup?ctx=
-  dblatest&id=GUID-86D61D6F-AD26-421A-BABA-77949C8A2B04>`__ and `Oracle Net
-  Services: Best Practices for Database Performance and High Availability
-  <https://static.rainfocus.com/oracle/oow19/sess/1553616880266001WLIh/PF/
-  OOW19_Net_CON4641_1569022126580001esUl.pdf>`__.
-
-  In python-oracledb Thick mode, the SDU size is configured in the
-  :ref:`optnetfiles`. In python-oracledb Thin mode, the SDU size can be passed
-  as a connection or pool creation parameter.  In both modes it may optionally
-  be set in the connection :ref:`Easy Connect string <easyconnect>` or
-  :ref:`connect descriptor <conndescriptor>`. The SDU size that will actually
-  be used is negotiated down to the lower of application-side value and the
-  database network SDU configuration value.
-
-* Do not commit or rollback unnecessarily.  Use :attr:`Connection.autocommit`
-  on the last of a sequence of DML statements.
-
-* Consider using :ref:`concurrent programming <concurrentprogramming>` or
-  :ref:`pipelining <pipelining>`.
-
-* If Python's Global Interpreter Lock (GIL) is limiting concurrent program
-  performance, then explore using parallel Python processes.
-
-.. _tuningfetch:
-
-Tuning Fetch Performance
-========================
-
-To improve application performance and scalability, you can set
-:attr:`Cursor.prefetchrows` and :attr:`Cursor.arraysize` to adjust
-python-oracledb's internal buffers used for SELECT and REF CURSOR query
-results. Increasing the sizes causes bigger batches of rows to be fetched by
-each internal request to the database. This reduces the number of
-:ref:`round-trips <roundtrips>` required. The performance benefit of larger
-buffer sizes can be significant when fetching lots of rows, or when using a
-slow network. The database also benefits from reduced overheads.
-
-Internally, python-oracledb always does row prefetching and array fetching.
-Row prefetching is when rows are returned from the database in the round-trip
-used for initial statement execution. Rows are then available in an internal
-buffer for the application to consume. Without prefetching, the first set of
-rows would have to fetched from the database using a separate round-trip. When
-all rows in the prefetch buffer have been consumed by the application, the next
-set of rows are internally fetched into a buffer using an array fetch which
-takes one round-trip. These rows are made available to the application when it
-wants them. After the initial array fetch buffer has been emptied, further
-array fetches into the buffer occur as needed to completely retrieve all rows
-from the database.
-
-Changing the buffer sizes with :attr:`~Cursor.prefetchrows` and
-:attr:`~Cursor.arraysize` affects the internal buffering behavior of
-:meth:`Cursor.fetchone()`, :meth:`Cursor.fetchmany()`, and
-:meth:`Cursor.fetchall()`. The attribute values do not affect how rows are
-returned to the application with the exception of :meth:`Cursor.fetchmany()`,
-where :attr:`Cursor.arraysize` is also used as the default for its ``size``
-parameter.
-
-An overhead of row prefetching in python-oracledb Thick mode is the use of a
-separate buffer from the array fetch buffer, increasing the memory
-requirements. Also, an additional data copy from Oracle Client's prefetch
-buffer is performed. These costs may outweigh the benefits of using prefetching
-in some cases.
-
-SELECT queries that return :ref:`LOB <lobobj>` objects and similar types will
-never prefetch rows, so the :attr:`~Cursor.prefetchrows` value is ignored in
-those cases.
-
-The attributes do not affect data insertion. To reduce round-trips for DML
-statements, see :ref:`batchstmnt`.
-
-Choosing values for ``arraysize`` and ``prefetchrows``
-------------------------------------------------------
-
-Tune "array fetching" with :attr:`Cursor.arraysize`. Tune "row prefetching"
-with :attr:`Cursor.prefetchrows`. Set these before calling
-:meth:`Cursor.execute()`. Also, see :ref:`defprefarray`.
-
-The best :attr:`~Cursor.arraysize` and :attr:`~Cursor.prefetchrows` values can
-be found by benchmarking your application under production load. Here are
-starting suggestions for four common scenarios:
-
-* Scenario 1: To tune queries that return an unknown and large number of rows,
-  increase the :attr:`~Cursor.arraysize` value from its default of 100 until
-  you are satisfied with performance, memory, and round-trip usage. For example:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-
-      # cursor.prefetchrows = 2  # generally leave this at its default
-      cursor.arraysize = 1000
-
-      for row in cursor.execute("select * from very_big_table"):
-          print(row)
-
-  In general for this scenario, leave :attr:`~Cursor.prefetchrows` at its
-  default value.  If you do change it, then set :attr:`Cursor.arraysize` to a
-  bigger value.  Do not make the sizes unnecessarily large.
-
-* Scenario 2: If you are fetching a fixed number of rows, set
-  :attr:`~Cursor.arraysize` to the number of expected rows, and set
-  :attr:`~Cursor.prefetchrows` to one greater than this value.  Adding one
-  removes the need for a round-trip to check for end-of-fetch.  For example, if
-  you are using a SELECT query to retrieve 20 rows, perhaps to :ref:`display a
-  page <rowlimit>` of data, then set :attr:`~Cursor.prefetchrows` to 21 and
-  :attr:`~Cursor.arraysize` to 20:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-
-      cursor.prefetchrows = 21
-      cursor.arraysize = 20
-
-      for row in cursor.execute("""
-          select last_name
-             from employees
-             order by last_name
-             offset 0 rows fetch next 20 rows only"""):
-          print(row)
-
-  This will return all rows for the query in one round-trip.
-
-* Scenario 3: If the number of rows returned by a SELECT statement varies from
-  execution to execution in your application but is never large, you can use a
-  similar strategy to Scenario 2.
-
-  Choose :attr:`~Cursor.arraysize` and :attr:`~Cursor.prefetchrows` values that
-  work well for the expected maximum number of rows.
-
-* Scenario 4: If you know that a SELECT query returns just one row then set
-  :attr:`~Cursor.arraysize` to 1 to minimize memory usage. The default prefetch
-  value of 2 allows minimal round-trips for single-row queries:
-
-  .. code-block:: python
-
-      cursor = connection.cursor()
-
-      cursor.arraysize = 1
-
-      cursor.execute("select * from MyTable where id = 1"):
-      row = cursor.fetchone()
-      print(row)
-
-**Round-trips Required for Fetching Rows**
-
-The following table shows the number of round-trips required to fetch various
-numbers of rows with different :attr:`~Cursor.prefetchrows` and
-:attr:`~Cursor.arraysize` values.
-
-.. list-table-with-summary::  Effect of ``prefetchrows`` and ``arraysize`` on the number of round-trips
-    :header-rows: 1
-    :class: wy-table-responsive
-    :align: center
-    :summary: The first column is the number of rows used for the example.  The second column is the prefetchrows value.  The third column is the arraysize value.  The final column shows how many round-trips it would take to fetch all data from the database.
-
-    * - Number of rows
-      - ``prefetchrows``
-      - ``arraysize``
-      - Round-trips
-    * - 1
-      - 2
-      - 100
-      - 1
-    * - 100
-      - 2
-      - 100
-      - 2
-    * - 1000
-      - 2
-      - 100
-      - 11
-    * - 10000
-      - 2
-      - 100
-      - 101
-    * - 10000
-      - 2
-      - 1000
-      - 11
-    * - 10000
-      - 1000
-      - 1000
-      - 11
-    * - 20
-      - 20
-      - 20
-      - 2
-    * - 20
-      - 21
-      - 20
-      - 1
-
-The number of round-trips will be the same regardless of which
-:ref:`python-oracledb method <fetching>` is used to fetch query results.
-
-.. _defprefarray:
-
-Application Default Prefetchrows and Arraysize Values
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Application-wide defaults can be set using
-:attr:`oracledb.defaults.prefetchrows <Defaults.prefetchrows>` and
-:attr:`oracledb.defaults.arraysize <Defaults.arraysize>`, for example:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.defaults.prefetchrows = 1000
-    oracledb.defaults.arraysize    = 1000
-
-When using python-oracledb in Thick mode, prefetching can also be tuned in an
-external :ref:`oraaccess.xml <optclientfiles>` file, which may be useful for
-tuning an application when modifying its code is not feasible.
-
-Setting the sizes with ``oracledb.defaults`` attributes or with
-``oraaccess.xml`` will affect the whole application, so it should not be the
-first tuning choice.
-
-Changing Prefetchrows and Arraysize for Re-executed Statements
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-In python-oracledb, the :attr:`~Cursor.prefetchrows` and
-:attr:`~Cursor.arraysize` values are only examined when a statement is executed
-the first time.  To change the values for a re-executed statement, create a new
-cursor.  For example, to change :attr:`~Cursor.arraysize`:
-
-.. code-block:: python
-
-    array_sizes = (10, 100, 1000)
-    for size in array_sizes:
-        cursor = connection.cursor()
-        cursor.arraysize = size
-        start = time.time()
-        cursor.execute(sql).fetchall()
-        elapsed = time.time() - start
-        print("Time for", size, elapsed, "seconds")
-
-Avoiding Premature Prefetching
-++++++++++++++++++++++++++++++
-
-There are two cases that will benefit from setting :attr:`~Cursor.prefetchrows`
-to zero:
-
-* When passing a python-oracledb cursor *into* PL/SQL.  Setting
-  :attr:`~Cursor.prefetchrows` to 0 can stop rows being prematurely (and
-  silently) fetched into the python-oracledb internal buffer, making those rows
-  unavailable to the PL/SQL REF CURSOR parameter::
-
-    refcursor = connection.cursor()
-    refcursor.prefetchrows = 0
-    refcursor.execute("select ...")
-    cursor.callproc("myproc", [refcursor])
-
-* When querying a PL/SQL function that uses PIPE ROW to emit rows at
-  intermittent intervals.  By default, several rows needs to be emitted by the
-  function before python-oracledb can return them to the application.  Setting
-  :attr:`~Cursor.prefetchrows` to 0 helps give a consistent flow of data to the
-  application.
-
-Tuning Fetching from REF CURSORS
---------------------------------
-
-The internal buffering and performance of fetching data from REF CURSORS can be
-tuned by setting the value of :attr:`~Cursor.arraysize` before rows are fetched
-from the cursor. The :attr:`~Cursor.prefetchrows` value is ignored when
-fetching *from* REF CURSORS.
-
-For example:
-
-.. code-block:: python
-
-    ref_cursor = connection.cursor()
-    cursor.callproc("myrefcursorproc", [ref_cursor])
-
-    ref_cursor.arraysize = 1000
-    print("Sum of IntCol for", num_rows, "rows:")
-    for row in ref_cursor:
-        sum_rows += row[0]
-    print(sum_rows)
-
-The :attr:`Cursor.arraysize`` value can also be set before calling the
-procedure:
-
-.. code-block:: python
-
-    ref_cursor = connection.cursor()
-    ref_cursor.arraysize = 1000
-
-    cursor.callproc("myrefcursorproc", [ref_cursor])
-    for row in ref_cursor:
-        . . .
-
-Also see `Avoiding Premature Prefetching`_.
-
-Tuning Fetching for Data Frames
--------------------------------
-
-When fetching :ref:`data frames <dataframeformat>` with
-:meth:`Connection.fetch_df_all()` or :meth:`Connection.fetch_df_batches()`,
-tuning of data transfer across the network is controlled by the respective
-methods ``arraysize`` or ``size`` parameters.
-
-Any :attr:`oracledb.defaults.prefetchrows <Defaults.prefetchrows>` value is
-ignored since these methods always set the internal prefetch size to the
-relevant ``arraysize`` or ``size`` value.
-
-Parallelizing Data Fetches from a Single Table
-----------------------------------------------
-
-Before trying to improve the performance of querying a single table by issuing
-multiple SELECT queries in multiple threads, where each query extracts a
-different range of data, you should do careful benchmarking.
-
-Factors that will impact such a solution:
-
-- How heavily loaded is the database? The parallel solution may appear to be
-  fast but it could be inefficient, thereby impacting, or eventually being
-  limited by, everyone else.
-
-- A single python-oracledb connection can only do one database operation at a
-  time, so you need to use a different connection for each executed SQL
-  statement, for example, using connections from a :ref:`pool
-  <connpooling>`. This will cause extra database load that needs to be
-  assessed.
-
-- A naive solution using the OFFSET FETCH syntax to fetch sections of a table
-  in individual queries will still cause table blocks to be scanned even though
-  not all data is returned.
-
-- Is the table partitioned?
-
-- Are zone maps being used?
-
-- Maybe the real performance bottleneck cannot be solved by parallelism.
-  Perhaps you have function based indexes that are being invoked for every
-  row.
-
-- Is the data in the database spread across multiple spindles or is the one
-  disk having to seek?
-
-- Is Exadata with storage indexes being used?
-
-- What is the impact of Python’s Global Interpreter Lock (GIL)?  Maybe multiple
-  Python processes should be used instead of threads.
-
-- What is the application doing with the data? Can the receiving end
-  efficiently process it?
-
-- Is it better to execute a single query in Python but use a PARALLEL query
-  hint? Or will this overload the database.
-
-.. _roundtrips:
-
-Database Round-trips
-====================
-
-A round-trip is defined as the travel of a message from python-oracledb to the
-database and back. Calling each python-oracledb function, or accessing each
-attribute, will require zero or more round-trips.  For example, inserting a
-simple row involves sending data to the database and getting a success response
-back.  This is a round-trip. Along with tuning an application's architecture
-and `tuning its SQL statements
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=TGSQL>`__, a general
-performance and scalability goal is to minimize `round-trips
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-9B2F05F9-D841-
-4493-A42D-A7D89694A2D1>`__ because they impact application performance and
-overall system scalability.
-
-Some general tips for reducing round-trips are:
-
-* Tune :attr:`Cursor.arraysize` and :attr:`Cursor.prefetchrows` for each
-  SELECT query.
-* Use :meth:`Cursor.executemany()` for optimal DML execution.
-* Only commit when necessary.  Use :attr:`Connection.autocommit` on the last
-  statement of a transaction.
-* For connection pools, use a callback to set connection state, see
-  :ref:`Session Callbacks for Setting Pooled Connection State
-  <sessioncallback>`.
-* Make use of PL/SQL procedures which execute multiple SQL statements instead
-  of executing them individually from python-oracledb.
-* Review whether :ref:`Pipelining <pipelining>` can be used.
-* Use scalar types instead of Oracle Database object types.
-* Avoid overuse of :meth:`Connection.ping()`.
-* Avoid setting :attr:`ConnectionPool.ping_interval` to 0 or a small value.
-* When using :ref:`SODA <sodausermanual>`, use pooled connections and enable
-  the :ref:`SODA metadata cache <sodametadatacache>`.
-
-Finding the Number of Round-Trips
-----------------------------------
-
-Oracle's `Automatic Workload Repository <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-56AEF38E-9400-427B-A818-EDEC145F7ACD>`__
-(AWR) reports show 'SQL*Net roundtrips to/from client' and are useful for
-finding the overall behavior of a system.
-
-Sometimes you may wish to find the number of round-trips used for a
-specific application.  Snapshots of the V$SESSTAT view taken before
-and after doing some work can be used for this:
-
-.. code-block:: python
-
-    # Get the connection's session id
-    def get_session_id(connection):
-        sql = "select sys_context('userenv','sid') from dual"
-        result, = connection.cursor().execute(sql).fetchone()
-        return result
-
-     # Get the number of round-trips a session has made so far
-     def get_round_trips(systemconn, sid):
-         sql = """select
-                      ss.value
-                  from
-                      v$sesstat  ss,
-                      v$statname sn
-                  where
-                      ss.sid = :sid
-                      and ss.statistic# = sn.statistic#
-                      and sn.name like '%roundtrip%client%'"""
-         round_trips, = systemconn.cursor().execute(sql, [sid]).fetchone()
-         return round_trips
-
-
-    systemconn = oracledb.connect(user="system", password=spw, dsn=cs)
-    connection = oracledb.connect(user=un, password=pw, dsn=cs)
-
-    sid = get_session_id(connection)
-    round_trips_before = get_round_trips(systemconn, sid)
-
-    # Do some "work"
-    cursor.execute("select ...")
-    rows = cursor.fetchall()
-
-    round_trips_after = get_round_trips(systemconn, sid)
-
-    print(f"Round-trips required for query: {round_trips_after - round_trips_before}")
-
-Note that V$SESSTAT is not accurate for :ref:`pipelined database operations
-<pipelining>`.
-
-.. _stmtcache:
-
-Statement Caching
-=================
-
-Python-oracledb's :meth:`Cursor.execute()` and :meth:`Cursor.executemany()`
-methods use statement caching to make re-execution of statements efficient.
-Statement caching lets Oracle Database cursors be used without re-parsing
-the statement.  Statement caching also reduces metadata transfer costs between
-python-oracledb and the database. Performance and scalability are improved.
-
-The python-oracledb Thick mode uses `Oracle Call Interface statement caching
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-4947CAE8-1F00-
-4897-BB2B-7F921E495175>`__, whereas the Thin mode uses its own implementation.
-
-Each standalone or pooled connection has its own cache of statements with a
-default size of 20. The default size of the statement cache can be changed
-using the :attr:`oracledb.defaults.stmtcachesize <Defaults.stmtcachesize>`
-attribute. The size can be set when creating connection pools or standalone
-connections. In general, set the statement cache size to the size of the
-working set of statements being executed by the application.  To manually tune
-the cache, monitor the general application load and the `Automatic Workload
-Repository <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-id=GUID-56AEF38E-9400-427B-A818-EDEC145F7ACD>`__ (AWR) "bytes sent via SQL*Net
-to client" values.  The latter statistic should benefit from not shipping
-statement metadata to python-oracledb.  Adjust the statement cache size to your
-satisfaction. With Oracle Database 12c (or later), the Thick mode statement
-cache size can be automatically tuned using an
-:ref:`oraaccess.xml <optclientfiles>` file.
-
-Setting the Statement Cache
----------------------------
-
-The statement cache size can be set globally with
-:attr:`oracledb.defaults.stmtcachesize <Defaults.stmtcachesize>`:
-
-.. code-block:: python
-
-    import oracledb
-
-    oracledb.defaults.stmtcachesize = 40
-
-The value can be overridden in an :meth:`oracledb.connect()` call, or when
-creating a pool with :meth:`oracledb.create_pool()`. For example:
-
-.. code-block:: python
-
-  oracledb.create_pool(user="scott", password=userpwd, dsn="dbhost.example.com/orclpb",
-                       min=2, max=5, increment=1, stmtcachesize=50)
-
-When python-oracledb Thick mode uses Oracle Client 21 (or later), changing the
-cache size with :meth:`ConnectionPool.reconfigure()` does not immediately
-affect connections previously acquired and currently in use. When those
-connections are subsequently released to the pool and re-acquired, they will
-then use the new value. When the Thick mode uses Oracle Client prior to
-version 21, changing the pool's statement cache size has no effect on
-connections that already exist in the pool but will affect new connections
-that are subsequently created, for example when the pool grows.
-
-Tuning the Statement Cache
---------------------------
-
-In general, set the statement cache to the size of the working set of
-statements being executed by the application. :ref:`SODA <sodausermanual>`
-internally makes SQL calls, so tuning the cache is also beneficial for SODA
-applications.
-
-In python-oracledb Thick mode with Oracle Client Libraries 12c (or later), the
-statement cache size can be automatically tuned with the Oracle Client
-Configuration :ref:`oraaccess.xml <optclientfiles>` file.
-
-For manual tuning use views like V$SYSSTAT:
-
-.. code-block:: sql
-
-    SELECT value FROM V$SYSSTAT WHERE name = 'parse count (total)'
-
-Find the value before and after running application load to give the number of
-statement parses during the load test. Alter the statement cache size and
-repeat the test until you find a minimal number of parses.
-
-If you have Automatic Workload Repository (AWR) reports you can monitor
-general application load and the "bytes sent via SQL*Net to client" values.
-The latter statistic should benefit from not shipping statement metadata to
-python-oracledb. Adjust the statement cache size and re-run the test to find
-the best cache size.
-
-Disabling the Statement Cache
------------------------------
-
-Statement caching can be disabled by setting the cache size to 0:
-
-.. code-block:: python
-
-    oracledb.defaults.stmtcachesize = 0
-
-Disabling the cache may be beneficial when the quantity or order of statements
-causes cache entries to be flushed before they get a chance to be
-reused. For example if there are more distinct statements than cache
-slots, and the order of statement execution causes older statements to
-be flushed from the cache before the statements are re-executed.
-
-Disabling the statement cache may also be helpful in test and development
-environments.  The statement cache can become invalid if connections remain
-open and database schema objects are recreated.  Applications can then receive
-errors such as ``ORA-3106``. However, after a statement execution error is
-returned once to the application, python-oracledb automatically drops that
-statement from the cache. This lets subsequent re-executions of the statement
-on that connection to succeed.
-
-When it is inconvenient to pass statement text through an application, the
-:meth:`Cursor.prepare()` call can be used to avoid statement re-parsing.
-If the ``cache_statement`` parameter in the :meth:`Cursor.prepare()` method is
-True and the statement cache size is greater than 0, then the statements will
-be added to the cache, if not already present. If the ``cache_statement``
-parameter in the :meth:`Cursor.prepare()` method is False and the statement
-cache size is greater than 0, then the statement will be removed from the
-statement cache (if present) or will not be cached (if not present). The
-subsequent ``execute()`` calls use the value None instead of the SQL text.
-
-This feature can prevent a rarely executed statement from flushing a potential
-more frequently executed one from a full cache. For example, if a statement
-will only ever be executed once:
-
-.. code-block:: python
-
-    cursor.prepare("select user from dual", cache_statement = False)
-    cursor.execute(None)
-
-Alternatively,
-
-.. code-block:: python
-
-    sql = "select user from dual"
-    cursor.prepare(sql, cache_statement=False)
-    cursor.execute(sql)
-
-Statements passed to :meth:`~Cursor.prepare()` are also stored in the statement
-cache.
-
-.. _clientresultcache:
-
-Client Result Caching (CRC)
-===========================
-
-Python-oracledb applications can use Oracle Database's `Client Result Cache
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-35CB2592-7588-
-4C2D-9075-6F639F25425E>`__.  The CRC enables client-side caching of SELECT
-query results in client memory for immediate use when the same query is
-re-executed.  This is useful for reducing the cost of queries for small,
-mostly static, lookup tables, such as for postal codes.  CRC reduces network
-:ref:`round-trips <roundtrips>`, and also reduces database server CPU usage.
-
-.. note::
-
-    Client Result Caching is only supported in python-oracledb Thick mode. See
-    :ref:`enablingthick`.
-
-The cache is at the application process level.  Access and invalidation is
-managed by the Oracle Client libraries.  This removes the need for extra
-application logic, or external utilities, to implement a cache.
-
-CRC can be enabled by setting the `database parameters <https://www.oracle.com
-/pls/topic/lookup?ctx=dblatest&id=GUID-A9D4A5F5-B939-48FF-80AE-0228E7314C7D>`__
-``CLIENT_RESULT_CACHE_SIZE`` and ``CLIENT_RESULT_CACHE_LAG``, and then
-restarting the database, for example:
-
-.. code-block:: sql
-
-    SQL> ALTER SYSTEM SET CLIENT_RESULT_CACHE_LAG = 3000 SCOPE=SPFILE;
-    SQL> ALTER SYSTEM SET CLIENT_RESULT_CACHE_SIZE = 64K SCOPE=SPFILE;
-    SQL> STARTUP FORCE
-
-CRC can alternatively be configured in an :ref:`oraaccess.xml <optclientfiles>`
-or :ref:`sqlnet.ora <optnetfiles>` file on the Python host, see `Client
-Configuration Parameters <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-&id=GUID-E63D75A1-FCAA-4A54-A3D2-B068442CE766>`__.
-
-Tables can then be created, or altered, so repeated queries use CRC.  This
-allows existing applications to use CRC without needing modification.  For
-example:
-
-.. code-block:: sql
-
-    SQL> CREATE TABLE cities (id number, name varchar2(40)) RESULT_CACHE (MODE FORCE);
-    SQL> ALTER TABLE locations RESULT_CACHE (MODE FORCE);
-
-Alternatively, hints can be used in SQL statements.  For example:
-
-.. code-block:: sql
-
-    SELECT /*+ result_cache */ postal_code FROM locations
diff --git a/doc/src/user_guide/two_phase_commit.rst b/doc/src/user_guide/two_phase_commit.rst
deleted file mode 100644
index dc703613..00000000
--- a/doc/src/user_guide/two_phase_commit.rst
+++ /dev/null
@@ -1,113 +0,0 @@
-.. _tpc:
-
-.. currentmodule:: oracledb
-
-*****************************
-Using Two-Phase Commits (TPC)
-*****************************
-
-The python-oracledb functions :meth:`~Connection.tpc_begin()` and
-:meth:`~Connection.tpc_end()` support distributed transactions. See `Two-Phase
-Commit Mechanism <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-GUID-8152084F-4760-4B89-A91C-9A84F81C23D1>`_ in the Oracle Database
-documentation.
-
-The method :meth:`Connection.tpc_begin()` can be used to start a TPC
-transaction.
-
-Distributed transaction protocols attempt to keep multiple data sources
-consistent with one another by ensuring updates to the data sources
-participating in a distributed transaction are all performed, or none of
-them performed. These data sources, also called participants or resource
-managers, may be traditional database systems, messaging systems, and
-other systems that store state such as caches. A common class of
-distributed transaction protocols are referred to as two-phase commit
-protocols. These protocols split the commitment of a distributed
-transaction into two distinct, separate phases.
-
-During the first phase, the participants (data sources) are polled or
-asked to vote on the outcome of the distributed transaction. This phase,
-called the prepare phase, ensures agreement or consensus on the ability
-for each participant to commit their portion of the transaction. When
-asked to prepare, the participants respond positively if they can commit
-their portion of the distributed transaction when requested or respond
-that there were no changes, so they have no need to be committed. Once
-all participants have responded to the first phase, the second phase of
-the protocol can begin. The method :meth:`Connection.tpc_prepare()` can
-be used to prepare a global transaction for commit.
-
-During the second phase of the protocol, called the commit phase, all of
-the participants that indicated they needed to be committed are asked to
-either commit their prepared changes or roll them back. If the decision on
-the outcome of the distributed transaction was to commit the transaction,
-each participant is asked to commit their changes. If the decision was to
-abort or rollback the distributed transaction, each participant is asked
-to rollback their changes. The methods :meth:`Connection.tpc_commit()` and
-:meth:`Connection.tpc_rollback()` can be used to commit or rollback a
-transaction respectively.
-
-While applications can coordinate these activities, it takes on additional
-responsibilities to ensure the correct outcome of all participants, even in
-the face of failures. These failures could be of the application itself, one
-of the participants in the transaction, of communication links, etc. In order
-to assure the atomic characteristics of a distributed transaction, once the
-decision has been made to commit the distributed transaction, this decision
-needs to be durably recorded in case of failure. The application, as part of
-its steps for recovery from a failure, now needs to check the durable log and
-notify the participants of the outcome. Failures may be nested such that not
-only might the application fail, one or more participants or connections to
-participants might fail. All these scenarios require careful consideration
-and remediation to ensure that all participants either committed or rolled
-back their local updates.
-
-As a result, most applications rely upon the services provided by a
-transaction manager (TM), also called a transaction coordinator. The purpose
-of having a transaction manager perform this coordination is to eliminate
-having to have each application perform these transaction management functions.
-The application asks the transaction manager to start a transaction. As
-additional participants or resource managers join the transaction, they register
-with the transaction manager as participants. When the original application decides
-the transaction is to be committed or rolled back, it asks the transaction manager
-to commit or rollback the transaction. If the application asked the transaction to
-be rolled back, the transaction coordinator notifies all participants to roll back.
-Otherwise, the transaction manager then starts the two-phase commit protocol.
-
-The following example shows how to perform an application level two-phase commit:
-
-.. code-block:: python
-
-    import oracledb
-
-    # connect to first database and begin transaction
-    conn1 = oracledb.connect(DSN1)
-    xid1 = conn1.xid(1000, "txn1", "branch1")
-    conn1.tpc_begin(xid1)
-    with conn1.cursor() as cursor:
-        cursor.execute("insert into SomeTable values (1, 'Some value')")
-
-    # connect to second database and begin transaction
-    conn2 = oracledb.connect(DSN2)
-    xid2 = conn1.xid(1000, "txn1", "branch2")
-    conn2.tpc_begin(xid2)
-    with conn2.cursor() as cursor:
-        cursor.execute("insert into SomeOtherTable values (2, 'Some value')")
-
-    # prepare both transactions and commit
-    commit_needed1 = conn1.tpc_prepare()
-    commit_needed2 = conn2.tpc_prepare()
-    if commit_needed1:
-        conn1.tpc_commit()
-    if commit_needed2:
-        conn2.tpc_commit()
-
-
-The following example shows how to perform recovery.
-
-.. code-block:: python
-
-    import oracledb
-
-    with oracledb.connect(DSN, mode=oracledb.SYSDBA) as conn:
-        for xid in conn.tpc_recover():
-            print("Recovering xid by rolling it back:", xid)
-            conn.tpc_rollback(xid)
diff --git a/doc/src/user_guide/txn_management.rst b/doc/src/user_guide/txn_management.rst
deleted file mode 100644
index 95629c37..00000000
--- a/doc/src/user_guide/txn_management.rst
+++ /dev/null
@@ -1,408 +0,0 @@
-.. _txnmgmnt:
-
-.. currentmodule:: oracledb
-
-*********************
-Managing Transactions
-*********************
-
-A database transaction is a grouping of SQL statements that make a logical data
-change to the database. When statements like :meth:`Cursor.execute()` or
-:meth:`Cursor.executemany()` execute SQL statements like INSERT or UPDATE, a
-transaction is started or continued. By default, python-oracledb does not
-commit this transaction to the database.  You can explictly commit or roll it
-back using the methods :meth:`Connection.commit()` and
-:meth:`Connection.rollback()`. For example to commit a new row:
-
-.. code-block:: python
-
-    cursor = connection.cursor()
-    cursor.execute("insert into mytab (name) values ('John')")
-    connection.commit()
-
-Transactions are handled at the connection level, meaning changes performed by
-all cursors obtained from a connection will be committed or rolled back
-together.
-
-When a database connection is closed, such as with :meth:`Connection.close()`,
-or when variables referencing the connection go out of scope, any uncommitted
-transaction will be rolled back.
-
-When `Data Definition Language (DDL) <https://www.oracle.com/pls/topic/lookup?
-ctx=dblatest&id=GUID-FD9A8CB4-6B9A-44E5-B114-EFB8DA76FC88>`__ statements such
-as CREATE are executed, Oracle Database will always perform a commit.
-
-This chapter covers python-oracledb's synchronous programming model. For
-information on managing transactions in asynchronous connections, see
-:ref:`txnasync`.
-
-
-Autocommitting
-==============
-
-An alternative way to commit is to set the attribute
-:attr:`Connection.autocommit` of the connection to ``True``.  This ensures all
-:ref:`DML <dml>` statements (INSERT, UPDATE, and so on) are committed as they
-are executed.  Unlike :meth:`Connection.commit()`, this does not require an
-additional :ref:`round-trip <roundtrips>` to the database so it is more
-efficient when used appropriately.
-
-When executing multiple DML statements that constitute a single transaction, it
-is recommended to use autocommit mode only for the last DML statement in the
-sequence of operations.
-
-.. warning::
-
-    Overuse of the mode can impact database performance. It can also destroy
-    relational data consistency when related changes made to multiple tables
-    are committed independently, causing table data to be out of sync.
-
-Note that irrespective of the autocommit value, Oracle Database will always
-commit an open transaction when a DDL statement is executed.
-
-The example below shows a new customer being added to the table ``CUST_TABLE``.
-The corresponding ``SALES`` table is updated with a purchase of 3000 pens from
-the customer.  The final insert uses autocommit mode to commit both new
-records:
-
-.. code-block:: python
-
-    # Add a new customer
-    id_var = cursor.var(int)
-    connection.autocommit = False  # make sure any previous value is off
-    cursor.execute("""
-            INSERT INTO cust_table (name) VALUES ('John')
-            RETURNING id INTO :bvid""", bvid=id_var)
-
-    # Add sales data for the new customer and commit all new values
-    id_val = id_var.getvalue()[0]
-    connection.autocommit = True
-    cursor.execute("INSERT INTO sales_table VALUES (:bvid, 'pens', 3000)",
-            bvid=id_val)
-
-
-Explicit Transactions
-=====================
-
-The method :meth:`Connection.begin()` can be used to explicitly start a local
-or global transaction.
-
-Without parameters, this explicitly begins a local transaction; otherwise, this
-explicitly begins a distributed (global) transaction with the given parameters.
-See the Oracle documentation for more details.
-
-Note that in order to make use of global (distributed) transactions, the
-attributes :attr:`Connection.internal_name` and
-:attr:`Connection.external_name` attributes must be set.
-
-.. _distributedtxns:
-
-Distributed Transactions
-========================
-
-For information on distributed transactions, see the chapter :ref:`tpc`.
-
-.. _sessionlesstxns:
-
-Sessionless Transactions
-========================
-
-A Sessionless Transaction is a transaction that can be suspended and resumed
-during its lifecycle. It breaks the coupling between transactions and
-connections, that is, a transaction is no longer tied to a specific
-connection. This enables connections to be released for use by other users
-while a transaction remains open and can be resumed later. With Sessionless
-Transactions, you do not need to use a transaction manager since Oracle AI
-Database manages coordination of transactions.
-
-Sessionless Transactions are supported in both python-oracledb Thin and
-:ref:`Thick <enablingthick>` modes. Oracle AI Database 26ai (or later) is
-required. For python-oracledb Thick mode, Oracle Client 23.6 (or later) is
-additionally required.
-
-Each sessionless transaction is identified by a unique transaction identifier.
-This can either be user-chosen or generated by python-oracledb.
-
-Sessionless Transactions are ideal for interactive applications with user
-"think time". If one user starts a database transaction and then does not
-perform database operations for some time (that is the "think time"), the
-transaction can be suspended and the database connection can be released
-and used by another user. When the first user is ready to continue work, a
-database connection can be obtained and their transaction resumed. Without
-Sessionless Transactions, both users would need their own connections for the
-entire duration of their interaction with the system, including during any
-think time.
-
-With python-oracledb, you can:
-
-- Start a sessionless transaction on a database connection by specifying a
-  unique transaction identifier
-- Perform database operations in the transaction
-- Suspend the transaction from the connection after the database operations
-  are completed
-- Resume the transaction on the same connection or a different connection
-  using the same transaction identifier
-- Commit or roll back the transaction on the same connection or on a different
-  connection if the transaction has been suspended by the previous connection
-
-.. _sessionlesstxnswithrac:
-
-You can use Sessionless Transactions on all Oracle Databases including with
-`Oracle Real Application Clusters (RAC) <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-D04AA2A7-2E68-4C5C-BD6E-36C62427B98E>`__. For RAC
-databases, you can start and suspend a sessionless transaction on one RAC
-database instance and resume it on another RAC database instance. To commit or
-rollback a sessionless transaction, it must be active on only one of the RAC
-instances. If multiple RAC instances have this sessionless transaction active,
-the database server waits for the `DISTRIBUTED_LOCK_TIMEOUT
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-AF535DC1-E45B-
-412D-95F2-5B6C1F18415D>`__ time to allow other instances to suspend this
-transaction before proceeding with a commit or rollback.
-
-Note that there are some constraints when using Sessionless Transactions.
-You cannot rollback to a savepoint of the sessionless transaction in a
-previous connection. Sessionless Transactions cannot be promoted to
-:ref:`distributedtxns`. Session states such as all parameters set by
-ALTER SESSION, temporary LOB states, and PL/SQL states are not carried over to
-the new connection. For more information on other constraints, see
-`Restrictions for Sessionless Transactions <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-7F76D67C-4470-4DA3-BAAE-8E243D9FA87B>`__.
-
-For more information on Sessionless Transactions, see `Developing Applications
-with Sessionless Transactions <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-C1F67D04-CE72-416E-8CED-243E5710E83D>`__ in the Oracle
-Database Development Guide.
-
-.. _starttxns:
-
-Starting Sessionless Transactions
----------------------------------
-
-To start a sessionless transaction, use
-:meth:`Connection.begin_sessionless_transaction()`, for example:
-
-.. code-block:: python
-
-    txn_id = b"new_sessionless_txn"
-    connection.begin_sessionless_transaction(transaction_id=txn_id, timeout=120,
-        defer_round_trip=False)
-
-You can pass the following parameters to
-:meth:`Connection.begin_sessionless_transaction()`:
-
-- ``transaction_id``: This parameter is the unique identifier of the
-  transaction which is used to manage the transaction from start to end. If you
-  do not specify the ``transaction_id`` value, a unique `universally-unique
-  identifier (UUID) <https://www.rfc-editor.org/rfc/rfc4122.txt>`__ is
-  generated and returned by
-  :meth:`~Connection.begin_sessionless_transaction`. An example is
-  "36b8f84d-df4e-4d49-b662-bcde71a8764f".
-
-- ``timeout``: This parameter is the number of seconds this transaction can
-  stay suspended when :meth:`Connection.suspend_sessionless_transaction()` is
-  later called, or if the transaction is automatically suspended when the
-  ``suspend_on_success`` parameter is set to to *True* in
-  :meth:`Cursor.execute()` or :meth:`Cursor.executemany()`. The default value
-  is *60* seconds. If the transaction is not resumed within the specified
-  duration, the transaction will be rolled back.
-
-- ``defer_round_trip``: This parameter determines whether the request to start
-  a sessionless transaction should be sent immediately or with the next
-  database operation. The default value is *False*, that is, the request is
-  sent immediately. When set to *True*, the request is sent with the next
-  database operation on the connection which reduces the number of
-  :ref:`round-trips <roundtrips>` to the database.
-
-Once a transaction has been started, all SQL statements are executed as a part
-of it.
-
-A sessionless transaction is active from the time it is newly started or
-resumed to the time it is suspended, committed, or rolled back.
-
-.. _suspendtxns:
-
-Suspending Sessionless Transactions
------------------------------------
-
-After you execute database operations, an active sessionless transaction can
-be explicitly suspended, or optionally can be automatically suspended on the
-next database operation if an execute operation completes successfully. This
-detaches the transaction from the current connection.
-
-**Explicitly Suspending Transactions**
-
-To explicitly suspend an active transaction, use
-:meth:`Connection.suspend_sessionless_transaction()`:
-
-.. code-block:: python
-
-    connection.suspend_sessionless_transaction()
-
-This suspends the active transaction. This transaction is no longer tied to
-the connection.
-
-**Suspending a Transaction After a Database Operation**
-
-To automatically suspend an active transaction after the next database
-operation, set the ``suspend_on_success`` parameter to *True* in
-:meth:`Cursor.execute()` or :meth:`Cursor.executemany()`. This setting
-suspends the transaction if the executed statement or PL/SQL block completes
-successfully. This helps reduce the number of
-:ref:`round-trips <roundtrips>` to the database which in turn improves
-performance. For example:
-
-.. code-block:: python
-
-    # Suspend after execute
-    cursor.execute(
-        "insert into slt_table (name) values ('John')",
-        suspend_on_success=True
-    )
-
-Once the transaction is suspended, further database operations are not part of
-that transaction until it is resumed.
-
-If the execute operation throws an exception, then the transaction will not be
-suspended.
-
-If there are no active Sessionless Transactions, this parameter is ignored.
-
-.. _resumetxns:
-
-Resuming Sessionless Transactions
----------------------------------
-
-To resume a suspended sessionless transaction, use
-:meth:`Connection.resume_sessionless_transaction()`, for example:
-
-.. code-block:: python
-
-    connection.resume_sessionless_transaction(transaction_id=txn_id, timeout=80,
-      defer_round_trip=False)
-
-The ``transaction_id`` parameter must contain the identifier of an existing
-transaction.
-
-You can set the following parameters in
-:meth:`Connection.resume_sessionless_transaction()`:
-
-- ``timeout``: This parameter specifies how long this connection should wait to
-  resume a sessionless transaction if it is currently in use by another
-  connection. In this case, the current connection waits for the transaction to
-  be suspended within this timeout period. If the transaction remains in use by
-  the other connection after the timeout period, the error `ORA-25351
-  <https://docs.oracle.com/en/error-help/db/ora-25351>`__ is raised. If another
-  connection completes the transaction, the error `ORA-24756
-  <https://docs.oracle.com/en/error-help/db/ora-24756>`__ is raised. These
-  error messages are only thrown for non-RAC instances. For information on
-  using Oracle RAC, see :ref:`Sessionless Transactions with Oracle RAC
-  <sessionlesstxnswithrac>`.
-
-- ``defer_round_trip``: This parameter determines whether the request to resume
-  a sessionless transaction should be sent immediately or with the next
-  database operation. The default value is *False*, that is, the request is
-  sent immediately. When set to *True*, the request is sent with the next
-  database operation on the connection which reduce the number of
-  :ref:`round-trips <roundtrips>` to the database.
-
-Once resumed, the transaction is considered to be active and database
-operations are part of that transaction.
-
-.. _commitorrollbacktxns:
-
-Committing or Rolling Back Sessionless Transactions
----------------------------------------------------
-
-A new or resumed transaction can be committed using :meth:`Connection.commit()`
-and rolled back using :meth:`Connection.rollback()`.
-
-Once a transaction has been committed or rolled back, it ends, and cannot be
-resumed, suspended, or used for additional database operations.
-
-.. _examplesessionlesstxns:
-
-Example of Using Sessionless Transactions
------------------------------------------
-
-An example of using Sessionless Transactions is:
-
-.. code-block:: python
-
-    import oracledb
-
-    connection1 = oracledb.connect(user="hr", password=userpwd, dsn="localhost/orclpdb")
-
-    txn_id = b"sessionless_txnid"
-    cursor1 = connection1.cursor()
-
-    cursor1.execute("create table sessionlessTxnTab (id number, name varchar2(50))")
-
-    # Start a new sessionless transaction
-    connection1.begin_sessionless_transaction(transaction_id=txn_id, timeout=15)
-
-    # Execute a database operation
-    cursor1.execute("insert into sessionlessTxnTab values(1, 'row1')")
-
-    # Insert another row
-    cursor1.execute("insert into sessionlessTxnTab values(2, 'row2')")
-
-    # Suspend the sessionless transaction
-    connection1.suspend_sessionless_transaction()
-
-    result = cursor1.execute("select * from sessionlessTxnTab")
-    rows = result.fetchall()
-    print(rows)
-    connection1.close()
-
-In the above sample, the transaction is not committed before being suspended.
-Hence the inserted data will not be visible and this prints ``[]`` as the
-output.
-
-The transaction, txn_id, has a *15* second timeout in which it needs to be
-resumed successfully on another connection. In the example below, a different
-connection resumes the transaction. The same transaction identifier must be
-used:
-
-.. code-block:: python
-
-    # Resume the transaction in another connection
-    connection2 = oracledb.connect(user="hr", password=userpwd, dsn="localhost/orclpdb")
-    connection2.resume_sessionless_transaction(transaction_id=txn_id)
-
-    cursor2 = connection2.cursor()
-    cursor2.execute("insert into sessionlessTxnTab values(3, 'row3')")
-
-    connection2.commit()
-
-    result = cursor2.execute("select * from sessionlessTxnTab")
-    rows = result.fetchall()
-    print(rows)
-
-This prints the following output (including the rows inserted in the first
-code snippet)::
-
-    [(1, 'row1'), (2, 'row2'), (3, 'row3')]
-
-.. _viewsessionlesstxns:
-
-Viewing Sessionless Transactions
---------------------------------
-
-The Oracle Database `V$GLOBAL_TRANSACTION <https://www.oracle.com/pls/topic/
-lookup?ctx=dblatest&id=GUID-85BD524A-FA12-417F-AC12-4863314E0349>`__ view
-displays information on the currently active transactions on the database
-server.
-
-To view the active transaction in the current connection, you can use the
-following query with `NVL() <https://docs.oracle.com/en/database/oracle/oracle
--database/23/sqlrf/NVL.html>`__:
-
-.. code-block:: sql
-
-    SELECT NVL(dbms_transaction.get_transaction_id, 'NULL transactionId')
-    FROM dual;
-
-The `GET_TRANSACTION_ID Function <https://www.oracle.com/pls/topic/lookup?ctx=
-dblatest&id=GUID-5E1C1B63-207F-4587-8259-0CED93EB9643>`__ of the
-DBMS_TRANSACTION package returns the transaction identifier that is used in
-the current connection.
diff --git a/doc/src/user_guide/vector_data_type.rst b/doc/src/user_guide/vector_data_type.rst
deleted file mode 100644
index 579391dc..00000000
--- a/doc/src/user_guide/vector_data_type.rst
+++ /dev/null
@@ -1,503 +0,0 @@
-.. _vectors:
-
-.. currentmodule:: oracledb
-
-*****************
-Using VECTOR Data
-*****************
-
-Oracle AI Database 26ai introduced a new data type `VECTOR <https://www.oracle.
-com/pls/topic/lookup?ctx=dblatest&id=GUID-746EAA47-9ADA-4A77-82BB-
-64E8EF5309BE>`__ for artificial intelligence and machine learning search
-operations. The VECTOR data type is a homogeneous array of 8-bit signed
-integers, 8-bit unsigned integers, 32-bit floating-point numbers, or 64-bit
-floating-point numbers. For more information about using vectors in Oracle
-Database, see the `Oracle AI Vector Search User's Guide
-<https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=VECSE>`__.
-
-With the VECTOR data type, you can define the number of dimensions for the
-data and the storage format for each dimension value in the vector. The
-possible storage formats include:
-
-- **int8** for 8-bit signed integers
-- **binary** for 8-bit unsigned integers
-- **float32** for 32-bit floating-point numbers
-- **float64** for 64-bit floating point numbers
-
-Vectors can also be defined with an arbitrary number of dimensions and
-formats. This allows you to specify vectors of different dimensions with the
-various storage formats mentioned above. For example:
-
-.. code-block:: sql
-
-    CREATE TABLE vector_table (
-        vec_data vector
-    )
-
-If you are interested in using VECTOR data with data frames, see
-:ref:`dfvector`.
-
-.. _intfloatformat:
-
-Using FLOAT32, FLOAT64, and INT8 Vectors
-========================================
-
-To create a table with three columns for vector data:
-
-.. code-block:: sql
-
-    CREATE TABLE vector_table (
-        v32 vector(3, float32),
-        v64 vector(3, float64),
-        v8  vector(3, int8)
-    )
-
-In this example, each column can store vector data of three dimensions where
-each dimension value is of the specified format.
-
-.. _insertintfloatformat:
-
-Inserting FLOAT32, FLOAT64, and INT8 Vectors
---------------------------------------------
-
-With python-oracledb, vector data can be inserted using
-`Python array.array() <https://docs.python.org/3/library/array.html>`__
-objects. Python arrays of type float (32-bit), double (64-bit), or
-int8_t (8-bit signed integer) are used as bind values when inserting vector
-columns. For example:
-
-.. code-block:: python
-
-    import array
-
-    vector_data_32 = array.array("f", [1.625, 1.5, 1.0]) # 32-bit float
-    vector_data_64 = array.array("d", [11.25, 11.75, 11.5]) # 64-bit float
-    vector_data_8 = array.array("b", [1, 2, 3]) # 8-bit signed integer
-
-    cursor.execute(
-        "insert into vector_table (v32, v64, v8) values (:1, :2, :3)",
-        [vector_data_32, vector_data_64, vector_data_8]
-    )
-
-.. _fetchintfloatformat:
-
-Fetching FLOAT32, FLOAT64, and INT8 Vectors
--------------------------------------------
-
-With python-oracledb, vector columns of int8, float32, and float64 format are
-fetched as Python array.array() types. For example:
-
-.. code-block:: python
-
-    cursor.execute("select * from vector_table")
-        for row in cursor:
-            print(row)
-
-This prints an output such as::
-
-    (array("f", [1.625, 1.5, 1.0]), array("d", [11.25, 11.75, 11.5]), array("b", [1, 2, 3]))
-
-The :ref:`FetchInfo <fetchinfoobj>` object that is returned as part of the
-fetched metadata contains attributes :attr:`FetchInfo.vector_dimensions` and
-:attr:`FetchInfo.vector_format` which return the number of dimensions of the
-vector column and the format of each dimension value in the vector column
-respectively.
-
-.. _vecoutputtypehandlerlist:
-
-You can convert the vector data fetched from array.array() to a Python list by
-using the following :ref:`output type handler <outputtypehandlers>`:
-
-.. code-block:: python
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VECTOR:
-            return cursor.var(metadata.type_code, arraysize=cursor.arraysize,
-                              outconverter=list)
-
-    connection.outputtypehandler = output_type_handler
-
-    cursor.execute("select * from vector_table")
-    for row in cursor:
-        print(row)
-
-For each vector column, the database will now return a Python list
-representation of each row's value as shown below::
-
-    ([1.625, 1.5, 1.0], [11.25, 11.75, 11.5], [1, 2, 3])
-
-See :ref:`insertvecwithnumpy` for an example of using an input type handler.
-
-If you are using python-oracledb Thick mode with Oracle Client 21c or earlier,
-see this :ref:`section <vector_thick_mode_old_client>`.
-
-See `vector.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/vector.py>`__ for a runnable example.
-
-.. _binaryformat:
-
-Using BINARY Vectors
-====================
-
-A Binary vector format represents each dimension value as a binary value (0 or
-1). Binary vectors require less memory storage.  For example, a 16
-dimensional vector with binary format requires only 2 bytes of storage while a
-16 dimensional vector with int8 format requires 16 bytes of storage.
-
-Binary vectors are represented as 8-bit unsigned integers. For the binary
-format, you must define the number of dimensions as a multiple of 8.
-
-To create a table with one column for vector data:
-
-.. code-block:: sql
-
-    CREATE TABLE vector_binary_table (
-        vb vector(24, binary)
-    )
-
-In this example, the VB column can store vector data of 24 dimensions
-where each dimension value is represented as a single bit. Note that the
-number of dimensions 24 is a multiple of 8.
-
-If you specify a vector dimension that is not a multiple of 8, then you will
-get ``ORA-51813``.
-
-.. _insertbinaryvector:
-
-Inserting BINARY Vectors
-------------------------
-
-Python arrays of type uint8_t (8-bit unsigned integer) are used as bind values
-when inserting vector columns. The length of uint8_t arrays must be equal to
-the number of dimensions divided by 8. For example, if the number of
-dimensions for a vector column is 24, then the length of the array must be 3.
-The values in uint8_t arrays can range from 0 to 255. For example:
-
-.. code-block:: python
-
-    import array
-
-    vector_data_vb = array.array("B", [180, 150, 100]) # 8-bit unsigned integer
-
-    cursor.execute(
-        "insert into vector_binary_table values (:1)",
-        [vector_data_vb]
-    )
-
-.. _fetchbinaryvector:
-
-Fetching BINARY Vectors
------------------------
-
-With python-oracledb, vector columns of binary format are fetched as Python
-array.array() types. For example:
-
-.. code-block:: python
-
-    cursor.execute("select * from vector_binary_table")
-        for row in cursor:
-            print(row)
-
-This prints an output such as::
-
-    (array("B", [180, 150, 100]))
-
-The :ref:`FetchInfo <fetchinfoobj>` object that is returned as part of the
-fetched metadata contains attributes :attr:`FetchInfo.vector_dimensions` and
-:attr:`FetchInfo.vector_format` which return the number of dimensions of the
-vector column and the format of each dimension value in the vector column
-respectively.
-
-You can convert the vector data fetched from a connection to a Python list by
-using this :ref:`output type handler <vecoutputtypehandlerlist>`. For each vector
-column, the database will now return a Python list representation of each
-row's value.
-
-If you are using python-oracledb Thick mode with Oracle Client 21c or earlier,
-see this :ref:`section <vector_thick_mode_old_client>`.
-
-.. _sparsevectors:
-
-Using SPARSE Vectors
-====================
-
-A Sparse vector is a vector which has zero value for most of its dimensions.
-This vector only physically stores the non-zero values. For more information
-on sparse vectors, see the `Oracle AI Vector search User's Guide <https://
-www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-6015566C-3277-4A3C-8DD0-
-08B346A05478>`__.
-
-Sparse vectors are represented by the total number of vector dimensions, an
-array of indices, and an array of values where each value's location in the
-vector is indicated by the corresponding indices array position. All other
-vector values are treated as zero.  The storage formats that can be used with
-sparse vectors are float32, float64, and int8. Note that the binary storage
-format cannot be used with sparse vectors.
-
-For example, a string representation could be::
-
-    [25, [5, 8, 11], [25.25, 6.125, 8.25]]
-
-In this example, the sparse vector has 25 dimensions. Only indices 5, 8, and 11
-have values which are 25.25, 6.125, and 8.25 respectively. All of the other
-values are zero.
-
-In Oracle AI Database, you can define a column for a sparse vector using the
-following format::
-
-    VECTOR(number_of_dimensions, dimension_storage_format, sparse)
-
-For example, to create a table with three columns for sparse vectors:
-
-.. code-block:: sql
-
-    CREATE TABLE vector_sparse_table (
-        float32sparsecol vector(25, float32, sparse),
-        float64sparsecol vector(30, float64, sparse),
-        int8sparsecol vector(35, int8, sparse)
-    )
-
-In this example:
-
-- The float32sparsecol column can store sparse vector data of 25 dimensions
-  where each dimension value is a 32-bit floating-point number.
-
-- The float64sparsecol column can store sparse vector data of 30 dimensions
-  where each dimension value is a 64-bit floating-point number.
-
-- The int8sparsecol column can store sparse vector data of 35 dimensions where
-  each dimension value is a 8-bit signed integer.
-
-.. _insertsparsevectors:
-
-Inserting SPARSE Vectors
-------------------------
-
-With python-oracledb, sparse vector data can be inserted using
-:ref:`SparseVector objects <sparsevectorsobj>`.  The SparseVector objects are
-used when fetching vectors, and as bind values when inserting sparse vector
-columns. For example to insert data:
-
-.. code-block:: python
-
-    import array
-
-    # 32-bit float sparse vector
-    float32_val = oracledb.SparseVector(
-        25, [6, 10, 18], array.array('f', [26.25, 129.625, 579.875])
-    )
-
-    # 64-bit float sparse vector
-    float64_val = oracledb.SparseVector(
-        30, [9, 16, 24], array.array('d', [19.125, 78.5, 977.375])
-    )
-
-    # 8-bit signed integer sparse vector
-    int8_val = oracledb.SparseVector(
-        35, [10, 20, 30], array.array('b', [26, 125, -37])
-    )
-
-    cursor.execute(
-        "insert into vector_sparse_table values (:1, :2, :3)",
-        [float32_val, float64_val, int8_val]
-    )
-
-.. _fetchsparsevectors:
-
-Fetching Sparse Vectors
------------------------
-
-With python-oracledb, sparse vector columns are fetched as :ref:`SparseVector
-objects <sparsevectorsobj>`:
-
-.. code-block:: python
-
-    cursor.execute("select * from vector_sparse_table")
-    for row in cursor:
-       print(row)
-
-
-This prints::
-
-    (oracledb.SparseVector(25, array('I', [6, 10, 18]), array('f', [26.25, 129.625, 579.875])),
-     oracledb.SparseVector(30, array('I', [9, 16, 24]), array('d', [19.125, 78.5, 977.375])),
-     oracledb.SparseVector(35, array('I', [10, 20, 30]), array('b', [26, 125, -37])))
-
-Depending on context, the SparseVector type will be treated as a string:
-
-.. code-block:: python
-
-    cursor.execute("select * from vector_sparse_table")
-    for float32_val, float64_val, int8_val in cursor:
-        print("float32:", float32_val)
-        print("float64:", float64_val)
-        print("int8:", int8_val)
-
-This prints::
-
-    float32: [25, [6, 10, 18], [26.25, 129.625, 579.875]]
-    float64: [30, [9, 16, 24], [19.125, 78.5, 977.375]]
-    int8: [35, [10, 20, 30], [26, 125, -37]]
-
-Values can also be explicitly passed to `str()
-<https://docs.python.org/3/library/stdtypes.html#str>`__, if needed.
-
-VECTOR Metadata
-===============
-
-The :ref:`FetchInfo <fetchinfoobj>` object that is returned as part of the
-query metadata contains attributes :attr:`FetchInfo.vector_dimensions`,
-:attr:`FetchInfo.vector_format`, and :attr:`FetchInfo.vector_is_sparse` which
-return the number of dimensions of the vector column, the format of each
-dimension value in the vector column, and a boolean which determines whether
-the vector is sparse or not.
-
-For example:
-
-.. code-block:: python
-
-    cursor.execute("select float64sparsecol from vector_sparse_table")
-    desc = cursor.description[0]
-    print(desc.vector_format, desc.vector_dimensions, desc.vector_is_sparse)
-
-might print::
-
-    VectorFormat.FLOAT64 30 True
-
-.. _vector_thick_mode_old_client:
-
-Using python-oracledb Thick Mode with Older Versions of Oracle Client Libraries
-===============================================================================
-
-If you are using python-oracledb Thick mode with Oracle Client 21c or earlier,
-then you must use strings when inserting vectors.  The vector columns are
-fetched as Python lists.
-
-Inserting Vectors with Older Oracle Client Versions
----------------------------------------------------
-
-To insert vectors of int8, float32, float64, and unit8 format when using Oracle
-Client 21c or earlier, you must use strings as shown below:
-
-.. code-block:: python
-
-    vector_data_32 = "[1.625, 1.5, 1.0]"
-    vector_data_64 = "[11.25, 11.75, 11.5]"
-    vector_data_8 = "[1, 2, 3]"
-    vector_data_vb = "[180, 150, 100]"
-
-    cursor.execute(
-        "insert into vector_table (v32, v64, v8, vb) values (:1, :2, :3, :4)",
-        [vector_data_32, vector_data_64, vector_data_8, vector_data_vb]
-    )
-
-Fetching Vectors with Older Oracle Client Versions
---------------------------------------------------
-
-With Oracle Client 21c or earlier, the vector columns are fetched as Python
-lists. For example:
-
-.. code-block:: python
-
-    cursor.execute("select * from vector_table")
-    for row in cursor:
-        print(row)
-
-This prints an output such as::
-
-    ([1.625, 1.5, 1.0], [11.25, 11.75, 11.5], [1, 2, 3], [180, 150, 100])
-
-See `vector_string.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/vector_string.py>`__ for a runnable example.
-
-.. _numpyvectors:
-
-Using NumPy
-===========
-
-Vector data can be used with Python's `NumPy <https://numpy.org>`__ package
-types. To use NumPy's ndarray type, install NumPy, for example with
-``pip install numpy``, and import the module in your code.
-
-.. _insertvecwithnumpy:
-
-Inserting Vectors with NumPy
-----------------------------
-
-To insert vectors, you must convert NumPy ndarray types to array types. This
-conversion can be done by using an input type handler. For example:
-
-.. code-block:: python
-
-    def numpy_converter_in(value):
-        if value.dtype == numpy.float64:
-            dtype = "d"
-        elif value.dtype == numpy.float32:
-            dtype = "f"
-        elif value.dtype == numpy.uint8:
-            dtype = "B"
-        else:
-            dtype = "b"
-        return array.array(dtype, value)
-
-    def input_type_handler(cursor, value, arraysize):
-        if isinstance(value, numpy.ndarray):
-            return cursor.var(
-                oracledb.DB_TYPE_VECTOR,
-                arraysize=arraysize,
-                inconverter=numpy_converter_in,
-            )
-
-Using it in an ``INSERT`` statement:
-
-.. code-block:: python
-
-    vector_data_32 = numpy.array([1.625, 1.5, 1.0], dtype=numpy.float32)
-    vector_data_64 = numpy.array([11.25, 11.75, 11.5], dtype=numpy.float64)
-    vector_data_8 = numpy.array([1, 2, 3], dtype=numpy.int8)
-    vector_data_vb = numpy.array([180, 150, 100], dtype=numpy.uint8)
-
-    connection.inputtypehandler = input_type_handler
-
-    cursor.execute(
-        "insert into vector_table (v32, v64, v8, vb) values (:1, :2, :3, :4)",
-        [vector_data_32, vector_data_64, vector_data_8, vector_data_vb],
-    )
-
-.. _fetchvecwithnumpy:
-
-Fetching Vectors with NumPy
----------------------------
-
-To fetch vector data as an ndarray type, you can convert the array type to
-an ndarray type by using an output type handler. For example:
-
-.. code-block:: python
-
-    def numpy_converter_out(value):
-        return numpy.array(value, copy=False, dtype=value.typecode)
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VECTOR:
-            return cursor.var(
-                metadata.type_code,
-                arraysize=cursor.arraysize,
-                outconverter=numpy_converter_out,
-            )
-
-Using it to query the columns:
-
-.. code-block:: python
-
-    connection.outputtypehandler = output_type_handler
-
-    cursor.execute("select * from vector_table")
-        for row in cursor:
-            print(row)
-
-This prints an output such as::
-
-    (array([1.625, 1.5, 1.0], dtype=float32), array([11.25, 11.75, 11.5], dtype=float64), array([1, 2, 3], dtype=int8), array([180, 150, 100], dtype=uint8))
-
-See `vector_numpy.py <https://github.com/oracle/python-oracledb/tree/main/
-samples/vector_numpy.py>`__ for a runnable example.
diff --git a/doc/src/user_guide/xml_data_type.rst b/doc/src/user_guide/xml_data_type.rst
deleted file mode 100644
index fdd104cc..00000000
--- a/doc/src/user_guide/xml_data_type.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-.. _xmldatatype:
-
-.. currentmodule:: oracledb
-
-******************
-Using XMLTYPE Data
-******************
-
-Oracle XMLType columns are fetched as strings by default in Thin and Thick
-mode.  Note that in Thick mode you may need to use ``XMLTYPE.GETCLOBVAL()`` as
-discussed below.
-
-The examples below demonstrate using XMLType data with python-oracledb.  The
-following table will be used in these examples:
-
-.. code-block:: sql
-
-    CREATE TABLE xml_table (
-        id NUMBER,
-        xml_data SYS.XMLTYPE
-    );
-
-Inserting into the table can be done by simply binding a string:
-
-.. code-block:: python
-
-    xml_data = """<?xml version="1.0"?>
-            <customer>
-                <name>John Smith</name>
-                <Age>43</Age>
-                <Designation>Professor</Designation>
-                <Subject>Mathematics</Subject>
-            </customer>"""
-    cursor.execute("insert into xml_table values (:id, :xml)",
-                   id=1, xml=xml_data)
-
-This approach works with XML strings up to 1 GB in size. For longer strings, a
-temporary CLOB must be created using :meth:`Connection.createlob()` and cast
-when bound:
-
-.. code-block:: python
-
-    clob = connection.createlob(oracledb.DB_TYPE_CLOB)
-    clob.write(xml_data)
-    cursor.execute("insert into xml_table values (:id, sys.xmltype(:xml))",
-                   id=2, xml=clob)
-
-Fetching XML data can be done directly in Thin mode. This also works in Thick
-mode for values that are shorter than the length of a VARCHAR2 column:
-
-.. code-block:: python
-
-    cursor.execute("select xml_data from xml_table where id = :id", id=1)
-    xml_data, = cursor.fetchone()
-    print(xml_data)
-
-In Thick mode, for values that exceed the length of a VARCHAR2 column, a CLOB
-must be returned by using the function ``XMLTYPE.GETCLOBVAL()``:
-
-.. code-block:: python
-
-    cursor.execute("""
-            select xmltype.getclobval(xml_data)
-            from xml_table
-            where id = :id""", id=1)
-    clob, = cursor.fetchone()
-    print(clob.read())
-
-The LOB that is returned can be streamed, as shown.  Alternatively a string can
-be returned.  See :ref:`lobdata` for more information.
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 00000000..740a3ab3
Binary files /dev/null and b/favicon.ico differ
diff --git a/index.html b/index.html
new file mode 100644
index 00000000..bf8dc84d
--- /dev/null
+++ b/index.html
@@ -0,0 +1,454 @@
+<!DOCTYPE html>
+<html itemscope="itemscope" itemtype="http://schema.org/WebPage" lang="en">
+
+<!--
+
+Copyright (c) 2022, 2025, Oracle and/or its affiliates.
+
+This software is dual-licensed to you under the Universal Permissive License
+(UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+either license.
+
+If you elect to accept the software under the Apache License, Version 2.0,
+the following applies:
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title>python-oracledb - Python Driver for Oracle Database</title>
+  <link rel="stylesheet" href="base.css" type="text/css" />
+  <link rel="shortcut icon" type="image/ico" href="favicon.ico" />
+</head>
+
+<body>
+  <div class="oracleHeader">
+    <div class="container">
+      <a class="oracleLogo" href="https://www.oracle.com/">Oracle</a>
+    </div>
+  </div>
+  <header class="header" role="banner">
+    <div class="container">
+      <div class="headerLogoContainer">
+        <img class="headerLogo" alt="python-oracledb logo" src="logo.png" />
+      </div>
+      <div class="headerContent">
+        <h1 class="headerTitle">Python python-oracledb Driver</h1>
+        <nav class="headerNav" role="navigation">
+          <ul>
+            <li><a href="https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html" >Installation</a></li>
+            <li><a href="https://python-oracledb.readthedocs.io/en/latest/index.html">Documentation</a></li>
+            <li><a href="https://python-oracledb.readthedocs.io/en/latest/release_notes.html#releasenotes">Release Notes</a></li>
+            <li><a href="https://github.com/oracle/python-oracledb/discussions">Help</a></li>
+            <li><a href="https://github.com/oracle/python-oracledb">Source code</a></li>
+          </ul>
+        </nav>
+      </div>
+    </div>
+
+  </header>
+
+  <main class="mainContent" role="main">
+    <div class="container">
+
+      <div id="about">
+      <h2>The python-oracledb driver for Oracle Database</h2>
+
+          <p>
+
+          The <strong>python-oracledb</strong> driver is the widely used,
+          open-source <a href="https://www.python.org/" >Python programming
+          language</a> extension module allowing Python programs to connect
+          directly to <a href="https://www.oracle.com/database/" >Oracle
+          Database</a> with no extra libraries needed. The module is built with
+          Cython for safety and speed. It is lightweight and
+          high-performance. It is stable, well tested, and has comprehensive
+          documentation. The module is maintained by Oracle.
+
+          </p>
+
+          <p>
+          <img width="85%" src="./python-oracledb-arch.jpg">
+          </p>
+
+          <p>
+
+          The python-oracledb module conforms to the <a
+          href="https://peps.python.org/pep-0249/" >Python Database API 2.0
+          specification</a> with a considerable number of additions and a
+          couple of minor exclusions, see the <a href="#features" >feature
+          list</a>. It is used by many Python frameworks, SQL generators, ORMs,
+          and libraries.
+
+          </p>
+
+          <p>
+
+          Python-oracledb has a rich feature set which is easy to use. It gives
+          you control over SQL and PL/SQL statement execution; for working with
+          data frames; for fast data ingestion; for calling NoSQL-style
+          document APIs; for message queueing; for receiving database
+          notifications; and for starting and stopping the database. It also
+          has high availability and security features. Synchronous and
+          concurrent <a href="https://docs.python.org/3/library/asyncio.html"
+          >asyncio</a> coding styles are supported.  Database operations can
+          optionally be pipelined.
+
+          </p>
+
+          <p>
+
+          Python-oracledb is the successor to the now obsolete cx_Oracle
+          driver.
+
+          </p>
+
+      </div> <!-- /about -->
+
+      <div id="quickstart">
+      <h2>Getting Started</h2>
+
+          <ul>
+
+            <li>
+
+              <p>
+              <a href="https://www.oracle.com/database/technologies/appdev/python/quickstartpythononprem.html" >Quick Start: Developing Python Applications for Oracle Database</a>:  Instructions for Windows, macOS, and Linux for installing python-oracledb and connecting to an existing on-premise database.
+              </p>
+
+            </li>
+            <li>
+
+              <p>
+              <a href="https://www.oracle.com/database/technologies/appdev/python/quickstartpython.html" >Quick Start: Developing Python Applications for Oracle Autonomous Database</a>: Instructions for Windows, macOS, and Linux for installing python-oracledb and connecting to an existing Oracle Autonomous Database.
+              </p>
+
+            </li>
+
+            <li>
+
+              <p><a
+            href="https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html#quickstart"
+            >Quick Start python-oracledb Installation</a>: a high-level quickstart from the python-oracledb documentation for the eager user.</p>
+
+            </li>
+
+            <li>
+
+              <p><a href="https://apexapps.oracle.com/pls/apex/r/dbpm/livelabs/view-workshop?wid=3482" >Getting Started with Python and Oracle Database</a>: An introductory tutorial using Oracle's LiveLabs learning environoment</p>
+
+            </li>
+
+            <li>
+
+              <p><a href="
+              https://oracle.github.io/python-oracledb/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html">Python
+              and Oracle Database Tutorial: The New Wave of Scripting</a>: similar to the LiveLab, but aimed at users who already have python-oracledb and a database installed.</p>
+
+            </li>
+
+            <li><p><a
+            href="https://github.com/oracle/python-oracledb/tree/main/samples"
+            >Samples</a>: the sample programs from the GitHub repository.</p></li>
+
+          </ul>
+
+      </div> <!-- /quickstart -->
+
+      <div id="installation">
+      <h2>Installation</h2>
+
+      <p>See <a
+      href="https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html"
+      >python-oracledb Installation</a> for detailed instructions.</p>
+
+      </div> <!-- /installation -->
+
+      <div id="dependencies">
+
+      <h2>Dependencies</h2>
+
+          <ul>
+
+            <li>
+
+              <p><strong>Python versions 3.9 through 3.14</strong>.</p>
+
+              <p> Pre-built packages are available on <a
+              href="https://pypi.org/project/oracledb" >PyPI</a> and other
+              repositories.</p>
+
+              <p>Source code is also available.</p>
+
+              <p>Previous versions of python-oracledb supported older Python versions.</p>
+
+            </li>
+
+            <li>
+
+              <p><strong>Oracle Client libraries are optional</strong>.</p>
+
+              <p><strong>Thin mode</strong>: By default, python-oracledb is a
+              'Thin' driver which connects directly to Oracle Database.  This
+              mode does not need Oracle Client libraries.</p>
+
+              <p><strong>Thick mode</strong>: An optional python-oracledb mode
+              enabled by loading Oracle Client libraries at runtime. This adds
+              some advanced Oracle Database functionality.  You can install
+              Oracle Client libraries using the free <a
+              href="https://www.oracle.com/database/technologies/instant-client.html"
+              >Oracle Instant Client</a> packages. Python-oracledb works with
+              Oracle Client libraries 11.2 through 23.  See <a
+              href="https://python-oracledb.readthedocs.io/en/latest/user_guide/initialization.html#enablingthick"
+              >Enabling python-oracledb Thick mode</a>.</p>
+
+            </li>
+
+            <li>
+
+              <p><strong>Oracle Database</strong></p>
+
+              <p><strong>Thin mode</strong>: Python-oracledb Thin mode connects
+              to Oracle Database 12, 18, 19, 21 and 23.</p>
+
+              <p><strong>Thick mode</strong>: Python-oracledb Thick mode
+              connects to Oracle Database 9.2, 10, 11.2, 12, 18, 21 and 23,
+              depending on the Oracle Client library version.  Oracle
+              Database's standard client-server version interoperability allows
+              connection to both older and newer databases. For example, when
+              python-oracledb uses Oracle Client 19 libraries, it can connect
+              to Oracle Database 11.2 or later.  </p>
+
+            </li>
+
+          </ul>
+
+      </div> <!-- /dependencies -->
+
+      <div id="documentation">
+      <h2>Documentation</h2>
+
+      <p>See the <a href="https://python-oracledb.readthedocs.io/en/latest/index.html"
+      >python-oracledb Documentation</a> and <a
+      href="https://python-oracledb.readthedocs.io/en/latest/release_notes.html#releasenotes"
+      >Release Notes</a>.</p>
+
+      <p>You can use assistive technology products, such as screen readers,
+      while you work with the documentation. You can also use the keyboard
+      instead of the mouse.</p>
+
+      </div> <!-- /documentation -->
+
+      <div id="resources">
+      <h2>Resources</h2>
+
+      <p>Some resources that cover python-oracledb topics are:</p>
+
+      <p>
+          Blogs:
+          <a href="https://medium.com/@cjones-oracle" >medium.com/@cjones-oracle</a>,
+          <a href="https://medium.com/@sharad-chandran" >medium.com/@sharad-chandran</a>,
+          <a href="https://medium.com/@vignan.v" >medium.com/@vignan.v</a>,
+          <a href="https://medium.com/@veronica.dumitriu" >medium.com/@veronica.dumitriu</a>
+      </p>
+
+      <p>Videos: <a href="https://www.youtube.com/user/OracleAppDev"
+      >www.youtube.com/user/OracleAppDev</a></p>
+
+      </div> <!-- /resources -->
+      <div id="help">
+      <h2>Help</h2>
+
+      <p>Questions can be asked on <a
+      href="https://github.com/oracle/python-oracledb/discussions" >GitHub
+      Discussions</a>. Identified issues can be raised as <a
+      href="https://github.com/oracle/python-oracledb/issues" >GitHub
+      Issues</a>.</p>
+
+      </div> <!-- /help -->
+
+      <div id="tests">
+      <h2>Tests</h2>
+
+      <p>See the <a href="https://github.com/oracle/python-oracledb/tree/main/tests" >test suite</a>.</p>
+
+      </div> <!-- /tests -->
+
+      <div id="contribuing">
+      <h2>Contributing</h2>
+
+      <p>See <a href="https://github.com/oracle/python-oracledb/blob/main/CONTRIBUTING.md" >CONTRIBUTING</a>.</p>
+
+      </div> <!-- /contributing -->
+
+      <div id="features">
+
+      <h2>Features</h2>
+
+      <ul>
+
+      <li><p>Easily installed from <a href="https://pypi.org/project/oracledb"
+      >PyPI</a> or other repositories.  No additional install is required -
+      you just need an available Oracle Database.</p></li>
+
+      <li><p>Support for Python 3.9 and higher. (Older versions of
+      python-oracledb can be used with Python versions back to Python 3.6).</p></li>
+
+      <li><p>Support for synchronous and concurrent <a
+      href="https://docs.python.org/3/library/asyncio.html" >asyncio</a> coding
+      styles.</p></li>
+
+      <li><p>Connects to Oracle Database 9.2, 10, 11.2, 12, 18, 19, 21 and 23
+      on-premises or in the Cloud.</p></li>
+
+      <li><p>Optional use of Oracle Client 11.2, 12, 18, 19, 21 or 23 libraries
+      for advanced Oracle Database functionality.  Oracle's standard
+      cross-version interoperability allows easy upgrades and connectivity to
+      different Oracle Database versions.</p></li>
+
+      <li><p>SQL and PL/SQL Execution with significant optimizations including
+      compressed fetch, pre-fetching, client and server result set caching, and
+      statement caching with auto-tuning.</p></li>
+
+      <li><p>Full use of Oracle Network Service infrastructure, including
+      encrypted network traffic and security features.</p></li>
+
+      <li><p>Extensive Oracle data type support, including VECTOR, JSON and
+      large object support (CLOB and BLOB).</p></li>
+
+      <li><p>Support for fetching and inserting data frames for efficient use
+      with Python DataFrame libraries and formats such as PyArrow, NumPy,
+      Pandas, Polars, PyTorch, and Apache Parquet.</p></li>
+
+      <li><p>Direct binding to SQL objects.  One great use case is binding
+      Python objects to Oracle Spatial SDO objects.</p></li>
+
+      <li><p>SODA (Simple Oracle Document Access).</p></li>
+
+      <li><p>Array operations for efficient INSERT, UPDATE and MERGE
+      execution.</p></li>
+
+      <li><p>Array row counts and batch error handling for array operations.</p></li>
+
+      <li><p>Oracle Database Direct Path Loads.</p></li>
+
+      <li><p>Fetching of large result sets with easy tuning.</p></li>
+
+      <li><p>REF CURSOR support.</p></li>
+
+      <li><p>Scrollable cursors. Go back and forth through your query
+      results.</p></li>
+
+      <li><p>Oracle Database 23ai statement pipelining. Keep the database busy
+      processing statements.</p></li>
+
+      <li><p>Fetch PL/SQL Implicit Results. Easily return query results from
+      PL/SQL.</p></li>
+
+      <li><p>Row Prefetching.  Efficient use of the network.</p></li>
+
+      <li><p>Client Result Caching.  Improve performance of frequently
+      executed look-up statements.</p></li>
+
+      <li><p>Advanced Queuing. Use database notifications to build
+      micro-service applications.</p></li>
+
+      <li><p>Continuous Query Notification (CQN).  Get notified when data
+      changes.</p></li>
+
+      <li><p>Edition Based Redefinition.  Easily switch applications to use
+      updated PL/SQL logic.</p></li>
+
+      <li><p>Support for setting application context during the creation of
+      a connection, making application metadata more accessible to the
+      database, including in LOGON triggers.</p></li>
+
+      <li><p>End-to-end monitoring and tracing.</p></li>
+
+      <li><p>Transaction management features, including Sessionless
+      Transactions and Two-phase Commits.</p></li>
+
+      <li><p>Session Pooling, with tagging and session state fix-up callback.</p></li>
+
+      <li><p>Database Resident Connection Pooling (DRCP). Optimize Oracle
+      Database resource usage for distributed applications.</p></li>
+
+      <li><p>Implicit Connection Pooling.</p></li>
+
+      <li><p>Privileged Connections.</p></li>
+
+      <li><p>External Authentication.</p></li>
+
+      <li><p>Token Authentication.</p></li>
+
+      <li><p>Centralized Configuration Provider support.</p></li>
+
+      <li><p>Oracle Database startup and shutdown.</p></li>
+
+      <li><p>Oracle Globally Distributed Database (formerly called Oracle
+      Sharding) connectivity.</p></li>
+
+      <li><p>Oracle Database High Availability Features, such as in-band and
+      FAN notifications, Application Continuity, Transparent Application
+      Continuity, and Transaction Guard support.</p></li>
+
+      </ul>
+
+      <p>Not all features are available in both Thin and Thick modes.  See the user
+      documentation <a
+      href="https://python-oracledb.readthedocs.io/en/latest/user_guide/appendix_a.html"
+      >Oracle Database Features Supported by python-oracledb</a> for more
+      information.</p>
+
+      <p>Python DB API specification exclusions:</p>
+      <ul>
+
+        <li><p>The TIME data type is not supported by Oracle Database and is
+        therefore not implemented.</p></li>
+
+        <li><p>The method <code>cursor.nextset()</code> is not implemented
+        because the specification assumes an implementation of cursors that
+        does not fit well with Oracle Database's implementation of cursors and
+        implicit results. See the method <a
+        href="https://python-oracledb.readthedocs.io/en/latest/api_manual/cursor.html#Cursor.getimplicitresults">Cursor.getimplicitresults()</a>
+        for the Oracle replacement.</p>
+
+        </li>
+
+      </ul>
+
+      </div> <!-- /features -->
+
+      <div id="license">
+      <h2>License</h2>
+
+      <p>Python-oracledb license information is in <a
+      href="https://github.com/oracle/python-oracledb/blob/main/LICENSE.txt"
+      >LICENSE</a>, <a
+      href="https://github.com/oracle/python-oracledb/blob/main/THIRD_PARTY_LICENSES.txt"
+      >THIRD_PARTY_LICENSES</a> and <a
+      href="https://github.com/oracle/python-oracledb/blob/main/NOTICE.txt"
+      >NOTICE</a>.</p>
+
+      </div> <!-- /license -->
+
+    </div>
+  </main>
+</body>
+
+</html>
diff --git a/logo.png b/logo.png
new file mode 100644
index 00000000..0c4c2933
Binary files /dev/null and b/logo.png differ
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index c630b8e1..00000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,101 +0,0 @@
-[build-system]
-requires = [
-    "setuptools >= 77.0.0",
-    "wheel",
-    "cython ~= 3.1",
-]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "oracledb"
-description = "Python interface to Oracle Database"
-keywords = ["Oracle", "database"]
-authors = [{name = "Anthony Tuininga", email = "anthony.tuininga@oracle.com"}]
-license = "UPL-1.0 OR Apache-2.0"
-license-files = [
-    "LICENSE.txt",
-    "THIRD_PARTY_LICENSES.txt",
-    "NOTICE.txt",
-]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "Natural Language :: English",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Cython",
-    "Topic :: Database",
-]
-requires-python = ">=3.9"
-dependencies = [
-    "cryptography>=3.2.1",
-    "typing_extensions>=4.14.0",
-]
-dynamic = ["version"]
-
-[project.readme]
-file = "README.md"
-content-type = "text/markdown"
-
-[project.urls]
-Homepage = "https://oracle.github.io/python-oracledb"
-Installation = "https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html"
-Samples = "https://github.com/oracle/python-oracledb/tree/main/samples"
-Documentation = "http://python-oracledb.readthedocs.io"
-"Release Notes" = "https://python-oracledb.readthedocs.io/en/latest/release_notes.html"
-Issues = "https://github.com/oracle/python-oracledb/issues"
-Source = "https://github.com/oracle/python-oracledb"
-
-[project.optional-dependencies]
-test = [
-    "anyio",
-    "numpy",
-    "pandas",
-    "pyarrow",
-    "pytest",
-]
-oci_config = ["oci"]
-oci_auth = ["oci"]
-azure_config = [
-    "azure-appconfiguration",
-    "azure-identity",
-    "azure-keyvault-secrets"
-]
-azure_auth = ["msal"]
-
-[tool.setuptools]
-zip-safe = false
-packages = [
-    "oracledb",
-    "oracledb.plugins",
-]
-package-dir = {"" = "src"}
-include-package-data = false
-
-[tool.setuptools.package-data]
-"*" = ["py.typed"]
-
-[tool.setuptools.dynamic]
-version = {attr = "oracledb.version.__version__"}
-
-[tool.black]
-line-length = 79
-required-version = 25
-
-[tool.ruff]
-line-length = 79
-target-version = "py39"
-exclude = ["templates"]
-
-[tool.pytest.ini_options]
-minversion = "8.3.0"
-testpaths = [
-    "tests"
-]
diff --git a/python-oracledb-arch.jpg b/python-oracledb-arch.jpg
new file mode 100644
index 00000000..272230b9
Binary files /dev/null and b/python-oracledb-arch.jpg differ
diff --git a/samples/README.md b/samples/README.md
deleted file mode 100644
index ef0499f1..00000000
--- a/samples/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-## Python-oracledb Examples
-
-This directory contains samples for python-oracledb.
-
-### Basic Examples
-
-1.  The schemas and SQL objects that are referenced in the samples can be
-    created by running the Python script [create_schema.py][1]. The script
-    requires SYSDBA privileges and will prompt for these credentials as well as
-    the names of the schemas and edition that will be created, unless a number
-    of environment variables are set as documented in the Python script
-    [sample_env.py][2]. Run the script using the following command:
-
-        python create_schema.py
-
-2.  Run a Python script, for example:
-
-        python query.py
-
-3.  After running python-oracledb samples, the schemas and SQL objects can be
-    dropped by running the Python script [drop_schema.py][3]. The script
-    requires SYSDBA privileges and will prompt for these credentials as well as
-    the names of the schemas and edition that will be dropped, unless a number
-    of environment variables are set as documented in the Python script
-    [sample_env.py][2]. Run the script using the following command:
-
-        python drop_schema.py
-
-### Examples in a Container
-
-The [containers](./containers) directory has Dockerfiles for building a
-container with the samples and a running Oracle Database, and for creating a
-development environment.
-
-### Notebooks
-
-The [notebooks](./notebooks) directory has Jupyter notebooks with runnable
-examples.
-
-[1]: https://github.com/oracle/python-oracledb/blob/main/samples/create_schema.py
-[2]: https://github.com/oracle/python-oracledb/blob/main/samples/sample_env.py
-[3]: https://github.com/oracle/python-oracledb/blob/main/samples/drop_schema.py
diff --git a/samples/app_context.py b/samples/app_context.py
deleted file mode 100644
index 2a4f3883..00000000
--- a/samples/app_context.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# app_context.py
-#
-# Demonstrates the use of application context. Application context is available
-# within logon triggers and can be retrieved by using the function
-# sys_context().
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# client context attributes to be set
-APP_CTX_NAMESPACE = "CLIENTCONTEXT"
-APP_CTX_ENTRIES = [
-    (APP_CTX_NAMESPACE, "ATTR1", "VALUE1"),
-    (APP_CTX_NAMESPACE, "ATTR2", "VALUE2"),
-    (APP_CTX_NAMESPACE, "ATTR3", "VALUE3"),
-]
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    appcontext=APP_CTX_ENTRIES,
-)
-
-with connection.cursor() as cursor:
-    for namespace, name, value in APP_CTX_ENTRIES:
-        cursor.execute(
-            "select sys_context(:1, :2) from dual", (namespace, name)
-        )
-        (value,) = cursor.fetchone()
-        print("Value of context key", name, "is", value)
diff --git a/samples/aq_notification.py b/samples/aq_notification.py
deleted file mode 100644
index 5315c26f..00000000
--- a/samples/aq_notification.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# aq_notification.py
-#
-# Demonstrates using advanced queuing notification. Once this script is
-# running, run object_aq.py in another terminal to enqueue a few messages to
-# the "DEMO_BOOK_QUEUE" queue.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-registered = True
-
-
-def process_messages(message):
-    global registered
-    print("Message type:", message.type)
-    if message.type == oracledb.EVENT_DEREG:
-        print("Deregistration has taken place...")
-        registered = False
-        return
-    print("Queue name:", message.queue_name)
-    print("Consumer name:", message.consumer_name)
-    print("Message id:", message.msgid)
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    events=True,
-)
-
-sub = connection.subscribe(
-    namespace=oracledb.SUBSCR_NAMESPACE_AQ,
-    name="DEMO_BOOK_QUEUE",
-    callback=process_messages,
-    timeout=300,
-)
-print("Subscription:", sub)
-print("--> Connection:", sub.connection)
-print("--> Callback:", sub.callback)
-print("--> Namespace:", sub.namespace)
-print("--> Protocol:", sub.protocol)
-print("--> Timeout:", sub.timeout)
-
-while registered:
-    print("Waiting for notifications....")
-    time.sleep(5)
diff --git a/samples/array_dml_rowcounts.py b/samples/array_dml_rowcounts.py
deleted file mode 100644
index bdfee97c..00000000
--- a/samples/array_dml_rowcounts.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# array_dml_rowcounts.py
-#
-# Demonstrates the use of the 12.1 feature that allows cursor.executemany()
-# to return the number of rows affected by each individual execution as a list.
-# The parameter "arraydmlrowcounts" must be set to True in the call to
-# cursor.executemany() after which cursor.getarraydmlrowcounts() can be called.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # show the number of rows for each parent ID as a means of verifying the
-    # output from the delete statement
-    for parent_id, count in cursor.execute(
-        """
-        select ParentId, count(*)
-        from ChildTable
-        group by ParentId
-        order by ParentId
-        """
-    ):
-        print("Parent ID:", parent_id, "has", int(count), "rows.")
-    print()
-
-    # delete the following parent IDs only
-    parent_ids_to_delete = [20, 30, 50]
-
-    print("Deleting Parent IDs:", parent_ids_to_delete)
-    print()
-
-    # enable array DML row counts for each iteration executed in executemany()
-    cursor.executemany(
-        "delete from ChildTable where ParentId = :1",
-        [(i,) for i in parent_ids_to_delete],
-        arraydmlrowcounts=True,
-    )
-
-    # display the number of rows deleted for each parent ID
-    row_counts = cursor.getarraydmlrowcounts()
-    for parent_id, count in zip(parent_ids_to_delete, row_counts):
-        print("Parent ID:", parent_id, "deleted", count, "rows.")
diff --git a/samples/array_dml_rowcounts_async.py b/samples/array_dml_rowcounts_async.py
deleted file mode 100644
index a8661af1..00000000
--- a/samples/array_dml_rowcounts_async.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# array_dml_rowcounts_async.py
-#
-# An asynchronous version of array_dml_rowcounts.py
-#
-# Demonstrates the use of the 12.1 feature that allows cursor.executemany()
-# to return the number of rows affected by each individual execution as a list.
-# The parameter "arraydmlrowcounts" must be set to True in the call to
-# cursor.executemany() after which cursor.getarraydmlrowcounts() can be called.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # show the number of rows for each parent ID as a means of verifying
-        # the output from the delete statement
-        await cursor.execute(
-            """
-            select ParentId, count(*)
-            from ChildTable
-            group by ParentId
-            order by ParentId
-            """
-        )
-        async for parent_id, count in cursor:
-            print("Parent ID:", parent_id, "has", int(count), "rows.")
-        print()
-
-        # delete the following parent IDs only
-        parent_ids_to_delete = [20, 30, 50]
-
-        print("Deleting Parent IDs:", parent_ids_to_delete)
-        print()
-
-        # enable array DML row counts for each iteration executed in
-        # executemany()
-        await cursor.executemany(
-            "delete from ChildTable where ParentId = :1",
-            [(i,) for i in parent_ids_to_delete],
-            arraydmlrowcounts=True,
-        )
-
-        # display the number of rows deleted for each parent ID
-        row_counts = cursor.getarraydmlrowcounts()
-        for parent_id, count in zip(parent_ids_to_delete, row_counts):
-            print("Parent ID:", parent_id, "deleted", count, "rows.")
-
-
-asyncio.run(main())
diff --git a/samples/async_gather.py b/samples/async_gather.py
deleted file mode 100644
index 81f45487..00000000
--- a/samples/async_gather.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# async_gather.py
-#
-# Demonstrates using a connection pool with asyncio and gather().
-#
-# This also shows the use of pool_alias for connection pool caching, so the
-# pool handle does not need to passed through the app.
-#
-# Each coroutine invocation will acquire a connection from the connection pool.
-# The number of connections in the pool will depend on the speed of your
-# environment. In some cases existing connections will get reused. In other
-# cases up to CONCURRENCY connections will be created by the pool.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-# Pool name for the connection pool cache
-POOL_ALIAS_NAME = "mypool"
-
-# Number of coroutines to run
-CONCURRENCY = 5
-
-# Query the unique session identifier/serial number combination of a connection
-SQL = """select unique current_timestamp as ct, sid||'-'||serial# as sidser
-         from v$session_connect_info
-         where sid = sys_context('userenv', 'sid')"""
-
-
-# Show the unique session identifier/serial number of each connection that the
-# pool creates
-async def init_session(connection, requested_tag):
-    res = await connection.fetchone(SQL)
-    print(res[0].strftime("%H:%M:%S.%f"), "- init_session SID-SERIAL#", res[1])
-
-
-# The coroutine simply shows the session identifier/serial number of the
-# connection returned from the pool
-async def query():
-    async with oracledb.connect_async(
-        pool_alias=POOL_ALIAS_NAME
-    ) as connection:
-        await connection.callproc("dbms_session.sleep", [1])
-        res = await connection.fetchone(SQL)
-        print(res[0].strftime("%H:%M:%S.%f"), "- query SID-SERIAL#", res[1])
-
-
-async def main():
-    oracledb.create_pool_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_pool_params(),
-        min=1,
-        max=CONCURRENCY,
-        session_callback=init_session,
-        pool_alias=POOL_ALIAS_NAME,
-    )
-
-    coroutines = [query() for i in range(CONCURRENCY)]
-
-    await asyncio.gather(*coroutines)
-
-    pool = oracledb.get_pool(POOL_ALIAS_NAME)
-    await pool.close()
-
-
-asyncio.run(main())
diff --git a/samples/batch_errors.py b/samples/batch_errors.py
deleted file mode 100644
index 50155752..00000000
--- a/samples/batch_errors.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# batch_errors.py
-#
-# Demonstrates the use of the Oracle Database 12.1 feature that allows
-# cursor.executemany() to complete successfully, even if errors take
-# place during the execution of one or more of the individual
-# executions. The parameter "batcherrors" must be set to True in the
-# call to cursor.executemany() after which cursor.getbatcherrors() can
-# be called, which will return a list of error objects.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # retrieve the number of rows in the table
-    cursor.execute("select count(*) from ChildTable")
-    (count,) = cursor.fetchone()
-    print("Number of rows in child table:", int(count))
-
-    # define data to insert
-    data_to_insert = [
-        (1016, 10, "Child B of Parent 10"),
-        (1017, 10, "Child C of Parent 10"),
-        (1018, 20, "Child D of Parent 20"),
-        (1018, 20, "Child D of Parent 20"),  # duplicate key
-        (1019, 30, "Child C of Parent 30"),
-        (1020, 30, "Child D of Parent 40"),
-        (1021, 60, "Child A of Parent 60"),  # parent does not exist
-        (1022, 40, "Child F of Parent 40"),
-    ]
-    print("Number of rows to insert:", len(data_to_insert))
-
-    # old method: executemany() with data errors results in stoppage after the
-    # first error takes place; the row count is updated to show how many rows
-    # actually succeeded
-    try:
-        cursor.executemany(
-            "insert into ChildTable values (:1, :2, :3)", data_to_insert
-        )
-    except oracledb.DatabaseError as e:
-        (error,) = e.args
-        print("Failure with error:", error.message)
-        print("Number of rows successfully inserted:", cursor.rowcount)
-
-    # demonstrate that the row count is accurate
-    cursor.execute("select count(*) from ChildTable")
-    (count,) = cursor.fetchone()
-    print("Number of rows in child table after failed insert:", int(count))
-
-    # roll back so we can perform the same work using the new method
-    connection.rollback()
-
-    # new method: executemany() with batch errors enabled (and array DML row
-    # counts also enabled) results in no immediate error being raised
-    cursor.executemany(
-        "insert into ChildTable values (:1, :2, :3)",
-        data_to_insert,
-        batcherrors=True,
-        arraydmlrowcounts=True,
-    )
-
-    # display the errors that have taken place
-    errors = cursor.getbatcherrors()
-    print("Number of rows with bad values:", len(errors))
-    for error in errors:
-        print("Error", error.message.rstrip(), "at row offset", error.offset)
-
-    # arraydmlrowcounts also shows rows with invalid data: they have a row
-    # count of 0; otherwise 1 is shown
-    row_counts = cursor.getarraydmlrowcounts()
-    print("Array DML row counts:", row_counts)
-
-    # demonstrate that all of the rows without errors have been successfully
-    # inserted
-    cursor.execute("select count(*) from ChildTable")
-    (count,) = cursor.fetchone()
-    print(
-        "Number of rows in child table after insert with batcherrors "
-        "enabled:",
-        int(count),
-    )
diff --git a/samples/batch_errors_async.py b/samples/batch_errors_async.py
deleted file mode 100644
index 3297fb6a..00000000
--- a/samples/batch_errors_async.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# batch_errors_async.py
-#
-# An asynchronous version of batch_errors.py
-#
-# Demonstrates the use of the Oracle Database 12.1 feature that allows
-# cursor.executemany() to complete successfully, even if errors take
-# place during the execution of one or more of the individual
-# executions. The parameter "batcherrors" must be set to True in the
-# call to cursor.executemany() after which cursor.getbatcherrors() can
-# be called, which will return a list of error objects.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # retrieve the number of rows in the table
-        await cursor.execute("select count(*) from ChildTable")
-        (count,) = await cursor.fetchone()
-        print("Number of rows in child table:", int(count))
-
-        # define data to insert
-        data_to_insert = [
-            (1016, 10, "Child B of Parent 10"),
-            (1017, 10, "Child C of Parent 10"),
-            (1018, 20, "Child D of Parent 20"),
-            (1018, 20, "Child D of Parent 20"),  # duplicate key
-            (1019, 30, "Child C of Parent 30"),
-            (1020, 30, "Child D of Parent 40"),
-            (1021, 60, "Child A of Parent 60"),  # parent does not exist
-            (1022, 40, "Child F of Parent 40"),
-        ]
-        print("Number of rows to insert:", len(data_to_insert))
-
-        # old method: executemany() with data errors results in stoppage after
-        # the first error takes place; the row count is updated to show how
-        # many rows actually succeeded
-        try:
-            await cursor.executemany(
-                "insert into ChildTable values (:1, :2, :3)", data_to_insert
-            )
-        except oracledb.DatabaseError as e:
-            (error,) = e.args
-            print("Failure with error:", error.message)
-            print("Number of rows successfully inserted:", cursor.rowcount)
-
-        # demonstrate that the row count is accurate
-        await cursor.execute("select count(*) from ChildTable")
-        (count,) = await cursor.fetchone()
-        print("Number of rows in child table after failed insert:", int(count))
-
-        # roll back so we can perform the same work using the new method
-        await connection.rollback()
-
-        # new method: executemany() with batch errors enabled (and array DML
-        # row counts also enabled) results in no immediate error being raised
-        await cursor.executemany(
-            "insert into ChildTable values (:1, :2, :3)",
-            data_to_insert,
-            batcherrors=True,
-            arraydmlrowcounts=True,
-        )
-
-        # display the errors that have taken place
-        errors = cursor.getbatcherrors()
-        print("Number of rows with bad values:", len(errors))
-        for error in errors:
-            print(
-                "Error", error.message.rstrip(), "at row offset", error.offset
-            )
-
-        # arraydmlrowcounts also shows rows with invalid data: they have a row
-        # count of 0; otherwise 1 is shown
-        row_counts = cursor.getarraydmlrowcounts()
-        print("Array DML row counts:", row_counts)
-
-        # demonstrate that all of the rows without errors have been
-        # successfully inserted
-        await cursor.execute("select count(*) from ChildTable")
-        (count,) = await cursor.fetchone()
-        print(
-            "Number of rows in child table after insert with batcherrors "
-            "enabled:",
-            int(count),
-        )
-
-
-asyncio.run(main())
diff --git a/samples/bind_insert.py b/samples/bind_insert.py
deleted file mode 100644
index a6094125..00000000
--- a/samples/bind_insert.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bind_insert.py
-#
-# Demonstrates how to insert rows into a table using bind variables.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-# "Bind by position"
-# -----------------------------------------------------------------------------
-
-rows = [
-    (1, "First"),
-    (2, "Second"),
-    (3, "Third"),
-    (4, "Fourth"),
-    (5, None),  # Insert a NULL value
-    (6, "Sixth"),
-    (7, "Seventh"),
-]
-
-with connection.cursor() as cursor:
-    # predefine the maximum string size to avoid data scans and memory
-    # reallocations.  The value 'None' indicates that the default processing
-    # can take place
-    cursor.setinputsizes(None, 20)
-
-    cursor.executemany("insert into mytab(id, data) values (:1, :2)", rows)
-
-# -----------------------------------------------------------------------------
-# "Bind by name"
-# -----------------------------------------------------------------------------
-
-rows = [
-    {"d": "Eighth", "i": 8},
-    {"d": "Ninth", "i": 9},
-    {"d": "Tenth", "i": 10},
-    {"i": 11},  # Insert a NULL value
-]
-
-with connection.cursor() as cursor:
-    # Predefine maximum string size to avoid data scans and memory
-    # reallocations
-    cursor.setinputsizes(d=20)
-
-    cursor.executemany("insert into mytab(id, data) values (:i, :d)", rows)
-
-# -----------------------------------------------------------------------------
-# Inserting a single bind still needs tuples
-# -----------------------------------------------------------------------------
-
-rows = [("Eleventh",), ("Twelfth",)]
-
-with connection.cursor() as cursor:
-    cursor.executemany("insert into mytab(id, data) values (12, :1)", rows)
-
-# Don't commit - this lets the demo be run multiple times
-# connection.commit()
-
-# -----------------------------------------------------------------------------
-# Now query the results back
-# -----------------------------------------------------------------------------
-
-with connection.cursor() as cursor:
-    for row in cursor.execute("select * from mytab order by id"):
-        print(row)
diff --git a/samples/bind_insert_async.py b/samples/bind_insert_async.py
deleted file mode 100644
index 6330e2e7..00000000
--- a/samples/bind_insert_async.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bind_insert_async.py
-#
-# An asynchronous version of bind_insert.py
-#
-# Demonstrates how to insert rows into a table using bind variables.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # -------------------------------------------------------------------------
-    # "Bind by position"
-    # -------------------------------------------------------------------------
-
-    rows = [
-        (1, "First"),
-        (2, "Second"),
-        (3, "Third"),
-        (4, "Fourth"),
-        (5, None),  # Insert a NULL value
-        (6, "Sixth"),
-        (7, "Seventh"),
-    ]
-
-    with connection.cursor() as cursor:
-        # predefine the maximum string size to avoid data scans and memory
-        # reallocations.  The value 'None' indicates that the default
-        # processing can take place
-        cursor.setinputsizes(None, 20)
-
-        await cursor.executemany(
-            "insert into mytab(id, data) values (:1, :2)", rows
-        )
-
-    # -------------------------------------------------------------------------
-    # "Bind by name"
-    # -------------------------------------------------------------------------
-
-    rows = [
-        {"d": "Eighth", "i": 8},
-        {"d": "Ninth", "i": 9},
-        {"d": "Tenth", "i": 10},
-        {"i": 11},  # Insert a NULL value
-    ]
-
-    with connection.cursor() as cursor:
-        # Predefine maximum string size to avoid data scans and memory
-        # reallocations
-        cursor.setinputsizes(d=20)
-
-        await cursor.executemany(
-            "insert into mytab(id, data) values (:i, :d)", rows
-        )
-
-    # -------------------------------------------------------------------------
-    # Inserting a single bind still needs tuples
-    # -------------------------------------------------------------------------
-
-    rows = [("Eleventh",), ("Twelfth",)]
-
-    await connection.executemany(
-        "insert into mytab(id, data) values (12, :1)", rows
-    )
-
-    # Don't commit - this lets the demo be run multiple times
-    # await connection.commit()
-
-    # -------------------------------------------------------------------------
-    # Now query the results back
-    # -------------------------------------------------------------------------
-
-    for row in await connection.fetchall("select * from mytab order by id"):
-        print(row)
-
-
-asyncio.run(main())
diff --git a/samples/bind_query.py b/samples/bind_query.py
deleted file mode 100644
index a7e5e5bb..00000000
--- a/samples/bind_query.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bind_query.py
-#
-# Demonstrates the use of bind variables in queries. Binding is important for
-# scalability and security.  Since the text of a query that is re-executed is
-# unchanged, no additional parsing is required, thereby reducing overhead and
-# increasing performance. It also permits data to be bound without having to be
-# concerned about escaping special characters, or be concerned about SQL
-# injection attacks.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# Bind by position with lists
-with connection.cursor() as cursor:
-    print("1. Bind by position: single value list")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    for row in cursor.execute(sql, [1]):
-        print(row)
-    print()
-
-    print("2. Bind by position: multiple values")
-    sql = "select * from SampleQueryTab where id = :bvid and 123 = :otherbind"
-    for row in cursor.execute(sql, [2, 123]):
-        print(row)
-    print()
-
-    # With bind-by-position, the order of the data in the bind list matches the
-    # order of the placeholders used in the SQL statement.  The bind list data
-    # order is not associated by the name of the bind variable placeholders in
-    # the SQL statement, even though those names are ":1" and ":2".
-    print(
-        "3. Bind by position: multiple values with numeric placeholder names"
-    )
-    sql = "select * from SampleQueryTab where id = :2 and 456 = :1"
-    for row in cursor.execute(sql, [3, 456]):
-        print(row)
-    print()
-
-    # With bind-by-position, repeated use of bind placeholder names in the SQL
-    # statement requires the input list data to be repeated.
-    print("4. Bind by position: multiple values with a repeated placeholder")
-    sql = "select * from SampleQueryTab where id = :2 and 3 = :2"
-    for row in cursor.execute(sql, [3, 3]):
-        print(row)
-    print()
-
-
-# Bind by position with tuples
-with connection.cursor() as cursor:
-    print("5. Bind by position with single value tuple")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    for row in cursor.execute(sql, (4,)):
-        print(row)
-    print()
-
-    print("6. Bind by position with a multiple value tuple")
-    sql = "select * from SampleQueryTab where id = :bvid and 789 = :otherbind"
-    for row in cursor.execute(sql, (4, 789)):
-        print(row)
-    print()
-
-# Bind by name with a dictionary
-with connection.cursor() as cursor:
-    print("7. Bind by name with a dictionary")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    for row in cursor.execute(sql, {"bvid": 4}):
-        print(row)
-    print()
-
-    # With bind-by-name, repeated use of bind placeholder names in the SQL
-    # statement lets you supply the data once.
-    print("8. Bind by name with multiple value dict and repeated placeholders")
-    sql = "select * from SampleQueryTab where id = :bvid and 4 = :bvid"
-    for row in cursor.execute(sql, {"bvid": 4}):
-        print(row)
-    print()
-
-# Bind by name with parameters.  The execute() parameter names match the bind
-# variable placeholder names.
-with connection.cursor() as cursor:
-    print("9. Bind by name using parameters")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    for row in cursor.execute(sql, bvid=5):
-        print(row)
-    print()
-
-    print("10. Bind by name using multiple parameters")
-    sql = "select * from SampleQueryTab where id = :bvid and 101 = :otherbind"
-    for row in cursor.execute(sql, bvid=5, otherbind=101):
-        print(row)
-    print()
-
-    # With bind-by-name, repeated use of bind placeholder names in the SQL
-    # statement lets you supply the data once.
-    print("11. Bind by name: multiple values with repeated placeholder names")
-    sql = "select * from SampleQueryTab where id = :bvid and 6 = :bvid"
-    for row in cursor.execute(sql, bvid=6):
-        print(row)
-    print()
-
-# Rexcuting a query with different data values
-with connection.cursor() as cursor:
-    sql = "select * from SampleQueryTab where id = :bvid"
-
-    print("12. Query results with id = 7")
-    for row in cursor.execute(sql, [4]):
-        print(row)
-    print()
-
-    print("13. Rexcuted query results with id = 1")
-    for row in cursor.execute(sql, [1]):
-        print(row)
-    print()
diff --git a/samples/bind_query_async.py b/samples/bind_query_async.py
deleted file mode 100644
index 69a938ad..00000000
--- a/samples/bind_query_async.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bind_query_async.py
-#
-# An asynchronous version of bind_query.py
-#
-# Demonstrates the use of bind variables in queries. Binding is important for
-# scalability and security.  Since the text of a query that is re-executed is
-# unchanged, no additional parsing is required, thereby reducing overhead and
-# increasing performance. It also permits data to be bound without having to be
-# concerned about escaping special characters, or be concerned about SQL
-# injection attacks.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # Bind by position with lists
-    print("1. Bind by position: single value list")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    print(await connection.fetchone(sql, [1]))
-    print()
-
-    print("2. Bind by position: multiple values")
-    sql = "select * from SampleQueryTab where id = :bvid and 123 = :otherbind"
-    print(await connection.fetchone(sql, [2, 123]))
-    print()
-
-    # With bind-by-position, the order of the data in the bind list matches
-    # the order of the placeholders used in the SQL statement.  The bind
-    # list data order is not associated by the name of the bind variable
-    # placeholders in the SQL statement, even though those names are ":1"
-    # and ":2".
-    print(
-        "3. Bind by position: multiple values with numeric placeholder names"
-    )
-    sql = "select * from SampleQueryTab where id = :2 and 456 = :1"
-    print(await connection.fetchone(sql, [3, 456]))
-    print()
-
-    # With bind-by-position, repeated use of bind placeholder names in the
-    # SQL statement requires the input list data to be repeated.
-    print("4. Bind by position: multiple values with a repeated placeholder")
-    sql = "select * from SampleQueryTab where id = :2 and 3 = :2"
-    print(await connection.fetchall(sql, [3, 3]))
-    print()
-
-    # Bind by position with tuples
-    print("5. Bind by position with single value tuple")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    print(await connection.fetchone(sql, (4,)))
-    print()
-
-    print("6. Bind by position with a multiple value tuple")
-    sql = "select * from SampleQueryTab where id = :bvid and 789 = :otherbind"
-    print(await connection.fetchone(sql, (4, 789)))
-    print()
-
-    # Bind by name with a dictionary
-    print("7. Bind by name with a dictionary")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    print(await connection.fetchone(sql, {"bvid": 4}))
-    print()
-
-    # With bind-by-name, repeated use of bind placeholder names in the SQL
-    # statement lets you supply the data once.
-    print("8. Bind by name with multiple value dict and repeated placeholders")
-    sql = "select * from SampleQueryTab where id = :bvid and 4 = :bvid"
-    print(await connection.fetchone(sql, {"bvid": 4}))
-    print()
-
-    # Bind by name with parameters.  The execute() parameter names match the
-    # bind variable placeholder names.
-    print("9. Bind by name using parameters")
-    sql = "select * from SampleQueryTab where id = :bvid"
-    print(await connection.fetchone(sql, dict(bvid=5)))
-    print()
-
-    print("10. Bind by name using multiple parameters")
-    sql = "select * from SampleQueryTab where id = :bvid and 101 = :otherbind"
-    print(await connection.fetchone(sql, dict(bvid=5, otherbind=101)))
-    print()
-
-    # With bind-by-name, repeated use of bind placeholder names in the SQL
-    # statement lets you supply the data once.
-    print("11. Bind by name: multiple values with repeated placeholder names")
-    sql = "select * from SampleQueryTab where id = :bvid and 6 = :bvid"
-    print(await connection.fetchone(sql, dict(bvid=6)))
-    print()
-
-    # Rexcuting a query with different data values
-    sql = "select * from SampleQueryTab where id = :bvid"
-
-    print("12. Query results with id = 7")
-    print(await connection.fetchone(sql, [4]))
-    print()
-
-    print("13. Rexcuted query results with id = 1")
-    print(await connection.fetchone(sql, [1]))
-    print()
-
-
-asyncio.run(main())
diff --git a/samples/bulk_aq.py b/samples/bulk_aq.py
deleted file mode 100644
index cbfffa90..00000000
--- a/samples/bulk_aq.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bulk_aq.py
-#
-# Demonstrates how to use bulk enqueuing and dequeuing of messages with
-# advanced queuing. It makes use of a RAW queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-QUEUE_NAME = "DEMO_RAW_QUEUE"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth message",
-    "The fifth message",
-    "The sixth message",
-    "The seventh message",
-    "The eighth message",
-    "The ninth message",
-    "The tenth message",
-    "The eleventh message",
-    "The twelfth and final message",
-]
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# connect to database
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# create a queue
-queue = connection.queue(QUEUE_NAME)
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-# dequeue all existing messages to ensure the queue is empty, just so that
-# the results are consistent
-while queue.deqone():
-    pass
-
-# enqueue a few messages
-print("Enqueuing messages...")
-batch_size = 6
-data_to_enqueue = PAYLOAD_DATA
-while data_to_enqueue:
-    batch_data = data_to_enqueue[:batch_size]
-    data_to_enqueue = data_to_enqueue[batch_size:]
-    messages = [connection.msgproperties(payload=d) for d in batch_data]
-    for data in batch_data:
-        print(data)
-    queue.enqmany(messages)
-connection.commit()
-
-# dequeue the messages
-print("\nDequeuing messages...")
-batch_size = 8
-while True:
-    messages = queue.deqmany(batch_size)
-    if not messages:
-        break
-    for props in messages:
-        print(props.payload.decode())
-connection.commit()
-print("\nDone.")
diff --git a/samples/bulk_aq_async.py b/samples/bulk_aq_async.py
deleted file mode 100644
index 539a6206..00000000
--- a/samples/bulk_aq_async.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# bulk_aq_async.py
-#
-# Demonstrates how to use bulk enqueuing and dequeuing of messages with
-# advanced queuing using asyncio. It makes use of a RAW queue created in the
-# sample setup.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-QUEUE_NAME = "DEMO_RAW_QUEUE"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth message",
-    "The fifth message",
-    "The sixth message",
-    "The seventh message",
-    "The eighth message",
-    "The ninth message",
-    "The tenth message",
-    "The eleventh message",
-    "The twelfth and final message",
-]
-
-
-async def main():
-
-    # connect to database
-    async with oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-    ) as connection:
-
-        # create a queue
-        queue = connection.queue(QUEUE_NAME)
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-        # dequeue all existing messages to ensure the queue is empty, just so
-        # that the results are consistent
-        while await queue.deqone():
-            pass
-
-        # enqueue a few messages
-        print("Enqueuing messages...")
-        batch_size = 6
-        data_to_enqueue = PAYLOAD_DATA
-        while data_to_enqueue:
-            batch_data = data_to_enqueue[:batch_size]
-            data_to_enqueue = data_to_enqueue[batch_size:]
-            messages = [
-                connection.msgproperties(payload=d) for d in batch_data
-            ]
-            for data in batch_data:
-                print(data)
-            await queue.enqmany(messages)
-        await connection.commit()
-
-        # dequeue the messages
-        print("\nDequeuing messages...")
-        batch_size = 8
-        while True:
-            messages = await queue.deqmany(batch_size)
-            if not messages:
-                break
-            for props in messages:
-                print(props.payload.decode())
-        await connection.commit()
-        print("\nDone.")
-
-
-asyncio.run(main())
diff --git a/samples/call_timeout.py b/samples/call_timeout.py
deleted file mode 100644
index 1bed24a9..00000000
--- a/samples/call_timeout.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# call_timeout.py
-#
-# Demonstrates the use of the Oracle Client 18c feature that enables round
-# trips to the database to time out if a specified amount of time
-# (in milliseconds) has passed without a response from the database.
-#
-# This script requires Oracle Client 18.1 and higher when using thick mode.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-connection.call_timeout = 2000
-print("Call timeout set at", connection.call_timeout, "milliseconds...")
-
-with connection.cursor() as cursor:
-    cursor.execute("select sysdate from dual")
-    (today,) = cursor.fetchone()
-    print("Fetch of current date before timeout:", today)
-
-    # dbms_session.sleep() replaces dbms_lock.sleep() from Oracle Database 18c
-    sleep_proc_name = (
-        "dbms_session.sleep"
-        if int(connection.version.split(".")[0]) >= 18
-        else "dbms_lock.sleep"
-    )
-
-    print("Sleeping...should time out...")
-    try:
-        cursor.callproc(sleep_proc_name, (3,))
-    except oracledb.DatabaseError as e:
-        print("ERROR:", e)
-
-    cursor.execute("select sysdate from dual")
-    (today,) = cursor.fetchone()
-    print("Fetch of current date after timeout:", today)
diff --git a/samples/call_timeout_async.py b/samples/call_timeout_async.py
deleted file mode 100644
index c136c01f..00000000
--- a/samples/call_timeout_async.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# call_timeout_async.py
-#
-# An asynchronous version of call_timeout.py
-#
-# Demonstrates the use of the feature that enables round trips to the database
-# to time out if a specified amount of time (in milliseconds) has passed
-# without a response from the database.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    connection.call_timeout = 2000
-    print("Call timeout set at", connection.call_timeout, "milliseconds...")
-
-    with connection.cursor() as cursor:
-        (today,) = await connection.fetchone("select sysdate from dual")
-        print("Fetch of current date before timeout:", today)
-
-        # dbms_session.sleep() replaces dbms_lock.sleep() from Oracle Database
-        # 18c
-        sleep_proc_name = (
-            "dbms_session.sleep"
-            if int(connection.version.split(".")[0]) >= 18
-            else "dbms_lock.sleep"
-        )
-
-        print("Sleeping...should time out...")
-        try:
-            await cursor.callproc(sleep_proc_name, (3,))
-        except oracledb.DatabaseError as e:
-            print("ERROR:", e)
-
-        (today,) = await connection.fetchone("select sysdate from dual")
-        print("Fetch of current date after timeout:", today)
-
-
-asyncio.run(main())
diff --git a/samples/connection_pool.py b/samples/connection_pool.py
deleted file mode 100644
index e14a5a24..00000000
--- a/samples/connection_pool.py
+++ /dev/null
@@ -1,218 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# connection_pool.py
-#
-# Demonstrates the use of connection pooling using a Flask web application.
-#
-# This also shows the use of pool_alias for connection pool caching, so the
-# pool handle does not need to passed through the app.
-#
-# Connection Pools can significantly reduce connection times for long running
-# applications that repeatedly open and close connections.  Connection pools
-# allow multiple, concurrent web requests to be efficiently handled.  Internal
-# features help protect against dead connections, and also aid use of Oracle
-# Database features such as FAN and Application Continuity.
-#
-# To run this sample:
-#
-#  1. Install Flask, for example like:
-#
-#     python -m pip install flask
-#
-#  2. (Optional) Set environment variables referenced in sample_env.py
-#
-#  3. Run:
-#
-#     python connection_pool.py
-#
-#  4. In a browser load a URL as shown below.
-#
-# The default route will display a welcome message:
-#   http://127.0.0.1:8080/
-#
-# To find a username you can pass an id, for example 1:
-#   http://127.0.0.1:8080/user/1
-#
-# To insert new a user 'fred' you can call:
-#   http://127.0.0.1:8080/post/fred
-#
-# -----------------------------------------------------------------------------
-
-import os
-import sys
-
-from flask import Flask
-
-import oracledb
-import sample_env
-
-# Port to listen on
-PORT = int(os.environ.get("PORT", "8080"))
-
-# Generally a fixed-size pool is recommended, i.e. POOL_MIN=POOL_MAX.  Here
-# the pool contains 4 connections, which will allow 4 concurrent users.
-POOL_MIN = 4
-POOL_MAX = 4
-POOL_INC = 0
-
-# Pool name for the connection pool cache
-POOL_ALIAS_NAME = "mypool"
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-# -----------------------------------------------------------------------------
-
-
-# start_pool(): starts the connection pool
-#
-# The pool is stored in the pool cache. Connections can later be acquired from
-# the pool by passing the same pool_alias value to oracledb.connect()
-def start_pool():
-    oracledb.create_pool(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_pool_params(),
-        min=POOL_MIN,
-        max=POOL_MAX,
-        increment=POOL_INC,
-        session_callback=init_session,
-        pool_alias=POOL_ALIAS_NAME,
-    )
-
-
-# init_session(): a 'session callback' to efficiently set any initial state
-# that each connection should have.
-#
-# This particular demo doesn't use dates, so sessionCallback could be omitted,
-# but it does show the kinds of settings many apps would use.
-#
-# If you have multiple SQL statements, an optimization is to call them all in a
-# PL/SQL anonymous block with BEGIN/END so you only use cursor.execute() once.
-# This is shown later in create_schema().
-#
-def init_session(connection, requestedTag_ignored):
-    with connection.cursor() as cursor:
-        cursor.execute(
-            """
-            alter session set
-                time_zone = 'UTC'
-                nls_date_format = 'YYYY-MM-DD HH24:MI'
-            """
-        )
-
-
-# -----------------------------------------------------------------------------
-
-
-# create_schema(): drop and create the demo table, and add a row
-def create_schema():
-    with oracledb.connect(pool_alias=POOL_ALIAS_NAME) as connection:
-        with connection.cursor() as cursor:
-            cursor.execute(
-                """
-                begin
-                    begin
-                        execute immediate 'drop table demo';
-                    exception when others then
-                        if sqlcode <> -942 then
-                            raise;
-                        end if;
-                    end;
-
-                    execute immediate 'create table demo (
-                        id       number generated by default as identity,
-                        username varchar2(40)
-                    )';
-
-                    execute immediate 'insert into demo (username) values
-                        (''chris'')';
-
-                    commit;
-                end;
-                """
-            )
-
-
-# -----------------------------------------------------------------------------
-
-app = Flask(__name__)
-
-
-# Display a welcome message on the 'home' page
-@app.route("/")
-def index():
-    return "Welcome to the demo app"
-
-
-# Add a new username
-#
-# The new user's id is generated by the database and returned in the OUT bind
-# variable 'idbv'.
-@app.route("/post/<string:username>")
-def post(username):
-    with oracledb.connect(pool_alias=POOL_ALIAS_NAME) as connection:
-        with connection.cursor() as cursor:
-            connection.autocommit = True
-            idbv = cursor.var(int)
-            cursor.execute(
-                """
-                insert into demo (username)
-                values (:unbv)
-                returning id into :idbv
-                """,
-                [username, idbv],
-            )
-            return f"Inserted {username} with id {idbv.getvalue()[0]}"
-
-
-# Show the username for a given id
-@app.route("/user/<int:id>")
-def show_username(id):
-    with oracledb.connect(pool_alias=POOL_ALIAS_NAME) as connection:
-        with connection.cursor() as cursor:
-            cursor.execute("select username from demo where id = :idbv", [id])
-            r = cursor.fetchone()
-            return r[0] if r is not None else "Unknown user id"
-
-
-# -----------------------------------------------------------------------------
-
-if __name__ == "__main__":
-    # Start a pool of connections
-    start_pool()
-
-    # Create a demo table
-    create_schema()
-
-    m = f"\nTry loading http://127.0.0.1:{PORT}/user/1 in a browser\n"
-    sys.modules["flask.cli"].show_server_banner = lambda *x: print(m)
-
-    # Start a webserver
-    app.run(port=PORT)
diff --git a/samples/containers/README.md b/samples/containers/README.md
deleted file mode 100644
index deda40ae..00000000
--- a/samples/containers/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# python-oracledb Containers
-
-## Samples
-
-This directory contains Dockerfiles for creating sample containers:
-
-- [Samples and Oracle Database](./samples_and_db) - a container with a running database, python-oracledb, and all the samples
-- [Application development](./app_dev) - a container with python-oracledb and the Apache web server with WSGI. This is useful for creating your own applications
-
-## Container images for Linux Developers
-
-Additional Dockerfiles showing installation of Python and python-oracle on
-Oracle Linux are available from
-[github.com/oracle/docker-images/tree/main/OracleLinuxDevelopers](https://github.com/oracle/docker-images/tree/main/OracleLinuxDevelopers).
-
-Containers can be pulled from the GitHub Container Registry:
-
-- [oraclelinux9-python](https://github.com/oracle/docker-images/pkgs/container/oraclelinux9-python)
-- [oraclelinux8-python](https://github.com/oracle/docker-images/pkgs/container/oraclelinux8-python)
diff --git a/samples/containers/app_dev/Dockerfile b/samples/containers/app_dev/Dockerfile
deleted file mode 100644
index 5fb7b665..00000000
--- a/samples/containers/app_dev/Dockerfile
+++ /dev/null
@@ -1,318 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025 Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-#
-# NAME
-#
-#   Dockerfile
-#
-# PURPOSE
-#
-#   Sample Dockerfile that creates a container image for Python application
-#   development and application deployment.  The container has python-oracledb
-#   installed, the Apache web server with WSGI, and (optionally) Oracle Instant
-#   Client pre-configured.
-#
-#   The container is for testing and development purposes only.
-#
-# NOTE
-#
-#   Read README.md and then use container_build.sh to build the container from
-#   this Dockerfile
-#
-
-# Variable declaration for base OS
-# --------------------------------
-ARG OPY_OS_VERSION=8
-
-# Base OS container image details
-# -------------------------------
-FROM ghcr.io/oracle/oraclelinux:${OPY_OS_VERSION} AS baseos
-
-# OS Username
-ARG OPY_USERNAME
-
-# OS Username's Groupname
-ARG OPY_GROUPNAME
-
-# Python Version details
-ARG OPY_PYTHON_VERSION
-
-# Instant Client Details
-ARG OPY_INSTANT_CLIENT_VERSION
-
-# User base directory
-ARG OPY_BASEDIR=/opt
-
-# OS User home directory
-ARG OPY_OS_USER_HOMEDIR=/home/${OPY_USERNAME}
-
-# Virtual environment directory name
-ARG OPY_PYTHON_VIRTUAL_DIRNAME=pyorcldb_env
-
-# OS Version
-ARG OPY_OS_VERSION=8
-
-RUN dnf upgrade && \
-  # Install latest Instant Client version 23
-  ( ( [ ${OPY_INSTANT_CLIENT_VERSION} == 23 ] && \
-      dnf install oracle-instantclient-release-23ai-el${OPY_OS_VERSION} && \
-      dnf install oracle-instantclient-basic \
-        oracle-instantclient-sqlplus ) || \
-    # Install latest Instant Client version 21
-    ( [ ${OPY_INSTANT_CLIENT_VERSION} == 21 ] && \
-      dnf install oracle-instantclient-release-el${OPY_OS_VERSION} && \
-      dnf install oracle-instantclient-basic \
-        oracle-instantclient-sqlplus ) || \
-    ( [ ${OPY_INSTANT_CLIENT_VERSION} == None ] && \
-      echo "Not installing Instant Client" ) || \
-    # Install specific Instant Client version 19 release update
-    ( \
-      # Install Instant Client 19 on Oracle Linux 9
-      ( ( [ ${OPY_OS_VERSION} == 9 ] && \
-          dnf install oracle-instantclient-release-el${OPY_OS_VERSION} && \
-          dnf install \
-            oracle-instantclient${OPY_INSTANT_CLIENT_VERSION}-basic \
-            oracle-instantclient${OPY_INSTANT_CLIENT_VERSION}-sqlplus \
-        ) || \
-        # Install Instant Client 19 on Oracle Linux 8
-        ( dnf install oracle-release-el${OPY_OS_VERSION} && \
-          dnf install \
-            oracle-instantclient${OPY_INSTANT_CLIENT_VERSION}-basic \
-            oracle-instantclient${OPY_INSTANT_CLIENT_VERSION}-sqlplus \
-        ) ) ) || \
-        ( echo "Not installing Instant Client" ) \
-  ) && \
-  # Install sudo, openssl and Python
-  # Installing ncurses to include 'clear' command
-  dnf install sudo openssl apr apr-util ncurses && \
-  echo "Python Version - ${OPY_PYTHON_VERSION}" && \
-  dnf install python${OPY_PYTHON_VERSION} python${OPY_PYTHON_VERSION}-pip \
-  python${OPY_PYTHON_VERSION}-devel && \
-  ( ( [ ${OPY_OS_VERSION} == 9 ] && \
-    update-alternatives --install /usr/bin/python python \
-    /usr/bin/python${OPY_PYTHON_VERSION} 1 ) || \
-    ( echo "Not required to set Python default" ) \
-  ) && \
-  # Add OS user
-  useradd -U -d ${OPY_OS_USER_HOMEDIR} ${OPY_USERNAME} && \
-  # Enable sudo access for appuser
-  echo "%appuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
-  # Create required directories
-  mkdir ${OPY_BASEDIR}/downloads && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} ${OPY_BASEDIR}/downloads && \
-  mkdir ${OPY_BASEDIR}/wallet && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} ${OPY_BASEDIR}/wallet && \
-  mkdir ${OPY_BASEDIR}/apache && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} ${OPY_BASEDIR}/apache && \
-  mkdir ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME} && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} \
-        ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME} && \
-  mkdir ${OPY_BASEDIR}/app && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} ${OPY_BASEDIR}/app && \
-  mkdir ${OPY_BASEDIR}/cert && \
-  chown ${OPY_USERNAME}:${OPY_GROUPNAME} ${OPY_BASEDIR}/cert && \
-  # Clean up cache
-  dnf clean all
-
-FROM baseos AS pythonenv
-
-# OS Username
-ARG OPY_USERNAME
-
-# OS Username's Groupname
-ARG OPY_GROUPNAME
-
-# Python Version details
-ARG OPY_PYTHON_VERSION
-
-# Virtual environment directory name
-ARG OPY_PYTHON_VIRTUAL_DIRNAME=pyorcldb_env
-
-# User base directory
-ARG OPY_BASEDIR=/opt
-
-# OS User home directory
-ARG OPY_OS_USER_HOMEDIR=/home/${OPY_USERNAME}
-
-# Switch User
-USER ${OPY_USERNAME}
-
-# Copy Auto deploy script template
-COPY --chown=${OPY_USERNAME}:${OPY_GROUPNAME} \
-  otherfiles/autodeployscript.sh.template \
-  ${OPY_OS_USER_HOMEDIR}/autodeployscript.sh
-
-# Configure virtual environment
-RUN cd ${OPY_BASEDIR} && \
-  python${OPY_PYTHON_VERSION} -m venv ${OPY_PYTHON_VIRTUAL_DIRNAME} && \
-  # Source the Python virtual environment
-  source ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME}/bin/activate && \
-  # Upgrade pip utility
-  python -m pip install --upgrade pip && \
-  # Install python-oracledb driver for Python
-  # Install wheel module (pre-requisite for WSGI module)
-  python -m pip install oracledb wheel && \
-  # Configure PATH and set the Python virtual environment user profile
-  echo "export PATH=${OPY_BASEDIR}/apache/bin:\$PATH" >> \
-    ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "source ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME}/bin/activate" >> \
-    ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "if [ ! -f ${OPY_BASEDIR}/cert/certificate.pem ]; then" >> \
-    ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "  ~/pyorcldb_generate_cert.sh" >> ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "fi" >> ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "~/autodeployscript.sh" >> ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  echo "" >> ${OPY_OS_USER_HOMEDIR}/.bashrc && \
-  sed -i "s/OPY_OSUSERBASEDIR/\\${OPY_BASEDIR}/g" \
-    ${OPY_OS_USER_HOMEDIR}/autodeployscript.sh
-
-# Intermediate image for building Apache Server
-# ---------------------------------------------
-FROM pythonenv AS apachebuildenv
-
-# Variables declaration for ApacheBuildEnv
-# ----------------------------------------
-
-# Apache Server Configuration - Version
-ARG OPY_APACHE_SERVER_VERSION
-
-# Python Version details
-ARG OPY_PYTHON_VERSION
-ARG OPY_PYTHON_VERSION_WITHOUTPERIOD
-
-# OS Username
-ARG OPY_USERNAME
-
-# OS Username's Groupname
-ARG OPY_GROUPNAME
-
-# Virtual environment directory name
-ARG OPY_PYTHON_VIRTUAL_DIRNAME=pyorcldb_env
-
-# User base directory
-ARG OPY_BASEDIR=/opt
-
-# Apache HTTP Server Listen port number
-ARG OPY_APACHE_LISTEN_PORT
-
-# Switch username
-USER ${OPY_USERNAME}
-
-# Copy Apache WSGI configuration file template into downloads directory
-COPY --chown=${OPY_USERNAME}:${OPY_GROUPNAME} \
-  otherfiles/pyorcldb_wsgi.conf.template ${OPY_BASEDIR}/downloads
-
-# Install Apache Server
-RUN sudo dnf install \
-  # Install prerequisite packages for Apache installation
-  gcc make expat-devel pcre-devel apr-devel apr-util-devel \
-    redhat-rpm-config openssl-devel perl && \
-  # Download Apache server source
-  cd ${OPY_BASEDIR}/downloads && \
-  curl -o ${OPY_APACHE_SERVER_VERSION}.tar.gz \
-    "https://archive.apache.org/dist/httpd/${OPY_APACHE_SERVER_VERSION}.tar.gz" && \
-  tar xzvf ${OPY_APACHE_SERVER_VERSION}.tar.gz && \
-  cd ${OPY_APACHE_SERVER_VERSION} && \
-  # Prepare and install Apache server
-  ./configure --enable-ssl --prefix=${OPY_BASEDIR}/apache && \
-  make && \
-  make install && \
-  # Set path of the Perl in Apache's apxs utility. This is required for
-  # building wsgi_mod.
-  sed -i "s/\/replace\/with\/path\/to\/perl\/interpreter/\/usr\/bin\/perl/g" \
-    ${OPY_BASEDIR}/apache/bin/apxs && \
-  export PATH=${OPY_BASEDIR}/apache/bin:$PATH && \
-  source ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME}/bin/activate &&\
-  # Install WSGI module
-  python -m pip install mod_wsgi && \
-  # Copy the mod_wsgi module from python virtual environment to Apache home
-  cp ${OPY_BASEDIR}/${OPY_PYTHON_VIRTUAL_DIRNAME}/lib/python${OPY_PYTHON_VERSION}/site-packages/mod_wsgi/server/mod_wsgi-py${OPY_PYTHON_VERSION_WITHOUTPERIOD}.cpython-${OPY_PYTHON_VERSION_WITHOUTPERIOD}-x86_64-linux-gnu.so \
-    ${OPY_BASEDIR}/apache/modules/mod_wsgi.so && \
-  # Configure httpd.conf
-  # --------------------
-  # 1. Removed listening on port 80
-  # 2. Enabled SSL module
-  # 3. Set default characterset to UTF-8
-  cd ${OPY_BASEDIR}/apache/conf && \
-  sed -i "s/Listen 80/# Listen 80/g" httpd.conf && \
-  sed -i "s/#LoadModule ssl_module/LoadModule ssl_module/g" httpd.conf && \
-  echo "AddDefaultCharset UTF-8" >> httpd.conf && \
-  echo "Include conf/extra/pyorcldb_wsgi.conf" >> httpd.conf && \
-  # Populate pyorcldb_wsgi.conf file into Apache's conf/extra directory
-  cd ${OPY_BASEDIR}/apache/conf/extra && \
-  cp ${OPY_BASEDIR}/downloads/pyorcldb_wsgi.conf.template \
-    ./pyorcldb_wsgi.conf && \
-  sed -i "s/OPY_BASEDIR/\\${OPY_BASEDIR}/g" pyorcldb_wsgi.conf && \
-  sed -i "s/OPY_PYTHONVIRTUALDIRNAME/${OPY_PYTHON_VIRTUAL_DIRNAME}/g" \
-    pyorcldb_wsgi.conf && \
-  sed -i "s/OPY_APACHE_LISTEN_PORT/${OPY_APACHE_LISTEN_PORT}/g" \
-    pyorcldb_wsgi.conf && \
-  rm ${OPY_BASEDIR}/downloads/pyorcldb_wsgi.conf.template && \
-  # Clean all cached packages from DNF cache
-  sudo dnf clean all && \
-  # Clean all downloads directory
-  cd ${OPY_BASEDIR}/downloads && \
-  rm -rf *
-
-# Python Development Image
-# ------------------------
-FROM pythonenv AS developmentimage
-
-# OS Username
-ARG OPY_USERNAME
-
-# OS Username's Groupname
-ARG OPY_GROUPNAME
-
-# OS User home directory
-ARG OPY_OS_USER_HOMEDIR=/home/${OPY_USERNAME}
-
-# User base directory
-ARG OPY_BASEDIR=/opt
-
-# Image metadata details
-ARG OPY_IMAGE_VERSION
-ARG OPY_IMAGE_RELEASE_DATE
-ARG OPY_IMAGE_RELEASE_STATUS
-
-# Image metadata
-# Uncomment the below lines to provide the label information
-# LABEL version=
-# LABEL release-date=
-# LABEL maintainer=
-# LABEL release-status=
-
-# Switch to OS user from root
-# ---------------------------
-USER ${OPY_USERNAME}
-
-WORKDIR ${OPY_OS_USER_HOMEDIR}
-
-# Get Apache Server
-COPY --from=apachebuildenv --chown=${OPY_USERNAME}:${OPY_GROUPNAME} \
-  ${OPY_BASEDIR}/apache ${OPY_BASEDIR}/apache
-
-# Copy SSL certificate generation script
-COPY --chown=${OPY_USERNAME}:${OPY_GROUPNAME} \
-  otherfiles/pyorcldb_generate_cert.sh ${OPY_OS_USER_HOMEDIR}/
diff --git a/samples/containers/app_dev/README.md b/samples/containers/app_dev/README.md
deleted file mode 100644
index 88af17cf..00000000
--- a/samples/containers/app_dev/README.md
+++ /dev/null
@@ -1,236 +0,0 @@
-# Oracle python-oracledb environment for Python application developers
-
-This Dockerfile creates a sample Oracle Linux container with the Oracle Python
-driver python-oracledb, the Apache web server with WSGI, and (optionally)
-Oracle Instant Client.  You need to have access to an existing database.
-
-A sample Flask application can optionally be deployed.
-
-This image can be used for development and deployment of Python applications
-for demonstrations and testing.
-
-It has been tested on macOS using podman and docker.
-
-## Build Instructions
-
-- Edit `container_build.env` and set your desired values.
-
-- Build the container image using the `container_build.sh` script:
-
-  ```
-  ./container_build.sh
-  ```
-
-  By default, Apache has SSL enabled and is listening on port 8443.
-
-## Usage for Application Development
-
-- Run a container:
-
-  ```
-  podman run -it -p 8443:8443 --name my_python_dev pyorcldbdev
-  ```
-
-  You can now create and run your own Python applications using the `python`
-  binary.
-
-  See lower for how to deploy applications such as the sample Flask application
-  in the container.
-
-- If you want to use the Apache HTTP server, it is configured with the WSGI
-  module. The listening port is set to 8443. (Note port 80 is disabled).
-
-  The Python home for the WSGI module is `/opt/pyorcldb_env`.  Refer to the
-  Apache HTTP server configuration file
-  `/opt/apache/conf/extra/pyorcldb_wsgi.conf` for more information.
-
-  To start Apache in the container:
-
-  ```
-  $ apachectl start
-  ```
-
-  To stop Apache:
-
-  ```
-  $ apachectl stop
-  ```
-
-- An Oracle Database wallet and/or `tnsnames.ora` file can be copied into, or
-  mounted in, `/opt/wallet` to connect to Oracle Database or Oracle Autonomous
-  Database.
-
-- By default, the Python virtual environment file `/opt/pyorcldb_env` is
-  sourced in the bash shell. The virtual environment can be enabled or
-  disabled.
-
-  To enable the Python virtual environment:
-
-  ```
-  $ source /opt/pyorcldb_env/bin/activate
-  ```
-
-  To disable the Python virtual environment:
-
-  ```
-  $ deactivate
-  ```
-
-## Container Environment
-
-### Default Environment
-
-- Oracle Linux 8
-- Python 3.12
-- Apache HTTP server 2.4
-
-### Optional packages
-
-- Oracle Instant Client (Basic and SQL*Plus packages)
-
-  By default, Oracle Instant Client is not installed. If you require it, select
-  the version in
-  `python-oracledb/samples/containers/app_dev/container_build.env` before
-  building the container image.
-
-  Supported versions: 23, 21 and 19
-
-  Recommended version: 23
-
-
-### Python modules pre-installed
-
-- Oracle Database driver for Python - oracledb (latest available version)
-- Pre-requisites for oracledb - cffi, cryptography, pycparser
-
-### Default Apache HTTP configuration
-
-- Server name         - pyorcldbdemo
-- Protocol            - HTTPS
-- Port #              - 8443
-- WSGI Python home    - `/opt/env/pyorcldb_env`
-- SSL certificate     - `/opt/cert/certificate.pem` (For demo and testing purposes)
-- SSL certificate key - `/opt/cert/privatekey.pem` (For demo and testing purposes)
-- Document root       - `/opt/app`
-- Error log           - `/opt/apache/logs/pyorcldb_error.log`
-- Custom log          - `/opt/apache/logs/appstack_app_access.log`
-
-### Directories
-
-- Python application home     - `/opt/app`
-- Python virtual environment  - `/opt/pyorcldb_env`
-- Apache HTTP server home     - `/opt/apache`
-- Oracle Database wallet home - `/opt/wallet`
-- SSL certificate and key     - `/opt/cert` (For demo and testing purposes)
-
-### The default SSL certificate and key
-
-The SSL certificate and key generated in `/opt/cert` can be used for demo and
-testing purposes only.  This is strictly not for production use. Configure or
-replace them with your own certificate and key.
-
-## Deploying the Sample Flask Application
-
-The GitHub directory
-[samples/containers/app_dev/sample_app](https://github.com/oracle/python-oracledb/tree/main/samples/containers/app_dev/sample_app)
-contains a sample Flask web application that queries a small customer
-database. This application can be enabled by copying or mounting it into the
-container.
-
-The sample application uses database credentials set via environment variables:
-
-1. `PYO_SAMPLES_MAIN_USER` - Oracle Database username
-2. `PYO_SAMPLES_MAIN_PASSWORD` -  Oracle Database password
-3. `PYO_SAMPLES_CONNECT_STRING` - Oracle Database TNS Alias or Easy Connect
-   string
-4. `TNS_ADMIN` - The location of the tnsnames.ora file or wallet files
-5. `PYO_SAMPLES_WALLET_PASSWORD` - Oracle Database wallet password
-6. `PYO_SAMPLES_WALLET_LOCATION` - Oracle Database wallet location. This
-   variable is optional and the sample application will use TNS_ADMIN path as
-   wallet location when this variable is not set.
-
-Here is an example to deploy the sample application without a database wallet:
-
-```
-podman run -it -p 8443:8443 --env DEPLOY_APP="TRUE" --env APP_NAME="customer" \
-  --env PYO_SAMPLES_MAIN_USER="user" --env PYO_SAMPLES_MAIN_PASSWORD="passwd" \
-  --env PYO_SAMPLES_CONNECT_STRING="myhostname:1521/mydbservicename" \
-  -v ./sample_app:/opt/app --name my_app1 pyorcldbdev
-```
-
-Here is an example to deploy the sample application with a database wallet, for
-example to connect to Oracle Autonomous Database Serverless (ADB-S):
-
-```
-podman run -it -p 8443:8443 --env DEPLOY_SAMPLE_APP="TRUE" \
-  --env APP_NAME="customer" --env PYO_SAMPLES_MAIN_USER="myuserid" \
-  --env PYO_SAMPLES_MAIN_PASSWORD="mypassword" \
-  --env PYO_SAMPLES_CONNECT_STRING="mydb1" \
-  --env PYO_SAMPLES_WALLET_PASSWORD="mywalletpassword" \
-  --env TNS_ADMIN=/opt/wallet -v ./sample_app:/opt/app \
-  -v /disk/path/mywallet:/opt/wallet --name my_app1 \
-  pyorcldbdev
-```
-
-The application will be installed in the container in `/opt/app`.
-
-The deployed sample application can be accessed using the host browser with the
-URL:
-
-```
-https://localhost:8443/app/customer
-```
-
-Because the SSL certificate is self-signed, you may have to accept accessing
-the URL in the browser.
-
-Review log files such as `/opt/apache/logs/pyorcldb_error.log` if you have
-problems accessing the application.
-
-## Deploying your own Flask Application
-
-Your own Python Flask application can be easily deployed with Apache. The
-following setup is required:
-
-- In your application directory, run `pip freeze > requirements.txt` to
-  generate a `requirements.txt` file for installing Python libraries required
-  for the application.
-
-  Note that the application does not need to bundle the Python virtual
-  environment: this container will create one.
-
-- Add a WSGI file `pyorcldb_app.wsgi` in the root directory of the application
-  and configure the application. For example:
-
-  ```
-  from mymodule1 import app as application
-
-  def func1():
-      return application
-  ```
-
-  In the above code, `app` is the Flask object created in the Python module
-  `mymodule1.py`.  That Flask object is renamed to `application` to comply with
-  the naming conventions expected by the WSGI server.
-
-- Set the module name in the environment variable `APP_NAME` and set
-  `DEPLOY_APP` to `TRUE` while creating the container.
-
-Here is a sample command to deploy a Flask application while creating the
-container:
-
-```
-podman run -it -p 8443:8443 --env DEPLOY_APP="TRUE" --env APP_NAME="mymodule1" \
-  -v /mydisk/myapplication:/opt/app --name myapp2 pyorcldbdev
-```
-
-Pass in any other environment as required by your application, for example the
-database connection details.
-
-This command will deploy your application into the container `myapp2` under
-directory `/opt/app`. The auto-deployment will start the Apache HTTP server on
-port 8443.
-
-The URL of the deployed Flask application or web service will be in this
-pattern `https://localhost:8443/app/<API/route name>`. The URL for the above
-sample `podman run` command is `https://localhost:8443/app/mymodule1`.
diff --git a/samples/containers/app_dev/container_build.env b/samples/containers/app_dev/container_build.env
deleted file mode 100644
index c707cc14..00000000
--- a/samples/containers/app_dev/container_build.env
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# NAME
-#
-#   container_build.env
-#
-# PURPOSE
-#
-#   This environment file sets up the required attributes for a Python
-#   application container image.
-#
-# NOTE
-#
-#   The build script container_build.sh will source it while building the
-#   container image.
-#
-
-# Use podman by default to build the container
-export CONTAINER_TOOL=podman
-#export CONTAINER_TOOL=docker
-
-# Python version
-export OPY_PYTHON_VERSION=3.12
-
-# Python version without dots
-export OPY_PYTHON_VERSION_WITHOUTPERIOD=312
-
-# Container OS user name to use
-export OPY_USERNAME=appuser
-
-# Container OS group name to use
-export OPY_GROUPNAME=appuser
-
-# Apache HTTP server version
-# You should use the latest version from https://archive.apache.org/dist/httpd/
-export OPY_APACHE_SERVER_VERSION=httpd-2.4.62
-
-# Apache HTTP server listen port
-export OPY_APACHE_LISTEN_PORT=8443
-
-# Oracle Instant Client
-# For Instant Client 19c, you should use the latest Release Update from
-#   https://yum.oracle.com/repo/OracleLinux/OL8/oracle/instantclient/x86_64/
-export OPY_INSTANT_CLIENT_VERSION=None   # don't install Instant Client
-#export OPY_INSTANT_CLIENT_VERSION=19.25  # Latest 19c RU available for OL8
-#export OPY_INSTANT_CLIENT_VERSION=21     # don't specify the RU for 21; the latest will be used
-#export OPY_INSTANT_CLIENT_VERSION=23     # don't specify the RU for 23; the latest will be used
-
-# Update the image label details
-# ------------------------------
-# Container image version
-export OPY_IMAGE_VERSION=
-
-# Container release date
-export OPY_IMAGE_RELEASE_DATE=
-
-# Container release status
-export OPY_IMAGE_RELEASE_STATUS=
diff --git a/samples/containers/app_dev/container_build.sh b/samples/containers/app_dev/container_build.sh
deleted file mode 100755
index 81811b98..00000000
--- a/samples/containers/app_dev/container_build.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-#
-# NAME
-#
-#   container_build.sh
-#
-# PURPOSE
-#
-#   Top level script to build a container image for Python application
-#   developers.
-#
-# USAGE
-#
-#   ./container_build.sh
-#
-
-# Sourcing environment file to setup the build environment
-source container_build.env
-
-# Pulling base image Oracle Linux container image
-$CONTAINER_TOOL pull ghcr.io/oracle/oraclelinux:$OPY_OS_VERSION
-
-# Building Container image
-$CONTAINER_TOOL build --tag pyorcldbdev \
-  --build-arg OPY_PYTHON_VERSION \
-  --build-arg OPY_PYTHON_VERSION_WITHOUTPERIOD \
-  --build-arg OPY_USERNAME \
-  --build-arg OPY_GROUPNAME \
-  --build-arg OPY_IMAGE_RELEASE_DATE \
-  --build-arg OPY_APACHE_SERVER_VERSION \
-  --build-arg OPY_INSTANT_CLIENT_VERSION \
-  --build-arg OPY_APACHE_LISTEN_PORT . --no-cache
diff --git a/samples/containers/app_dev/otherfiles/autodeployscript.sh.template b/samples/containers/app_dev/otherfiles/autodeployscript.sh.template
deleted file mode 100755
index 8d86e746..00000000
--- a/samples/containers/app_dev/otherfiles/autodeployscript.sh.template
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-#
-# NAME
-#
-#   autodeployscript.sh
-#
-# PURPOSE
-#
-#   Deploy a user application during container creation.
-
-apache_conf_file="OPY_OSUSERBASEDIR/apache/conf/extra/pyorcldb_wsgi.conf"
-requirements_txt="OPY_OSUSERBASEDIR/app/requirements.txt"
-search_txt="# Add your WSGI file details below in the next line"
-auto_deploy="${DEPLOY_APP:-FALSE}"
-appname="${APP_NAME:-No_App_Name}"
-
-( [ ${auto_deploy} != "TRUE" ] && echo "No need to deploy application" && exit 0)
-
-( [ ${auto_deploy} == "TRUE" ] && [ ${appname} == "No_App_Name" ] &&
-  echo "Application name is not found" && \
-  echo "Application name is required to deploy your application" && \
-  echo "Please set it in environment variable APP_NAME" && exit -1 )
-
-( [ ${auto_deploy} == "TRUE" ] &&
-  sed -i "s/OPY_APPNAME/${appname}/g" $apache_conf_file &&
-  sed -i "s/No_App_Name/${appname}/g" $apache_conf_file )
-
-search_txt1="# DocumentRoot"
-replace_txt1="DocumentRoot"
-
-search_txt2="# WSGIScriptAlias \\/app"
-replace_txt2="WSGIScriptAlias \\/app"
-
-search_txt3="# <Directory"
-replace_txt3="<Directory"
-
-search_txt4="#   Order"
-replace_txt4="  Order"
-
-search_txt5="#   Allow"
-replace_txt5="  Allow"
-
-search_txt6="#   Require"
-replace_txt6="  Require"
-
-search_txt7="# <\\/Directory>"
-replace_txt7="<\\/Directory>"
-
-search_txt8="# WSGIDaemonProcess"
-replace_txt8="WSGIDaemonProcess"
-
-search_txt9="#   WSGIProcessGroup"
-replace_txt9="  WSGIProcessGroup"
-
-( [ ${auto_deploy} == "TRUE" ] &&
-  sed -i "s/$search_txt1/$replace_txt1/g" $apache_conf_file && \
-  sed -i "s/$search_txt2/$replace_txt2/g" $apache_conf_file && \
-  sed -i "s/$search_txt3/$replace_txt3/g" $apache_conf_file && \
-  sed -i "s/$search_txt4/$replace_txt4/g" $apache_conf_file && \
-  sed -i "s/$search_txt5/$replace_txt5/g" $apache_conf_file && \
-  sed -i "s/$search_txt6/$replace_txt6/g" $apache_conf_file && \
-  sed -i "s/$search_txt7/$replace_txt7/g" $apache_conf_file )
-
-( [ ${appname} != "No_App_Name" ] && \
-  sed -i "s/$search_txt8/$replace_txt8/g" $apache_conf_file && \
-  sed -i "s/$search_txt9/$replace_txt9/g" $apache_conf_file )
-
-( ( [ ${auto_deploy} == "TRUE" ] && \
-    ( [ -f "$requirements_txt" ] && pip install -r "$requirements_txt" ) && \
-    apachectl restart 1>/tmp/null && \
-     [ $? -eq 0 ] && echo "Application deployment was successfully completed! Starting Apache HTTP server.." ) ||
-  [ "TRUE" == "TRUE" ] )
-
-exit 0
diff --git a/samples/containers/app_dev/otherfiles/pyorcldb_generate_cert.sh b/samples/containers/app_dev/otherfiles/pyorcldb_generate_cert.sh
deleted file mode 100755
index cb05891c..00000000
--- a/samples/containers/app_dev/otherfiles/pyorcldb_generate_cert.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-#
-# NAME
-#
-#   pyorcldb_generate_cert.sh
-#
-# PURPOSE
-#
-#   Sample generation of an SSL certificate and key for testing purposes
-#
-# USAGE
-#   ./pyorcldb_generate_cert.sh
-#
-cd /opt/cert
-openssl req -newkey rsa:4096 -x509 -sha512 -days 365 -nodes -out \
-  certificate.pem -keyout privatekey.pem \
-  -subj "/C=OC/ST=DEMO/L=DEMO/O=DEMO/CN=DEMO" 2>/dev/null
diff --git a/samples/containers/app_dev/otherfiles/pyorcldb_wsgi.conf.template b/samples/containers/app_dev/otherfiles/pyorcldb_wsgi.conf.template
deleted file mode 100644
index a9d861d9..00000000
--- a/samples/containers/app_dev/otherfiles/pyorcldb_wsgi.conf.template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Sample WSGI configuration for testing purposes
-
-Define opy_basedir OPY_BASEDIR
-Define opy_port OPY_APACHE_LISTEN_PORT
-Define opy_pythonvirtualdirname OPY_PYTHONVIRTUALDIRNAME
-Define opy_appdir app
-Define opy_appname OPY_APPNAME
-
-ServerName pyorcldbdemo
-
-Listen 0.0.0.0:${opy_port}
-
-<IfModule !wsgi_module>
-    LoadModule wsgi_module modules/mod_wsgi.so
-</IfModule>
-
-WSGIPythonHome ${opy_basedir}/${opy_pythonvirtualdirname}
-
-<VirtualHost 0.0.0.0:${opy_port}>
-
-#  Alias /static/ ${opy_basedir}/${opy_appdir}/static/
-#  <Directory ${opy_basedir}/${opy_appdir}/static>
-#    Require all granted
-#  </Directory>
-
-  ErrorLog ${opy_basedir}/apache/logs/pyorcldb_error.log
-  CustomLog ${opy_basedir}/apache/logs/appstack_app_access.log "%h %l %u %t \"%r\" %>s %b"
-
-  SSLEngine on
-  SSLCertificateFile ${opy_basedir}/cert/certificate.pem
-  SSLCertificateKeyFile ${opy_basedir}/cert/privatekey.pem
-
-  # Deployed application
-  # DocumentRoot ${opy_basedir}/${opy_appdir}
-  # WSGIDaemonProcess ${opy_appname} python-path=${opy_basedir}/${opy_appdir}
-  # WSGIScriptAlias /app ${opy_basedir}/${opy_appdir}/pyorcldb_app.wsgi
-  # <Directory ${opy_basedir}/${opy_appdir}>
-  #   WSGIProcessGroup ${opy_appname}
-  #   Order allow,deny
-  #   Allow from all
-  #   Require all granted
-  # </Directory>
-
-</VirtualHost>
diff --git a/samples/containers/app_dev/sample_app/README.md b/samples/containers/app_dev/sample_app/README.md
deleted file mode 100644
index 0bb48f14..00000000
--- a/samples/containers/app_dev/sample_app/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains a sample application that can be installed in the
-container.  See the upper level README for details.
-
-The sample is a Flask web app that queries a small customer database.
diff --git a/samples/containers/app_dev/sample_app/customer.py b/samples/containers/app_dev/sample_app/customer.py
deleted file mode 100644
index 091b9a55..00000000
--- a/samples/containers/app_dev/sample_app/customer.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025 Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# customer.py
-# -----------------------------------------------------------------------------
-
-import os
-
-from flask import Flask, render_template, request, redirect, url_for
-import oracledb
-
-app = Flask(__name__, template_folder="templates")
-app.config["CONNECTION_POOL"] = None
-app.config["CONNECTION_STATUS"] = None
-drop_table_23 = "drop table if exists customer_info"
-drop_table = """begin
-                  execute immediate 'drop table customer_info';
-                exception
-                  when others then
-                    if sqlcode != -942 then
-                      raise;
-                    end if;
-                end;"""
-stmts = [
-    """create table customer_info (
-       id     number generated always as
-                identity(start with 1001 increment by 1),
-       name    varchar2(30),
-       dob     date,
-       city    varchar2(30),
-       zipcode number)""",
-    """insert into customer_info (name, dob, city, zipcode)
-       values ('Allen', '01-Sep-1980', 'Belmont', 56009)""",
-    """insert into customer_info (name, dob, city, zipcode)
-       values ('Bob', '12-Aug-2009', 'San Jose', 56012)""",
-    """insert into customer_info (name, dob, city, zipcode)
-       values ('Christina', '30-Jul-1994', 'San Carlos', 56023)""",
-]
-
-
-# init_session(): a 'session callback' to efficiently set any initial state
-# that each connection should have.
-def init_session(connection, requestedTag_ignored):
-    with connection.cursor() as cursor:
-        cursor.execute(
-            """
-            alter session set
-                time_zone = 'UTC'
-                 nls_date_format = 'DD-MON-YYYY'
-            """
-        )
-
-
-def create_pool():
-    pool_min = 2
-    pool_max = 2
-    pool_inc = 0
-
-    tns_admin = os.environ.get("TNS_ADMIN")
-    wallet_password = os.environ.get("PYO_SAMPLES_WALLET_PASSWORD")
-    wallet_location = os.environ.get("PYO_SAMPLES_WALLET_LOCATION")
-    if (
-        wallet_password is not None
-        and wallet_location is None
-        and tns_admin is not None
-    ):
-        wallet_location = tns_admin
-
-    if wallet_password is not None:
-        try:
-            db_pool = oracledb.create_pool(
-                user=os.environ.get("PYO_SAMPLES_MAIN_USER"),
-                password=os.environ.get("PYO_SAMPLES_MAIN_PASSWORD"),
-                wallet_password=wallet_password,
-                wallet_location=wallet_location,
-                config_dir=tns_admin,
-                dsn=os.environ.get("PYO_SAMPLES_CONNECT_STRING"),
-                min=pool_min,
-                max=pool_max,
-                increment=pool_inc,
-                session_callback=init_session,
-            )
-            error_msg = "Success!"
-        except oracledb.DatabaseError as e:
-            db_pool = None
-            (error,) = e.args
-            error_msg = error.message
-    else:
-        try:
-            db_pool = oracledb.create_pool(
-                user=os.environ.get("PYO_SAMPLES_MAIN_USER"),
-                password=os.environ.get("PYO_SAMPLES_MAIN_PASSWORD"),
-                dsn=os.environ.get("PYO_SAMPLES_CONNECT_STRING"),
-                config_dir=tns_admin,
-                min=pool_min,
-                max=pool_max,
-                increment=pool_inc,
-                session_callback=init_session,
-            )
-            error_msg = "Success!"
-        except oracledb.DatabaseError as e:
-            db_pool = None
-            (error,) = e.args
-            error_msg = error.message
-
-    return (db_pool, error_msg)
-
-
-# Create customer details table and populate records
-# Note: The customer_info table will be re-created everytime during this
-# application startup.
-def create_schema():
-    pool = app.config["CONNECTION_POOL"]
-    dbstatus = app.config["CONNECTION_STATUS"]
-
-    if dbstatus != "Success!":
-        return
-
-    try:
-        connection = pool.acquire()
-    except oracledb.DatabaseError:
-        return
-
-    with connection.cursor() as cursor:
-        dbversion = connection.version
-        dbversion = dbversion.split(".")[0]
-        if int(dbversion) >= 23:
-            cursor.execute(drop_table_23)
-        else:
-            cursor.execute(drop_table)
-        for stmt in stmts:
-            cursor.execute(stmt)
-        connection.commit()
-
-
-@app.route("/entry", methods=["POST", "GET"])
-def entry():
-    stmt = """insert into customer_info (name, dob, city, zipcode) values
-             (:1, :2, :3, :4)"""
-
-    if request.method == "GET":
-        msg = "Customer details added successfully!"
-        return render_template("customer_entry_redirect.html", form_data=msg)
-
-    if request.method == "POST":
-        data = [
-            request.form["cus_name"],
-            request.form["cus_dob"],
-            request.form["cus_city"],
-            request.form["cus_zipcode"],
-        ]
-
-    try:
-        pool = app.config["CONNECTION_POOL"]
-        with pool.acquire() as connection:
-            connection.autocommit = True
-            with connection.cursor() as cursor:
-                cursor.execute(stmt, data)
-    except oracledb.DatabaseError as e:
-        (error,) = e.args
-        dbstatus = error.message
-        return render_template("error_handler.html", form_data=dbstatus)
-
-    return redirect(url_for("customer"))
-
-
-@app.route("/customer", methods=["POST", "GET"])
-def customer():
-    stmt = "select * from customer_info"
-    pool = app.config["CONNECTION_POOL"]
-    dbstatus = app.config["CONNECTION_STATUS"]
-
-    if dbstatus != "Success!":
-        return render_template("error_handle.html", form_data=dbstatus)
-
-    try:
-        connection = pool.acquire()
-    except oracledb.DatabaseError as e:
-        (error,) = e.args
-        dbstatus = error.message
-        return render_template("error_handler.html", form_data=dbstatus)
-
-    with connection.cursor() as cursor:
-        cursor.execute(stmt)
-        data = cursor.fetchall()
-        return render_template("customer_list.html", form_data=data)
-
-
-# MAIN
-
-# Create the connection pool
-(
-    app.config["CONNECTION_POOL"],
-    app.config["CONNECTION_STATUS"],
-) = create_pool()
-
-# Warning: the CUSTOMER_INFO table used by this application will be re-created
-# during application startup so any previous changes (addition of customers)
-# will vanish.
-
-create_schema()
-if __name__ == "__main__":
-    app.run(
-        host="0.0.0.0",
-        port=8443,
-    )
diff --git a/samples/containers/app_dev/sample_app/pyorcldb_app.wsgi b/samples/containers/app_dev/sample_app/pyorcldb_app.wsgi
deleted file mode 100644
index 2c392273..00000000
--- a/samples/containers/app_dev/sample_app/pyorcldb_app.wsgi
+++ /dev/null
@@ -1,5 +0,0 @@
-from customer import app as application
-
-
-def func1():
-    return application
diff --git a/samples/containers/app_dev/sample_app/requirements.txt b/samples/containers/app_dev/sample_app/requirements.txt
deleted file mode 100644
index d9ccdf77..00000000
--- a/samples/containers/app_dev/sample_app/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Flask
-oracledb
diff --git a/samples/containers/app_dev/sample_app/static/logo.png b/samples/containers/app_dev/sample_app/static/logo.png
deleted file mode 100644
index c8d6ea8a..00000000
Binary files a/samples/containers/app_dev/sample_app/static/logo.png and /dev/null differ
diff --git a/samples/containers/app_dev/sample_app/static/styles/styles.css b/samples/containers/app_dev/sample_app/static/styles/styles.css
deleted file mode 100644
index 623db6f0..00000000
--- a/samples/containers/app_dev/sample_app/static/styles/styles.css
+++ /dev/null
@@ -1,41 +0,0 @@
-.header {
-  display: flex;
-  padding: 10px;
-  background-color: #4C825C
-}
-
-.logo {
-  width: 150px;
-  height: auto;
-  margin-right: 10px;
-}
-
-h1 {
-  color: #C74634;
-}
-
-h2 {
-  color: #C74634;
-}
-
-table {
-  border: 2px solid #C74634;
-}
-
-th {
-  font-size: large;
-  color: #161513;
-  background-color: #4C825C;
-  border: 2px solid #C74634;
-}
-
-td {
-  font-size: medium;
-  color: #161513;
-  background-color: #86B596;
-  border: 2px solid #C74634;
-}
-
-body {
-  font-family: sans-serif;
-}
diff --git a/samples/containers/app_dev/sample_app/templates/customer_list.html b/samples/containers/app_dev/sample_app/templates/customer_list.html
deleted file mode 100644
index bb5b8560..00000000
--- a/samples/containers/app_dev/sample_app/templates/customer_list.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/styles.css') }}">
-    <title>My Customer Sample Application - python-oracledb developer environment</title>
-  </head>
-  <body>
-    <header>
-      <img src="{{ url_for('static', filename='logo.png')}}" alt="Logo" class="logo">
-      <h1>Customer list</h1>
-    </header>
-    <table>
-      <tr>
-        <th>Customer ID</th>
-        <th>Name</th>
-        <th>Date of birth</th>
-        <th>City</th>
-        <th>Zipcode</th>
-      </tr>
-      {% for item in form_data %}
-      <tr>
-        <td> {{item[0]}} </td>
-        <td> {{item[1]}} </td>
-        <td> {{item[2]}} </td>
-        <td> {{item[3]}} </td>
-        <td> {{item[4]}} </td>
-      </tr>
-      {% endfor %}
-    </table>
-    <h2>Add new customer</h2>
-    <form action="{{ url_for('entry') }}" method="post">
-      <table>
-        <tr>
-          <td><label for="cus_name">Name: </label></td>
-          <td><input type="text" name="cus_name" required/></td>
-        </tr>
-        <tr>
-          <td><label for="cus_dob">Date of birth (DD-MON-YYYY): </label></td>
-          <td><input type="text" name="cus_dob" required/></td>
-        </tr>
-        <tr>
-          <td><label for="cus_city">City: </label></td>
-          <td><input type="text" name="cus_city" required/></td>
-        </tr>
-        <tr>
-          <td><label for="cus_zipcode">Zipcode :</label></td>
-          <td><input type="number" name="cus_zipcode" required/></td>
-        </tr>
-      </table>
-      <input type="submit" value="Add Customer"/>
-    </form>
-    {% with messages = get_flashed_messages() %}
-      {% if messages %}
-        <ul class="flashes">
-          {% for message in messages %}
-            <li>{{message}}</li>
-          {% endfor %}
-        </ul>
-     {% endif %}
-    {% endwith %}
-  </body>
-</html>
diff --git a/samples/containers/app_dev/sample_app/templates/error_handler.html b/samples/containers/app_dev/sample_app/templates/error_handler.html
deleted file mode 100644
index 7f7ff390..00000000
--- a/samples/containers/app_dev/sample_app/templates/error_handler.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/styles.css') }}">
-    <title>My Customer Sample Application - python-oracledb developer environment</title>
-  </head>
-  <body>
-    <header>
-      <img src="{{ url_for('static', filename='logo.png')}}" alt="Logo" class="logo">
-      <h1>Database Error</h1>
-    </header>
-    <table>
-      <tr>
-        <th>Error Message</th>
-      </tr>
-      <tr>
-        <td>
-          {% for item in form_data %}{{item[0]}}{% endfor %}
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/samples/containers/samples_and_db/Dockerfile b/samples/containers/samples_and_db/Dockerfile
deleted file mode 100644
index b94514a3..00000000
--- a/samples/containers/samples_and_db/Dockerfile
+++ /dev/null
@@ -1,115 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-#
-# NAME
-#
-#   Dockerfile
-#
-# PURPOSE
-#
-#   Creates a container with the python-oracledb samples and a running Oracle
-#   Database Free database so you can quickly try python-oracledb.
-#
-#   Python-oracledb is the Python database driver for Oracle Database.  See
-#   https://oracle.github.io/python-oracledb/
-#
-# USAGE
-#
-#   Get an Oracle Database container (see
-#   https://hub.docker.com/r/gvenzl/oracle-free):
-#
-#     podman pull docker.io/gvenzl/oracle-free
-#
-#   Create a container with the database, Python, python-oracledb and the
-#   samples. Choose a password for the sample schemas and pass it as an
-#   argument:
-#
-#     podman build -t pyo --build-arg PYO_PASSWORD=a_secret .
-#
-#   Start the container, which creates the database. Choose a password for the
-#   privileged database users and pass it as a variable:
-#
-#     podman run -d --name pyo -p 1521:1521 -it -e ORACLE_PASSWORD=a_secret pyo
-#
-#   Log into the container:
-#
-#     podman exec -it pyo bash
-#
-#   At the first login, create the sample schema:
-#
-#     python setup.py
-#
-#   If this times out, wait a few minutes for the database to finish
-#   initializing and then rerun it.
-#
-#   In the container, run samples like:
-#
-#     python bind_insert.py
-#
-#   Use `vim` to edit files, if required.
-#
-#   The database will persist across container shutdowns, but will be deleted
-#   when the container is deleted.
-
-FROM docker.io/gvenzl/oracle-free
-
-USER root
-
-RUN microdnf module disable python36 && \
-    microdnf module enable python39 && \
-    microdnf install python39 python39-pip python39-setuptools python39-wheel vim vi httpd-tools && \
-    microdnf clean all
-
-WORKDIR /samples/
-
-RUN curl -LO https://github.com/oracle/python-oracledb/archive/refs/heads/main.zip && \
-    unzip main.zip && \
-    cp python-oracledb-main/samples/containers/samples_and_db/setup.py . && \
-    /bin/rm -rf python-oracledb-main/samples/containers/ python-oracledb-main/samples/notebooks/ && \
-    mv python-oracledb-main/samples/* . && \
-    /bin/rm -rf python-oracledb-main samples main.zip && \
-    cat create_schema.py >> /samples/setup.py && \
-    chown -R oracle.oinstall /samples/
-
-USER oracle
-
-RUN python3 -m pip install oracledb Flask --user --no-warn-script-location
-
-ARG PYO_PASSWORD
-
-ENV PYO_SAMPLES_MAIN_USER=pythondemo
-ENV PYO_SAMPLES_MAIN_PASSWORD=${PYO_PASSWORD}
-ENV PYO_SAMPLES_EDITION_USER=pythoneditions
-ENV PYO_SAMPLES_EDITION_PASSWORD=${PYO_PASSWORD}
-ENV PYO_SAMPLES_EDITION_NAME=python_e1
-ENV PYO_SAMPLES_CONNECT_STRING="localhost/freepdb1"
-ENV PYO_SAMPLES_DRCP_CONNECT_STRING="localhost/freepdb1:pooled"
-ENV PYO_SAMPLES_ADMIN_USER=system
-
-# Run the samples using the default python-oracledb 'Thin' mode, if possible
-ENV PYO_SAMPLES_DRIVER_MODE="thin"
-
-# The privileged user password is set in setup.py from the "podman run"
-# environment variable ORACLE_PASSWORD
-#ENV PYO_SAMPLES_ADMIN_PASSWORD=
diff --git a/samples/containers/samples_and_db/README.md b/samples/containers/samples_and_db/README.md
deleted file mode 100644
index ca923ed1..00000000
--- a/samples/containers/samples_and_db/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# python-oracledb Samples in a Container
-
-This Dockerfile creates a container with the python-oracledb samples and a
-running Oracle Database Free database so you can quickly try python-oracledb.
-
-It has been tested on Oracle Linux 8 using 'podman', and on Apple Silicon with
-'docker' under colima.
-
-## Usage
-
-- Get an Oracle Database container (see
-  https://hub.docker.com/r/gvenzl/oracle-free):
-
-  The steps below use 'podman', but 'docker' will also work.
-
-  ```
-  podman pull docker.io/gvenzl/oracle-free
-  ```
-
-- Create a container with the database, Python, python-oracledb and the
-  samples. Choose a password for the sample schemas and pass it as an argument:
-
-  ```
-  podman build -t pyo --build-arg PYO_PASSWORD=a_secret .
-  ```
-
-- Start the container, which creates the database. Choose a password for the
-  privileged database users and pass it as a variable:
-
-  ```
-  podman run -d --name pyo -p 1521:1521 -it -e ORACLE_PASSWORD=a_secret_password pyo
-  ```
-
-- Log into the container:
-
-  ```
-  podman exec -it pyo bash
-  ```
-
-- At the first login, create the sample schema:
-
-  ```
-  python setup.py
-  ```
-
-  If this times out, wait a few minutes for the database to finish initializing
-  and then rerun it.
-
-  The schema used can be seen in `sql/create_schema.sql`
-
-- In the container, run samples like:
-
-  ```
-  python bind_insert.py
-  ```
-
-  Use `vim` to edit files, if required.
-
-The database will persist across container shutdowns, but will be deleted when
-the container is deleted.
diff --git a/samples/containers/samples_and_db/setup.py b/samples/containers/samples_and_db/setup.py
deleted file mode 100755
index 09220173..00000000
--- a/samples/containers/samples_and_db/setup.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#! /usr/bin/env python3.9
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# NAME
-#
-#   setup.py
-#
-# PURPOSE
-#
-#   Creates the python-oracledb sample schema after waiting for the database to
-#   open.
-#
-#   If this times out, wait a few minutes for the database to finish
-#   initializing and then rerun it.
-#
-# USAGE
-#
-#   python setup.py
-
-import oracledb
-import os
-import time
-
-oracledb.init_oracle_client()
-
-pw = os.environ.get("ORACLE_PASSWORD")
-os.environ["PYO_SAMPLES_ADMIN_PASSWORD"] = pw
-
-c = None
-
-for i in range(30):
-    try:
-        c = oracledb.connect(
-            user="system",
-            password=pw,
-            dsn="localhost/freepdb1",
-            tcp_connect_timeout=5,
-        )
-        break
-    except (OSError, oracledb.Error):
-        print("Waiting for database to open")
-        time.sleep(5)
-
-if c:
-    print("PDB is open")
-else:
-    print("PDB did not open in allocated time")
-    print("Try again in a few minutes")
-    exit()
-
-
-print("Enabling per-PDB DRCP")
-
-c = oracledb.connect(mode=oracledb.SYSDBA)
-cursor = c.cursor()
-cursor.execute("alter pluggable database all close")
-cursor.execute(
-    "alter system set enable_per_pdb_drcp=true scope=spfile sid='*'"
-)
-
-c = oracledb.connect(mode=oracledb.SYSDBA | oracledb.PRELIM_AUTH)
-c.startup(force=True)
-
-c = oracledb.connect(mode=oracledb.SYSDBA)
-cursor = c.cursor()
-cursor.execute("alter database mount")
-cursor.execute("alter database open")
-
-c = oracledb.connect(
-    user="sys", password=pw, dsn="localhost/freepdb1", mode=oracledb.SYSDBA
-)
-cursor = c.cursor()
-cursor.callproc("dbms_connection_pool.start_pool")
-
-# create_schema.py will be appended here by the Dockerfile
diff --git a/samples/cqn.py b/samples/cqn.py
deleted file mode 100644
index 6a34d576..00000000
--- a/samples/cqn.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# cqn.py
-#
-# Demonstrates using continuous query notification in Python, a feature that is
-# available in Oracle 11g and later. Once this script is running, use another
-# session to insert, update or delete rows from the table TestTempTable and you
-# will see the notification of that change.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-registered = True
-
-
-def callback(message):
-    global registered
-    print("Message type:", message.type)
-    if not message.registered:
-        print("Deregistration has taken place...")
-        registered = False
-        return
-    print("Message database name:", message.dbname)
-    print("Message transaction id:", message.txid)
-    print("Message queries:")
-    for query in message.queries:
-        print("--> Query ID:", query.id)
-        print("--> Query Operation:", query.operation)
-        for table in query.tables:
-            print("--> --> Table Name:", table.name)
-            print("--> --> Table Operation:", table.operation)
-            if table.rows is not None:
-                print("--> --> Table Rows:")
-                for row in table.rows:
-                    print("--> --> --> Row RowId:", row.rowid)
-                    print("--> --> --> Row Operation:", row.operation)
-                    print("-" * 60)
-            print("=" * 60)
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    events=True,
-)
-
-qos = oracledb.SUBSCR_QOS_QUERY | oracledb.SUBSCR_QOS_ROWIDS
-sub = connection.subscribe(
-    callback=callback, timeout=1800, qos=qos, client_initiated=True
-)
-print("Subscription:", sub)
-print("--> Connection:", sub.connection)
-print("--> Callback:", sub.callback)
-print("--> Namespace:", sub.namespace)
-print("--> Protocol:", sub.protocol)
-print("--> Timeout:", sub.timeout)
-print("--> Operations:", sub.operations)
-print("--> Rowids?:", bool(sub.qos & oracledb.SUBSCR_QOS_ROWIDS))
-query_id = sub.registerquery("select * from TestTempTable")
-print("Registered query:", query_id)
-
-while registered:
-    print("Waiting for notifications....")
-    time.sleep(5)
diff --git a/samples/cqn_pool.py b/samples/cqn_pool.py
deleted file mode 100644
index a4fd6e92..00000000
--- a/samples/cqn_pool.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# cqn_pool.py
-#
-# Demonstrates using continuous query notification in Python, a feature that is
-# available in Oracle Database 11g and later. Once this script is running, use
-# another session to insert, update or delete rows from the table TestTempTable
-# and you will see the notification of that change.
-#
-# This script differs from cqn.py in that it shows how a connection can be
-# acquired from a session pool and used to query the changes that have been
-# made.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-registered = True
-
-
-def callback(message):
-    global registered
-    if not message.registered:
-        print("Deregistration has taken place...")
-        registered = False
-        return
-    connection = pool.acquire()
-    for query in message.queries:
-        for table in query.tables:
-            if table.rows is None:
-                print("Too many row changes detected in table", table.name)
-                continue
-            num_rows_deleted = 0
-            print(len(table.rows), "row changes detected in table", table.name)
-            for row in table.rows:
-                if row.operation & oracledb.OPCODE_DELETE:
-                    num_rows_deleted += 1
-                    continue
-                ops = []
-                if row.operation & oracledb.OPCODE_INSERT:
-                    ops.append("inserted")
-                if row.operation & oracledb.OPCODE_UPDATE:
-                    ops.append("updated")
-                cursor = connection.cursor()
-                cursor.execute(
-                    """
-                    select IntCol
-                    from TestTempTable
-                    where rowid = :rid
-                    """,
-                    rid=row.rowid,
-                )
-                (int_col,) = cursor.fetchone()
-                print("    Row with IntCol", int_col, "was", " and ".join(ops))
-            if num_rows_deleted > 0:
-                print("   ", num_rows_deleted, "rows deleted")
-            print("=" * 60)
-
-
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    min=1,
-    max=4,
-    increment=1,
-    events=True,
-)
-
-with pool.acquire() as connection:
-    qos = oracledb.SUBSCR_QOS_QUERY | oracledb.SUBSCR_QOS_ROWIDS
-    sub = connection.subscribe(
-        callback=callback, timeout=1800, qos=qos, client_initiated=True
-    )
-    print("Subscription created with ID:", sub.id)
-    query_id = sub.registerquery("select * from TestTempTable")
-    print("Registered query with ID:", query_id)
-
-while registered:
-    print("Waiting for notifications....")
-    time.sleep(5)
diff --git a/samples/create_schema.py b/samples/create_schema.py
deleted file mode 100644
index 409b367e..00000000
--- a/samples/create_schema.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# create_schema.py
-#
-# Creates users and populates their schemas with the tables and packages
-# necessary for running the python-oracledb sample scripts. An edition is also
-# created for the demonstration of PL/SQL editioning.
-# -----------------------------------------------------------------------------
-
-import drop_schema
-import sample_env
-
-# connect as administrative user (usually SYSTEM or ADMIN)
-conn = sample_env.get_admin_connection()
-
-# drop existing users and editions, if applicable
-drop_schema.drop_schema(conn)
-
-# create sample schema and edition
-print("Creating sample schemas and edition...")
-sample_env.run_sql_script(
-    conn,
-    "create_schema",
-    main_user=sample_env.get_main_user(),
-    main_password=sample_env.get_main_password(),
-    edition_user=sample_env.get_edition_user(),
-    edition_password=sample_env.get_edition_password(),
-    edition_name=sample_env.get_edition_name(),
-)
-if sample_env.get_server_version() >= (21, 0):
-    sample_env.run_sql_script(
-        conn, "create_schema_21", main_user=sample_env.get_main_user()
-    )
-if sample_env.get_server_version() >= (23, 7):
-    sample_env.run_sql_script(
-        conn, "create_schema_23", main_user=sample_env.get_main_user()
-    )
-print("Done.")
diff --git a/samples/data/load_csv.csv b/samples/data/load_csv.csv
deleted file mode 100644
index 1ad32e75..00000000
--- a/samples/data/load_csv.csv
+++ /dev/null
@@ -1,100 +0,0 @@
-1,Biologist
-2,Doctor
-3,Call Center Representative
-4,Executive Director
-5,Laboratory Technician
-6,Cashier
-7,Global Logistics Supervisor
-8,Investment  Advisor
-9,HR Coordinator
-10,HR Specialist
-11,Investment  Advisor
-12,Baker
-13,Baker
-14,Cashier
-15,CNC Operator
-16,Software Engineer
-17,Call Center Representative
-18,Auditor
-19,Accountant
-20,Auditor
-21,Loan Officer
-22,Bellman
-23,Cashier
-24,Baker
-25,HR Coordinator
-26,Operator
-27,Service Supervisor
-28,Lecturer
-29,IT Support Staff
-30,Staffing Consultant
-31,Paramedic
-32,Associate Professor
-33,HR Coordinator
-34,HR Coordinator
-35,Restaurant Manager
-36,Webmaster
-37,Global Logistics Supervisor
-38,Bellman
-39,Design Engineer
-40,Cashier
-41,Global Logistics Supervisor
-42,Steward
-43,Fabricator
-44,Inspector
-45,Pharmacist
-46,Loan Officer
-47,Staffing Consultant
-48,Chef Manager
-49,Biologist
-50,Food Technologist
-51,Biologist
-52,Global Logistics Supervisor
-53,Laboratory Technician
-54,Design Engineer
-55,Fabricator
-56,Lecturer
-57,Loan Officer
-58,Investment  Advisor
-59,Treasurer
-60,Cash Manager
-61,Audiologist
-62,Fabricator
-63,Systems Administrator
-64,Health Educator
-65,Fabricator
-66,HR Specialist
-67,Physician
-68,Staffing Consultant
-69,Fabricator
-70,Physician
-71,Auditor
-72,Biologist
-73,Budget Analyst
-74,Bellman
-75,Restaurant Manager
-76,Stockbroker
-77,Paramedic
-78,Front Desk Coordinator
-79,Cashier
-80,CNC Operator
-81,Design Engineer
-82,Audiologist
-83,CNC Operator
-84,IT Support Staff
-85,Paramedic
-86,Fabricator
-87,Laboratory Technician
-88,Mobile Developer
-89,Global Logistics Supervisor
-90,Budget Analyst
-91,Lecturer
-92,Physician
-93,Retail Trainee
-94,Pharmacist
-95,Service Supervisor
-96,Production Painter
-97,Cash Manager
-98,Global Logistics Supervisor
-99,Treasurer
-100,Pharmacist
diff --git a/samples/data/load_csv_direct_path.csv b/samples/data/load_csv_direct_path.csv
deleted file mode 100644
index 16322263..00000000
--- a/samples/data/load_csv_direct_path.csv
+++ /dev/null
@@ -1,92 +0,0 @@
-1,Biologist
-2,Doctor
-4,Executive Director
-5,Laboratory Technician
-6,Cashier
-8,Investment  Advisor
-9,HR Coordinator
-10,HR Specialist
-11,Investment  Advisor
-12,Baker
-13,Baker
-14,Cashier
-15,CNC Operator
-16,Software Engineer
-18,Auditor
-19,Accountant
-20,Auditor
-21,Loan Officer
-22,Bellman
-23,Cashier
-24,Baker
-25,HR Coordinator
-26,Operator
-27,Service Supervisor
-28,Lecturer
-29,IT Support Staff
-30,Staffing Consultant
-31,Paramedic
-32,Associate Professor
-33,HR Coordinator
-34,HR Coordinator
-35,Restaurant Manager
-36,Webmaster
-38,Bellman
-39,Design Engineer
-40,Cashier
-42,Steward
-43,Fabricator
-44,Inspector
-45,Pharmacist
-46,Loan Officer
-47,Staffing Consultant
-48,Chef Manager
-49,Biologist
-50,Food Technologist
-51,Biologist
-53,Laboratory Technician
-54,Design Engineer
-55,Fabricator
-56,Lecturer
-57,Loan Officer
-58,Investment  Advisor
-59,Treasurer
-60,Cash Manager
-61,Audiologist
-62,Fabricator
-63,Systems Administrator
-64,Health Educator
-65,Fabricator
-66,HR Specialist
-67,Physician
-68,Staffing Consultant
-69,Fabricator
-70,Physician
-71,Auditor
-72,Biologist
-73,Budget Analyst
-74,Bellman
-75,Restaurant Manager
-76,Stockbroker
-77,Paramedic
-78,Front Desk Coordinator
-79,Cashier
-80,CNC Operator
-81,Design Engineer
-82,Audiologist
-83,CNC Operator
-84,IT Support Staff
-85,Paramedic
-86,Fabricator
-87,Laboratory Technician
-88,Mobile Developer
-90,Budget Analyst
-91,Lecturer
-92,Physician
-93,Retail Trainee
-94,Pharmacist
-95,Service Supervisor
-96,Production Painter
-97,Cash Manager
-99,Treasurer
-100,Pharmacist
diff --git a/samples/database_change_notification.py b/samples/database_change_notification.py
deleted file mode 100644
index 385e73bf..00000000
--- a/samples/database_change_notification.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# database_change_notification.py
-#
-# Demonstrates using database change notification in Python, a feature that is
-# available in Oracle 10g Release 2. Once this script is running, use another
-# session to insert, update or delete rows from the table TestTempTable and you
-# will see the notification of that change.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-registered = True
-
-
-def callback(message):
-    global registered
-    print("Message type:", message.type)
-    if not message.registered:
-        print("Deregistration has taken place...")
-        registered = False
-        return
-    print("Message database name:", message.dbname)
-    print("Message transaction id:", message.txid)
-    print("Message tables:")
-    for table in message.tables:
-        print("--> Table Name:", table.name)
-        print("--> Table Operation:", table.operation)
-        if table.rows is not None:
-            print("--> Table Rows:")
-            for row in table.rows:
-                print("--> --> Row RowId:", row.rowid)
-                print("--> --> Row Operation:", row.operation)
-                print("-" * 60)
-        print("=" * 60)
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    events=True,
-)
-
-sub = connection.subscribe(
-    callback=callback,
-    timeout=1800,
-    qos=oracledb.SUBSCR_QOS_ROWIDS,
-    client_initiated=True,
-)
-print("Subscription:", sub)
-print("--> Connection:", sub.connection)
-print("--> ID:", sub.id)
-print("--> Callback:", sub.callback)
-print("--> Namespace:", sub.namespace)
-print("--> Protocol:", sub.protocol)
-print("--> Timeout:", sub.timeout)
-print("--> Operations:", sub.operations)
-print("--> Rowids?:", bool(sub.qos & oracledb.SUBSCR_QOS_ROWIDS))
-sub.registerquery("select * from TestTempTable")
-
-while registered:
-    print("Waiting for notifications....")
-    time.sleep(5)
diff --git a/samples/database_shutdown.py b/samples/database_shutdown.py
deleted file mode 100644
index a4d940af..00000000
--- a/samples/database_shutdown.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# database_shutdown.py
-#
-# Demonstrates shutting down a database using Python. The connection used
-# assumes that the environment variable ORACLE_SID has been set.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# need to connect as SYSDBA or SYSOPER
-connection = oracledb.connect(mode=oracledb.SYSDBA)
-
-# first shutdown() call must specify the mode, if DBSHUTDOWN_ABORT is used,
-# there is no need for any of the other steps
-connection.shutdown(mode=oracledb.DBSHUTDOWN_IMMEDIATE)
-
-# now close and dismount the database
-cursor = connection.cursor()
-cursor.execute("alter database close normal")
-cursor.execute("alter database dismount")
-
-# perform the final shutdown call
-connection.shutdown(mode=oracledb.DBSHUTDOWN_FINAL)
diff --git a/samples/database_startup.py b/samples/database_startup.py
deleted file mode 100644
index adf1ba87..00000000
--- a/samples/database_startup.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# database_startup.py
-#
-# Demonstrates starting up a database using Python. The connection used
-# assumes that the environment variable ORACLE_SID has been set.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# the connection must be in PRELIM_AUTH mode
-connection = oracledb.connect(mode=oracledb.SYSDBA | oracledb.PRELIM_AUTH)
-connection.startup()
-
-# the following statements must be issued in normal SYSDBA mode
-connection = oracledb.connect(mode=oracledb.SYSDBA)
-cursor = connection.cursor()
-cursor.execute("alter database mount")
-cursor.execute("alter database open")
diff --git a/samples/dataframe_insert.py b/samples/dataframe_insert.py
deleted file mode 100644
index f2787c31..00000000
--- a/samples/dataframe_insert.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_insert.py
-#
-# Shows how executemany() and Direct Path Loads can be used to insert a Pandas
-# dataframe directly into Oracle Database. The same technique can be used with
-# data frames from many other Python libraries.
-# -----------------------------------------------------------------------------
-
-import sys
-import pandas
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-#
-# Inserting a simple DataFrame using executemany()
-
-with connection.cursor() as cursor:
-
-    # Create a Pandas DataFrame
-    print("Pandas Dataframe 1:")
-    d = {"A": [101, 213, 394], "B": ["Christie", "Cindy", "Kate"]}
-    pdf = pandas.DataFrame(data=d)
-    print(pdf)
-
-    # Insert data into NUMBER and VARCHAR2(20) columns using Oracle Database's
-    # efficient "Array DML" method
-    cursor.executemany("insert into mytab (id, data) values (:1, :2)", pdf)
-
-    # Check data using a non-DataFrame fetch
-    print("\nOracle Database Query:")
-    cursor.execute("select * from mytab order by id")
-    columns = [col.name for col in cursor.description]
-    print(columns)
-    for r in cursor:
-        print(r)
-
-    # Clean up for the next example
-    cursor.execute("truncate table mytab")
-
-# -----------------------------------------------------------------------------
-#
-# Inserting a DataFrame using Direct Path Loading
-
-with connection.cursor() as cursor:
-
-    # Create a Pandas DataFrame
-    print("\nPandas Dataframe 2:")
-    d = {"A": [202, 412, 487], "B": ["Abi", "Jessie", "Fay"]}
-    pdf = pandas.DataFrame(data=d)
-    print(pdf)
-
-    # Insert using Direct Path Loads
-    connection.direct_path_load(
-        schema_name=sample_env.get_main_user(),
-        table_name="mytab",
-        column_names=["id", "data"],
-        data=pdf,
-    )
-
-    # Check data using a non-DataFrame fetch
-    print("\nOracle Database Query:")
-    cursor.execute("select * from mytab order by id")
-    columns = [col.name for col in cursor.description]
-    print(columns)
-    for r in cursor:
-        print(r)
-
-# -----------------------------------------------------------------------------
-#
-# Inserting a DataFrame with VECTORs using executemany()
-
-# The VECTOR example only works with Oracle Database 23.4 or later
-if sample_env.get_server_version() < (23, 4):
-    sys.exit("This example requires Oracle Database 23.4 or later.")
-
-# The VECTOR example works with thin mode, or with thick mode using Oracle
-# Client 23.4 or later
-if not connection.thin and oracledb.clientversion()[:2] < (23, 4):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.4 or later"
-    )
-
-with connection.cursor() as cursor:
-
-    # Create a Pandas DataFrame
-    print("\nPandas Dataframe 3:")
-    d = {"v": [[3.3, 1.32, 5.0], [2.2, 2.32, 2.0]]}
-    pdf = pandas.DataFrame(data=d)
-    print(pdf)
-
-    # Insert data into a VECTOR column using Oracle Database's
-    # efficient "Array DML" method
-    cursor.executemany("insert into SampleVectorTab (v64) values (:1)", pdf)
-
-    # Check data using a non-DataFrame fetch
-    print("\nOracle Database Query:")
-    cursor.execute("select v64 from SampleVectorTab order by id")
-    columns = [col.name for col in cursor.description]
-    print(columns)
-    for r in cursor:
-        print(r)
diff --git a/samples/dataframe_numpy.py b/samples/dataframe_numpy.py
deleted file mode 100644
index 5ed8ed35..00000000
--- a/samples/dataframe_numpy.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_numpy.py
-#
-# Shows how to use connection.fetch_df_all() to put data into a NumPy ndarray
-# -----------------------------------------------------------------------------
-
-import array
-import sys
-
-import numpy
-import pyarrow
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-#
-# Fetching all records
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-sql = "select id from SampleQueryTab order by id"
-odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-# Convert to an ndarray via the Python DLPack specification
-pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-np = numpy.from_dlpack(pyarrow_array)
-
-# If the array has nulls, an alternative is:
-# np = pyarrow_array.to_numpy(zero_copy_only=False)
-
-print("Type:")
-print(type(np))  # <class 'numpy.ndarray'>
-
-print("Values:")
-print(np)
-
-# Perform various NumPy operations on the ndarray
-
-print("\nSum:")
-print(numpy.sum(np))
-
-print("\nLog10:")
-print(numpy.log10(np))
-
-# -----------------------------------------------------------------------------
-#
-# Fetching VECTORs
-
-# The VECTOR example only works with Oracle Database 23.4 or later
-if sample_env.get_server_version() < (23, 4):
-    sys.exit("This example requires Oracle Database 23.4 or later.")
-
-# The VECTOR example works with thin mode, or with thick mode using Oracle
-# Client 23.4 or later
-if not connection.thin and oracledb.clientversion()[:2] < (23, 4):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.4 or later"
-    )
-
-# Insert sample data
-rows = [
-    (array.array("d", [11.25, 11.75, 11.5]),),
-    (array.array("d", [12.25, 12.75, 12.5]),),
-]
-
-with connection.cursor() as cursor:
-    cursor.executemany("insert into SampleVectorTab (v64) values (:1)", rows)
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-sql = "select v64 from SampleVectorTab order by id"
-odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-# Convert to a NumPy ndarray
-pyarrow_array = pyarrow.array(odf.get_column_by_name("V64"))
-np = pyarrow_array.to_numpy(zero_copy_only=False)
-
-print("Type:")
-print(type(np))  # <class 'numpy.ndarray'>
-
-print("Values:")
-print(np)
-
-print("\nSum:")
-print(numpy.sum(np))
diff --git a/samples/dataframe_pandas.py b/samples/dataframe_pandas.py
deleted file mode 100644
index f86ea06f..00000000
--- a/samples/dataframe_pandas.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_pandas.py
-#
-# Shows how to use connection.fetch_df_all() and connection.fetch_df_batches()
-# to create Pandas dataframes.
-# -----------------------------------------------------------------------------
-
-import array
-import sys
-
-import numpy
-import pandas
-import pyarrow
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-#
-# Fetching all records
-
-# Get a python-oracledb DataFrame.
-# Adjust arraysize to tune the query fetch performance
-sql = "select id, name from SampleQueryTab order by id"
-odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-# Get a Pandas DataFrame from the data
-df = pyarrow.table(odf).to_pandas()
-
-# Perform various Pandas operations on the DataFrame
-
-print("Columns:")
-print(df.columns)
-
-print("\nDataframe description:")
-print(df.describe())
-
-print("\nLast three rows:")
-print(df.tail(3))
-
-print("\nTransform:")
-print(df.T)
-
-# -----------------------------------------------------------------------------
-#
-# Batch record fetching
-#
-# Note that since this particular example ends up with all query rows being
-# held in memory, it would be more efficient to use fetch_df_all() as shown
-# above.
-
-print("\nFetching in batches:")
-df = pandas.DataFrame()
-
-# Tune 'size' for your data set. Here it is small to show the batch fetch
-# behavior on the sample table.
-sql = "select id, name from SampleQueryTab order by id"
-for odf in connection.fetch_df_batches(statement=sql, size=10):
-    df_b = pyarrow.table(odf).to_pandas()
-    print(f"Appending {df_b.shape[0]} rows")
-    df = pandas.concat([df, df_b], ignore_index=True)
-
-r, c = df.shape
-print(f"{r} rows, {c} columns")
-
-print("\nLast three rows:")
-print(df.tail(3))
-
-# -----------------------------------------------------------------------------
-#
-# Fetching VECTORs
-
-# The VECTOR example only works with Oracle Database 23.4 or later
-if sample_env.get_server_version() < (23, 4):
-    sys.exit("This example requires Oracle Database 23.4 or later.")
-
-# The VECTOR example works with thin mode, or with thick mode using Oracle
-# Client 23.4 or later
-if not connection.thin and oracledb.clientversion()[:2] < (23, 4):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.4 or later"
-    )
-
-# Insert sample data
-rows = [
-    (array.array("d", [11.25, 11.75, 11.5]),),
-    (array.array("d", [12.25, 12.75, 12.5]),),
-]
-
-with connection.cursor() as cursor:
-    cursor.executemany("insert into SampleVectorTab (v64) values (:1)", rows)
-
-
-# Get a python-oracledb DataFrame.
-# Adjust arraysize to tune the query fetch performance
-sql = "select id, v64 from SampleVectorTab order by id"
-odf = connection.fetch_df_all(statement=sql, arraysize=100)
-
-# Get a Pandas DataFrame from the data
-df = pyarrow.table(odf).to_pandas()
-
-# Perform various Pandas operations on the DataFrame
-
-print("\nDataFrame:")
-print(df)
-
-print("\nMean:")
-print(pandas.DataFrame(df["V64"].tolist()).mean())
-
-print("\nList:")
-df2 = pandas.DataFrame(df["V64"].tolist()).T
-print(df2)
-print(df2.sum())
-
-# You can manipulate vectors using Pandas's apply or list comprehension with
-# NumPy for efficient array operations.
-
-# Scaling all vectors by a factor of two
-print("\nScaled:")
-df["SCALED_V64_COL"] = df["V64"] * 2
-print(df)
-
-# Calculating vector norms
-#
-# L2_NORM = Straight line distance from the origin to vector's endpoint
-# L1_NORM = Sum of absolute values of the vector's components
-# Linf_NORM = Largest absolute component of the vector; useful in scenarios
-# where maximum deviation matters
-print("\nNorms:")
-df["L2_NORM"] = df["V64"].apply(lambda x: numpy.linalg.norm(x, ord=2))
-df["L1_NORM"] = df["V64"].apply(lambda x: numpy.linalg.norm(x, ord=1))
-df["Linf_NORM"] = df["V64"].apply(
-    lambda x: numpy.linalg.norm(x, ord=numpy.inf)
-)
-print(df)
-
-# Calculating the vector dot product with a reference vector
-print("\nDot product:")
-ref_vector = numpy.array([1, 10, 10])
-df["DOT_PRODUCT"] = df["V64"].apply(lambda x: numpy.dot(x, ref_vector))
-print(df)
diff --git a/samples/dataframe_pandas_async.py b/samples/dataframe_pandas_async.py
deleted file mode 100644
index eaadead2..00000000
--- a/samples/dataframe_pandas_async.py
+++ /dev/null
@@ -1,184 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_pandas_async.py
-#
-# An asynchronous version of dataframe_pandas.py
-#
-# Shows how to use AsyncConnection.fetch_df_all() and
-# AsyncConnection.fetch_df_batches(). This example then creates Pandas
-# dataframes. Alternative dataframe libraries could be used similar to the
-# other, synchronous, data frame samples.
-# -----------------------------------------------------------------------------
-
-import array
-import asyncio
-import sys
-
-import numpy
-import pandas
-import pyarrow
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    SQL = "select id, name from SampleQueryTab order by id"
-
-    # -------------------------------------------------------------------------
-    #
-    # Fetching all records
-
-    # Get a python-oracledb DataFrame.
-    # Adjust arraysize to tune the query fetch performance
-    odf = await connection.fetch_df_all(statement=SQL, arraysize=100)
-
-    # Get a Pandas DataFrame from the data
-    df = pyarrow.table(odf).to_pandas()
-
-    # Perform various Pandas operations on the DataFrame
-
-    print("Columns:")
-    print(df.columns)
-
-    print("\nDataframe description:")
-    print(df.describe())
-
-    print("\nLast three rows:")
-    print(df.tail(3))
-
-    print("\nTransform:")
-    print(df.T)
-
-    # -------------------------------------------------------------------------
-    #
-    # Batch record fetching
-    #
-    # Note that since this particular example ends up with all query rows being
-    # held in memory, it would be more efficient to use fetch_df_all() as shown
-    # above.
-
-    print("\nFetching in batches:")
-    df = pandas.DataFrame()
-
-    # Tune 'size' for your data set. Here it is small to show the batch fetch
-    # behavior on the sample table.
-    async for odf in connection.fetch_df_batches(statement=SQL, size=10):
-        df_b = pyarrow.table(odf).to_pandas()
-        print(f"Appending {df_b.shape[0]} rows")
-        df = pandas.concat([df, df_b], ignore_index=True)
-
-    r, c = df.shape
-    print(f"{r} rows, {c} columns")
-
-    print("\nLast three rows:")
-    print(df.tail(3))
-
-    # -------------------------------------------------------------------------
-    #
-    # Fetching VECTORs
-
-    # The VECTOR example only works with Oracle Database 23.4 or later
-    if sample_env.get_server_version() < (23, 4):
-        sys.exit("This example requires Oracle Database 23.4 or later.")
-
-    # The VECTOR example works with thin mode, or with thick mode using Oracle
-    # Client 23.4 or later
-    if not connection.thin and oracledb.clientversion()[:2] < (23, 4):
-        sys.exit(
-            "This example requires python-oracledb thin mode, or Oracle Client"
-            " 23.4 or later"
-        )
-
-    # Insert sample data
-    rows = [
-        (array.array("d", [11.25, 11.75, 11.5]),),
-        (array.array("d", [12.25, 12.75, 12.5]),),
-    ]
-
-    with connection.cursor() as cursor:
-        await cursor.executemany(
-            "insert into SampleVectorTab (v64) values (:1)", rows
-        )
-
-    # Get a python-oracledb DataFrame.
-    # Adjust arraysize to tune the query fetch performance
-    sql = "select id, v64 from SampleVectorTab order by id"
-    odf = await connection.fetch_df_all(statement=sql, arraysize=100)
-
-    # Get a Pandas DataFrame from the data
-    df = pyarrow.table(odf).to_pandas()
-
-    # Perform various Pandas operations on the DataFrame
-
-    print("\nDataFrame:")
-    print(df)
-
-    print("\nMean:")
-    print(pandas.DataFrame(df["V64"].tolist()).mean())
-
-    print("\nList:")
-    df2 = pandas.DataFrame(df["V64"].tolist()).T
-    print(df2)
-    print(df2.sum())
-
-    # You can manipulate vectors using Pandas's apply or list comprehension
-    # with NumPy for efficient array operations.
-
-    # Scaling all vectors by a factor of two
-    print("\nScaled:")
-    df["SCALED_V64_COL"] = df["V64"].apply(lambda x: numpy.array(x) * 2)
-    print(df)
-
-    # Calculating vector norms
-    #
-    # L2_NORM = Straight line distance from the origin to vector's endpoint
-    # L1_NORM = Sum of absolute values of the vector's components
-    # Linf_NORM = Largest absolute component of the vector; useful in scenarios
-    # where maximum deviation matters
-    print("\nNorms:")
-    df["L2_NORM"] = df["V64"].apply(lambda x: numpy.linalg.norm(x, ord=2))
-    df["L1_NORM"] = df["V64"].apply(lambda x: numpy.linalg.norm(x, ord=1))
-    df["Linf_NORM"] = df["V64"].apply(
-        lambda x: numpy.linalg.norm(x, ord=numpy.inf)
-    )
-    print(df)
-
-    # Calculating the vector dot product with a reference vector
-    print("\nDot product:")
-    ref_vector = numpy.array([1, 10, 10])
-    df["DOT_PRODUCT"] = df["V64"].apply(lambda x: numpy.dot(x, ref_vector))
-    print(df)
-
-
-asyncio.run(main())
diff --git a/samples/dataframe_parquet_write.py b/samples/dataframe_parquet_write.py
deleted file mode 100644
index fcb65784..00000000
--- a/samples/dataframe_parquet_write.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_parquet_write.py
-#
-# Shows how to use connection.fetch_df_batches() to write files in Parquet
-# format.
-# -----------------------------------------------------------------------------
-
-import os
-
-import pyarrow
-import pyarrow.parquet as pq
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-PARQUET_FILE_NAME = "sample.parquet"
-
-if os.path.isfile(PARQUET_FILE_NAME):
-    os.remove(PARQUET_FILE_NAME)
-
-# Tune this for your query
-FETCH_BATCH_SIZE = 10
-
-SQL = "select id, name from SampleQueryTab order by id"
-pqwriter = None
-
-for odf in connection.fetch_df_batches(statement=SQL, size=FETCH_BATCH_SIZE):
-
-    pyarrow_table = pyarrow.table(odf)
-
-    if not pqwriter:
-        pqwriter = pq.ParquetWriter(PARQUET_FILE_NAME, pyarrow_table.schema)
-
-    print(f"Writing a batch of {odf.num_rows()} rows")
-    pqwriter.write_table(pyarrow_table)
-
-pqwriter.close()
-
-# -----------------------------------------------------------------------------
-# Check the file was created
-
-print("\nParquet file metadata:")
-print(pq.read_metadata(PARQUET_FILE_NAME))
-
-# -----------------------------------------------------------------------------
-# Read the file
-
-print("\nParquet file data:")
-t = pq.read_table(PARQUET_FILE_NAME, columns=["ID", "NAME"])
-print(t)
diff --git a/samples/dataframe_polars.py b/samples/dataframe_polars.py
deleted file mode 100644
index 52d76610..00000000
--- a/samples/dataframe_polars.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_polars.py
-#
-# Shows how to use connection.fetch_df_all() to efficiently put data into
-# Polars DataFrames and Series.
-# -----------------------------------------------------------------------------
-
-import pyarrow
-import polars
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-#
-# Polars DataFrame
-
-SQL1 = "select * from SampleQueryTab order by id"
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = connection.fetch_df_all(statement=SQL1, arraysize=100)
-
-# Convert to a Polars DataFrame
-p = polars.from_arrow(odf)
-
-print(type(p))  # <class 'polars.dataframe.frame.DataFrame'>
-
-r, c = p.shape
-print(f"{r} rows, {c} columns")
-
-print("\nSum:")
-print(p.sum())
-
-# -----------------------------------------------------------------------------
-#
-# Polars Series
-
-SQL2 = "select id from SampleQueryTab order by id"
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = connection.fetch_df_all(statement=SQL2, arraysize=100)
-
-# Convert to a Polars Series
-pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-p = polars.from_arrow(pyarrow_array)
-
-print(type(p))  # <class 'polars.series.series.Series'>
-
-(r,) = p.shape
-print(f"{r} rows")
-
-print("\nSum:")
-print(p.sum())
-
-print("\nLog10:")
-print(p.log10())
diff --git a/samples/dataframe_pyarrow.py b/samples/dataframe_pyarrow.py
deleted file mode 100644
index dc01531a..00000000
--- a/samples/dataframe_pyarrow.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_pyarrow.py
-#
-# Shows how to use connection.fetch_df_all() to create PyArrow tables and
-# arrays.
-# -----------------------------------------------------------------------------
-
-import pyarrow
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-#
-# Creating a PyArrow table
-
-SQL1 = "select id, name from SampleQueryTab order by id"
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = connection.fetch_df_all(statement=SQL1, arraysize=100)
-
-# Create a PyArrow table
-pyarrow_table = pyarrow.table(odf)
-
-print("Type:")
-print(type(pyarrow_table))  # <class 'pyarrow.lib.Table'>
-
-# Perform various PyArrow operations
-
-print("\nColumn names:")
-print(pyarrow_table.column_names)
-
-print("\nNumber of rows and columns:")
-(r, c) = pyarrow_table.shape
-print(f"{r} rows, {c} columns")
-
-# -----------------------------------------------------------------------------
-#
-# Creating a PyArrow array
-
-SQL2 = "select id from SampleQueryTab order by id"
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = connection.fetch_df_all(statement=SQL2, arraysize=100)
-
-# Create a PyArrow array
-pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-
-print("Type:")
-print(type(pyarrow_array))  # <class 'pyarrow.lib.DoubleArray'>
-
-# Perform various PyArrow operations
-
-print("\nSum:")
-print(pyarrow_array.sum())
-
-print("\nFirst three elements:")
-print(pyarrow_array.slice(0, 3))
diff --git a/samples/dataframe_torch.py b/samples/dataframe_torch.py
deleted file mode 100644
index ed006c0e..00000000
--- a/samples/dataframe_torch.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_torch.py
-#
-# Shows how to use connection.fetch_df_all() to efficiently put data into a
-# Torch tensor via the DLPack standard memory layout.
-# -----------------------------------------------------------------------------
-
-import pyarrow
-import torch
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-SQL = "select id from SampleQueryTab order by id"
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = connection.fetch_df_all(statement=SQL, arraysize=100)
-
-# Convert to a Torch tensor via the Python DLPack specification
-pyarrow_array = pyarrow.array(odf.get_column_by_name("ID"))
-tt = torch.from_dlpack(pyarrow_array)
-
-print(type(tt))  # <class 'torch.Tensor'>
-
-# Perform various Torch operations on the tensor
-
-print("\nSum:")
-print(torch.sum(tt))
-
-print("\nLog10:")
-print(torch.log10(tt))
diff --git a/samples/dataframe_types.py b/samples/dataframe_types.py
deleted file mode 100644
index 7c0c572a..00000000
--- a/samples/dataframe_types.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe_types.py
-#
-# Shows how to change the schema types and names of a dataframe
-# -----------------------------------------------------------------------------
-
-import pyarrow
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-
-SQL = "select * from SampleQueryTab where id < 5"
-
-# Default fetch with no type mapping
-
-odf = connection.fetch_df_all(SQL)
-tab = pyarrow.table(odf)
-print("Default Output:", tab)
-
-# Fetching with an explicit schema
-
-schema = pyarrow.schema(
-    [("COL_1", pyarrow.int16()), ("COL_2", pyarrow.string())]
-)
-odf = connection.fetch_df_all(SQL, requested_schema=schema)
-tab = pyarrow.table(odf)
-print("\nNew Output:", tab)
diff --git a/samples/dbms_output.py b/samples/dbms_output.py
deleted file mode 100644
index 3c0e8098..00000000
--- a/samples/dbms_output.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dbms_output.py
-#
-# Demonstrates one method of fetching the lines produced by the DBMS_OUTPUT
-# package.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # enable DBMS_OUTPUT
-    cursor.callproc("dbms_output.enable")
-
-    # execute some PL/SQL that generates output with DBMS_OUTPUT.PUT_LINE
-    cursor.execute(
-        """
-        begin
-            dbms_output.put_line('This is some text');
-            dbms_output.put_line('');
-            dbms_output.put_line('Demonstrating use of DBMS_OUTPUT');
-        end;
-        """
-    )
-
-    # tune this size for your application
-    chunk_size = 10
-
-    # create variables to hold the output
-    lines_var = cursor.arrayvar(str, chunk_size)
-    num_lines_var = cursor.var(int)
-    num_lines_var.setvalue(0, chunk_size)
-
-    # fetch the text that was added by PL/SQL
-    while True:
-        cursor.callproc("dbms_output.get_lines", (lines_var, num_lines_var))
-        num_lines = num_lines_var.getvalue()
-        lines = lines_var.getvalue()[:num_lines]
-        for line in lines:
-            print(line or "")
-        if num_lines < chunk_size:
-            break
diff --git a/samples/dbms_output_async.py b/samples/dbms_output_async.py
deleted file mode 100644
index 757db241..00000000
--- a/samples/dbms_output_async.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dbms_output_async.py
-#
-# An asynchronous version of dbms_output.py
-#
-# Demonstrates one method of fetching the lines produced by the DBMS_OUTPUT
-# package.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # enable DBMS_OUTPUT
-        await cursor.callproc("dbms_output.enable")
-
-        # execute some PL/SQL that generates output with DBMS_OUTPUT.PUT_LINE
-        await cursor.execute(
-            """
-            begin
-                dbms_output.put_line('This is some text');
-                dbms_output.put_line('');
-                dbms_output.put_line('Demonstrating use of DBMS_OUTPUT');
-            end;
-            """
-        )
-
-        # tune this size for your application
-        chunk_size = 10
-
-        # create variables to hold the output
-        lines_var = cursor.arrayvar(str, chunk_size)
-        num_lines_var = cursor.var(int)
-        num_lines_var.setvalue(0, chunk_size)
-
-        # fetch the text that was added by PL/SQL
-        while True:
-            await cursor.callproc(
-                "dbms_output.get_lines", (lines_var, num_lines_var)
-            )
-            num_lines = num_lines_var.getvalue()
-            lines = lines_var.getvalue()[:num_lines]
-            for line in lines:
-                print(line or "")
-            if num_lines < chunk_size:
-                break
-
-
-asyncio.run(main())
diff --git a/samples/direct_path_load.py b/samples/direct_path_load.py
deleted file mode 100644
index 22670596..00000000
--- a/samples/direct_path_load.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# direct_path_load.py
-#
-# Shows how Direct Path Loads can be used to insert into Oracle Database.
-#
-# The same technique can be used with data frames, see dataframe_insert.py
-# An example of loading from a CSV file is in load_csv.py
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-
-DATA = [
-    (1, "A first row"),
-    (2, "A second row"),
-    (3, "A third row"),
-]
-
-connection.direct_path_load(
-    schema_name=sample_env.get_main_user(),
-    table_name="mytab",
-    column_names=["id", "data"],
-    data=DATA,
-)
-
-with connection.cursor() as cursor:
-
-    # Check the data was inserted
-    sql = "select * from mytab"
-    for r in cursor.execute(sql):
-        print(r)
-
-    # Clean up the table so the sample can be re-run
-    cursor.execute("truncate table mytab")
diff --git a/samples/direct_path_load_async.py b/samples/direct_path_load_async.py
deleted file mode 100644
index 7e7cae1a..00000000
--- a/samples/direct_path_load_async.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# direct_path_load_async.py
-#
-# An asynchronous version of direct_path_load.py
-#
-# Shows how Direct Path Loads can be used to insert into Oracle Database.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-# -----------------------------------------------------------------------------
-
-
-async def main():
-
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    DATA = [
-        (1, "A first row"),
-        (2, "A second row"),
-        (3, "A third row"),
-    ]
-
-    await connection.direct_path_load(
-        schema_name=sample_env.get_main_user(),
-        table_name="mytab",
-        column_names=["id", "data"],
-        data=DATA,
-    )
-
-    with connection.cursor() as cursor:
-
-        await cursor.execute("select * from mytab")
-        async for r in cursor:
-            print(r)
-        # Check the data was inserted
-        await cursor.execute("select * from mytab")
-        async for r in cursor:
-            print(r)
-
-        # Clean up the table so the sample can be re-run
-        await cursor.execute("truncate table mytab")
-
-
-asyncio.run(main())
diff --git a/samples/dml_returning_multiple_rows.py b/samples/dml_returning_multiple_rows.py
deleted file mode 100644
index cc19884e..00000000
--- a/samples/dml_returning_multiple_rows.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dml_returning_multiple_rows.py
-#
-# Demonstrates the use of DML returning with multiple rows being returned at
-# once.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # truncate table first so that script can be rerun
-    print("Truncating table...")
-    cursor.execute("truncate table TestTempTable")
-
-    # populate table with a few rows
-    for i in range(5):
-        data = (i + 1, "Test String #%d" % (i + 1))
-        print("Adding row", data)
-        cursor.execute("insert into TestTempTable values (:1, :2)", data)
-
-    # now delete them and use DML returning to return the data that was
-    # deleted
-    int_col = cursor.var(int)
-    string_col = cursor.var(str)
-    print("Deleting data with DML returning...")
-    cursor.execute(
-        """
-        delete from TestTempTable
-        returning IntCol, StringCol into :int_col, :string_col
-        """,
-        int_col=int_col,
-        string_col=string_col,
-    )
-    print("Data returned:")
-    for int_val, string_val in zip(int_col.getvalue(), string_col.getvalue()):
-        print(tuple([int_val, string_val]))
diff --git a/samples/dml_returning_multiple_rows_async.py b/samples/dml_returning_multiple_rows_async.py
deleted file mode 100644
index 2bda224b..00000000
--- a/samples/dml_returning_multiple_rows_async.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dml_returning_multiple_rows_async.py
-#
-# An asynchronous version of dml_returning_multiple_rows.py
-#
-# Demonstrates the use of DML returning with multiple rows being returned at
-# once.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # truncate table first so that script can be rerun
-        print("Truncating table...")
-        await cursor.execute("truncate table TestTempTable")
-
-        # populate table with a few rows
-        for i in range(5):
-            data = (i + 1, "Test String #%d" % (i + 1))
-            print("Adding row", data)
-            await cursor.execute(
-                "insert into TestTempTable values (:1, :2)", data
-            )
-
-        # now delete them and use DML returning to return the data that was
-        # deleted
-        int_col = cursor.var(int)
-        string_col = cursor.var(str)
-        print("Deleting data with DML returning...")
-        await cursor.execute(
-            """
-            delete from TestTempTable
-            returning IntCol, StringCol into :int_col, :string_col
-            """,
-            int_col=int_col,
-            string_col=string_col,
-        )
-        print("Data returned:")
-        for int_val, string_val in zip(
-            int_col.getvalue(), string_col.getvalue()
-        ):
-            print(tuple([int_val, string_val]))
-
-
-asyncio.run(main())
diff --git a/samples/drcp_pool.py b/samples/drcp_pool.py
deleted file mode 100644
index eb7c89fc..00000000
--- a/samples/drcp_pool.py
+++ /dev/null
@@ -1,260 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# drcp_pool.py
-#
-# Demonstrates the use of Database Resident Connection Pooling (DRCP)
-# connection pooling using a Flask web application.  This sample is similar to
-# connection_pool.py
-#
-# DRCP can be used with standalone connections from connect(), but it is often
-# used together with a python-oracledb connection pool created with
-# create_pool(), as shown here.
-#
-# DRCP provides a connection pool in the database server. The pool reduces the
-# cost of creating and tearing down database server processs.  This pool of
-# server processes can be shared across application processs, allowing for
-# resource sharing.
-#
-# There is no difference in how a connection is used once it has been
-# established.
-#
-# To use DRCP, the connection string should request the database use a pooled
-# server.  For example, "localhost/orclpdb:pooled".  It is best practice for
-# connections to specify a connection class and server purity when creating
-# a pool
-#
-# For on premise databases, the DRCP pool can be started and stopped in the
-# database by issuing the following commands in SQL*Plus:
-#
-#   exec dbms_connection_pool.start_pool()
-#   exec dbms_connection_pool.stop_pool()
-#
-# For multitenant databases, DRCP management needs to be done the root ("CDB")
-# database unless the database initialization parameter ENABLE_PER_PDB_DRCP is
-# TRUE.
-#
-# Oracle Autonomous Databases already have DRCP enabled.
-#
-# Statistics on DRCP usage are recorded in various data dictionary views, for
-# example in V$CPOOL_CC_STATS.
-#
-# See the python-oracledb documentation for more information on DRCP.
-#
-# To run this sample:
-#
-#  1. Install Flask, for example like:
-#
-#     python -m pip install Flask
-#
-#  2. (Optional) Set environment variables referenced in sample_env.py
-#
-#  3. Run:
-#
-#     python drcp_pool.py
-#
-#  4. In a browser load a URL as shown below.
-#
-# The default route will display a welcome message:
-#   http://127.0.0.1:8080/
-#
-# To find a username you can pass an id, for example 1:
-#   http://127.0.0.1:8080/user/1
-#
-# To insert new a user 'fred' you can call:
-#   http://127.0.0.1:8080/post/fred
-#
-# Multi-user load can be simulated with a testing tool such as 'ab':
-#
-#   ab -n 1000 -c 4 http://127.0.0.1:8080/user/1
-#
-# Then you can query the data dictionary:
-#
-#   select cclass_name, num_requests, num_hits,
-#          num_misses, num_waits, num_authentications as num_auths
-#   from   v$cpool_cc_stats;
-#
-# Output will be like:
-#
-#   CCLASS_NAME      NUM_REQUESTS NUM_HITS NUM_MISSES NUM_WAITS NUM_AUTHS
-#   ---------------- ------------ -------- ---------- --------- ---------
-#   PYTHONDEMO.MYAPP         1001      997          4         0         4
-#
-# With ADB-S databases, query V$CPOOL_CONN_INFO instead.
-#
-# -----------------------------------------------------------------------------
-
-import os
-import sys
-
-from flask import Flask
-
-import oracledb
-import sample_env
-
-# Port to listen on
-port = int(os.environ.get("PORT", "8080"))
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# -----------------------------------------------------------------------------
-
-
-# start_pool(): starts the connection pool
-def start_pool():
-    # Generally a fixed-size pool is recommended, i.e. pool_min=pool_max.  Here
-    # the pool contains 4 connections, which will allow 4 concurrent users.
-
-    pool_min = 4
-    pool_max = 4
-    pool_inc = 0
-
-    pool = oracledb.create_pool(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_drcp_connect_string(),
-        params=sample_env.get_pool_params(),
-        min=pool_min,
-        max=pool_max,
-        increment=pool_inc,
-        session_callback=init_session,
-        cclass="MYAPP",
-        purity=oracledb.ATTR_PURITY_SELF,
-    )
-
-    return pool
-
-
-# init_session(): a 'session callback' to efficiently set any initial state
-# that each connection should have.
-#
-# This particular demo doesn't use dates, so sessionCallback could be omitted,
-# but it does show the kinds of settings many apps would use.
-#
-# If you have multiple SQL statements, then call them all in a PL/SQL anonymous
-# block with BEGIN/END so you only use execute() once.  This is shown later in
-# create_schema().
-#
-def init_session(connection, requestedTag_ignored):
-    with connection.cursor() as cursor:
-        cursor.execute(
-            """
-            alter session set
-                time_zone = 'UTC'
-                nls_date_format = 'YYYY-MM-DD HH24:MI'
-            """
-        )
-
-
-# -----------------------------------------------------------------------------
-
-
-# create_schema(): drop and create the demo table, and add a row
-def create_schema():
-    with pool.acquire() as connection:
-        with connection.cursor() as cursor:
-            cursor.execute(
-                """
-                begin
-                    begin
-                        execute immediate 'drop table demo';
-                    exception when others then
-                        if sqlcode <> -942 then
-                            raise;
-                        end if;
-                    end;
-
-                    execute immediate 'create table demo (
-                        id       number generated by default as identity,
-                        username varchar2(40)
-                    )';
-
-                    execute immediate 'insert into demo (username)
-                    values (''chris'')';
-
-                    commit;
-                end;
-                """
-            )
-
-
-# -----------------------------------------------------------------------------
-
-app = Flask(__name__)
-
-
-# Display a welcome message on the 'home' page
-@app.route("/")
-def index():
-    return "Welcome to the demo app"
-
-
-# Add a new username
-#
-# The new user's id is generated by the database and returned in the OUT bind
-# variable 'idbv'.
-@app.route("/post/<string:username>")
-def post(username):
-    with pool.acquire() as connection:
-        with connection.cursor() as cursor:
-            connection.autocommit = True
-            idbv = cursor.var(int)
-            cursor.execute(
-                """
-                insert into demo (username)
-                values (:unbv)
-                returning id into :idbv
-                """,
-                [username, idbv],
-            )
-            return f"Inserted {username} with id {idbv.getvalue()[0]}"
-
-
-# Show the username for a given id
-@app.route("/user/<int:id>")
-def show_username(id):
-    with pool.acquire() as connection:
-        with connection.cursor() as cursor:
-            cursor.execute("select username from demo where id = :idbv", [id])
-            r = cursor.fetchone()
-            return r[0] if r is not None else "Unknown user id"
-
-
-# -----------------------------------------------------------------------------
-
-if __name__ == "__main__":
-    # Start a pool of connections
-    pool = start_pool()
-
-    # Create a demo table
-    create_schema()
-
-    m = f"\nTry loading http://127.0.0.1:{port}/user/1 in a browser\n"
-    sys.modules["flask.cli"].show_server_banner = lambda *x: print(m)
-
-    # Start a webserver
-    app.run(port=port)
diff --git a/samples/drop_schema.py b/samples/drop_schema.py
deleted file mode 100644
index 5d0443c3..00000000
--- a/samples/drop_schema.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# drop_schema.py
-#
-# Drops the database objects used by the python-oracledb samples.
-#
-# This script is also executed by the Python script sample_setup.py for
-# dropping the existing users and editions, if applicable, before creating the
-# sample schemas and editions.
-# -----------------------------------------------------------------------------
-
-import sample_env
-
-
-def drop_schema(conn):
-    print("Dropping sample schemas and edition...")
-    sample_env.run_sql_script(
-        conn,
-        "drop_schema",
-        main_user=sample_env.get_main_user(),
-        edition_user=sample_env.get_edition_user(),
-        edition_name=sample_env.get_edition_name(),
-    )
-
-
-if __name__ == "__main__":
-    conn = sample_env.get_admin_connection()
-    drop_schema(conn)
-    print("Done.")
diff --git a/samples/editioning.py b/samples/editioning.py
deleted file mode 100644
index 8b75e79f..00000000
--- a/samples/editioning.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# editioning.py
-#
-# Demonstrates the use of Edition-Based Redefinition, a feature that is
-# available in Oracle Database 11.2 and higher. See the Oracle documentation on
-# the subject for additional information. Adjust the contents at the top of the
-# script for your own database as needed.
-# -----------------------------------------------------------------------------
-
-import os
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# connect to the editions user and create a procedure
-edition_connect_string = sample_env.get_edition_connect_string()
-edition_name = sample_env.get_edition_name()
-connection = oracledb.connect(edition_connect_string)
-print("Edition should be None, actual value is:", repr(connection.edition))
-cursor = connection.cursor()
-cursor.execute(
-    """
-    create or replace function TestEditions return varchar2 as
-    begin
-        return 'Base Procedure';
-    end;
-    """
-)
-result = cursor.callfunc("TestEditions", str)
-print(
-    "Function should return 'Base Procedure', actually returns:", repr(result)
-)
-
-# next, change the edition and recreate the procedure in the new edition
-cursor.execute("alter session set edition = %s" % edition_name)
-print(
-    "Edition should be",
-    repr(edition_name.upper()),
-    "actual value is:",
-    repr(connection.edition),
-)
-cursor.execute(
-    """
-    create or replace function TestEditions return varchar2 as
-    begin
-        return 'Edition 1 Procedure';
-    end;
-    """
-)
-result = cursor.callfunc("TestEditions", str)
-print(
-    "Function should return 'Edition 1 Procedure', actually returns:",
-    repr(result),
-)
-
-# next, change the edition back to the base edition and demonstrate that the
-# original function is being called
-cursor.execute("alter session set edition = ORA$BASE")
-result = cursor.callfunc("TestEditions", str)
-print(
-    "Function should return 'Base Procedure', actually returns:", repr(result)
-)
-
-# the edition can be set upon connection
-connection = oracledb.connect(
-    edition_connect_string, edition=edition_name.upper()
-)
-cursor = connection.cursor()
-result = cursor.callfunc("TestEditions", str)
-print(
-    "Function should return 'Edition 1 Procedure', actually returns:",
-    repr(result),
-)
-
-# it can also be set via the environment variable ORA_EDITION
-os.environ["ORA_EDITION"] = edition_name.upper()
-connection = oracledb.connect(edition_connect_string)
-print(
-    "Edition should be",
-    repr(edition_name.upper()),
-    "actual value is:",
-    repr(connection.edition),
-)
-cursor = connection.cursor()
-result = cursor.callfunc("TestEditions", str)
-print(
-    "Function should return 'Edition 1 Procedure', actually returns:",
-    repr(result),
-)
diff --git a/samples/generic_row_factory.py b/samples/generic_row_factory.py
deleted file mode 100644
index 8b60f509..00000000
--- a/samples/generic_row_factory.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# generic_row_factory.py
-#
-# Demonstrates the ability to return named tuples for all queries using a
-# subclassed cursor and row factory.
-# -----------------------------------------------------------------------------
-
-import collections
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-class Connection(oracledb.Connection):
-    def cursor(self):
-        return Cursor(self)
-
-
-class Cursor(oracledb.Cursor):
-    def execute(self, statement, args=None):
-        prepare_needed = self.statement != statement
-        result = super().execute(statement, args or [])
-        if prepare_needed:
-            description = self.description
-            if description is not None:
-                names = [d.name for d in description]
-                self.rowfactory = collections.namedtuple("GenericQuery", names)
-        return result
-
-
-# create a new subclassed connection and cursor
-connection = Connection(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # the names are now available directly for each query executed
-    for row in cursor.execute("select ParentId, Description from ParentTable"):
-        print(row.PARENTID, "->", row.DESCRIPTION)
-    print()
-
-    for row in cursor.execute("select ChildId, Description from ChildTable"):
-        print(row.CHILDID, "->", row.DESCRIPTION)
-    print()
diff --git a/samples/generic_row_factory_async.py b/samples/generic_row_factory_async.py
deleted file mode 100644
index e1efdbf4..00000000
--- a/samples/generic_row_factory_async.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# generic_row_factory_async.py
-#
-# An asynchronous version of generic_row_factory.py
-#
-# Demonstrates the ability to return named tuples for all queries using a
-# subclassed cursor and row factory.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import collections
-
-import oracledb
-import sample_env
-
-
-class Connection(oracledb.AsyncConnection):
-    def cursor(self):
-        return Cursor(self)
-
-
-class Cursor(oracledb.AsyncCursor):
-    async def execute(self, statement, args=None):
-        prepare_needed = self.statement != statement
-        result = await super().execute(statement, args or [])
-        if prepare_needed:
-            description = self.description
-            if description is not None:
-                names = [d.name for d in description]
-                self.rowfactory = collections.namedtuple("GenericQuery", names)
-        return result
-
-
-async def main():
-    # create a new subclassed connection and cursor
-    connection = await oracledb.connect_async(
-        conn_class=Connection,
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # the names are now available directly for each query executed
-        await cursor.execute("select ParentId, Description from ParentTable")
-        async for row in cursor:
-            print(row.PARENTID, "->", row.DESCRIPTION)
-        print()
-
-        await cursor.execute("select ChildId, Description from ChildTable")
-        async for row in cursor:
-            print(row.CHILDID, "->", row.DESCRIPTION)
-        print()
-
-
-asyncio.run(main())
diff --git a/samples/implicit_results.py b/samples/implicit_results.py
deleted file mode 100644
index ff688377..00000000
--- a/samples/implicit_results.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# implicit_results.py
-#
-# Demonstrates the use of the Oracle Database 12.1 feature that allows PL/SQL
-# procedures to return result sets implicitly, without having to explicitly
-# define them.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # A PL/SQL block that returns two cursors
-    cursor.execute(
-        """
-        declare
-            c1 sys_refcursor;
-            c2 sys_refcursor;
-        begin
-
-            open c1 for
-                select * from TestNumbers;
-
-            dbms_sql.return_result(c1);
-
-            open c2 for
-                select * from TestStrings;
-
-            dbms_sql.return_result(c2);
-
-        end;
-        """
-    )
-
-    # display results
-    for ix, result_set in enumerate(cursor.getimplicitresults()):
-        print("Result Set #" + str(ix + 1))
-        for row in result_set:
-            print(row)
-        print()
diff --git a/samples/implicit_results_async.py b/samples/implicit_results_async.py
deleted file mode 100644
index 95841274..00000000
--- a/samples/implicit_results_async.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# implicit_results_async.py
-#
-# An asynchronous version of implicit_results.py
-#
-# Demonstrates the use of the Oracle Database 12.1 feature that allows PL/SQL
-# procedures to return result sets implicitly, without having to explicitly
-# define them.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # A PL/SQL block that returns two cursors
-        await cursor.execute(
-            """
-            declare
-                c1 sys_refcursor;
-                c2 sys_refcursor;
-            begin
-
-                open c1 for
-                    select * from TestNumbers;
-
-                dbms_sql.return_result(c1);
-
-                open c2 for
-                    select * from TestStrings;
-
-                dbms_sql.return_result(c2);
-
-            end;
-            """
-        )
-
-        # display results
-        for ix, result_set in enumerate(cursor.getimplicitresults()):
-            print("Result Set #" + str(ix + 1))
-            async for row in result_set:
-                print(row)
-            print()
-
-
-asyncio.run(main())
diff --git a/samples/insert_geometry.py b/samples/insert_geometry.py
deleted file mode 100644
index 6946b42f..00000000
--- a/samples/insert_geometry.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# insert_geometry.py
-#
-# Demonstrates the ability to create Oracle objects (this example uses
-# SDO_GEOMETRY) and insert them into a table.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# create and populate Oracle objects
-type_obj = connection.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = connection.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = connection.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-obj = type_obj.newobject()
-obj.SDO_GTYPE = 2003
-obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-obj.SDO_ELEM_INFO.extend([1, 1003, 3])
-obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-obj.SDO_ORDINATES.extend([1, 1, 5, 7])
-print("Created object", obj)
-
-with connection.cursor() as cursor:
-    cursor.execute("truncate table TestGeometry")
-    print("Adding row to table...")
-    cursor.execute("insert into TestGeometry values (1, :objbv)", objbv=obj)
-    connection.commit()
-    print("Success!")
diff --git a/samples/insert_geometry_async.py b/samples/insert_geometry_async.py
deleted file mode 100644
index 22fe92d4..00000000
--- a/samples/insert_geometry_async.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# insert_geometry_async.py
-#
-# An asynchronous version of insert_geometry.py
-#
-# Demonstrates the ability to create Oracle objects (this example uses
-# SDO_GEOMETRY) and insert them into a table.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # create and populate Oracle objects
-    type_obj = await connection.gettype("MDSYS.SDO_GEOMETRY")
-    element_info_type_obj = await connection.gettype(
-        "MDSYS.SDO_ELEM_INFO_ARRAY"
-    )
-    ordinate_type_obj = await connection.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-    obj = type_obj.newobject()
-    obj.SDO_GTYPE = 2003
-    obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-    obj.SDO_ELEM_INFO.extend([1, 1003, 3])
-    obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-    obj.SDO_ORDINATES.extend([1, 1, 5, 7])
-    print("Created object", obj)
-
-    with connection.cursor() as cursor:
-        await cursor.execute("truncate table TestGeometry")
-        print("Adding row to table...")
-        await cursor.execute(
-            "insert into TestGeometry values (1, :objbv)", objbv=obj
-        )
-        await connection.commit()
-        print("Success!")
-
-
-asyncio.run(main())
diff --git a/samples/json_blob.py b/samples/json_blob.py
deleted file mode 100644
index 2a3d42b0..00000000
--- a/samples/json_blob.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_blob.py
-#
-# Demonstrates how to use a BLOB as a JSON column store.
-#
-# Note: Oracle Database 12c lets JSON be stored in VARCHAR2 or LOB columns.
-#       With Oracle Database 21c using the new JSON type is recommended
-#       instead, see json_direct.py
-#
-# Documentation:
-#     python-oracledb: https://oracledb.readthedocs.io/en/latest/user_guide/json_data_type.html
-#     Oracle Database: https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-# -----------------------------------------------------------------------------
-
-import json
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-if not connection.thin:
-    client_version = oracledb.clientversion()[0]
-db_version = int(connection.version.split(".")[0])
-
-# Minimum database version is 12
-if db_version < 12:
-    sys.exit("This example requires Oracle Database 12.1.0.2 or later")
-
-# Insert JSON data
-with connection.cursor() as cursor:
-    data = dict(name="Rod", dept="Sales", location="Germany")
-    inssql = "insert into CustomersAsBlob values (:1, :2)"
-
-    if (connection.thin or client_version >= 21) and db_version >= 21:
-        # Take advantage of direct binding
-        cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-        cursor.execute(inssql, [1, data])
-    else:
-        # Insert the data as a JSON string
-        cursor.setinputsizes(None, oracledb.DB_TYPE_LONG_RAW)
-        cursor.execute(inssql, [1, json.dumps(data)])
-
-# Select JSON data
-with connection.cursor() as cursor:
-    sql = "select c.json_data from CustomersAsBlob c"
-    for (j,) in cursor.execute(sql):
-        print(j)
-
-    # Using JSON_VALUE to extract a value from a JSON column
-
-    sql = """select json_value(json_data, '$.location')
-             from CustomersAsBlob
-             offset 0 rows fetch next 1 rows only"""
-    for r in cursor.execute(sql):
-        print(r)
-
-    # Using dot-notation to extract a value from a JSON  (BLOB storage) column
-
-    sql = """select c.json_data.location
-             from CustomersAsBlob c
-             offset 0 rows fetch next 1 rows only"""
-    for (j,) in cursor.execute(sql):
-        print(j)
-
-    # Using JSON_OBJECT to extract relational data as JSON
-
-    sql = """select json_object('key' is d.dummy) dummy
-             from dual d"""
-    for r in cursor.execute(sql):
-        print(r)
-
-    # Using JSON_ARRAYAGG to extract a whole relational table as JSON
-
-    sql = """select json_arrayagg(
-                        json_object('key' is c.id,
-                                    'name' is c.json_data)
-                        returning clob)
-             from CustomersAsBlob c"""
-    for r in cursor.execute(sql, fetch_lobs=False):
-        print(r)
diff --git a/samples/json_blob_async.py b/samples/json_blob_async.py
deleted file mode 100644
index 845063a4..00000000
--- a/samples/json_blob_async.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_blob_async.py
-#
-# An asynchronous version of json_blob.py
-#
-# Demonstrates how to use a BLOB as a JSON column store.
-#
-# Note: Oracle Database 12c lets JSON be stored in VARCHAR2 or LOB columns.
-#       With Oracle Database 21c using the new JSON type is recommended
-#       instead, see json_direct_async.py
-#
-# Documentation:
-#     python-oracledb: https://oracledb.readthedocs.io/en/latest/user_guide/json_data_type.html
-#     Oracle Database: https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-# -----------------------------------------------------------------------------
-
-import asyncio
-import json
-import sys
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # Minimum database version is 12
-    db_version = int(connection.version.split(".")[0])
-    if db_version < 12:
-        sys.exit("This example requires Oracle Database 12.1.0.2 or later")
-
-    # Insert JSON data
-    with connection.cursor() as cursor:
-        data = dict(name="Rod", dept="Sales", location="Germany")
-        inssql = "insert into CustomersAsBlob values (:1, :2)"
-
-        if db_version >= 21:
-            # Take advantage of direct binding
-            cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-            await cursor.execute(inssql, [1, data])
-        else:
-            # Insert the data as a JSON string
-            await cursor.execute(inssql, [1, json.dumps(data)])
-
-    # Select JSON data
-    with connection.cursor() as cursor:
-        sql = "select c.json_data from CustomersAsBlob c"
-        await cursor.execute(sql)
-        async for (j,) in cursor:
-            print(j)
-
-        # Using JSON_VALUE to extract a value from a JSON column
-
-        sql = """select json_value(json_data, '$.location')
-                 from CustomersAsBlob
-                 offset 0 rows fetch next 1 rows only"""
-        await cursor.execute(sql)
-        async for (r,) in cursor:
-            print(r)
-
-        # Using dot-notation to extract a value from a JSON  (BLOB storage)
-        # column
-
-        sql = """select c.json_data.location
-                 from CustomersAsBlob c
-                 offset 0 rows fetch next 1 rows only"""
-        await cursor.execute(sql)
-        async for (j,) in cursor:
-            print(j)
-
-        # Using JSON_OBJECT to extract relational data as JSON
-
-        sql = """select json_object('key' is d.dummy) dummy
-                 from dual d"""
-        await cursor.execute(sql)
-        async for r in cursor:
-            print(r)
-
-        # Using JSON_ARRAYAGG to extract a whole relational table as JSON
-
-        sql = """select json_arrayagg(
-                            json_object('key' is c.id,
-                                        'name' is c.json_data)
-                            returning clob)
-                 from CustomersAsBlob c"""
-        await cursor.execute(sql, fetch_lobs=False)
-        async for r in cursor:
-            print(r)
-
-
-asyncio.run(main())
diff --git a/samples/json_direct.py b/samples/json_direct.py
deleted file mode 100644
index 9df9eb16..00000000
--- a/samples/json_direct.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_direct.py
-#
-# Demonstrates the use of some JSON features with the JSON type that is
-# available in Oracle Database 21c and higher.
-#
-# See https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-#
-# For JSON with older databases see json_blob.py
-# -----------------------------------------------------------------------------
-
-import json
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-if not connection.thin:
-    client_version = oracledb.clientversion()[0]
-db_version = int(connection.version.split(".")[0])
-
-# this script only works with Oracle Database 21
-if db_version < 21:
-    sys.exit(
-        "This example requires Oracle Database 21.1 or later. "
-        "Try json_blob.py instead"
-    )
-
-# Insert JSON data
-with connection.cursor() as cursor:
-    data = dict(name="Rod", dept="Sales", location="Germany")
-    inssql = "insert into CustomersAsJson values (:1, :2)"
-    if connection.thin or client_version >= 21:
-        # Take advantage of direct binding
-        cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-        cursor.execute(inssql, [1, data])
-    else:
-        # Insert the data as a JSON string
-        cursor.execute(inssql, [1, json.dumps(data)])
-
-# Select JSON data
-with connection.cursor() as cursor:
-    sql = "select c.json_data from CustomersAsJson c"
-    if connection.thin or client_version >= 21:
-        for (j,) in cursor.execute(sql):
-            print(j)
-    else:
-        for (j,) in cursor.execute(sql):
-            print(json.loads(j.read()))
-
-    # Using JSON_VALUE to extract a value from a JSON column
-
-    sql = """select json_value(json_data, '$.location')
-             from CustomersAsJson
-             offset 0 rows fetch next 1 rows only"""
-    for r in cursor.execute(sql):
-        print(r)
-
-    # Using dot-notation to extract a value from a JSON column
-
-    sql = """select c.json_data.location
-             from CustomersAsJson c
-             offset 0 rows fetch next 1 rows only"""
-    if connection.thin or client_version >= 21:
-        for (j,) in cursor.execute(sql):
-            print(j)
-    else:
-        for (j,) in cursor.execute(sql):
-            print(json.loads(j.read()))
-
-    # Using JSON_OBJECT to extract relational data as JSON
-
-    sql = """select json_object('key' is d.dummy) dummy
-             from dual d"""
-    for r in cursor.execute(sql):
-        print(r)
-
-    # Using JSON_ARRAYAGG to extract a whole relational table as JSON
-
-    sql = """select json_arrayagg(
-                        json_object('key' is c.id,
-                                    'name' is c.json_data)
-                        returning clob)
-             from CustomersAsJson c"""
-    for r in cursor.execute(sql, fetch_lobs=False):
-        print(r)
diff --git a/samples/json_direct_async.py b/samples/json_direct_async.py
deleted file mode 100644
index 5821f935..00000000
--- a/samples/json_direct_async.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_direct_async.py
-#
-# An asynchronous version of json_direct.py
-#
-# Demonstrates the use of some JSON features with the JSON type that is
-# available in Oracle Database 21c and higher.
-#
-# See https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-#
-# For JSON with older databases see json_blob_async.py
-# -----------------------------------------------------------------------------
-
-import asyncio
-import sys
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # this script only works with Oracle Database 21
-    db_version = int(connection.version.split(".")[0])
-    if db_version < 21:
-        sys.exit(
-            "This example requires Oracle Database 21.1 or later. "
-            "Try json_blob.py instead"
-        )
-
-    # Insert JSON data
-    with connection.cursor() as cursor:
-        data = dict(name="Rod", dept="Sales", location="Germany")
-        inssql = "insert into CustomersAsJson values (:1, :2)"
-        cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-        await cursor.execute(inssql, [1, data])
-
-    # Select JSON data
-    with connection.cursor() as cursor:
-        sql = "select c.json_data from CustomersAsJson c"
-        await cursor.execute(sql)
-        async for (j,) in cursor:
-            print(j)
-
-        # Using JSON_VALUE to extract a value from a JSON column
-
-        sql = """select json_value(json_data, '$.location')
-                 from CustomersAsJson
-                 offset 0 rows fetch next 1 rows only"""
-        await cursor.execute(sql)
-        async for r in cursor:
-            print(r)
-
-        # Using dot-notation to extract a value from a JSON column
-
-        sql = """select c.json_data.location
-                 from CustomersAsJson c
-                 offset 0 rows fetch next 1 rows only"""
-        await cursor.execute(sql)
-        async for (j,) in cursor:
-            print(j)
-
-        # Using JSON_OBJECT to extract relational data as JSON
-
-        sql = """select json_object('key' is d.dummy) dummy
-                 from dual d"""
-        await cursor.execute(sql)
-        async for r in cursor:
-            print(r)
-
-        # Using JSON_ARRAYAGG to extract a whole relational table as JSON
-
-        sql = """select json_arrayagg(
-                            json_object('key' is c.id,
-                                        'name' is c.json_data)
-                            returning clob)
-                 from CustomersAsJson c"""
-        await cursor.execute(sql, fetch_lobs=False)
-        async for r in cursor:
-            print(r)
-
-
-asyncio.run(main())
diff --git a/samples/json_duality.py b/samples/json_duality.py
deleted file mode 100644
index 991c8eab..00000000
--- a/samples/json_duality.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_duality.py
-#
-# Demonstrates Oracle Database version 23 JSON-Relational Duality Views.
-#
-# Also see soda_json_duality.py
-#
-# Reference: https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-# -----------------------------------------------------------------------------
-
-import json
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# this script only works with Oracle Database 23.5 or later
-if sample_env.get_server_version() < (23, 5):
-    sys.exit("This example requires Oracle Database 23.5 or later")
-
-if not connection.thin:
-    client_version = oracledb.clientversion()[0]
-
-with connection.cursor() as cursor:
-
-    # Create a JSON-Relational Duality View over the SampleJRDVAuthorTab and
-    # SampleJRDVBookTab tables
-    sql = """
-          create or replace json relational duality view BookDV as
-          SampleJRDVBookTab @insert @update @delete
-          {
-              _id: BookId,
-              book_title: BookTitle,
-              author: SampleJRDVAuthorTab @insert @update
-              {
-                  author_id: AuthorId,
-                  author_name: AuthorName
-              }
-          }"""
-    cursor.execute(sql)
-
-with connection.cursor() as cursor:
-
-    # Insert a new book and author into the Duality View and show the resulting
-    # new records in the relational tables
-    data = dict(
-        _id=101,
-        book_title="Cooking at Home",
-        author=dict(author_id=201, author_name="Dave Smith"),
-    )
-    inssql = "insert into BookDV values (:1)"
-    if connection.thin or client_version >= 21:
-        # Take advantage of direct binding
-        cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-        cursor.execute(inssql, [data])
-    else:
-        # Insert the data as a JSON string
-        cursor.execute(inssql, [json.dumps(data)])
-
-    print("Authors in the relational table:")
-    for row in cursor.execute(
-        "select * from SampleJRDVAuthorTab order by AuthorId"
-    ):
-        print(row)
-
-    print("\nBooks in the relational table:")
-    for row in cursor.execute(
-        "select * from SampleJRDVBookTab order by BookId"
-    ):
-        print(row)
-
-# Select from the duality view
-
-with connection.cursor() as cursor:
-
-    print("\nDuality view query for an author's books:")
-    sql = """select b.data.book_title, b.data.author.author_name
-             from BookDV b
-             where b.data.author.author_id = :1"""
-    for r in cursor.execute(sql, [1]):
-        print(r)
-
-    print("\nDuality view query of all records:")
-    sql = """select data from BookDV"""
-    if connection.thin or client_version >= 21:
-        for (j,) in cursor.execute(sql):
-            print(j)
-    else:
-        for (j,) in cursor.execute(sql):
-            print(json.loads(j.read()))
diff --git a/samples/json_duality_async.py b/samples/json_duality_async.py
deleted file mode 100644
index 3755fc5f..00000000
--- a/samples/json_duality_async.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# json_duality_async.py
-#
-# An asynchronous version of json_duality.py
-#
-# Demonstrates Oracle Database version 23 JSON-Relational Duality Views.
-#
-# Reference: https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=ADJSN
-# -----------------------------------------------------------------------------
-
-import asyncio
-import sys
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # this script only works with Oracle Database 23.5 or later
-    if sample_env.get_server_version() < (23, 5):
-        sys.exit("This example requires Oracle Database 23.5 or later")
-
-    with connection.cursor() as cursor:
-
-        # Create a JSON-Relational Duality View over the SampleJRDVAuthorTab
-        # and SampleJRDVBookTab tables
-        sql = """
-              create or replace json relational duality view BookDV as
-              SampleJRDVBookTab @insert @update @delete
-              {
-                  _id: BookId,
-                  book_title: BookTitle,
-                  author: SampleJRDVAuthorTab @insert @update
-                  {
-                      author_id: AuthorId,
-                      author_name: AuthorName
-                  }
-              }"""
-        await cursor.execute(sql)
-
-    with connection.cursor() as cursor:
-
-        # Insert a new book and author into the Duality View and show the
-        # resulting new records in the relational tables
-        data = dict(
-            _id=101,
-            book_title="Cooking at Home",
-            author=dict(author_id=201, author_name="Dave Smith"),
-        )
-        inssql = "insert into BookDV values (:1)"
-        cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-        await cursor.execute(inssql, [data])
-
-        print("Authors in the relational table:")
-        await cursor.execute(
-            "select * from SampleJRDVAuthorTab order by AuthorId"
-        )
-        async for row in cursor:
-            print(row)
-
-        print("\nBooks in the relational table:")
-        await cursor.execute("select * from SampleJRDVBookTab order by BookId")
-        async for row in cursor:
-            print(row)
-
-    # Select from the duality view
-
-    with connection.cursor() as cursor:
-
-        print("\nDuality view query for an author's books:")
-        sql = """select b.data.book_title, b.data.author.author_name
-                 from BookDV b
-                 where b.data.author.author_id = :1"""
-        await cursor.execute(sql, [1])
-        async for r in cursor:
-            print(r)
-
-        print("\nDuality view query of all records:")
-        sql = """select data from BookDV"""
-        await cursor.execute(sql)
-        async for (j,) in cursor:
-            print(j)
-
-
-asyncio.run(main())
diff --git a/samples/last_rowid.py b/samples/last_rowid.py
deleted file mode 100644
index f536a795..00000000
--- a/samples/last_rowid.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# last_rowid.py
-#
-# Demonstrates the use of the cursor.lastrowid attribute.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # insert a couple of rows and retain the rowid of each
-    row1 = [1, "First"]
-    row2 = [2, "Second"]
-
-    cursor.execute("insert into mytab (id, data) values (:1, :2)", row1)
-    rowid1 = cursor.lastrowid
-    print("Row 1:", row1)
-    print("Rowid 1:", rowid1)
-    print()
-
-    cursor.execute("insert into mytab (id, data) values (:1, :2)", row2)
-    rowid2 = cursor.lastrowid
-    print("Row 2:", row2)
-    print("Rowid 2:", rowid2)
-    print()
-
-    # the row can be fetched with the rowid that was returned
-    cursor.execute("select id, data from mytab where rowid = :1", [rowid1])
-    print("Row 1:", cursor.fetchone())
-    cursor.execute("select id, data from mytab where rowid = :1", [rowid2])
-    print("Row 2:", cursor.fetchone())
-    print()
-
-    # updating multiple rows only returns the rowid of the last updated row
-    cursor.execute("update mytab set data = data || ' (Modified)'")
-    cursor.execute(
-        "select id, data from mytab where rowid = :1", [cursor.lastrowid]
-    )
-    print("Last updated row:", cursor.fetchone())
-
-    # deleting multiple rows only returns the rowid of the last deleted row
-    cursor.execute("delete from mytab")
-    print("Rowid of last deleted row:", cursor.lastrowid)
-
-    # deleting no rows results in a value of None
-    cursor.execute("delete from mytab")
-    print("Rowid when no rows are deleted:", cursor.lastrowid)
-
-    # Don't commit - this lets us run the demo multiple times
-    # connection.commit()
diff --git a/samples/last_rowid_async.py b/samples/last_rowid_async.py
deleted file mode 100644
index 20c8e472..00000000
--- a/samples/last_rowid_async.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# last_rowid_async.py
-#
-# An asynchronous version of last_rowid.py
-#
-# Demonstrates the use of the cursor.lastrowid attribute.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # insert a couple of rows and retain the rowid of each
-        row1 = [1, "First"]
-        row2 = [2, "Second"]
-
-        await cursor.execute(
-            "insert into mytab (id, data) values (:1, :2)", row1
-        )
-        rowid1 = cursor.lastrowid
-        print("Row 1:", row1)
-        print("Rowid 1:", rowid1)
-        print()
-
-        await cursor.execute(
-            "insert into mytab (id, data) values (:1, :2)", row2
-        )
-        rowid2 = cursor.lastrowid
-        print("Row 2:", row2)
-        print("Rowid 2:", rowid2)
-        print()
-
-        # the row can be fetched with the rowid that was returned
-        await cursor.execute(
-            "select id, data from mytab where rowid = :1", [rowid1]
-        )
-        print("Row 1:", await cursor.fetchone())
-        await cursor.execute(
-            "select id, data from mytab where rowid = :1", [rowid2]
-        )
-        print("Row 2:", await cursor.fetchone())
-        print()
-
-        # updating multiple rows only returns the rowid of the last updated row
-        await cursor.execute("update mytab set data = data || ' (Modified)'")
-        await cursor.execute(
-            "select id, data from mytab where rowid = :1", [cursor.lastrowid]
-        )
-        print("Last updated row:", await cursor.fetchone())
-
-        # deleting multiple rows only returns the rowid of the last deleted row
-        await cursor.execute("delete from mytab")
-        print("Rowid of last deleted row:", cursor.lastrowid)
-
-        # deleting no rows results in a value of None
-        await cursor.execute("delete from mytab")
-        print("Rowid when no rows are deleted:", cursor.lastrowid)
-
-        # Don't commit - this lets us run the demo multiple times
-        # await connection.commit()
-
-
-asyncio.run(main())
diff --git a/samples/load_csv.py b/samples/load_csv.py
deleted file mode 100644
index fc95df33..00000000
--- a/samples/load_csv.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# load_csv.py
-#
-# A sample showing how to load CSV data using two methods:
-#   - executemany() of data read with Python's CSV module
-#   - executemany() of data read into dataframes by PyArrow's CSV module
-#
-# To run the second example, install pyarrow:
-#   python -m pip install pyarrow --upgrade
-# -----------------------------------------------------------------------------
-
-import csv
-import os
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# CSV file. This sample file has both valid rows and some rows with data too
-# large to insert.
-FILE_NAME = os.path.join("data", "load_csv.csv")
-
-# Adjust the number of rows to be inserted in each iteration to meet your
-# memory and performance requirements. Typically this is a large-ish value to
-# reduce the number of calls to executemany(). For this demo with a small CSV
-# file, a small batch size is used to show the looping behavior of the code.
-BATCH_SIZE = 19
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-# Loading using executemany() which uses Oracle Database's "Array DML" support
-
-print("\nLoading with executemany() using Python's CSV module")
-
-
-def process_batch_em(cursor, batch_number, data):
-    print("Processing batch", batch_number + 1)
-    cursor.executemany(sql, data, batcherrors=True)
-    for error in cursor.getbatcherrors():
-        line_num = (batch_number * BATCH_SIZE) + error.offset + 1
-        print("Error", error.message, "at line", line_num)
-
-
-with connection.cursor() as cursor:
-    # Clean up the table for demonstration purposes
-    cursor.execute("truncate table LoadCsvTab")
-
-    # Predefine the memory areas to match the table definition.
-    # This can improve performance by avoiding memory reallocations.
-    # Here, one parameter is passed for each of the columns.
-    # "None" is used for the ID column, since the size of NUMBER isn't
-    # variable.  The "25" matches the maximum expected data size for the
-    # NAME column
-    cursor.setinputsizes(None, 25)
-
-    # Loop over the data and insert it in batches
-    with open(FILE_NAME, "r") as csv_file:
-        csv_reader = csv.reader(csv_file, delimiter=",")
-        sql = "insert into LoadCsvTab (id, name) values (:1, :2)"
-        data = []
-        batch_number = 0
-        for line in csv_reader:
-            data.append((line[0], line[1]))
-            if len(data) % BATCH_SIZE == 0:
-                process_batch_em(cursor, batch_number, data)
-                data = []
-                batch_number += 1
-        if data:
-            process_batch_em(cursor, batch_number, data)
-
-        # In a production system you might choose to fix any invalid rows,
-        # re-insert them, and then commit.  Or you could rollback everything.
-        # In this sample we simply commit and ignore the invalid rows that
-        # couldn't be inserted.
-        connection.commit()
-
-    # Show how many rows were inserted
-    cursor.execute("select count(*) from LoadCsvTab")
-    (r,) = cursor.fetchone()
-    print(f"\n{r} valid rows were inserted")
-
-# -----------------------------------------------------------------------------
-# Loading with PyArrow's CSV package using executemany()
-#
-# Using PyArrow to read into a dataframe for insertion can be faster than using
-# the Python CSV module.
-
-try:
-    import pyarrow.csv
-except Exception:
-    print("\nTo use pyarrow dataframes, install pyarrow.")
-    sys.exit()
-
-print("\nLoading with executemany() using PyArrow's CSV module")
-
-with connection.cursor() as cursor:
-    # Clean up the table for demonstration purposes
-    cursor.execute("truncate table LoadCsvTab")
-
-    # PyArrow uses a byte size for batching. For this demo, a size is
-    # semi-arbitrarily set to give similar behavior to other loading examples
-    read_options = pyarrow.csv.ReadOptions(
-        column_names=["id", "name"], block_size=BATCH_SIZE * 17
-    )
-
-    csv_reader = pyarrow.csv.open_csv(FILE_NAME, read_options=read_options)
-    batch_number = 0
-    record_start = 0
-    for df in csv_reader:
-        if df is None:
-            break
-        batch_number += 1
-        print("Processing batch", batch_number)
-        cursor.executemany(sql, df, batcherrors=True)
-        for error in cursor.getbatcherrors():
-            line_num = record_start + error.offset + 1
-            print("Error", error.message, "at line", line_num)
-        record_start += len(df)
-
-    # Show how many rows were inserted
-    cursor.execute("select count(*) from LoadCsvTab")
-    (r,) = cursor.fetchone()
-    print(f"\n{r} rows were inserted")
diff --git a/samples/load_csv_async.py b/samples/load_csv_async.py
deleted file mode 100644
index 3a5be68b..00000000
--- a/samples/load_csv_async.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# load_csv_async.py
-#
-# An asynchronous version of load_csv.py
-#
-# A sample showing how to load CSV data.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import csv
-import os
-
-import oracledb
-import sample_env
-
-# CSV file.  This sample file has both valid rows and some rows with data too
-# large to insert.
-FILE_NAME = os.path.join("data", "load_csv.csv")
-
-# Adjust the number of rows to be inserted in each iteration to meet your
-# memory and performance requirements.  Typically this is a large-ish value to
-# reduce the number of calls to executemany() to a reasonable size.  For this
-# demo with a small CSV file a smaller number is used to show the looping
-# behavior of the code.
-BATCH_SIZE = 19
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    async def process_batch(batch_number, cursor, data):
-        print("processing batch", batch_number + 1)
-        await cursor.executemany(sql, data, batcherrors=True)
-        for error in cursor.getbatcherrors():
-            line_num = (batch_number * BATCH_SIZE) + error.offset + 1
-            print("Error", error.message, "at line", line_num)
-
-    with connection.cursor() as cursor:
-        # Clean up the table for demonstration purposes
-        await cursor.execute("truncate table LoadCsvTab")
-
-        # Predefine the memory areas to match the table definition.
-        # This can improve performance by avoiding memory reallocations.
-        # Here, one parameter is passed for each of the columns.
-        # "None" is used for the ID column, since the size of NUMBER isn't
-        # variable.  The "25" matches the maximum expected data size for the
-        # NAME column
-        cursor.setinputsizes(None, 25)
-
-        # Loop over the data and insert it in batches
-        with open(FILE_NAME, "r") as csv_file:
-            csv_reader = csv.reader(csv_file, delimiter=",")
-            sql = "insert into LoadCsvTab (id, name) values (:1, :2)"
-            data = []
-            batch_number = 0
-            for line in csv_reader:
-                data.append((line[0], line[1]))
-                if len(data) % BATCH_SIZE == 0:
-                    await process_batch(batch_number, cursor, data)
-                    data = []
-                    batch_number += 1
-            if data:
-                await process_batch(batch_number, cursor, data)
-
-            # In a production system you might choose to fix any invalid rows,
-            # re-insert them, and then commit.  Or you could rollback
-            # everything.  In this sample we simply commit and ignore the
-            # invalid rows that couldn't be inserted.
-            await connection.commit()
-
-
-asyncio.run(main())
diff --git a/samples/load_csv_direct_path.py b/samples/load_csv_direct_path.py
deleted file mode 100644
index ee1e3c2b..00000000
--- a/samples/load_csv_direct_path.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# load_csv_direct_path.py
-#
-# A sample showing how to load CSV data using two methods:
-#   - Direct Path Load of data read with Python's CSV module
-#   - Direct Path Load of data from PyArrow dataframes
-#
-# This is related to load_csv.py but the CSV data file for Direct Path Load can
-# only contain valid data.
-#
-# Direct Path Loads can be faster for very large data sets than the
-# executemany() code shown in load_csv.py.
-#
-# To run the second example, install pyarrow:
-#   python -m pip install pyarrow --upgrade
-# -----------------------------------------------------------------------------
-
-import csv
-import os
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# CSV file. This sample file has both valid rows
-FILE_NAME = os.path.join("data", "load_csv_direct_path.csv")
-
-# Adjust the number of rows to be inserted in each iteration to meet your
-# memory and performance requirements. Typically this is a large-ish value to
-# reduce the number of calls to executemany() or direct_path_load(). For this
-# demo with a small CSV file, a small batch size is used to show the looping
-# behavior of the code.
-BATCH_SIZE = 19
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-# Loading with Python's CSV package using Direct Path Loads
-
-print("\nDirect Path Load using Python's CSV module")
-
-
-def process_batch_dpl(connection, batch_number, data):
-    print("Processing batch", batch_number + 1)
-    connection.direct_path_load(
-        schema_name=sample_env.get_main_user(),
-        table_name="LoadCsvTab",
-        column_names=["id", "name"],
-        data=data,
-    )
-
-
-with connection.cursor() as cursor:
-    # Clean up the table for demonstration purposes
-    cursor.execute("truncate table LoadCsvTab")
-
-# Loop over the data and insert it in batches
-with open(FILE_NAME, "r") as csv_file:
-    csv_reader = csv.reader(csv_file, delimiter=",")
-    data = []
-    batch_number = 0
-    for line in csv_reader:
-        data.append((float(line[0]), line[1]))
-        if len(data) % BATCH_SIZE == 0:
-            process_batch_dpl(connection, batch_number, data)
-            data = []
-            batch_number += 1
-    if data:
-        process_batch_dpl(connection, batch_number, data)
-
-# Show how many rows were inserted
-with connection.cursor() as cursor:
-    cursor.execute("select count(*) from LoadCsvTab")
-    (r,) = cursor.fetchone()
-    print(f"\n{r} rows were inserted")
-
-# -----------------------------------------------------------------------------
-# Loading with PyArrow's CSV package using Direct Path Loads
-#
-# Using Direct Path Load in conjunction with PyArrow's CSV package can be the
-# fastest way to load huge datasets.
-
-try:
-    import pyarrow.csv
-except Exception:
-    print("\nTo use pyarrow dataframes, install pyarrow.")
-    sys.exit()
-
-print("\nDirect Path Load using PyArrow's CSV module")
-
-with connection.cursor() as cursor:
-    # Clean up the table for demonstration purposes
-    cursor.execute("truncate table LoadCsvTab")
-
-# PyArrow uses a byte size for batching. For this demo, a size is
-# semi-arbitrarily set to give similar behavior to other loading examples
-read_options = pyarrow.csv.ReadOptions(
-    column_names=["id", "name"], block_size=BATCH_SIZE * 18
-)
-
-csv_reader = pyarrow.csv.open_csv(FILE_NAME, read_options=read_options)
-batch_number = 0
-for df in csv_reader:
-    if df is None:
-        break
-    batch_number += 1
-    print("Processing batch", batch_number)
-    connection.direct_path_load(
-        schema_name=sample_env.get_main_user(),
-        table_name="LoadCsvTab",
-        column_names=["id", "name"],
-        data=df,
-    )
-
-with connection.cursor() as cursor:
-
-    # Show how many rows were inserted
-    cursor.execute("select count(*) from LoadCsvTab")
-    (r,) = cursor.fetchone()
-    print(f"\n{r} rows were inserted")
-
-    # Direct Path Load always commits so clean up the table for demonstration
-    # purposes
-    cursor.execute("truncate table LoadCsvTab")
diff --git a/samples/multi_consumer_aq.py b/samples/multi_consumer_aq.py
deleted file mode 100644
index b4e91289..00000000
--- a/samples/multi_consumer_aq.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# multi_consumer_aq.py
-#
-# Demonstrates how to use multi-consumer advanced queuing. It makes use of a
-# RAW queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-QUEUE_NAME = "DEMO_RAW_QUEUE_MULTI"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth and final message",
-]
-
-# connect to database
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# create a queue
-queue = connection.queue(QUEUE_NAME)
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-# enqueue a few messages
-print("Enqueuing messages...")
-for data in PAYLOAD_DATA:
-    print(data)
-    queue.enqone(connection.msgproperties(payload=data))
-connection.commit()
-print()
-
-# dequeue the messages for consumer A
-print("Dequeuing the messages for consumer A...")
-queue.deqoptions.consumername = "SUBSCRIBER_A"
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.decode())
-connection.commit()
-print()
-
-# dequeue the message for consumer B
-print("Dequeuing the messages for consumer B...")
-queue.deqoptions.consumername = "SUBSCRIBER_B"
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.decode())
-connection.commit()
-
-print("\nDone.")
diff --git a/samples/multi_consumer_aq_async.py b/samples/multi_consumer_aq_async.py
deleted file mode 100644
index 12c405e9..00000000
--- a/samples/multi_consumer_aq_async.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# multi_consumer_aq.py
-#
-# Demonstrates how to use multi-consumer advanced queuing. It makes use of a
-# RAW queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-QUEUE_NAME = "DEMO_RAW_QUEUE_MULTI"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth and final message",
-]
-
-
-async def main():
-
-    # connect to database
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-    )
-
-    # create a queue
-    queue = connection.queue(QUEUE_NAME)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-    # enqueue a few messages
-    print("Enqueuing messages...")
-    for data in PAYLOAD_DATA:
-        print(data)
-        await queue.enqone(connection.msgproperties(payload=data))
-    await connection.commit()
-    print()
-
-    # dequeue the messages for consumer A
-    print("Dequeuing the messages for consumer A...")
-    queue.deqoptions.consumername = "SUBSCRIBER_A"
-    while True:
-        props = await queue.deqone()
-        if not props:
-            break
-        print(props.payload.decode())
-    await connection.commit()
-    print()
-
-    # dequeue the message for consumer B
-    print("Dequeuing the messages for consumer B...")
-    queue.deqoptions.consumername = "SUBSCRIBER_B"
-    while True:
-        props = await queue.deqone()
-        if not props:
-            break
-        print(props.payload.decode())
-    await connection.commit()
-    print("\nDone.")
-
-
-asyncio.run(main())
diff --git a/samples/notebooks/1-Connection.ipynb b/samples/notebooks/1-Connection.ipynb
deleted file mode 100644
index a9c0853b..00000000
--- a/samples/notebooks/1-Connection.ipynb
+++ /dev/null
@@ -1,405 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# python-oracledb Introduction"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "This Jupyter Notebook shows how to use [python-oracledb](https://oracle.github.io/python-oracledb/) in its default 'Thin' mode that connects directly to Oracle Database."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# python-oracledb Connection"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Architecture\n",
-    "\n",
-    "Documentation reference link: [Introduction to python-oracledb](https://python-oracledb.readthedocs.io/en/latest/user_guide/introduction.html)\n",
-    "\n",
-    "![Architecture](images/architecture-thin.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Installation\n",
-    "\n",
-    "Documentation reference link: [python-oracledb Installation](https://python-oracledb.readthedocs.io/en/latest/user_guide/installation.html)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### **Install python-oracledb**\n",
-    "\n",
-    "Install with a command like one of the following:\n",
-    "\n",
-    "    $ python -m pip install oracledb --upgrade\n",
-    "    $ python -m pip install oracledb --upgrade --user\n",
-    "    $ python -m pip install oracledb --upgrade --user --proxy=http://proxy.example.com:80\n",
-    "\n",
-    "In some environments you may need to use the program name `python3` instead of `python`."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To use python-oracledb, your application code must import the module:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import oracledb"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Connecting to a Database\n",
-    "\n",
-    "Connections are used for executing SQL and PL/SQL in an Oracle Database.\n",
-    "\n",
-    "Documentation reference link: [Connecting to Oracle Database](https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Credentials\n",
-    "un = \"pythondemo\"\n",
-    "pw = \"welcome\""
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Instead of hard coding the password in your applications, you could prompt for a value, pass it as an environment variable, or use Oracle \"external authentication\".\n",
-    "\n",
-    "To use environment variables, or default values (if the environment variables are not set):"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Easy Connect Syntax: \"hostname/servicename\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [],
-   "source": [
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "print(connection)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Oracle's [Easy Connect](https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-8C85D289-6AF3-41BC-848B-BF39D32648BA) syntax allows many optional settings, for example:\n",
-    "\n",
-    "    cs = \"tcps://my.cloud.com:1522/orclpdb?connect_timeout=4&expire_time=10\"\n",
-    "\n",
-    "See the Oracle Database Easy Connect [technical brief](https://download.oracle.com/ocomdocs/global/Oracle-Net-Easy-Connect-Plus.pdf) for other options."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Oracle Network and Oracle Client Configuration Files\n",
-    "\n",
-    "Instead of the Easy Connect syntax, a TNS Alias from a `tnsnames.ora` file can be used.  This file maps connect descriptors to TNS aliases. \n",
-    "\n",
-    "Documentation reference link: [Optional configuration files](https://python-oracledb.readthedocs.io/en/latest/user_guide/initialization.html#optional-oracle-net-configuration-files)"
-   ]
-  },
-  {
-   "cell_type": "raw",
-   "metadata": {},
-   "source": [
-    "# tnsnames.ora in /opt/oracle/configdir\n",
-    "\n",
-    "highperfdb = (description= \n",
-    "               (retry_count=5)(retry_delay=3)\n",
-    "               (address=(protocol=tcps)(port=1522)(host=xxxxxx.oraclecloud.com))\n",
-    "               (connect_data=(service_name=yyyyyyyyyy.oraclecloud.com))\n",
-    "               (security=(ssl_server_cert_dn=\n",
-    "                 \"CN=zzzzzzzz.oraclecloud.com,OU=Oracle ADB,O=Oracle Corporation,L=Redwood City,ST=California,C=US\")))\n",
-    "                 "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Your Python code could use the TNS Alias as the connection `dsn` value:\n",
-    "\n",
-    "    connection = oracledb.connect(user=un, password=pw, dsn=\"highperfdb\", config_dir=\"/opt/oracle/configdir\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Connection Types"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Standalone Connections\n",
-    "\n",
-    "Standalone connections are simple to create. They are suitable for single-user applications that do not run very long."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Stand-alone Connection](images/standalone-connection.png)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Stand-alone Connection\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "print(connection)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Pooled Connections"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "#### Pools are highly recommended if you have:\n",
-    "- A lot of connections that will be used for short periods of time\n",
-    "- Or a small number of connections that are idle for long periods of time\n",
-    "\n",
-    "#### Pool advantages\n",
-    "Try to architect your applications to use connection pools to take advantage of:\n",
-    "\n",
-    "- Reduced cost of setting up and tearing down connections\n",
-    "- Dead connection detection and automatic re-establishment"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Pooled connection](images/pooled-connection.png)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Pooled Connections\n",
-    "\n",
-    "# Call once during application initization\n",
-    "pool = oracledb.create_pool(user=un, password=pw, dsn=cs,\n",
-    "                            min=1, max=10, increment=1)\n",
-    "\n",
-    "# Get a connection when needed in the application body\n",
-    "with pool.acquire() as connection:\n",
-    "    # do_something_useful(connection)\n",
-    "    print(f\"Got a connection to Oracle Database {connection.version}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "**Tip**: Use a fixed size pool `min` = `max` and `increment = 0`.  See [Guideline for Preventing Connection Storms: Use Static Pools](https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-7DFBA826-7CC0-4D16-B19C-31D168069B54)."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Because of the high availability benefits such as automatic reconnection, using a connection pool can even be helpful for single-user applications that infrequently do database operations."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Closing Connections"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Close connections when not needed.  This is important for pooled connections. With a connection pool, closing the connection releases it back to the pool for later reuse.\n",
-    "\n",
-    "To avoid resource closing order issues, you should use `with` or let resources be closed at end of scope:\n",
-    "\n",
-    "    with pool.acquire() as connection:\n",
-    "        do_something(connection)\n",
-    "\n",
-    "Or you can explicitly close connections:\n",
-    "\n",
-    "    connection.close()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Database Resident Connection Pooling\n",
-    "\n",
-    "**Connection pooling on the database tier**\n",
-    "\n",
-    "Documentation reference link: [Database Resident Connection Pooling (DRCP)](https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#database-resident-connection-pooling-drcp)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Dedicated server processes are the default in the database, but DRCP is an alternative when the database server is short of memory."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![DRCP architecture](images/drcp-architecture.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Use DRCP if and only if:\n",
-    "- The database computer doesn't have enough memory for all the server processes for all open application connections\n",
-    "- When you have thousands of users which need access to a database server session for a short period of time\n",
-    "- Applications mostly use same database credentials, and have identical session settings\n",
-    "\n",
-    "Using DRCP in conjunction with a python-oracledb connection pool is recommended."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "#### Database memory usage example with 5000 application users and a DRCP pool of size 100\n",
-    "![DRCP memory comparison](images/drcp-comparison.png)\n",
-    "The numbers are examples."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "In Python, the connect string must request a pooled server, for example with ':pooled'.  For best efficiency to allow database server session re-use, set a connection class and use the purity 'PURITY_SELF'.\n",
-    "\n",
-    "    pool = oracledb.create_pool(user=un, password=pw, dsn=\"dbhost.example.com/orclpdb:pooled\",\n",
-    "                                cclass=\"MYCLASS\", purity=oracledb.PURITY_SELF)\n",
-    "\n",
-    "    connection = pool.acquire()\n",
-    "\n",
-    "Don't forget to start the pool first!:\n",
-    "\n",
-    "    SQL> execute dbms_connection_pool.start_pool()\n",
-    "\n",
-    "Note DRCP is pre-enabled on Oracle Autonomous Database."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/samples/notebooks/10-Vectors.ipynb b/samples/notebooks/10-Vectors.ipynb
deleted file mode 100644
index c2cd6200..00000000
--- a/samples/notebooks/10-Vectors.ipynb
+++ /dev/null
@@ -1,327 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "1219343f-add9-41c0-8ede-e626a99baa3f",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c8683213-8402-4b0b-9775-8eab75292a7e",
-   "metadata": {},
-   "source": [
-    "# Working with the VECTOR data type\n",
-    "\n",
-    "This section requires Oracle AI Database 26ai\n",
-    "\n",
-    "Documentation reference link: [Using VECTOR Data](https://python-oracledb.readthedocs.io/en/latest/user_guide/vector_data_type.html).\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b2e8ee24-171a-412b-be64-b0755979ee02",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import array\n",
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "if tuple(int(s) for s in connection.version.split(\".\"))[:2] < (23, 7):\n",
-    "    print(\"!! This notebook requires Oracle Database 23.7 or later !!\")\n",
-    "\n",
-    "cursor = connection.cursor()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ca3d046c-86d9-4743-a238-826ed579659d",
-   "metadata": {},
-   "source": [
-    "## The VECTOR data type\n",
-    "\n",
-    "Oracle AI Database 26ai introduces a VECTOR data type and Unified Hybrid Vector Search. You can blend vectors with relational, text, JSON, graph, and spatial predicates in a single query to retrieve documents, images, audio, video, and table rows together. \n",
-    "\n",
-    "Each VECTOR is represented as a number of vectors and a data format. For example this table holds rows where the first column contains three vectors of 32-bit numbers, the second column holds three vectors of 64-bit numbers, and the last column holds three vectors of 8-bit integers:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3a38f25b-b72c-4dc2-98ea-de5f1797f988",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"drop table if exists vtab\")\n",
-    "\n",
-    "cursor.execute(\"\"\"create table vtab (\n",
-    "                               v32  vector(3, float32),\n",
-    "                               v64  vector(3, float64),\n",
-    "                               v8   vector(3, int8))\"\"\"\n",
-    ")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f5f57b50-f8eb-40a6-a247-8179f12bdbc9",
-   "metadata": {},
-   "source": [
-    "The Python `array.array()` class is used to represent vectors:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "acf55243-b0c3-464a-a5e2-bc952484fc55",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "vector_data_32 = array.array(\"f\", [2.625, 2.5, 2.0])\n",
-    "vector_data_64 = array.array(\"d\", [22.25, 22.75, 22.5])\n",
-    "vector_data_8 = array.array(\"b\", [4, 5, 6])"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "697d5208-af6a-49df-b9e2-c1df4eb9ffbf",
-   "metadata": {},
-   "source": [
-    "Insert the data:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6f68aa51-b1de-412c-a8c4-1dd891b52b7c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\n",
-    "    \"insert into vtab (v32, v64, v8) values (:1, :2, :3)\", \n",
-    "    [vector_data_32, vector_data_64, vector_data_8]\n",
-    ")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "3886080a-f9cd-4c86-8303-2a2f36a43974",
-   "metadata": {},
-   "source": [
-    "Verify it was inserted correctly:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "189250d7-ae5a-4297-a26b-4546701f4c14",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for row in cursor.execute(\"select v32, v64, v8 from vtab\"):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "859c184a-c470-4c7a-ac2b-7a41b4e8504e",
-   "metadata": {},
-   "source": [
-    "## Binary Vectors\n",
-    "\n",
-    "Documentation reference link: [Using BINARY Vectors](https://python-oracledb.readthedocs.io/en/latest/user_guide/vector_data_type.html#using-binary-vectors).\n",
-    "\n",
-    "The BINARY format for VECTOR is an efficient way to store 0 and 1 values.\n",
-    "\n",
-    "You must define the number of dimensions as a multiple of 8. Rows in the `vbin` column of this table hold 24 binary values:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "079ffd5f-9705-4720-a473-0ccbc12431ee",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"drop table if exists vtab\")\n",
-    "\n",
-    "cursor.execute(\"create table vtab (vbin vector(24, binary))\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "0ca087a2-6da1-4da0-b2a0-15abcd7db795",
-   "metadata": {},
-   "source": [
-    "Binary vectors are represented as 8-bit unsigned integers so the 24 bit values are inserted as three 8-bit unsigned integers:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f0dc8d51-ea14-4d5f-b287-225b19760624",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "vector_data_bin = array.array(\"B\", [40, 15, 255])\n",
-    "\n",
-    "cursor.execute(\"insert into vtab (vbin) values (:1)\", [vector_data_bin])"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "dcaaaba8-f2ac-4738-93ee-fc78c1db3266",
-   "metadata": {},
-   "source": [
-    "Verify it was inserted correctly:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c83f1260-4e21-4ac0-96bb-ef6a2239344d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for row in cursor.execute(\"select vbin from vtab\"):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "74325ada-531e-4584-918a-8b339642fd5c",
-   "metadata": {},
-   "source": [
-    "## Sparse Vectors\n",
-    "\n",
-    "Documentation reference link: [Using SPARSE Vectors](https://python-oracledb.readthedocs.io/en/latest/user_guide/vector_data_type.html#using-sparse-vectors).\n",
-    "\n",
-    "Vectors can be declared as SPARSE, which saves space when most values are zero:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3c18d6e2-0268-4134-9b4b-558964352d96",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"drop table if exists vtab\")\n",
-    "\n",
-    "cursor.execute(\"create table vtab (v64sparse vector(30, float64, sparse))\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ee5b7de1-ba93-4796-ab9e-563b4088aaf3",
-   "metadata": {},
-   "source": [
-    "Sparse vector data is represented by a maximum length of the vector, and two arrays. The first array contains data indexes, and the second array contains the non-zero data values corresponding to the indexes. In python-oracledb, a SparseVector class encapsulates this information:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b130da07-4f12-4924-a867-e19d791f8690",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "vector_data_sparse64 = oracledb.SparseVector(30, [3, 10, 12], array.array(\"d\", [2.5, 2.5, 1.0]))"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "225f7fd0-015e-4883-86fc-d4cb50ddb0fa",
-   "metadata": {},
-   "source": [
-    "Insertion is simply a matter of binding the vector:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e896fa56-c138-46ac-950d-6625ac927d7a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"insert into vtab (v64sparse) values (:1)\", [vector_data_sparse64])"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c2b6be65-5dd1-468b-b8f4-5a4570395f6e",
-   "metadata": {},
-   "source": [
-    "Verify it was inserted correctly:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3d43698d-326c-4432-bb61-0d852f3287cf",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for row in cursor.execute(\"select v64sparse from vtab\"):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "0549c1a1-6729-43b9-bd44-1a092c92bec5",
-   "metadata": {},
-   "source": [
-    "## VECTOR Query Metadata\n",
-    "\n",
-    "Query metadata can be used to describe vector columns:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e03f3dbb-2b3c-403d-aa8b-6af75f46767f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"select v64sparse from vtab\")\n",
-    "desc = cursor.description[0]\n",
-    "\n",
-    "print(desc.vector_format, desc.vector_dimensions, desc.vector_is_sparse)"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/samples/notebooks/2-Queries.ipynb b/samples/notebooks/2-Queries.ipynb
deleted file mode 100644
index a7572da3..00000000
--- a/samples/notebooks/2-Queries.ipynb
+++ /dev/null
@@ -1,556 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Queries - SELECT and WITH Statements"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "\n",
-    "adminun = os.environ.get(\"PYO_SAMPLES_ADMIN_USER\", \"system\")\n",
-    "adminpw = os.environ.get(\"PYO_SAMPLES_ADMIN_PASSWORD\", \"oracle\")\n",
-    "\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "systemconnection = oracledb.connect(user=adminun, password=adminpw, dsn=cs)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Fetching Rows\n",
-    "\n",
-    "Documentation reference link: [Fetch Methods](https://python-oracledb.readthedocs.io/en/latest/user_guide/sql_execution.html#fetch-methods)\n",
-    "\n",
-    "Fetching single rows:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    \n",
-    "    cursor.execute(\"select * from SampleQueryTab where id = :1\", [6])\n",
-    "    \n",
-    "    row = cursor.fetchone()\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Fetching all rows from a small table of not too big size:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "       \n",
-    "    cursor.execute(\"select * from SampleQueryTab\")\n",
-    "    \n",
-    "    rows = cursor.fetchall()\n",
-    "    \n",
-    "    for r in rows:\n",
-    "        print(r)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Fetching all rows from a big table:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    " \n",
-    "    cursor.execute(\"select * from SampleQueryTab\")  # pretend this is big\n",
-    "    \n",
-    "    while True:\n",
-    "        rows = cursor.fetchmany()  # get a batch rows (of size cursor.arraysize=100)\n",
-    "        for r in rows:\n",
-    "            print(r)\n",
-    "        if len(rows) < cursor.arraysize:\n",
-    "            break"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "A common idiom to use an iterator and process each row individually.  Internally python-oracledb will fetch from the database in batches controlled by tuning parameters shown in the next section:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    for row in cursor.execute(\"select * from SampleQueryTab\"):\n",
-    "        print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## A key tuning goal is to reduce \"round-trips\"\n",
-    "\n",
-    "\n",
-    "> \"A server round-trip is defined as the trip from the client to the server and back to the client.\"\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
-    "![Round-trip](images/roundtrip.png)\n",
-    "\n",
-    "Round-trips affect performance and system scalability.\n",
-    "\n",
-    "Make every round-trip useful:\n",
-    "\n",
-    "- fetch multiple rows at a time\n",
-    "- insert multiple rows at a time\n",
-    "- don't select more data than needed\n",
-    "- don't overuse commit or rollback"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Round-trip comparison - prefetchrows & arraysize\n",
-    "\n",
-    "Documentation reference link: [Tuning python-oracledb](https://python-oracledb.readthedocs.io/en/latest/user_guide/tuning.html)\n",
-    "\n",
-    "Regardless of which fetch method is used there are two tuning parameters that affect internal buffering of fetched rows. This alters the number of round-trips required to fetch all the query data from the database.  These parameters do not affect how, or when, rows are returned to the application itself.\n",
-    "\n",
-    "Here's a demo counting round-trips:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [],
-   "source": [
-    "def get_session_id(connection):\n",
-    "    sid, = connection.cursor().execute(\"SELECT sys_context('userenv', 'sid') FROM dual\").fetchone()\n",
-    "    return sid\n",
-    "\n",
-    "def get_round_trips(systemconnection, sid):\n",
-    "    sql = \"\"\"SELECT ss.value\n",
-    "             FROM v$sesstat ss, v$statname sn\n",
-    "             WHERE ss.sid = :sid\n",
-    "             AND ss.statistic# = sn.statistic#\n",
-    "             AND sn.name LIKE '%roundtrip%client%'\"\"\"  \n",
-    "    roundtrips, = systemconnection.cursor().execute(sql, [sid]).fetchone()\n",
-    "    return roundtrips\n",
-    "\n",
-    "sid = get_session_id(connection)\n",
-    "\n",
-    "def do_query(connection, numrows, prefetchrows, arraysize):\n",
-    "\n",
-    "    roundtrips = get_round_trips(systemconnection, sid)\n",
-    "\n",
-    "    with connection.cursor() as cursor:\n",
-    "        cursor.prefetchrows = prefetchrows\n",
-    "        cursor.arraysize    = arraysize\n",
-    "        cursor.execute(\"select * from all_objects where rownum <= :nr\", [numrows])\n",
-    "        rows = cursor.fetchall()\n",
-    "\n",
-    "    roundtrips = get_round_trips(systemconnection, sid) - roundtrips\n",
-    "\n",
-    "    print(\"Number of rows: {:5}, prefetchrows {:4}  arraysize {:4}  roundtrips {:3} \".format(len(rows), prefetchrows, arraysize, roundtrips))\n",
-    "\n",
-    "\n",
-    "# do_query(connection, number of rows, prefetchrows, arraysize)\n",
-    "\n",
-    "print(\"Default prefetch & arraysize values:\")\n",
-    "do_query(connection,                1,            2,       100)\n",
-    "do_query(connection,              100,            2,       100)\n",
-    "do_query(connection,             1000,            2,       100)\n",
-    "do_query(connection,            10000,            2,       100)\n",
-    "\n",
-    "print(\"\\n'Unknown' large number of rows:\")\n",
-    "do_query(connection,            10000,            2,      1000)\n",
-    "do_query(connection,            10000,         1000,      1000)\n",
-    "\n",
-    "print(\"\\n'Page' of rows:\")\n",
-    "do_query(connection,               20,           20,        20)\n",
-    "do_query(connection,               20,           21,        20)\n",
-    "\n",
-    "print(\"\\nDone\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Your tuning goal is to reduce round-trips (thus improving performance) without using too much internal buffer memory.\n",
-    "\n",
-    "When selecting a huge number of rows, tuning `arraysize` is important. In general there is no need to set `prefetchrows` in this scenario.\n",
-    "\n",
-    "When selecting a known, small number of rows such as for 'paging' through a result set, then set `prefetchrows` to be one larger than the number of rows returned."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Querying LOB Columns\n",
-    "\n",
-    "Documentation reference link: [Using CLOB and BLOB Data](https://python-oracledb.readthedocs.io/en/latest/user_guide/lob_data.html)\n",
-    "\n",
-    "When fetching LOBs there are two modes that can be used:\n",
-    "- Fetching as a \"locator\" for streaming use\n",
-    "- Fetching directly as a string or buffer"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Fetching LOBs for streaming\n",
-    "\n",
-    "- this is the default\n",
-    "- it requires more round trips and has more overhead\n",
-    "- it is useful when very long LOBs are being used"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    id = 1\n",
-    "    textData = \"The quick brown fox jumps over the lazy dog\"\n",
-    "    cursor.execute(\"truncate table TestClobs\")\n",
-    "    cursor.execute(\"insert into TestClobs (IntCol, ClobCol) values (:1, :2)\", [id, textData])\n",
-    "\n",
-    "    cursor.execute(\"select ClobCol from TestClobs where IntCol = :ic1\", [id])\n",
-    "    c, = cursor.fetchone()\n",
-    "    print(\"CLOB length:\", c.size())\n",
-    "    print(\"CLOB data:\", c.read())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Fetching CLOBs as String\n",
-    "\n",
-    "- this is much faster than the streaming method\n",
-    "- LOBs are limited to 1 GB (and obviously must all be in memory at once)\n",
-    "\n",
-    "To do this, pass `fetch_lobs` at execution, or set the equivalent global default in `oracledb.defaults.fetch_lobs`:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    id = 1\n",
-    "    cursor.execute(\"select ClobCol from TestClobs where IntCol = :ic2\", [id], fetch_lobs=False)\n",
-    "    c, = cursor.fetchone()\n",
-    "\n",
-    "    print(\"CLOB length:\", len(c))\n",
-    "    print(\"CLOB data:\", c)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The same `fetch_lobs` setting will return BLOBs as buffers.  \n",
-    "\n",
-    "When experimenting, if you change the `fetch_lobs` or `fetch_decimals` values, then make sure to use a new cursor for each execution."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Sample benchmark\n",
-    "A sample benchmark shows the performance benefit of querying using the direct String method compared with using the default locator stream method. \n",
-    "![LOB Benchmark](images/lob-benchmark.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Fetching Numbers as Decimals\n",
-    "\n",
-    "Oracle's NUMBER format is Decimal but Python uses floating point so there can be conversion artifacts.\n",
-    "\n",
-    "Documentation reference link:  [Fetched Number Precision](https://python-oracledb.readthedocs.io/en/latest/user_guide/sql_execution.html#fetched-number-precision)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    cursor.execute(\"select 0.1 as d1 from dual\")\n",
-    "    v, = cursor.fetchone()\n",
-    "    print('Value =', v, '\\tValue * 3 =', v * 3)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Fetching as Decimal may be useful.\n",
-    "\n",
-    "To do this, pass `fetch_decimals` at execution, or set the equivalent global default in `oracledb.defaults.fetch_decimals`:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import decimal\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    cursor.execute(\"select 0.1 as d2 from dual\", fetch_decimals=True)\n",
-    "    v, = cursor.fetchone()\n",
-    "    print('Value =', v, '\\tValue * 3 =', v * 3)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Multiple Values in \"WHERE ... IN\" Clauses\n",
-    "\n",
-    "Documentation reference link: [Binding Multiple Values to a SQL WHERE IN Clause](https://python-oracledb.readthedocs.io/en/latest/user_guide/bind.html#binding-multiple-values-to-a-sql-where-in-clause)\n",
-    "\n",
-    "### A fixed number of binds\n",
-    "\n",
-    "It's important to use bind variables for security.  For small numbers of binds this is simple.  One placeholder must be used for each value in the IN clause."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sql = \"\"\"select name\n",
-    "         from SampleQueryTab\n",
-    "         where id in (:id1, :id2, :id3, :id4, :id5)\n",
-    "         order by id\"\"\"\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    cursor.execute(sql,\n",
-    "        id1=5, id2=7, id3=1, id4=3, id5=2)\n",
-    "    for row, in cursor:\n",
-    "        print(row)       "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "If statements are re-executed but the number of values varies, then pass None (i.e. NULL) for 'missing' values.  This lets the database execute the same statement text as before, which helps performance and scalability. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    cursor.execute(sql,\n",
-    "        id1=2, id2=4, id3=1, id4=None, id5=None)\n",
-    "    for row, in cursor:\n",
-    "        print(row) "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "When using character data and the size of the values varies between statement execution, then using `setinputsizes()` with the column size or maximum expected input data size can help reduce the number of SQL 'versions' of the statement used by the database optimizer, although this is not often an issue and it's not uncommon to see SQL statements with tens or low hundreds of versions.\n",
-    "\n",
-    "For example with the query:\n",
-    "\n",
-    "    sql = \"\"\"select name\n",
-    "             from SampleQueryTab\n",
-    "             where name in (:n1, :n2, :n3, :n4, :n5)\n",
-    "             order by id\"\"\"\n",
-    "\n",
-    "the statement:\n",
-    "\n",
-    "    cursor.setinputsizes(n1=20, n2=20, n3=20, n4=20, n5=20)\n",
-    "\n",
-    "indicates that each value bound will be a string of no more than 20 characters."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sql = \"\"\"select name\n",
-    "         from SampleQueryTab\n",
-    "         where name in (:n1, :n2, :n3, :n4, :n5)\n",
-    "         order by id\"\"\"\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    cursor.setinputsizes(n1=20, n2=20, n3=20, n4=20, n5=20)\n",
-    "    cursor.execute(sql,\n",
-    "        n1='Anthony', n2='Barbie', n3='Bogus', n4=None, n5=None)\n",
-    "    for row, in cursor:\n",
-    "        print(row) "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Dynamically creating the statement\n",
-    "\n",
-    "If the number of bind values is not known, and the statement is never rexecuted, you can consider dynamically creating a statement."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "bind_values = [5, 7, 1, 3, 2, 6]\n",
-    "bind_names = [\":\" + str(i + 1) for i in range(len(bind_values))]\n",
-    "sql = \"\"\"select name from SampleQueryTab where id in (%s)\"\"\" % (\",\".join(bind_names))\n",
-    "print(sql, \"\\n\")\n",
-    "with connection.cursor() as cursor:\n",
-    "    cursor.execute(sql, bind_values)\n",
-    "    for row, in cursor:\n",
-    "        print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Binding using an Oracle type \n",
-    "\n",
-    "One solution when matching a huge number of values is to use the SQL `table()` clause and an Oracle type.  This works for up to 32K values."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "type_obj = connection.gettype(\"SYS.ODCINUMBERLIST\")\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    obj = type_obj.newobject()\n",
-    "    obj.extend([3, 4, 7])\n",
-    "    cursor.execute(\"\"\"select name\n",
-    "                      from SampleQueryTab\n",
-    "                      where id in (select * from table(:1))\"\"\",\n",
-    "                [obj])\n",
-    "    for row, in cursor:\n",
-    "        print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The presupplied types `SYS.ODCIVARCHAR2LIST` or `SYS.ODCIDATELIST` can similarly be used for VARCHAR2 and DATE, respectively."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Accessing object type information takes a few round-trips so the earlier methods are better for small numbers of values. If you use this solution in a more complex statement, check the optimizer plan is still OK. "
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/samples/notebooks/3-DML.ipynb b/samples/notebooks/3-DML.ipynb
deleted file mode 100644
index 86fcd3d8..00000000
--- a/samples/notebooks/3-DML.ipynb
+++ /dev/null
@@ -1,514 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# DML - INSERT, UPDATE, DELETE, and MERGE Statements"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "cursor = connection.cursor()\n",
-    "try:\n",
-    "    cursor.execute(\"drop table mytab\")\n",
-    "except:\n",
-    "    pass\n",
-    "cursor.execute(\"create table mytab (id number, data varchar2(1000))\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Binding for Insertion\n",
-    "\n",
-    "Documentation reference link: [Using Bind Variables](https://python-oracledb.readthedocs.io/en/latest/user_guide/bind.html)\n",
-    "\n",
-    "Binding is very, very important. \n",
-    "\n",
-    "Binding:\n",
-    "- eliminates escaping special characters and helps prevent SQL injection attacks\n",
-    "- is important for performance and scalability"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 12,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Done\n"
-     ]
-    }
-   ],
-   "source": [
-    "cursor.execute(\"truncate table mytab\")\n",
-    "\n",
-    "sql = \"insert into mytab (id, data) values (:idVal, :dataVal)\"\n",
-    "\n",
-    "# bind by position using a sequence (list or tuple)\n",
-    "cursor.execute(sql, [1, \"String 1\"])\n",
-    "cursor.execute(sql, (2, \"String 2\"))\n",
-    "\n",
-    "# bind by name using a dictionary\n",
-    "cursor = connection.cursor()\n",
-    "cursor.execute(sql, {\"idVal\": 3, \"dataVal\": \"String 3\"})\n",
-    "\n",
-    "# bind by name using keyword arguments\n",
-    "cursor.execute(sql, idVal=4, dataVal=\"String 4\")\n",
-    "\n",
-    "print(\"Done\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Batch execution - Inserting multiple rows with executemany()\n",
-    "\n",
-    "Documentation reference link: [Executing Batch Statements and Bulk Loading](https://python-oracledb.readthedocs.io/en/latest/user_guide/batch_statement.html)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 13,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "(1, 'First')\n",
-      "(2, 'Second')\n",
-      "(3, 'Third')\n",
-      "(4, 'Fourth')\n",
-      "(5, 'Fifth')\n",
-      "(6, 'Sixth')\n",
-      "(7, 'Seventh')\n"
-     ]
-    }
-   ],
-   "source": [
-    "cursor.execute(\"truncate table mytab\")\n",
-    "\n",
-    "rows = [ (1, \"First\" ),\n",
-    "\t (2, \"Second\" ),\n",
-    "\t (3, \"Third\" ),\n",
-    "\t (4, \"Fourth\" ),\n",
-    "\t (5, \"Fifth\" ),\n",
-    "\t (6, \"Sixth\" ),\n",
-    "\t (7, \"Seventh\" ) ]\n",
-    "\n",
-    "# Using setinputsizes helps avoid memory reallocations.\n",
-    "# The parameters correspond to the insert columns.  \n",
-    "# The value None says use python-oracledb's default size for a NUMBER column.  \n",
-    "# The second value is the maximum input data (or column) width for the VARCHAR2 column\n",
-    "cursor.setinputsizes(None, 7)\n",
-    "\n",
-    "cursor.executemany(\"insert into mytab(id, data) values (:1, :2)\", rows)\n",
-    "\n",
-    "# Now query the results back\n",
-    "\n",
-    "for row in cursor.execute('select * from mytab'):\n",
-    "    print(row)\n",
-    "\n",
-    "connection.rollback()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Performance - executemany() vs execute()\n",
-    "\n",
-    "This script compares `executemany()` vs `execute()` and shows that `executemany()` is faster for inserting multiple records.  It may take several seconds for it to run and plot the graph."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "execute() loop      1 rows in 0.0276 seconds\n",
-      "executemany()       1 rows in 0.0064 seconds\n",
-      "execute() loop      5 rows in 0.0259 seconds\n",
-      "executemany()       5 rows in 0.0065 seconds\n",
-      "execute() loop     10 rows in 0.0554 seconds\n",
-      "executemany()      10 rows in 0.0081 seconds\n",
-      "execute() loop    100 rows in 0.4570 seconds\n",
-      "executemany()     100 rows in 0.0207 seconds\n",
-      "execute() loop   1000 rows in 3.9817 seconds\n",
-      "executemany()    1000 rows in 0.1517 seconds\n",
-      "execute() loop   5000 rows in 20.7784 seconds\n",
-      "executemany()    5000 rows in 0.7431 seconds\n",
-      "Plot is:\n"
-     ]
-    },
-    {
-     "data": {
-      "image/png": "iVBORw0KGgoAAAANSUhEUgAAAjIAAAG1CAYAAADjkR6kAAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjkuNCwgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy8ekN5oAAAACXBIWXMAAA9hAAAPYQGoP6dpAABNgklEQVR4nO3dB3xV9f3/8U92yCAQMkjYG4Is2QqCoiBtBRy1+rOK1omjWuv+V3FUcVRFLULrxNZVrOKqDFE2IoggG4GwR4CQBWTde/6Pzze515uQcTPvej37uM0955577vfeGznvfGeQZVmWAAAA+KBgTxcAAACgtggyAADAZxFkAACAzyLIAAAAn0WQAQAAPosgAwAAfBZBBgAA+CyCDAAA8Fmh4ufsdrscOHBAYmNjJSgoyNPFAQAAbtD5enNzcyU1NVWCg4MDN8hoiGnTpo2niwEAAGph79690rp168ANMloT4/ggmjZt6uniAAAAN+Tk5JiKCMd1PGCDjKM5SUMMQQYAAN9SXbcQOvsCAACfRZABAAA+y++bltxls9mkqKjI08UA6k1YWJiEhIR4uhgA0KACPsjo8K5Dhw5JVlaWp4sC1LtmzZpJy5YtmXoAgN8K+CDjCDFJSUkSFRXFP/jwm4B+8uRJycjIMNspKSmeLhIANIjQQG9OcoSYFi1aeLo4QL1q0qSJ+alhRn/HaWYC4I8CurOvo0+M1sQA/sjxu03/LwD+KqCDjAPNSfBX/G4D8HcB3bQEAABqx2a35Pv0TMnIzZek2EgZ1CFeQoIb/48nggwAAKiRORsOymOfb5KD2fnOfSlxkTL5ojS58IzGHVxA01I9pdIVO47Jp2v3m5+6jdo7duyY6Zy6a9cus71p0yazYNiJEyeqfN6jjz4qffv2baRSAkDghphJ/15TJsSoQ9n5Zr8+3pgIMnWkX9iwZ76RK1/7Tu78YK35qduN/UV6m5EjR8pdd91Vq+c++eSTMn78eGnfvr3ZTktLkyFDhsgLL7xQz6UEANSE/qGuNTEV/bnu2KePN+Yf9AQZP0ql/kDnPnnjjTfk+uuvL7P/uuuuk+nTp0txcbHHygYAge779MzTrnmuNL7o43pcYyHIlJ9ErLDYrVtufpFM/mxjlan00c82mePcOZ++trvsdrtMmTJFOnToYOYK6dOnj3z00UfO93D++efLmDFjnOfMzMw0TTOPPPKI8xyvv/669OjRQyIjI6V79+7y6quvlnmNffv2yZVXXinx8fESHR0tAwYMkJUrV5rHrr32WpkwYUKZ47X2RWthHI8vWrRIXnrpJTNqRm+OZqINGzbI2LFjJSYmRpKTk+Xqq6+Wo0ePOs/zv//9TyIiIkwNjKsLLrjAvA89b00+p8cff9y8dz2nNjvNmTOnzDHr16+X8847z3yOOpfQTTfdJHl5ec7HHe/1sccek8TERLOC+i233CKFhYVulwMA/EVGbn69Hlcf6Ozr4lSRTdIemVsv59IIcSgnX3o9Os+t4zc9Pkaiwt37OjTE/Pvf/5YZM2ZIly5dZPHixfL73//eXGhHjBghM2fOlF69esnLL78sd955p7nwtmrVyhlk3n33XXP/73//u/Tr109+/PFHufHGG01gmThxormQ63n0OZ999pmZ4n7NmjUmGLhDA8y2bdvkjDPOMEFCadl08kENDTfccIO8+OKLcurUKbn//vvl8ssvl2+++cYct2TJEunfv/9p5wwPDzdBRB8fNWqU2+V4/vnn5R//+Id5n2+++aaMGzdONm7caD437XOjgW/o0KGyatUqM3Gclu3222+Xt99+23meBQsWmMC3cOFCE8i0dkhDjzaBAUAgSYqNrNfj6gNBxscUFBTIU089JV9//bW5AKuOHTvK0qVLzQXbEUD0/jXXXGOWYNBaDg0roaElX/fkyZPNBf6SSy4x21qzox1q9TkaZN577z05cuSIubhrjYzq3Lmz22WMi4szwUMnY9MQ5OAITlp+Bw0Xbdq0McGna9eusnv3bklNTa3wvLpfH3fX3/72NxOUrrjiCrP9zDPPyLfffitTp06VadOmmfeZn58v77zzjglxjjJedNFF5litMVL6XrSc+n569uxpwtm9994rTzzxhAQHU6kJIHAM6hBvRidpF4qK2hF08HXLuJKh2I2FIOOiSViIqRlxh7b/XfvWqmqPe/u6gW59ofra7ti+fbvpR6JNLa60qUNDgsNvf/tb+eSTT+Tpp582fUu0BkJpLcSOHTtMHxSthXHQvicaQNTatWvNuRwhpr6sW7fOBAltVipPy6RBRmtptPajItr8o+/dHTk5OXLgwAE5++yzy+zXbS2H2rx5s2mWc4QYx+Na87R161ZnkNFjXGd/1gCptVZ79+6Vdu3aufnuAcD3hQQHmSHW2g+0PMcMMvp4Y84nQ5BxoX053G3eGd4l0a1UqsfV5xfq6L/x5ZdfmpoXV9oPxEEv+D/88INZX+fnn38+7fmvvfaaDB48uMzzHWvxONboqYzWQpTv0+POFPj62o7ajvIcixomJCTI8ePHK3y+9pHp1KlTta8DAGg4Ok/M337bR/48q+SPQoeWHppHhiBTD6lUY4rVSKlUhyJrYNmzZ49pRqrMn//8ZxM4vvrqK/nVr34lv/71r03/FK1l0CaanTt3ylVXXVXhc3v37m06A2twqKhWRvu7aKddV1qLExYW5tzW5hhdlNPVmWeeKf/973/NsGpHM1d5WhOk/X8qoq952WWXiTu0U66+z2XLlpX5nHR70KBB5r52dta+MFpL5aiV0cf1c+vWrZvzOVqDozVFjoD33XffmVolbRIDgEAUXNqq3qZ5E7lnTDePzuxLA38daOqc/vszTQp1pdu6vyFSaWxsrNxzzz3ypz/9yXTq1SYZ7Yj7yiuvmG1HbY326dBOvdoEpf05tO+Lo6ZDR+Boh2HtDKx9U3TkzltvveWcp0VHK2nfFh2toxd2DT0aQFasWGEe10C0evVq07dEa3u0z035YKNhRUc5aedYHZWkzTW33XabCUd6fu1/o2WfO3eu6TzrCD3a+VY745avldHz7N+/34zIcpe+b639+fDDD01T0QMPPGACl3aAVhrktBlLPxstvzZ73XHHHWYklaNZydFsp01x2o9I+xvp+9UOwfSPARCo5m08bH5O6NdKxvdtJUM7tfBIiDEsP5edna2VJeZneadOnbI2bdpkftZFsc1uLd9+1Jr94z7zU7cbkt1ut6ZOnWp169bNCgsLsxITE60xY8ZYixYtsjIyMqzk5GTrqaeech5fWFho9e/f37r88sud+959912rb9++Vnh4uNW8eXPrnHPOsT7++GPn47t27bIuvfRSq2nTplZUVJQ1YMAAa+XKlc7HH3nkEfM6cXFx1p/+9Cfr9ttvt0aMGOF8fOvWrdaQIUOsJk2amM8/PT3d7N+2bZt18cUXW82aNTOPde/e3brrrrvMe3IYNGiQNWPGjDLvWd+PvseqTJ482erTp49z22azWY8++qjVqlUr8znpY1999VWZ5/z000/Wueeea0VGRlrx8fHWjTfeaOXm5jofnzhxojV+/Hjzflu0aGHFxMSYY/Lz8y1fUF+/4wDgcKqw2Or+l6+sdvd/Yf20N8vyxPXbVZD+n/gx7fSpnVizs7NNc4MrHbGSnp5uRu1U1sEUjU9rlLQ2RWtJtNZDa0S0s7KOMirfebeh6TwyOmx89uzZ4ov4HQdQ377edFhueGe1pMZFyrIHzjP9Sxv7+u3Ko3Xj2rwxcOBA01yia+toU4Y2AZT/h1ibJHTeDu2XcOmll8rhwyVVWvBP2p9HJ6bTpiSl/YEeeuihRg8xAIDTzdt0yPwc3bNlg4WYmvBokNFZWjWkaOfJ+fPnm5Evo0ePLrM4oPYF+fzzz2XWrFnmeB1S65j/BP5LZwp2dKbVOWxuvvlmTxcJAAJesc0uX2/OMPdHp/3Sl9CTPDpqqfx08TqCRGtmdNjwOeecY6qTdN0dbVLQDqZKO6XqaBMNP+WnsQfqm+sMvwAQ6H7YfVwyTxRKXJMwGdiIk95VxauGXWhwUY4hvxpotJbGdaSKrgvUtm1b5wiaima+1XY11xsAAKi7eZtKunaM6pEkYSHeESG8oxSlC/xpc4L2g9A1epROr6/zkTRr1qzMsTo0Vh+rrN+Ndg5y3JjrAwCAutOxQc7+MWm/LD/jaV4TZLSvjI5S+eCDD+p0ngcffNDU7DhuOo08AACom80Hc2Vv5imJCA2Wc7omiLfwipl9dXKxL774wqzi3Lp1a+d+nZRNh97q8FfXWhkdteS6GKErnfXWdap+AABQd47amHO6Jrq9nI/f18hoNZWGGF3c8JtvvjFzXbjq37+/mfZ+wYIFzn06PFuH4zpWfgYAAI03m6+3jFbyiiCjzUm6ro6OStK5ZLTfi950XRulfVx0avi7777bTB+vnX91OnsNMYxYQqDRkXz634rSmkpdBkKXigCAhrY386RsOpgjugrBqB4EGafp06ebfiwjR440qx87bro2jsOLL74ov/nNb8xEePoPuTYpffzxx+JV7DaR9CUi6z8q+anb8AidiVcnVvQ3n332mWlSveKKK8y2doLXNbfuv/9+TxcNQACNVhrUIV7io8PFm3i0kcud1RF0WvVp06aZm1fa9JnInPtFcg78sq9pqsiFz4ikjfNkyeBHdIFPrY10XahSF73UVc51kc2ePXt6tHwA/Nu8jd43WsnrRi35JA0x/7mmbIhROQdL9uvjDUDnyvnjH/9oJg/UoDds2DCzmrTDwoULzbTR2rdowIABEhUVJWedddZpyz98+umncuaZZ5pzdOzY0ayKXVxcXOVrv/7662ZCQn2Ozunz6quvOh/7wx/+IL179zblczR/9OvXT6655hq3X1M7dussvjrEXo/RofjaEVw9+uij0rdv3zLlmTp1qmlicTyuK4Dra+j715t+FkpHr11++eWm07jOUzR+/Hizonb5mpynnnrKvLYe9/jjj5uy6bpP+hztiK4TMrrSGpGuXbuaz1jfz8MPP2zmPnJwlPlf//qXKac2l2qtSm5urnlcVxDX5Tccn5mDlkVX4VZHjhwxfcguuuiiMsc0b97cTFdQ15F+AFAVnQBv1a5Mc/8CL+sfowgyrrSGqPCEe7f8HJGv7tMnVXSikh9aU6PHuXO+Gqzded9998l///tfc9Fes2aNmcJ/zJgxkplZ8ovm8P/+3/+T559/3vSjCA0NNUHDYcmSJSZg3HnnnbJp0yb5xz/+YWaxffLJJyt93XfffVceeeQRc8zmzZvNRV8v3FoOR62BLi/xwAMPOF9fg8nf//53t15T5xIaO3asLFu2zPSd0mOefvppCQkJcetz0aYWDSsXXnihHDx40Nw0wGmw0M9H+2FpGfT8um6XHqdhy0HDgi6BoaPnXnjhBZk8ebJp1tTAsHLlSrnllltMyNq3b5/zOXpOfQ9a1pdeeklee+010xzqaseOHWbRSQ1ketOlNvR9qd/+9rdis9lM05FDRkaGWTjT8X0tXbrUBCUNkOUNGjTIvCcAaChfbz4sdkskLaWptImPEq9j+bmqlgE/deqUtWnTJvPTKMizrMlNPXPT13ZDXl6eFRYWZr377rvOfYWFhVZqaqr17LPPmu1vv/3WvOevv/7aecyXX35p9jne66hRo6ynnnqqzLn/9a9/WSkpKZW+dqdOnaz33nuvzL4nnnjCGjp0qHN7+fLlpnwPP/ywFRoaai1ZssT5WHWvOXfuXCs4ONjaunVrha8/efJkq0+fPmX2vfjii1a7du2c2xMnTrTGjx9/2mt069bNstvtzn0FBQVWkyZNzGs6nqfnsdlszmP0OcOHD3duFxcXW9HR0db7779f6Wf03HPPWf379y9T5qioKCsnJ8e5795777UGDx7s3J40aZI1duxY5/bzzz9vdezY0VlefY+6XZGXXnrJat++faXlOe13HABq6Pq3V1nt7v/Cmjp/m+Ut129X3jMQHG7Rv+61hsF1JWgdoq5/mWstiStt5nHQTtSOv/Z1iYd169aZmgnXGhitGdDVxk+ePGlqAFxpTYu+to4iu/HGG537telFm0scdESZ1ow88cQTptlFm70cqnvNtWvXmuYbbaqpT/q627dvN7UnrvR19T05aD8T1z4o2sTkmGVaac2QNgPpZ+igHdO1JkrPk5eXZz6P8svNa5OS62vrd+F6Dv08dRV4Xe27VatWpoZHm7ocq8rqKD5tZqtIkyZNzGcHAA3hZGGxLPn5iLk/uqf3NSspgoyrsCiRh8r1d6nM7uUi715W/XFXfSTS7iz3XrueacBxcFwUtflG6UVX+6dUtJJ4RRdNPV5p08ngwYPLPOba9KPn17Ci+zQ8lD9HVa+pF+WqaMgo30HctT9KZfR1dU4ibRorLzExscLPy/GZVbTP8Rnqel/a4VbfkzZdaaDT/iranOeqqnMo7UfUp08f019GV3/XzrvatOSQkJAgx48fr/C9aXOi63sAgPq0eNsRKSi2S5v4JtK9Zdk/Br0FQcaVXuzDo907ttN5JaOTtGNvhf1kgkoe1+OC3evj4dbLdupkht5qWGjXrp3zYq6dfXWtKndph1vt/Kv9a9yhtROpqamyc+dOc/GuzHPPPSdbtmwx/UD04q6dY3W0jTuvqTVI2v9k27ZtFdbK6AVb5xnSMOMIZlqL40o/G63lKf9eteZEO0eXry2pi+XLl5vvQPsCOezevbtW57rhhhtMx2WtldFFUl3XCNOgo+9bw4z213Gly3ro4wDQkJPgjUlr6fx319vQ2be2NJzoEGuj/Jdbun3h0/UaYlR0dLRMmjTJjKSZM2eO6WSqTRPavKDNPu7STrtaA6C1CVoDoM1SWpvwl7/8pdLn6LG6KKc2pWjYWL9+vQkq2jFW/fjjj+a8OrJJm750v3bs1fDjzmuOGDHCzBWkcwbNnz9f0tPT5auvvjLvU+l8QzqC59lnnzVNOTokXx8v34zz008/mcB09OhRE/I0eGmtho5U0o6xel4dzaQjv1w77tZUly5dzCzT+h60PPq56CzVtfF///d/pixa4+XaKVtpUNHya3gtT9+P1uIAQH0rstllwZaSZvDRPb1v2LUDQaYudJ6Yy98RaVrS/8RJa2J0fwPNI6MjXvRir8NztbZBm3Dmzp172l/rVdHaEh1BM2/ePNM/Q2dK1tE2jlqeymoNNKRoeOnVq5cJHtqfQ5eW0P4mv//9703fDscw4ZtuuknOPfdcU06tJXHnNXU0lj525ZVXSlpamhmh5ahh0VE7OtxbA4w2xXz//femP44rDXXdunUzw861Bkcv/trfR0ciad8gbdbS82jo0zLXpYZm3Lhx8qc//ckss6FDrLWGRkdx1YY2S+l3qqOpyk/op810WqtVvmlMm7Z0QsnLLnOjiRMAamhVeqZknyoyE+D1b+f+9aWxBWmPX/FjOTk55iKh/+CXv2jphUz/OtcLcWWdKd2iM/lqn5m8wyIxySV9Yuq5Jgb+b9SoUabDsdbslKdNS/qYDrd3BL/f/e53JtA99NBDlZ6z3n7HAQScyZ9ukJkrdsvlA1rLs5f18arrtyv6yNQHDS0dhnu6FPBR2vdFm7r05jrBoCtdmuONN94wTVkaZHT+G60V0xohAKhvWsfhWJZgjBc3KymCDOBh2gdGw8wzzzxjmsUq49rkpJ2aq+rPBAB1sWF/jhzMzpeo8BA5u3OCeDOCDOBhrkslAIA3mFu6ttKIrokSGebdXSXo7AsAAMqYt+mQTzQrKYIMAABwSj96QrYdzpPQ4CA5t1uSeDuCTGmnJsAf8bsNoKbml9bGDOnYQuKiys5M7o0COsg4po5nrRr4K8fvdvllEgCgMnNLZ/P11rWVygvozr460VizZs2cC/jpxGneOgUzUNOaGA0x+rutv+Ou62EBQGUycvNlzZ6Std0uSCPI+ASdn0O5rkYM+AsNMY7fcQCozoLNGaIt0n1ax0lKXNUL+XqLgA8yWgOTkpJiFhR0ZyVlwFdocxI1MQBqM+zam9dWKi/gg4yD/oPPP/oAgECVm18ky7cfM/fH+Ej/GAn0zr4AAKDEom1HpNBml44J0dIpMUZ8BUEGAADIvNLRShf0TPapgS8EGQAAAlxhsV2+3VIy6GV0mu/0j1EEGQAAAtyKncckt6BYEmMjpF+bZuJLCDIAAAS4eaWjlXTumOBg32lWUgQZAAACmN1uyfxNpbP5+sgkeK4IMgAABLC1+7IkI7dAYiNC5axOCeJrCDIAAASweaWjlUZ2T5LwUN+LBb5XYgAAUG/mla527YvNSoogAwBAgNqekSs7j5yQ8JBgGdktUXwRQQYAgAA1t7RZ6azOLSQ2Mkx8EUEGAIAANc85Wsm3JsFzRZABACAAHcrOl3V7s0RXIzg/LUl8FUEGAIAANL+0k++ZbZtLUmyk+CqCDAAAAd2slCy+jCADAECAyT5VJCt2HDP3R/f03f4xiiADAECA+XZLhhTbLemSFCMdEqLFlxFkAAAI0Enwxvh4bYwiyAAAEEDyi2yycOsRc390T9/uH6MIMgAABJDlO47KyUKbpMRFSq9WceLrCDIAAASQuRt+Ga0UpJPI+DiCDAAAAcJmt+TrzaVBxg/6xyiCDAAAAWLNnuNy7EShNI0MlUEd4sUfEGQAAAgQczeUjFYa1SNZwkL8IwL4x7sAAABVsizLOZvvGD8YreRAkAEAIABsPZwrezJPSkRosJzTNVH8BUEGAIAAMG9jSW3M8C4JEhUeKv6CIAMAQACYu/GQX41WciDIAADg5/YdPykbD+RIcJDIqO5J4k8IMgAA+Ln5pZ18B7SPlxYxEeJPCDIAAARKs1Ka/4xWciDIAADgx46fKJTv0zP9ZrXr8ggyAAD4sQVbMsRuifRIaSpt4qPE3xBkAADwY/P8uFlJEWQAAPBTpwptsvjnI37brKQIMgAA+CkNMflFdmndvIn0SIkVf0SQAQDAz2fzHZ3WUoKCgsQfEWQAAPBDxTa7LNhSGmT8aJHI8ggyAAD4oe93ZUrWySKJjw6XAe2ai78iyAAA4MfNSqO6J0loiP9e7v33nQEAEKAsy3IuS+Bvi0SWR5ABAMDPbDyQI/uzTkmTsBAZ3iVB/BlBBgAAP50Eb0TXRIkMCxF/RpABAMDPzNvk/6OVHAgyAAD4kd3HTsiWQ7kSEhwk53VPEn9HkAEAwA9HKw3pGC/NosLF3xFkAADwI/M2ORaJ9O/RSg4EGQAA/MTRvAJZvfu4uX+Bn652XR5BBgAAP/H1psNiWSK9W8dJarMmEggIMgAA+NtopbTAqI3xeJBZvHixXHTRRZKammpW5Zw9e3aZx6+99lqz3/V24YUXeqy8AAB4q7yCYlm6/WhAzObrNUHmxIkT0qdPH5k2bVqlx2hwOXjwoPP2/vvvN2oZAQDwBYu3HZHCYru0bxElXZJiJFCEevLFx44da25ViYiIkJYtAydZAgBQG3NLZ/Md07OlacEIFF7fR2bhwoWSlJQk3bp1k0mTJsmxY8eqPL6goEBycnLK3AAA8GeFxXb5ZktGwMzm6zNBRpuV3nnnHVmwYIE888wzsmjRIlODY7PZKn3OlClTJC4uznlr06ZNo5YZAIDGtjL9mOTmF0tCTIT0a9NcAolHm5aqc8UVVzjv9+rVS3r37i2dOnUytTSjRo2q8DkPPvig3H333c5trZEhzAAAAqFZ6YK0ZAkODpxmJa+vkSmvY8eOkpCQINu3b6+yT03Tpk3L3AAA8Fd2uyXzA2iRSJ8OMvv27TN9ZFJSUjxdFAAAvMJP+7PlcE6BRIeHyFmdWkig8WjTUl5eXpnalfT0dFm7dq3Ex8eb22OPPSaXXnqpGbW0Y8cOue+++6Rz584yZswYTxYbAACvMa+0WWlk9ySJCA2RQOPRILN69Wo599xznduOvi0TJ06U6dOny08//SQzZ86UrKwsM2ne6NGj5YknnjDNRwAAQMoMuw5EHg0yI0eOFEsXhajE3LlzG7U8AAD4ku0ZebLjyAkJCwmSkd0SJRD5VB8ZAADwi/mlnXyHdkqQppFhEogIMgAA+HyzUrIEKoIMAAA+6HBOvqzdm2XuX9CDIAMAAHywWalf22aS1DRSAhVBBgAAHzTPMQleWmCOVnIgyAAA4GNy8otkxY6jEuj9YxRBBgAAH/PtlgwpslnSOSlGOibGSCAjyAAA4LPNSskS6AgyAAD4kPwimyzckhHQs/m6IsgAAOBDVuw4JicKbdKyaaT0ahUngY4gAwCAD5m3qWQSvAvSkiU4OEgCHUEGAAAfYbNbzvljRgf4aCUHggwAAD7ixz3H5WheocRGhsqQji08XRyvQJABAMDHRiuN6p4kYSFcwhWfAgAAPsCyLOcikaMZreREkAEAwAf8nJEnu4+dlPDQYBnRNdHTxfEaBBkAAHzA3A0ltTHDOydIdESop4vjNQgyAAD40my+jFYqgyADAICXO5B1StbvzxadNmZUD4KMK4IMAABebl5pJ98B7eIlISbC08XxKgQZAAC8HM1KlSPIAADgxbJOFsrK9Exzf3Qaw67LI8gAAODFvtmSYZYm6N4yVtq2iPJ0cbwOQQYAAC/GJHhVI8gAAOClThXaZNG2I+b+6DT6x1SEIAMAgJdauv2o5BfZpVWzJtIztamni+OVCDIAAHh9s1KyBAUFebo4XokgAwCAFyq22WXB5tJh14xWqhRBBgAAL7R693E5frJImkeFycD2zT1dHK9FkAEAwAvN21hSG6NLEoSGcLmuDJ8MAABexrKsX/rHMFqpSgQZAAC8zKaDObI/65REhgXL8C6Jni6OVyPIAADgpc1K53RJlCbhIZ4ujlcjyAAA4GUczUpjmM23WgQZAAC8yJ5jJ2XLoVwJCQ6S87onebo4Xo8gAwCAF5m3qaQ2ZlD7eGkeHe7p4ng9ggwAAF5k3qaS/jFjejJayR0EGQAAvMSxvAJZvSvT3L+A/jFuIcgAAOAlFmzOELslckarpmahSFSPIAMAgJf1j2FtJfcRZAAA8AInCopl8c9HzX2GXTdwkDl16pScPHnSub17926ZOnWqzJs3rzanAwAg4C3edkQKi+3SrkWUdE2O8XRx/DvIjB8/Xt555x1zPysrSwYPHizPP/+82T99+vT6LiMAAAEzWknXVgoKCvJ0cfw7yKxZs0aGDx9u7n/00UeSnJxsamU03Lz88sv1XUYAAPxakc0uCzY7hl3TrNTgQUablWJjY819bU665JJLJDg4WIYMGWICDQAAcN/KnZmSk18sCTHh0q9tc08Xx/+DTOfOnWX27Nmyd+9emTt3rowePdrsz8jIkKZNm9Z3GQEACIjRSuf3SDZLE6CBg8wjjzwi99xzj7Rv3970jxk6dKizdqZfv361OSUAAAHJsiznatejmc23xkJr/hSRyy67TIYNGyYHDx6UPn36OPePGjVKLr744tqcEgCAgLR+f7YcysmX6PAQOatTgqeLExhBRrVs2dLcXA0aNKg+ygQAQMCYu7GkWWlktySJDAvxdHH8N8hoh153ffzxx7UtDwAAAYVmpUbqIxMXF+e8aYfeBQsWyOrVq52P//DDD2afPg4AAKq380ie/JyRJ2EhQXJu9yRPF8e/a2Teeust5/37779fLr/8cpkxY4aEhJRUg9lsNrn11lsZtQQAQA0nwRvSsYU0jQzzdHECZ9TSm2++aUYtOUKM0vt33323eQwAAFRvXmn/mNFMgte4Qaa4uFi2bNly2n7dZ7fba18aAAACREZOvvy4N8vcv6AH/WMaddTSddddJ9dff73s2LHDOVJp5cqV8vTTT5vHAABA1b7enCGWJdK3TTNpGRfp6eIEVpD529/+ZoZe60KROpeMSklJkXvvvVf+/Oc/13cZAQDw22HXjFaqmyBLpxSsg5ycHPPTWzv5avl0JFV2drbXlhEAEFhy84vkzCfmS5HNkq/vHiGdk2I8XSSfvX7XekI8B8IBAAA1s3DrERNiOiVGE2I80dn38OHDcvXVV0tqaqqEhoaaEUuuNwAA4E6zEqOV6qpWNTLXXnut7NmzRx5++GHTNyYoiJU6AQBwR0GxzdTIqNFp9I/xSJBZunSpLFmyRPr27VvnAgAAEEhW7DgmeQXFkhQbIX1aN/N0cQKzaalNmzZm2XEAAFC72Xx1tFJwMC0aHgkyU6dOlQceeEB27dpV5wIAABAo7HZL5juCTBr9YzzWtPS73/1OTp48KZ06dZKoqCgJCyu7PkRmZma9FA4AAH+iM/keyS2Q2MhQs74SPBRktEYGAADUzLxNJaOVzuueJOGhtWoUQX0EmYkTJ9bmaQAABCztWzpvI81K9a3WE+LZbDaZPXu2bN682Wz37NlTxo0bxzwyAABUYHtGnqQfPSHhIcEyoluip4sT2EFm+/bt8qtf/Ur2798v3bp1M/umTJliRjN9+eWXpu8MAAA4fbTS2Z1bSExEnSfWR6laNdD98Y9/NGFl7969smbNGnPTCfI6dOhgHgMAAGXNK53Ndwyz+darWkXCRYsWyXfffSfx8fHOfS1atJCnn35azj777PosHwAAPu9g9ilZty9bdCL8UT2YzdfjNTIRERGSm5t72v68vDwJDw93+zyLFy+Wiy66yKzZpMscaJ+b8h2jHnnkEbMMQpMmTeT888+Xn3/+uTZFBgDAYxxzx/Rv21wSYyM8XRy/Uqsg85vf/EZuuukmWblypQkbetMamltuucV0+HXXiRMnpE+fPjJt2rQKH3/22Wfl5ZdflhkzZpjXio6OljFjxkh+fn5tig0AgEc4RivRrOQlTUsaLnQI9tChQ52T4RUXF5sQ89JLL7l9nrFjx5pbRTQc6Xw1f/nLX2T8+PFm3zvvvCPJycmm5uaKK66oTdEBAGhU2SeL5Ludx8z9C1gk0juCTLNmzeTTTz81o5ccw6979OghnTt3rreCpaeny6FDh0xzkkNcXJwMHjxYVqxYUWmQKSgoMDeHnJyceisTAAA19c3Ww1Jst6Rbcqy0T4j2dHH8Tp3Gf2lwqc/w4kpDjNIaGFe67XisIjoM/LHHHmuQMgEAUFPOSfB6UhvjNX1kLr30UnnmmWcq7NPy29/+VjzpwQcflOzsbOdNh4gDAOAJ+UU2WbTtiLlP/xgvCjI62kgnxCtP+7voY/WhZcuSL/zw4ZIk66DbjscqG1HVtGnTMjcAADxh6c9H5WShTVLjIqVnKtcjrwkylQ2z1o6/9dUnRSfX08CyYMEC5z49t45e0k7GAAD4yiKRo3u2NNOMwEuCTK9eveTDDz88bf8HH3wgaWlpNQpEa9euNTdHB1+9r7ME6xd+1113yV//+lf57LPPZP369XLNNdeYOWcmTJhQm2IDANBobHZLvt6cYe7TP8bLOvs+/PDDcskll8iOHTvkvPPOM/u05uT999+XWbNmuX2e1atXy7nnnuvcvvvuu81PHdr99ttvy3333WfmmtE5a7KysmTYsGEyZ84ciYyMrE2xAQBoNKt3ZUrmiUKJaxImg9r/MhM+6leQpRO21IIuDvnUU0+ZGhSddbd3794yefJkGTFihHgTbY7SYdva8Zf+MgCAxvLEF5vkjaXpcsmZreSFy/t6ujg+x93rd62HX//61782NwAAUJbWETj7x6QxWsnr+sgobep5/fXX5aGHHpLMzEyzT1fB3r9/f32WDwAAn7PlUK7szTwlkWHBMqJroqeL49dqVSPz008/mRl3tcpn165dcsMNN5iVsD/++GPTUVeXEgAAIFDN3VhSGzO8S6I0CQ/xdHH8Wq1qZLRT7rXXXmtWonbteKtzy9TXPDIAAPj8bL6sreSdQWbVqlVy8803n7a/VatWVS4fAACAv9ubeVI2HcyR4CCR83sQZLwyyOjsuRVNfLdt2zZJTKQtEAAQuOZvKqmNGdQhXppHnz55LLwgyIwbN04ef/xxKSoqMts6eZ32jbn//vvNOkwAAAR6/xhGK3lxkHn++efNrLxJSUly6tQpM3dMp06dJCYmRp588sn6LyUAAD5AJ8BbtatkJO8F9I/x3lFLOlpp/vz5snTpUjOCSUNN//79ZdSoUfVfQgAAfMSCzYfFbolZILJNfJSnixMQalQjs2LFCvniiy+c27pkQHR0tLz66qty5ZVXmqUECgoKGqKcAAB4vbnO0Uo0K3llkNF+MRs3bnRu60KON954o1xwwQXywAMPyOeffy5TpkxpiHICAODVThYWy5Kfj5j7LBLppUFG11VybT7S1a4HDRokr732mplb5uWXX5b//Oc/DVFOAAC82uJtR6Wg2C5t46Oke8tYTxcnYNQoyBw/flySk39JmYsWLZKxY8c6twcOHCh79+6t3xICAOADfllbKdmM5oUXBhkNMenp6eZ+YWGhWVtpyJAhzsdzc3MlLCys/ksJAIAXK7LZZcHmDHN/dE/6x3htkNElCLQvzJIlS+TBBx+UqKgoGT58uPNxHcGkw7ABAAgkq9IzJftUkbSIDpf+7Zp7ujgBpUbDr5944gm55JJLzLwxOmfMzJkzJTz8l1kL33zzTRk9enRDlBMAAK81r3Q2X12SIETXJoB3BpmEhASzKGR2drYJMiEhZVf0nDVrltkPAECgsCxL5jlm82W0ku9MiFeR+Pj4upYHAACfsmF/jhzIzpeo8BA5u3OCp4sTcGq1RAEAACg7Wmlkt0SJDCvbUoGGR5ABAKAO5jGbr0cRZAAAqKVdR0/I1sO5EhocJOd2S/J0cQISQQYAgDo2Kw3p2ELiophHzRMIMgAA1LFZaQyjlTyGIAMAQC0cyS2QH/YcN/fPTyPIeApBBgCAWvh682GxLJE+reMkJa6Jp4sTsAgyAADUwi+T4DFayZMIMgAA1FBeQbEs237M3Kd/jGcRZAAAqKGFWzOk0GaXjgnR0imRpXk8iSADAEAtRytd0DNZgoJYJNKTCDIAANRAYbFdvt2SYe6PoX+MxxFkAACogRU7j0luQbEkxkZI39bNPF2cgEeQAQCgFqOVLkhLluBgmpU8jSADAICb7HZL5m9yzOZLs5I3IMgAAOCmdfuyJCO3QGIjQmVoxxaeLg4IMgAAuG9u6Wilkd2TJDyUS6g34FsAAKCGq12PZm0lr0GQAQDADdsz8mTnkRMSHhIsI7slero4KEWQAQCgBrUxZ3VuIbGRYZ4uDkoRZAAAqEH/mNFpjFbyJgQZAACqcSg7X9btzRJdjeD8tCRPFwcuCDIAAFRj/uaS2pgz2zaXpNhITxcHLggyAAC4OZsvo5W8D0EGAIAqZJ8qkhU7jpn7o5nN1+sQZAAAqMLCrRlSbLeka3KMdEiI9nRxUA5BBgCAKsxjtJJXI8gAAFCJ/CKbqZFRo3vSP8YbEWQAAKjE8h1H5UShTVLiIqVXqzhPFwcVIMgAAFBts1KyBOkkMvA6BBkAACpgs1syf1NpkGG0ktciyAAAUIE1e47LsROFEtckTAZ1iPd0cVAJggwAAFVMgjeqe5KEhXC59FZ8MwAAlGNZlsxzNisxWsmbEWQAAChn6+Fc2X3spESEBss5XRM9XRxUgSADAEAlo5WGd0mUqPBQTxcHVSDIAABQzrxNpYtE0qzk9QgyAAC42Hf8pGzYnyPBQSUdfeHdCDIAALhwzB0zoH28tIiJ8HRxUA2CDAAAFfSPGcMkeD6BIAMAQKnjJwrl+12ZzmUJ4P0IMgAAlFqwJcMsTdAjpam0iY/ydHHgBoIMAADlZvMdw2gln0GQAQBARE4V2mTxz0fM/dFp9I/xFQQZAABETIjJL7JL6+ZNpEdKrKeLAzcRZAAAcBmtpLUxQUFBni4O3ESQAQAEvGKbXRZscQy7pn+MLyHIAAAC3qpdxyXrZJHER4dL/3bNPV0c1ABBBgAQ8OaWjlbSJQlCQ7g0+hK+LQBAQLMsy7ksAbP5+h6CDAAgoG08kCP7s05Jk7AQGdYlwdPFQQ0RZAAAAc0xCd6IrokSGRbi6eLAn4LMo48+aobAud66d+/u6WIBAPzIvNJmpdGMVvJJoeLlevbsKV9//bVzOzTU64sMAPARu4+dkC2HciUkOEhGdSfI+CKvTwUaXFq2pPMVAKD+OTr5DukYL3FRYZ4uDvytaUn9/PPPkpqaKh07dpSrrrpK9uzZU+XxBQUFkpOTU+YGAEBVw65ZW8l3eXWQGTx4sLz99tsyZ84cmT59uqSnp8vw4cMlNze30udMmTJF4uLinLc2bdo0apkBAL7haF6BrN593Ny/II1mJV8VZOkAeh+RlZUl7dq1kxdeeEGuv/76Smtk9OagNTIaZrKzs6Vp06aNWFoAgDf7cNUeuf+/66V36zj57PZhni4OytHrt1ZIVHf99vo+Mq6aNWsmXbt2le3bt1d6TEREhLkBAODeIpHUxvgyr25aKi8vL0927NghKSkpni4KAMCH5RUUy5LtR8390czm69O8Osjcc889smjRItm1a5csX75cLr74YgkJCZErr7zS00UDAPiwxduOSGGxXTokREuXpBhPFwd14NVNS/v27TOh5dixY5KYmCjDhg2T7777ztwHAKCus/lqs5JOtgrf5dVB5oMPPvB0EQAAfkZrYhZsyTD3mc3X93l10xIAAPVtZfoxyc0vloSYCOnXprmni4M6IsgAAAJytJLOHRMcTLOSryPIAAACht1uOZcloFnJPxBkAAAB46f92XIoJ19iIkLlrE4tPF0c+HtnXwAA6oPNbsn36Zny5tKdZntE1wSJCA3xdLFQDwgyAAC/NmfDQXns801yMDvfuW/Z9mNm/4VnMMGqr6NpCQDgtzSsTPr3mjIhRmWfKjL79XH4NoIMAMBvm5O0JqailZEd+/RxPQ6+iyADAPBL2iemfE2MK40v+rgeB99FkAEA+KX9x0+6dVxGbuVhB96Pzr4AAL+SdbJQZi7fLa+XjlCqTlJsZIOXCQ2HIAMA8AsHs0/J60vS5f3v98jJQpvZFxIUJDar4j4wOqdvy7hIGdQhvpFLivpEkAEA+LTtGbkyY9FO+XTtfimylYSWtJSmMmlkJ9EVCG5/70ezzzXOOBYmmHxRmoSwTIFPI8gAAHzSmj3HZcbCHTKvdMkBNaRjvEwa2VnO6ZIgQUElAUWDSvl5ZLQmRkMM88j4PoIMAMBnWJYli7YdkekLd8jK0tFGmldGpyXLLSM6Sb+2p69mrWHlgrSWZnSSduzVPjHanERNjH8gyAAAvF6xzS5frj9ompA2H8wx+8JCguTifq3kpnM6SeekmCqfr6FlKGsr+SWCDADAa+UX2WTWD/vkn4t3yN7MU2ZfVHiI/N+gtnL98A6SEtfE00WEhxFkAABeR5cQ+Pd3u+WtZelyNK/Q7IuPDpfrzmovVw9tJ82iwj1dRHgJggwAwGsczsmXN5emy7sr90heQbHZ16pZE7npnI5y+YA20iScFatRFkEGAOBxO4/kyT8X75SP1+yXQpvd7OuWHGuGUP+6d4qEhTARPSpGkAEAeMxP+7JkxqId8tWGQ+KYt25g++YmwJzbLck5hBqoDEEGANDoQ6iXbT8m0xdtNz8dzu+RZIZQD2jPTLtwH0EGANAobHZL5m48ZOaAWb8/2zksenyfVLl5RCfp1jLW00WEDyLIAAAaVEGxzfR90T4w6UdPmH2RYcFyxcC2csPwDtK6eZSniwgfRpABADSI3PwiM/pIRyFl5BaYfc2iwmTi0PYy8az2Zjg1UFcEGQBAvTqSW2Dmf/nXd7slN79kCHVKXKTcMLyjXDGwjURHcOlB/eG3CQBQL3YfO2Gaj3Qm3sLikiHUunSAduAd1ydVwkMZQo36R5ABANTJxgPZZg2kL386IPbSIdT92jaTSSM6yfk9kiWYxRnRgAgyAIBaDaH+bmemTF+0QxZvO+LcP7Jbogkwuro0c8CgMRBkAABus9stmbfpsJnEbu3eLLNPK1x+0zvVNCGlpTb1dBERYAgyAIBqaZ+X2Wv3yz8W7ZAdR0qGUEeEBpv1j24c3lHatmAINTyDIAMAqJQu3PjB93vk9SXpcign3+yLjQyVa4a2k2vP6iCJsRGeLiICHEEGAHCaY3kFMnP5Lpm5Yrdknyoy+5JiI8wEdlcOaiuxkWGeLiJgEGQAAE57M0/K60t2yoer90p+UckQ6o4J0XLziI4yoV8riQgN8XQRgTIIMgAA2XIoR/6xaKd8tu6AWRNJ9W4dZ0Ygje7Z0qyJBHgjggwABLBVuzLNIo7fbMlw7hveJcGMQDqrUwuGUMPrEWQAIACHUH+7NcMEmNW7j5t9mld+1StFbjmnk/RqHefpIgJuI8gAQIAostnl83UHzBww2w7nmX3hIcFyaf/WctM5HaVDQrSniwjUGEEGAPzcycJi+XDVXjOEen/WKbMvJiJUrhrSVq4/u4MkNY30dBGBWiPIAICfOn6iUN5ZsVveXp4ux0+WDKFOiImQPwxrL1cNbidxTRhCDd9HkAEAP3Mg65Spfflg1R45WWgz+9rGR5kh1Jee2VoiwxhCDf9BkAEAP7E9I9esQj37x/1SXDqEOi2lqUwa2UnGntFSQkOCPV1EoN4RZADAx63Zc9yMQJq/6bBz39COLUyA0aHUDKGGPyPIAIAPsixLFm47IjMW7pCV6Zlmn+aV0WnJZg6Yfm2be7qIQKMgyACADym22eXL9QdNE9LmgzlmX1hIkFzcr5XcdE4n6ZwU4+kiAo2KIAMAPiC/yCazVu+Vfy7ZKXszS4ZQR4WHyFWD28ofhnWQlLgmni4i4BEEGQDwYrry9L+/2y1vLk2XYycKzb746HC57qz2cvXQdtIsKtzTRQQ8iiADAF7ocE6+vLE0Xd5buUfyCorNvlbNmpgh1L/t30aahDOEGlAEGQDwIjuP5Mk/F++Uj9fsl0Kb3ezrlhxrRiD9uneKhDGEGiiDIAMAXmDd3iyzBtKcjYfEKpkCRga1jzcBZmS3RIZQA5UgyACAB4dQL9t+TKYv2m5+OpzfI1kmjewo/dvFe7R8gC8gyABAI7PZLZmz4ZAJMBv2lwyhDg0OknF9U80cMF2TYz1dRMBnEGQAoBGHUGvfl38u3iG7jp00+5qEhcjvBraRG4Z3kNbNozxdRMDnEGQAoIHl5hfJuyv3mFFIR3ILzL5mUWEycWh7mXhWezOcGkDtEGQAoIFk5ObLW8t2mXlgcvNLhlCnxEXKjcM7mlqY6Aj+CQbqiv+KAKCe7T52wgyhnvXDPiksLhlCrUsHaP+XcX1SJTyUIdRAfSHIAEA92bA/2wyh/t/6g2IvHULdr20zuXVkZxnVPUmCgxlCDT9it4nsXi6Sd1gkJlmk3VkiwY0/USNBBgDqOIR6xc5jZhHHxduOOPfr3C+TRnSSQR3imQMG/mfTZyJz7hfJOfDLvqapIhc+I5I2rlGLQpABgFqw2y2Zt+mwTF+0w0xmp7TC5aI+qXLzOZ0kLbWpp4sINFyI+c81GuPL7s85WLL/8ncaNcwQZACgBrTPy+wf98uMxTtk55ETZl9EaLDpvKudeNvEM4Qaft6cNOf+00OMofuCROY8INL9143WzESQAQA36MKNH3y/R15fki6HcvLNvqaRoXLN0PZy7dntJSEmwtNFBBo+xGz+vGxz0mkskZz9JX1nOgyXxkCQASCBPsvu9+mZZqh0Umyk6dMS4tIp91hegby9fJfMXL5LckqHUCc3jZDrh3WQKwe1ldjIMA+WHqgndrvIyaMi2ftKgoiGFcf97NLt3AMi9pL/BqqlHYAbCUEGQMCas+GgPPb5JjmYXVLD4pjnZfJFadIzNU5eX7JTPly9V/KLSoZQd0yIlptHdJQJ/VpJRGjjj84AasWyRE4ecwkl+0tDyoFf7uceFLEVunGyoEqalcrRUUyNhCADIGBDzKR/rzntn2QNNbf8e43puOsYQt27dZzcOrKTXJDWskxtDeAVIeXU8UpqURy3AyLFv4T1ygWJxLYsGX3UtJVIXOty91uJRCWIvNK3pGNvhYEmqOQ5OhS7kRBkAARkc5LWxFT1d6WGmGGdW5g5YIZ2asEQangmpBTkVF6L4rhfVLJuV7Wik0TiWpUEEhNOyt2PTREJcaOpVIdYm1FL5WtnSv8bufDpRp1PhiADwGcV2+xyosAmuQVF5mdeQZFZCqCi+3nmZ7Hk5RfJwaz8Ms1Jlbnt3C4mxAANoiC38loUx/3CPPfOFdWi8loUs50qElpPHdJ1aLUOsa5wHpmnmUcGgP/Pv3KisOKwUXK/2ASO3ILS+/kl246bCS5mX5Gz70pD0Q7A8BONPQtt4cmqa1E0qBRku3euyGa/hJI4RzBp7VKjkioS1kQalYYVHWLNzL4AfGX22lNFjhoNl2ChwaOw5Kdr8HDer/B4W72XT9cuio0INYswxugtsvRn+fultwPZp2Tq1z9Xe14dxQQ/UN+z0Bbln15zUv6+9ltxR0RcSVkcoeS0GpVUkfBo8UrBIY02xLoqBJlasBUXy5aVc+XU8f3SpHkr6T54jISE8lH62+fqbeWpjYJi22lBwrV2wwSL0toPRyhxrRVxPd7R8bW+hAYHmZARHR4qsaVhwwQRvR9eRRgpF0z0OTVdhFH7yHy4aq8cys6XILHLoOAtkiRZkiHN5Ht7d7EkWFrGlQzFRoDNQltcUDKCp9J+KftLRgC5IzzmlxoTE1Ran16jEhFbv+83AAVZ+qeWl5s2bZo899xzcujQIenTp4+88sorMmjQILeem5OTI3FxcZKdnS1Nm9Z9yvAf586U1BWPSbL88ot8WFrIgaGTpd+YiXU+f6Dyts/Vk+UpMv0+KgkfFdSGlDSzlAYSl/v6s8hWv/95a39X15ChIaJMCCnddtaMVBFEdDZcT3ag1VFLs9+bIY+EvSOpQZnO/QeseHm86BqZ8H+3yIVnpHisfKin5qSpZ1Q9gZvWdnQYWTJHioaXExnunTu0ScUdZ11rVCLjSv6jQa24e/32+iDz4YcfyjXXXCMzZsyQwYMHy9SpU2XWrFmydetWSUpKatQgoxe3Psv/aO67jsB0/KW67qyXCTN+8LnWpjw2Z7+P05tZyoSQ0maYyoKHbhcU13+/j6jwkEqbWUytiGsIKQ0qzqYal/t6Hr8ZvbPpM7H+c41Ypv7lF/rpB+n/Gnm9mEan//Tr5Ga2opKfrrfy+8y2TcTust/meLyomm3HPpvLectvu/Pa7ryWy7HmeUW1+2xCIkprUarol9KkOSGlgflNkNHwMnDgQPn73/9utu12u7Rp00buuOMOeeCBBxotyGgzw9G/dpVE61iZi5vrRS4jqIWE/3ljpc0Ptfmdr+lTanqRqc1/hjV9H3pRqOpzPfFsj2o/16Lb15n2WA0MNssq+el6syzTibTYXvJTt533XY5xfY69/DGWSHFxoYz/dqwkSeXlOSQt5NYWb0pOkTibZhqi34fWWFRbu+ESRCoKHo6mG+Y+qelf6joXRorIpO9Kok2Zi2N1F93ishf98iGg2gtzTS7w5Y+pJly4ntuq/99Zn9X3qpKOq44aFR0BREjxOL8IMoWFhRIVFSUfffSRTJgwwbl/4sSJkpWVJZ9++ulpzykoKDA31w9Cg09dg8zGZV9Kz/n/V+1x62wdJFtiav06gSZO8qRPSHq1x/1ka3/a5xpUwSwgFf3T4+5xpjxBeZIWvKfa8my2t5FciXKe23E+/andNYKDgyQ0SEyACAkq2Q4JCpKQYDE/g0t/uj4WHGyV/NTnBQWVK3fpfecul8ec/wk7jqnoeVbDPa+icjV2GSp83mmF++U4vbC7NUFYAAoOFQkOK/kZElp2Wzt3hjjul94q3Q6p/DxVnjesmm13Xrv0tv8Hkf9cXf17nviFV3RaRe2CjFf3XDx69KjYbDZJTi471bFub9mypcLnTJkyRR577LF6L4t2+HSHOxdl1FzvkF3iTXoE7636AEfrEH/0+o+g4CouxhVceCu90Lpe4F2OdeuiX9V5qwsTlb2263ND/KsmwjFLrRfNQov659VBpjYefPBBufvuu0+rkakrHbXijj09b5HUzn2lPtS0qswb69a0/0FVDv28TtptnlHtefadcau07nqm1F+bXcXP2bt1rbRZ/3K1T9/T+4/StvsAx8kqOGf5fS6Pld/n9vOkkV+vJs9z3SceKoO7z9NfqNUin9wk1brqvyIdzim9yNdsZBS8gAYzL5uFFgEWZBISEiQkJEQOHy67iqZut2zZssLnREREmFt906G3h+e3qLYvR6uLn/S5Ibqe1Lr35XL4r7Oq/VxTJjwh0gifa2r38XJ4/bvVf8/jJjdKedBAmrcXWfBo9X+pdzqXi5yv87JZaFH/vPpPjPDwcOnfv78sWLDAuU87++r20KFDG7UsGk506K0pQ7l/9xzbB4dOJsT4+OfqbeVBA/+lbpRPrPyl7nc0rNy1oaQvzKVvlPy8az0hxk94dZBR2kz02muvycyZM2Xz5s0yadIkOXHihFx33XWNXhYdcqtDb48ElV17Rf9CZ+i1/3yu3lYeNPBf6jo6yZX+pe7vQ68DkWMW2l6XlfwkpPoNrx615KBDrx0T4vXt21defvllMyzbExPi+cuMr97I2z5XbysP/GQNHgCBM/y6PjREkAEAAN5x/fb6piUAAIDKEGQAAIDPIsgAAACfRZABAAA+iyADAAB8FkEGAAD4LIIMAADwWQQZAADgswgyAADAZ/n9fOuOiYt1hkAAAOAbHNft6hYg8Psgk5uba362adPG00UBAAC1uI7rUgUBu9aS3W6XAwcOSGxsrAQFBZl9AwcOlFWrVlV4fGWPld+vSVHD0d69e71qDaeq3punzlvT57pzfHXH1PZxvmf/+Z5r8lggfc91PWdNnu/usXzPfM8VPa7xRENMamqqBAcHB26NjL751q1bl9kXEhJS6S9xZY9Vtl/3edN/EFW9N0+dt6bPdef46o6p7eN8z/7zPdfmsUD4nut6zpo8391j+Z75nit7vKqamIDu7HvbbbfV+LGqnuNNGqqcdTlvTZ/rzvHVHVPbx/me/ed7ru1j3qQhylnXc9bk+e4ey/fM91yXMvt905KnlxeHb+N7Dgx8z4GB79k/BWSNTH2IiIiQyZMnm5/wX3zPgYHvOTDwPfsnamQAAIDPokYGAAD4LIIMAADwWQQZAADgswgyAADAZxFkAACAzyLINJAvvvhCunXrJl26dJHXX3/d08VBA7n44oulefPmctlll3m6KGggOp39yJEjJS0tTXr37i2zZs3ydJHQALKysmTAgAHSt29fOeOMM+S1117zdJHgJoZfN4Di4mLzj963335rJl/q37+/LF++XFq0aOHpoqGeLVy40KwFMnPmTPnoo488XRw0gIMHD8rhw4fNBe7QoUPmv+dt27ZJdHS0p4uGemSz2aSgoECioqLkxIkTJsysXr2af7d9ADUyDeD777+Xnj17SqtWrSQmJkbGjh0r8+bN83Sx0AD0L3VdkBT+KyUlxYQY1bJlS0lISJDMzExPFwv1TNf50RCjNNDo3/j8ne8bCDIVWLx4sVx00UVmxU1dMXv27NmnHTNt2jRp3769REZGyuDBg014cdDVtjXEOOj9/fv3N1r50TjfMwLve/7hhx/MX+66gjL873vW5qU+ffqYhYbvvfdeE1rh/QgyFdBqRf1l1l/6inz44Ydy9913m6mu16xZY44dM2aMZGRkNHpZUXt8z4Ghvr5nrYW55ppr5J///GcjlRyN/T03a9ZM1q1bJ+np6fLee++ZJkX4AO0jg8rpR/TJJ5+U2Tdo0CDrtttuc27bbDYrNTXVmjJlitletmyZNWHCBOfjd955p/Xuu+82YqnRGN+zw7fffmtdeumljVZWNP73nJ+fbw0fPtx65513GrW8aPz/nh0mTZpkzZo1q8HLirqjRqaGCgsLTfXy+eef79wXHBxstlesWGG2Bw0aJBs2bDDNSXl5efLVV1+Z5A//+p4RGN+zXhevvfZaOe+88+Tqq6/2YGnRkN+z1r5ox32lq2NrU5WOPIX3C/V0AXzN0aNHTRt5cnJymf26vWXLFnM/NDRUnn/+eTn33HPFbrfLfffdR893P/yelf5DqFXRWq2t7eo6NHfo0KEeKDEa6ntetmyZaZbQodeOfhf/+te/pFevXh4pMxrme969e7fcdNNNzk6+d9xxB9+xjyDINJBx48aZG/zb119/7ekioIENGzbM/EEC/6Y16WvXrvV0MVALNC3VkPZi12F65TuB6bYOzYR/4HsODHzPgYHv2b8RZGooPDzcTIi1YMEC5z79a023aVLwH3zPgYHvOTDwPfs3mpYqoB10t2/f7tzWoXha5RgfHy9t27Y1Q/gmTpxoprPW6sipU6eaPhLXXXedR8uNmuF7Dgx8z4GB7zmA1cPIJ7+jw2n1oyl/mzhxovOYV155xWrbtq0VHh5uhvV99913Hi0zao7vOTDwPQcGvufAxVpLAADAZ9FHBgAA+CyCDAAA8FkEGQAA4LMIMgAAwGcRZAAAgM8iyAAAAJ9FkAEAAD6LIAMAAHwWQQZAo9i1a5cEBQV51QrDW7ZskSFDhkhkZKT07dvX08UBUAsEGSBAXHvttSZIPP3002X2z5492+wPRJMnT5bo6GjZunVrmQUFAfgOggwQQLTm4ZlnnpHjx4+LvygsLKz1c3fs2CHDhg2Tdu3aSYsWLRr89QDUP4IMEEDOP/98admypUyZMqXSYx599NHTmll0peD27duXqd2ZMGGCPPXUU5KcnCzNmjWTxx9/XIqLi+Xee+81Kw63bt1a3nrrrQqbc8466ywTqs444wxZtGhRmcc3bNggY8eOlZiYGHPuq6++Wo4ePep8fOTIkXL77bfLXXfdJQkJCTJmzJgK34fdbjdl0nJERESY9zRnzhzn41oL9cMPP5hj9L6+74pU9npabl1FWc+dkpIiDzzwgHn/6osvvjCfic1mM9vanKavocc43HDDDfL73//e3N+9e7dcdNFF0rx5c1ND1LNnT/nf//5X6XcE4BcEGSCAhISEmPDxyiuvyL59++p0rm+++UYOHDggixcvlhdeeME00/zmN78xF+OVK1fKLbfcIjfffPNpr6NB589//rP8+OOPMnToUHMBP3bsmHksKytLzjvvPOnXr5+sXr3aBI/Dhw/L5ZdfXuYcM2fOlPDwcFm2bJnMmDGjwvK99NJL8vzzz8vf/vY3+emnn0wAGTdunPz888/m8YMHD5rAoGXR+/fcc0+l77X86+3fv19+9atfycCBA2XdunUyffp0eeONN+Svf/2rOX748OGSm5tr3qMj9GgIWrhwofOcuk9DkrrtttukoKDAfJbr1683tWYa5AC4wdPLbwNoHBMnTrTGjx9v7g8ZMsT6wx/+YO5/8sknlus/BZMnT7b69OlT5rkvvvii1a5duzLn0m2bzebc161bN2v48OHO7eLiYis6Otp6//33zXZ6erp5naefftp5TFFRkdW6dWvrmWeeMdtPPPGENXr06DKvvXfvXvO8rVu3mu0RI0ZY/fr1q/b9pqamWk8++WSZfQMHDrRuvfVW57a+T32/Vano9R566CHzfu12u3PftGnTrJiYGOdncuaZZ1rPPfecuT9hwgRTlvDwcCs3N9fat2+feU/btm0zj/fq1ct69NFHq31PAE5HjQwQgPQvfq1l2Lx5c63PobUZwcG//BOizUC9evUqU/uj/U4yMjLKPE9rYRxCQ0NlwIABznJo7ca3335raiMct+7duzv7szj079+/yrLl5OSY2qKzzz67zH7drs17Lv96eg59H66dpPXceXl5zhqoESNGmBoYy7JkyZIlcskll0iPHj1k6dKlpjYmNTVVunTpYo794x//aGpz9Bxas6U1SADcQ5ABAtA555xjmloefPDB0x7TcKIXX1dFRUWnHRcWFlZmWy/qFe3Tviru0iCgTU3ap8T1ps1BWmYH7UfSmGrzetpspKFFw5l+LhrIdJ+GGw0yGnRc+8vs3LnT9AfSpiUNd9r8B6B6BBkgQOkw7M8//1xWrFhRZn9iYqIcOnSoTJipz7lfvvvuO+d97RyrHW61pkKdeeaZsnHjRtOxuHPnzmVuNQkTTZs2NTUe2qfFlW6npaXV+T1oefVzc/2M9NyxsbGmc7FrP5kXX3zRGVocQUZvjv4xDm3atDH9ij7++GPTb+e1116rczmBQECQAQKUNgNdddVV8vLLL5fZrxfYI0eOyLPPPmuac6ZNmyZfffVVvb2unu+TTz4xo5e0k6sOBf/DH/5gHtPtzMxMufLKK2XVqlXm9efOnSvXXXedcwSQu7RTsTahffjhh2aeGB0xpIHszjvvrPN7uPXWW2Xv3r1yxx13mPfx6aefmiahu+++29ncpp2ee/fuLe+++64ztGit0po1a2Tbtm1lamR0RJS+z/T0dPO4Nq85wh2AqhFkgACmQ4/LN/3oBfTVV181gaNPnz7y/fffVzmipzY1QXrTc2vTy2effWZG9ChHLYqGltGjR5uwpRd5Hcrs2h/HHdrvRIOF1m7oeXQElL6Wo19KXbRq1coMj9bPRt+H1qRcf/318pe//KXMcRpW9L04gowOS9caIR0C361bN+dxeoyGOP3sL7zwQunatav5DgBUL0h7/LpxHAAAgNehRgYAAPgsggwAAPBZBBkAAOCzCDIAAMBnEWQAAIDPIsgAAACfRZABAAA+iyADAAB8FkEGAAD4LIIMAADwWQQZAADgswgyAABAfNX/BxHMAKaWZTvyAAAAAElFTkSuQmCC",
-      "text/plain": [
-       "<Figure size 640x480 with 1 Axes>"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
-   "source": [
-    "import matplotlib.pyplot as plt\n",
-    "import time\n",
-    "\n",
-    "cursor = connection.cursor()\n",
-    "cursor.execute(\"truncate table mytab\")\n",
-    "\n",
-    "# Row counts to test inserting\n",
-    "numrows = (1, 5, 10, 100, 1000)\n",
-    "\n",
-    "longstring = \"x\" * 1000\n",
-    "\n",
-    "def create_data(n):\n",
-    "    d = []\n",
-    "    for i in range(n):\n",
-    "        d.append((i, longstring))\n",
-    "    return d\n",
-    "\n",
-    "ex = []  # seconds for execute() loop\n",
-    "em = []  # seconds for executemany()\n",
-    "\n",
-    "for n in numrows:\n",
-    "    \n",
-    "    rows = create_data(n)\n",
-    "    \n",
-    "    ############################################################\n",
-    "    #\n",
-    "    # Loop over each row\n",
-    "    #\n",
-    "\n",
-    "    start=time.time()\n",
-    "\n",
-    "    for r in rows:\n",
-    "        cursor.execute(\"insert into mytab(id, data) values (:1, :2)\", r)          # <==== Loop over execute()\n",
-    "        \n",
-    "    elapsed = time.time() - start\n",
-    "    ex.append(elapsed)\n",
-    "    \n",
-    "    r, = cursor.execute(\"select count(*) from mytab\").fetchone()\n",
-    "    print(\"execute() loop {:6d} rows in {:06.4f} seconds\".format(r, elapsed))    \n",
-    "    connection.rollback()\n",
-    "    \n",
-    "    ############################################################# \n",
-    "    #\n",
-    "    # Insert all rows in one call\n",
-    "    #\n",
-    "\n",
-    "    start = time.time()\n",
-    "\n",
-    "    cursor.executemany(\"insert into mytab(id, data) values (:1, :2)\", rows)       # <==== One executemany()\n",
-    "    \n",
-    "    elapsed = time.time() - start\n",
-    "    em.append(elapsed)\n",
-    "    \n",
-    "    r, = cursor.execute(\"select count(*) from mytab\").fetchone()\n",
-    "    print(\"executemany()  {:6d} rows in {:06.4f} seconds\".format(r, elapsed))  \n",
-    "    connection.rollback()\n",
-    "\n",
-    "\n",
-    "print(\"Plot is:\")\n",
-    "plt.xticks(numrows)\n",
-    "plt.plot(numrows, ex, label=\"execute() loop\", marker=\"o\")\n",
-    "plt.plot(numrows, em, label=\"one executemany()\", marker=\"o\")\n",
-    "plt.xscale(\"log\")\n",
-    "plt.xlabel('Number of rows')\n",
-    "plt.ylabel('Seconds')\n",
-    "plt.legend(loc=\"upper left\")\n",
-    "plt.show()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Noisy Data - Batch Errors\n",
-    "\n",
-    "Dealing with bad data is easy with the `batcherrors` parameter."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 20,
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "(10, 'Parent 10')\n",
-      "(20, 'Parent 20')\n",
-      "(30, 'Parent 30')\n",
-      "(40, 'Parent 40')\n",
-      "(50, 'Parent 50')\n",
-      "(1001, 10, 'Child A of Parent 10')\n",
-      "(1002, 20, 'Child A of Parent 20')\n",
-      "(1003, 20, 'Child B of Parent 20')\n",
-      "(1004, 20, 'Child C of Parent 20')\n",
-      "(1005, 30, 'Child A of Parent 30')\n",
-      "(1006, 30, 'Child B of Parent 30')\n",
-      "(1007, 40, 'Child A of Parent 40')\n",
-      "(1008, 40, 'Child B of Parent 40')\n",
-      "(1009, 40, 'Child C of Parent 40')\n",
-      "(1010, 40, 'Child D of Parent 40')\n",
-      "(1011, 40, 'Child E of Parent 40')\n",
-      "(1012, 50, 'Child A of Parent 50')\n",
-      "(1013, 50, 'Child B of Parent 50')\n",
-      "(1014, 50, 'Child C of Parent 50')\n",
-      "(1015, 50, 'Child D of Parent 50')\n",
-      "(1016, 10, 'Child Red')\n",
-      "(1018, 20, 'Child Blue')\n",
-      "(1022, 40, 'Child Yellow')\n"
-     ]
-    }
-   ],
-   "source": [
-    "# Initial data\n",
-    "\n",
-    "cursor.execute(\"truncate table mytab\")\n",
-    "\n",
-    "for row in cursor.execute(\"select * from ParentTable order by ParentId\"):\n",
-    "    print(row)\n",
-    "\n",
-    "for row in cursor.execute(\"select * from ChildTable order by ChildId\"):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Additional data, some of it invalid:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 21,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n",
-      "Errors in rows that were not inserted:\n",
-      "\n",
-      "Error ORA-00001: unique constraint (PYTHONDEMO.CHILDTABLE_PK) violated on table PYTHONDEMO.CHILDTABLE columns (CHILDID)\n",
-      "ORA-03301: (ORA-00001 details) row with column values (CHILDID:1016) already exists\n",
-      "Help: https://docs.oracle.com/error-help/db/ora-00001/ at row offset 0\n",
-      "Error ORA-00001: unique constraint (PYTHONDEMO.CHILDTABLE_PK) violated on table PYTHONDEMO.CHILDTABLE columns (CHILDID)\n",
-      "ORA-03301: (ORA-00001 details) row with column values (CHILDID:1018) already exists\n",
-      "Help: https://docs.oracle.com/error-help/db/ora-00001/ at row offset 1\n",
-      "Error ORA-00001: unique constraint (PYTHONDEMO.CHILDTABLE_PK) violated on table PYTHONDEMO.CHILDTABLE columns (CHILDID)\n",
-      "ORA-03301: (ORA-00001 details) row with column values (CHILDID:1018) already exists\n",
-      "Help: https://docs.oracle.com/error-help/db/ora-00001/ at row offset 2\n",
-      "Error ORA-00001: unique constraint (PYTHONDEMO.CHILDTABLE_PK) violated on table PYTHONDEMO.CHILDTABLE columns (CHILDID)\n",
-      "ORA-03301: (ORA-00001 details) row with column values (CHILDID:1022) already exists\n",
-      "Help: https://docs.oracle.com/error-help/db/ora-00001/ at row offset 3\n",
-      "Error ORA-02291: integrity constraint (PYTHONDEMO.CHILDTABLE_FK) violated - parent key not found\n",
-      "Help: https://docs.oracle.com/error-help/db/ora-02291/ at row offset 4\n",
-      "\n",
-      "Rows that were successfully inserted:\n",
-      "\n",
-      "(1001, 10, 'Child A of Parent 10')\n",
-      "(1002, 20, 'Child A of Parent 20')\n",
-      "(1003, 20, 'Child B of Parent 20')\n",
-      "(1004, 20, 'Child C of Parent 20')\n",
-      "(1005, 30, 'Child A of Parent 30')\n",
-      "(1006, 30, 'Child B of Parent 30')\n",
-      "(1007, 40, 'Child A of Parent 40')\n",
-      "(1008, 40, 'Child B of Parent 40')\n",
-      "(1009, 40, 'Child C of Parent 40')\n",
-      "(1010, 40, 'Child D of Parent 40')\n",
-      "(1011, 40, 'Child E of Parent 40')\n",
-      "(1012, 50, 'Child A of Parent 50')\n",
-      "(1013, 50, 'Child B of Parent 50')\n",
-      "(1014, 50, 'Child C of Parent 50')\n",
-      "(1015, 50, 'Child D of Parent 50')\n",
-      "(1016, 10, 'Child Red')\n",
-      "(1018, 20, 'Child Blue')\n",
-      "(1022, 40, 'Child Yellow')\n"
-     ]
-    }
-   ],
-   "source": [
-    "dataToInsert = [\n",
-    "    (1016, 10, 'Child Red'),\n",
-    "    (1018, 20, 'Child Blue'),\n",
-    "    (1018, 30, 'Child Green'),  # duplicate key\n",
-    "    (1022, 40, 'Child Yellow'),\n",
-    "    (1021, 75, 'Child Orange')  # parent does not exist\n",
-    "]\n",
-    "    \n",
-    "cursor.executemany(\"insert into ChildTable values (:1, :2, :3)\", dataToInsert, batcherrors=True)\n",
-    "\n",
-    "print(\"\\nErrors in rows that were not inserted:\\n\")\n",
-    "for error in cursor.getbatcherrors():\n",
-    "    print(\"Error\", error.message, \"at row offset\", error.offset)   \n",
-    "\n",
-    "print(\"\\nRows that were successfully inserted:\\n\")\n",
-    "for row in cursor.execute(\"select * from ChildTable order by ChildId\"):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Now you can choose whether or not to fix failed records and reinsert them.\n",
-    "You can then rollback or commit.\n",
-    "\n",
-    "This is true even if you had enabled autocommit mode - no commit will occur if there are batch errors."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Roll back so the example can be re-run\n",
-    "connection.rollback()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Direct Path Loads\n",
-    "\n",
-    "Documentation reference link: [Direct Path Loads](https://python-oracledb.readthedocs.io/en/latest/user_guide/batch_statement.html#direct-path-loads)\n",
-    "\n",
-    "Direct Path Loading is an Oracle Database feature most commonly known from SQL*Loader. It is efficient for ingesting very large data sets into Oracle Database."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "SCHEMA_NAME = \"pythondemo\"\n",
-    "TABLE_NAME = \"mytab\"\n",
-    "COLUMN_NAMES = [\"id\", \"data\"]\n",
-    "DATA = [\n",
-    "    (1, \"A first row\"),\n",
-    "    (2, \"A second row\"),\n",
-    "    (3, \"A third row\")\n",
-    "]\n",
-    "\n",
-    "connection.direct_path_load(\n",
-    "    schema_name=SCHEMA_NAME,\n",
-    "    table_name=TABLE_NAME,\n",
-    "    column_names=COLUMN_NAMES,\n",
-    "    data=DATA\n",
-    ")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Direct Path Loads are efficient because some Oracle Database code layers are bypassed. There are also no INSERT statements involved. This means there are a few restrictions on when to use the feature: refer to Oracle Database documentation such as SQL*Loader [Direct Path Loads](https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-0D576DEF-7918-4DD2-A184-754D217C021F)."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Verify inserted data\n",
-    "\n",
-    "for row in cursor.execute('select * from mytab'):\n",
-    "    print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Note that the data is automatically committed."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Remove the data so the sample can be re-run cleanly\n",
-    "\n",
-    "cursor.execute(\"truncate table mytab\")\n",
-    "connection.commit()"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/samples/notebooks/4-DataFrames.ipynb b/samples/notebooks/4-DataFrames.ipynb
deleted file mode 100644
index 42c4961b..00000000
--- a/samples/notebooks/4-DataFrames.ipynb
+++ /dev/null
@@ -1,248 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "cbc9caf8-be1a-43f5-aafe-252ce2cfa32d",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "db9894be-9081-41ef-b77c-4099f6a8bfa4",
-   "metadata": {},
-   "source": [
-    "# Data Frames\n",
-    "\n",
-    "Documentation reference link: [Working with Data Frames](https://python-oracledb.readthedocs.io/en/latest/user_guide/dataframes.html)\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "41df9da5-373d-407d-8fe7-7d07652e671e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "cursor = connection.cursor()\n",
-    "try:\n",
-    "    cursor.execute(\"drop table mytab\")\n",
-    "except:\n",
-    "    pass\n",
-    "cursor.execute(\"create table mytab (id number, data varchar2(1000))\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "1ecc6448-868e-4ae8-8637-f89d369764fc",
-   "metadata": {},
-   "source": [
-    "## Working with Data Frames\n",
-    "\n",
-    "Python-oracledb can query directly to a data frame format, and can also insert data frames into Oracle Database. This can improve performance and reduce memory requirements when your application uses Python data frame libraries such as Apache PyArrow, Pandas, Polars, NumPy, Dask, PyTorch, or writes files in Apache Parquet format.\n",
-    "\n",
-    "Python-oracledb has two methods for querying into a DataFrame:\n",
-    "- `Connection.fetch_df_all()` fetches all rows from a query\n",
-    "- `Connection.fetch_df_batches()` implements an iterator for fetching batches of rows"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "4308706b-8e7c-4b7f-8fe1-6593e8d11e3c",
-   "metadata": {},
-   "source": [
-    "To fetch all table rows into a Pandas DataFrame:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "518f59f6-6582-488b-b426-d16aa661c53a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import pyarrow\n",
-    "\n",
-    "sql = \"select id, name from SampleQueryTab where id < :idbv order by id\"\n",
-    "odf = connection.fetch_df_all(statement=sql, arraysize=100, parameters=[5])\n",
-    "\n",
-    "# Get a Pandas DataFrame from the data\n",
-    "df = pyarrow.table(odf).to_pandas()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c3b12661-bdbe-4c45-a051-ed7cc840780b",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "572964be-01d3-4cfc-9fd3-ec316e2256ad",
-   "metadata": {},
-   "source": [
-    "For larger tables you can adjust `arraysize` to optimize network performance."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7dd9bf73-21dc-4fdd-8ede-db4c912875de",
-   "metadata": {},
-   "source": [
-    "You can alter the types and names by specifying a custom schema:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f4aabdac-3246-40bd-bff3-c40f7244cff5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sql = \"select id, name from SampleQueryTab where id < :idbv order by id\"\n",
-    "\n",
-    "schema = pyarrow.schema(\n",
-    "    [(\"COL_1\", pyarrow.int16()), \n",
-    "     (\"COL_2\", pyarrow.string())]\n",
-    ")\n",
-    "\n",
-    "odf = connection.fetch_df_all(statement=sql, arraysize=100, parameters=[5], requested_schema=schema)\n",
-    "df = pyarrow.table(odf).to_pandas()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "609585ce-3cbc-46bf-9322-36c4b3512c99",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "df"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8982d8b1-ae47-477e-ab3d-088f48ef73e2",
-   "metadata": {},
-   "source": [
-    "## Inserting DataFrames\n",
-    "\n",
-    "DataFrames from popular libraries can be inserted directly into Oracle Database using `executemany()`:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b0b23b2e-8811-4f27-bd0b-923fdeb588be",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import pandas\n",
-    "\n",
-    "# Create a DataFrame manually\n",
-    "d = {'A': [1.2, 2.4, 8.9], 'B': [\"Alex\", \"Bobbie\", \"Charlie\"]}\n",
-    "pdf = pandas.DataFrame(data=d)\n",
-    "\n",
-    "# Insert into the database\n",
-    "cursor.executemany(\"insert into mytab (id, data) values (:1, :2)\", pdf)\n",
-    "\n",
-    "# Verify rows\n",
-    "rows = cursor.execute(\"select * from mytab\")\n",
-    "for r in rows:\n",
-    "    print(r)\n",
-    "\n",
-    "connection.rollback()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "0231d747-2f25-4bf3-991e-87035c3c6365",
-   "metadata": {},
-   "source": [
-    "You can also insert large DataFrames using **Direct Path Loading**:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1414110c-2923-4561-9dc4-01492e4450fb",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "SCHEMA_NAME = \"pythondemo\"\n",
-    "TABLE_NAME = \"mytab\"\n",
-    "COLUMN_NAMES = [\"id\", \"data\"]\n",
-    "DATA = pdf\n",
-    "\n",
-    "connection.direct_path_load(\n",
-    "    schema_name=SCHEMA_NAME,\n",
-    "    table_name=TABLE_NAME,\n",
-    "    column_names=COLUMN_NAMES,\n",
-    "    data=DATA\n",
-    ")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "5fe0e958-a626-4853-9717-9250d6b7e000",
-   "metadata": {},
-   "source": [
-    "Verify inserted data"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ec755f98-8f51-459b-b08a-e37a1522d778",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for row in cursor.execute('select * from mytab'):\n",
-    "    print(row)\n",
-    "\n",
-    "# Remove the data so the sample can be re-run cleanly\n",
-    "cursor.execute(\"truncate table mytab\")\n",
-    "connection.commit()    "
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/samples/notebooks/5-CSV.ipynb b/samples/notebooks/5-CSV.ipynb
deleted file mode 100644
index b3231ac3..00000000
--- a/samples/notebooks/5-CSV.ipynb
+++ /dev/null
@@ -1,256 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "04c694cd",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "b739ae65",
-   "metadata": {},
-   "source": [
-    "# Loading and Unloading Data: Working with Comma Separated Values (CSV) files"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "2b027728",
-   "metadata": {},
-   "source": [
-    "CSV is not a well-defined standard! "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "581e9486",
-   "metadata": {},
-   "source": [
-    "\"Unhelpful\" (that's a joke) suggestions for Python programmers:\n",
-    "- Don't use CSV files: Keep the data in the database.\n",
-    "- Don't use Excel - use Oracle APEX\n",
-    "- Use Oracle SQL*Loader to load CSV files into Oracle Database\n",
-    "<hr>"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "6cb0a244",
-   "metadata": {},
-   "source": [
-    "Helpful suggestions:\n",
-    "- Python's [\"csv\" module](https://docs.python.org/3/library/csv.html) has extensive reading and writing support\n",
-    "- The PyArrow package also contains [CSV functionality](https://arrow.apache.org/docs/python/generated/pyarrow.csv.read_csv.html) that may be faster for some use cases\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1d9c084a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "3ae66a62",
-   "metadata": {},
-   "source": [
-    "## Reading CSV Files and Inserting Data into Oracle Database\n",
-    "\n",
-    "Set up the schema:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ed1517dd",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    try:\n",
-    "        cursor.execute(\"drop table t\")\n",
-    "    except:\n",
-    "        pass\n",
-    "\n",
-    "    cursor.execute(\"\"\"create table t (k number, \n",
-    "                                      first_name varchar2(30), \n",
-    "                                      last_name varchar2(30), \n",
-    "                                      country varchar2(30))\"\"\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8dba72c1",
-   "metadata": {},
-   "source": [
-    "Data in the external CSV file looks like:\n",
-    "\n",
-    "    1,Fred,Nurke,UK\n",
-    "    2,Henry,Crun,UK\n",
-    "\n",
-    "The Python csv module has extensive functionality.  One sample is shown below.  For python-oracledb users the important points are to use `executemany()` and send batches of rows to the database.  Tuning in your environment will determine the best batch size."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "bace97d8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import csv\n",
-    "\n",
-    "# The batch size determines how many records are inserted at a time.\n",
-    "# Adjust the size to meet your memory and performance requirements.\n",
-    "batch_size = 10000\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    \n",
-    "    sql = \"insert into t (k, first_name, last_name, country) values (:1, :2, :3, :4)\"\n",
-    "    \n",
-    "    # Predefine memory areas to match the table definition (or max data) to avoid memory re-allocs\n",
-    "    cursor.setinputsizes(None, 30, 30, 30)\n",
-    "\n",
-    "    with open(\"csv/data1.csv\", \"r\") as csv_file:\n",
-    "        csv_reader = csv.reader(csv_file, delimiter=',')\n",
-    "        data = []\n",
-    "        for line in csv_reader:\n",
-    "            data.append((line[0], line[1], line[2], line[3]))   # e.g [('1', 'Fred', 'Nurke', 'UK')]\n",
-    "            if len(data) % batch_size == 0:\n",
-    "                cursor.executemany(sql, data)\n",
-    "                data = []\n",
-    "        if data:\n",
-    "            cursor.executemany(sql, data)\n",
-    "        connection.commit()\n",
-    "\n",
-    "print(\"Done\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c8d3ed6e-a7ce-4245-b34d-c419939f71b5",
-   "metadata": {},
-   "source": [
-    "Check the results:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4a0b4215",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    sql = \"select * from t order by k\"\n",
-    "    for r in cursor.execute(sql):\n",
-    "        print(r)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7ff76bf5",
-   "metadata": {},
-   "source": [
-    "Tuning database features may also be beneficial. For example, disabling logging and/or indexes."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "08f9bc4e",
-   "metadata": {},
-   "source": [
-    "## Writing CSV Files from Queried Data\n",
-    "\n",
-    "This example shows just one way to write CSV files.  The important point for python-oracledb users is to tune `cursor.arraysize` for your data and network."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "bbc9db48",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import time\n",
-    "\n",
-    "sql = \"select * from all_objects where rownum <= 10000\"\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    start = time.time()\n",
-    "\n",
-    "    cursor.arraysize = 1000\n",
-    "\n",
-    "    with open(\"testwrite.csv\", \"w\", encoding=\"utf-8\") as outputfile:\n",
-    "        writer = csv.writer(outputfile, lineterminator=\"\\n\")\n",
-    "        results = cursor.execute(sql)\n",
-    "        writer.writerows(results)\n",
-    "\n",
-    "    elapsed = time.time() - start\n",
-    "    print(\"Writing CSV: 10000 rows in {:06.4f} seconds\".format(elapsed))  "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7b3ddf5e",
-   "metadata": {},
-   "source": [
-    "If you change the arraysize and rerun the cell, the time taken may vary."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "62a7ecfe",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Confirm the number of lines in the output file is correct\n",
-    "\n",
-    "import os\n",
-    "\n",
-    "r = os.system(\"wc -l testwrite.csv\")"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/samples/notebooks/6-JSON.ipynb b/samples/notebooks/6-JSON.ipynb
deleted file mode 100644
index 864aef25..00000000
--- a/samples/notebooks/6-JSON.ipynb
+++ /dev/null
@@ -1,207 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "a9825ce4",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7b00c7cf",
-   "metadata": {},
-   "source": [
-    "# Working with JSON Data\n",
-    "\n",
-    "Documentation reference link: [Using JSON Data](https://python-oracledb.readthedocs.io/en/latest/user_guide/json_data_type.html)\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1e091ca8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "a81ba26a",
-   "metadata": {},
-   "source": [
-    "### JSON Storage:\n",
-    "\n",
-    "- Oracle Database 12c introduced JSON stored as a LOB or VARCHAR2\n",
-    "\n",
-    "- Oracle Database 21c introduced a new optimized native binary format and a dedicated JSON type\n",
-    "\n",
-    "**Careful coding is required for apps that run in a mixed version environment**\n",
-    "\n",
-    "The first JSON example assumes you are using Oracle Database 21c or later.\n",
-    "\n",
-    "Setup the schema:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "caa04809",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    try:\n",
-    "        cursor.execute(\"drop table customers\")\n",
-    "    except:\n",
-    "        pass\n",
-    "    cursor.execute(\"create table customers (k number, json_data json)\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "a84dfaeb",
-   "metadata": {},
-   "source": [
-    "With Oracle Database 21c or later, you can bind Python objects directly to the JSON column:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e14826f4",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import datetime\n",
-    "\n",
-    "json_data = [\n",
-    "    2.78,\n",
-    "    True,\n",
-    "    'Ocean Beach',\n",
-    "    b'Some bytes',\n",
-    "    {'keyA': 1, 'KeyB': 'Melbourne'},\n",
-    "    datetime.date.today()\n",
-    "]\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    cursor.setinputsizes(oracledb.DB_TYPE_JSON)\n",
-    "    cursor.execute(\"insert into customers (k, json_data) values (1, :jbv)\", [json_data])\n",
-    "    \n",
-    "print(\"Done\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c21d71e3",
-   "metadata": {},
-   "source": [
-    "Querying returns the JSON in a familiar Python data structure:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d84a494d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    for row, in cursor.execute(\"select c.json_data from customers c where k = 1\"):\n",
-    "        print(row)\n",
-    "        \n",
-    "# With Oracle Database 21c or later, this gives:\n",
-    "# [Decimal('2.78'), True, 'Ocean Beach', b'Some bytes', {'keyA': Decimal('1'), 'KeyB': 'Melbourne'}, datetime.datetime(2022, 3, 4, 0, 0)]"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "e18fc3b4",
-   "metadata": {},
-   "source": [
-    "If you don't have a recent database, then you can still easily work with JSON.  Store it using BLOB and work with JSON strings. The Python \"json\" package can be used with many Python types:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a54a7bca-c8d9-4f47-89a2-edaf6ada0a44",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import json\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    try:\n",
-    "        cursor.execute(\"drop table customersblob\")\n",
-    "    except:\n",
-    "        ;\n",
-    "    cursor.execute(\"\"\"create table customersblob (k number, \n",
-    "                                                  json_data blob check (json_data is json)) \n",
-    "                                                        lob (json_data) store as (cache)\"\"\")\n",
-    " \n",
-    "# INSERT\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    data = json_data = [\n",
-    "        2.78,\n",
-    "        True,\n",
-    "        'Ocean Beach',\n",
-    "        {'keyA': 1, 'KeyB': 'Melbourne'},\n",
-    "    ]\n",
-    "    cursor.execute(\"insert into customersblob (k, json_data) values (2, :jbv)\", [json.dumps(data)])\n",
-    " \n",
-    "# FETCH\n",
-    "\n",
-    "with connection.cursor() as cursor:\n",
-    "    for row, in cursor.execute(\"SELECT c.json_data FROM customersblob c where k = 2\"):\n",
-    "        print(row)\n",
-    "    \n",
-    "connection.rollback()   "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f03084a3-e1dc-4a8d-95db-e07e21800215",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/samples/notebooks/7-PLSQL.ipynb b/samples/notebooks/7-PLSQL.ipynb
deleted file mode 100644
index 94b3aec7..00000000
--- a/samples/notebooks/7-PLSQL.ipynb
+++ /dev/null
@@ -1,284 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Calling PL/SQL\n",
-    "\n",
-    "Documentation reference link: [Executing PL/SQL](https://python-oracledb.readthedocs.io/en/latest/user_guide/plsql_execution.html)\n",
-    "\n",
-    "PL/SQL is a 'stored' procedural language that is stored and run inside the database itself. PL/SQL lets you capture business logic for reuse across all your applications.  You can call stored procedures and functions easily from python-oracledb.\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## PL/SQL Procedures\n",
-    "\n",
-    "This shows the PL/SQL procedure `MYPROC` used in this demo:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "   \n",
-    "    cursor.execute(\"select dbms_metadata.get_ddl('PROCEDURE', 'MYPROC') from dual\")\n",
-    "    ddl, = cursor.fetchone()\n",
-    "    print(ddl.read())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "You can use `callproc()` to call the procedure.  Bind variables are passed by position:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    myinvar  = 22\n",
-    "    myoutvar = cursor.var(int)    # allocate a 'variable' of integer type to hold the OUT bind parameter\n",
-    "\n",
-    "    cursor.callproc('myproc', [myinvar, myoutvar])\n",
-    "    print(myoutvar.getvalue())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "You can also call PL/SQL procedures via an 'anonymous' PL/SQL block.  This can be useful if you want to use named bind placeholders:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    myinvar  = 33\n",
-    "    myoutvar = cursor.var(int)\n",
-    "\n",
-    "    cursor.execute(' begin myproc(:v1, :v2); end;', {\"v1\": myinvar, \"v2\": myoutvar})\n",
-    "    print(myoutvar.getvalue())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## PL/SQL Functions\n",
-    "\n",
-    "This shows the PL/SQL function `MYFUNC` used in this demo:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    \n",
-    "    cursor.execute(\"select dbms_metadata.get_ddl('FUNCTION', 'MYFUNC') from dual\")\n",
-    "    ddl, = cursor.fetchone()\n",
-    "    print(ddl.read())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "You can use `callfunc()` to call the function. Bind variables are passed by position.  The second argument to `callfunc()` is the type of the PL/SQL function return value.  Here it is an integer:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    data = \"abc\"\n",
-    "    id = 3\n",
-    "    res = cursor.callfunc('myfunc', int, (data, id))\n",
-    "    print(res)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Similar to calling PL/SQL procedures, you can also invoke PL/SQL procedures via an anonymous block, and optionally used named bind placeholders:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    data  = \"def\"\n",
-    "    id = 4\n",
-    "    ret = cursor.var(int)\n",
-    "\n",
-    "    cursor.execute(' begin :ret := myfunc(:data, :id); end;', {\"ret\": ret, \"data\": data, \"id\": id})\n",
-    "    print(ret.getvalue())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## REF CURSORS\n",
-    "\n",
-    "REF CURSORS let result sets be returned to python-oracledb, commonly from PL/SQL.\n",
-    "\n",
-    "Here is the PL/SQL procedure used in this example:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    cursor.execute(\"\"\"select text from all_source \n",
-    "                      where name = 'MYREFCURSORPROC' and type = 'PROCEDURE' \n",
-    "                      order by line\"\"\")\n",
-    "    rows = cursor.fetchall()\n",
-    "    for r, in rows:\n",
-    "        print(r, end=\"\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Use `callproc()` as shown before to call the PL/SQL procedure. The `ref_cursor` variable needs to be defined as a cursor so it can hold the returned REF CURSOR.  This second cursor is then simply iterated over exactly like a cursor for simple SELECT would be:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "    ref_cursor = connection.cursor()\n",
-    "\n",
-    "    cursor.callproc(\"myrefcursorproc\", (2, 6, ref_cursor))\n",
-    "\n",
-    "    print(\"Rows between 2 and 6:\")\n",
-    "    for row in ref_cursor:\n",
-    "        print(row)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "## Implicit Cursors\n",
-    "\n",
-    "Instead of binding a cursor to get a REF CURSOR, the `dbms_sql.return_result()` procedure can alternatively return a result set back which is fetched in python-oracledb using `getimplicitresults()`:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with connection.cursor() as cursor:\n",
-    "\n",
-    "    cursor.execute(\"\"\"\n",
-    "            declare\n",
-    "                c1 sys_refcursor;\n",
-    "                c2 sys_refcursor;\n",
-    "            begin\n",
-    "                open c1 for\n",
-    "                select * from ParentTable;\n",
-    "                dbms_sql.return_result(c1);\n",
-    "\n",
-    "                open c2 for\n",
-    "                select * from ChildTable;\n",
-    "                dbms_sql.return_result(c2);\n",
-    "            end;\"\"\")\n",
-    "\n",
-    "    for resultSet in cursor.getimplicitresults():\n",
-    "        print(\"Result Set:\")\n",
-    "        for row in resultSet:\n",
-    "           print(row)\n"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/samples/notebooks/8-Objects.ipynb b/samples/notebooks/8-Objects.ipynb
deleted file mode 100644
index 28315615..00000000
--- a/samples/notebooks/8-Objects.ipynb
+++ /dev/null
@@ -1,372 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Oracle Database Objects and Collections\n",
-    "\n",
-    "Documentation reference link: [Fetching Oracle Database Objects and Collections](https://python-oracledb.readthedocs.io/en/latest/user_guide/sql_execution.html#fetching-oracle-database-objects-and-collections)\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook. The table uses the predefined SDO_GEOMETRY object which stores spatial information:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor = connection.cursor() \n",
-    "\n",
-    "try:\n",
-    "    cursor.execute(\"drop table TestGeometry\")\n",
-    "except:\n",
-    "    pass\n",
-    "        \n",
-    "cursor.execute(\"\"\"create table TestGeometry (\n",
-    "                  IntCol   number(9) not null,\n",
-    "                  Geometry sdo_geometry not null)\"\"\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Binding Named Objects"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Using python-oracledb functions like `gettype()` and `extend()` you can create a Python representation of the database object:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "typeObj = connection.gettype(\"SDO_GEOMETRY\")\n",
-    "elementInfoTypeObj = connection.gettype(\"SDO_ELEM_INFO_ARRAY\")\n",
-    "ordinateTypeObj = connection.gettype(\"SDO_ORDINATE_ARRAY\")\n",
-    "\n",
-    "obj = typeObj()               # Alternatively use 'obj = typeObj.newobject()''\n",
-    "obj.SDO_GTYPE = 2003\n",
-    "obj.SDO_ELEM_INFO = elementInfoTypeObj()\n",
-    "obj.SDO_ELEM_INFO.extend([1, 1003, 3])\n",
-    "obj.SDO_ORDINATES = ordinateTypeObj()\n",
-    "obj.SDO_ORDINATES.extend([1, 1, 5, 7])\n",
-    "\n",
-    "print(\"Done\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Calling `gettype()` requires multiple round-trips to the database, so avoid calling it unnecessarily."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The new object can be bound directly for insertion:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"insert into TestGeometry values (1, :objbv)\",  {\"objbv\": obj})\n",
-    "    \n",
-    "print(\"Done\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "And then fetched back:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for (id, obj) in cursor.execute(\"select IntCol, Geometry from testgeometry\"):\n",
-    "    print(id, obj)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Simple attribute access is easy:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for (id, obj) in cursor.execute(\"select IntCol, Geometry from testgeometry\"):\n",
-    "    print(\"SDO_GTYPE is\", obj.SDO_GTYPE)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    " To display all attributes, create a helper function:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Oracle Database object dumper\n",
-    "\n",
-    "def dumpobject(obj, prefix = \"  \"):\n",
-    "    if obj.type.iscollection:\n",
-    "        print(prefix, \"[\")\n",
-    "        for value in obj.aslist():\n",
-    "            if isinstance(value, oracledb.Object):\n",
-    "                dumpobject(value, prefix + \"  \")\n",
-    "            else:\n",
-    "                print(prefix + \"  \", repr(value))\n",
-    "        print(prefix, \"]\")\n",
-    "    else:\n",
-    "        print(prefix, \"{\")\n",
-    "        for attr in obj.type.attributes:\n",
-    "            value = getattr(obj, attr.name)\n",
-    "            if isinstance(value, oracledb.Object):\n",
-    "                print(prefix + \"  \" + attr.name + \" :\")\n",
-    "                dumpobject(value, prefix + \"    \")\n",
-    "            else:\n",
-    "                print(prefix + \"  \" + attr.name + \" :\", repr(value))\n",
-    "        print(prefix, \"}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Using the helper function shows the full object structure:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for (id, obj) in cursor.execute(\"select IntCol, Geometry from testgeometry\"):\n",
-    "    print(\"Id: \", id)\n",
-    "    dumpobject(obj)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# PL/SQL Collections\n",
-    "\n",
-    "The sample schema uses PL/SQL collections"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.execute(\"select dbms_metadata.get_ddl('PACKAGE', 'PKG_DEMO') from dual\")\n",
-    "ddl, = cursor.fetchone()\n",
-    "print(ddl.read())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To get a collection, create a Python variable with the database object type:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "typeObj = connection.gettype(\"PKG_DEMO.UDT_STRINGLIST\")\n",
-    "obj = typeObj()\n",
-    "\n",
-    "# call the stored procedure which will populate the object\n",
-    "cursor = connection.cursor()\n",
-    "cursor.callproc(\"pkg_Demo.DemoCollectionOut\", (obj,))"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "To show the collection indexes and values:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "ix = obj.first()\n",
-    "while ix is not None:\n",
-    "    print(ix, \"->\", obj.getelement(ix))\n",
-    "    ix = obj.next(ix)\n",
-    "print()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Show the values as a simple list:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print(obj.aslist())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Show the values as a simple dictionary:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print(obj.asdict())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Binding PL/SQL Records\n",
-    "\n",
-    "Create a new Python object of the correct type and set attribute values:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import datetime\n",
-    "\n",
-    "typeObj = connection.gettype(\"PKG_DEMO.UDT_DEMORECORD\")\n",
-    "obj = typeObj()\n",
-    "\n",
-    "obj.NUMBERVALUE = 6\n",
-    "obj.STRINGVALUE = \"Test String\"\n",
-    "obj.DATEVALUE = datetime.datetime(2016, 5, 28)\n",
-    "obj.BOOLEANVALUE = False"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Call the stored procedure which will modify the object:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "cursor.callproc(\"pkg_Demo.DemoRecordsInOut\", (obj,))"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Show the modified values:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print(\"NUMBERVALUE ->\", obj.NUMBERVALUE)\n",
-    "print(\"STRINGVALUE ->\", obj.STRINGVALUE)\n",
-    "print(\"DATEVALUE ->\", obj.DATEVALUE)\n",
-    "print(\"BOOLEANVALUE ->\", obj.BOOLEANVALUE)"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
diff --git a/samples/notebooks/9-Transactions.ipynb b/samples/notebooks/9-Transactions.ipynb
deleted file mode 100644
index f9a4cba6..00000000
--- a/samples/notebooks/9-Transactions.ipynb
+++ /dev/null
@@ -1,324 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "7874f912-50e7-4aa4-aa48-0d97584d48e3",
-   "metadata": {},
-   "source": [
-    "![Banner](images/banner.png)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "1dd36559-0d19-487a-a110-02b890ba7690",
-   "metadata": {},
-   "source": [
-    "# Transaction Mananagement and Sessionless Transactions\n",
-    "\n",
-    "<hr>\n",
-    "\n",
-    "Setup for this notebook:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1f64d468-f213-4735-a8de-f3678cfc0491",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os\n",
-    "import oracledb\n",
-    "\n",
-    "un = os.environ.get(\"PYO_SAMPLES_MAIN_USER\", \"pythondemo\")\n",
-    "pw = os.environ.get(\"PYO_SAMPLES_MAIN_PASSWORD\", \"welcome\")\n",
-    "cs = os.environ.get(\"PYO_SAMPLES_CONNECT_STRING\", \"localhost/orclpdb\")\n",
-    "\n",
-    "connection = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "\n",
-    "cursor = connection.cursor()\n",
-    "try:\n",
-    "    cursor.execute(\"drop table mytab\")\n",
-    "except:\n",
-    "    pass\n",
-    "cursor.execute(\"create table mytab (id number, data varchar2(1000))\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "5876c546-66e5-48cb-8acd-70890b4e74cb",
-   "metadata": {},
-   "source": [
-    "## Transaction Management\n",
-    "\n",
-    "Documentation reference link: [Managing Transations](https://python-oracledb.readthedocs.io/en/latest/user_guide/txn_management.html)."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "e0058aab-0804-4935-8600-1f7ed9afda91",
-   "metadata": {},
-   "source": [
-    "A database transaction is a grouping of SQL statements that make a logical data change to the database. When statements like `Cursor.execute()` or `Cursor.executemany()` execute SQL statements like INSERT or UPDATE, a transaction is started or continued. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1cb74a36-8b89-42d4-927d-3840988ce1e0",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection1 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor1 = connection1.cursor()\n",
-    "cursor1.execute(\"insert into mytab (id, data) values (1, 'Widget')\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "5a6e8bf3-4490-433d-b1c3-31ccdeacbc44",
-   "metadata": {},
-   "source": [
-    "By default, python-oracledb does not commit this transaction to the database. "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "18123b56-3923-4821-8138-57dbc1884439",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection2 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor2 = connection2.cursor()\n",
-    "\n",
-    "# No rows will be displayed\n",
-    "rows = cursor2.execute(\"select * from mytab\")\n",
-    "for r in rows:\n",
-    "    print(r)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "9d38bb79-7417-43ca-92e1-670730f3ea72",
-   "metadata": {},
-   "source": [
-    "You can explictly commit or roll it back using the methods `Connection.commit()` and `Connection.rollback()`.  \n",
-    "\n",
-    "To commit the row just inserted:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "76c39a92-aa91-4313-a4e1-a1ae5d521050",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection1.commit()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8272b6ec-721f-4fb6-8b24-1fdd55d071ba",
-   "metadata": {},
-   "source": [
-    "The committed data is now visible in the second connection:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "cfb399db-73f9-41c8-a0da-20dff5bc1268",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for r in cursor2.execute(\"select * from mytab\"):\n",
-    "    print(r)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "9a850d4a-e2c1-40a7-8203-fe1a24ea1f69",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Delete the data so the example can be re-run\n",
-    "\n",
-    "cursor1.execute(\"truncate table mytab\")\n",
-    "connection1.commit()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f8da302f-1720-48a0-bd06-cbabd7e41e7a",
-   "metadata": {},
-   "source": [
-    "## Autocommitting\n",
-    "\n",
-    "Documentation reference link: [Autocommitting](https://python-oracledb.readthedocs.io/en/latest/user_guide/txn_management.html#autocommitting).\n",
-    "\n",
-    "Autocommitting is a way to improve application scalability by removing the need to perform an explicit `connection.commit()` call.\n",
-    "\n",
-    "The recommendation is to use it on the last DML statement of a transaction."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "2586d903-cf7a-4427-a221-bd9afd31b451",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection1 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor1 = connection1.cursor()\n",
-    "\n",
-    "connection1.autocommit = False  # make sure the value is off\n",
-    "cursor1.execute(\"insert into mytab (id, data) values (1, 'Widget')\")\n",
-    "\n",
-    "# Insert a second row and commit the transaction\n",
-    "connection1.autocommit = True\n",
-    "cursor1.execute(\"insert into mytab (id, data) values (2, 'Thingummy')\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "88c0da81-2aea-4a45-92a2-d9df44c7e69b",
-   "metadata": {},
-   "source": [
-    "Other sessions will see the committed data:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "c809bf41-3a20-4237-bad2-7f1e8c1b7353",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection2 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor2 = connection2.cursor()\n",
-    "\n",
-    "for r in cursor2.execute(\"select * from mytab\"):\n",
-    "    print(r)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "2c1c30d8-1c03-493a-b3f0-cdf279d79c13",
-   "metadata": {},
-   "source": [
-    "You should avoid the over-use of autocommit because it can break relational consistency. Also unnecessarily committing will add additional load the the database."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "0c91d7a9-f3dc-417a-a6e6-e635d746c912",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Delete the data so the example can be re-run\n",
-    "\n",
-    "cursor1.execute(\"truncate table mytab\")\n",
-    "connection1.commit()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ff4be0eb-7a2c-4b22-bdc5-facb2d0b454c",
-   "metadata": {},
-   "source": [
-    "## Sessionless Transactions\n",
-    "\n",
-    "Documentation reference link: [Sessionless Transactions](https://python-oracledb.readthedocs.io/en/latest/user_guide/txn_management.html#sessionless-transactions).\n",
-    "\n",
-    "A Sessionless Transaction is a transaction that can be suspended and resumed during its lifecycle. A transaction is no longer tied to a specific connection. This enables connections to be released for use by other users while a transaction remains open to be resumed later. One use case is with web services, where a user's workflow involves calling individual services for specific tasks, and each service uses different tables for their part of the workflow. Each service can start, suspend, and resume a transaction as needed to complete the workflow in a single transaction, allowing relational consistency to be ensured. Another scenario is when a customer has some 'think time' between making purchases from an online store. During that intermediate time the customer is browsing the site, the connection can be released for other customers to use. This reduces the overall system resources required.\n",
-    "\n",
-    "With Sessionless Transactions, you do not need to use a transaction manager since Oracle Database manages coordination of transactions."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ab09b1b5-9657-495a-86e6-063458bec61d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Start a transaction\n",
-    "connection1 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "txn_id = connection1.begin_sessionless_transaction()\n",
-    "cursor1 = connection1.cursor()\n",
-    "cursor1.execute(\"insert into mytab (id, data) values (1, 'Blue Dress')\")\n",
-    "connection1.suspend_sessionless_transaction()\n",
-    "\n",
-    "# The user might have some 'think time' before doing more database work on the transaction\n",
-    "# ...\n",
-    "\n",
-    "# In the same or another process, a second connection can resume and complete the transaction\n",
-    "connection2 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "connection2.resume_sessionless_transaction(txn_id)\n",
-    "cursor2 = connection2.cursor()\n",
-    "cursor2.execute(\"insert into mytab (id, data) values (2, 'Green Shirt')\")\n",
-    "connection2.commit()\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "6a634fc6-1896-470d-af66-a850c1494a86",
-   "metadata": {},
-   "source": [
-    "Both records have been committed to the database:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "72ad6411-a940-4f19-93a6-c89859b6b9b5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "connection3 = oracledb.connect(user=un, password=pw, dsn=cs)\n",
-    "cursor3 = connection3.cursor()\n",
-    "\n",
-    "for r in cursor3.execute(\"select * from mytab\"):\n",
-    "    print(r)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "2ce9ea84-b19d-46de-a4ab-de96bef4b7fe",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Delete the data so the example can be re-run\n",
-    "\n",
-    "cursor1.execute(\"truncate table mytab\")\n",
-    "connection1.commit()"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.9.24"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/samples/notebooks/README.md b/samples/notebooks/README.md
deleted file mode 100644
index cdcb50b9..00000000
--- a/samples/notebooks/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Python python-oracledb Notebooks
-
-This directory contains Jupyter notebooks showing best practices for using
-python-oracledb.  The notebooks cover:
-
-- Connecting
-- Queries
-- DML
-- Transactions
-- Data frames
-- Data loading and unloading (CSV Files)
-- JSON
-- PL/SQL
-- Vectors
-- Objects
-
-Python-oracledb's default 'Thin' mode is used.
-
-Jupyter notebooks let you easily step through, modify, and execute Python code:
-
-![A screenshot of a notebook running in a browser](./images/jupyter-notebook-screenshot.png)
-
-# Setup
-
-An existing Oracle Database is required.  The JSON demo assumes that Oracle
-Database 21c or later is being used.  The VECTOR demo assumes that Oracle AI
-Database 26ai is being used.
-
-### Install Python
-
-See https://www.python.org/downloads/
-
-### Install Jupyter
-
-See https://jupyter.org/install:
-
-    python -m pip install notebook
-
-### Install the python-oracledb driver
-
-    python -m pip install oracledb
-
-### Install some libraries used by the examples
-
-    python -m pip install numpy matplotlib pyarrow pandas
-
-### Create the python-oracledb sample schema
-
-Clone the python-oracledb repository, for example in a terminal window:
-
-    git clone https://github.com/oracle/python-oracledb.git
-
-    cd python-oracledb/samples
-
-Review README.md and sample_env.py
-
-In the terminal, set desired credentials, for example:
-
-    export PYO_SAMPLES_ADMIN_USER=system
-    export PYO_SAMPLES_ADMIN_PASSWORD=oracle
-    export PYO_SAMPLES_CONNECT_STRING=localhost/orclpdb
-    export PYO_SAMPLES_MAIN_USER=pythondemo
-    export PYO_SAMPLES_MAIN_PASSWORD=welcome
-    export PYO_SAMPLES_EDITION_USER=pythoneditions
-    export PYO_SAMPLES_EDITION_PASSWORD=welcome
-    export PYO_SAMPLES_EDITION_NAME=python_e1
-
-Install the schema:
-
-    python create_schema.py
-
-### Start Jupyter
-
-    cd notebooks
-
-    export PYO_SAMPLES_ADMIN_USER=system
-    export PYO_SAMPLES_ADMIN_PASSWORD=oracle
-    export PYO_SAMPLES_CONNECT_STRING=localhost/orclpdb
-    export PYO_SAMPLES_MAIN_USER=pythondemo
-    export PYO_SAMPLES_MAIN_PASSWORD=welcome
-
-    jupyter notebook
-
-If Jupyter is not in your path, you may need to find it on your computer and
-invoke it with an absolute path, for example on macOS:
-
-    $HOME/Library/Python/3.9/bin/jupyter notebook
-
-Load each notebook *.ipynb file and step through the cells.
-
-The notebooks will use the environment variables above for connection
-credentials. However, if these variables are not set in the terminal window
-that you start Jupyter in, then edit the credentials and connect string near
-the top of each notebook. Set the same values you used when installing the
-schema.
diff --git a/samples/notebooks/csv/data1.csv b/samples/notebooks/csv/data1.csv
deleted file mode 100644
index afa32dde..00000000
--- a/samples/notebooks/csv/data1.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-1,Fred,Nurke,UK
-2,Henry,Crun,UK
diff --git a/samples/notebooks/images/architecture-thin.png b/samples/notebooks/images/architecture-thin.png
deleted file mode 100644
index 52153129..00000000
Binary files a/samples/notebooks/images/architecture-thin.png and /dev/null differ
diff --git a/samples/notebooks/images/banner.png b/samples/notebooks/images/banner.png
deleted file mode 100644
index 523ce17e..00000000
Binary files a/samples/notebooks/images/banner.png and /dev/null differ
diff --git a/samples/notebooks/images/drcp-architecture.png b/samples/notebooks/images/drcp-architecture.png
deleted file mode 100644
index 60271890..00000000
Binary files a/samples/notebooks/images/drcp-architecture.png and /dev/null differ
diff --git a/samples/notebooks/images/drcp-comparison.png b/samples/notebooks/images/drcp-comparison.png
deleted file mode 100644
index e2ddde43..00000000
Binary files a/samples/notebooks/images/drcp-comparison.png and /dev/null differ
diff --git a/samples/notebooks/images/jupyter-notebook-screenshot.png b/samples/notebooks/images/jupyter-notebook-screenshot.png
deleted file mode 100644
index 46bfac1c..00000000
Binary files a/samples/notebooks/images/jupyter-notebook-screenshot.png and /dev/null differ
diff --git a/samples/notebooks/images/lob-benchmark.png b/samples/notebooks/images/lob-benchmark.png
deleted file mode 100644
index ba760d32..00000000
Binary files a/samples/notebooks/images/lob-benchmark.png and /dev/null differ
diff --git a/samples/notebooks/images/pooled-connection.png b/samples/notebooks/images/pooled-connection.png
deleted file mode 100644
index 4ff72749..00000000
Binary files a/samples/notebooks/images/pooled-connection.png and /dev/null differ
diff --git a/samples/notebooks/images/roundtrip.png b/samples/notebooks/images/roundtrip.png
deleted file mode 100644
index 39fb4418..00000000
Binary files a/samples/notebooks/images/roundtrip.png and /dev/null differ
diff --git a/samples/notebooks/images/standalone-connection.png b/samples/notebooks/images/standalone-connection.png
deleted file mode 100644
index 3ab77086..00000000
Binary files a/samples/notebooks/images/standalone-connection.png and /dev/null differ
diff --git a/samples/object_aq.py b/samples/object_aq.py
deleted file mode 100644
index 1fb8adcf..00000000
--- a/samples/object_aq.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# object_aq.py
-#
-# Demonstrates how to use advanced queuing with objects. It makes use of a
-# simple type and queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import decimal
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "DEMO_BOOK_QUEUE"
-BOOK_DATA = [
-    (
-        "The Fellowship of the Ring",
-        "Tolkien, J.R.R.",
-        decimal.Decimal("10.99"),
-    ),
-    (
-        "Harry Potter and the Philosopher's Stone",
-        "Rowling, J.K.",
-        decimal.Decimal("7.99"),
-    ),
-]
-
-# connect to database
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# create a queue
-books_type = connection.gettype(BOOK_TYPE_NAME)
-queue = connection.queue(QUEUE_NAME, payload_type=books_type)
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-# dequeue all existing messages to ensure the queue is empty, just so that
-# the results are consistent
-while queue.deqone():
-    pass
-
-# enqueue a few messages
-print("Enqueuing messages...")
-for title, authors, price in BOOK_DATA:
-    book = books_type.newobject()
-    book.TITLE = title
-    book.AUTHORS = authors
-    book.PRICE = price
-    print(title)
-    queue.enqone(connection.msgproperties(payload=book))
-connection.commit()
-
-# dequeue the messages
-print("\nDequeuing messages...")
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.TITLE)
-connection.commit()
-print("\nDone.")
diff --git a/samples/object_aq_async.py b/samples/object_aq_async.py
deleted file mode 100644
index 1dda7de0..00000000
--- a/samples/object_aq_async.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# object_aq.py
-#
-# Demonstrates how to use advanced queuing with objects. It makes use of a
-# simple type and queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import decimal
-
-import oracledb
-import sample_env
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "DEMO_BOOK_QUEUE"
-BOOK_DATA = [
-    (
-        "The Fellowship of the Ring",
-        "Tolkien, J.R.R.",
-        decimal.Decimal("10.99"),
-    ),
-    (
-        "Harry Potter and the Philosopher's Stone",
-        "Rowling, J.K.",
-        decimal.Decimal("7.99"),
-    ),
-]
-
-
-async def main():
-
-    # connect to database
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-    )
-
-    # create a queue
-    books_type = await connection.gettype(BOOK_TYPE_NAME)
-    queue = connection.queue(QUEUE_NAME, payload_type=books_type)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-    # dequeue all existing messages to ensure the queue is empty, just so that
-    # the results are consistent
-    while await queue.deqone():
-        pass
-
-    # enqueue a few messages
-    print("Enqueuing messages...")
-    for title, authors, price in BOOK_DATA:
-        book = books_type.newobject()
-        book.TITLE = title
-        book.AUTHORS = authors
-        book.PRICE = price
-        print(title)
-        await queue.enqone(connection.msgproperties(payload=book))
-    await connection.commit()
-
-    # dequeue the messages
-    print("\nDequeuing messages...")
-    while True:
-        props = await queue.deqone()
-        if not props:
-            break
-        print(props.payload.TITLE)
-    await connection.commit()
-    print("\nDone.")
-
-
-asyncio.run(main())
diff --git a/samples/object_dump.py b/samples/object_dump.py
deleted file mode 100644
index 786823e6..00000000
--- a/samples/object_dump.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# object_dump.py
-#
-# Shows how to pretty-print an Oracle object or collection.
-# Also shows how to insert a Python object to an Oracle object column.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# Create Oracle connection and cursor objects
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-cursor = connection.cursor()
-
-
-# Create a Python class equivalent to an Oracle SDO object
-class MySDO(object):
-    def __init__(self, gtype, elem_info, ordinates):
-        self.gtype = gtype
-        self.elem_info = elem_info
-        self.ordinates = ordinates
-
-
-# Get Oracle type information
-obj_type = connection.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = connection.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = connection.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-
-
-# Convert a Python object to MDSYS.SDO_GEOMETRY
-def sdo_input_type_handler(cursor, value, num_elements):
-    def sdo_in_converter(value):
-        obj = obj_type.newobject()
-        obj.SDO_GTYPE = value.gtype
-        obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-        obj.SDO_ELEM_INFO.extend(value.elem_info)
-        obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-        obj.SDO_ORDINATES.extend(value.ordinates)
-        return obj
-
-    if isinstance(value, MySDO):
-        return cursor.var(
-            obj_type, arraysize=num_elements, inconverter=sdo_in_converter
-        )
-
-
-# Create and insert a Python object
-sdo = MySDO(2003, [1, 1003, 3], [1, 1, 5, 7])
-cursor.inputtypehandler = sdo_input_type_handler
-cursor.execute("truncate table TestGeometry")
-cursor.execute("insert into TestGeometry values (1, :1)", [sdo])
-
-
-# Define a function to pretty-print the contents of an Oracle object
-def dump_object(obj, prefix=""):
-    if obj.type.iscollection:
-        print(f"{prefix}[")
-        for value in obj.aslist():
-            if isinstance(value, oracledb.DbObject):
-                dump_object(value, prefix + "  ")
-            else:
-                print(f"{prefix}  {repr(value)}")
-        print(f"{prefix}]")
-    else:
-        print(f"{prefix}{{")
-        for attr in obj.type.attributes:
-            value = getattr(obj, attr.name)
-            if isinstance(value, oracledb.DbObject):
-                print(f"{prefix}  {attr.name}:")
-                dump_object(value, prefix + "    ")
-            else:
-                print(f"{prefix}  {attr.name}: {repr(value)}")
-        print(f"{prefix}}}")
-
-
-# Query the row back
-cursor.execute("select geometry from TestGeometry")
-for (obj,) in cursor:
-    dump_object(obj)
diff --git a/samples/object_dump_async.py b/samples/object_dump_async.py
deleted file mode 100644
index 9061c3ef..00000000
--- a/samples/object_dump_async.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# object_dump_async.py
-#
-# An asynchronous version of object_dump.py
-#
-# Shows how to pretty-print an Oracle object or collection.
-# Also shows how to insert a Python object to an Oracle object column.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    # Create Oracle connection and cursor objects
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-    cursor = connection.cursor()
-
-    # Create a Python class equivalent to an Oracle SDO object
-    class MySDO(object):
-        def __init__(self, gtype, elem_info, ordinates):
-            self.gtype = gtype
-            self.elem_info = elem_info
-            self.ordinates = ordinates
-
-    # Get Oracle type information
-    obj_type = await connection.gettype("MDSYS.SDO_GEOMETRY")
-    element_info_type_obj = await connection.gettype(
-        "MDSYS.SDO_ELEM_INFO_ARRAY"
-    )
-    ordinate_type_obj = await connection.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-
-    # Convert a Python object to MDSYS.SDO_GEOMETRY
-    def sdo_input_type_handler(cursor, value, num_elements):
-        def sdo_in_converter(value):
-            obj = obj_type.newobject()
-            obj.SDO_GTYPE = value.gtype
-            obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-            obj.SDO_ELEM_INFO.extend(value.elem_info)
-            obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-            obj.SDO_ORDINATES.extend(value.ordinates)
-            return obj
-
-        if isinstance(value, MySDO):
-            return cursor.var(
-                obj_type, arraysize=num_elements, inconverter=sdo_in_converter
-            )
-
-    # Create and insert a Python object
-    sdo = MySDO(2003, [1, 1003, 3], [1, 1, 5, 7])
-    cursor.inputtypehandler = sdo_input_type_handler
-    await cursor.execute("truncate table TestGeometry")
-    await cursor.execute("insert into TestGeometry values (1, :1)", [sdo])
-
-    # Define a function to pretty-print the contents of an Oracle object
-    def dump_object(obj, prefix=""):
-        if obj.type.iscollection:
-            print(f"{prefix}[")
-            for value in obj.aslist():
-                if isinstance(value, oracledb.DbObject):
-                    dump_object(value, prefix + "  ")
-                else:
-                    print(f"{prefix}  {repr(value)}")
-            print(f"{prefix}]")
-        else:
-            print(f"{prefix}{{")
-            for attr in obj.type.attributes:
-                value = getattr(obj, attr.name)
-                if isinstance(value, oracledb.DbObject):
-                    print(f"{prefix}  {attr.name}:")
-                    dump_object(value, prefix + "    ")
-                else:
-                    print(f"{prefix}  {attr.name}: {repr(value)}")
-            print(f"{prefix}}}")
-
-    # Query the row back
-    await cursor.execute("select geometry from TestGeometry")
-    async for (obj,) in cursor:
-        dump_object(obj)
-
-
-asyncio.run(main())
diff --git a/samples/oracledb_upgrade.py b/samples/oracledb_upgrade.py
deleted file mode 100644
index af37f9cb..00000000
--- a/samples/oracledb_upgrade.py
+++ /dev/null
@@ -1,289 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# oracledb_upgrade.py
-#
-# Example module to assist upgrading large applications from cx_Oracle 8 to
-# python-oracledb (the renamed major new release of cx_Oracle).
-#
-# An environment variable ORA_PYTHON_DRIVER_TYPE can be set to determine
-# whether to use cx_Oracle, python-oracledb Thin mode, or python-oracledb Thick
-# mode.
-#
-# NOTE
-#
-#   Most users DO NOT need this file. Instead you can do:
-#
-#   - Install python-oracledb:
-#
-#       python -m pip install oracledb
-#
-#   - Change "import cx_Oracle" to:
-#
-#       import oracledb as cx_Oracle
-#
-#   - Remove any call to init_oracle_client() if you want to use
-#     python-oracledb Thin mode.  Conversely add a call if you want to use
-#     Thick mode.
-#
-#   - Use named parameters in calls to connect(), Connection() and
-#     SessionPool():
-#
-#       c = oracledb.connect(user="un", password="pw", dsn="cs")
-#
-#   Other updates noted in the upgrade documentation may also need to be
-#   made.
-#
-#   However, if you want to toggle which driver to use or have code where
-#   changes are not easy, then this file may help.
-#
-# USAGE
-#
-#   - Install python-oracledb:
-#
-#       python -m pip install oracledb
-#
-#   - Change your code's first "import cx_Oracle" to:
-#
-#       import oracledb_upgrade as cx_Oracle
-#
-#     This needs to be imported before cx_Oracle is ever imported for it to
-#     take effect. Subsequent imports do not need to be changed but may be,
-#     if desired.
-#
-#   - Remove any call to init_oracle_client() from your existing code base.
-#
-#   - Set lib_dir (in the module code below) to your Oracle Client library
-#     directory if you are calling init_oracle_client() with that parameter in
-#     your existing cx_Oracle code on Windows or macOS, and you intend to use
-#     python-oracledb Thick mode or cx_Oracle.
-#
-#   - Review python-oracledb documentation for additional changes that may be
-#     needed in your code.
-#
-#   - Set the environment variable ORA_PYTHON_DRIVER_TYPE to "cx", "thin", or
-#     "thick" to choose which module to use:
-#
-#       thin -> python-oracledb Thin mode (the default)
-#
-#       thick -> python-oracledb Thick mode
-#
-#       cx -> cx_Oracle
-#
-#   - Run your application
-#
-#     An example application showing this module in use is:
-#
-#       import oracledb_upgrade as cx_Oracle
-#       import os
-#
-#       un = os.environ.get("PYTHON_USERNAME")
-#       pw = os.environ.get("PYTHON_PASSWORD")
-#       cs = os.environ.get("PYTHON_CONNECTSTRING")
-#
-#       connection = cx_Oracle.connect(user=un, password=pw, dsn=cs)
-#       with connection.cursor() as cursor:
-#           sql = """SELECT UNIQUE CLIENT_DRIVER
-#                    FROM V$SESSION_CONNECT_INFO
-#                    WHERE SID = SYS_CONTEXT('USERENV', 'SID')"""
-#           for r, in cursor.execute(sql):
-#               print(r)
-#
-# -----------------------------------------------------------------------------
-
-import os
-import sys
-import platform
-
-import cx_Oracle
-import oracledb
-
-# Set True to print which driver and mode is being used
-MODE_TRACE = False
-
-# Enable a 'shim' if your cx_Oracle code makes connect(), Connection() or
-# SessionPool() calls that use positional parameters e.g. like:
-#   cx_Oracle.connect(username, password, connect_string)
-ALLOW_POSITIONAL_CONNECT_ARGS = True
-
-# On macOS and Windows set lib_dir to your Instant Client path if you are
-# currently calling init_oracle_client() in your application. On Linux do not
-# set lib_dir; instead set LD_LIBRARY_PATH or configure ldconfig before running
-# Python.
-lib_dir = None
-if platform.system() == "Darwin":
-    lib_dir = os.environ.get("HOME") + "/Downloads/instantclient_19_8"
-elif platform.system() == "Windows":
-    lib_dir = r"C:\oracle\instantclient_19_14"
-
-# Determine which module and mode to use.
-# The default is python-oracledb Thin mode.
-driver_type = os.environ.get("ORA_PYTHON_DRIVER_TYPE", "thin")
-
-if driver_type.lower() == "cx":
-    if MODE_TRACE:
-        print("Using cx_Oracle")
-    from cx_Oracle import *  # noqa: F403
-
-    sys.modules["oracledb"] = cx_Oracle
-    sys.modules["cx_Oracle"] = cx_Oracle
-    oracledb.init_oracle_client(lib_dir=lib_dir)
-else:
-    from oracledb import *  # noqa: F403
-
-    sys.modules["oracledb"] = oracledb
-    sys.modules["cx_Oracle"] = oracledb
-    if driver_type.lower() == "thick":
-        if MODE_TRACE:
-            print("Using python-oracledb thick")
-        # For python-oracledb Thick mode, init_oracle_client() MUST be called
-        # on all operating systems. Whether to use a lib_dir value depends on
-        # how your system library search path is configured.
-        oracledb.init_oracle_client(lib_dir=lib_dir)
-    else:
-        if MODE_TRACE:
-            print("Using python-oracledb thin")
-
-
-# If your existing cx_Oracle code never used positional arguments for
-# connection and pool creation calls then inject_connect_shim() is not
-# necessary and you can set ALLOW_POSITIONAL_CONNECT_ARGS to False
-def inject_connect_shim():
-    """
-    Allow python-oracledb to use positional arguments in connect(),
-    Connection() and SessionPool() signatures as allowed by cx_Oracle.
-    """
-
-    class ShimConnection(oracledb.Connection):
-        def __init__(
-            self,
-            user=None,
-            password=None,
-            dsn=None,
-            mode=oracledb.DEFAULT_AUTH,
-            handle=0,
-            pool=None,
-            threaded=False,
-            events=False,
-            cclass=None,
-            purity=oracledb.ATTR_PURITY_DEFAULT,
-            newpassword=None,
-            encoding=None,
-            nencoding=None,
-            edition=None,
-            appcontext=[],
-            tag=None,
-            matchanytag=False,
-            shardingkey=[],
-            supershardingkey=[],
-            stmtcachesize=20,
-        ):
-            if dsn is None and password is None:
-                dsn = user
-                user = None
-            super().__init__(
-                dsn=dsn,
-                user=user,
-                password=password,
-                mode=mode,
-                handle=handle,
-                pool=pool,
-                threaded=threaded,
-                events=events,
-                cclass=cclass,
-                purity=purity,
-                newpassword=newpassword,
-                edition=edition,
-                appcontext=appcontext,
-                tag=tag,
-                matchanytag=matchanytag,
-                shardingkey=shardingkey,
-                supershardingkey=supershardingkey,
-                stmtcachesize=stmtcachesize,
-            )
-
-    class ShimPool(oracledb.SessionPool):
-        def __init__(
-            self,
-            user=None,
-            password=None,
-            dsn=None,
-            min=1,
-            max=2,
-            increment=1,
-            connectiontype=oracledb.Connection,
-            threaded=True,
-            getmode=oracledb.SPOOL_ATTRVAL_NOWAIT,
-            events=False,
-            homogeneous=True,
-            externalauth=False,
-            encoding=None,
-            nencoding=None,
-            edition=None,
-            timeout=0,
-            wait_timeout=0,
-            max_lifetime_session=0,
-            session_callback=None,
-            max_sessions_per_shard=0,
-            soda_metadata_cache=False,
-            stmtcachesize=20,
-            ping_interval=60,
-        ):
-            super().__init__(
-                dsn=dsn,
-                user=user,
-                password=password,
-                min=min,
-                max=max,
-                increment=increment,
-                connectiontype=connectiontype,
-                threaded=threaded,
-                getmode=getmode,
-                events=events,
-                homogeneous=homogeneous,
-                externalauth=externalauth,
-                encoding=encoding,
-                nencoding=nencoding,
-                edition=edition,
-                timeout=timeout,
-                wait_timeout=wait_timeout,
-                max_lifetime_session=max_lifetime_session,
-                session_callback=session_callback,
-                max_sessions_per_shard=max_sessions_per_shard,
-                soda_metadata_cache=soda_metadata_cache,
-                stmtcachesize=stmtcachesize,
-                ping_interval=ping_interval,
-            )
-
-    global connect
-    connect = ShimConnection
-    global Connection
-    Connection = ShimConnection
-    global SessionPool
-    SessionPool = ShimPool
-
-
-if ALLOW_POSITIONAL_CONNECT_ARGS and driver_type.lower() != "cx":
-    inject_connect_shim()
diff --git a/samples/pipelining_basic.py b/samples/pipelining_basic.py
deleted file mode 100644
index 14af9b4a..00000000
--- a/samples/pipelining_basic.py
+++ /dev/null
@@ -1,159 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pipelining_basic.py
-#
-# Demonstrates Oracle Database Pipelining. True pipelining is only available
-# when connected to Oracle Database version 23.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # ------------------------------------------------------------
-
-    # Create a pipeline and define the operations
-    pipeline = oracledb.create_pipeline()
-
-    pipeline.add_fetchone("select user from dual")
-
-    pipeline.add_fetchone("select sysdate from dual")
-
-    rows = [
-        (1, "First"),
-        (2, "Second"),
-        (3, "Third"),
-        (4, "Fourth"),
-        (5, "Fifth"),
-        (6, "Sixth"),
-    ]
-    pipeline.add_executemany(
-        "insert into mytab(id, data) values (:1, :2)", rows
-    )
-
-    # pipeline.add_commit()  # uncomment to persist data
-
-    pipeline.add_execute(
-        """create or replace procedure myprocerr as
-           begin
-              bogus;
-           end;"""
-    )
-
-    pipeline.add_execute(
-        """create or replace procedure myproc2 (p in number) as
-           begin
-              null;
-           end;"""
-    )
-
-    pipeline.add_execute(
-        """create or replace function myfunc (p in number) return number as
-           begin
-              return p;
-           end;"""
-    )
-
-    pipeline.add_callproc("myproc2", [123])
-
-    pipeline.add_callfunc("myfunc", oracledb.DB_TYPE_NUMBER, [456])
-
-    pipeline.add_fetchall("select 3 from does_not_exist")
-
-    pipeline.add_fetchall("select * from mytab")
-
-    # Run the operations in the pipeline.
-    # Note although the database receives all the operations at the same time,
-    # it will execute each operation sequentially
-    results = await connection.run_pipeline(pipeline, continue_on_error=True)
-
-    # Print the query results
-    for i, result in enumerate(results):
-        statement = result.operation.statement
-        op_type = result.operation.op_type
-
-        if result.warning:
-            print(f"\n-> OPERATION {i+1}: WARNING\n")
-            print(statement)
-            print(f"{result.warning}\n")
-
-        elif result.error:
-            # This will only be invoked if the pipeline is run with
-            # continue_on_error=True
-            offset = result.error.offset
-            print(f"\n-> OPERATION {i+1}: ERROR AT POSITION {offset}:\n")
-            print(statement, "\n")
-            print(f"{result.error}\n")
-
-        elif op_type == oracledb.PipelineOpType.EXECUTE:
-            print(f"\n-> OPERATION {i+1}: EXECUTE\n")
-            print(statement)
-
-        elif op_type == oracledb.PipelineOpType.EXECUTE_MANY:
-            print(f"\n-> OPERATION {i+1}: EXECUTE_MANY\n")
-            print(statement)
-
-        elif result.rows:
-            print(f"\n-> OPERATION {i+1}: ROWS\n")
-            print(statement, "\n")
-            headings = [col.name for col in result.columns]
-            print(*headings, sep="\t")
-            print("--")
-            for row in result.rows:
-                print(*row, sep="\t")
-
-        elif op_type == oracledb.PipelineOpType.CALL_PROC:
-            print(f"\n-> OPERATION {i+1}: CALL_PROC\n")
-            print(result.operation.name)
-
-        elif op_type == oracledb.PipelineOpType.CALL_FUNC:
-            print(f"\n-> OPERATION {i+1}: CALL_FUNC\n")
-            print(result.operation.name)
-            print(result.return_value)
-
-        elif op_type == oracledb.PipelineOpType.COMMIT:
-            print(f"\n-> OPERATION {i+1}: COMMIT")
-
-        else:
-            print(f"\n-> OPERATION {i+1}: Unknown\n")
-            print(f"Operation type: {op_type}")
-
-    # ------------------------------------------------------------
-
-    await connection.close()
-
-
-asyncio.run(main())
diff --git a/samples/pipelining_error.py b/samples/pipelining_error.py
deleted file mode 100644
index ba27b47f..00000000
--- a/samples/pipelining_error.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pipelining_error.py
-#
-# Demonstrates warnings and errors with Oracle Database Pipelining.  True
-# pipelining is only available when connected to Oracle Database version 23.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # ------------------------------------------------------------
-
-    print("\nExecution exception:\n")
-
-    try:
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_fetchall("select 1 from does_not_exist_1")
-        pipeline.add_fetchall("select 2 from does_not_exist_2")
-
-        # By default, the first failure throws an exception
-        await connection.run_pipeline(pipeline)
-
-    except oracledb.Error as e:
-        (error,) = e.args
-        print(error.message)
-
-    # ------------------------------------------------------------
-
-    print("\nContinuing after first error:\n")
-
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute(
-        """create or replace procedure myproc as
-           begin
-              bogus;
-           end;"""
-    )
-    pipeline.add_fetchall("select 1 from does_not_exist_3")
-    pipeline.add_fetchall("select 2 from does_not_exist_4")
-    pipeline.add_fetchall("select dummy from dual")
-    results = await connection.run_pipeline(pipeline, continue_on_error=True)
-
-    for i, result in enumerate(results):
-        statement = result.operation.statement
-        if result.warning:
-            print(
-                f"Warning {result.warning.full_code} " f"in operation {i+1}:\n"
-            )
-            print(statement)
-            print(f"{result.warning}\n")
-        elif result.error:
-            print(
-                f"Error {result.error.full_code} "
-                f"at position {result.error.offset+1} "
-                f"in operation {i+1}:\n"
-            )
-            print(statement)
-            print(f"{result.error}\n")
-        elif result.rows:
-            print(f"Rows from operation {i+1}:\n")
-            print(statement)
-            for row in result.rows:
-                print(row)
-
-    # ------------------------------------------------------------
-
-    await connection.execute("drop procedure myproc")
-    await connection.close()
-
-
-asyncio.run(main())
diff --git a/samples/pipelining_parallel.py b/samples/pipelining_parallel.py
deleted file mode 100644
index c54f6c8b..00000000
--- a/samples/pipelining_parallel.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pipelining_parallel.py
-#
-# Demonstrates Oracle Database Pipelining running local and database operations
-# concurrently. True pipelining is only available when connected to Oracle
-# Database version 23.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def run_thing_one():
-    return "thing_one"
-
-
-async def run_thing_two():
-    return "thing_two"
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_fetchone("select user from dual")
-    pipeline.add_fetchone("select sysdate from dual")
-
-    # Run the pipeline and non-database operations concurrently.
-    # Note although the database receives all the operations at the same time,
-    # it will execute each operation sequentially. It is the local and
-    # database tasks that execute concurrently.
-    return_values = await asyncio.gather(
-        run_thing_one(), run_thing_two(), connection.run_pipeline(pipeline)
-    )
-
-    for r in return_values:
-        if isinstance(r, list):  # the pipeline return list
-            for result in r:
-                if result.rows:
-                    for row in result.rows:
-                        print(*row, sep="\t")
-        else:
-            print(r)  # a local operation result
-
-    await connection.close()
-
-
-asyncio.run(main())
diff --git a/samples/plsql_batch.py b/samples/plsql_batch.py
deleted file mode 100644
index b5381ca3..00000000
--- a/samples/plsql_batch.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_batch.py
-#
-# Demonstrates using executemany() to make repeated calls to a PL/SQL procedure
-#
-# Note in python-oracledb Thick mode, when cursor.executemany() is used for
-# PL/SQL code that returns OUT binds, it will have the same performance
-# characteristics as repeated calls to cursor.execute().
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# -----------------------------------------------------------------------------
-# IN and OUT PL/SQL parameter examples
-# Also shows passing in an object
-# -----------------------------------------------------------------------------
-
-# Setup
-
-with connection.cursor() as cursor:
-    stmts = [
-        """create or replace type my_varchar_list as table of varchar2(100)""",
-        """create or replace procedure myproc
-                  (p in number, names in my_varchar_list, count out number) as
-           begin
-               count := p + names.count;
-           end;""",
-    ]
-    for s in stmts:
-        cursor.execute(s)
-        if cursor.warning:
-            print(cursor.warning)
-            print(s)
-
-type_obj = connection.gettype("MY_VARCHAR_LIST")
-
-# Example 1: positional binds
-
-with connection.cursor() as cursor:
-
-    obj1 = type_obj.newobject()
-    obj1.extend(["Alex", "Bobbie"])
-    obj2 = type_obj.newobject()
-    obj2.extend(["Charlie", "Dave", "Eric"])
-    obj3 = type_obj.newobject()
-    obj3.extend(["Fred", "Georgia", "Helen", "Ian"])
-
-    data = [
-        (1, obj1),
-        (2, obj2),
-        (3, obj3),
-    ]
-
-    count = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-    cursor.setinputsizes(None, type_obj, count)
-
-    cursor.executemany("begin myproc(:1, :2, :3); end;", data)
-    print(count.values)  # [3, 5, 7]
-
-# Example 2: named binds
-
-with connection.cursor() as cursor:
-
-    obj1 = type_obj.newobject()
-    obj1.extend(["Alex", "Bobbie"])
-    obj2 = type_obj.newobject()
-    obj2.extend(["Charlie", "Dave", "Eric"])
-    obj3 = type_obj.newobject()
-    obj3.extend(["Fred", "Georgia", "Helen", "Ian"])
-
-    data = [
-        {"p": 100, "names": obj1},
-        {"p": 200, "names": obj2},
-        {"p": 300, "names": obj3},
-    ]
-
-    count = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-    cursor.setinputsizes(p=None, names=type_obj, count=count)
-
-    cursor.executemany("begin myproc(:p, :names, :count); end;", data)
-    print(count.values)  # [102, 203, 304]
-
-# -----------------------------------------------------------------------------
-# IN/OUT PL/SQL parameter examples
-# -----------------------------------------------------------------------------
-
-# Setup
-
-with connection.cursor() as cursor:
-    stmt = """create or replace procedure myproc2
-                     (p1 in number, p2 in out varchar2) as
-              begin
-                  p2 := p2 || ' ' || p1;
-              end;"""
-    cursor.execute(stmt)
-    if cursor.warning:
-        print(cursor.warning)
-        print(stmt)
-
-# Example 3: positional binds
-
-with connection.cursor() as cursor:
-    data = [(440, "Gregory"), (550, "Haley"), (660, "Ian")]
-    outvals = cursor.var(
-        oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-    )
-    cursor.setinputsizes(None, outvals)
-
-    cursor.executemany("begin myproc2(:1, :2); end;", data)
-    print(outvals.values)  # ['Gregory 440', 'Haley 550', 'Ian 660']
-
-# Example 4: positional binds, utilizing setvalue()
-
-with connection.cursor() as cursor:
-    data = [(777,), (888,), (999,)]
-
-    inoutvals = cursor.var(
-        oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-    )
-    inoutvals.setvalue(0, "Roger")
-    inoutvals.setvalue(1, "Sally")
-    inoutvals.setvalue(2, "Tom")
-    cursor.setinputsizes(None, inoutvals)
-
-    cursor.executemany("begin myproc2(:1, :2); end;", data)
-    print(inoutvals.values)  # ['Roger 777', 'Sally 888', 'Tom 999']
-
-# Example 5: named binds
-
-with connection.cursor() as cursor:
-    data = [
-        {"p1bv": 100, "p2bv": "Alfie"},
-        {"p1bv": 200, "p2bv": "Brian"},
-        {"p1bv": 300, "p2bv": "Cooper"},
-    ]
-    outvals = cursor.var(
-        oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-    )
-    cursor.setinputsizes(p1bv=None, p2bv=outvals)
-
-    cursor.executemany("begin myproc2(:p1bv, :p2bv); end;", data)
-    print(outvals.values)  # ['Alfie 100', 'Brian 200', 'Cooper 300']
-
-# Example 6: named binds, utilizing setvalue()
-
-with connection.cursor() as cursor:
-    inoutvals = cursor.var(
-        oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-    )
-    inoutvals.setvalue(0, "Dean")
-    inoutvals.setvalue(1, "Elsa")
-    inoutvals.setvalue(2, "Felix")
-    data = [{"p1bv": 101}, {"p1bv": 202}, {"p1bv": 303}]
-    cursor.setinputsizes(p1bv=None, p2bv=inoutvals)
-
-    cursor.executemany("begin myproc2(:p1bv, :p2bv); end;", data)
-    print(inoutvals.values)  # ['Dean 101', 'Elsa 202', 'Felix 303']
diff --git a/samples/plsql_batch_async.py b/samples/plsql_batch_async.py
deleted file mode 100644
index 196d95cc..00000000
--- a/samples/plsql_batch_async.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_batch_async.py
-#
-# An asynchronous version of plsql_batch.py
-#
-# Demonstrates using executemany() to make repeated calls to a PL/SQL procedure
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # -------------------------------------------------------------------------
-    # IN and OUT PL/SQL parameter examples
-    # Also shows passing in an object
-    # -------------------------------------------------------------------------
-
-    # Setup
-
-    pipeline = oracledb.create_pipeline()
-
-    pipeline.add_execute(
-        """create or replace type my_varchar_list
-               as table of varchar2(100)"""
-    )
-
-    pipeline.add_execute(
-        """create or replace procedure myproc
-               (p in number, names in my_varchar_list, count out number) as
-           begin
-               count := p + names.count;
-           end;"""
-    )
-
-    await connection.run_pipeline(pipeline)
-
-    # Example 1: positional binds
-
-    type_obj = await connection.gettype("MY_VARCHAR_LIST")
-
-    with connection.cursor() as cursor:
-
-        obj1 = type_obj.newobject()
-        obj1.extend(["Alex", "Bobbie"])
-        obj2 = type_obj.newobject()
-        obj2.extend(["Charlie", "Dave", "Eric"])
-        obj3 = type_obj.newobject()
-        obj3.extend(["Fred", "Georgia", "Helen", "Ian"])
-
-        data = [
-            (1, obj1),
-            (2, obj2),
-            (3, obj3),
-        ]
-
-        count = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-        cursor.setinputsizes(None, type_obj, count)
-
-        await cursor.executemany("begin myproc(:1, :2, :3); end;", data)
-        print(count.values)  # [3, 5, 7]
-
-    # Example 2: named binds
-
-    with connection.cursor() as cursor:
-
-        obj1 = type_obj.newobject()
-        obj1.extend(["Alex", "Bobbie"])
-        obj2 = type_obj.newobject()
-        obj2.extend(["Charlie", "Dave", "Eric"])
-        obj3 = type_obj.newobject()
-        obj3.extend(["Fred", "Georgia", "Helen", "Ian"])
-
-        data = [
-            {"p": 100, "names": obj1},
-            {"p": 200, "names": obj2},
-            {"p": 300, "names": obj3},
-        ]
-
-        count = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(data))
-        cursor.setinputsizes(p=None, names=type_obj, count=count)
-
-        await cursor.executemany(
-            "begin myproc(:p, :names, :count); end;", data
-        )
-
-        print(count.values)  # [102, 203, 304]
-
-    # -------------------------------------------------------------------------
-    # IN/OUT PL/SQL parameter examples
-    # -------------------------------------------------------------------------
-
-    # Setup
-
-    pipeline = oracledb.create_pipeline()
-
-    pipeline.add_execute(
-        """create or replace procedure myproc2
-              (p1 in number, p2 in out varchar2) as
-           begin
-               p2 := p2 || ' ' || p1;
-           end;"""
-    )
-
-    await connection.run_pipeline(pipeline)
-
-    # Example 3: positional binds
-
-    with connection.cursor() as cursor:
-        data = [(440, "Gregory"), (550, "Haley"), (660, "Ian")]
-        outvals = cursor.var(
-            oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-        )
-        cursor.setinputsizes(None, outvals)
-
-        await cursor.executemany("begin myproc2(:1, :2); end;", data)
-        print(outvals.values)  # ['Gregory 440', 'Haley 550', 'Ian 660']
-
-    # Example 4: positional binds, utilizing setvalue()
-
-    with connection.cursor() as cursor:
-        data = [(777,), (888,), (999,)]
-
-        inoutvals = cursor.var(
-            oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-        )
-        inoutvals.setvalue(0, "Roger")
-        inoutvals.setvalue(1, "Sally")
-        inoutvals.setvalue(2, "Tom")
-        cursor.setinputsizes(None, inoutvals)
-
-        await cursor.executemany("begin myproc2(:1, :2); end;", data)
-        print(inoutvals.values)  # ['Roger 777', 'Sally 888', 'Tom 999']
-
-    # Example 5: named binds
-
-    with connection.cursor() as cursor:
-        data = [
-            {"p1bv": 100, "p2bv": "Alfie"},
-            {"p1bv": 200, "p2bv": "Brian"},
-            {"p1bv": 300, "p2bv": "Cooper"},
-        ]
-        outvals = cursor.var(
-            oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-        )
-        cursor.setinputsizes(p1bv=None, p2bv=outvals)
-
-        await cursor.executemany("begin myproc2(:p1bv, :p2bv); end;", data)
-        print(outvals.values)  # ['Alfie 100', 'Brian 200', 'Cooper 300']
-
-    # Example 6: named binds, utilizing setvalue()
-
-    with connection.cursor() as cursor:
-        inoutvals = cursor.var(
-            oracledb.DB_TYPE_VARCHAR, size=100, arraysize=len(data)
-        )
-        inoutvals.setvalue(0, "Dean")
-        inoutvals.setvalue(1, "Elsa")
-        inoutvals.setvalue(2, "Felix")
-        data = [{"p1bv": 101}, {"p1bv": 202}, {"p1bv": 303}]
-        cursor.setinputsizes(p1bv=None, p2bv=inoutvals)
-
-        await cursor.executemany("begin myproc2(:p1bv, :p2bv); end;", data)
-        print(inoutvals.values)  # ['Dean 101', 'Elsa 202', 'Felix 303']
-
-
-asyncio.run(main())
diff --git a/samples/plsql_collection.py b/samples/plsql_collection.py
deleted file mode 100644
index 2049277f..00000000
--- a/samples/plsql_collection.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_collection.py
-#
-# Demonstrates how to get the value of a PL/SQL collection from a stored
-# procedure.
-#
-# This feature is only available in Oracle Database 12.1 and higher.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# create a new empty object of the correct type.
-# note the use of a PL/SQL type that is defined in a package
-type_obj = connection.gettype("PKG_DEMO.UDT_STRINGLIST")
-obj = type_obj.newobject()
-
-# call the stored procedure which will populate the object
-with connection.cursor() as cursor:
-    cursor.callproc("pkg_Demo.DemoCollectionOut", (obj,))
-
-    # show the indexes that are used by the collection
-    print("Indexes and values of collection:")
-    ix = obj.first()
-    while ix is not None:
-        print(ix, "->", obj.getelement(ix))
-        ix = obj.next(ix)
-    print()
-
-    # show the values as a simple list
-    print("Values of collection as list:")
-    print(obj.aslist())
-    print()
-
-    # show the values as a simple dictionary
-    print("Values of collection as dictionary:")
-    print(obj.asdict())
-    print()
diff --git a/samples/plsql_collection_async.py b/samples/plsql_collection_async.py
deleted file mode 100644
index a6d07e98..00000000
--- a/samples/plsql_collection_async.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_collection_async.py
-#
-# An asynchronous version of plsql_collection.py
-#
-# Demonstrates how to get the value of a PL/SQL collection from a stored
-# procedure.
-#
-# This feature is only available in Oracle Database 12.1 and higher.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # create a new empty object of the correct type.
-    # note the use of a PL/SQL type that is defined in a package
-    type_obj = await connection.gettype("PKG_DEMO.UDT_STRINGLIST")
-    obj = type_obj.newobject()
-
-    # call the stored procedure which will populate the object
-    with connection.cursor() as cursor:
-        await cursor.callproc("pkg_Demo.DemoCollectionOut", (obj,))
-
-        # show the indexes that are used by the collection
-        print("Indexes and values of collection:")
-        ix = obj.first()
-        while ix is not None:
-            print(ix, "->", obj.getelement(ix))
-            ix = obj.next(ix)
-        print()
-
-        # show the values as a simple list
-        print("Values of collection as list:")
-        print(obj.aslist())
-        print()
-
-        # show the values as a simple dictionary
-        print("Values of collection as dictionary:")
-        print(obj.asdict())
-        print()
-
-
-asyncio.run(main())
diff --git a/samples/plsql_function.py b/samples/plsql_function.py
deleted file mode 100644
index fde6c2f2..00000000
--- a/samples/plsql_function.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_function.py
-#
-# Demonstrates how to call a PL/SQL function and get its return value.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # The second parameter is the expected return type of the PL/SQL function
-    res = cursor.callfunc("myfunc", int, ("abc", 2))
-    print(res)
diff --git a/samples/plsql_function_async.py b/samples/plsql_function_async.py
deleted file mode 100644
index df10d73e..00000000
--- a/samples/plsql_function_async.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_function_async.py
-#
-# An asynchronous version of plsql_function.py
-#
-# Demonstrates how to call a PL/SQL function and get its return value.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # The second parameter is the expected return type of the PL/SQL
-        # function
-        res = await cursor.callfunc("myfunc", int, ("abc", 2))
-        print(res)
-
-
-asyncio.run(main())
diff --git a/samples/plsql_procedure.py b/samples/plsql_procedure.py
deleted file mode 100644
index 8f812c47..00000000
--- a/samples/plsql_procedure.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_procedure.py
-#
-# Demonstrates how to call a PL/SQL stored procedure and get the results of an
-# OUT variable.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    myvar = cursor.var(int)
-    cursor.callproc("myproc", (123, myvar))
-    print(myvar.getvalue())
diff --git a/samples/plsql_procedure_async.py b/samples/plsql_procedure_async.py
deleted file mode 100644
index eefe48cb..00000000
--- a/samples/plsql_procedure_async.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_procedure_async.py
-#
-# An asynchronous version of plsql_procedure.py
-#
-# Demonstrates how to call a PL/SQL stored procedure and get the results of an
-# OUT variable.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        myvar = cursor.var(int)
-        await cursor.callproc("myproc", (123, myvar))
-        print(myvar.getvalue())
-
-
-asyncio.run(main())
diff --git a/samples/plsql_record.py b/samples/plsql_record.py
deleted file mode 100644
index 8aff6aea..00000000
--- a/samples/plsql_record.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_record.py
-#
-# Demonstrates how to bind (IN and OUT) a PL/SQL record.
-#
-# This feature is only available in Oracle Database 12.1 and higher.
-# -----------------------------------------------------------------------------
-
-import datetime
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# create new object of the correct type
-# note the use of a PL/SQL record defined in a package
-# a table record identified by TABLE%ROWTYPE can also be used
-type_obj = connection.gettype("PKG_DEMO.UDT_DEMORECORD")
-obj = type_obj.newobject()
-obj.NUMBERVALUE = 6
-obj.STRINGVALUE = "Test String"
-obj.DATEVALUE = datetime.datetime(2016, 5, 28)
-obj.BOOLEANVALUE = False
-
-# show the original values
-print("NUMBERVALUE ->", obj.NUMBERVALUE)
-print("STRINGVALUE ->", obj.STRINGVALUE)
-print("DATEVALUE ->", obj.DATEVALUE)
-print("BOOLEANVALUE ->", obj.BOOLEANVALUE)
-print()
-
-with connection.cursor() as cursor:
-    # call the stored procedure which will modify the object
-    cursor.callproc("pkg_Demo.DemoRecordsInOut", (obj,))
-
-    # show the modified values
-    print("NUMBERVALUE ->", obj.NUMBERVALUE)
-    print("STRINGVALUE ->", obj.STRINGVALUE)
-    print("DATEVALUE ->", obj.DATEVALUE)
-    print("BOOLEANVALUE ->", obj.BOOLEANVALUE)
-    print()
diff --git a/samples/plsql_record_async.py b/samples/plsql_record_async.py
deleted file mode 100644
index 61c5165a..00000000
--- a/samples/plsql_record_async.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_record_async.py
-#
-# An asynchronous version of plsql_record.py
-#
-# Demonstrates how to bind (IN and OUT) a PL/SQL record.
-#
-# This feature is only available in Oracle Database 12.1 and higher.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import datetime
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # create new object of the correct type
-    # note the use of a PL/SQL record defined in a package
-    # a table record identified by TABLE%ROWTYPE can also be used
-    type_obj = await connection.gettype("PKG_DEMO.UDT_DEMORECORD")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 6
-    obj.STRINGVALUE = "Test String"
-    obj.DATEVALUE = datetime.datetime(2016, 5, 28)
-    obj.BOOLEANVALUE = False
-
-    # show the original values
-    print("NUMBERVALUE ->", obj.NUMBERVALUE)
-    print("STRINGVALUE ->", obj.STRINGVALUE)
-    print("DATEVALUE ->", obj.DATEVALUE)
-    print("BOOLEANVALUE ->", obj.BOOLEANVALUE)
-    print()
-
-    with connection.cursor() as cursor:
-        # call the stored procedure which will modify the object
-        await cursor.callproc("pkg_Demo.DemoRecordsInOut", (obj,))
-
-        # show the modified values
-        print("NUMBERVALUE ->", obj.NUMBERVALUE)
-        print("STRINGVALUE ->", obj.STRINGVALUE)
-        print("DATEVALUE ->", obj.DATEVALUE)
-        print("BOOLEANVALUE ->", obj.BOOLEANVALUE)
-        print()
-
-
-asyncio.run(main())
diff --git a/samples/plsql_rowtype.py b/samples/plsql_rowtype.py
deleted file mode 100644
index 4b046907..00000000
--- a/samples/plsql_rowtype.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_rowtype.py
-#
-# Demonstrates how to use a PL/SQL %ROWTYPE attribute
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-
-    cursor.execute(
-        """
-        begin
-            begin
-                execute immediate 'drop table RTSampleTable';
-            exception
-            when others then
-                if sqlcode <> -942 then
-                    raise;
-                end if;
-            end;
-
-            execute immediate 'create table RTSampleTable (
-                                            city varchar2(10))';
-
-            execute immediate
-                    'insert into RTSampleTable values (''London'')';
-
-            commit;
-
-        end;
-        """
-    )
-
-    cursor.execute(
-        """
-        create or replace function TestFuncOUT return RTSampleTable%rowtype as
-            r RTSampleTable%rowtype;
-        begin
-            select * into r from RTSampleTable where rownum < 2 order by 1;
-            return r;
-        end;"""
-    )
-    if cursor.warning:
-        print(cursor.warning)
-
-    cursor.execute(
-        """
-        create or replace procedure TestProcIN(
-            r in RTSampleTable%rowtype, city out varchar2) as
-        begin
-            city := r.city;
-        end;"""
-    )
-    if cursor.warning:
-        print(cursor.warning)
-
-    # Getting a %ROWTYPE from PL/SQL returns a python-oracledb DbObject record
-
-    rt = connection.gettype("RTSAMPLETABLE%ROWTYPE")
-    r = cursor.callfunc("TESTFUNCOUT", rt)
-    print("1. City is:", r.CITY)
-    # dump_object(r)           # This is defined in object_dump.py
-
-    # An equivalent record can be directly constructed
-
-    obj = rt.newobject()
-    obj.CITY = "My Town"
-
-    # Passing a record to a %ROWTYPE parameter
-
-    c = cursor.var(oracledb.DB_TYPE_VARCHAR)
-    cursor.callproc("TESTPROCIN", [r, c])
-    print("2. City is:", c.getvalue())
-
-    cursor.callproc("TESTPROCIN", [obj, c])
-    print("3. City is:", c.getvalue())
diff --git a/samples/plsql_rowtype_async.py b/samples/plsql_rowtype_async.py
deleted file mode 100644
index 68371897..00000000
--- a/samples/plsql_rowtype_async.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# plsql_rowtype_async.py
-#
-# An asynchronous version of plsql_rowtype.py
-#
-# Demonstrates how to use a PL/SQL %ROWTYPE attribute
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-
-        await cursor.execute(
-            """
-            begin
-                begin
-                    execute immediate 'drop table RTSampleTable';
-                exception
-                when others then
-                    if sqlcode <> -942 then
-                        raise;
-                    end if;
-                end;
-
-                execute immediate 'create table RTSampleTable (
-                                                city varchar2(10))';
-
-                execute immediate
-                        'insert into RTSampleTable values (''London'')';
-
-                commit;
-
-            end;
-            """
-        )
-
-        await cursor.execute(
-            """
-            create or replace function TestFuncOUT return RTSampleTable%rowtype
-            as
-                r RTSampleTable%rowtype;
-            begin
-                select * into r from RTSampleTable where rownum < 2 order by 1;
-                return r;
-            end;"""
-        )
-        if cursor.warning:
-            print(cursor.warning)
-
-        await cursor.execute(
-            """
-            create or replace procedure TestProcIN(
-                r in RTSampleTable%rowtype, city out varchar2) as
-            begin
-                city := r.city;
-            end;"""
-        )
-        if cursor.warning:
-            print(cursor.warning)
-
-        # Getting a %ROWTYPE from PL/SQL returns a python-oracledb DbObject
-        # record
-
-        rt = await connection.gettype("RTSAMPLETABLE%ROWTYPE")
-        r = await cursor.callfunc("TESTFUNCOUT", rt)
-        print("1. City is:", r.CITY)
-        # dump_object(r)           # This is defined in object_dump.py
-
-        # An equivalent record can be directly constructed
-
-        obj = rt.newobject()
-        obj.CITY = "My Town"
-
-        # Passing a record to a %ROWTYPE parameter
-
-        c = cursor.var(oracledb.DB_TYPE_VARCHAR)
-        await cursor.callproc("TESTPROCIN", [r, c])
-        print("2. City is:", c.getvalue())
-
-        await cursor.callproc("TESTPROCIN", [obj, c])
-        print("3. City is:", c.getvalue())
-
-
-asyncio.run(main())
diff --git a/samples/query.py b/samples/query.py
deleted file mode 100644
index 5048b0ca..00000000
--- a/samples/query.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query.py
-#
-# Demonstrates different ways of fetching rows from a query.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-sql = """select * from SampleQueryTab
-         where id < 6
-         order by id"""
-
-with connection.cursor() as cursor:
-    print("Get all rows via an iterator")
-    for result in cursor.execute(sql):
-        print(result)
-    print()
-
-    print("Query one row at a time")
-    cursor.execute(sql)
-    row = cursor.fetchone()
-    print(row)
-    row = cursor.fetchone()
-    print(row)
-    print()
-
-    print("Fetch many rows")
-    cursor.execute(sql)
-    res = cursor.fetchmany(3)
-    print(res)
-    print()
-
-    print("Fetch all rows")
-    cursor.execute(sql)
-    res = cursor.fetchall()
-    print(res)
-    print()
-
-    print("Fetch each row as a Dictionary")
-    cursor.execute(sql)
-    columns = [col.name for col in cursor.description]
-    cursor.rowfactory = lambda *args: dict(zip(columns, args))
-    for row in cursor:
-        print(row)
diff --git a/samples/query_arraysize.py b/samples/query_arraysize.py
deleted file mode 100644
index 0b25b85a..00000000
--- a/samples/query_arraysize.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query_arraysize.py
-#
-# Demonstrates how to alter the arraysize and prefetchrows values in order to
-# tune the performance of fetching data from the database.  Increasing these
-# values can reduce the number of network round trips and overhead required to
-# fetch all of the rows from a large table.  The value affect internal buffers
-# and do not affect how, or when, rows are returned to your application.
-#
-# The best values need to be determined by tuning in your production
-# environment.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# Global values can be set to override the defaults used when a cursor is
-# created
-#
-# oracledb.defaults.prefetchrows = 200  # default is 2
-# oracledb.defaults.arraysize = 200     # default is 100
-
-with connection.cursor() as cursor:
-    # Scenario 1: Selecting from a "large" table
-
-    start = time.time()
-
-    # Tune arraysize for your memory, network, and performance requirements.
-    # Generally leave prefetchrows at its default of 2.
-    cursor.arraysize = 1000
-
-    cursor.execute("select * from bigtab")
-    res = cursor.fetchall()
-
-    elapsed = time.time() - start
-    print("Prefetchrows:", cursor.prefetchrows, "Arraysize:", cursor.arraysize)
-    print("Retrieved", len(res), "rows in", elapsed, "seconds")
-
-    # Scenario 2: Selecting a "page" of data
-
-    PAGE_SIZE = 20  # number of rows to fetch from the table
-
-    start = time.time()
-
-    cursor.arraysize = PAGE_SIZE
-    cursor.prefetchrows = PAGE_SIZE + 1  # Set this one larger than arraysize
-    # to remove an extra round-trip
-
-    cursor.execute(
-        "select * from bigtab offset 0 rows fetch next :r rows only",
-        [PAGE_SIZE],
-    )
-    res = cursor.fetchall()
-
-    elapsed = time.time() - start
-    print("Prefetchrows:", cursor.prefetchrows, "Arraysize:", cursor.arraysize)
-    print("Retrieved", len(res), "rows in", elapsed, "seconds")
-
-    # Scenario 3: Selecting one row of data is similar to the previous example
-
-    start = time.time()
-
-    cursor.arraysize = 1
-    cursor.prefetchrows = 2
-
-    cursor.execute("select * from bigtab where rownum < 2")
-    res = cursor.fetchall()
-
-    elapsed = time.time() - start
-    print("Prefetchrows:", cursor.prefetchrows, "Arraysize:", cursor.arraysize)
-    print("Retrieved", len(res), "row in", elapsed, "seconds")
diff --git a/samples/query_arraysize_async.py b/samples/query_arraysize_async.py
deleted file mode 100644
index ec6330fc..00000000
--- a/samples/query_arraysize_async.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query_arraysize_async.py
-#
-# An asynchronous version of query_arraysize.py
-#
-# Demonstrates how to alter the arraysize and prefetchrows values in order to
-# tune the performance of fetching data from the database.  Increasing these
-# values can reduce the number of network round trips and overhead required to
-# fetch all of the rows from a large table.  The value affect internal buffers
-# and do not affect how, or when, rows are returned to your application.
-#
-# The best values need to be determined by tuning in your production
-# environment.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import time
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # Global values can be set to override the defaults used when a cursor is
-    # created
-    #
-    # oracledb.defaults.prefetchrows = 200  # default is 2
-    # oracledb.defaults.arraysize = 200     # default is 100
-
-    with connection.cursor() as cursor:
-        # Scenario 1: Selecting from a "large" table
-
-        start = time.time()
-
-        # Tune arraysize for your memory, network, and performance
-        # requirements.  Generally leave prefetchrows at its default of 2.
-        cursor.arraysize = 1000
-
-        await cursor.execute("select * from bigtab")
-        res = await cursor.fetchall()
-
-        elapsed = time.time() - start
-        print(
-            "Prefetchrows:",
-            cursor.prefetchrows,
-            "Arraysize:",
-            cursor.arraysize,
-        )
-        print("Retrieved", len(res), "rows in", elapsed, "seconds")
-
-        # Scenario 2: Selecting a "page" of data
-
-        PAGE_SIZE = 20  # number of rows to fetch from the table
-
-        start = time.time()
-
-        # Set prefetchrows one larger than arraysize
-        # to remove an extra round-trip
-        cursor.arraysize = PAGE_SIZE
-        cursor.prefetchrows = PAGE_SIZE + 1
-
-        await cursor.execute(
-            "select * from bigtab offset 0 rows fetch next :r rows only",
-            [PAGE_SIZE],
-        )
-        res = await cursor.fetchall()
-
-        elapsed = time.time() - start
-        print(
-            "Prefetchrows:",
-            cursor.prefetchrows,
-            "Arraysize:",
-            cursor.arraysize,
-        )
-        print("Retrieved", len(res), "rows in", elapsed, "seconds")
-
-        # Scenario 3: Selecting one row of data is similar to the previous
-        # example
-
-        start = time.time()
-
-        cursor.arraysize = 1
-        cursor.prefetchrows = 2
-
-        await cursor.execute("select * from bigtab where rownum < 2")
-        res = await cursor.fetchall()
-
-        elapsed = time.time() - start
-        print(
-            "Prefetchrows:",
-            cursor.prefetchrows,
-            "Arraysize:",
-            cursor.arraysize,
-        )
-        print("Retrieved", len(res), "row in", elapsed, "seconds")
-
-
-asyncio.run(main())
diff --git a/samples/query_async.py b/samples/query_async.py
deleted file mode 100644
index bd5f97a9..00000000
--- a/samples/query_async.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query_async.py
-#
-# An asynchronous version of query.py
-#
-# Demonstrates different ways of fetching rows from a query with asyncio.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    sql = """select * from SampleQueryTab
-             where id < 6
-             order by id"""
-
-    with connection.cursor() as cursor:
-        print("Get all rows via an iterator")
-        await cursor.execute(sql)
-        async for result in cursor:
-            print(result)
-        print()
-
-        print("Query one row at a time")
-        await cursor.execute(sql)
-        row = await cursor.fetchone()
-        print(row)
-        row = await cursor.fetchone()
-        print(row)
-        print()
-
-    print("Fetch many rows")
-    res = await connection.fetchmany(sql, num_rows=3)
-    print(res)
-    print()
-
-    print("Fetch all rows")
-    res = await connection.fetchall(sql)
-    print(res)
-    print()
-
-    with connection.cursor() as cursor:
-        print("Fetch each row as a Dictionary")
-        await cursor.execute(sql)
-        columns = [col.name for col in cursor.description]
-        cursor.rowfactory = lambda *args: dict(zip(columns, args))
-        async for row in cursor:
-            print(row)
-
-
-asyncio.run(main())
diff --git a/samples/query_strings_as_bytes.py b/samples/query_strings_as_bytes.py
deleted file mode 100644
index b1c47b7d..00000000
--- a/samples/query_strings_as_bytes.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query_strings_as_bytes.py
-#
-# Demonstrates how to query strings as bytes (bypassing decoding of the bytes
-# into a Python string). This can be useful when attempting to fetch data that
-# was stored in the database in the wrong encoding.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-STRING_VAL = "I bought a cafetière on the Champs-Élysées"
-
-
-def return_strings_as_bytes(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-        return cursor.var(str, arraysize=cursor.arraysize, bypass_decode=True)
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# truncate table and populate with our data of choice
-with connection.cursor() as cursor:
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        "insert into TestTempTable values (1, :val)", val=STRING_VAL
-    )
-    connection.commit()
-
-# fetch the data normally and show that it is returned as a string
-with connection.cursor() as cursor:
-    cursor.execute("select IntCol, StringCol from TestTempTable")
-    print("Data fetched using normal technique:")
-    for row in cursor:
-        print(row)
-    print()
-
-# fetch the data, bypassing the decode and show that it is returned as
-# bytes
-with connection.cursor() as cursor:
-    cursor.outputtypehandler = return_strings_as_bytes
-    cursor.execute("select IntCol, StringCol from TestTempTable")
-    print("Data fetched using bypass decode technique:")
-    for row in cursor:
-        print(row)
diff --git a/samples/query_strings_as_bytes_async.py b/samples/query_strings_as_bytes_async.py
deleted file mode 100644
index df64db39..00000000
--- a/samples/query_strings_as_bytes_async.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query_strings_as_bytes_async.py
-#
-# An asynchronous version of query_strings_as_bytes.py
-#
-# Demonstrates how to query strings as bytes (bypassing decoding of the bytes
-# into a Python string). This can be useful when attempting to fetch data that
-# was stored in the database in the wrong encoding.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-STRING_VAL = "I bought a cafetière on the Champs-Élysées"
-
-
-def return_strings_as_bytes(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-        return cursor.var(str, arraysize=cursor.arraysize, bypass_decode=True)
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # truncate table and populate with our data of choice
-    with connection.cursor() as cursor:
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute(
-            "insert into TestTempTable values (1, :val)", val=STRING_VAL
-        )
-        await connection.commit()
-
-    # fetch the data normally and show that it is returned as a string
-    with connection.cursor() as cursor:
-        await cursor.execute("select IntCol, StringCol from TestTempTable")
-        print("Data fetched using normal technique:")
-        async for row in cursor:
-            print(row)
-        print()
-
-    # fetch the data, bypassing the decode and show that it is returned as
-    # bytes
-    with connection.cursor() as cursor:
-        cursor.outputtypehandler = return_strings_as_bytes
-        await cursor.execute("select IntCol, StringCol from TestTempTable")
-        print("Data fetched using bypass decode technique:")
-        async for row in cursor:
-            print(row)
-
-
-asyncio.run(main())
diff --git a/samples/raw_aq.py b/samples/raw_aq.py
deleted file mode 100644
index 674557be..00000000
--- a/samples/raw_aq.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# raw_aq.py
-#
-# Demonstrates how to use advanced queuing with RAW data. It makes use of a
-# RAW queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-QUEUE_NAME = "DEMO_RAW_QUEUE"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth and final message",
-]
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# create a queue
-queue = connection.queue(QUEUE_NAME)
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-# dequeue all existing messages to ensure the queue is empty, just so that
-# the results are consistent
-while queue.deqone():
-    pass
-
-# enqueue a few messages
-print("Enqueuing messages...")
-for data in PAYLOAD_DATA:
-    print(data)
-    queue.enqone(connection.msgproperties(payload=data))
-connection.commit()
-
-# dequeue the messages
-print("\nDequeuing messages...")
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.decode())
-connection.commit()
-print("\nDone.")
diff --git a/samples/raw_aq_async.py b/samples/raw_aq_async.py
deleted file mode 100644
index 8d25b614..00000000
--- a/samples/raw_aq_async.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# raw_aq.py
-#
-# Demonstrates how to use advanced queuing with RAW data. It makes use of a
-# RAW queue created in the sample setup.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-QUEUE_NAME = "DEMO_RAW_QUEUE"
-PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth and final message",
-]
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-    )
-
-    # create a queue
-    queue = connection.queue(QUEUE_NAME)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-
-    # dequeue all existing messages to ensure the queue is empty, just so
-    # that the results are consistent
-    while await queue.deqone():
-        pass
-
-    # enqueue a few messages
-    print("Enqueuing messages...")
-    for data in PAYLOAD_DATA:
-        print(data)
-        await queue.enqone(connection.msgproperties(payload=data))
-    await connection.commit()
-
-    # dequeue the messages
-    print("\nDequeuing messages...")
-    while True:
-        props = await queue.deqone()
-        if not props:
-            break
-        print(props.payload.decode())
-    await connection.commit()
-    print("\nDone.")
-
-
-asyncio.run(main())
diff --git a/samples/ref_cursor.py b/samples/ref_cursor.py
deleted file mode 100644
index e92f47fc..00000000
--- a/samples/ref_cursor.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# ref_cursor.py
-#
-# Demonstrates the use of REF CURSORS.
-# -----------------------------------------------------------------------------
-
-import time
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    ref_cursor = connection.cursor()
-    cursor.callproc("myrefcursorproc", (2, 6, ref_cursor))
-    print("Rows between 2 and 6:")
-    for row in ref_cursor:
-        print(row)
-    print()
-
-    ref_cursor = connection.cursor()
-    cursor.callproc("myrefcursorproc", (8, 9, ref_cursor))
-    print("Rows between 8 and 9:")
-    for row in ref_cursor:
-        print(row)
-    print()
-
-    # -------------------------------------------------------------------------
-    # Setting prefetchrows and arraysize of a REF CURSOR can improve
-    # performance when fetching a large number of rows by reducing network
-    # round-trips.
-    # -------------------------------------------------------------------------
-
-    # Truncate the table used for this demo
-    cursor.execute("truncate table TestTempTable")
-
-    # Populate the table with a large number of rows
-    num_rows = 50000
-    sql = "insert into TestTempTable (IntCol) values (:1)"
-    data = [(n + 1,) for n in range(num_rows)]
-    cursor.executemany(sql, data)
-
-    # Perform an untuned fetch
-    ref_cursor = connection.cursor()
-
-    print(
-        "ref_cursor.prefetchrows =",
-        ref_cursor.prefetchrows,
-        "ref_cursor.arraysize =",
-        ref_cursor.arraysize,
-    )
-    start = time.time()
-    sum_rows = 0
-    cursor.callproc("myrefcursorproc2", [ref_cursor])
-    for row in ref_cursor:
-        sum_rows += row[0]
-    elapsed = time.time() - start
-    print(
-        "Sum of IntCol for",
-        num_rows,
-        "rows is ",
-        sum_rows,
-        "in",
-        elapsed,
-        "seconds",
-    )
-    print()
-
-    # Repeat the call but increase the internal arraysize and prefetch row
-    # buffers for the REF CURSOR to tune the number of round-trips to the
-    # database
-    ref_cursor = connection.cursor()
-    ref_cursor.prefetchrows = 1000
-    ref_cursor.arraysize = 1000
-
-    print(
-        "ref_cursor.prefetchrows =",
-        ref_cursor.prefetchrows,
-        "ref_cursor.arraysize =",
-        ref_cursor.arraysize,
-    )
-    start = time.time()
-    sum_rows = 0
-    cursor.callproc("myrefcursorproc2", [ref_cursor])
-    for row in ref_cursor:
-        sum_rows += row[0]
-    elapsed = time.time() - start
-    print(
-        "Sum of IntCol for",
-        num_rows,
-        "rows is ",
-        sum_rows,
-        "in",
-        elapsed,
-        "seconds",
-    )
diff --git a/samples/ref_cursor_async.py b/samples/ref_cursor_async.py
deleted file mode 100644
index 4abbca40..00000000
--- a/samples/ref_cursor_async.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# ref_cursor_async.py
-#
-# An asynchronous version of ref_cursor.py
-#
-# Demonstrates the use of REF CURSORS.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import time
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    ref_cursor = connection.cursor()
-    await connection.callproc("myrefcursorproc", (2, 6, ref_cursor))
-    print("Rows between 2 and 6:")
-    async for row in ref_cursor:
-        print(row)
-    print()
-
-    ref_cursor = connection.cursor()
-    await connection.callproc("myrefcursorproc", (8, 9, ref_cursor))
-    print("Rows between 8 and 9:")
-    async for row in ref_cursor:
-        print(row)
-    print()
-
-    # ---------------------------------------------------------------------
-    # Setting prefetchrows and arraysize of a REF CURSOR can improve
-    # performance when fetching a large number of rows by reducing network
-    # round-trips.
-    # ---------------------------------------------------------------------
-
-    # Truncate the table used for this demo
-    await connection.execute("truncate table TestTempTable")
-
-    # Populate the table with a large number of rows
-    num_rows = 50000
-    sql = "insert into TestTempTable (IntCol) values (:1)"
-    data = [(n + 1,) for n in range(num_rows)]
-    await connection.executemany(sql, data)
-
-    # Perform an untuned fetch
-    ref_cursor = connection.cursor()
-
-    print(
-        "ref_cursor.prefetchrows =",
-        ref_cursor.prefetchrows,
-        "ref_cursor.arraysize =",
-        ref_cursor.arraysize,
-    )
-    start = time.time()
-    sum_rows = 0
-    await connection.callproc("myrefcursorproc2", [ref_cursor])
-    async for row in ref_cursor:
-        sum_rows += row[0]
-    elapsed = time.time() - start
-    print(
-        "Sum of IntCol for",
-        num_rows,
-        "rows is ",
-        sum_rows,
-        "in",
-        elapsed,
-        "seconds",
-    )
-    print()
-
-    # Repeat the call but increase the internal arraysize and prefetch row
-    # buffers for the REF CURSOR to tune the number of round-trips to the
-    # database
-    ref_cursor = connection.cursor()
-    ref_cursor.prefetchrows = 1000
-    ref_cursor.arraysize = 1000
-
-    print(
-        "ref_cursor.prefetchrows =",
-        ref_cursor.prefetchrows,
-        "ref_cursor.arraysize =",
-        ref_cursor.arraysize,
-    )
-    start = time.time()
-    sum_rows = 0
-    await connection.callproc("myrefcursorproc2", [ref_cursor])
-    async for row in ref_cursor:
-        sum_rows += row[0]
-    elapsed = time.time() - start
-    print(
-        "Sum of IntCol for",
-        num_rows,
-        "rows is ",
-        sum_rows,
-        "in",
-        elapsed,
-        "seconds",
-    )
-
-
-asyncio.run(main())
diff --git a/samples/return_lobs_as_strings.py b/samples/return_lobs_as_strings.py
deleted file mode 100644
index ac71d42e..00000000
--- a/samples/return_lobs_as_strings.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# return_lobs_as_strings.py
-#
-# Returns all CLOB values as strings and BLOB values as bytes. The
-# performance of this technique is significantly better than fetching the LOBs
-# and then reading the contents of the LOBs as it avoids round-trips to the
-# database. Be aware, however, that this method requires contiguous memory so
-# is not suitable for very large LOBs.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# A global indicating that LOB columns should be fetched as str or bytes, not
-# as python-oracledb LOB objects. You can do the same in execute() calls by
-# passing a fetch_lobs parameter.
-oracledb.defaults.fetch_lobs = False
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # add some data to the tables
-    print("Populating tables with data...")
-    cursor.execute("truncate table TestClobs")
-    cursor.execute("truncate table TestBlobs")
-    long_string = ""
-    for i in range(10):
-        char = chr(ord("A") + i)
-        long_string += char * 25000
-        cursor.execute(
-            "insert into TestClobs values (:1, :2)",
-            (i + 1, "STRING " + long_string),
-        )
-        cursor.execute(
-            "insert into TestBlobs values (:1, :2)",
-            (i + 1, long_string.encode("ascii")),
-        )
-    connection.commit()
-
-    # fetch the data and show the results
-    print("CLOBS returned as strings")
-    cursor.execute(
-        """
-        select
-            IntCol,
-            ClobCol
-        from TestClobs
-        order by IntCol
-        """
-    )
-    for int_col, value in cursor:
-        print("Row:", int_col, "string of length", len(value))
-    print()
-    print("BLOBS returned as bytes")
-    cursor.execute(
-        """
-        select
-            IntCol,
-            BlobCol
-        from TestBlobs
-        order by IntCol
-        """
-    )
-    for int_col, value in cursor:
-        print("Row:", int_col, "string of length", value and len(value) or 0)
diff --git a/samples/return_lobs_as_strings_async.py b/samples/return_lobs_as_strings_async.py
deleted file mode 100644
index e5d27f37..00000000
--- a/samples/return_lobs_as_strings_async.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# return_lobs_as_strings_async.py
-#
-# An asynchronous version of return_lobs_as_strings.py
-#
-# Returns all CLOB values as strings and BLOB values as bytes. The
-# performance of this technique is significantly better than fetching the LOBs
-# and then reading the contents of the LOBs as it avoids round-trips to the
-# database. Be aware, however, that this method requires contiguous memory so
-# is not suitable for very large LOBs.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-# A global indicating that LOB columns should be fetched as str or bytes, not
-# as python-oracledb LOB objects. You can do the same in execute() calls by
-# passing a fetch_lobs parameter.
-oracledb.defaults.fetch_lobs = False
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # add some data to the tables
-        print("Populating tables with data...")
-        await cursor.execute("truncate table TestClobs")
-        await cursor.execute("truncate table TestBlobs")
-        long_string = ""
-        for i in range(10):
-            char = chr(ord("A") + i)
-            long_string += char * 25000
-            await cursor.execute(
-                "insert into TestClobs values (:1, :2)",
-                (i + 1, "STRING " + long_string),
-            )
-            await cursor.execute(
-                "insert into TestBlobs values (:1, :2)",
-                (i + 1, long_string.encode("ascii")),
-            )
-        await connection.commit()
-
-        # fetch the data and show the results
-        print("CLOBS returned as strings")
-        await cursor.execute(
-            """
-            select
-                IntCol,
-                ClobCol
-            from TestClobs
-            order by IntCol
-            """
-        )
-        async for int_col, value in cursor:
-            print("Row:", int_col, "string of length", len(value))
-        print()
-        print("BLOBS returned as bytes")
-        await cursor.execute(
-            """
-            select
-                IntCol,
-                BlobCol
-            from TestBlobs
-            order by IntCol
-            """
-        )
-        async for int_col, value in cursor:
-            print(
-                "Row:", int_col, "string of length", value and len(value) or 0
-            )
-
-
-asyncio.run(main())
diff --git a/samples/return_numbers_as_decimals.py b/samples/return_numbers_as_decimals.py
deleted file mode 100644
index 3eed1afb..00000000
--- a/samples/return_numbers_as_decimals.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# return_numbers_as_decimals.py
-#
-# Returns all numbers as decimals. This is needed if the full decimal
-# precision of Oracle numbers is required by the application. See this article
-# (http://blog.reverberate.org/2016/02/06/floating-point-demystified-part2.html)
-# for an explanation of why decimal numbers (like Oracle numbers) cannot be
-# represented exactly by floating point numbers.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# A global indicating that NUMBER columns should be fetched as decimal.Decimal.
-# You can do the same in execute() calls by passing a fetch_decimals parameter.
-oracledb.defaults.fetch_decimals = True
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    cursor.execute("select * from TestNumbers")
-    for row in cursor:
-        print("Row:", row)
diff --git a/samples/return_numbers_as_decimals_async.py b/samples/return_numbers_as_decimals_async.py
deleted file mode 100644
index df206fc7..00000000
--- a/samples/return_numbers_as_decimals_async.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# return_numbers_as_decimals_async.py
-#
-# An asynchronous version of return_numbers_as_decimals.py
-#
-# Returns all numbers as decimals. This is needed if the full decimal
-# precision of Oracle numbers is required by the application. See this article
-# (http://blog.reverberate.org/2016/02/06/floating-point-demystified-part2.html)
-# for an explanation of why decimal numbers (like Oracle numbers) cannot be
-# represented exactly by floating point numbers.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-# A global indicating that NUMBER columns should be fetched as decimal.Decimal.
-# You can do the same in execute() calls by passing a fetch_decimals parameter.
-oracledb.defaults.fetch_decimals = True
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        await cursor.execute("select * from TestNumbers")
-        async for row in cursor:
-            print("Row:", row)
-
-
-asyncio.run(main())
diff --git a/samples/rows_as_instance.py b/samples/rows_as_instance.py
deleted file mode 100644
index f595f85f..00000000
--- a/samples/rows_as_instance.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# rows_as_instance.py
-#
-# Returns rows as instances instead of tuples. See the ceDatabase.Row class
-# in the cx_PyGenLib project (http://cx-pygenlib.sourceforge.net) for a more
-# advanced example.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-class Test:
-    def __init__(self, a, b, c):
-        self.a = a
-        self.b = b
-        self.c = c
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # create sample data
-    cursor.execute(
-        """
-        begin
-            begin
-                execute immediate 'drop table TestInstances';
-            exception
-            when others then
-                if sqlcode <> -942 then
-                    raise;
-                end if;
-            end;
-
-            execute immediate 'create table TestInstances (
-                                 a varchar2(60) not null,
-                                 b number(9) not null,
-                                 c date not null)';
-
-            execute immediate
-                    'insert into TestInstances values (''First'', 5, sysdate)';
-
-            execute immediate
-                    'insert into TestInstances
-                    values (''Second'', 25, sysdate)';
-
-            commit;
-        end;
-        """
-    )
-
-    # retrieve the data and display it
-    cursor.execute("select * from TestInstances")
-    cursor.rowfactory = Test
-    print("Rows:")
-    for row in cursor:
-        print("a = %s, b = %s, c = %s" % (row.a, row.b, row.c))
diff --git a/samples/rows_as_instance_async.py b/samples/rows_as_instance_async.py
deleted file mode 100644
index 9ceaba4d..00000000
--- a/samples/rows_as_instance_async.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# rows_as_instance_async.py
-#
-# An asynchronous version of rows_as_instance.py
-#
-# Returns rows as instances instead of tuples. See the ceDatabase.Row class
-# in the cx_PyGenLib project (http://cx-pygenlib.sourceforge.net) for a more
-# advanced example.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-class Test:
-    def __init__(self, a, b, c):
-        self.a = a
-        self.b = b
-        self.c = c
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # create sample data
-        await cursor.execute(
-            """
-            begin
-                begin
-                    execute immediate 'drop table TestInstances';
-                exception
-                when others then
-                    if sqlcode <> -942 then
-                        raise;
-                    end if;
-                end;
-
-                execute immediate 'create table TestInstances (
-                                     a varchar2(60) not null,
-                                     b number(9) not null,
-                                     c date not null)';
-
-                execute immediate
-                        'insert into TestInstances
-                        values (''First'', 5, sysdate)';
-
-                execute immediate
-                        'insert into TestInstances
-                        values (''Second'', 25, sysdate)';
-
-                commit;
-            end;
-            """
-        )
-
-        # retrieve the data and display it
-        await cursor.execute("select * from TestInstances")
-        cursor.rowfactory = Test
-        print("Rows:")
-        async for row in cursor:
-            print("a = %s, b = %s, c = %s" % (row.a, row.b, row.c))
-
-
-asyncio.run(main())
diff --git a/samples/sample_env.py b/samples/sample_env.py
deleted file mode 100644
index 6d757eba..00000000
--- a/samples/sample_env.py
+++ /dev/null
@@ -1,298 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Sets the environment used by the python-oracledb sample scripts. Production
-# applications should consider using External Authentication to avoid hard
-# coded credentials.
-#
-# The samples will prompt for credentials and schema information unless the
-# following environment variables are set:
-#
-#   PYO_SAMPLES_ORACLE_CLIENT_PATH: Oracle Client or Instant Client library dir
-#   PYO_SAMPLES_ADMIN_USER: privileged admin user for setting up samples
-#   PYO_SAMPLES_ADMIN_PASSWORD: password of PYO_SAMPLES_ADMIN_USER
-#   PYO_SAMPLES_CONNECT_STRING: database connection string
-#   PYO_SAMPLES_DRCP_CONNECT_STRING: database connection string for DRCP
-#   PYO_SAMPLES_MAIN_USER: user to be created. Used for most samples
-#   PYO_SAMPLES_MAIN_PASSWORD: password for PYO_SAMPLES_MAIN_USER
-#   PYO_SAMPLES_EDITION_USER: user to be created for editiong samples
-#   PYO_SAMPLES_EDITION_PASSWORD: password of PYO_SAMPLES_EDITION_USER
-#   PYO_SAMPLES_EDITION_NAME: name of edition for editioning samples
-#   PYO_SAMPLES_WALLET_LOCATION: location of wallet file (thin mode, mTLS)
-#   PYO_SAMPLES_WALLET_PASSWORD: password for wallet file (thin mode, mTLS)
-#   PYO_SAMPLES_DRIVER_MODE: python-oracledb mode (Thick or thin) to use
-#
-# - On Windows set PYO_SAMPLES_ORACLE_CLIENT_PATH if Oracle libraries are not
-#   in PATH.  On macOS set the variable to the Instant Client directory.  On
-#   Linux do not set the variable; instead set LD_LIBRARY_PATH or configure
-#   ldconfig before running Python.
-#
-# - PYO_SAMPLES_ADMIN_USER should be the administrative user ADMIN for cloud
-#   databases and SYSTEM for on premises databases.
-#
-# - PYO_SAMPLES_CONNECT_STRING is the connection string for your database. It
-#   can be set to an Easy Connect string or to a Net Service Name from a
-#   tnsnames.ora file or external naming service.
-#
-#   The Easy Connect string is generally easiest. The basic syntax is:
-#
-#     host_name[:port][/service_name][:server_type]
-#
-#   Commonly just the host_name and service_name are needed
-#   e.g. "localhost/orclpdb" or "localhost/XEPDB1".
-#
-#   If PYO_SAMPLES_CONNECT_STRING is an aliases from tnsnames.ora file, then
-#   set the TNS_ADMIN environment variable and put the file in
-#   $TNS_ADMIN/tnsnames.ora.  Alternatively for python-oracledb Thick mode, the
-#   file will be automatically used if it is in a location such as
-#   instantclient_XX_Y/network/admin/tnsnames.ora,
-#   $ORACLE_HOME/network/admin/tnsnames.ora or /etc/tnsnames.ora.
-#
-# - PYO_SAMPLES_DRCP_CONNECT_STRING should be a connect string requesting a
-#   pooled server, for example "localhost/orclpdb:pooled".
-#
-# - PYO_SAMPLES_MAIN_USER and PYO_SAMPLES_EDITION_USER are names of users that
-#   will be created and used for running samples.  Choose names that do not
-#   exist because the schemas will be dropped and then recreated.
-#
-# - PYO_SAMPLES_EDITION_NAME can be set to a new name to be used for Edition
-#   Based Redefinition examples.
-#
-# - PYO_SAMPLES_DRIVER_MODE should be "thin" or "thick".  It is used by samples
-#   that can run in both python-oracledb modes.
-#
-# -----------------------------------------------------------------------------
-
-import getpass
-import os
-import platform
-import sys
-
-import oracledb
-
-# default values
-DEFAULT_MAIN_USER = "pythondemo"
-DEFAULT_EDITION_USER = "pythoneditions"
-DEFAULT_EDITION_NAME = "python_e1"
-DEFAULT_CONNECT_STRING = "localhost/orclpdb1"
-DEFAULT_DRCP_CONNECT_STRING = "localhost/orclpdb1:pooled"
-
-# dictionary containing all parameters; these are acquired as needed by the
-# methods below (which should be used instead of consulting this dictionary
-# directly) and then stored so that a value is not requested more than once
-PARAMETERS = {}
-
-
-def get_value(name, label, default_value=None, password=False):
-    value = PARAMETERS.get(name)
-    if value is not None:
-        return value
-    value = os.environ.get(name)
-    if value is None:
-        if default_value is not None:
-            label += " [%s]" % default_value
-        label += ": "
-        if not password:
-            value = input(label).strip()
-        else:
-            value = getpass.getpass(label)
-        if not value:
-            value = default_value
-    PARAMETERS[name] = value
-    return value
-
-
-def get_main_user():
-    return get_value(
-        "PYO_SAMPLES_MAIN_USER", "Main User Name", DEFAULT_MAIN_USER
-    )
-
-
-def get_main_password():
-    return get_value(
-        "PYO_SAMPLES_MAIN_PASSWORD",
-        f"Password for {get_main_user()}",
-        password=True,
-    )
-
-
-def get_edition_user():
-    return get_value(
-        "PYO_SAMPLES_EDITION_USER", "Edition User Name", DEFAULT_EDITION_USER
-    )
-
-
-def get_edition_password():
-    return get_value(
-        "PYO_SAMPLES_EDITION_PASSWORD",
-        f"Password for {get_edition_user()}",
-        password=True,
-    )
-
-
-def get_edition_name():
-    return get_value(
-        "PYO_SAMPLES_EDITION_NAME", "Edition Name", DEFAULT_EDITION_NAME
-    )
-
-
-def get_connect_params(cls=oracledb.ConnectParams):
-    wallet_location = get_wallet_location()
-    if wallet_location is not None:
-        return cls(
-            config_dir=wallet_location,
-            wallet_location=wallet_location,
-            wallet_password=get_wallet_password(),
-            disable_oob=True,
-        )
-
-
-def get_pool_params():
-    return get_connect_params(cls=oracledb.PoolParams)
-
-
-def get_connect_string():
-    return get_value(
-        "PYO_SAMPLES_CONNECT_STRING", "Connect String", DEFAULT_CONNECT_STRING
-    )
-
-
-def get_drcp_connect_string():
-    return get_value(
-        "PYO_SAMPLES_DRCP_CONNECT_STRING",
-        "DRCP Connect String",
-        DEFAULT_DRCP_CONNECT_STRING,
-    )
-
-
-def get_driver_mode():
-    return get_value(
-        "PYO_SAMPLES_DRIVER_MODE", "Driver mode (thin|thick)", "thin"
-    )
-
-
-def get_edition_connect_string():
-    return "%s/%s@%s" % (
-        get_edition_user(),
-        get_edition_password(),
-        get_connect_string(),
-    )
-
-
-def get_admin_connection():
-    admin_user = get_value(
-        "PYO_SAMPLES_ADMIN_USER", "Administrative user", "admin"
-    )
-    admin_password = get_value(
-        "PYO_SAMPLES_ADMIN_PASSWORD",
-        f"Password for {admin_user}",
-        password=True,
-    )
-    params = oracledb.ConnectParams()
-    if admin_user and admin_user.upper() == "SYS":
-        params.set(mode=oracledb.AUTH_MODE_SYSDBA)
-    return oracledb.connect(
-        dsn=get_connect_string(),
-        params=params,
-        user=admin_user,
-        password=admin_password,
-    )
-
-
-def get_oracle_client():
-    if platform.system() == "Darwin" or platform.system() == "Windows":
-        return get_value(
-            "PYO_SAMPLES_ORACLE_CLIENT_PATH", "Oracle Instant Client Path"
-        )
-
-
-def get_server_version():
-    name = "SERVER_VERSION"
-    value = PARAMETERS.get(name)
-    if value is None:
-        conn = oracledb.connect(
-            user=get_main_user(),
-            password=get_main_password(),
-            dsn=get_connect_string(),
-        )
-        value = tuple(int(s) for s in conn.version.split("."))[:2]
-        PARAMETERS[name] = value
-    return value
-
-
-def get_wallet_location():
-    if not run_in_thick_mode():
-        return get_value("PYO_SAMPLES_WALLET_LOCATION", "Wallet Location")
-
-
-def get_wallet_password():
-    if not run_in_thick_mode() and get_wallet_location():
-        return get_value(
-            "PYO_SAMPLES_WALLET_PASSWORD", "Wallet Password", password=True
-        )
-
-
-def run_in_thick_mode():
-    return get_driver_mode() != "thin"
-
-
-def run_sql_script(conn, script_name, **kwargs):
-    statement_parts = []
-    cursor = conn.cursor()
-    replace_values = [("&" + k + ".", v) for k, v in kwargs.items()] + [
-        ("&" + k, v) for k, v in kwargs.items()
-    ]
-    script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    file_name = os.path.join(script_dir, "sql", script_name + ".sql")
-    for line in open(file_name):
-        if line.strip() == "/":
-            statement = "".join(statement_parts).strip()
-            if statement:
-                for search_value, replace_value in replace_values:
-                    statement = statement.replace(search_value, replace_value)
-                try:
-                    cursor.execute(statement)
-                except:
-                    print("Failed to execute SQL:", statement)
-                    raise
-            statement_parts = []
-        else:
-            statement_parts.append(line)
-    cursor.execute(
-        """
-        select name, type, line, position, text
-        from dba_errors
-        where owner = upper(:owner)
-        order by name, type, line, position
-        """,
-        owner=get_main_user(),
-    )
-    prev_name = prev_obj_type = None
-    for name, obj_type, line_num, position, text in cursor:
-        if name != prev_name or obj_type != prev_obj_type:
-            print("%s (%s)" % (name, obj_type))
-            prev_name = name
-            prev_obj_type = obj_type
-        print("    %s/%s %s" % (line_num, position, text))
diff --git a/samples/scrollable_cursors.py b/samples/scrollable_cursors.py
deleted file mode 100644
index 59447b0a..00000000
--- a/samples/scrollable_cursors.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# scrollable_cursors.py
-#
-# Demonstrates how to use scrollable cursors. These allow moving forward and
-# backward in the result set but incur additional overhead on the server to
-# retain this information.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# show all of the rows available in the table
-with connection.cursor() as cursor:
-    cursor.execute("select * from TestStrings order by IntCol")
-    print("ALL ROWS")
-    for row in cursor:
-        print(row)
-    print()
-
-# create a scrollable cursor
-with connection.cursor(scrollable=True) as cursor:
-    # set array size smaller than the default (100) to force scrolling by the
-    # database; otherwise, scrolling occurs directly within the buffers
-    cursor.arraysize = 3
-    cursor.execute("select * from TestStrings order by IntCol")
-
-    # scroll to last row in the result set; the first parameter is not needed
-    # and is ignored)
-    cursor.scroll(mode="last")
-    print("LAST ROW")
-    print(cursor.fetchone())
-    print()
-
-    # scroll to the first row in the result set; the first parameter not needed
-    # and is ignored
-    cursor.scroll(mode="first")
-    print("FIRST ROW")
-    print(cursor.fetchone())
-    print()
-
-    # scroll to an absolute row number
-    cursor.scroll(5, mode="absolute")
-    print("ROW 5")
-    print(cursor.fetchone())
-    print()
-
-    # scroll forward six rows (the mode parameter defaults to relative)
-    cursor.scroll(3)
-    print("SKIP 3 ROWS")
-    print(cursor.fetchone())
-    print()
-
-    # scroll backward four rows (the mode parameter defaults to relative)
-    cursor.scroll(-4)
-    print("SKIP BACK 4 ROWS")
-    print(cursor.fetchone())
-    print()
diff --git a/samples/session_callback.py b/samples/session_callback.py
deleted file mode 100644
index 4d7dfb3b..00000000
--- a/samples/session_callback.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# session_callback.py
-#
-# Demonstrates how to use a connection pool session callback written in
-# Python. The callback is invoked whenever a newly created session is acquired
-# from the pool, or when the requested tag does not match the tag that is
-# associated with the session. (This particular example does not show tagging)
-# A callback is generally used to set session state so that the application can
-# count on known session state.  This allows the application to reduce the
-# number of round-trips made to the database.
-#
-# Also see session_callback_tagging.py and session_callback_plsql.py
-#
-# To run this sample:
-#
-#  1. Install Flask, for example like:
-#
-#     python -m pip install Flask
-#
-#  2. (Optional) Set environment variables referenced in sample_env.py
-#
-#  3. Run:
-#
-#     python session_callback.py
-#
-#  4. Run this script and experiment sending web requests.  For example to
-#     send 20 requests with a concurrency of 4:
-#         ab -n 20 -c 4 http://127.0.0.1:8080/
-#
-#  The application console output will show that queries are executed multiple
-#  times for each session created, but the initialization function for each
-#  session is invoked only once.
-# -----------------------------------------------------------------------------
-
-import os
-import sys
-
-from flask import Flask
-
-import oracledb
-import sample_env
-
-# Port to listen on
-PORT = int(os.environ.get("PORT", "8080"))
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# -----------------------------------------------------------------------------
-
-
-# init_session(): The session callback. The requested_tag parameter is not used
-# in this example.
-def init_session(connection, requested_tag):
-    # Your session initialization code would be here.  This example just
-    # queries the session id to show that the callback is invoked once per
-    # session.
-    with connection.cursor() as cursor:
-        cursor.execute(
-            """
-            select current_timestamp, sid || '-' || serial#
-            from v$session
-            where sid = sys_context('userenv','sid')"""
-        )
-        t, s = cursor.fetchone()
-        print(f"init_session() at time {t} was invoked for session {s}")
-
-
-# start_pool(): starts the connection pool with a session callback defined
-def start_pool():
-    pool = oracledb.create_pool(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_pool_params(),
-        min=4,
-        max=4,
-        increment=0,
-        session_callback=init_session,
-    )
-
-    return pool
-
-
-# -----------------------------------------------------------------------------
-
-app = Flask(__name__)
-
-
-@app.route("/")
-def index():
-    with pool.acquire() as connection:
-        with connection.cursor() as cursor:
-            cursor.execute(
-                """
-                select current_timestamp, sid || '-' || serial#
-                from v$session
-                where sid = sys_context('userenv','sid')"""
-            )
-            t, s = cursor.fetchone()
-            r = f"Query at time {t} used session {s}"
-            print(r)
-            return r
-
-
-# -----------------------------------------------------------------------------
-
-if __name__ == "__main__":
-    # Start a pool of connections
-    pool = start_pool()
-
-    m = f"\nTry loading http://127.0.0.1:{PORT}/ in a browser\n"
-    sys.modules["flask.cli"].show_server_banner = lambda *x: print(m)
-
-    # Start a webserver
-    app.run(port=PORT)
diff --git a/samples/session_callback_plsql.py b/samples/session_callback_plsql.py
deleted file mode 100644
index fe4f45df..00000000
--- a/samples/session_callback_plsql.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# session_callback_plsql.py
-#
-# Demonstrates how to use a connection pool session callback written in
-# PL/SQL. The callback is invoked whenever the tag requested by the application
-# does not match the tag associated with the session in the pool. It should be
-# used to set session state so that the application can count on known session
-# state. This allows the application to reduce the number of round-trips to the
-# database.
-#
-# The primary advantage to this approach over the equivalent approach shown in
-# session_callback.py and session_callback_tagging.py is when DRCP is used, as
-# the callback is invoked on the server and no round trip is required to set
-# state.
-#
-# Also see session_callback.py and session_callback_tagging.py
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# create pool with session callback defined
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    min=2,
-    max=5,
-    increment=1,
-    session_callback="pkg_SessionCallback.TheCallback",
-)
-
-# truncate table logging calls to PL/SQL session callback
-with pool.acquire() as conn:
-    cursor = conn.cursor()
-    cursor.execute("truncate table PLSQLSessionCallbacks")
-
-# acquire session without specifying a tag; the callback will not be invoked as
-# a result and no session state will be changed
-print("(1) acquire session without tag")
-with pool.acquire() as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a tag; since the session returned has no tag,
-# the callback will be invoked; session state will be changed and the tag will
-# be saved when the connection is closed
-print("(2) acquire session with tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying the same tag; since a session exists in the pool
-# with this tag, it will be returned and the callback will not be invoked but
-# the connection will still have the session state defined previously
-print("(3) acquire session with same tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a different tag; since no session exists in the
-# pool with this tag, a new session will be returned and the callback will be
-# invoked; session state will be changed and the tag will be saved when the
-# connection is closed
-print("(4) acquire session with different tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=UTC") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a different tag but also specifying that a
-# session with any tag can be acquired from the pool; a session with one of the
-# previously set tags will be returned and the callback will be invoked;
-# session state will be changed and the tag will be saved when the connection
-# is closed
-print("(4) acquire session with different tag but match any also specified")
-with pool.acquire(
-    tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=MST", matchanytag=True
-) as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session and display results from PL/SQL session logs
-with pool.acquire() as conn:
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select RequestedTag, ActualTag
-        from PLSQLSessionCallbacks
-        order by FixupTimestamp
-        """
-    )
-    print("(5) PL/SQL session callbacks")
-    for requestedTag, actualTag in cursor:
-        print("Requested:", requestedTag, "Actual:", actualTag)
diff --git a/samples/session_callback_tagging.py b/samples/session_callback_tagging.py
deleted file mode 100644
index 3e31d0fe..00000000
--- a/samples/session_callback_tagging.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# session_callback_tagging.py
-#
-# Demonstrates how to use a connection pool session callback written in
-# Python. The callback is invoked whenever a newly created session is acquired
-# from the pool, or when the requested tag does not match the tag that is
-# associated with the session. It is generally used to set session state, so
-# that the application can count on known session state. This allows the
-# application to reduce the number of round-trips made to the database.  If all
-# your connections should have the same session state, you can simplify the
-# session callback by removing the tagging logic.
-#
-# Also see session_callback.py and session_callback_plsql.py
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# define a dictionary of NLS_DATE_FORMAT formats supported by this sample
-SUPPORTED_FORMATS = {
-    "SIMPLE": "'YYYY-MM-DD HH24:MI'",
-    "FULL": "'YYYY-MM-DD HH24:MI:SS'",
-}
-
-# define a dictionary of TIME_ZONE values supported by this sample
-SUPPORTED_TIME_ZONES = {"UTC": "'UTC'", "MST": "'-07:00'"}
-
-# define a dictionary of keys that are supported by this sample
-SUPPORTED_KEYS = {
-    "NLS_DATE_FORMAT": SUPPORTED_FORMATS,
-    "TIME_ZONE": SUPPORTED_TIME_ZONES,
-}
-
-
-# define session callback
-def init_session(conn, requested_tag):
-    # display the requested and actual tags
-    print(
-        "init_session(): requested tag=%r, actual tag=%r"
-        % (requested_tag, conn.tag)
-    )
-
-    # tags are expected to be in the form "key1=value1;key2=value2"
-    # in this example, they are used to set NLS parameters and the tag is
-    # parsed to validate it
-    if requested_tag is not None:
-        state_parts = []
-        for directive in requested_tag.split(";"):
-            parts = directive.split("=")
-            if len(parts) != 2:
-                raise ValueError("Tag must contain key=value pairs")
-            key, value = parts
-            value_dict = SUPPORTED_KEYS.get(key)
-            if value_dict is None:
-                raise ValueError(
-                    "Tag only supports keys: %s" % (", ".join(SUPPORTED_KEYS))
-                )
-            actual_value = value_dict.get(value)
-            if actual_value is None:
-                raise ValueError(
-                    "Key %s only supports values: %s"
-                    % (key, ", ".join(value_dict))
-                )
-            state_parts.append("%s = %s" % (key, actual_value))
-        sql = "alter session set %s" % " ".join(state_parts)
-        cursor = conn.cursor()
-        cursor.execute(sql)
-
-    # assign the requested tag to the connection so that when the connection
-    # is closed, it will automatically be retagged; note that if the requested
-    # tag is None (no tag was requested) this has no effect
-    conn.tag = requested_tag
-
-
-# create pool with session callback defined
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    min=2,
-    max=5,
-    increment=1,
-    session_callback=init_session,
-)
-
-# acquire session without specifying a tag; since the session returned is
-# newly created, the callback will be invoked but since there is no tag
-# specified, no session state will be changed
-print("(1) acquire session without tag")
-with pool.acquire() as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a tag; since the session returned has no tag,
-# the callback will be invoked; session state will be changed and the tag will
-# be saved when the connection is closed
-print("(2) acquire session with tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying the same tag; since a session exists in the pool
-# with this tag, it will be returned and the callback will not be invoked but
-# the connection will still have the session state defined previously
-print("(3) acquire session with same tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a different tag; since no session exists in the
-# pool with this tag, a new session will be returned and the callback will be
-# invoked; session state will be changed and the tag will be saved when the
-# connection is closed
-print("(4) acquire session with different tag")
-with pool.acquire(tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=UTC") as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
-
-# acquire session, specifying a different tag but also specifying that a
-# session with any tag can be acquired from the pool; a session with one of the
-# previously set tags will be returned and the callback will be invoked;
-# session state will be changed and the tag will be saved when the connection
-# is closed
-print("(4) acquire session with different tag but match any also specified")
-with pool.acquire(
-    tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=MST", matchanytag=True
-) as conn:
-    cursor = conn.cursor()
-    cursor.execute("select to_char(current_date) from dual")
-    (result,) = cursor.fetchone()
-    print("main(): result is", repr(result))
diff --git a/samples/sessionless_transactions.py b/samples/sessionless_transactions.py
deleted file mode 100644
index 240db274..00000000
--- a/samples/sessionless_transactions.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025 Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# sessionless_transactions.py
-#
-# Show Oracle Database version 23 Sessionless Transactions
-# -----------------------------------------------------------------------------
-
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# this script only works with Oracle Database 23.6 or later
-if sample_env.get_server_version() < (23, 6):
-    sys.exit("This example requires Oracle Database 23.6 or later.")
-
-# this script works with thin mode, or with thick mode using Oracle Client
-# 23.6 or later
-if not oracledb.is_thin_mode() and oracledb.clientversion()[:2] < (23, 6):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.6 or later"
-    )
-
-TXN_ID = b"my_transaction_id"
-
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_pool_params(),
-)
-
-# -----------------------------------------------------------------------------
-# Basic Sessionless Transaction example
-
-print("Example 1:")
-
-# Start and suspend a transaction
-with pool.acquire() as connection1:
-
-    # Immediately begin the transaction
-    connection1.begin_sessionless_transaction(transaction_id=TXN_ID)
-
-    with connection1.cursor() as cursor1:
-        cursor1.execute(
-            "insert into mytab(id, data) values (:i, :d)", [1, "Sessionless 1"]
-        )
-    connection1.suspend_sessionless_transaction()
-
-    # Since the transaction is suspended, there will be no rows
-    print("1st query")
-    with connection1.cursor() as cursor1b:
-        for r in cursor1b.execute("select * from mytab"):
-            print(r)
-
-# Resume and complete the transaction in a different connection
-with pool.acquire() as connection2:
-
-    # Immediately resume the transaction
-    connection2.resume_sessionless_transaction(transaction_id=TXN_ID)
-
-    with connection2.cursor() as cursor2:
-        cursor2.execute(
-            "insert into mytab(id, data) values (:i, :d)", [2, "Sessionless 2"]
-        )
-
-        # The query will show both rows inserted
-        print("2nd query")
-        for r in cursor2.execute("select * from mytab order by id"):
-            print(r)
-
-    # Rollback so the example can be run multiple times.
-    # This concludes the Sessionless Transaction
-    connection2.rollback()
-
-# -----------------------------------------------------------------------------
-# Sessionless Transaction example with custom timeouts and round-trip
-# optimizations
-
-print("Example 2:")
-
-# Start and suspend a transaction
-with pool.acquire() as connection3:
-
-    connection3.begin_sessionless_transaction(
-        transaction_id=TXN_ID,
-        # The transaction can only ever be suspended for 15 seconds before it
-        # is automatically rolled back
-        timeout=15,
-        # Only start the transaction when the next DB operation is performed
-        defer_round_trip=True,
-    )
-    with connection3.cursor() as cursor3:
-        cursor3.execute(
-            "insert into mytab(id, data) values (:i, :d)",
-            [3, "Sessionless 3"],
-            suspend_on_success=True,  # automatically suspend on success
-        )
-
-    # Since the transaction is suspended, there will be no rows
-    print("1st query")
-    with connection3.cursor() as cursor3b:
-        for r in cursor3b.execute("select * from mytab"):
-            print(r)
-
-# Resume and complete the transaction in a different connection
-with pool.acquire() as connection4:
-    connection4.resume_sessionless_transaction(
-        transaction_id=TXN_ID,
-        # Only wait 20 seconds if someone else is using the transaction
-        timeout=20,
-        # Only initiate resuming the transaction when the next DB operation is
-        # performed
-        defer_round_trip=True,
-    )
-
-    with connection4.cursor() as cursor4:
-        cursor4.execute(
-            "insert into mytab(id, data) values (:i, :d)", [4, "Sessionless 4"]
-        )
-
-        # The query will show both rows inserted
-        print("2nd query")
-        for r in cursor4.execute("select * from mytab order by id"):
-            print(r)
-
-    # Rollback so the example can be run multiple times.
-    # This concludes the Sessionless Transaction
-    connection4.rollback()
diff --git a/samples/sharding_number_key.py b/samples/sharding_number_key.py
deleted file mode 100644
index 67238bc0..00000000
--- a/samples/sharding_number_key.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# sharding_number_key.py
-#
-# Demonstrates how to use sharding keys with a sharded database.
-# The sample schema provided does not include support for running this demo. A
-# sharded database must first be created. Information on how to create a
-# sharded database can be found in the documentation:
-# https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=SHARD
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    min=1,
-    max=5,
-    increment=1,
-)
-
-
-def connect_and_display(sharding_key):
-    print("Connecting with sharding key:", sharding_key)
-    with pool.acquire(shardingkey=[sharding_key]) as conn:
-        cursor = conn.cursor()
-        cursor.execute("select sys_context('userenv', 'db_name') from dual")
-        (name,) = cursor.fetchone()
-        print("--> connected to database", name)
-
-
-connect_and_display(100)
-connect_and_display(167)
diff --git a/samples/soda_basic.py b/samples/soda_basic.py
deleted file mode 100644
index 8b1ddc25..00000000
--- a/samples/soda_basic.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# soda_basic.py
-#
-# A basic Simple Oracle Document Access (SODA) example.
-#
-# Oracle Client must be at 18.3 or higher.
-# Oracle Database must be at 18.1 or higher.
-# The user must have been granted the SODA_APP privilege.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# The general recommendation for simple SODA usage is to enable autocommit
-connection.autocommit = True
-
-# Create the parent object for SODA
-soda = connection.getSodaDatabase()
-
-# drop the collection if it already exists in order to ensure that the sample
-# runs smoothly each time
-collection = soda.openCollection("mycollection")
-if collection is not None:
-    collection.drop()
-
-# Explicit metadata is used for maximum version portability.
-# Refer to the documentation.
-metadata = {
-    "keyColumn": {"name": "ID"},
-    "contentColumn": {"name": "JSON_DOCUMENT", "sqlType": "BLOB"},
-    "versionColumn": {"name": "VERSION", "method": "UUID"},
-    "lastModifiedColumn": {"name": "LAST_MODIFIED"},
-    "creationTimeColumn": {"name": "CREATED_ON"},
-}
-
-# Create a new SODA collection and index
-# This will open an existing collection, if the name is already in use.
-collection = soda.createCollection("mycollection", metadata)
-
-index_spec = {
-    "name": "CITY_IDX",
-    "fields": [{"path": "address.city", "datatype": "string", "order": "asc"}],
-}
-collection.createIndex(index_spec)
-
-# Insert a document.
-# A system generated key is created by default.
-content = {"name": "Matilda", "address": {"city": "Melbourne"}}
-doc = collection.insertOneAndGet(content)
-key = doc.key
-print("The key of the new SODA document is: ", key)
-
-# Fetch the document back
-doc = collection.find().key(key).getOne()  # A SodaDocument
-content = doc.getContent()
-print("Retrieved SODA document dictionary is:")
-print(content)
-content = doc.getContentAsString()  # A JSON string
-print("Retrieved SODA document string is:")
-print(content)
-
-# Replace document contents
-content = {"name": "Matilda", "address": {"city": "Sydney"}}
-collection.find().key(key).replaceOne(content)
-
-# Insert some more documents without caring about their keys
-content = {"name": "Venkat", "address": {"city": "Bengaluru"}}
-collection.insertOne(content)
-content = {"name": "May", "address": {"city": "London"}}
-collection.insertOne(content)
-content = {"name": "Sally-Ann", "address": {"city": "San Francisco"}}
-collection.insertOne(content)
-
-# Find all documents with names like 'Ma%'
-print("Names matching 'Ma%'")
-documents = collection.find().filter({"name": {"$like": "Ma%"}}).getDocuments()
-for d in documents:
-    content = d.getContent()
-    print(content["name"])
-
-# Count all documents
-c = collection.find().count()
-print("Collection has", c, "documents")
-
-# Remove documents with cities containing 'o'
-print("Removing documents")
-c = collection.find().filter({"address.city": {"$regex": ".*o.*"}}).remove()
-print("Dropped", c, "documents")
-
-# Count all documents
-c = collection.find().count()
-print("Collection has", c, "documents")
-
-# Drop the collection
-if collection.drop():
-    print("Collection was dropped")
diff --git a/samples/soda_bulk_insert.py b/samples/soda_bulk_insert.py
deleted file mode 100644
index f7ee8b93..00000000
--- a/samples/soda_bulk_insert.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# soda_bulk_insert.py
-#
-# Demonstrates the use of SODA bulk insert.
-#
-# Oracle Client must be at 18.5 or higher.
-# Oracle Database must be at 18.1 or higher.
-# The user must have been granted the SODA_APP privilege.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-# the general recommendation for simple SODA usage is to enable autocommit
-connection.autocommit = True
-
-# create the parent object for all SODA work
-soda = connection.getSodaDatabase()
-
-# drop the collection if it already exists in order to ensure that the sample
-# runs smoothly each time
-collection = soda.openCollection("SodaBulkInsert")
-if collection is not None:
-    collection.drop()
-
-# Explicit metadata is used for maximum version portability.
-# Refer to the documentation.
-metadata = {
-    "keyColumn": {"name": "ID"},
-    "contentColumn": {"name": "JSON_DOCUMENT", "sqlType": "BLOB"},
-    "versionColumn": {"name": "VERSION", "method": "UUID"},
-    "lastModifiedColumn": {"name": "LAST_MODIFIED"},
-    "creationTimeColumn": {"name": "CREATED_ON"},
-}
-
-# create a new (or open an existing) SODA collection
-collection = soda.createCollection("SodaBulkInsert", metadata)
-
-# remove all documents from the collection
-collection.find().remove()
-
-# define some documents that will be stored
-in_docs = [
-    dict(name="Sam", age=8),
-    dict(name="George", age=46),
-    dict(name="Bill", age=35),
-    dict(name="Sally", age=43),
-    dict(name="Jill", age=28),
-    dict(name="Cynthia", age=12),
-]
-
-# perform bulk insert
-result_docs = collection.insertManyAndGet(in_docs)
-for doc in result_docs:
-    print("Inserted SODA document with key", doc.key)
-print()
-
-# perform search of all persons under the age of 40
-print("Persons under the age of 40:")
-for doc in collection.find().filter({"age": {"$lt": 40}}).getDocuments():
-    print(doc.getContent()["name"] + ",", "key", doc.key)
diff --git a/samples/soda_json_duality.py b/samples/soda_json_duality.py
deleted file mode 100644
index 33bfd27c..00000000
--- a/samples/soda_json_duality.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# soda_json_duality.py
-#
-# An example of accessing Oracle Database version 23 JSON-Relational views
-# using Simple Oracle Document Access (SODA).
-#
-# Oracle Client must be at 23.4 or higher.
-# Oracle Database must be at 23.5 or higher.
-# The user must have been granted the SODA_APP privilege.
-#
-# Also see json_duality.py
-# -----------------------------------------------------------------------------
-
-import sys
-import oracledb
-import sample_env
-
-# this script is currently only supported in python-oracledb thick mode
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# this script only works with Oracle Database 23.5 & Client 23.4 or later
-if sample_env.get_server_version() < (23, 5):
-    sys.exit("This example requires Oracle Database 23.5 or later")
-if oracledb.clientversion()[:2] < (23, 4):
-    sys.exit("This example requires Oracle Client 23.4 or later")
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-)
-
-with connection.cursor() as cursor:
-
-    # Create a JSON-Relational Duality View over the SampleJRDVAuthorTab and
-    # SampleJRDVBookTab tables
-    sql = """
-          create or replace json relational duality view BookDV as
-          SampleJRDVBookTab @insert @update @delete
-          {
-              _id: BookId,
-              book_title: BookTitle,
-              author: SampleJRDVAuthorTab @insert @update
-              {
-                  author_id: AuthorId,
-                  author_name: AuthorName
-              }
-          }"""
-    cursor.execute(sql)
-
-# Create the parent object for SODA
-soda = connection.getSodaDatabase()
-
-# The duality view can be opened as if it were a collection
-collection = soda.openCollection("BOOKDV")
-
-# Count all documents
-c = collection.find().count()
-print("Collection has", c, "documents")
-
-# Perform a query-by-example on the duality view
-print("Books starting with 'The':")
-qbe = {"book_title": {"$like": "The%"}}
-for doc in collection.find().filter(qbe).getDocuments():
-    content = doc.getContent()
-    print(content["book_title"])
-
-# Insert a document
-content = {
-    "_id": 201,
-    "book_title": "Rainbows and Unicorns",
-    "author": {"author_id": 401, "author_name": "Merlin"},
-}
-doc = collection.insertOneAndGet(content)
-key = doc.key
-
-# Fetch the document back and print the title
-doc = collection.find().key(key).getOne()
-content = doc.getContent()
-print("Retrieved SODA document title is:")
-print(content["book_title"])
-
-# The new book can also be queried relationally from the base tables
-print("Relational query:")
-with connection.cursor() as cursor:
-    sql = """
-          select AuthorName, BookTitle
-          from SampleJRDVAuthorTab, SampleJRDVBookTab
-          where SampleJRDVAuthorTab.AuthorName = 'Merlin'
-          and SampleJRDVAuthorTab.AuthorId = SampleJRDVBookTab.AuthorId"""
-
-    for r in cursor.execute(sql):
-        print(r)
diff --git a/samples/spatial_to_geopandas.py b/samples/spatial_to_geopandas.py
deleted file mode 100644
index c3cf17e0..00000000
--- a/samples/spatial_to_geopandas.py
+++ /dev/null
@@ -1,547 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# spatial_to_geopandas.py
-#
-# GeoPandas is a popular python library for working with geospatial data.
-# GeoPandas extends the Pandas data analysis library with geospatial support
-# using the Shapely library for geometry object support.
-#
-# See http://geopandas.org, https://pandas.pydata.org,
-# and https://github.com/shapely/shapely.
-#
-# This example shows how to bring geometries from Oracle Spatial (SDO_GEOMETRY
-# data type) into GeoPandas and perform a simple spatial operation. While the
-# spatial operation we perform in Python could have been performed in the
-# Oracle database, this example targets use cases where Python with GeoPandas
-# is being used to combine and work with geospatial data from numerous
-# additional sources such as files and web services.
-#
-# This script requires GeoPandas and its dependencies (see
-# https://geopandas.org/en/stable/getting_started/install.html).
-# -----------------------------------------------------------------------------
-
-from shapely.wkb import loads
-import geopandas as gpd
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# create Oracle connection and cursor objects
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-cursor = connection.cursor()
-
-# enable autocommit to avoid the additional round trip to the database to
-# perform a commit; this should not be used if multiple statements must be
-# executed for a single transaction
-connection.autocommit = True
-
-# drop and create table
-print("Dropping and creating table...")
-cursor.execute(
-    """
-    begin
-        execute immediate 'drop table TestStates';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cursor.execute(
-    """
-    create table TestStates (
-        state varchar2(30) not null,
-        geometry sdo_geometry not null
-    )
-    """
-)
-
-# acquire types used for creating SDO_GEOMETRY objects
-type_obj = connection.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = connection.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = connection.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-
-
-# define function for creating an SDO_GEOMETRY object
-def create_geometry_obj(*ordinates):
-    geometry = type_obj.newobject()
-    geometry.SDO_GTYPE = 2003
-    geometry.SDO_SRID = 8307
-    geometry.SDO_ELEM_INFO = element_info_type_obj.newobject()
-    geometry.SDO_ELEM_INFO.extend([1, 1003, 1])
-    geometry.SDO_ORDINATES = ordinate_type_obj.newobject()
-    geometry.SDO_ORDINATES.extend(ordinates)
-    return geometry
-
-
-# create SDO_GEOMETRY objects for three adjacent states in the USA
-geometry_nevada = create_geometry_obj(
-    -114.052025,
-    37.103989,
-    -114.049797,
-    37.000423,
-    -113.484375,
-    37,
-    -112.898598,
-    37.000401,
-    -112.539604,
-    37.000683,
-    -112,
-    37.000977,
-    -111.412048,
-    37.001514,
-    -111.133018,
-    37.00079,
-    -110.75,
-    37.003201,
-    -110.5,
-    37.004265,
-    -110.469505,
-    36.998001,
-    -110,
-    36.997967,
-    -109.044571,
-    36.999088,
-    -109.045143,
-    37.375,
-    -109.042824,
-    37.484692,
-    -109.040848,
-    37.881176,
-    -109.041405,
-    38.153027,
-    -109.041107,
-    38.1647,
-    -109.059402,
-    38.275501,
-    -109.059296,
-    38.5,
-    -109.058868,
-    38.719906,
-    -109.051765,
-    39,
-    -109.050095,
-    39.366699,
-    -109.050697,
-    39.4977,
-    -109.050499,
-    39.6605,
-    -109.050156,
-    40.222694,
-    -109.047577,
-    40.653641,
-    -109.0494,
-    41.000702,
-    -109.2313,
-    41.002102,
-    -109.534233,
-    40.998184,
-    -110,
-    40.997398,
-    -110.047768,
-    40.997696,
-    -110.5,
-    40.994801,
-    -111.045982,
-    40.998013,
-    -111.045815,
-    41.251774,
-    -111.045097,
-    41.579899,
-    -111.045944,
-    42.001633,
-    -111.506493,
-    41.999588,
-    -112.108742,
-    41.997677,
-    -112.16317,
-    41.996784,
-    -112.172562,
-    41.996643,
-    -112.192184,
-    42.001244,
-    -113,
-    41.998314,
-    -113.875,
-    41.988091,
-    -114.040871,
-    41.993805,
-    -114.038803,
-    41.884899,
-    -114.041306,
-    41,
-    -114.04586,
-    40.116997,
-    -114.046295,
-    39.906101,
-    -114.046898,
-    39.542801,
-    -114.049026,
-    38.67741,
-    -114.049339,
-    38.572968,
-    -114.049095,
-    38.14864,
-    -114.0476,
-    37.80946,
-    -114.05098,
-    37.746284,
-    -114.051666,
-    37.604805,
-    -114.052025,
-    37.103989,
-)
-geometry_wyoming = create_geometry_obj(
-    -111.045815,
-    41.251774,
-    -111.045982,
-    40.998013,
-    -110.5,
-    40.994801,
-    -110.047768,
-    40.997696,
-    -110,
-    40.997398,
-    -109.534233,
-    40.998184,
-    -109.2313,
-    41.002102,
-    -109.0494,
-    41.000702,
-    -108.525368,
-    40.999634,
-    -107.917793,
-    41.002071,
-    -107.317177,
-    41.002956,
-    -106.857178,
-    41.002697,
-    -106.455704,
-    41.002167,
-    -106.320587,
-    40.999153,
-    -106.189987,
-    40.997604,
-    -105.729874,
-    40.996906,
-    -105.276604,
-    40.998188,
-    -104.942848,
-    40.998226,
-    -104.625,
-    41.00145,
-    -104.052742,
-    41.001423,
-    -104.051781,
-    41.39333,
-    -104.052032,
-    41.564301,
-    -104.052185,
-    41.697983,
-    -104.052109,
-    42.001736,
-    -104.052277,
-    42.611626,
-    -104.052643,
-    43.000614,
-    -104.054337,
-    43.47784,
-    -104.054298,
-    43.503101,
-    -104.055,
-    43.8535,
-    -104.054108,
-    44.141102,
-    -104.054001,
-    44.180401,
-    -104.055458,
-    44.570877,
-    -104.057205,
-    44.997444,
-    -104.664658,
-    44.998631,
-    -105.037872,
-    45.000359,
-    -105.088867,
-    45.000462,
-    -105.912819,
-    45.000957,
-    -105.927612,
-    44.99366,
-    -106.024239,
-    44.993591,
-    -106.263,
-    44.993801,
-    -107.054871,
-    44.996384,
-    -107.133545,
-    45.000141,
-    -107.911095,
-    45.001343,
-    -108.248672,
-    44.999504,
-    -108.620628,
-    45.000328,
-    -109.082314,
-    44.999664,
-    -109.102745,
-    45.005955,
-    -109.797951,
-    45.002247,
-    -110.000771,
-    45.003502,
-    -110.10936,
-    45.003967,
-    -110.198761,
-    44.99625,
-    -110.286026,
-    44.99691,
-    -110.361946,
-    45.000656,
-    -110.402176,
-    44.993874,
-    -110.5,
-    44.992355,
-    -110.704506,
-    44.99239,
-    -110.784241,
-    45.003021,
-    -111.05442,
-    45.001392,
-    -111.054558,
-    44.666336,
-    -111.048203,
-    44.474144,
-    -111.046272,
-    43.983456,
-    -111.044724,
-    43.501213,
-    -111.043846,
-    43.3158,
-    -111.043381,
-    43.02013,
-    -111.042786,
-    42.719578,
-    -111.045967,
-    42.513187,
-    -111.045944,
-    42.001633,
-    -111.045097,
-    41.579899,
-    -111.045815,
-    41.251774,
-)
-geometry_colorado = create_geometry_obj(
-    -109.045143,
-    37.375,
-    -109.044571,
-    36.999088,
-    -108.378571,
-    36.999516,
-    -107.481133,
-    37,
-    -107.420311,
-    37,
-    -106.876701,
-    37.00013,
-    -106.869209,
-    36.992416,
-    -106.475639,
-    36.993748,
-    -106.006058,
-    36.995327,
-    -105.717834,
-    36.995823,
-    -105.220055,
-    36.995144,
-    -105.154488,
-    36.995239,
-    -105.028671,
-    36.992702,
-    -104.407616,
-    36.993446,
-    -104.007324,
-    36.996216,
-    -103.085617,
-    37.000244,
-    -103.001709,
-    37.000084,
-    -102.986488,
-    36.998505,
-    -102.759384,
-    37,
-    -102.69767,
-    36.995132,
-    -102.041794,
-    36.993061,
-    -102.041191,
-    37.389172,
-    -102.04113,
-    37.644268,
-    -102.041695,
-    37.738529,
-    -102.043938,
-    38.262466,
-    -102.044113,
-    38.268803,
-    -102.04483,
-    38.615234,
-    -102.044762,
-    38.697556,
-    -102.046112,
-    39.047035,
-    -102.046707,
-    39.133144,
-    -102.049301,
-    39.568176,
-    -102.049347,
-    39.574062,
-    -102.051277,
-    40.00309,
-    -102.051117,
-    40.34922,
-    -102.051003,
-    40.440018,
-    -102.050873,
-    40.697556,
-    -102.050835,
-    40.749596,
-    -102.051155,
-    41.002384,
-    -102.620567,
-    41.002609,
-    -102.652992,
-    41.002342,
-    -103.382011,
-    41.00227,
-    -103.574036,
-    41.001736,
-    -104.052742,
-    41.001423,
-    -104.625,
-    41.00145,
-    -104.942848,
-    40.998226,
-    -105.276604,
-    40.998188,
-    -105.729874,
-    40.996906,
-    -106.189987,
-    40.997604,
-    -106.320587,
-    40.999153,
-    -106.455704,
-    41.002167,
-    -106.857178,
-    41.002697,
-    -107.317177,
-    41.002956,
-    -107.917793,
-    41.002071,
-    -108.525368,
-    40.999634,
-    -109.0494,
-    41.000702,
-    -109.047577,
-    40.653641,
-    -109.050156,
-    40.222694,
-    -109.050499,
-    39.6605,
-    -109.050697,
-    39.4977,
-    -109.050095,
-    39.366699,
-    -109.051765,
-    39,
-    -109.058868,
-    38.719906,
-    -109.059296,
-    38.5,
-    -109.059402,
-    38.275501,
-    -109.041107,
-    38.1647,
-    -109.041405,
-    38.153027,
-    -109.040848,
-    37.881176,
-    -109.042824,
-    37.484692,
-    -109.045143,
-    37.375,
-)
-
-# Insert rows for test states. If we were analyzing these geometries in Oracle
-# we would also add Spatial metadata and indexes.  However in this example we
-# are only storing the geometries so that we load them back into Python, so we
-# will skip the metadata and indexes.
-print("Adding rows to table...")
-data = [
-    ("Nevada", geometry_nevada),
-    ("Colorado", geometry_colorado),
-    ("Wyoming", geometry_wyoming),
-]
-cursor.executemany("insert into TestStates values (:state, :obj)", data)
-
-# We now have test geometries in Oracle Spatial (SDO_GEOMETRY) and will next
-# bring them back into Python to analyze with GeoPandas. GeoPandas is able to
-# consume geometries in the Well Known Text (WKT) and Well Known Binary (WKB)
-# formats. Oracle database includes utility functions to return SDO_GEOMETRY as
-# both WKT and WKB. Therefore we use that utility function in the query below
-# to provide results in a format readily consumable by GeoPandas. These utility
-# functions were introduced in Oracle 10g. We use WKB here; however the same
-# process applies for WKT.
-cursor.execute(
-    "select state, sdo_util.to_wkbgeometry(geometry) from TestStates",
-    fetch_lobs=False,
-)
-gdf = gpd.GeoDataFrame(cursor.fetchall(), columns=["state", "wkbgeometry"])
-
-# create GeoSeries to replace the WKB geometry column
-gdf["geometry"] = gpd.GeoSeries(gdf["wkbgeometry"].apply(lambda x: loads(x)))
-del gdf["wkbgeometry"]
-
-# display the GeoDataFrame
-print()
-print(gdf)
-
-# perform a basic GeoPandas operation to combine the three adjacent states into
-# one geometry
-print()
-print("GeoPandas combining the 3 geometries into a single geometry...")
-print(gdf.union_all())
diff --git a/samples/sql/create_schema.sql b/samples/sql/create_schema.sql
deleted file mode 100644
index d160e984..00000000
--- a/samples/sql/create_schema.sql
+++ /dev/null
@@ -1,645 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright 2017, 2023, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb samples. An edition is also
- * created for the demonstration of PL/SQL editioning. It is executed by the
- * Python script create_schema.py.
- *---------------------------------------------------------------------------*/
-
-alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'
-/
-alter session set nls_numeric_characters='.,'
-/
-
-create user &main_user identified by "&main_password"
-/
-
-grant
-    create session,
-    create table,
-    create procedure,
-    create type,
-    create sequence,
-    create view,
-    select any dictionary,
-    change notification,
-    unlimited tablespace
-to &main_user
-/
-
-grant aq_administrator_role to &main_user
-/
-
-begin
-    execute immediate 'begin dbms_session.sleep(0); end;';
-exception
-when others then
-    begin
-        execute immediate 'grant execute on dbms_lock to &main_user';
-    exception
-    when others then
-        raise_application_error(-20000,
-                'Ensure the following grant is made: ' ||
-                'grant execute on dbms_lock to ' || user ||
-                ' with grant option');
-    end;
-end;
-/
-
-begin
-
-    for r in
-            ( select role
-              from dba_roles
-              where role in ('SODA_APP')
-            ) loop
-        execute immediate 'grant ' || r.role || ' to &main_user';
-    end loop;
-
-end;
-/
-
-create user &edition_user identified by "&edition_password"
-/
-
-grant
-    create session,
-    create procedure
-to &edition_user
-/
-
-alter user &edition_user enable editions
-/
-
-create edition &edition_name
-/
-
-grant use on edition &edition_name to &edition_user
-/
-
--- create types
-
-create type &main_user..udt_SubObject as object (
-    SubNumberValue                      number,
-    SubStringValue                      varchar2(60)
-);
-/
-
-create or replace type &main_user..udt_Building as object (
-    BuildingId                          number(9),
-    NumFloors                           number(3),
-    Description                         varchar2(60),
-    DateBuilt                           date
-);
-/
-
-create or replace type &main_user..udt_Book as object (
-    Title                               varchar2(100),
-    Authors                             varchar2(100),
-    Price                               number(5,2)
-);
-/
-
--- create tables
-
-create table &main_user..TestNumbers (
-    IntCol                              number(9) not null,
-    NumberCol                           number(9, 2) not null,
-    FloatCol                            float not null,
-    UnconstrainedCol                    number not null,
-    NullableCol                         number(38)
-)
-/
-
-create table &main_user..TestStrings (
-    IntCol                number(9) not null,
-    StringCol             varchar2(20) not null,
-    RawCol                raw(30) not null,
-    FixedCharCol          char(40) not null,
-    NullableCol           varchar2(50)
-)
-/
-
-create table &main_user..TestCLOBs (
-    IntCol                number(9) not null,
-    CLOBCol               clob not null
-)
-/
-
-create table &main_user..TestBLOBs (
-    IntCol                number(9) not null,
-    BLOBCol               blob not null
-)
-/
-
-create table &main_user..TestTempTable (
-    IntCol                number(9) not null,
-    StringCol             varchar2(400),
-    constraint TestTempTable_pk primary key (IntCol)
-)
-/
-
-create table &main_user..TestUniversalRowids (
-    IntCol                number(9) not null,
-    StringCol             varchar2(250) not null,
-    DateCol               date not null,
-    constraint TestUniversalRowids_pk primary key (IntCol, StringCol, DateCol)
-) organization index
-/
-
-create table &main_user..BuildingsAsObjects (
-    BuildingId            number(9) not null,
-    BuildingObj &main_user..udt_Building not null
-)
-/
-
-create table &main_user..BuildingsAsJsonStrings (
-    BuildingId            number(9) not null,
-    BuildingStr           varchar2(400) not null,
-    constraint BuildingsAsJsonStrings_pk primary key (BuildingId)
-)
-/
-
-create table &main_user..BigTab (
-    mycol                 varchar2(20)
-)
-/
-
-create table &main_user..SampleQueryTab (
-    id                    number not null,
-    name                  varchar2(20) not null
-)
-/
-
-create table &main_user..MyTab (
-    id                    number,
-    data                  varchar2(20)
-)
-/
-
-create table &main_user..ParentTable (
-    ParentId              number(9) not null,
-    Description           varchar2(60) not null,
-    constraint ParentTable_pk primary key (ParentId)
-)
-/
-
-create table &main_user..ChildTable (
-    ChildId               number(9) not null,
-    ParentId              number(9) not null,
-    Description           varchar2(60) not null,
-    constraint ChildTable_pk primary key (ChildId),
-    constraint ChildTable_fk foreign key (ParentId)
-            references &main_user..ParentTable
-)
-/
-
-create table &main_user..Ptab (
-    myid                  number,
-    mydata                varchar(20)
-)
-/
-
-create table &main_user..PlsqlSessionCallbacks (
-    RequestedTag          varchar2(250),
-    ActualTag             varchar2(250),
-    FixupTimestamp        timestamp
-)
-/
-
-create table &main_user..CustomersAsBlob (
-    id                number(9) not null,
-    json_data         blob check (json_data is json),
-    constraint CustomersAsBlob_pk primary key (id)
-)
-/
-
-create table &main_user..LoadCsvTab (
-    id                    number not null,
-    name                  varchar2(25),
-    constraint LoadCsvTab_pk primary key (id)
-)
-/
-
-create table &main_user..TestGeometry (
-    id                    number(9) not null,
-    geometry              mdsys.sdo_geometry not null
-)
-/
-
--- create queue table, queues and subscribers for demonstrating Advanced Queuing
-begin
-
-    dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_TAB',
-            '&main_user..UDT_BOOK');
-    dbms_aqadm.create_queue('&main_user..DEMO_BOOK_QUEUE',
-            '&main_user..BOOK_QUEUE_TAB');
-    dbms_aqadm.start_queue('&main_user..DEMO_BOOK_QUEUE');
-
-    dbms_aqadm.create_queue_table('&main_user..RAW_QUEUE_TAB', 'RAW');
-    dbms_aqadm.create_queue('&main_user..DEMO_RAW_QUEUE',
-            '&main_user..RAW_QUEUE_TAB');
-    dbms_aqadm.start_queue('&main_user..DEMO_RAW_QUEUE');
-
-    dbms_aqadm.create_queue_table('&main_user..RAW_QUEUE_MULTI_TAB', 'RAW',
-            multiple_consumers => true);
-    dbms_aqadm.create_queue('&main_user..DEMO_RAW_QUEUE_MULTI',
-            '&main_user..RAW_QUEUE_MULTI_TAB');
-    dbms_aqadm.start_queue('&main_user..DEMO_RAW_QUEUE_MULTI');
-
-    dbms_aqadm.add_subscriber('&main_user..DEMO_RAW_QUEUE_MULTI',
-            sys.aq$_agent('SUBSCRIBER_A', null, null));
-    dbms_aqadm.add_subscriber('&main_user..DEMO_RAW_QUEUE_MULTI',
-            sys.aq$_agent('SUBSCRIBER_B', null, null));
-
-end;
-/
-
--- populate tables
-
-begin
-    for i in 1..20000 loop
-        insert into &main_user..BigTab (mycol)
-        values (dbms_random.string('A', 20));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestNumbers
-        values (i, i + i * 0.25, i + i * .75, i * i * i + i *.5,
-                decode(mod(i, 2), 0, null, power(143, i)));
-    end loop;
-end;
-/
-
-declare
-
-    t_RawValue                          raw(30);
-
-    function ConvertHexDigit(a_Value number) return varchar2 is
-    begin
-        if a_Value between 0 and 9 then
-            return to_char(a_Value);
-        end if;
-        return chr(ascii('A') + a_Value - 10);
-    end;
-
-    function ConvertToHex(a_Value varchar2) return varchar2 is
-        t_HexValue                      varchar2(60);
-        t_Digit                         number;
-    begin
-        for i in 1..length(a_Value) loop
-            t_Digit := ascii(substr(a_Value, i, 1));
-            t_HexValue := t_HexValue ||
-                    ConvertHexDigit(trunc(t_Digit / 16)) ||
-                    ConvertHexDigit(mod(t_Digit, 16));
-        end loop;
-        return t_HexValue;
-    end;
-
-begin
-    for i in 1..10 loop
-        t_RawValue := hextoraw(ConvertToHex('Raw ' || to_char(i)));
-        insert into &main_user..TestStrings
-        values (i, 'String ' || to_char(i), t_RawValue,
-                'Fixed Char ' || to_char(i),
-                decode(mod(i, 2), 0, null, 'Nullable ' || to_char(i)));
-    end loop;
-end;
-/
-
-insert into &main_user..ParentTable values (10, 'Parent 10')
-/
-insert into &main_user..ParentTable values (20, 'Parent 20')
-/
-insert into &main_user..ParentTable values (30, 'Parent 30')
-/
-insert into &main_user..ParentTable values (40, 'Parent 40')
-/
-insert into &main_user..ParentTable values (50, 'Parent 50')
-/
-
-insert into &main_user..ChildTable values (1001, 10, 'Child A of Parent 10')
-/
-insert into &main_user..ChildTable values (1002, 20, 'Child A of Parent 20')
-/
-insert into &main_user..ChildTable values (1003, 20, 'Child B of Parent 20')
-/
-insert into &main_user..ChildTable values (1004, 20, 'Child C of Parent 20')
-/
-insert into &main_user..ChildTable values (1005, 30, 'Child A of Parent 30')
-/
-insert into &main_user..ChildTable values (1006, 30, 'Child B of Parent 30')
-/
-insert into &main_user..ChildTable values (1007, 40, 'Child A of Parent 40')
-/
-insert into &main_user..ChildTable values (1008, 40, 'Child B of Parent 40')
-/
-insert into &main_user..ChildTable values (1009, 40, 'Child C of Parent 40')
-/
-insert into &main_user..ChildTable values (1010, 40, 'Child D of Parent 40')
-/
-insert into &main_user..ChildTable values (1011, 40, 'Child E of Parent 40')
-/
-insert into &main_user..ChildTable values (1012, 50, 'Child A of Parent 50')
-/
-insert into &main_user..ChildTable values (1013, 50, 'Child B of Parent 50')
-/
-insert into &main_user..ChildTable values (1014, 50, 'Child C of Parent 50')
-/
-insert into &main_user..ChildTable values (1015, 50, 'Child D of Parent 50')
-/
-
-insert into &main_user..SampleQueryTab values (1, 'Anthony')
-/
-insert into &main_user..SampleQueryTab values (2, 'Barbie')
-/
-insert into &main_user..SampleQueryTab values (3, 'Chris')
-/
-insert into &main_user..SampleQueryTab values (4, 'Dazza')
-/
-insert into &main_user..SampleQueryTab values (5, 'Erin')
-/
-insert into &main_user..SampleQueryTab values (6, 'Frankie')
-/
-insert into &main_user..SampleQueryTab values (7, 'Gerri')
-/
-insert into &main_user..SampleQueryTab values (8, 'Harriet')
-/
-insert into &main_user..SampleQueryTab values (9, 'Isabelle')
-/
-insert into &main_user..SampleQueryTab values (10, 'Jarek')
-/
-insert into &main_user..SampleQueryTab values (11, 'Krishna')
-/
-insert into &main_user..SampleQueryTab values (12, 'Leo')
-/
-insert into &main_user..SampleQueryTab values (13, 'Mia')
-/
-insert into &main_user..SampleQueryTab values (14, 'Nathalie')
-/
-insert into &main_user..SampleQueryTab values (15, 'Oscar')
-/
-insert into &main_user..SampleQueryTab values (16, 'Pia')
-/
-insert into &main_user..SampleQueryTab values (17, 'Quentin')
-/
-insert into &main_user..SampleQueryTab values (18, 'Roger')
-/
-insert into &main_user..SampleQueryTab values (19, 'Sally')
-/
-insert into &main_user..SampleQueryTab values (20, 'Tully')
-/
-insert into &main_user..SampleQueryTab values (21, 'Una')
-/
-insert into &main_user..SampleQueryTab values (22, 'Valerie')
-/
-insert into &main_user..SampleQueryTab values (23, 'William')
-/
-insert into &main_user..SampleQueryTab values (24, 'Xavier')
-/
-insert into &main_user..SampleQueryTab values (25, 'Yasmin')
-/
-insert into &main_user..SampleQueryTab values (26, 'Zach')
-/
-
-commit
-/
-
---
--- For PL/SQL Examples
---
-
-create or replace function &main_user..myfunc (
-    a_Data                              varchar2,
-    a_Id                                number
-) return number as
-begin
-    insert into &main_user..ptab (mydata, myid) values (a_Data, a_Id);
-    return (a_Id * 2);
-end;
-/
-
-create or replace procedure &main_user..myproc (
-    a_Value1                            number,
-    a_Value2                            out number
-) as
-begin
-   a_Value2 := a_Value1 * 2;
-end;
-/
-
-create or replace procedure &main_user..myrefcursorproc (
-    a_StartingValue                     number,
-    a_EndingValue                       number,
-    a_RefCursor                         out sys_refcursor
-) as
-begin
-    open a_RefCursor for
-        select *
-        from TestStrings
-        where IntCol between a_StartingValue and a_EndingValue;
-end;
-/
-
-create procedure &main_user..myrefcursorproc2 (
-    a_RefCursor                         out sys_refcursor
-) as
-begin
-    open a_RefCursor for
-        select *
-        from TestTempTable;
-end;
-/
-
---
--- Create package for demoing PL/SQL collections and records.
---
-
-create or replace package &main_user..pkg_Demo as
-
-    type udt_StringList is table of varchar2(100) index by binary_integer;
-
-    type udt_DemoRecord is record (
-        NumberValue                     number,
-        StringValue                     varchar2(30),
-        DateValue                       date,
-        BooleanValue                    boolean
-    );
-
-    procedure DemoCollectionOut (
-        a_Value                         out nocopy udt_StringList
-    );
-
-    procedure DemoRecordsInOut (
-        a_Value                         in out nocopy udt_DemoRecord
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_Demo as
-
-    procedure DemoCollectionOut (
-        a_Value                         out nocopy udt_StringList
-    ) is
-    begin
-        a_Value(-1048576) := 'First element';
-        a_Value(-576) := 'Second element';
-        a_Value(284) := 'Third element';
-        a_Value(8388608) := 'Fourth element';
-    end;
-
-    procedure DemoRecordsInOut (
-        a_Value                         in out nocopy udt_DemoRecord
-    ) is
-    begin
-        a_Value.NumberValue := a_Value.NumberValue * 2;
-        a_Value.StringValue := a_Value.StringValue || ' (Modified)';
-        a_Value.DateValue := a_Value.DateValue + 5;
-        a_Value.BooleanValue := not a_Value.BooleanValue;
-    end;
-
-end;
-/
-
---
--- Create package for demoing PL/SQL session callback
---
-
-create or replace package &main_user..pkg_SessionCallback as
-
-    procedure TheCallback (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_SessionCallback as
-
-    type udt_Properties is table of varchar2(64) index by varchar2(64);
-
-    procedure LogCall (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    ) is
-        pragma autonomous_transaction;
-    begin
-        insert into PlsqlSessionCallbacks
-        values (a_RequestedTag, a_ActualTag, systimestamp);
-        commit;
-    end;
-
-    procedure ParseProperty (
-        a_Property                      varchar2,
-        a_Name                          out nocopy varchar2,
-        a_Value                         out nocopy varchar2
-    ) is
-        t_Pos                           number;
-    begin
-        t_Pos := instr(a_Property, '=');
-        if t_Pos = 0 then
-            raise_application_error(-20000, 'Tag must contain key=value pairs');
-        end if;
-        a_Name := substr(a_Property, 1, t_Pos - 1);
-        a_Value := substr(a_Property, t_Pos + 1);
-    end;
-
-    procedure SetProperty (
-        a_Name                          varchar2,
-        a_Value                         varchar2
-    ) is
-        t_ValidValues                   udt_Properties;
-    begin
-        if a_Name = 'TIME_ZONE' then
-            t_ValidValues('UTC') := 'UTC';
-            t_ValidValues('MST') := '-07:00';
-        elsif a_Name = 'NLS_DATE_FORMAT' then
-            t_ValidValues('SIMPLE') := 'YYYY-MM-DD HH24:MI';
-            t_ValidValues('FULL') := 'YYYY-MM-DD HH24:MI:SS';
-        else
-            raise_application_error(-20000, 'Unsupported session setting');
-        end if;
-        if not t_ValidValues.exists(a_Value) then
-            raise_application_error(-20000, 'Unsupported session setting');
-        end if;
-        execute immediate
-                'ALTER SESSION SET ' || a_Name || '=''' ||
-                t_ValidValues(a_Value) || '''';
-    end;
-
-    procedure ParseTag (
-        a_Tag                           varchar2,
-        a_Properties                    out nocopy udt_Properties
-    ) is
-        t_PropertyName                  varchar2(64);
-        t_PropertyValue                 varchar2(64);
-        t_StartPos                      number;
-        t_EndPos                        number;
-    begin
-        t_StartPos := 1;
-        while t_StartPos < length(a_Tag) loop
-            t_EndPos := instr(a_Tag, ';', t_StartPos);
-            if t_EndPos = 0 then
-                t_EndPos := length(a_Tag) + 1;
-            end if;
-            ParseProperty(substr(a_Tag, t_StartPos, t_EndPos - t_StartPos),
-                    t_PropertyName, t_PropertyValue);
-            a_Properties(t_PropertyName) := t_PropertyValue;
-            t_StartPos := t_EndPos + 1;
-        end loop;
-    end;
-
-    procedure TheCallback (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    ) is
-        t_RequestedProps                udt_Properties;
-        t_ActualProps                   udt_Properties;
-        t_PropertyName                  varchar2(64);
-    begin
-        LogCall(a_RequestedTag, a_ActualTag);
-        ParseTag(a_RequestedTag, t_RequestedProps);
-        ParseTag(a_ActualTag, t_ActualProps);
-        t_PropertyName := t_RequestedProps.first;
-        while t_PropertyName is not null loop
-            if not t_ActualProps.exists(t_PropertyName) or
-                    t_ActualProps(t_PropertyName) !=
-                    t_RequestedProps(t_PropertyName) then
-                SetProperty(t_PropertyName, t_RequestedProps(t_PropertyName));
-            end if;
-            t_PropertyName := t_RequestedProps.next(t_PropertyName);
-        end loop;
-    end;
-
-end;
-/
diff --git a/samples/sql/create_schema_21.sql b/samples/sql/create_schema_21.sql
deleted file mode 100644
index 0131f5f1..00000000
--- a/samples/sql/create_schema_21.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright 2023, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_21.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb samples that require Oracle
- * Database 21c or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create table &main_user..CustomersAsJson (
-    id number(9) not null primary key,
-    json_data json
-)
-/
diff --git a/samples/sql/create_schema_23.sql b/samples/sql/create_schema_23.sql
deleted file mode 100644
index 53226f02..00000000
--- a/samples/sql/create_schema_23.sql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright 2023, 2024, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_23.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb samples that require Oracle
- * Database 23.7 or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create table &main_user..SampleVectorTab (
-    id        number generated by default on null as identity primary key,
-    v32       vector(3, float32),
-    v64       vector(3, float64),
-    v8        vector(3, int8),
-    vbin      vector(24, binary),
-    v64sparse vector(30, float64, sparse)
-)
-/
-
-create table &main_user..SampleJRDVAuthorTab (
-    AuthorId number generated by default on null as identity primary key,
-    AuthorName varchar2(100)
-)
-/
-
-create table &main_user..SampleJRDVBookTab (
-    BookId number generated by default on null as identity primary key,
-    BookTitle varchar2(100),
-    AuthorId number references &main_user..SampleJRDVAuthorTab (AuthorId)
-)
-/
-
-insert into &main_user..SampleJRDVAuthorTab values
-    (1, 'Isabel M. Rich'),
-    (2, 'Bobbie Cool'),
-    (3, 'Charlie Shore')
-/
-
-insert into &main_user..SampleJRDVBookTab values
-    (1, 'The Mysterious Dog', 1),
-    (2, 'The Mysterious Pony', 1),
-    (3, 'The Mysterious Tiger', 1),
-    (4, 'Self Help for Programmers', 2),
-    (5, 'More Self Help for Programmers', 2),
-    (6, 'Travel Guide Volume I', 3),
-    (7, 'Travel Guide Volume II', 3)
-/
-
-commit
-/
diff --git a/samples/sql/drop_schema.sql b/samples/sql/drop_schema.sql
deleted file mode 100644
index 62e11959..00000000
--- a/samples/sql/drop_schema.sql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright 2017, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * drop_schema.sql
- *
- * Performs the actual work of dropping the database schemas and edition used
- * by the python-oracledb samples. It is executed by the Python script
- * drop_schema.py.
- *---------------------------------------------------------------------------*/
-
-begin
-
-    for r in
-            ( select username
-              from dba_users
-              where username in (upper('&main_user'), upper('&edition_user'))
-            ) loop
-        execute immediate 'drop user ' || r.username || ' cascade';
-    end loop;
-
-    for r in
-            ( select edition_name
-              from dba_editions
-	          start with edition_name = upper('&edition_name')
-	          connect by prior edition_name = parent_edition_name
-	          order by level desc
-            ) loop
-        execute immediate 'drop edition ' || r.edition_name || ' cascade';
-    end loop;
-
-end;
-/
diff --git a/samples/sqlp.py b/samples/sqlp.py
deleted file mode 100755
index 6b2933b8..00000000
--- a/samples/sqlp.py
+++ /dev/null
@@ -1,325 +0,0 @@
-#! /usr/bin/env python
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# sqlp.py
-#
-# USAGE
-#  python sqlp.py [username@password/connect_string]
-#
-# DESCRIPTION
-#  Example interactive command line SQL executor for ad hoc statements.
-#
-#  This is modelled on SQL*Plus but has MANY differences.  Some are:
-#   - It always reads from the keyboard and doesn't directly read SQL files
-#   - It doesn't execute SQL*Plus-specific commands like SET or DESC
-#   - It doesn't support "&" substitution or bind variables
-#   - It doesn't display all data types, e.g. object types aren't supported
-#   - It doesn't do smart sizing or wrapping of query columns
-#   - Statements like "CREATE OR REPLACE" must have all keywords on the same
-#     (first) line
-#   - it has very limited error handling
-# -----------------------------------------------------------------------------
-
-import oracledb
-import getpass
-import sys
-import re
-import signal
-
-# Statement types
-STMT_TYPE_UNKNOWN = 0
-STMT_TYPE_SQL = 1  # Like SELECT or INSERT
-STMT_TYPE_PLSQL = 2  # Like BEGIN or CREATE FUNCTION
-STMT_TYPE_SQLPLUS = 3  # Like SET or DESC
-
-# Simple regexps for statement type identification
-SQL_PATTERN = re.compile(
-    "^(administer|alter|analyze|associate|audit|call|comment|commit|create"
-    "|delete|disassociate|drop|explain|flashback|grant|insert|lock|merge"
-    "|noaudit|purge|rename|revoke|rollback|savepoint|select|truncate|update"
-    r"|with|set\s+constraint[s*]|set\s+role|set\s+transaction)(\s|$|;)",
-    re.IGNORECASE,
-)
-
-PLSQL_PATTERN = re.compile(
-    r"^(begin|declare|create\s+or\s+replace|create\s+function"
-    r"|create\s+procedure|create\s+package|create\s+type)(\s|$)",
-    re.IGNORECASE,
-)
-
-SQLPLUS_PATTERN = re.compile(
-    r"^(@|@@|(acc(e?|ep?|ept?))|(a(p?|pp?|ppe?|ppen?|ppend?))|(archive\s+log)"
-    "|(attr(i?|ib?|ibu?|ibut?|ibute?))|(bre(a?|ak?))|(bti(t?|tl?|tle?))"
-    "|(c(h?|ha?|han?|hang?|hange?))|(cl(e?|ea?|ear?))|(col(u?|um?|umn?))"
-    "|(comp(u?|ut?|ute?))|(conn(e?|ec?|ect?))|copy|(def(i?|in?|ine?))|del"
-    "|(desc(r?|ri?|rib?|ribe?))|(disc(o?|on?|onn?|onne?|onnec?|onnect?))"
-    "|(ed(i?|it?))|(exec(u?|ut?|ute?))|exit|get|help|history|host"
-    "|(i(n?|np?|npu?|nput?))|(l(i?|is?|ist?))|(passw(o?|or?|ord?))"
-    "|(pau(s?|se?))|print|(pro(m?|mp?|mpt?))|quit|recover|(rem(a?|ar?|ark?))"
-    "|(repf(o?|oo?|oot?|oote?|ooter?))|(reph(e?|ea?|ead?|eade?|eader?))"
-    "|(r(u?|un?))|(sav(e?))|set|(sho(w?))|shutdown|(spo(o?|ol?))|(sta(r?|rt?))"
-    "|startup|store|(timi(n?|ng?))|(tti(t?|tl?|tle?))|(undef(i?|in?|ine?))"
-    r"|(var(i?|ia?|iab?|iabl?|iable?))|whenever|xquery|--.*)(\s|$)",
-    re.IGNORECASE,
-)
-
-QUERY_PATTERN = re.compile(r"(select|with)\s*", re.IGNORECASE)
-
-
-# Look up the first keywords to find the statement type
-def detect_statement_type(s):
-    if PLSQL_PATTERN.match(s):
-        return STMT_TYPE_PLSQL
-    elif SQL_PATTERN.match(s):
-        return STMT_TYPE_SQL
-    elif SQLPLUS_PATTERN.match(s):
-        return STMT_TYPE_SQLPLUS
-    else:
-        return STMT_TYPE_UNKNOWN
-
-
-# Read text until the expected end-of-statement terminator is seen.
-#
-#   - SQL*Plus commands like SET or DESC can have an optional semi-colon
-#     statement terminator.
-#
-#   - SQL commands like SELECT and INSERT can end with a semi-colon or with a
-#     slash on a new line.
-#
-#   - PL/SQL commands like BEGIN or CREATE PROCEDURE must end with a slash on a
-#     new line.
-#
-def read_statement():
-    statement = ""
-    statement_type = STMT_TYPE_UNKNOWN
-    line_number = 1
-    print("SQLP> ", end="")
-    while True:
-        try:
-            line = input().strip()
-        except EOFError:
-            sys.exit(0)
-        line_number += 1
-        if len(line) == 0 and statement_type != STMT_TYPE_PLSQL:
-            statement = ""
-            break
-        if statement_type == STMT_TYPE_UNKNOWN:
-            statement_type = detect_statement_type(line)
-        if statement_type == STMT_TYPE_UNKNOWN:
-            return (line, STMT_TYPE_UNKNOWN)
-        elif line == "/" and (
-            statement_type == STMT_TYPE_SQL
-            or statement_type == STMT_TYPE_PLSQL
-        ):
-            break
-        elif (
-            statement_type == STMT_TYPE_SQL
-            or statement_type == STMT_TYPE_SQLPLUS
-        ) and line[-1] == ";":
-            statement = f"{statement} {line[:-1]}" if statement else line[:-1]
-            break
-        elif statement_type == STMT_TYPE_SQLPLUS:
-            statement = line
-            break
-        else:
-            statement = f"{statement} {line}" if statement else line
-
-        print("{0:3}  ".format(line_number), end="")
-
-    return (statement, statement_type)
-
-
-# Execute a statement that needs to be sent to the database
-def execute_db_statement(connection, statement, statement_type):
-    if not connection:
-        print("Not connected")
-    else:
-        with connection.cursor() as cursor:
-            try:
-                cursor.execute(statement)
-                if cursor.warning:
-                    print(cursor.warning)
-                if statement_type == STMT_TYPE_SQL and QUERY_PATTERN.match(
-                    statement
-                ):
-                    fetch_rows(cursor)
-
-            except oracledb.Error as e:
-                (error,) = e.args
-                print(statement)
-                print("*".rjust(error.offset + 1, " "))
-                print(error.message)
-
-
-# Handle "local" SQL*Plus commands
-def execute_sqlplus_statement(connection, statement):
-    if re.match(r"(conn(e?|ec?|ect?))(\s|$)", statement):
-        a = re.split(r"\s+", statement)
-        dsn = None if len(a) <= 1 else a[1]
-        connection = get_connection(dsn)
-    elif (
-        statement.lower().strip() == "exit"
-        or statement.lower().strip() == "quit"
-    ):
-        sys.exit(0)
-    elif (
-        re.match(r"(rem(a?|ar?|ark?))(\s|$)", statement)
-        or statement[:2] == "--"
-    ):
-        return connection
-    # elif ...
-    #  This is where you can extend keyword support
-    else:
-        print(
-            'Unsupported SQL*Plus command "{}"'.format(
-                re.split(r"\s+", statement)[0]
-            )
-        )
-    return connection
-
-
-# Fetch and display query rows
-def fetch_rows(cursor):
-    try:
-        rows = cursor.fetchmany()
-        if not rows:
-            print("no rows selected")
-        else:
-            col_formats = get_col_formats(cursor.description)
-            print_headings(col_formats)
-            while rows:
-                for row in rows:
-                    print_row(col_formats, row)
-                rows = cursor.fetchmany()
-    except oracledb.Error as e:
-        (error,) = e.args
-        print(error.message)
-
-
-# Naive logic to choose column display widths
-def get_col_formats(description):
-    col_formats = []
-    for col in description:
-        if col[2] is None:  # no width, e.g. a LOB
-            w = len(col[0])  # use heading length
-        elif col[1] == oracledb.DB_TYPE_NUMBER:
-            w = max(40, len(col[0]))
-        else:
-            w = max(col[2], len(col[0]))
-        col_formats.append({"heading": col[0], "type": col[1], "width": w})
-    return col_formats
-
-
-# Print query column headings and separator
-def print_headings(col_formats):
-    for col in col_formats:
-        print("{h:{w}s}".format(h=col["heading"], w=col["width"]), end=" ")
-    print()
-    for col in col_formats:
-        print("-".rjust(col["width"], "-"), end=" ")
-    print()
-
-
-# Print a row of query data
-# No column wrapping occurs
-def print_row(col_formats, row):
-    for i, v in enumerate(row):
-        v = " " if v is None else v
-        print("{v:{w}s}".format(v=str(v), w=col_formats[i]["width"]), end=" ")
-    print()
-
-
-# Connect
-def get_connection(dsn=None):
-    connection = None
-    try:
-        if dsn:
-            connection = oracledb.connect(dsn=dsn)
-        else:
-            un = get_user()
-            pw = get_password()
-            cs = get_connect_string()
-            if un and pw and cs:
-                connection = oracledb.connect(user=un, password=pw, dsn=cs)
-            else:
-                raise ValueError("Invalid credentials entered")
-    except ValueError as e:
-        print(e)
-    except oracledb.Error as e:
-        (error,) = e.args
-        print("Failed to connect")
-        print(error.message)
-    finally:
-        return connection
-
-
-# Signal handler for graceful interrupts
-def signal_handler(sig, frame):
-    print()
-    sys.exit(0)
-
-
-# Connection helper functions
-def get_user():
-    return input("Enter username: ").strip()
-
-
-def get_password():
-    return getpass.getpass("Enter password: ")
-
-
-def get_connect_string():
-    return input("Enter connection string: ")
-
-
-# Main body
-if __name__ == "__main__":
-    # Allow graceful interrupts
-    signal.signal(signal.SIGINT, signal_handler)
-
-    # Fetch LOBs directly as strings or bytes
-    oracledb.defaults.fetch_lobs = False
-
-    # Fetch numbers as decimal.Decimal
-    oracledb.defaults.fetch_decimals = True
-
-    # Connect
-    connection = None if len(sys.argv) <= 1 else get_connection(sys.argv[1])
-
-    # Loop to read statements and execute them
-    while True:
-        (statement, statement_type) = read_statement()
-        if len(statement) == 0:
-            continue
-        elif statement_type == STMT_TYPE_UNKNOWN:
-            print(
-                'Unknown command "{}"'.format(re.split(r"\s+", statement)[0])
-            )
-        elif statement_type == STMT_TYPE_SQLPLUS:
-            connection = execute_sqlplus_statement(connection, statement)
-        else:
-            execute_db_statement(connection, statement, statement_type)
diff --git a/samples/subclassing.py b/samples/subclassing.py
deleted file mode 100644
index 809eec31..00000000
--- a/samples/subclassing.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# subclassing.py
-#
-# Demonstrates how to subclass connections and cursors in order to add
-# additional functionality (like logging) or create specialized interfaces for
-# particular applications.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-# sample subclassed Connection which overrides the constructor (so no
-# parameters are required) and the cursor() method (so that the subclassed
-# cursor is returned instead of the default cursor implementation)
-class Connection(oracledb.Connection):
-    def __init__(self):
-        print("CONNECT", sample_env.get_connect_string())
-        super().__init__(
-            user=sample_env.get_main_user(),
-            password=sample_env.get_main_password(),
-            dsn=sample_env.get_connect_string(),
-            params=sample_env.get_connect_params(),
-        )
-
-    def cursor(self):
-        return Cursor(self)
-
-
-# sample subclassed cursor which overrides the execute() and fetchone()
-# methods in order to perform some simple logging
-class Cursor(oracledb.Cursor):
-    def execute(self, statement, args):
-        print("EXECUTE", statement)
-        print("ARGS:")
-        for arg_index, arg in enumerate(args):
-            print("   ", arg_index + 1, "=>", repr(arg))
-        return super().execute(statement, args)
-
-    def fetchone(self):
-        print("FETCHONE")
-        return super().fetchone()
-
-
-# create instances of the subclassed Connection and cursor
-connection = Connection()
-
-with connection.cursor() as cursor:
-    # demonstrate that the subclassed connection and cursor are being used
-    cursor.execute(
-        "select count(*) from ChildTable where ParentId = :1", (30,)
-    )
-    (count,) = cursor.fetchone()
-    print("COUNT:", int(count))
diff --git a/samples/subclassing_async.py b/samples/subclassing_async.py
deleted file mode 100644
index 3d2ec024..00000000
--- a/samples/subclassing_async.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# subclassing_async.py
-#
-# An asynchronous version of subclassing.py
-#
-# Demonstrates how to subclass connections and cursors in order to add
-# additional functionality (like logging) or create specialized interfaces for
-# particular applications.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import oracledb
-import sample_env
-
-
-# sample subclassed Connection which overrides the constructor (so no
-# parameters are required) and the cursor() method (so that the subclassed
-# cursor is returned instead of the default cursor implementation)
-class Connection(oracledb.AsyncConnection):
-    def cursor(self):
-        return Cursor(self)
-
-
-# sample subclassed cursor which overrides the execute() and fetchone()
-# methods in order to perform some simple logging
-class Cursor(oracledb.AsyncCursor):
-    async def execute(self, statement, args):
-        print("EXECUTE", statement)
-        print("ARGS:")
-        for arg_index, arg in enumerate(args):
-            print("   ", arg_index + 1, "=>", repr(arg))
-        return await super().execute(statement, args)
-
-    async def fetchone(self):
-        print("FETCHONE")
-        return await super().fetchone()
-
-
-async def main():
-    # create instances of the subclassed Connection and cursor
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-        conn_class=Connection,
-    )
-
-    with connection.cursor() as cursor:
-        # demonstrate that the subclassed connection and cursor are being used
-        await cursor.execute(
-            "select count(*) from ChildTable where ParentId = :1", (30,)
-        )
-        (count,) = await cursor.fetchone()
-        print("COUNT:", int(count))
-
-
-asyncio.run(main())
diff --git a/samples/transaction_guard.py b/samples/transaction_guard.py
deleted file mode 100644
index 99eac1a5..00000000
--- a/samples/transaction_guard.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# transaction_guard.py
-#
-# Demonstrates the use of Transaction Guard to verify if a transaction has
-# completed, ensuring that a duplicate transaction is not created or attempted
-# if the application chooses to handle the error. This
-# feature is only available in Oracle Database 12.1. It follows loosely the
-# OCI sample provided by Oracle in its documentation about OCI and Transaction
-# Guard.
-#
-# Run the following as SYSDBA to set up Transaction Guard
-#
-#     grant execute on dbms_app_cont to pythondemo;
-#
-#     declare
-#         t_Params dbms_service.svc_parameter_array;
-#     begin
-#         t_Params('COMMIT_OUTCOME') := 'true';
-#         t_Params('RETENTION_TIMEOUT') := 604800;
-#         dbms_service.create_service('orcl-tg', 'orcl-tg', t_Params);
-#         dbms_service.start_service('orcl-tg');
-#     end;
-#     /
-# -----------------------------------------------------------------------------
-
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# constants
-CONNECT_STRING = "localhost/orcl-tg"
-
-# create transaction and generate a recoverable error
-pool = oracledb.create_pool(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=CONNECT_STRING,
-    min=1,
-    max=9,
-    increment=2,
-)
-connection = pool.acquire()
-cursor = connection.cursor()
-cursor.execute("delete from TestTempTable where IntCol = 1")
-cursor.execute("insert into TestTempTable values (1, null)")
-
-try:
-    sql = """select unique
-             'alter system kill session '''||sid||','||serial#||''';'
-             from v$session_connect_info
-             where sid = sys_context('USERENV', 'SID')"""
-    (killsql,) = connection.cursor().execute(sql).fetchone()
-    print(f"Execute this SQL statement as a DBA user in SQL*Plus:\n {killsql}")
-except Exception:
-    print(
-        "As a DBA user in SQL*Plus, use ALTER SYSTEM KILL SESSION "
-        f"to terminate the {sample_env.get_main_user()} session now."
-    )
-
-input("Press ENTER when complete.")
-
-ltxid = connection.ltxid
-if not ltxid:
-    sys.exit("Logical transaction not available. Terminating.")
-try:
-    connection.commit()  # this should fail
-    sys.exit("Session was not killed. Sample cannot continue.")
-except oracledb.DatabaseError as e:
-    (error_obj,) = e.args
-    print("Session is recoverable:", error_obj.isrecoverable)
-    if not error_obj.isrecoverable:
-        sys.exit("Session is not recoverable. Terminating.")
-pool.drop(connection)
-
-# check if previous transaction completed
-connection = pool.acquire()
-cursor = connection.cursor()
-args = (oracledb.Binary(ltxid), cursor.var(bool), cursor.var(bool))
-_, committed, completed = cursor.callproc(
-    "dbms_app_cont.get_ltxid_outcome", args
-)
-print("Failed transaction was committed:", committed)
-print("Failed call was completed:", completed)
diff --git a/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html b/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html
index 9afdbede..8734268f 100644
--- a/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html
+++ b/samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Python and Oracle Database Tutorial: The New Wave of Scripting</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 
 <link rel="stylesheet" href="resources/base.css" type="text/css"/>
 <link rel="shortcut icon" type="image/x-icon" href="resources/favicon.ico"/>
@@ -133,38 +133,31 @@ <h2>Contents</h2>
       <li>15.1 Working with scrollable cursors</li>
       </ul>
     </li>
-    <li><a href="#dataframes">16. DataFrames</a>
+    <li><a href="#dataframes">16. Dataframes</a>
       <ul>
-        <li>16.1 Fetching DataFrames</li>
-        <li>16.2 Inserting DataFrames</li>
+        <li>16.1 Working with Dataframes</li>
       </ul>
     </li>
-    <li><a href="#directpath">17. Direct Path Loads</a>
+    <li><a href="#asyncio">17. Concurrent Programming with asyncio</a>
       <ul>
-        <li>17.1 Using Direct Path Loads</li>
-        <li>17.2 Inserting DataFrames with Direct Path Loads</li>
+        <li>17.1 Using asyncio</li>
       </ul>
     </li>
-    <li><a href="#asyncio">18. Concurrent Programming with asyncio</a>
+    <li><a href="#pipelining">18. Pipelining multiple operations</a>
       <ul>
-        <li>18.1 Using asyncio</li>
+        <li>18.1 Using Pipelining</li>
       </ul>
     </li>
-    <li><a href="#pipelining">19. Pipelining multiple operations</a>
+    <li><a href="#thick">19. Python-oracledb Thick mode</a>
       <ul>
-        <li>19.1 Using Pipelining</li>
+      <li>19.1 Review the Oracle Client library path</li>
+      <li>19.2 Review the configuration files for thick mode</li>
       </ul>
     </li>
-    <li><a href="#thick">20. Python-oracledb Thick mode</a>
+    <li><a href="#soda">20. Simple Oracle Document Access (SODA)</a>
       <ul>
-      <li>20.1 Review the Oracle Client library path</li>
-      <li>20.2 Review the configuration files for thick mode</li>
-      </ul>
-    </li>
-    <li><a href="#soda">21. Simple Oracle Document Access (SODA)</a>
-      <ul>
-        <li>21.1 Inserting JSON Documents</li>
-        <li>21.2 Searching SODA Documents</li>
+        <li>20.1 Inserting JSON Documents</li>
+        <li>20.2 Searching SODA Documents</li>
       </ul>
     </li>
     <li><a href="#summary" >Summary</a></li>
@@ -212,7 +205,7 @@ <h3><a name="architecture">Python-oracledb Architecture</a></h3>
 
   <ul>
     <li>
-      <h4 id="accessdb">Get Access to Oracle Database</h4>
+      <h4 id="installsw">Get Access to Oracle Database</h4>
 
       <p>This tutorial assumes you have DBA access to Oracle Database. This is
       needed to grant some privileges and roles.</p>
@@ -220,7 +213,7 @@ <h4 id="accessdb">Get Access to Oracle Database</h4>
       <p>Some examples require the latest version of Oracle Database, but most
       will work with older database versions.</p>
 
-      <p>If you need a database, you can install Oracle Database Free on
+      <p>If you need a database, you can install Oracle Database 23ai Free on
       Linux or Windows from <a
       href="https://www.oracle.com/database/technologies/oracle-database-software-downloads.html#db_free"
       >oracle-database-software-downloads.html#db_free</a>.</p>
@@ -273,7 +266,7 @@ <h4 id="downloadscripts">Download the tutorial scripts</h4>
         >here</a> and unzip it. Alternatively you can use 'git' to clone the
         repository:</p>
 
-<pre>git clone --recursive https://github.com/oracle/python-oracledb.git</pre>
+<pre>git clone https://github.com/oracle/python-oracledb.git</pre>
 
         <p>The <code>samples/tutorial</code> directory has scripts to run and
         modify. The <code>samples/tutorial/solutions</code> directory has
@@ -292,7 +285,7 @@ <h4>Review the privileged database credentials used for creating the
         directory. This file is included in other Python files for creating and
         dropping the tutorial user.</p>
 
-        <p>Edit <code>db_config_sys.py</code> and change the default
+        <p>Edit <code>db_config_sys.py</code> file and change the default
         values to match the system connection information for your environment.
         Alternatively, you can set the given environment variables in your
         terminal window. For example, the default username is "<em>SYSTEM</em>"
@@ -391,7 +384,7 @@ <h4>Review the connection credentials used by the tutorial scripts</h4>
        in other Python and SQL files for setting up the database
        connection.</p>
 
-       <p>Edit <code>db_config.py</code> and change the default values to
+       <p>Edit <code>db_config.py</code> file and change the default values to
        match the connection information for your environment.  Alternatively,
        you can set the given environment variables in your terminal window. For
        example, the default username is "<em>pythondemo</em>" unless the
@@ -631,7 +624,7 @@ <h4>1.5 Checking versions</h4>
 
 print(oracledb.__version__) # two underscores before and after the version</pre>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre><strong>python versions.py</strong></pre>
 
@@ -727,7 +720,7 @@ <h4>1.7 Checking Connection Health</h4>
 else:
     print("Unusable connection. Please check the database and network settings.")</pre>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre>python connect_health.py</pre>
 
@@ -867,7 +860,7 @@ <h4>2.2 Connection pool experiments</h4>
     <code>numberOfThreads</code>. </p>
 
     <p>Try changing <code>getmode</code> to
-    <code>oracledb.POOL_GETMODE_NOWAIT</code>, reducing the maximum pool size to
+    <code>oracledb.POOL_GETMODE_NOWAIT</code>, reducing the maxium pool size to
     2, and increasing the number of threads to 3.  When
     <code>number_of_threads</code> exceeds the maximum size of the pool, the
     <code>acquire()</code> call will now generate an error such as
@@ -1035,7 +1028,7 @@ <h4>2.4 Connection pooling and DRCP</h4>
     <p>The script logic does not need to be changed to benefit from DRCP
     connection pooling.</p>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre><strong>python connect_pool2.py</strong></pre>
 
@@ -1080,7 +1073,7 @@ <h4>2.5 More DRCP investigation</h4>
     <code>oracledb.PURITY_NEW</code> to see the effect on the DRCP NUM_MISSES
     statistic.</p>
 
-    <p>Another experiment is to include the <code>time</code> module at the
+    <p>Another experiement is to include the <code>time</code> module at the
     file top:</p>
 
     <pre>
@@ -1505,7 +1498,7 @@ <h4>4.3 Batcherrors</h4>
 print(res)
 </pre>
 
-      <p>Run the script in a terminal window:</p>
+      <p>Run the script:</p>
 
       <pre><strong>python bind_insert.py</strong></pre>
 
@@ -1726,7 +1719,7 @@ <h4>6.1 Basic output type handler</h4>
     print("Value:", value, "* 3 =", value * 3)
 </pre>
 
-      <p>Run the script in a terminal window:</p>
+      <p>Run the script:</p>
 
       <pre><strong>python type_converter.py</strong></pre>
 
@@ -1776,9 +1769,6 @@ <h4>6.1 Basic output type handler</h4>
 oracledb.defaults.fetch_decimals = True
 </pre>
 
-     <p>You can also set <em>fetch_decimals</em> as an <code>execute()</code>
-     parameter.</p>
-
   </li>
 
   <li>
@@ -1883,7 +1873,7 @@ <h4>6.3 Input type handlers</h4>
     handler <code>input_type_handler</code> whenever an instance of
     <code>Building</code> is inserted with the cursor.</p>
 
-    <p>Run the script in a terminal window:</p>
+    <p>To confirm the behavior, run the script:</p>
 
     <pre><strong>python type_input.py</strong></pre>
 
@@ -1940,7 +1930,7 @@ <h4>7.1 Fetching a CLOB using a locator</h4>
       LOB Object.  Methods on LOB include <code>size()</code> and
       <code>read()</code>.</p>
 
-      <p>To see the output, run the script in a terminal window:</p>
+      <p>To see the output, run the script:</p>
 
       <pre><strong>python clob.py</strong></pre>
 
@@ -1985,10 +1975,8 @@ <h4>7.2 Fetching a CLOB as a string</h4>
 </pre>
 
       <p>Setting <em>oracledb.defaults.fetch_lobs</em> to False causes
-      python-oracledb to fetch the CLOB as a string. You can alternatively set
-      <em>fetch_lobs</em> as an <code>execute()</code> parameter. Standard
-      Python string functions such as <code>len()</code> can be used on the
-      result.</p>
+      python-oracledb to fetch the CLOB as a string.  Standard Python string
+      functions such as <code>len()</code> can be used on the result.</p>
 
       <p>The output is the same as for <code>clob.py</code>.  To check, run the
       script:</p>
@@ -2046,7 +2034,7 @@ <h2><a name="json">8. JSON</a></h2>
     print(j)
 </pre>
 
-      <p>Run the script in a terminal window:</p>
+      <p>Run the script:</p>
 
       <pre><strong>python json_insert.py</strong></pre>
 
@@ -2066,7 +2054,7 @@ <h2><a name="json">8. JSON</a></h2>
     print(j)
 </pre>
 
-      <p>Run the script in a terminal window:</p>
+      <p>Run the script:</p>
 
       <pre><strong>python json_insert.py</strong></pre>
 
@@ -2082,7 +2070,7 @@ <h2><a name="json">8. JSON</a></h2>
 
   <h2><a name="vector">9. VECTORs</a></h2>
 
-  <p>Oracle Database version 23 supports a VECTOR data type for artificial
+  <p>Oracle Database 23ai supports a VECTOR data type for artificial
   intelligence and machine learning search operations. <em>Documentation link
   for further reading: <a
   href="https://python-oracledb.readthedocs.io/en/latest/user_guide/vector_data_type.html"
@@ -2139,7 +2127,7 @@ <h4>9.2 Fetching a VECTOR</h4>
     print(type(v))
 </pre>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre><strong>python vector.py</strong></pre>
 
@@ -2251,7 +2239,7 @@ <h4>9.3 Working with VECTORs and NumPy</h4>
     print(type(v))
 </pre>
 
-<p>Run the script in a terminal window:</p>
+<p>Run the script</p>
 
 <pre><strong>python vector_numpy.py</strong></pre>
 
@@ -2295,7 +2283,7 @@ <h2><a name="rowfactory">10. Rowfactory functions</a></h2>
   first uses array indexes like <code>row[0]</code>. The second uses loop
   target variables that take each row tuple's values.</p>
 
-  <p>Run the script in a terminal window:</p>
+  <p>Run the script:</p>
 
   <pre><strong>python rowfactory.py</strong></pre>
 
@@ -2377,7 +2365,7 @@ <h2><a name="subclass">11. Subclassing connections and cursors</a></h2>
   custom subclass. All the python-oracledb methods such as
   <code>cursor()</code> are available, as shown by the query.</p>
 
-  <p>Run the script in a terminal window:</p>
+  <p>Run the script:</p>
 
 <pre><strong>python subclass.py</strong></pre>
 
@@ -2508,11 +2496,11 @@ <h4>12.1 How to bind named objects</h4>
 
 <p>This uses <code>gettype()</code> to get the database types of the SDO
 and its object attributes. The <code>newobject()</code> calls create
-Python representations of those objects. The python object attributes are
+Python representations of those objects. The python object atributes are
 then set.  Oracle VARRAY types such as SDO_ELEM_INFO_ARRAY are set with
 <code>extend()</code>.</p>
 
-<p>Run the script in a terminal window:</p>
+<p>Run the script:</p>
 
 <pre><strong>python bind_sdo.py</strong></pre>
 
@@ -2699,7 +2687,7 @@ <h4>13.1 Input type handlers with named objects</h4>
 called by the input type handler <code>SDOInputTypeHandler</code> whenever an
 instance of <code>mySDO</code> is inserted with the cursor.</p>
 
-<p>Run the script in a terminal window:</p>
+<p>To confirm the behavior, run the script:</p>
 
 <pre><strong>python type_input_named_obj.py</strong></pre>
 
@@ -2820,7 +2808,7 @@ <h4>13.2 Output type handlers with named objects</h4>
 the cursor and needs to be converted to a user-defined Python object
 (<code>mySDO</code> object in this case).</p>
 
-<p>Run the script in a terminal window:</p>
+<p>To confirm the behavior, run the script:</p>
 
 <pre><strong>python type_output_named_obj.py</strong></pre>
 
@@ -2928,7 +2916,7 @@ <h4>14.1 Message passing with Oracle Advanced Queuing</h4>
 <p>This file sets up Advanced Queuing using Oracle's DBMS_AQADM package.  The
 queue is used for passing Oracle UDT_BOOK objects.</p>
 
-<p>Run the script in a terminal window:</p>
+<p>Run the script:</p>
 
 <pre><strong>python aq.py</strong></pre>
 
@@ -3018,27 +3006,23 @@ <h2><a name = "scrollable">15. Scrollable cursors</a></h2>
 </li>
 </ul>
 
-<h2><a name="dataframes">16. DataFrames</a></h2>
+<h2><a name="dataframes">16. Dataframes</a></h2>
 
-<p>Python-oracledb has a DataFrame class that exposes an Apache Arrow PyCapsule
-interface.  Data can be fetched directly from Oracle Database into DataFrame
-instances for efficient use with Python libraries such as Apache PyArrow,
-Pandas, Polars, NumPy, PyTorch, or to write files in Apache Parquet
-format. Data that is already in a third-party library DataFrame instance that
-exposes the PyCapsule interface can be inserted into Oracle Database by passing
-the instance directly to <code>executemany()</code>.  <em>Documentation link
-for further reading: <a
+<p>Python-oracledb can query data directly into a dataframe format that exposes
+an Apache Arrow PyCapsule interface.  This is an efficient way to use Python
+libraries such as Apache PyArrow, Pandas, Polars, NumPy, PyTorch, or to write
+files in Apache Parquet format. <em>Documentation link for further reading: <a
 href="https://python-oracledb.readthedocs.io/en/latest/user_guide/sql_execution.html#fetching-data-frames"
 >Fetching Data Frames</a></em>.</p>
 
-<p>This section shows how to efficiently fetch data for use with Pandas, modify
-it, and then insert it back into Oracle Database. The <em>pyarrow</em> and
-<em>pandas</em> packages need to be installed:</p>
+<ul>
+  <li><h4>16.1 Working with Dataframes</h4>
 
-      <pre>python -m pip install pyarrow pandas --upgrade</pre>
+    <p>This section shows how to efficiently fetch data for use with Pandas. It
+    uses the <em>pyarrow</em> and <em>pandas</em> packages, which need to be
+    installed:</p>
 
-<ul>
-  <li><h4>16.1 Fetching DataFrames</h4>
+      <pre>python -m pip install pyarrow pandas --upgrade</pre>
 
     <p>Review the code contained in <code>query_pandas.py</code>:</p>
 
@@ -3054,23 +3038,21 @@ <h2><a name="dataframes">16. DataFrames</a></h2>
 
 odf = con.fetch_df_all(
     statement="select sal from emp order by empno",
-    arraysize=100
-)
+    arraysize=100)
 </pre>
 
-    <p>This uses <code>fetch_df_all()</code> to directly fetch rows into a
-    dataframe that internally exposes a PyCapsule interface. For large result
-    sets you can tune the arraysize parameter, or use an iterator from the
-    <code>fetch_df_batches()</code> method.</p>
+    <p>This uses <code>fetch_df_all()</code> to directly fetch data into an
+    OracleDataFrame that internally exposes a PyCapsule interface. For large
+    result sets you can tune the arraysize parameter, or use an iterator from
+    the <code>fetch_df_batches()</code> method.</p>
 
     <p>To use the new dataframe in Pandas, edit <code>query_pandas.py</code>
     and add this code at the bottom:</p>
 
     <pre>
-# Get a Pandas DataFrame from the data
-df = pyarrow.table(odf).to_pandas()
-
-# Perform various operations on the Pandas DataFrame
+df = pyarrow.Table.from_arrays(
+    odf.column_arrays(), names=odf.column_names()
+).to_pandas()
 
 print("\nSum:")
 print(df.sum())
@@ -3079,9 +3061,8 @@ <h2><a name="dataframes">16. DataFrames</a></h2>
 print(df.median())
 </pre>
 
-    <p>This uses PyArrow functionality to convert the python-oracledb DataFrame
-    to a Pandas DataFrame. Pandas sum and median operations are then
-    performed.</p>
+    <p>This uses PyArrow functionality to convert the OracleDataFrame to a
+    Pandas dataframe.</p>
 
     <p>Run the script in a terminal window:</p>
 
@@ -3090,154 +3071,9 @@ <h2><a name="dataframes">16. DataFrames</a></h2>
     <p>The output is the expected calculations on the employee salary data.</p>
 
   </li>
-
-  <li><h4>16.2 Inserting DataFrames</h4>
-
-    <p>Python-oracledb DataFrame instances, and instances of DataFrames from
-    third-party libraries that support the Apache Arrow PyCapsule Interface
-    can be inserted into Oracle Database by passing them directly to
-    <code>executemany()</code>.</p>
-
-    <p>Edit <code>query_pandas.py</code> and add this code at the bottom:</p>
-
-    <pre>
-# Double everyone's salary and insert the Pandas DataFrame into Oracle Database
-
-df = df * 2
-
-cur = con.cursor()
-cur.executemany("insert into pdtab (sal) values (:1)", df)
-
-# Check the inserted data
-
-print("\nNew Salaries")
-cur.execute("select * from pdtab")
-res = cur.fetchall()
-print(res)
-</pre>
-
-    <p>Run the script in a terminal window:</p>
-
-    <pre><strong>python query_pandas.py</strong></pre>
-
-    <p>This increases everyone's salary in the Pandas DataFrame and then
-    inserts the DataFrame into Oracle Database. The new salaries are queried
-    back to confirm the insertion was successful.</p>
-
-    <p>You can also insert DataFrames using Oracle Database Direct Path Loads,
-    as shown in a later section.</p> </li>
-
 </ul>
 
-<h2><a name="directpath">17. Direct Path Loads</a></h2>
-
-<p>Oracle Database Direct Path Loads allow data being inserted to bypass code
-layers such as the database buffer cache. Also there are no INSERT statements
-used. This can be very efficient for ingestion of huge amounts of
-data. <em>Documentation link for further reading: <a
-href="https://python-oracledb.readthedocs.io/en/latest/user_guide/batch_statement.html#direct-path-loads">Direct
-Path Loads</a></em> </p>
-
-<ul>
-  <li><h4> 17.1 Using Direct Path Loads</h4>
-
-    <p>The python-oracledb method <code>connection.direct_path_load()</code>
-    accepts the schema name, table name, column names, and the data to be
-    loaded.</p>
-
-    <p>Review the code contained in <code>direct_path.py</code>:</p>
-
-    <pre>import oracledb
-import db_config
-
-con = oracledb.connect(user=db_config.user, password=db_config.pw, dsn=db_config.dsn)
-
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testdpl';
-    exception when others then
-        if sqlcode &lt;&gt; -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testdpl (
-        id   number(9),
-        name varchar2(100)
-    )
-    """
-)
-
-DATA = [
-    (1, "Adelaide"),
-    (2, "Brisbane"),
-    (3, "Canberra"),
-]
-
-con.direct_path_load(
-    schema_name=db_config.user,
-    table_name="testdpl",
-    column_names=["id", "name"],
-    data=DATA,
-)
-
-# Check the data was inserted
-sql = "select * from testdpl"
-for r in cur.execute(sql):
-    print(r)
-</pre>
-
-    <p>Run the script in a terminal window:</p>
-
-    <pre><strong>python direct_path.py</strong></pre>
-
-    <p>This inserts the data into the new table and queries it back to
-    confirm.</p>
-
-    <p>For small numbers of rows, the elapsed time to insert data may not be
-    better than using <code>executemany()</code>. For larger numbers of rows
-    there can be time benefits and also reduced load on the database.</p>
-
-  </li>
-
-  <li><h4>17.2 Inserting DataFrames with Direct Path Loads</h4>
-
-    <p>DataFrames from third-party libraries that support the Apache Arrow
-    PyCapsule Interface can be inserted into Oracle Database by passing them
-    directly to <code>direct_path_load()</code>.</p>
-
-    <p>For this example, the <em>pandas</em> package need to be installed:</p>
-
-    <pre>python -m pip install pandas --upgrade</pre>
-
-    <p>Edit <code>direct_path.py</code> and import the Pandas package at the top:</p>
-
-    <pre>import pandas</pre>
-
-    <p>Change the data creation to use a Pandas DataFrame instead of the list
-    of tuples:</p>
-
-    <pre>d = {"A": [202, 412, 487], "B": ["Anna", "Bidisha", "Charlie"]}
-DATA = pandas.DataFrame(data=d)
-</pre>
-
-    <p>Run the script in a terminal window:</p>
-
-    <pre><strong>python direct_path.py</strong></pre>
-
-    <p>This displays the inserted values from the DataFrame.</p>
-
-  </li>
-</ul>
-
-<h2><a name="asyncio">18. Concurrent Programming with asyncio</a></h2>
+<h2><a name="asyncio">17. Concurrent Programming with asyncio</a></h2>
 
 <p>The Asynchronous I/O (asyncio) Python library can be used in python-oracledb
 Thin mode for concurrent programming. This library allows you to run operations
@@ -3253,7 +3089,7 @@ <h2><a name="asyncio">18. Concurrent Programming with asyncio</a></h2>
 Programming with asyncio</a></em>.</p>
 
 <ul>
-  <li><h4> 18.1 Using asyncio</h4>
+  <li><h4> 17.1 Using asyncio</h4>
 
     <p>Review the code contained in <code>async_gather.py</code>:</p>
 
@@ -3317,7 +3153,7 @@ <h2><a name="asyncio">18. Concurrent Programming with asyncio</a></h2>
     <p>When all the awaitables executed by <code>gather()</code> have
     completed, the pool is closed.</p>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre><strong>python async_gather.py</strong></pre>
 
@@ -3331,7 +3167,7 @@ <h2><a name="asyncio">18. Concurrent Programming with asyncio</a></h2>
 </li>
 </ul>
 
-<h2> <a name="pipelining">19. Pipelining multiple operations</a></h2>
+<h2> <a name="pipelining">18. Pipelining multiple operations</a></h2>
 
 <p>Pipelining allows python-oracledb Thin mode applications to send multiple,
 independent statements to Oracle Database with one call. The database is kept
@@ -3344,13 +3180,13 @@ <h2> <a name="pipelining">19. Pipelining multiple operations</a></h2>
 </p>
 
 <p>Pipelining requires the use of asyncio.  True pipelining only occurs when
-you are connected to Oracle Database version 23.  <em>Documentation link for
-further reading: <a
+you are connected to Oracle Database 23ai.  <em>Documentation link for further
+reading: <a
 href="https://python-oracledb.readthedocs.io/en/latest/user_guide/asyncio.html#pipelining-database-operations">Pipelining
 Database Operations</a></em>.</p>
 
 <ul>
-  <li><h4> 19.1 Using Pipelining</h4>
+  <li><h4> 18.1 Using Pipelining</h4>
 
     <p>Review the code contained in <code>pipelining.py</code>:</p>
 
@@ -3394,7 +3230,7 @@ <h2> <a name="pipelining">19. Pipelining multiple operations</a></h2>
 </pre>
 
     <p>Connection is established using <code>oracledb.connect_async()</code>.
-    Asynchronous methods are awaited.</p>
+    Asynchronous methods are awated.</p>
 
     <p>The script creates a pipeline with <code>create_pipeline()</code> and
     adds two database operations.  The use of <code>asyncio.gather()</code>
@@ -3409,7 +3245,7 @@ <h2> <a name="pipelining">19. Pipelining multiple operations</a></h2>
     <p>When all the awaitables executed by <code>gather()</code> have
     completed, the results are displayed.</p>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
     <pre><strong>python pipeline.py</strong></pre>
 
@@ -3419,7 +3255,7 @@ <h2> <a name="pipelining">19. Pipelining multiple operations</a></h2>
 </li>
 </ul>
 
-<h2> <a name="thick">20. Python-oracledb Thick mode</a></h2>
+<h2> <a name="thick">19. Python-oracledb Thick mode</a></h2>
 
 <p>All the above examples were run in python-oracledb's default Thin mode that
 connects directly to Oracle Database. Most could also have been run in Thick
@@ -3429,7 +3265,7 @@ <h2> <a name="thick">20. Python-oracledb Thick mode</a></h2>
 connectivity to Oracle Database.  There are some additional features these
 libraries provide which are therefore only available in python-oracledb Thick
 mode. The next example shows one of these. Other Oracle Database features that
-require python-oracledb Thick mode include Application Continuity, and
+require python-oracledb Thick mode include Application Continurity, and
 Continuous Query Notification. <em>Documentation link for further reading: <a
 href="https://python-oracledb.readthedocs.io/en/latest/user_guide/initialization.html#enabling-python-oracledb-thick-mode"
 >Enabling python-oracledb Thick mode</a></em>.</p>
@@ -3439,7 +3275,7 @@ <h2> <a name="thick">20. Python-oracledb Thick mode</a></h2>
 
 <ul>
 <li>
-<h4> 20.1 Review the Oracle Client library path</h4>
+<h4> 19.1 Review the Oracle Client library path</h4>
 
 <p>You additionally need to make Oracle Client libraries available.  Follow the
 documentation on <a
@@ -3513,14 +3349,14 @@ <h4> 20.1 Review the Oracle Client library path</h4>
 </li>
 
 <li>
-  <h4 id="thickconfig">20.2 Review the configuration files for thick mode</h4>
+  <h4 id="thickconfig">19.2 Review the configuration files for thick mode</h4>
 
   <p>Review <code>db_config_thick.py</code> (thick mode), and
   <code>sql/db_config.sql</code> files in the <code>tutorial</code> directory.
   These are included in other Python and SQL files for setting up the database
   connection.</p>
 
-  <p>Edit <code>db_config_thick.py</code> and change the default values to
+  <p>Edit <code>db_config_thick.py</code> file and change the default values to
   match the connection information for your environment.  Alternatively, you
   can set the given environment variables in your terminal window. For example,
   the default username is "<em>pythondemo</em>" unless the environment variable
@@ -3565,7 +3401,7 @@ <h4 id="thickconfig">20.2 Review the configuration files for thick mode</h4>
 <p>The following section is specific to the python-oracledb Thick mode in this
 release of python-oracledb.</p>
 
-<h2><a name="soda">21. Simple Oracle Document Access (SODA)</a></h2>
+<h2><a name="soda">20. Simple Oracle Document Access (SODA)</a></h2>
 
 <p>Simple Oracle Document Access (SODA) is a set of NoSQL-style APIs.
   Documents can be inserted, queried, and retrieved from Oracle Database.  By
@@ -3578,7 +3414,7 @@ <h2><a name="soda">21. Simple Oracle Document Access (SODA)</a></h2>
 <ul>
 
   <li>
-    <h4>21.1 Inserting JSON Documents</h4>
+    <h4>20.1 Inserting JSON Documents</h4>
 
     <p>Review <code>soda.py</code> :</p>
 
@@ -3640,7 +3476,7 @@ <h4>21.1 Inserting JSON Documents</h4>
     <p><code>content</code> is a dictionary.  You can also get a JSON string by
     calling <code>doc.getContentAsString()</code>.</p>
 
-    <p>Run the script in a terminal window:</p>
+    <p>Run the script:</p>
 
 <pre><strong>python soda.py</strong></pre>
 
@@ -3649,7 +3485,7 @@ <h4>21.1 Inserting JSON Documents</h4>
     </li>
 
     <li>
-      <h4>21.2 Searching SODA Documents</h4>
+      <h4>20.2 Searching SODA Documents</h4>
 
       <p>Extend <code>soda.py</code> to insert some more documents and perform
       a find filter operation:</p>
@@ -3949,7 +3785,7 @@ <h4>Modules</h4>
 These can be installed from PyPI, for example from <a
 href="https://pypi.org/project/oracledb/" >pypi.org/project/oracledb/</a> (as
 shown in the tutorial <a href="#setup" >setup</a> instructions). In some
-environments you may prefer to install using a package repository such as <a
+enviroments you may prefer to install using a package repository such as <a
 href="https://yum.oracle.com/oracle-linux-python.html" >yum.oracle.com</a> for
 Oracle Linux.</p>
 
diff --git a/samples/tutorial/aq.py b/samples/tutorial/aq.py
deleted file mode 100644
index fb5814b4..00000000
--- a/samples/tutorial/aq.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# -----------------------------------------------------------------------------
-# aq.py (Section 14.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import decimal
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "BOOKS"
-QUEUE_TABLE_NAME = "BOOK_QUEUE_TABLE"
-
-# Cleanup
-cur.execute(
-    f"""
-    begin
-        dbms_aqadm.stop_queue('{QUEUE_NAME}');
-        dbms_aqadm.drop_queue('{QUEUE_NAME}');
-        dbms_aqadm.drop_queue_table('{QUEUE_TABLE_NAME}');
-
-        execute immediate 'drop type {BOOK_TYPE_NAME}';
-        exception when others then
-            if sqlcode <> -24010 then
-                raise;
-            end if;
-    end;
-    """
-)
-
-# Create a type
-print("Creating books type UDT_BOOK...")
-cur.execute(
-    f"""
-    create type {BOOK_TYPE_NAME} as object (
-        title varchar2(100),
-        authors varchar2(100),
-        price number(5,2)
-    );
-    """
-)
-
-
-# Create queue table and queue and start the queue
-print("Creating queue table...")
-cur.callproc(
-    "dbms_aqadm.create_queue_table", (QUEUE_TABLE_NAME, BOOK_TYPE_NAME)
-)
-cur.callproc("dbms_aqadm.create_queue", (QUEUE_NAME, QUEUE_TABLE_NAME))
-cur.callproc("dbms_aqadm.start_queue", (QUEUE_NAME,))
-
-books_type = con.gettype(BOOK_TYPE_NAME)
-queue = con.queue(QUEUE_NAME, books_type)
-
-# Enqueue a few messages
-print("Enqueuing messages...")
-
-BOOK_DATA = [
-    (
-        "The Fellowship of the Ring",
-        "Tolkien, J.R.R.",
-        decimal.Decimal("10.99"),
-    ),
-    (
-        "Harry Potter and the Philosopher's Stone",
-        "Rowling, J.K.",
-        decimal.Decimal("7.99"),
-    ),
-]
-
-for title, authors, price in BOOK_DATA:
-    book = books_type.newobject()
-    book.TITLE = title
-    book.AUTHORS = authors
-    book.PRICE = price
-    print(title)
-    queue.enqone(con.msgproperties(payload=book))
-    con.commit()
-
-# Dequeue the messages
-print("\nDequeuing messages...")
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.TITLE)
-    con.commit()
-
-print("\nDone.")
diff --git a/samples/tutorial/async_gather.py b/samples/tutorial/async_gather.py
deleted file mode 100644
index 4f7ed64e..00000000
--- a/samples/tutorial/async_gather.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -----------------------------------------------------------------------------
-# async_gather.py (Section 18.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import oracledb
-import db_config
-
-# Number of coroutines to run
-CONCURRENCY = 5
-
-# Maximum connection pool size
-POOLSIZE = 5
-
-# Query the unique session identifier/serial number combination of a connection
-SQL = """select unique current_timestamp as ct, sid||'-'||serial# as sidser
-         from v$session_connect_info
-         where sid = sys_context('userenv', 'sid')"""
-
-
-# Show the unique session identifier/serial number of each connection that the
-# pool opens
-async def init_session(connection, requested_tag):
-    res = await connection.fetchone(SQL)
-    print(res[0].strftime("%H:%M:%S.%f"), "- init_session SID-SERIAL#", res[1])
-
-
-# The coroutine simply shows the session identifier/serial number of the
-# connection returned by the pool.acquire() call
-async def query(pool):
-    async with pool.acquire() as connection:
-        await connection.callproc("dbms_session.sleep", [1])
-        res = await connection.fetchone(SQL)
-        print(res[0].strftime("%H:%M:%S.%f"), "- query SID-SERIAL#", res[1])
-
-
-async def main():
-
-    pool = oracledb.create_pool_async(
-        user=db_config.user,
-        password=db_config.pw,
-        dsn=db_config.dsn,
-        min=1,
-        max=POOLSIZE,
-        session_callback=init_session,
-    )
-
-    coroutines = [query(pool) for i in range(CONCURRENCY)]
-
-    await asyncio.gather(*coroutines)
-
-    await pool.close()
-
-
-asyncio.run(main())
diff --git a/samples/tutorial/bind_insert.py b/samples/tutorial/bind_insert.py
deleted file mode 100644
index a7a91bbe..00000000
--- a/samples/tutorial/bind_insert.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -----------------------------------------------------------------------------
-# bind_insert.py (Section 4.2 and 4.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-rows = [
-    (1, "First"),
-    (2, "Second"),
-    (3, "Third"),
-    (4, "Fourth"),
-    (5, "Fifth"),
-    (6, "Sixth"),
-    (7, "Seventh"),
-]
-
-cur.executemany("insert into mytab(id, data) values (:1, :2)", rows)
-
-# Now query the results back
-
-cur2 = con.cursor()
-cur2.execute("select * from mytab")
-res = cur2.fetchall()
-print(res)
diff --git a/samples/tutorial/bind_query.py b/samples/tutorial/bind_query.py
deleted file mode 100644
index 490ea172..00000000
--- a/samples/tutorial/bind_query.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -----------------------------------------------------------------------------
-# bind_query.py (Section 4.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-sql = "select * from dept where deptno = :id order by deptno"
-
-cur.execute(sql, id=20)
-res = cur.fetchall()
-print(res)
-
-cur.execute(sql, id=10)
-res = cur.fetchall()
-print(res)
diff --git a/samples/tutorial/bind_sdo.py b/samples/tutorial/bind_sdo.py
deleted file mode 100644
index 5c088e70..00000000
--- a/samples/tutorial/bind_sdo.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -----------------------------------------------------------------------------
-# bind_sdo.py (Section 12.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testgeometry';
-    exception when others then
-        if sqlcode <> -942 then
-          raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testgeometry (
-        id number(9) not null,
-        geometry MDSYS.SDO_GEOMETRY not null
-    )
-    """
-)
-
-# Create and populate Oracle objects
-type_obj = con.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = con.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = con.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-obj = type_obj.newobject()
-obj.SDO_GTYPE = 2003
-obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-obj.SDO_ELEM_INFO.extend([1, 1003, 3])
-obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-obj.SDO_ORDINATES.extend([1, 1, 5, 7])
-print("Created object", obj)
-
-# Add a new row
-print("Adding row to table...")
-cur.execute("insert into testgeometry values (1, :obj)", obj=obj)
-print("Row added!")
-
-# (Change below here)
-
-# Query the row
-print("Querying row just inserted...")
-cur.execute("select id, geometry from testgeometry")
-for row in cur:
-    print(row)
diff --git a/samples/tutorial/clob.py b/samples/tutorial/clob.py
deleted file mode 100644
index 4011abc0..00000000
--- a/samples/tutorial/clob.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -----------------------------------------------------------------------------
-# clob.py (Section 7.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-print("Inserting data...")
-cur.execute("truncate table testclobs")
-long_string = ""
-for i in range(5):
-    char = chr(ord("A") + i)
-    long_string += char * 250
-    cur.execute(
-        "insert into testclobs values (:1, :2)",
-        (i + 1, "String data " + long_string + " End of string"),
-    )
-con.commit()
-
-print("Querying data...")
-cur.execute("select * from testclobs where id = :id", {"id": 1})
-(id, clob) = cur.fetchone()
-print("CLOB length:", clob.size())
-clobdata = clob.read()
-print("CLOB data:", clobdata)
diff --git a/samples/tutorial/clob_string.py b/samples/tutorial/clob_string.py
deleted file mode 100644
index 7181c987..00000000
--- a/samples/tutorial/clob_string.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -----------------------------------------------------------------------------
-# clob_string.py (Section 7.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-oracledb.defaults.fetch_lobs = False
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-print("Inserting data...")
-cur.execute("truncate table testclobs")
-long_string = ""
-for i in range(5):
-    char = chr(ord("A") + i)
-    long_string += char * 250
-    cur.execute(
-        "insert into testclobs values (:1, :2)",
-        (i + 1, "String data " + long_string + " End of string"),
-    )
-con.commit()
-
-print("Querying data...")
-cur.execute("select * from testclobs where id = :id", {"id": 1})
-(id, clobdata) = cur.fetchone()
-print("CLOB length:", len(clobdata))
-print("CLOB data:", clobdata)
diff --git a/samples/tutorial/connect.py b/samples/tutorial/connect.py
deleted file mode 100644
index 17e49432..00000000
--- a/samples/tutorial/connect.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect.py (Section 1.1 and 1.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-print("Database version:", con.version)
diff --git a/samples/tutorial/connect_drcp.py b/samples/tutorial/connect_drcp.py
deleted file mode 100644
index 92dd2797..00000000
--- a/samples/tutorial/connect_drcp.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_drcp.py (Section 2.3 and 2.5)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user,
-    password=db_config.pw,
-    dsn=db_config.dsn + ":pooled",
-    cclass="PYTHONDEMO",
-    purity=oracledb.PURITY_SELF,
-)
-
-print("Database version:", con.version)
diff --git a/samples/tutorial/connect_health.py b/samples/tutorial/connect_health.py
deleted file mode 100644
index 27852296..00000000
--- a/samples/tutorial/connect_health.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_health.py (Section 1.7)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-if con.is_healthy():
-    print("Healthy connection!")
-else:
-    print(
-        "Unusable connection. Please check the database and network settings."
-    )
diff --git a/samples/tutorial/connect_params2.py b/samples/tutorial/connect_params2.py
deleted file mode 100644
index 1a366561..00000000
--- a/samples/tutorial/connect_params2.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_params2.py (Section 1.6)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-params = oracledb.ConnectParams(
-    host="localhost", port=1521, service_name="freepdb1"
-)
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, params=params
-)
-print("Database version:", con.version)
diff --git a/samples/tutorial/connect_pool.py b/samples/tutorial/connect_pool.py
deleted file mode 100644
index d9fbcda3..00000000
--- a/samples/tutorial/connect_pool.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_pool.py (Section 2.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import threading
-import db_config
-
-pool = oracledb.create_pool(
-    user=db_config.user,
-    password=db_config.pw,
-    dsn=db_config.dsn,
-    min=2,
-    max=5,
-    increment=1,
-    getmode=oracledb.POOL_GETMODE_WAIT,
-)
-
-
-def Query():
-    con = pool.acquire()
-    cur = con.cursor()
-    for i in range(4):
-        cur.execute("select myseq.nextval from dual")
-        (seqval,) = cur.fetchone()
-        print(
-            "Thread",
-            threading.current_thread().name,
-            "fetched sequence =",
-            seqval,
-        )
-
-
-thread1 = threading.Thread(name="#1", target=Query)
-thread1.start()
-
-thread2 = threading.Thread(name="#2", target=Query)
-thread2.start()
-
-thread1.join()
-thread2.join()
-
-print("All done!")
diff --git a/samples/tutorial/connect_pool2.py b/samples/tutorial/connect_pool2.py
deleted file mode 100644
index 04135a24..00000000
--- a/samples/tutorial/connect_pool2.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_pool2.py (Section 2.2 and 2.4)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import threading
-import db_config
-
-pool = oracledb.create_pool(
-    user=db_config.user,
-    password=db_config.pw,
-    dsn=db_config.dsn,
-    min=2,
-    max=5,
-    increment=1,
-    getmode=oracledb.POOL_GETMODE_WAIT,
-)
-
-
-def Query():
-    con = pool.acquire()
-    cur = con.cursor()
-    for i in range(4):
-        cur.execute("select myseq.nextval from dual")
-        (seqval,) = cur.fetchone()
-        print(
-            "Thread",
-            threading.current_thread().name,
-            "fetched sequence =",
-            seqval,
-        )
-
-
-number_of_threads = 2
-thread_array = []
-
-for i in range(number_of_threads):
-    thread = threading.Thread(name="#" + str(i), target=Query)
-    thread_array.append(thread)
-    thread.start()
-
-for t in thread_array:
-    t.join()
-
-print("All done!")
diff --git a/samples/tutorial/create_user.py b/samples/tutorial/create_user.py
deleted file mode 100644
index 32918c45..00000000
--- a/samples/tutorial/create_user.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -----------------------------------------------------------------------------
-# create_user.py (Setup Section)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config_sys
-import run_sql_script
-import getpass
-import os
-
-# default values
-PYTHON_USER = "pythondemo"
-PYTHON_CONNECT_STRING = "localhost/freepdb1"
-PYTHON_DRCP_CONNECT_STRING = "localhost/freepdb1:pooled"
-
-# dictionary containing all parameters; these are acquired as needed by the
-# methods below (which should be used instead of consulting this dictionary
-# directly) and then stored so that a value is not requested more than once
-PARAMETERS = {}
-
-
-def get_value(name, label, default_value=""):
-    value = PARAMETERS.get(name)
-    if value is not None:
-        return value
-    value = os.environ.get(name)
-    if value is None:
-        if default_value:
-            label += " [%s]" % default_value
-        label += ": "
-        if default_value:
-            value = input(label).strip()
-        else:
-            value = getpass.getpass(label)
-        if not value:
-            value = default_value
-    PARAMETERS[name] = value
-    return value
-
-
-def get_main_user():
-    return get_value("user", "Enter the User to be created", PYTHON_USER)
-
-
-def get_main_password():
-    return get_value("pw", "Enter the Password for %s" % get_main_user())
-
-
-# Connect using the System User ID and password
-con = oracledb.connect(
-    user=db_config_sys.sysuser,
-    password=db_config_sys.syspw,
-    dsn=db_config_sys.dsn,
-)
-
-# create sample user and schema
-print("Creating user...")
-run_sql_script.run_sql_script(
-    con, "create_user", user=get_main_user(), pw=get_main_password()
-)
-print("Done.")
diff --git a/samples/tutorial/db_config.py b/samples/tutorial/db_config.py
deleted file mode 100644
index c807a5d8..00000000
--- a/samples/tutorial/db_config.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-import getpass
-
-#
-# Tutorial credentials and connection string.
-# Environment variable values are used, if they are defined.
-#
-
-user = os.environ.get("PYTHON_USER", "pythondemo")
-
-dsn = os.environ.get("PYTHON_CONNECT_STRING", "localhost/freepdb1")
-
-pw = os.environ.get("PYTHON_PASSWORD")
-if pw is None:
-    pw = getpass.getpass("Enter password for %s: " % user)
diff --git a/samples/tutorial/db_config_sys.py b/samples/tutorial/db_config_sys.py
deleted file mode 100644
index 255965b9..00000000
--- a/samples/tutorial/db_config_sys.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-import getpass
-
-#
-# Tutorial credentials and connection string for the SYSTEM (ADMIN) user.
-# Environment variable values are used, if they are defined.
-#
-
-sysuser = os.environ.get("PYTHON_SYSUSER", "SYSTEM")
-
-dsn = os.environ.get("PYTHON_CONNECT_STRING", "localhost/freepdb1")
-
-syspw = os.environ.get("PYTHON_SYSPASSWORD")
-if syspw is None:
-    syspw = getpass.getpass("Enter password for %s: " % sysuser)
diff --git a/samples/tutorial/db_config_thick.py b/samples/tutorial/db_config_thick.py
deleted file mode 100644
index a7bbdc28..00000000
--- a/samples/tutorial/db_config_thick.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import platform
-import os
-import getpass
-
-######################################################################
-
-#
-# Oracle Client library configuration
-#
-
-# On Linux this must be None.
-# Instead, the Oracle environment must be set before Python starts.
-instant_client_dir = None
-
-# On Windows, if your database is on the same machine, comment these lines out
-# and let instant_client_dir be None.  Otherwise, set this to your Instant
-# Client directory.  Note the use of the raw string r"..."  so backslashes can
-# be used as directory separators.
-if platform.system() == "Windows":
-    instant_client_dir = r"C:\Oracle\instantclient_23_7"
-
-# On macOS set the directory to your Instant Client directory
-if platform.system() == "Darwin":
-    instant_client_dir = (
-        os.environ.get("HOME") + "/Downloads/instantclient_23_3"
-    )
-
-# You must always call init_oracle_client() to use thick mode in any platform
-oracledb.init_oracle_client(lib_dir=instant_client_dir)
-
-######################################################################
-
-#
-# Tutorial credentials and connection string.
-# Environment variable values are used, if they are defined.
-#
-
-user = os.environ.get("PYTHON_USER", "pythondemo")
-
-dsn = os.environ.get("PYTHON_CONNECT_STRING", "localhost/freepdb1")
-
-pw = os.environ.get("PYTHON_PASSWORD")
-if pw is None:
-    pw = getpass.getpass("Enter password for %s: " % user)
diff --git a/samples/tutorial/defaults.py b/samples/tutorial/defaults.py
deleted file mode 100644
index f5e08f93..00000000
--- a/samples/tutorial/defaults.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -----------------------------------------------------------------------------
-# defaults.py (Overview Section)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-
-print("Default array size:", oracledb.defaults.arraysize)
diff --git a/samples/tutorial/direct_path.py b/samples/tutorial/direct_path.py
deleted file mode 100644
index e9ad3185..00000000
--- a/samples/tutorial/direct_path.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -----------------------------------------------------------------------------
-# direct_path.py (Section 17.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testdpl';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testdpl (
-        id   number(9),
-        name varchar2(100)
-    )
-    """
-)
-
-DATA = [
-    (1, "Adelaide"),
-    (2, "Brisbane"),
-    (3, "Canberra"),
-]
-
-con.direct_path_load(
-    schema_name=db_config.user,
-    table_name="testdpl",
-    column_names=["id", "name"],
-    data=DATA,
-)
-
-# Check the data was inserted
-cur.execute("select * from testdpl")
-rows = cur.fetchall()
-for row in rows:
-    print(row)
diff --git a/samples/tutorial/drcp_query.py b/samples/tutorial/drcp_query.py
deleted file mode 100644
index 637b807f..00000000
--- a/samples/tutorial/drcp_query.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -----------------------------------------------------------------------------
-# drcp_query.py (Section 2.4 and 2.5)
-# Query DRCP pool statistics
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import getpass
-import os
-
-# default values
-PYTHON_SYS_USER = "SYSTEM"
-PYTHON_DRCP_CONNECT_STRING = "localhost/free"
-
-# dictionary containing all parameters; these are acquired as needed by the
-# methods below (which should be used instead of consulting this dictionary
-# directly) and then stored so that a value is not requested more than once
-PARAMETERS = {}
-
-
-def get_value(name, label, default_value=""):
-    value = PARAMETERS.get(name)
-    if value is not None:
-        return value
-    value = os.environ.get(name)
-    if value is None:
-        if default_value:
-            label += " [%s]" % default_value
-        label += ": "
-        if default_value:
-            value = input(label).strip()
-        else:
-            value = getpass.getpass(label)
-        if not value:
-            value = default_value
-    PARAMETERS[name] = value
-    return value
-
-
-def get_main_user():
-    return get_value(
-        "user",
-        "Enter the privileged user with access to DRCP views",
-        PYTHON_SYS_USER,
-    )
-
-
-def get_main_password():
-    return get_value("pw", "Enter the Password for %s" % get_main_user())
-
-
-def get_drcp_connect_string():
-    connect_string = get_value(
-        "DRCP_CONNECT_STRING",
-        "Enter the connect string to access the DRCP views",
-        PYTHON_DRCP_CONNECT_STRING,
-    )
-    return connect_string
-
-
-drcp_user = get_main_user()
-drcp_password = get_main_password()
-drcp_connect_string = get_drcp_connect_string()
-
-con = oracledb.connect(
-    user=drcp_user, password=drcp_password, dsn=drcp_connect_string
-)
-cur = con.cursor()
-# looking at the pool stats of the DRCP Connection
-print("\nLooking at DRCP Pool statistics...\n")
-cur.execute(
-    "select cclass_name, num_requests, num_hits, num_misses "
-    "from v$cpool_cc_stats"
-)
-res = cur.fetchall()
-
-print("(CCLASS_NAME, NUM_REQUESTS, NUM_HITS, NUM_MISSES)")
-print("-------------------------------------------------")
-for row in res:
-    print(row)
-print("Done.")
diff --git a/samples/tutorial/drop_user.py b/samples/tutorial/drop_user.py
deleted file mode 100644
index a91e478a..00000000
--- a/samples/tutorial/drop_user.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -----------------------------------------------------------------------------
-# drop_user.py (Setup Section)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config_sys
-import db_config
-import run_sql_script
-
-# Connect using the System User ID and password
-con = oracledb.connect(
-    user=db_config_sys.sysuser,
-    password=db_config_sys.syspw,
-    dsn=db_config_sys.dsn,
-)
-
-# drop the tutorial user and schema
-print("Dropping the tutorial user...")
-run_sql_script.run_sql_script(con, "drop_user", user=db_config.user)
-print("Done.")
diff --git a/samples/tutorial/json_insert.py b/samples/tutorial/json_insert.py
deleted file mode 100644
index ce6f436b..00000000
--- a/samples/tutorial/json_insert.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -----------------------------------------------------------------------------
-# json_insert.py (Section 8.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Insert JSON data
-data = dict(name="Rod", dept="Sales", location="Germany")
-inssql = "insert into jtab (id, json_data) values (:1, :2)"
-cur.setinputsizes(None, oracledb.DB_TYPE_JSON)
-cur.execute(inssql, [101, data])
diff --git a/samples/tutorial/pipelining.py b/samples/tutorial/pipelining.py
deleted file mode 100644
index 4b5ef68c..00000000
--- a/samples/tutorial/pipelining.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -----------------------------------------------------------------------------
-# pipelining.py (Section 19.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import oracledb
-import db_config
-
-
-async def get_weather():
-    return "Hot and sunny"
-
-
-async def get_location():
-    return "Melbourne"
-
-
-async def main():
-    con = await oracledb.connect_async(
-        user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-    )
-
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_fetchone(
-        "select ename, job from emp where empno = :en", [7839]
-    )
-    pipeline.add_fetchall("select dname from dept order by deptno")
-
-    # Run the pipeline and non-database operations concurrently.
-    # Note although the database receives all the operations at the same time,
-    # it will execute each operation sequentially. The local Python work
-    # executes during the time the database is processing the queries.
-    return_values = await asyncio.gather(
-        get_weather(), get_location(), con.run_pipeline(pipeline)
-    )
-
-    for r in return_values:
-        if isinstance(r, list):  # the pipeline return list
-            for result in r:
-                if result.rows:
-                    for row in result.rows:
-                        print(*row, sep="\t")
-        else:
-            print(r)  # a local operation result
-
-    await con.close()
-
-
-asyncio.run(main())
diff --git a/samples/tutorial/plsql_func.py b/samples/tutorial/plsql_func.py
deleted file mode 100644
index f8d949e3..00000000
--- a/samples/tutorial/plsql_func.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -----------------------------------------------------------------------------
-# plsql_func.py (Section 5.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-res = cur.callfunc("myfunc", int, ("abc", 2))
-print(res)
diff --git a/samples/tutorial/plsql_proc.py b/samples/tutorial/plsql_proc.py
deleted file mode 100644
index 066c670a..00000000
--- a/samples/tutorial/plsql_proc.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -----------------------------------------------------------------------------
-# plsql_proc.py (Section 5.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-myvar = cur.var(int)
-cur.callproc("myproc", (123, myvar))
-print(myvar.getvalue())
diff --git a/samples/tutorial/query.py b/samples/tutorial/query.py
deleted file mode 100644
index 310bc0dc..00000000
--- a/samples/tutorial/query.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -----------------------------------------------------------------------------
-# query.py (Section 1.3 and 1.4)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
diff --git a/samples/tutorial/query2.py b/samples/tutorial/query2.py
deleted file mode 100644
index 5447a030..00000000
--- a/samples/tutorial/query2.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# query2.py (Section 3.1)
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-cur.execute("select * from dept order by deptno")
-for deptno, dname, loc in cur:
-    print("Department number: ", deptno)
-    print("Department name: ", dname)
-    print("Department location:", loc)
diff --git a/samples/tutorial/query_arraysize.py b/samples/tutorial/query_arraysize.py
deleted file mode 100644
index 0e8b7c10..00000000
--- a/samples/tutorial/query_arraysize.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_arraysize.py (Section 3.5)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import time
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-start = time.time()
-
-cur = con.cursor()
-cur.prefetchrows = 100
-cur.arraysize = 100
-cur.execute("select * from bigtab")
-res = cur.fetchall()
-# print(res)  # uncomment to display the query results
-
-elapsed = time.time() - start
-print(elapsed, "seconds")
diff --git a/samples/tutorial/query_many.py b/samples/tutorial/query_many.py
deleted file mode 100644
index 0d95dc4c..00000000
--- a/samples/tutorial/query_many.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_many.py (Section 3.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-cur.execute("select * from dept order by deptno")
-num_rows = 3
-res = cur.fetchmany(num_rows)
-print(res)
diff --git a/samples/tutorial/query_one.py b/samples/tutorial/query_one.py
deleted file mode 100644
index b7405aae..00000000
--- a/samples/tutorial/query_one.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_one.py (Section 3.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-cur.execute("select * from dept order by deptno")
-row = cur.fetchone()
-print(row)
-
-row = cur.fetchone()
-print(row)
diff --git a/samples/tutorial/query_pandas.py b/samples/tutorial/query_pandas.py
deleted file mode 100644
index 7c991b7d..00000000
--- a/samples/tutorial/query_pandas.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_pandas.py (Section 16.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import pandas
-import pyarrow
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = con.fetch_df_all(
-    statement="select sal from emp order by empno", arraysize=100
-)
diff --git a/samples/tutorial/query_scroll.py b/samples/tutorial/query_scroll.py
deleted file mode 100644
index 5cf4539c..00000000
--- a/samples/tutorial/query_scroll.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_scroll.py (Section 15.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor(scrollable=True)
-
-cur.execute("select * from dept order by deptno")
-
-cur.scroll(2, mode="absolute")  # go to second row
-print(cur.fetchone())
-
-cur.scroll(-1)  # go back one row
-print(cur.fetchone())
diff --git a/samples/tutorial/rowfactory.py b/samples/tutorial/rowfactory.py
deleted file mode 100644
index 830be093..00000000
--- a/samples/tutorial/rowfactory.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -----------------------------------------------------------------------------
-# rowfactory.py (Section 10.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import collections
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-cur.execute("select deptno, dname from dept")
-res = cur.fetchall()
-
-print("Array indexes:")
-for row in res:
-    print(row[0], "->", row[1])
-
-print("Loop target variables:")
-for c1, c2 in res:
-    print(c1, "->", c2)
diff --git a/samples/tutorial/run_sql_script.py b/samples/tutorial/run_sql_script.py
deleted file mode 100644
index 4f4846bc..00000000
--- a/samples/tutorial/run_sql_script.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -----------------------------------------------------------------------------
-# run_sql_script.py
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-import sys
-
-
-def run_sql_script(conn, script_name, **kwargs):
-    statement_parts = []
-    cursor = conn.cursor()
-    replace_values = [("&" + k + ".", v) for k, v in kwargs.items()] + [
-        ("&" + k, v) for k, v in kwargs.items()
-    ]
-    script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    file_name = os.path.join(script_dir, "sql", script_name + ".sql")
-    print("SQL File Name: ", file_name)
-    for line in open(file_name):
-        if line.strip() == "/":
-            statement = "".join(statement_parts).strip()
-            if statement:
-                for search_value, replace_value in replace_values:
-                    statement = statement.replace(search_value, replace_value)
-                try:
-                    cursor.execute(statement)
-                except:
-                    print("Failed to execute SQL:", statement)
-                    raise
-            statement_parts = []
-        else:
-            statement_parts.append(line)
-    cursor.execute(
-        """
-        select name, type, line, position, text
-        from dba_errors
-        where owner = upper(:owner)
-        order by name, type, line, position
-        """,
-        owner=kwargs["user"],
-    )
-    prev_name = prev_obj_type = None
-    for name, obj_type, line_num, position, text in cursor:
-        if name != prev_name or obj_type != prev_obj_type:
-            print("%s (%s)" % (name, obj_type))
-            prev_name = name
-            prev_obj_type = obj_type
-        print("    %s/%s %s" % (line_num, position, text))
diff --git a/samples/tutorial/setup_tutorial.py b/samples/tutorial/setup_tutorial.py
deleted file mode 100644
index e3ee7986..00000000
--- a/samples/tutorial/setup_tutorial.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -----------------------------------------------------------------------------
-# setup_tutorial.py (Setup Section)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-import run_sql_script
-
-# Connect using the tutorial username and password
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-# create sample schemas and definitions for the tutorial
-print("Setting up the sample tables and other DB objects for the tutorial...")
-run_sql_script.run_sql_script(
-    con, "setup_tutorial", user=db_config.user, pw=db_config.pw
-)
-print("Done.")
diff --git a/samples/tutorial/soda.py b/samples/tutorial/soda.py
deleted file mode 100644
index 518506ad..00000000
--- a/samples/tutorial/soda.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -----------------------------------------------------------------------------
-# soda.py (Section 21.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config_thick as db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-soda = con.getSodaDatabase()
-
-# Explicit metadata is used for maximum version portability
-metadata = {
-    "keyColumn": {"name": "ID"},
-    "contentColumn": {"name": "JSON_DOCUMENT", "sqlType": "BLOB"},
-    "versionColumn": {"name": "VERSION", "method": "UUID"},
-    "lastModifiedColumn": {"name": "LAST_MODIFIED"},
-    "creationTimeColumn": {"name": "CREATED_ON"},
-}
-
-collection = soda.createCollection("friends", metadata)
-
-content = {"name": "Jared", "age": 35, "address": {"city": "Melbourne"}}
-
-doc = collection.insertOneAndGet(content)
-key = doc.key
-
-doc = collection.find().key(key).getOne()
-content = doc.getContent()
-print("Retrieved SODA document dictionary is:")
-print(content)
diff --git a/samples/tutorial/solutions/aq-dequeue.py b/samples/tutorial/solutions/aq-dequeue.py
deleted file mode 100644
index f4a1c84c..00000000
--- a/samples/tutorial/solutions/aq-dequeue.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -----------------------------------------------------------------------------
-# aq-dequeue.py (Section 14.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "BOOKS"
-QUEUE_TABLE_NAME = "BOOK_QUEUE_TABLE"
-
-# Dequeue the messages
-books_type = con.gettype(BOOK_TYPE_NAME)
-queue = con.queue(QUEUE_NAME, books_type)
-queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-
-print("\nDequeuing messages...")
-while True:
-    props = queue.deqone()
-    if not props:
-        break
-    print(props.payload.TITLE)
-
-print("\nDone.")
diff --git a/samples/tutorial/solutions/aq-enqueue.py b/samples/tutorial/solutions/aq-enqueue.py
deleted file mode 100644
index 05b26ce0..00000000
--- a/samples/tutorial/solutions/aq-enqueue.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -----------------------------------------------------------------------------
-# aq-enqueue.py (Section 14.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import decimal
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "BOOKS"
-QUEUE_TABLE_NAME = "BOOK_QUEUE_TABLE"
-
-# Enqueue a few messages
-print("Enqueuing messages...")
-
-BOOK_DATA = [
-    (
-        "The Fellowship of the Ring",
-        "Tolkien, J.R.R.",
-        decimal.Decimal("10.99"),
-    ),
-    (
-        "Harry Potter and the Philosopher's Stone",
-        "Rowling, J.K.",
-        decimal.Decimal("7.99"),
-    ),
-]
-
-books_type = con.gettype(BOOK_TYPE_NAME)
-queue = con.queue(QUEUE_NAME, books_type)
-
-for title, authors, price in BOOK_DATA:
-    book = books_type.newobject()
-    book.TITLE = title
-    book.AUTHORS = authors
-    book.PRICE = price
-    print(title)
-    queue.enqone(con.msgproperties(payload=book, expiration=4))
-    con.commit()
diff --git a/samples/tutorial/solutions/aq-queuestart.py b/samples/tutorial/solutions/aq-queuestart.py
deleted file mode 100644
index 4706d8b3..00000000
--- a/samples/tutorial/solutions/aq-queuestart.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -----------------------------------------------------------------------------
-# aq-queuestart.py (Section 14.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-QUEUE_NAME = "BOOKS"
-QUEUE_TABLE_NAME = "BOOK_QUEUE_TABLE"
-
-# Cleanup
-cur.execute(
-    f"""
-    begin
-        dbms_aqadm.stop_queue('{QUEUE_NAME}');
-        dbms_aqadm.drop_queue('{QUEUE_NAME}');
-        dbms_aqadm.drop_queue_table('{QUEUE_TABLE_NAME}');
-
-        execute immediate 'drop type {BOOK_TYPE_NAME}';
-    exception when others then
-        if sqlcode <> -24010 then
-            raise;
-        end if;
-    end;
-    """
-)
-
-# Create a type
-print("Creating books type UDT_BOOK...")
-cur.execute(
-    f"""
-    create type {BOOK_TYPE_NAME} as object (
-        title varchar2(100),
-        authors varchar2(100),
-        price number(5,2)
-    );
-    """
-)
-
-# Create queue table and queue and start the queue
-print("Creating queue table...")
-cur.callproc(
-    "dbms_aqadm.create_queue_table", (QUEUE_TABLE_NAME, BOOK_TYPE_NAME)
-)
-cur.callproc("dbms_aqadm.create_queue", (QUEUE_NAME, QUEUE_TABLE_NAME))
-cur.callproc("dbms_aqadm.start_queue", (QUEUE_NAME,))
diff --git a/samples/tutorial/solutions/bind_insert.py b/samples/tutorial/solutions/bind_insert.py
deleted file mode 100644
index 6563343e..00000000
--- a/samples/tutorial/solutions/bind_insert.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -----------------------------------------------------------------------------
-# bind_insert.py (Section 4.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-rows = [
-    (1, "First"),
-    (2, "Second"),
-    (3, "Third"),
-    (4, "Fourth"),
-    (5, "Fifth"),
-    (6, "Sixth"),
-    (6, "Duplicate"),
-    (7, "Seventh"),
-]
-
-cur.executemany(
-    "insert into mytab(id, data) values (:1, :2)", rows, batcherrors=True
-)
-
-for error in cur.getbatcherrors():
-    print("Error", error.message.rstrip(), "at row offset", error.offset)
-
-# Now query the results back
-
-cur2 = con.cursor()
-cur2.execute("select * from mytab")
-res = cur2.fetchall()
-print(res)
diff --git a/samples/tutorial/solutions/bind_sdo.py b/samples/tutorial/solutions/bind_sdo.py
deleted file mode 100644
index 8269cdc7..00000000
--- a/samples/tutorial/solutions/bind_sdo.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -----------------------------------------------------------------------------
-# bind_sdo.py (Section 12.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testgeometry';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testgeometry (
-        id number(9) not null,
-        geometry MDSYS.SDO_GEOMETRY not null
-    )
-    """
-)
-
-# Create and populate Oracle objects
-type_obj = con.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = con.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = con.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-obj = type_obj.newobject()
-obj.SDO_GTYPE = 2003
-obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-obj.SDO_ELEM_INFO.extend([1, 1003, 3])
-obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-obj.SDO_ORDINATES.extend([1, 1, 5, 7])
-
-point_type_obj = con.gettype("MDSYS.SDO_POINT_TYPE")
-obj.SDO_POINT = point_type_obj.newobject()
-obj.SDO_POINT.X = 1
-obj.SDO_POINT.Y = 2
-obj.SDO_POINT.Z = 3
-
-print("Created object", obj)
-
-# Add a new row
-print("Adding row to table...")
-cur.execute("insert into testgeometry values (1, :objbv)", objbv=obj)
-print("Row added!")
-
-# (Change below here)
-
-# Define a function to dump the contents of an Oracle object
-
-
-def dumpobject(obj, prefix="  "):
-    if obj.type.iscollection:
-        print(prefix, "[")
-        for value in obj.aslist():
-            if isinstance(value, oracledb.Object):
-                dumpobject(value, prefix + "  ")
-            else:
-                print(prefix + "  ", repr(value))
-        print(prefix, "]")
-    else:
-        print(prefix, "{")
-        for attr in obj.type.attributes:
-            value = getattr(obj, attr.name)
-            if isinstance(value, oracledb.Object):
-                print(prefix + "  " + attr.name + " :")
-                dumpobject(value, prefix + "    ")
-            else:
-                print(prefix + "  " + attr.name + " :", repr(value))
-        print(prefix, "}")
-
-
-# Query the row
-print("Querying row just inserted...")
-cur.execute("select id, geometry from testgeometry")
-for id, obj in cur:
-    print("Id: ", id)
-    dumpobject(obj)
diff --git a/samples/tutorial/solutions/connect_pool2.py b/samples/tutorial/solutions/connect_pool2.py
deleted file mode 100644
index 073c8daa..00000000
--- a/samples/tutorial/solutions/connect_pool2.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -----------------------------------------------------------------------------
-# connect_pool2.py (Section 2.5)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import threading
-import time  # noqa: F401
-import db_config
-
-pool = oracledb.create_pool(
-    user=db_config.user,
-    password=db_config.pw,
-    dsn=db_config.dsn + ":pooled",
-    min=2,
-    max=5,
-    increment=1,
-    getmode=oracledb.POOL_GETMODE_NOWAIT,
-    cclass="PYTHONDEMO",
-    purity=oracledb.PURITY_SELF,
-)  # try PURITY_NEW
-
-
-def Query():
-    con = pool.acquire()
-    cur = con.cursor()
-    for i in range(4):
-        cur.execute("select myseq.nextval from dual")
-        (seqval,) = cur.fetchone()
-        print(
-            "Thread",
-            threading.current_thread().name,
-            "fetched sequence =",
-            seqval,
-        )
-        # time.sleep(1)
-
-
-number_of_threads = 5
-thread_array = []
-
-for i in range(number_of_threads):
-    thread = threading.Thread(name="#" + str(i), target=Query)
-    thread_array.append(thread)
-    # time.sleep(4)
-    thread.start()
-
-for t in thread_array:
-    t.join()
-
-print("All done!")
diff --git a/samples/tutorial/solutions/db_config.py b/samples/tutorial/solutions/db_config.py
deleted file mode 100644
index 9e5c62fc..00000000
--- a/samples/tutorial/solutions/db_config.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-
-dir_name = os.path.dirname(os.path.dirname(__file__))
-exec(open(os.path.join(dir_name, "db_config.py"), "r").read())
diff --git a/samples/tutorial/solutions/db_config_thick.py b/samples/tutorial/solutions/db_config_thick.py
deleted file mode 100644
index ef273515..00000000
--- a/samples/tutorial/solutions/db_config_thick.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-
-dir_name = os.path.dirname(os.path.dirname(__file__))
-exec(open(os.path.join(dir_name, "db_config_thick.py"), "r").read())
diff --git a/samples/tutorial/solutions/direct_path.py b/samples/tutorial/solutions/direct_path.py
deleted file mode 100644
index 4e25635c..00000000
--- a/samples/tutorial/solutions/direct_path.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -----------------------------------------------------------------------------
-# direct_path.py (Section 17.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import pandas
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testdpl';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testdpl (
-        id   number(9),
-        name varchar2(100)
-    )
-    """
-)
-
-d = {"A": [202, 412, 487], "B": ["Anna", "Bidisha", "Charlie"]}
-DATA = pandas.DataFrame(data=d)
-
-con.direct_path_load(
-    schema_name=db_config.user,
-    table_name="testdpl",
-    column_names=["id", "name"],
-    data=DATA,
-)
-
-# Check the data was inserted
-cur.execute("select * from testdpl")
-rows = cur.fetchall()
-for row in rows:
-    print(row)
diff --git a/samples/tutorial/solutions/json_insert.py b/samples/tutorial/solutions/json_insert.py
deleted file mode 100644
index fcd08c31..00000000
--- a/samples/tutorial/solutions/json_insert.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -----------------------------------------------------------------------------
-# json_insert.py (Section 8.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Insert JSON data
-data = dict(name="Rod", dept="Sales", location="Germany")
-inssql = "insert into jtab (id, json_data) values (:1, :2)"
-cur.setinputsizes(None, oracledb.DB_TYPE_JSON)
-cur.execute(inssql, [101, data])
-
-# Select JSON data
-sql = "select c.json_data from jtab c"
-for (j,) in cur.execute(sql):
-    print(j)
-
-# Dot-notation to extract a value from a JSON column
-sql = """select c.json_data.location
-         from jtab c
-         offset 0 rows fetch next 1 rows only"""
-for (j,) in cur.execute(sql):
-    print(j)
diff --git a/samples/tutorial/solutions/query-2.py b/samples/tutorial/solutions/query-2.py
deleted file mode 100644
index 0c4e1bb6..00000000
--- a/samples/tutorial/solutions/query-2.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -----------------------------------------------------------------------------
-# query.py (Section 1.4)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-cur.execute("select * from dept order by deptno")
-res = cur.fetchall()
-for row in res:
-    print(row)
-
-cur.close()
-con.close()
diff --git a/samples/tutorial/solutions/query.py b/samples/tutorial/solutions/query.py
deleted file mode 100644
index e412dbb5..00000000
--- a/samples/tutorial/solutions/query.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -----------------------------------------------------------------------------
-# query.py (Section 1.3 and 1.4)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-cur.execute("select * from dept order by deptno")
-res = cur.fetchall()
-for row in res:
-    print(row)
diff --git a/samples/tutorial/solutions/query_many.py b/samples/tutorial/solutions/query_many.py
deleted file mode 100644
index 8d638dd2..00000000
--- a/samples/tutorial/solutions/query_many.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_many.py (Section 3.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-cur.execute("select * from dept order by deptno")
-num_rows = 3
-res = cur.fetchmany(num_rows)
-print(res)
-
-print(res[0])  # first row
-print(res[0][1])  # second element of first row
diff --git a/samples/tutorial/solutions/query_pandas.py b/samples/tutorial/solutions/query_pandas.py
deleted file mode 100644
index ee7a2b81..00000000
--- a/samples/tutorial/solutions/query_pandas.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_pandas.py (Section 16.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import pandas
-import pyarrow
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-# Get a python-oracledb DataFrame
-# Adjust arraysize to tune the query fetch performance
-odf = con.fetch_df_all(
-    statement="select sal from emp order by empno", arraysize=100
-)
-
-# Get a Pandas DataFrame from the data
-df = pyarrow.table(odf).to_pandas()
-
-# Perform various operations on the Pandas DataFrame
-
-print("\nSum:")
-print(df.sum())
-
-print("\nMedian:")
-print(df.median())
-
-# Double everyone's salary and insert the Pandas DataFrame into Oracle Database
-
-df = df * 2
-
-cur = con.cursor()
-cur.executemany("insert into pdtab (sal) values (:1)", df)
-
-# Check the inserted data
-
-print("\nNew Salaries")
-cur.execute("select * from pdtab")
-res = cur.fetchall()
-print(res)
diff --git a/samples/tutorial/solutions/query_scroll.py b/samples/tutorial/solutions/query_scroll.py
deleted file mode 100644
index 3cfb94a5..00000000
--- a/samples/tutorial/solutions/query_scroll.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -----------------------------------------------------------------------------
-# query_scroll.py (Section 15.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor(scrollable=True)
-
-cur.execute("select * from dept order by deptno")
-
-cur.scroll(2, mode="absolute")  # go to second row
-print(cur.fetchone())
-
-cur.scroll(-1)  # go back one row
-print(cur.fetchone())
-
-cur.scroll(1)  # go to next row
-print(cur.fetchone())
-
-cur.scroll(mode="first")  # go to first row
-print(cur.fetchone())
diff --git a/samples/tutorial/solutions/rowfactory.py b/samples/tutorial/solutions/rowfactory.py
deleted file mode 100644
index 5220d609..00000000
--- a/samples/tutorial/solutions/rowfactory.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -----------------------------------------------------------------------------
-# rowfactory.py (Section 10.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import collections
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-
-cur.execute("select deptno, dname from dept")
-res = cur.fetchall()
-
-print("Array indexes:")
-for row in res:
-    print(row[0], "->", row[1])
-
-print("Loop target variables:")
-for c1, c2 in res:
-    print(c1, "->", c2)
-
-print("Rowfactory:")
-cur.execute("select deptno, dname from dept")
-cur.rowfactory = collections.namedtuple("MyClass", ["DeptNumber", "DeptName"])
-
-res = cur.fetchall()
-for row in res:
-    print(row.DeptNumber, "->", row.DeptName)
diff --git a/samples/tutorial/solutions/soda.py b/samples/tutorial/solutions/soda.py
deleted file mode 100644
index 8bc2ef13..00000000
--- a/samples/tutorial/solutions/soda.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -----------------------------------------------------------------------------
-# soda.py (Section 21.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config_thick as db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-soda = con.getSodaDatabase()
-
-# Explicit metadata is used for maximum version portability
-metadata = {
-    "keyColumn": {"name": "ID"},
-    "contentColumn": {"name": "JSON_DOCUMENT", "sqlType": "BLOB"},
-    "versionColumn": {"name": "VERSION", "method": "UUID"},
-    "lastModifiedColumn": {"name": "LAST_MODIFIED"},
-    "creationTimeColumn": {"name": "CREATED_ON"},
-}
-
-collection = soda.createCollection("friends", metadata)
-
-content = {"name": "Jared", "age": 35, "address": {"city": "Melbourne"}}
-
-doc = collection.insertOneAndGet(content)
-key = doc.key
-
-doc = collection.find().key(key).getOne()
-content = doc.getContent()
-print("Retrieved SODA document dictionary is:")
-print(content)
-
-my_docs = [
-    {"name": "Gerald", "age": 21, "address": {"city": "London"}},
-    {"name": "David", "age": 28, "address": {"city": "Melbourne"}},
-    {"name": "Shawn", "age": 20, "address": {"city": "San Francisco"}},
-]
-collection.insertMany(my_docs)
-
-filter_spec = {"address.city": "Melbourne"}
-my_documents = collection.find().filter(filter_spec).getDocuments()
-
-print("Melbourne people:")
-for doc in my_documents:
-    print(doc.getContent()["name"])
-
-filter_spec = {"age": {"$lt": 25}}
-my_documents = collection.find().filter(filter_spec).getDocuments()
-
-print("Young people:")
-for doc in my_documents:
-    print(doc.getContent()["name"])
diff --git a/samples/tutorial/solutions/subclass.py b/samples/tutorial/solutions/subclass.py
deleted file mode 100644
index dfbc626b..00000000
--- a/samples/tutorial/solutions/subclass.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -----------------------------------------------------------------------------
-# subclass.py (Section 11.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-
-class MyConnection(oracledb.Connection):
-    def __init__(self):
-        print("Connecting to database")
-        return super(MyConnection, self).__init__(
-            user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-        )
-
-    def cursor(self):
-        return MyCursor(self)
-
-
-class MyCursor(oracledb.Cursor):
-    def execute(self, statement, args):
-        print("Executing:", statement)
-        print("Arguments:")
-        for argIndex, arg in enumerate(args):
-            print("  Bind", argIndex + 1, "has value", repr(arg))
-            return super(MyCursor, self).execute(statement, args)
-
-    def fetchone(self):
-        print("Fetchone()")
-        return super(MyCursor, self).fetchone()
-
-
-con = MyConnection()
-cur = con.cursor()
-
-cur.execute("select count(*) from emp where deptno = :bv", (10,))
-(count,) = cur.fetchone()
-print("Number of rows:", count)
diff --git a/samples/tutorial/solutions/type_converter.py b/samples/tutorial/solutions/type_converter.py
deleted file mode 100644
index 641cc2c0..00000000
--- a/samples/tutorial/solutions/type_converter.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_converter.py (Section 6.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import decimal
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-
-def ReturnNumbersAsDecimal(cursor, name, defaultType, size, precision, scale):
-    if defaultType == oracledb.NUMBER:
-        return cursor.var(
-            str, 9, cursor.arraysize, outconverter=decimal.Decimal
-        )
-
-
-cur.outputtypehandler = ReturnNumbersAsDecimal
-
-for (value,) in cur.execute("select 0.1 from dual"):
-    print("Value:", value, "* 3 =", value * 3)
diff --git a/samples/tutorial/solutions/type_output.py b/samples/tutorial/solutions/type_output.py
deleted file mode 100644
index 44cf1a9e..00000000
--- a/samples/tutorial/solutions/type_output.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_output.py (Section 6.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-cur = con.cursor()
-
-print("Standard output...")
-for row in cur.execute("select * from dept"):
-    print(row)
-
-
-def ReturnNumbersAsStrings(cursor, name, defaultType, size, precision, scale):
-    if defaultType == oracledb.NUMBER:
-        return cursor.var(str, 9, cursor.arraysize)
-
-
-print("Output type handler output...")
-cur = con.cursor()
-cur.outputtypehandler = ReturnNumbersAsStrings
-for row in cur.execute("select * from dept"):
-    print(row)
diff --git a/samples/tutorial/solutions/vector.py b/samples/tutorial/solutions/vector.py
deleted file mode 100644
index a9ac1d29..00000000
--- a/samples/tutorial/solutions/vector.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -----------------------------------------------------------------------------
-# vector.py (Section 9.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import array
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-vector_data_64 = array.array("d", [11.25, 11.75, 11.5])
-
-cur.execute(
-    "insert into vtab (id, v64) values (:1, :2)",
-    [101, vector_data_64],
-)
-
-# Query
-cur.execute("select v64 from vtab")
-
-# Each non-sparse vector is represented as an array.array type.
-# Sparse vectors are represented as oracledb.SparseVector() instances
-for (v,) in cur:
-    print(v)
-    print(type(v))
diff --git a/samples/tutorial/solutions/vector_numpy.py b/samples/tutorial/solutions/vector_numpy.py
deleted file mode 100644
index 633755ad..00000000
--- a/samples/tutorial/solutions/vector_numpy.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -----------------------------------------------------------------------------
-# vector_numpy.py (Section 9.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import array
-import numpy
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-
-# Convert from NumPy ndarray type to array type when inserting vectors
-def numpy_converter_in(value):
-    if value.dtype == numpy.float64:
-        dtype = "d"
-    elif value.dtype == numpy.float32:
-        dtype = "f"
-    elif value.dtype == numpy.uint8:
-        dtype = "B"
-    else:
-        dtype = "b"
-    return array.array(dtype, value)
-
-
-def input_type_handler(cur, value, arraysize):
-    if isinstance(value, numpy.ndarray):
-        return cur.var(
-            oracledb.DB_TYPE_VECTOR,
-            arraysize=arraysize,
-            inconverter=numpy_converter_in,
-        )
-
-
-con.inputtypehandler = input_type_handler
-
-
-# Convert from array types to NumPy ndarray types when fetching vectors
-def numpy_converter_out(value):
-    return numpy.array(value, copy=False, dtype=value.typecode)
-
-
-def output_type_handler(cur, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VECTOR:
-        return cur.var(
-            metadata.type_code,
-            arraysize=cur.arraysize,
-            outconverter=numpy_converter_out,
-        )
-
-
-con.outputtypehandler = output_type_handler
-
-# Insert
-vector_data_64 = numpy.array([11.25, 11.75, 11.5], dtype=numpy.float64)
-
-cur.execute(
-    "insert into vtab (id, v64) values (:1, :2)",
-    [202, vector_data_64],
-)
-
-# Each vector is represented as a numpy.ndarray type
-for (v,) in cur.execute("select v64 from vtab"):
-    print(v)
-    print(type(v))
diff --git a/samples/tutorial/solutions/versions.py b/samples/tutorial/solutions/versions.py
deleted file mode 100644
index 202f0967..00000000
--- a/samples/tutorial/solutions/versions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -----------------------------------------------------------------------------
-# versions.py (Section 1.5)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-print(oracledb.__version__)  # two underscores before and after version
-print("Database version:", con.version)
-# print("Client version:", oracledb.clientversion())
diff --git a/samples/tutorial/sql/create_user.sql b/samples/tutorial/sql/create_user.sql
deleted file mode 100644
index 6a6af344..00000000
--- a/samples/tutorial/sql/create_user.sql
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_user.sql (Setup Section)
- *   Creates a database user for the python-oracledb tutorial
- * For Oracle Autonomous Database, use 'admin' instead of system.
- * You will be prompted for the new username and the new password to use.
- *
- * When you no longer need this user, run drop_user.sql to drop the user
- *
- *---------------------------------------------------------------------------*/
-
-create user &user
-/
-
-grant
-    create session,
-    create table,
-    create procedure,
-    create type,
-    create sequence,
-    select any dictionary,
-    unlimited tablespace
-to &user
-/
-
-begin
-
-    for r in
-            ( select role
-              from dba_roles
-              where role in ('SODA_APP', 'AQ_ADMINISTRATOR_ROLE')
-            ) loop
-        execute immediate 'grant ' || r.role || ' to &user';
-    end loop;
-
-end;
-/
-
-alter user &user identified by "&pw"
-/
diff --git a/samples/tutorial/sql/db_config.sql b/samples/tutorial/sql/db_config.sql
deleted file mode 100644
index 27ce595a..00000000
--- a/samples/tutorial/sql/db_config.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
--- Default database username
-def user = "pythondemo"
-
--- Default database connection string
-def connect_string = "localhost/freepdb1"
-
--- Prompt for the password
-accept pw char prompt 'Enter database password for &user: ' hide
diff --git a/samples/tutorial/sql/drcp_query.sql b/samples/tutorial/sql/drcp_query.sql
deleted file mode 100644
index ec48a9d9..00000000
--- a/samples/tutorial/sql/drcp_query.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * drcp_query.sql (Section 2.4 and 2.5)
- *---------------------------------------------------------------------------*/
-
-set echo off verify off feedback off linesize 80 pagesize 1000
-
-accept pw char prompt 'Enter database password for SYSTEM: ' hide
-accept connect_string char prompt 'Enter database connection string: '
-
--- Connect to the CDB to see pool statistics
-connect system/&pw@&connect_string
-
-col cclass_name format a40
-
--- Some DRCP pool statistics
-select cclass_name, num_requests, num_hits, num_misses from v$cpool_cc_stats;
-
-exit
diff --git a/samples/tutorial/sql/drop_user.sql b/samples/tutorial/sql/drop_user.sql
deleted file mode 100644
index 705a68eb..00000000
--- a/samples/tutorial/sql/drop_user.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * drop_user.sql (Setup Section)
- *   Drops the database user used for the python-oracledb tutorial
- *
- * Substitute your actual password and connection string.
- * For Oracle Autonomous Database, use 'admin' instead of system.
- * You will be prompted for the user to drop.
- *---------------------------------------------------------------------------*/
-
-begin
-  dbms_aqadm.stop_queue('BOOKS');
-  dbms_aqadm.drop_queue('BOOKS');
-  dbms_aqadm.drop_queue_table('BOOK_QUEUE_TABLE');
-  exception when others then
-    if sqlcode <> -24010 then
-      raise;
-    end if;
-  end;
-/
-
-begin
-
-    for r in
-            ( select username
-              from dba_users
-              where username in (upper('&user'))
-            ) loop
-        execute immediate 'drop user ' || r.username || ' cascade';
-    end loop;
-end;
-/
diff --git a/samples/tutorial/sql/setup_tutorial.sql b/samples/tutorial/sql/setup_tutorial.sql
deleted file mode 100644
index 419ddd59..00000000
--- a/samples/tutorial/sql/setup_tutorial.sql
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * setup_tutorial.sql (Setup Section)
- *   Creates the tables, sequence etc. used by the python-oracledb tutorial.
- *---------------------------------------------------------------------------*/
-
-begin execute immediate 'drop table emp'; exception when others then if sqlcode <> -942 then raise; end if; end;
-/
-
-create table emp
-       (empno number(4) not null,
-        ename varchar2(10),
-        job varchar2(9),
-        mgr number(4),
-        hiredate date,
-        sal number(7, 2),
-        comm number(7, 2),
-        deptno number(2))
-/
-
-insert into emp values
-        (7369, 'SMITH',  'CLERK',     7902,
-        to_date('17-DEC-1980', 'DD-MON-YYYY'),  800, NULL, 20)
-/
-
-insert into emp values
-        (7499, 'ALLEN',  'SALESMAN',  7698,
-        to_date('20-FEB-1981', 'DD-MON-YYYY'), 1600,  300, 30)
-/
-
-insert into emp values
-        (7521, 'WARD',   'SALESMAN',  7698,
-        to_date('22-FEB-1981', 'DD-MON-YYYY'), 1250,  500, 30)
-/
-
-insert into emp values
-        (7566, 'JONES',  'MANAGER',   7839,
-        to_date('2-APR-1981', 'DD-MON-YYYY'),  2975, NULL, 20)
-/
-
-insert into emp values
-        (7654, 'MARTIN', 'SALESMAN',  7698,
-        to_date('28-SEP-1981', 'DD-MON-YYYY'), 1250, 1400, 30)
-/
-
-insert into emp values
-        (7698, 'BLAKE',  'MANAGER',   7839,
-        to_date('1-MAY-1981', 'DD-MON-YYYY'),  2850, NULL, 30)
-/
-
-insert into emp values
-        (7782, 'CLARK',  'MANAGER',   7839,
-        to_date('9-JUN-1981', 'DD-MON-YYYY'),  2450, NULL, 10)
-/
-
-insert into emp values
-        (7788, 'SCOTT',  'ANALYST',   7566,
-        to_date('09-DEC-1982', 'DD-MON-YYYY'), 3000, NULL, 20)
-/
-insert into emp values
-        (7839, 'KING',   'PRESIDENT', NULL,
-        to_date('17-NOV-1981', 'DD-MON-YYYY'), 5000, NULL, 10)
-/
-
-insert into emp values
-        (7844, 'TURNER', 'SALESMAN',  7698,
-        to_date('8-SEP-1981', 'DD-MON-YYYY'),  1500,    0, 30)
-/
-
-insert into emp values
-        (7876, 'ADAMS',  'CLERK',     7788,
-        to_date('12-JAN-1983', 'DD-MON-YYYY'), 1100, NULL, 20)
-/
-
-insert into emp values
-        (7900, 'JAMES',  'CLERK',     7698,
-        to_date('3-DEC-1981', 'DD-MON-YYYY'),   950, NULL, 30)
-/
-
-insert into emp values
-        (7902, 'FORD',   'ANALYST',   7566,
-        to_date('3-DEC-1981', 'DD-MON-YYYY'),  3000, NULL, 20)
-/
-
-insert into emp values
-        (7934, 'MILLER', 'CLERK',     7782,
-        to_date('23-JAN-1982', 'DD-MON-YYYY'), 1300, NULL, 10)
-/
-
-begin execute immediate 'drop table dept'; exception when others then if sqlcode <> -942 then raise; end if; end;
-/
-
-create table dept
-       (deptno number(2),
-        dname varchar2(14),
-        loc varchar2(13) )
-/
-
-insert into dept values (10, 'ACCOUNTING', 'NEW YORK')
-/
-
-insert into dept values (20, 'RESEARCH',   'DALLAS')
-/
-
-insert into dept values (30, 'SALES',      'CHICAGO')
-/
-
-insert into dept values (40, 'OPERATIONS', 'BOSTON')
-/
-
-commit
-/
-
--- Table for clob.py and clob_string.py
-
-begin execute immediate 'drop table testclobs'; exception when others then if sqlcode <> -942 then raise; end if; end;
-/
-
-create table testclobs (
-    id     number not null,
-    myclob clob not null
-)
-/
-
--- Sequence for connect_pool.py
-
-begin execute immediate 'drop sequence myseq'; exception when others then if sqlcode <> -2289 then raise; end if; end;
-/
-
-create sequence myseq
-/
-
--- Table for bind_insert.py
-begin
-  execute immediate 'drop table mytab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table mytab (id number, data varchar2(20), constraint my_pk primary key (id))
-/
-
---Table for query_arraysize.py
-begin
-  execute immediate 'drop table bigtab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table bigtab (mycol varchar2(20))
-/
-
-begin
-  for i in 1..20000
-  loop
-   insert into bigtab (mycol) values (dbms_random.string('A',20));
-  end loop;
-end;
-/
-
-commit
-/
-
--- Table for plsql_func.py
-begin
-  execute immediate 'drop table ptab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table ptab (mydata varchar(20), myid number)
-/
-
--- PL/SQL function for plsql_func.py
-create or replace function myfunc(d_p in varchar2, i_p in number) return number as
-  begin
-    insert into ptab (mydata, myid) values (d_p, i_p);
-    return (i_p * 2);
-  end;
-/
-
--- PL/SQL procedure for plsql_proc.py
-create or replace procedure myproc(v1_p in number, v2_p out number) as
-begin
-  v2_p := v1_p * 2;
-end;
-/
-
--- Table for query_pandas.py
-begin
-  execute immediate 'drop table pdtab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table pdtab (
-  sal number(7, 2))
-/
-
-
--- Table for json_insert.py (requires Oracle Database 21c or later)
-begin
-  execute immediate 'drop table jtab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table jtab (
-  id number(9) not null primary key,
-  json_data json)
-/
-
--- Table for vector.py and vector_numpy.py
--- (requires Oracle Database version 23 or later)
-begin
-  execute immediate 'drop table vtab';
-exception
-when others then
-  if sqlcode not in (-00942) then
-    raise;
-  end if;
-end;
-/
-
-create table vtab (
-  id number(9) not null primary key,
-  v64 vector(3, float64))
-/
diff --git a/samples/tutorial/subclass.py b/samples/tutorial/subclass.py
deleted file mode 100644
index 2c3bd17b..00000000
--- a/samples/tutorial/subclass.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -----------------------------------------------------------------------------
-# subclass.py (Section 11.1 and 11.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-
-class MyConnection(oracledb.Connection):
-    def __init__(self):
-        print("Connecting to database")
-        return super(MyConnection, self).__init__(
-            user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-        )
-
-
-con = MyConnection()
-cur = con.cursor()
-
-cur.execute("select count(*) from emp where deptno = :bv", (10,))
-(count,) = cur.fetchone()
-print("Number of rows:", count)
diff --git a/samples/tutorial/type_converter.py b/samples/tutorial/type_converter.py
deleted file mode 100644
index ecbc7816..00000000
--- a/samples/tutorial/type_converter.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_converter.py (Section 6.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-for (value,) in cur.execute("select 0.1 from dual"):
-    print("Value:", value, "* 3 =", value * 3)
diff --git a/samples/tutorial/type_input.py b/samples/tutorial/type_input.py
deleted file mode 100644
index fa1d95a9..00000000
--- a/samples/tutorial/type_input.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_input.py (Section 6.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-import json
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table BuildingTable';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table BuildingTable (
-        ID number(9) not null,
-        BuildingDetails varchar2(400),
-        constraint TestTempTable_pk primary key (ID)
-    )
-    """
-)
-
-# Create a Python class for a Building
-
-
-class Building(object):
-    def __init__(self, building_id, description, num_floors):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-
-    def __repr__(self):
-        return "<Building %s: %s>" % (self.building_id, self.description)
-
-    def __eq__(self, other):
-        if isinstance(other, Building):
-            return (
-                other.building_id == self.building_id
-                and other.description == self.description
-                and other.num_floors == self.num_floors
-            )
-        return NotImplemented
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-    @classmethod
-    def from_json(cls, value):
-        result = json.loads(value)
-        return cls(**result)
-
-
-# Convert a Python building object to a SQL JSON type that can be read as a
-# string
-
-
-def building_in_converter(value):
-    return value.to_json()
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            oracledb.DB_TYPE_VARCHAR,
-            arraysize=num_elements,
-            inconverter=building_in_converter,
-        )
-
-
-building = Building(1, "The First Building", 5)  # Python object
-cur.execute("truncate table BuildingTable")
-cur.inputtypehandler = input_type_handler
-cur.execute(
-    "insert into BuildingTable (ID, BuildingDetails) values (:1, :2)",
-    (building.building_id, building),
-)
-con.commit()
-
-# Query the row
-print("Querying the row just inserted...")
-cur.execute("select ID, BuildingDetails from BuildingTable")
-for int_col, string_col in cur:
-    print("Building ID:", int_col)
-    print("Building Details in JSON format:", string_col)
diff --git a/samples/tutorial/type_input_named_obj.py b/samples/tutorial/type_input_named_obj.py
deleted file mode 100644
index 5bdbd02c..00000000
--- a/samples/tutorial/type_input_named_obj.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_input_named_obj.py (Section 13.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testgeometry';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testgeometry (
-        id number(9) not null,
-        geometry MDSYS.SDO_GEOMETRY not null
-    )
-    """
-)
-
-
-# Create a Python class for an SDO
-class mySDO(object):
-    def __init__(self, gtype, elemInfo, ordinates):
-        self.gtype = gtype
-        self.elemInfo = elemInfo
-        self.ordinates = ordinates
-
-
-# Get Oracle type information
-obj_type = con.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = con.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = con.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-
-# Convert a Python object to MDSYS.SDO_GEOMETRY
-
-
-def SDOInConverter(value):
-    obj = obj_type.newobject()
-    obj.SDO_GTYPE = value.gtype
-    obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-    obj.SDO_ELEM_INFO.extend(value.elemInfo)
-    obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-    obj.SDO_ORDINATES.extend(value.ordinates)
-    return obj
-
-
-def SDOInputTypeHandler(cursor, value, numElements):
-    if isinstance(value, mySDO):
-        return cursor.var(
-            oracledb.OBJECT,
-            arraysize=numElements,
-            inconverter=SDOInConverter,
-            typename=obj_type.name,
-        )
-
-
-sdo = mySDO(2003, [1, 1003, 3], [1, 1, 5, 7])  # Python object
-cur.inputtypehandler = SDOInputTypeHandler
-cur.execute("insert into testgeometry values (:1, :2)", (1, sdo))
-
-
-# Define a function to dump the contents of an Oracle object
-def dumpobject(obj, prefix="  "):
-    if obj.type.iscollection:
-        print(prefix, "[")
-        for value in obj.aslist():
-            if isinstance(value, oracledb.Object):
-                dumpobject(value, prefix + "  ")
-            else:
-                print(prefix + "  ", repr(value))
-        print(prefix, "]")
-    else:
-        print(prefix, "{")
-        for attr in obj.type.attributes:
-            value = getattr(obj, attr.name)
-            if isinstance(value, oracledb.Object):
-                print(prefix + "  " + attr.name + " :")
-                dumpobject(value, prefix + "    ")
-            else:
-                print(prefix + "  " + attr.name + " :", repr(value))
-        print(prefix, "}")
-
-
-# Query the row
-print("Querying row just inserted...")
-cur.execute("select id, geometry from testgeometry")
-for id, obj in cur:
-    print("Id: ", id)
-    dumpobject(obj)
diff --git a/samples/tutorial/type_output.py b/samples/tutorial/type_output.py
deleted file mode 100644
index 1a1b521a..00000000
--- a/samples/tutorial/type_output.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_output.py (Section 6.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-print("Standard output...")
-for row in cur.execute("select * from dept"):
-    print(row)
diff --git a/samples/tutorial/type_output_named_obj.py b/samples/tutorial/type_output_named_obj.py
deleted file mode 100644
index 7815b2ad..00000000
--- a/samples/tutorial/type_output_named_obj.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -----------------------------------------------------------------------------
-# type_output_named_obj.py (Section 13.2)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-# Create table
-cur.execute(
-    """
-    begin
-        execute immediate 'drop table testgeometry';
-    exception when others then
-        if sqlcode <> -942 then
-            raise;
-        end if;
-    end;
-    """
-)
-cur.execute(
-    """
-    create table testgeometry (
-        id number(9) not null,
-        geometry MDSYS.SDO_GEOMETRY not null
-    )
-    """
-)
-
-# Create a Python class for an SDO
-
-
-class mySDO(object):
-    def __init__(self, gtype, elemInfo, ordinates):
-        self.gtype = gtype
-        self.elemInfo = elemInfo
-        self.ordinates = ordinates
-
-
-# Get Oracle type information
-obj_type = con.gettype("MDSYS.SDO_GEOMETRY")
-element_info_type_obj = con.gettype("MDSYS.SDO_ELEM_INFO_ARRAY")
-ordinate_type_obj = con.gettype("MDSYS.SDO_ORDINATE_ARRAY")
-
-# Convert a Python object to MDSYS.SDO_GEOMETRY
-
-
-def SDOInConverter(value):
-    obj = obj_type.newobject()
-    obj.SDO_GTYPE = value.gtype
-    obj.SDO_ELEM_INFO = element_info_type_obj.newobject()
-    obj.SDO_ELEM_INFO.extend(value.elemInfo)
-    obj.SDO_ORDINATES = ordinate_type_obj.newobject()
-    obj.SDO_ORDINATES.extend(value.ordinates)
-    return obj
-
-
-def SDOInputTypeHandler(cursor, value, numElements):
-    if isinstance(value, mySDO):
-        return cursor.var(
-            oracledb.OBJECT,
-            arraysize=numElements,
-            inconverter=SDOInConverter,
-            typename=obj_type.name,
-        )
-
-
-# Convert a  MDSYS.SDO_GEOMETRY DB Object to Python object
-
-
-def SDOOutConverter(DBobj):
-    return mySDO(
-        int(DBobj.SDO_GTYPE),
-        DBobj.SDO_ELEM_INFO.aslist(),
-        DBobj.SDO_ORDINATES.aslist(),
-    )
-
-
-def SDOOutputTypeHandler(cursor, name, default_type, size, precision, scale):
-    if default_type == oracledb.DB_TYPE_OBJECT:
-        return cursor.var(
-            obj_type, arraysize=cursor.arraysize, outconverter=SDOOutConverter
-        )
-
-
-sdo = mySDO(2003, [1, 1003, 3], [1, 1, 5, 7])  # Python object
-cur.inputtypehandler = SDOInputTypeHandler
-cur.execute("insert into testgeometry values (:1, :2)", (1, sdo))
-cur.outputtypehandler = SDOOutputTypeHandler
-
-# Query the SDO Table row
-print(
-    "Querying the Spatial Data Object(SDO) Table "
-    "using the Output Type Handler..."
-)
-print(
-    "----------------------------------------------------------------------------"
-)
-cur.execute("select id, geometry from testgeometry")
-for id, obj in cur:
-    print("SDO ID:", id)
-    print("SDO GYTPE:", obj.gtype)
-    print("SDO ELEMINFO:", obj.elemInfo)
-    print("SDO_ORDINATES:", obj.ordinates)
diff --git a/samples/tutorial/vector.py b/samples/tutorial/vector.py
deleted file mode 100644
index 157455b4..00000000
--- a/samples/tutorial/vector.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -----------------------------------------------------------------------------
-# vector.py (Section 9.1)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import array
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-vector_data_64 = array.array("d", [11.25, 11.75, 11.5])
-
-cur.execute(
-    "insert into vtab (id, v64) values (:1, :2)",
-    [101, vector_data_64],
-)
diff --git a/samples/tutorial/vector_numpy.py b/samples/tutorial/vector_numpy.py
deleted file mode 100644
index 4631739c..00000000
--- a/samples/tutorial/vector_numpy.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -----------------------------------------------------------------------------
-# vector_numpy.py (Section 9.3)
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import array
-import numpy
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-cur = con.cursor()
-
-vector_data_64 = numpy.array([11.25, 11.75, 11.5], dtype=numpy.float64)
-
-cur.execute(
-    "insert into vtab (id, v64) values (:1, :2)",
-    [202, vector_data_64],
-)
-
-for (v,) in cur.execute("select v64 from vtab"):
-    print(v)
-    print(type(v))
diff --git a/samples/tutorial/versions.py b/samples/tutorial/versions.py
deleted file mode 100644
index 45feeef4..00000000
--- a/samples/tutorial/versions.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# versions.py (Section 1.5)
-# -----------------------------------------------------------------------------
-
-import oracledb
-import db_config
-
-con = oracledb.connect(
-    user=db_config.user, password=db_config.pw, dsn=db_config.dsn
-)
-
-print(oracledb.__version__)  # two underscores before and after version
diff --git a/samples/type_handlers_json_strings.py b/samples/type_handlers_json_strings.py
deleted file mode 100644
index f4d7e25d..00000000
--- a/samples/type_handlers_json_strings.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# type_handlers_json_strings.py
-#
-# Demonstrates the use of input and output type handlers as well as variable
-# input and output converters. These methods can be used to extend
-# python-oracledb in many ways.
-#
-# This script differs from type_handlers_objects.py in that it shows the
-# binding and querying of JSON strings as Python objects for both
-# python-oracledb thin and thick mode.
-# -----------------------------------------------------------------------------
-
-import json
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-
-    def __repr__(self):
-        return "<Building %s: %s>" % (self.building_id, self.description)
-
-    def __eq__(self, other):
-        if isinstance(other, Building):
-            return (
-                other.building_id == self.building_id
-                and other.description == self.description
-                and other.num_floors == self.num_floors
-            )
-        return NotImplemented
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-    @classmethod
-    def from_json(cls, value):
-        result = json.loads(value)
-        return cls(**result)
-
-
-def building_in_converter(value):
-    return value.to_json()
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            oracledb.STRING,
-            arraysize=num_elements,
-            inconverter=building_in_converter,
-        )
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.STRING:
-        return cursor.var(
-            metadata.type_code,
-            arraysize=cursor.arraysize,
-            outconverter=Building.from_json,
-        )
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    buildings = [
-        Building(1, "The First Building", 5),
-        Building(2, "The Second Building", 87),
-        Building(3, "The Third Building", 12),
-    ]
-
-    # Insert building data (python object) as a JSON string
-    cursor.inputtypehandler = input_type_handler
-    for building in buildings:
-        cursor.execute(
-            "insert into BuildingsAsJsonStrings values (:1, :2)",
-            (building.building_id, building),
-        )
-
-    # fetch the building data as a JSON string
-    print("NO OUTPUT TYPE HANDLER:")
-    for row in cursor.execute(
-        "select * from BuildingsAsJsonStrings order by BuildingId"
-    ):
-        print(row)
-    print()
-
-with connection.cursor() as cursor:
-    # fetch the building data as python objects
-    cursor.outputtypehandler = output_type_handler
-    print("WITH OUTPUT TYPE HANDLER:")
-    for row in cursor.execute(
-        "select * from BuildingsAsJsonStrings order by BuildingId"
-    ):
-        print(row)
-    print()
diff --git a/samples/type_handlers_json_strings_async.py b/samples/type_handlers_json_strings_async.py
deleted file mode 100644
index 710342c3..00000000
--- a/samples/type_handlers_json_strings_async.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# type_handlers_json_strings_async.py
-#
-# An asynchronous version of type_handlers_json_strings.py
-#
-# Demonstrates the use of input and output type handlers as well as variable
-# input and output converters. These methods can be used to extend
-# python-oracledb in many ways.
-#
-# This script differs from type_handlers_objects.py in that it shows the
-# binding and querying of JSON strings as Python objects for both
-# python-oracledb thin and thick mode.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import json
-
-import oracledb
-import sample_env
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-
-    def __repr__(self):
-        return "<Building %s: %s>" % (self.building_id, self.description)
-
-    def __eq__(self, other):
-        if isinstance(other, Building):
-            return (
-                other.building_id == self.building_id
-                and other.description == self.description
-                and other.num_floors == self.num_floors
-            )
-        return NotImplemented
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-    @classmethod
-    def from_json(cls, value):
-        result = json.loads(value)
-        return cls(**result)
-
-
-def building_in_converter(value):
-    return value.to_json()
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            oracledb.STRING,
-            arraysize=num_elements,
-            inconverter=building_in_converter,
-        )
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.STRING:
-        return cursor.var(
-            metadata.type_code,
-            arraysize=cursor.arraysize,
-            outconverter=Building.from_json,
-        )
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        buildings = [
-            Building(1, "The First Building", 5),
-            Building(2, "The Second Building", 87),
-            Building(3, "The Third Building", 12),
-        ]
-
-        # Insert building data (python object) as a JSON string
-        cursor.inputtypehandler = input_type_handler
-        for building in buildings:
-            await cursor.execute(
-                "insert into BuildingsAsJsonStrings values (:1, :2)",
-                (building.building_id, building),
-            )
-
-        # fetch the building data as a JSON string
-        query = "select * from BuildingsAsJsonStrings order by BuildingId"
-        print("NO OUTPUT TYPE HANDLER:")
-        await cursor.execute(query)
-        async for row in cursor:
-            print(row)
-        print()
-
-    with connection.cursor() as cursor:
-        # fetch the building data as python objects
-        cursor.outputtypehandler = output_type_handler
-        print("WITH OUTPUT TYPE HANDLER:")
-        await cursor.execute(query)
-        async for row in cursor:
-            print(row)
-        print()
-
-
-asyncio.run(main())
diff --git a/samples/type_handlers_objects.py b/samples/type_handlers_objects.py
deleted file mode 100644
index a3321f62..00000000
--- a/samples/type_handlers_objects.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# type_handlers_objects.py
-#
-# Demonstrates the use of input and output type handlers as well as variable
-# input and output converters. These methods can be used to extend
-# python-oracledb in many ways. This script demonstrates the binding and
-# querying of SQL objects as Python objects.
-# -----------------------------------------------------------------------------
-
-import datetime
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-obj_type = connection.gettype("UDT_BUILDING")
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors, date_built):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-        self.date_built = date_built
-
-    def __repr__(self):
-        return "<Building %s: %s>" % (self.building_id, self.description)
-
-
-def building_in_converter(value):
-    obj = obj_type.newobject()
-    obj.BUILDINGID = value.building_id
-    obj.DESCRIPTION = value.description
-    obj.NUMFLOORS = value.num_floors
-    obj.DATEBUILT = value.date_built
-    return obj
-
-
-def building_out_converter(obj):
-    return Building(
-        int(obj.BUILDINGID), obj.DESCRIPTION, int(obj.NUMFLOORS), obj.DATEBUILT
-    )
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            obj_type, arraysize=num_elements, inconverter=building_in_converter
-        )
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_OBJECT:
-        return cursor.var(
-            metadata.type,
-            arraysize=cursor.arraysize,
-            outconverter=building_out_converter,
-        )
-
-
-buildings = [
-    Building(1, "The First Building", 5, datetime.date(2007, 5, 18)),
-    Building(2, "The Second Building", 87, datetime.date(2010, 2, 7)),
-    Building(3, "The Third Building", 12, datetime.date(2005, 6, 19)),
-]
-
-with connection.cursor() as cursor:
-    cursor.inputtypehandler = input_type_handler
-    for building in buildings:
-        cursor.execute(
-            "insert into BuildingsAsObjects values (:1, :2)",
-            (building.building_id, building),
-        )
-
-    print("NO OUTPUT TYPE HANDLER:")
-    for row in cursor.execute(
-        """
-        select *
-        from BuildingsAsObjects
-        order by BuildingId
-        """
-    ):
-        print(row)
-    print()
-
-with connection.cursor() as cursor:
-    cursor.outputtypehandler = output_type_handler
-    print("WITH OUTPUT TYPE HANDLER:")
-    for row in cursor.execute(
-        """
-        select *
-        from BuildingsAsObjects
-        order by BuildingId
-        """
-    ):
-        print(row)
-    print()
diff --git a/samples/type_handlers_objects_async.py b/samples/type_handlers_objects_async.py
deleted file mode 100644
index f406ace4..00000000
--- a/samples/type_handlers_objects_async.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# type_handlers_objects_async.py
-#
-# An asynchronous version of type_handlers_objects.py
-#
-# Demonstrates the use of input and output type handlers as well as variable
-# input and output converters. These methods can be used to extend
-# python-oracledb in many ways. This script demonstrates the binding and
-# querying of SQL objects as Python objects.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import datetime
-
-import oracledb
-import sample_env
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors, date_built):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-        self.date_built = date_built
-
-    def __repr__(self):
-        return "<Building %s: %s>" % (self.building_id, self.description)
-
-
-buildings = [
-    Building(1, "The First Building", 5, datetime.date(2007, 5, 18)),
-    Building(2, "The Second Building", 87, datetime.date(2010, 2, 7)),
-    Building(3, "The Third Building", 12, datetime.date(2005, 6, 19)),
-]
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    obj_type = await connection.gettype("UDT_BUILDING")
-
-    def building_in_converter(value):
-        obj = obj_type.newobject()
-        obj.BUILDINGID = value.building_id
-        obj.DESCRIPTION = value.description
-        obj.NUMFLOORS = value.num_floors
-        obj.DATEBUILT = value.date_built
-        return obj
-
-    def building_out_converter(obj):
-        return Building(
-            int(obj.BUILDINGID),
-            obj.DESCRIPTION,
-            int(obj.NUMFLOORS),
-            obj.DATEBUILT,
-        )
-
-    def input_type_handler(cursor, value, num_elements):
-        if isinstance(value, Building):
-            return cursor.var(
-                obj_type,
-                arraysize=num_elements,
-                inconverter=building_in_converter,
-            )
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_OBJECT:
-            return cursor.var(
-                metadata.type,
-                arraysize=cursor.arraysize,
-                outconverter=building_out_converter,
-            )
-
-    with connection.cursor() as cursor:
-        cursor.inputtypehandler = input_type_handler
-        for building in buildings:
-            await cursor.execute(
-                "insert into BuildingsAsObjects values (:1, :2)",
-                (building.building_id, building),
-            )
-
-        print("NO OUTPUT TYPE HANDLER:")
-        await cursor.execute(
-            """
-            select *
-            from BuildingsAsObjects
-            order by BuildingId
-            """
-        )
-        async for row in cursor:
-            print(row)
-        print()
-
-    with connection.cursor() as cursor:
-        cursor.outputtypehandler = output_type_handler
-        print("WITH OUTPUT TYPE HANDLER:")
-        await cursor.execute(
-            """
-            select *
-            from BuildingsAsObjects
-            order by BuildingId
-            """
-        )
-        async for row in cursor:
-            print(row)
-        print()
-
-
-asyncio.run(main())
diff --git a/samples/universal_rowids.py b/samples/universal_rowids.py
deleted file mode 100644
index 1f36dc04..00000000
--- a/samples/universal_rowids.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates.
-#
-# Portions Copyright 2007-2015, Anthony Tuininga. All rights reserved.
-#
-# Portions Copyright 2001-2007, Computronix (Canada) Ltd., Edmonton, Alberta,
-# Canada. All rights reserved.
-#
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# universal_rowids.py
-#
-# Demonstrates the use of universal rowids. Universal rowids are used to
-# identify rows in index organized tables.
-# -----------------------------------------------------------------------------
-
-import datetime
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-DATA = [
-    (1, "String #1", datetime.datetime(2017, 4, 4)),
-    (2, "String #2", datetime.datetime(2017, 4, 5)),
-    (3, "A" * 250, datetime.datetime(2017, 4, 6)),
-]
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    # truncate table so sample can be rerun
-    print("Truncating table...")
-    cursor.execute("truncate table TestUniversalRowids")
-
-    # populate table with a few rows
-    print("Populating table...")
-    for row in DATA:
-        print("Inserting", row)
-        cursor.execute(
-            "insert into TestUniversalRowids values (:1, :2, :3)", row
-        )
-    connection.commit()
-
-    # fetch the rowids from the table
-    cursor.execute("select rowid from TestUniversalRowids")
-    rowids = [r for r, in cursor]
-
-    # fetch each of the rows given the rowid
-    for rowid in rowids:
-        print("-" * 79)
-        print("Rowid:", rowid)
-        cursor.execute(
-            """
-            select IntCol, StringCol, DateCol
-            from TestUniversalRowids
-            where rowid = :rid
-            """,
-            {"rid": rowid},
-        )
-        int_col, string_col, dateCol = cursor.fetchone()
-        print("IntCol:", int_col)
-        print("StringCol:", string_col)
-        print("DateCol:", dateCol)
diff --git a/samples/universal_rowids_async.py b/samples/universal_rowids_async.py
deleted file mode 100644
index 0ad58876..00000000
--- a/samples/universal_rowids_async.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# universal_rowids_async.py
-#
-# An asynchronous version of universal_rowids.py
-#
-# Demonstrates the use of universal rowids. Universal rowids are used to
-# identify rows in index organized tables.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import datetime
-
-import oracledb
-import sample_env
-
-DATA = [
-    (1, "String #1", datetime.datetime(2017, 4, 4)),
-    (2, "String #2", datetime.datetime(2017, 4, 5)),
-    (3, "A" * 250, datetime.datetime(2017, 4, 6)),
-]
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        # truncate table so sample can be rerun
-        print("Truncating table...")
-        await cursor.execute("truncate table TestUniversalRowids")
-
-        # populate table with a few rows
-        print("Populating table...")
-        for row in DATA:
-            print("Inserting", row)
-            await cursor.execute(
-                "insert into TestUniversalRowids values (:1, :2, :3)", row
-            )
-        await connection.commit()
-
-        # fetch the rowids from the table
-        await cursor.execute("select rowid from TestUniversalRowids")
-        rowids = [r async for r, in cursor]
-
-        # fetch each of the rows given the rowid
-        for rowid in rowids:
-            print("-" * 79)
-            print("Rowid:", rowid)
-            await cursor.execute(
-                """
-                select IntCol, StringCol, DateCol
-                from TestUniversalRowids
-                where rowid = :rid
-                """,
-                {"rid": rowid},
-            )
-            int_col, string_col, dateCol = await cursor.fetchone()
-            print("IntCol:", int_col)
-            print("StringCol:", string_col)
-            print("DateCol:", dateCol)
-
-
-asyncio.run(main())
diff --git a/samples/vector.py b/samples/vector.py
deleted file mode 100644
index 79de206d..00000000
--- a/samples/vector.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# vector.py
-#
-# Demonstrates how to use the Oracle Database version 23 VECTOR data type.
-# -----------------------------------------------------------------------------
-
-import array
-import sys
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# this script only works with Oracle Database 23.7 or later
-#
-# The VECTOR datatype was initially introduced in Oracle Database 23.4.
-# The BINARY vector format was introduced in Oracle Database 23.5.
-# The SPARSE vector format was introduced in Oracle Database 23.7.
-
-if sample_env.get_server_version() < (23, 7):
-    sys.exit("This example requires Oracle Database 23.7 or later.")
-
-# this script works with thin mode, or with thick mode using Oracle Client 23.7
-# or later
-if not connection.thin and oracledb.clientversion()[:2] < (23, 7):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.7 or later"
-    )
-
-with connection.cursor() as cursor:
-    # Single-row insert
-    vector1_data_32 = array.array("f", [1.625, 1.5, 1.0])
-    vector1_data_64 = array.array("d", [11.25, 11.75, 11.5])
-    vector1_data_8 = array.array("b", [1, 2, 3])
-    vector1_data_bin = array.array("B", [180, 150, 100])
-    vector1_data_sparse64 = oracledb.SparseVector(
-        30, [9, 16, 24], array.array("d", [19.125, 78.5, 977.375])
-    )
-
-    cursor.execute(
-        """insert into SampleVectorTab (v32, v64, v8, vbin, v64sparse)
-           values (:1, :2, :3, :4, :5)""",
-        [
-            vector1_data_32,
-            vector1_data_64,
-            vector1_data_8,
-            vector1_data_bin,
-            vector1_data_sparse64,
-        ],
-    )
-
-    # Multi-row insert
-    vector2_data_32 = array.array("f", [2.625, 2.5, 2.0])
-    vector2_data_64 = array.array("d", [22.25, 22.75, 22.5])
-    vector2_data_8 = array.array("b", [4, 5, 6])
-    vector2_data_bin = array.array("B", [40, 15, 255])
-    vector2_data_sparse64 = oracledb.SparseVector(
-        30, [3, 10, 12], array.array("d", [2.5, 2.5, 1.0])
-    )
-
-    vector3_data_32 = array.array("f", [3.625, 3.5, 3.0])
-    vector3_data_64 = array.array("d", [33.25, 33.75, 33.5])
-    vector3_data_8 = array.array("b", [7, 8, 9])
-    vector3_data_bin = array.array("B", [0, 17, 101])
-    vector3_data_sparse64 = oracledb.SparseVector(
-        30, [8, 15, 29], array.array("d", [1.125, 200.5, 100.0])
-    )
-
-    rows = [
-        (
-            vector2_data_32,
-            vector2_data_64,
-            vector2_data_8,
-            vector2_data_bin,
-            vector2_data_sparse64,
-        ),
-        (
-            vector3_data_32,
-            vector3_data_64,
-            vector3_data_8,
-            vector3_data_bin,
-            vector3_data_sparse64,
-        ),
-    ]
-
-    cursor.executemany(
-        """insert into SampleVectorTab (v32, v64, v8, vbin, v64sparse)
-           values (:1, :2, :3, :4, :5)""",
-        rows,
-    )
-
-    # Query
-    cursor.execute("select * from SampleVectorTab")
-
-    # Each non-sparse vector is represented as an array.array type.
-    # Sparse vectors are represented as oracledb.SparseVector() instances
-    for row in cursor:
-        print(row)
diff --git a/samples/vector_async.py b/samples/vector_async.py
deleted file mode 100644
index db8c7336..00000000
--- a/samples/vector_async.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# vector_async.py
-#
-# An asynchronous version of vector.py
-#
-# Demonstrates how to use the Oracle Database version 23 VECTOR data type.
-# -----------------------------------------------------------------------------
-
-import array
-import asyncio
-import sys
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # this script only works with Oracle Database 23.7 or later
-    #
-    # The VECTOR datatype was initially introduced in Oracle Database 23.4.
-    # The BINARY vector format was introduced in Oracle Database 23.5.
-    # The SPARSE vector format was introduced in Oracle Database 23.7.
-
-    if sample_env.get_server_version() < (23, 7):
-        sys.exit("This example requires Oracle Database 23.7 or later.")
-
-    with connection.cursor() as cursor:
-        # Single-row insert
-        vector1_data_32 = array.array("f", [1.625, 1.5, 1.0])
-        vector1_data_64 = array.array("d", [11.25, 11.75, 11.5])
-        vector1_data_8 = array.array("b", [1, 2, 3])
-        vector1_data_bin = array.array("B", [180, 150, 100])
-        vector1_data_sparse64 = oracledb.SparseVector(
-            30, [9, 16, 24], array.array("d", [19.125, 78.5, 977.375])
-        )
-
-        await cursor.execute(
-            """insert into SampleVectorTab (v32, v64, v8, vbin, v64sparse)
-               values (:1, :2, :3, :4, :5)""",
-            [
-                vector1_data_32,
-                vector1_data_64,
-                vector1_data_8,
-                vector1_data_bin,
-                vector1_data_sparse64,
-            ],
-        )
-
-        # Multi-row insert
-        vector2_data_32 = array.array("f", [2.625, 2.5, 2.0])
-        vector2_data_64 = array.array("d", [22.25, 22.75, 22.5])
-        vector2_data_8 = array.array("b", [4, 5, 6])
-        vector2_data_bin = array.array("B", [40, 15, 255])
-        vector2_data_sparse64 = oracledb.SparseVector(
-            30, [3, 10, 12], array.array("d", [2.5, 2.5, 1.0])
-        )
-
-        vector3_data_32 = array.array("f", [3.625, 3.5, 3.0])
-        vector3_data_64 = array.array("d", [33.25, 33.75, 33.5])
-        vector3_data_8 = array.array("b", [7, 8, 9])
-        vector3_data_bin = array.array("B", [0, 17, 101])
-        vector3_data_sparse64 = oracledb.SparseVector(
-            30, [8, 15, 29], array.array("d", [1.125, 200.5, 100.0])
-        )
-
-        rows = [
-            (
-                vector2_data_32,
-                vector2_data_64,
-                vector2_data_8,
-                vector2_data_bin,
-                vector2_data_sparse64,
-            ),
-            (
-                vector3_data_32,
-                vector3_data_64,
-                vector3_data_8,
-                vector3_data_bin,
-                vector3_data_sparse64,
-            ),
-        ]
-
-        await cursor.executemany(
-            """insert into SampleVectorTab (v32, v64, v8, vbin, v64sparse)
-               values (:1, :2, :3, :4, :5)""",
-            rows,
-        )
-
-        # Query
-        await cursor.execute("select * from SampleVectorTab")
-
-        # Each non-sparse vector is represented as an array.array type.
-        # Sparse vectors are represented as oracledb.SparseVector() instances
-        async for row in cursor:
-            print(row)
-
-
-asyncio.run(main())
diff --git a/samples/vector_numpy.py b/samples/vector_numpy.py
deleted file mode 100644
index 3d073628..00000000
--- a/samples/vector_numpy.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# vector_numpy.py
-#
-# Demonstrates how to use the Oracle Database version 23 VECTOR data type with
-# NumPy types.
-# -----------------------------------------------------------------------------
-
-import sys
-import array
-import numpy
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# this script only works with Oracle Database 23.5 or later
-if sample_env.get_server_version() < (23, 5):
-    sys.exit("This example requires Oracle Database 23.5 or later.")
-
-# this script works with thin mode, or with thick mode using Oracle Client 23.5
-# or later
-if not connection.thin and oracledb.clientversion()[:2] < (23, 5):
-    sys.exit(
-        "This example requires python-oracledb thin mode, or Oracle Client"
-        " 23.5 or later"
-    )
-
-
-# Convert from NumPy ndarray types to array types when inserting vectors
-def numpy_converter_in(value):
-    if value.dtype == numpy.float64:
-        dtype = "d"
-    elif value.dtype == numpy.float32:
-        dtype = "f"
-    elif value.dtype == numpy.uint8:
-        dtype = "B"
-    else:
-        dtype = "b"
-    return array.array(dtype, value)
-
-
-def input_type_handler(cursor, value, arraysize):
-    if isinstance(value, numpy.ndarray):
-        return cursor.var(
-            oracledb.DB_TYPE_VECTOR,
-            arraysize=arraysize,
-            inconverter=numpy_converter_in,
-        )
-
-
-connection.inputtypehandler = input_type_handler
-
-
-# Convert from array types to NumPy ndarray types when fetching vectors
-def numpy_converter_out(value):
-    return numpy.array(value, copy=False, dtype=value.typecode)
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VECTOR:
-        return cursor.var(
-            metadata.type_code,
-            arraysize=cursor.arraysize,
-            outconverter=numpy_converter_out,
-        )
-
-
-connection.outputtypehandler = output_type_handler
-
-
-with connection.cursor() as cursor:
-    # Insert
-    vector_data_32 = numpy.array([1.625, 1.5, 1.0], dtype=numpy.float32)
-    vector_data_64 = numpy.array([11.25, 11.75, 11.5], dtype=numpy.float64)
-    vector_data_8 = numpy.array([1, 2, 3], dtype=numpy.int8)
-    vector_data_vb = numpy.array([180, 150, 100], dtype=numpy.uint8)
-
-    cursor.execute(
-        """insert into SampleVectorTab (v32, v64, v8, vbin)
-           values (:1, :2, :3, :4)""",
-        [vector_data_32, vector_data_64, vector_data_8, vector_data_vb],
-    )
-
-    # Query
-    cursor.execute("select * from SampleVectorTab")
-
-    # Each vector is represented as a numpy.ndarray type
-    for row in cursor:
-        print(row)
diff --git a/samples/vector_numpy_async.py b/samples/vector_numpy_async.py
deleted file mode 100644
index e7766e61..00000000
--- a/samples/vector_numpy_async.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# vector_numpy_async.py
-#
-# An asynchronous version of vector_numpy.py
-#
-# Demonstrates how to use the Oracle Database version 23 VECTOR data type with
-# NumPy types.
-# -----------------------------------------------------------------------------
-
-import array
-import asyncio
-import numpy
-import sys
-
-import oracledb
-import sample_env
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    # this script only works with Oracle Database 23.5 or later
-    if sample_env.get_server_version() < (23, 5):
-        sys.exit("This example requires Oracle Database 23.5 or later.")
-
-    # Convert from NumPy ndarray types to array types when inserting vectors
-    def numpy_converter_in(value):
-        if value.dtype == numpy.float64:
-            dtype = "d"
-        elif value.dtype == numpy.float32:
-            dtype = "f"
-        elif value.dtype == numpy.uint8:
-            dtype = "B"
-        else:
-            dtype = "b"
-        return array.array(dtype, value)
-
-    def input_type_handler(cursor, value, arraysize):
-        if isinstance(value, numpy.ndarray):
-            return cursor.var(
-                oracledb.DB_TYPE_VECTOR,
-                arraysize=arraysize,
-                inconverter=numpy_converter_in,
-            )
-
-    connection.inputtypehandler = input_type_handler
-
-    # Convert from array types to NumPy ndarray types when fetching vectors
-    def numpy_converter_out(value):
-        return numpy.array(value, copy=False, dtype=value.typecode)
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VECTOR:
-            return cursor.var(
-                metadata.type_code,
-                arraysize=cursor.arraysize,
-                outconverter=numpy_converter_out,
-            )
-
-    connection.outputtypehandler = output_type_handler
-
-    with connection.cursor() as cursor:
-        # Insert
-        vector_data_32 = numpy.array([1.625, 1.5, 1.0], dtype=numpy.float32)
-        vector_data_64 = numpy.array([11.25, 11.75, 11.5], dtype=numpy.float64)
-        vector_data_8 = numpy.array([1, 2, 3], dtype=numpy.int8)
-        vector_data_vb = numpy.array([180, 150, 100], dtype=numpy.uint8)
-
-        await cursor.execute(
-            """insert into SampleVectorTab (v32, v64, v8, vbin)
-               values (:1, :2, :3, :4)""",
-            [vector_data_32, vector_data_64, vector_data_8, vector_data_vb],
-        )
-
-        # Query
-        await cursor.execute("select * from SampleVectorTab")
-
-        # Each vector is represented as a numpy.ndarray type
-        async for row in cursor:
-            print(row)
-
-
-asyncio.run(main())
diff --git a/samples/vector_string.py b/samples/vector_string.py
deleted file mode 100644
index f957ca51..00000000
--- a/samples/vector_string.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# vector_string.py
-#
-# Demonstrates how to use the Oracle Database version 23 VECTOR data type when
-# using python-oracledb thick mode Oracle Client libraries version 21 or
-# earlier. See vector.py for a more efficient example for other deployments.
-# -----------------------------------------------------------------------------
-
-import sys
-import oracledb
-import sample_env
-
-# Although the code in this example could run with python-oracledb thin mode,
-# it is not efficient so it should only be used for thick mode with old Oracle
-# Client libraries.
-oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-# this script only works with Oracle Database 23.5 or later
-if sample_env.get_server_version() < (23, 5):
-    sys.exit("This example requires Oracle Database 23.5 or later.")
-
-
-with connection.cursor() as cursor:
-    # Single-row insert
-    vector1_data_32 = "[1.625, 1.5, 1.0]"
-    vector1_data_64 = "[11.25, 11.75, 11.5]"
-    vector1_data_8 = "[1, 2, 3]"
-    vector1_data_bin = "[180, 150, 100]"
-
-    cursor.execute(
-        """insert into SampleVectorTab (v32, v64, v8, vbin)
-           values (:1, :2, :3, :4)""",
-        [vector1_data_32, vector1_data_64, vector1_data_8, vector1_data_bin],
-    )
-
-    # Multi-row insert
-    vector2_data_32 = "[2.625, 2.5, 2.0]"
-    vector2_data_64 = "[22.25, 22.75, 22.5]"
-    vector2_data_8 = "[4, 5, 6]"
-    vector2_data_bin = "[40, 15, 255]"
-
-    vector3_data_32 = "[3.625, 3.5, 3.0]"
-    vector3_data_64 = "[33.25, 33.75, 33.5]"
-    vector3_data_8 = "[7, 8, 9]"
-    vector3_data_bin = "[0, 17, 101]"
-
-    rows = [
-        (vector2_data_32, vector2_data_64, vector2_data_8, vector2_data_bin),
-        (vector3_data_32, vector3_data_64, vector3_data_8, vector3_data_bin),
-    ]
-
-    cursor.executemany(
-        """insert into SampleVectorTab (v32, v64, v8, vbin)
-                          values (:1, :2, :3, :4)""",
-        rows,
-    )
-
-    # Query
-    cursor.execute("select * from SampleVectorTab")
-
-    # Each vector is represented as a list
-    for row in cursor:
-        print(row)
diff --git a/samples/write_csv.py b/samples/write_csv.py
deleted file mode 100644
index c74412c4..00000000
--- a/samples/write_csv.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# write_csv.py
-#
-# A sample showing one way of writing CSV data.
-# -----------------------------------------------------------------------------
-
-import csv
-
-import oracledb
-import sample_env
-
-# determine whether to use python-oracledb thin mode or thick mode
-if sample_env.run_in_thick_mode():
-    oracledb.init_oracle_client(lib_dir=sample_env.get_oracle_client())
-
-# CSV file to create
-FILE_NAME = "sample.csv"
-
-
-connection = oracledb.connect(
-    user=sample_env.get_main_user(),
-    password=sample_env.get_main_password(),
-    dsn=sample_env.get_connect_string(),
-    params=sample_env.get_connect_params(),
-)
-
-with connection.cursor() as cursor:
-    cursor.arraysize = 1000  # tune this for large queries
-    print(f"Writing to {FILE_NAME}")
-    with open(FILE_NAME, "w") as f:
-        writer = csv.writer(
-            f, lineterminator="\n", quoting=csv.QUOTE_NONNUMERIC
-        )
-        cursor.execute("""select rownum, sysdate, mycol from BigTab""")
-        writer.writerow(info.name for info in cursor.description)
-        writer.writerows(cursor)
diff --git a/samples/write_csv_async.py b/samples/write_csv_async.py
deleted file mode 100644
index e0b8d797..00000000
--- a/samples/write_csv_async.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# write_csv_async.py
-#
-# An asynchronous version of write_csv.py
-#
-# A sample showing one way of writing CSV data.
-# -----------------------------------------------------------------------------
-
-import asyncio
-import csv
-
-import oracledb
-import sample_env
-
-# CSV file to create
-FILE_NAME = "sample.csv"
-
-
-async def main():
-    connection = await oracledb.connect_async(
-        user=sample_env.get_main_user(),
-        password=sample_env.get_main_password(),
-        dsn=sample_env.get_connect_string(),
-        params=sample_env.get_connect_params(),
-    )
-
-    with connection.cursor() as cursor:
-        cursor.arraysize = 1000  # tune this for large queries
-        print(f"Writing to {FILE_NAME}")
-        with open(FILE_NAME, "w") as f:
-            writer = csv.writer(
-                f, lineterminator="\n", quoting=csv.QUOTE_NONNUMERIC
-            )
-            await cursor.execute(
-                """select rownum, sysdate, mycol from BigTab"""
-            )
-            writer.writerow(info.name for info in cursor.description)
-            writer.writerows(await cursor.fetchall())
-
-
-asyncio.run(main())
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 3718bf38..00000000
--- a/setup.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-import os
-import platform
-import sys
-import sysconfig
-from setuptools import setup, Extension
-
-# base source directory
-source_dir = os.path.join("src", "oracledb")
-
-# determine the Arrow dependent source files (included)
-impl_dir = os.path.join(source_dir, "impl", "arrow")
-nanoarrow_include_dir = os.path.join(impl_dir, "nanoarrow")
-arrow_depends = [
-    os.path.join(impl_dir, n)
-    for n in sorted(os.listdir(impl_dir))
-    if n.endswith(".pyx") or n.endswith(".pxi") or n.endswith(".pxd")
-]
-arrow_depends.append(os.path.join(nanoarrow_include_dir, "nanoarrow.c"))
-arrow_depends.append(os.path.join(nanoarrow_include_dir, "nanoarrow.h"))
-arrow_pxd = os.path.join(source_dir, "arrow_impl.pxd")
-arrow_depends.append(arrow_pxd)
-
-# determine the base implementation dependent source files (included)
-impl_dir = os.path.join(source_dir, "impl", "base")
-base_depends = [
-    os.path.join(impl_dir, n)
-    for n in sorted(os.listdir(impl_dir))
-    if n.endswith(".pyx")
-]
-base_pxd = os.path.join(source_dir, "base_impl.pxd")
-base_depends.extend([base_pxd, arrow_pxd])
-
-# determine the thick mode dependent source files (included)
-impl_dir = os.path.join(source_dir, "impl", "thick")
-source_dirs = [
-    os.path.join(impl_dir, "odpi", "src"),
-    os.path.join(impl_dir, "odpi", "include"),
-]
-thick_depends = [
-    os.path.join(d, n)
-    for d in source_dirs
-    for n in sorted(os.listdir(d))
-    if n.endswith(".c") or n.endswith(".h")
-]
-thick_depends.extend(
-    os.path.join(impl_dir, n)
-    for n in sorted(os.listdir(impl_dir))
-    if n.endswith(".pyx") or n.endswith(".pxd")
-)
-thick_depends.append(base_pxd)
-
-# determine the thin mode dependent source files (included)
-impl_dir = os.path.join(source_dir, "impl", "thin")
-thin_depends = [
-    os.path.join(impl_dir, n)
-    for n in sorted(os.listdir(impl_dir))
-    if n.endswith(".pyx") or n.endswith(".pxi") or n.endswith(".pxd")
-]
-thin_depends.append(base_pxd)
-
-
-# if the platform is macOS:
-#  - target the minimum OS version that current Python packages work with.
-#    (Use 'otool -l /path/to/python' and look for 'version' in the
-#    LC_VERSION_MIN_MACOSX section)
-#  - add argument required for cross-compilation for both x86_64 and arm64
-#    architectures if the python interpreter is a universal2 version.
-
-extra_compile_args = os.environ.get("PYO_COMPILE_ARGS", "").split()
-if sys.platform == "darwin":
-    extra_compile_args.extend(["-mmacosx-version-min=10.9"])
-    if "universal2" in sysconfig.get_platform():
-        if platform.machine() == "x86_64":
-            target = "arm64-apple-macos"
-        else:
-            target = "x86_64-apple-macos"
-        extra_compile_args.extend(["-target", target])
-
-setup(
-    ext_modules=[
-        Extension(
-            "oracledb.base_impl",
-            sources=["src/oracledb/base_impl.pyx"],
-            include_dirs=[nanoarrow_include_dir],
-            depends=base_depends,
-            extra_compile_args=extra_compile_args,
-        ),
-        Extension(
-            "oracledb.thin_impl",
-            sources=["src/oracledb/thin_impl.pyx"],
-            include_dirs=[nanoarrow_include_dir],
-            depends=thin_depends,
-            extra_compile_args=extra_compile_args,
-        ),
-        Extension(
-            "oracledb.thick_impl",
-            sources=["src/oracledb/thick_impl.pyx"],
-            include_dirs=[
-                "src/oracledb/impl/thick/odpi/include",
-                nanoarrow_include_dir,
-            ],
-            depends=thick_depends,
-            extra_compile_args=extra_compile_args,
-        ),
-        Extension(
-            "oracledb.arrow_impl",
-            sources=["src/oracledb/arrow_impl.pyx"],
-            include_dirs=[nanoarrow_include_dir],
-            depends=arrow_depends,
-            extra_compile_args=extra_compile_args,
-        ),
-    ]
-)
diff --git a/src/oracledb/__init__.py b/src/oracledb/__init__.py
deleted file mode 100644
index 7e11e7f0..00000000
--- a/src/oracledb/__init__.py
+++ /dev/null
@@ -1,1275 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# __init__.py
-#
-# Package initialization module.
-# -----------------------------------------------------------------------------
-
-import collections
-import sys
-import warnings
-
-if sys.version_info[:2] < (3, 9):
-    message = (
-        f"Python {sys.version_info[0]}.{sys.version_info[1]} is no longer "
-        "supported by the Python core team. Therefore, support for it is "
-        "deprecated in python-oracledb and will be removed in a future release"
-    )
-    warnings.warn(message)
-
-from . import base_impl, thick_impl, thin_impl
-
-from .base_impl import (
-    ApiType as ApiType,
-    DbType as DbType,
-)
-
-from .enums import (
-    AuthMode as AuthMode,
-    PipelineOpType as PipelineOpType,
-    PoolGetMode as PoolGetMode,
-    Purity as Purity,
-    VectorFormat as VectorFormat,
-)
-
-from . import constants, version
-
-from .arrow_array import (
-    ArrowArray as ArrowArray,
-)
-
-from .constructors import (
-    Binary as Binary,
-    Date as Date,
-    DateFromTicks as DateFromTicks,
-    Time as Time,
-    TimeFromTicks as TimeFromTicks,
-    Timestamp as Timestamp,
-    TimestampFromTicks as TimestampFromTicks,
-)
-
-from .dataframe import (
-    DataFrame as DataFrame,
-)
-
-from .dbobject import (
-    DbObject as DbObject,
-    DbObjectAttr as DbObjectAttr,
-    DbObjectType as DbObjectType,
-)
-
-from .defaults import (
-    Defaults as Defaults,
-)
-
-from .driver_mode import (
-    is_thin_mode as is_thin_mode,
-)
-
-from .dsn import (
-    makedsn as makedsn,
-)
-
-from .errors import (
-    _Error as _Error,
-)
-
-from .exceptions import (
-    Warning as Warning,
-    Error as Error,
-    DatabaseError as DatabaseError,
-    DataError as DataError,
-    IntegrityError as IntegrityError,
-    InterfaceError as InterfaceError,
-    InternalError as InternalError,
-    NotSupportedError as NotSupportedError,
-    OperationalError as OperationalError,
-    ProgrammingError as ProgrammingError,
-)
-
-from .fetch_info import (
-    FetchInfo as FetchInfo,
-)
-
-from .future import (
-    __future__ as __future__,
-)
-
-from .lob import (
-    LOB as LOB,
-    AsyncLOB as AsyncLOB,
-)
-
-from .pipeline import (
-    Pipeline as Pipeline,
-    PipelineOp as PipelineOp,
-    PipelineOpResult as PipelineOpResult,
-    create_pipeline as create_pipeline,
-)
-
-from .soda import (
-    SodaDatabase as SodaDatabase,
-    SodaCollection as SodaCollection,
-    SodaDocument as SodaDocument,
-    SodaDocCursor as SodaDocCursor,
-    SodaOperation as SodaOperation,
-)
-
-from .sparse_vector import (
-    SparseVector as SparseVector,
-)
-
-from .utils import (
-    clientversion as clientversion,
-    enable_thin_mode as enable_thin_mode,
-    from_arrow as from_arrow,
-    init_oracle_client as init_oracle_client,
-    register_params_hook as register_params_hook,
-    register_password_type as register_password_type,
-    register_protocol as register_protocol,
-    unregister_params_hook as unregister_params_hook,
-)
-
-from .var import (
-    Var as Var,
-)
-
-
-# module attributes
-apilevel: str = "2.0"
-"""
-A string constant stating the Python DB API level supported by python-oracledb.
-"""
-
-defaults: Defaults = Defaults()
-"""
-The defaults object for setting default behaviors of python-oracledb.
-"""
-
-paramstyle: str = "named"
-"""
-A string constant stating the type of parameter marker formatting expected by
-the interface. Currently 'named' as in 'where name = :name'.
-"""
-
-threadsafety: int = 2
-"""
-An integer constant stating the level of thread safety that python-oracledb
-supports. Currently 2, which means that threads may share the module and
-connections, but not cursors. Sharing means that a thread may use a resource
-without wrapping it using a mutex semaphore to implement resource locking.
-"""
-
-__version__: str = version.__version__
-"""
-A string constant stating the version of the module.
-"""
-
-
-# API types
-BINARY: ApiType = base_impl.BINARY
-"""
-This type object is used to describe columns in a database that contain binary
-data. The database types :data:`DB_TYPE_RAW` and :data:`DB_TYPE_LONG_RAW` will
-compare equal to this value. If a variable is created with this type, the
-database type :data:`DB_TYPE_RAW` will be used.
-"""
-
-DATETIME: ApiType = base_impl.DATETIME
-"""
-This type object is used to describe columns in a database that are dates.  The
-database types :data:`DB_TYPE_DATE`, :data:`DB_TYPE_TIMESTAMP`,
-:data:`DB_TYPE_TIMESTAMP_LTZ` and :data:`DB_TYPE_TIMESTAMP_TZ` will all compare
-equal to this value. If a variable is created with this type, the database type
-:data:`DB_TYPE_DATE` will be used.
-"""
-
-NUMBER: ApiType = base_impl.NUMBER
-"""
-This type object is used to describe columns in a database that are numbers.
-The database types :data:`DB_TYPE_BINARY_DOUBLE`, :data:`DB_TYPE_BINARY_FLOAT`,
-:data:`DB_TYPE_BINARY_INTEGER` and :data:`DB_TYPE_NUMBER` will all compare
-equal to this value. If a variable is created with this type, the database type
-:data:`DB_TYPE_NUMBER` will be used.
-"""
-
-ROWID: ApiType = base_impl.ROWID
-"""
-This type object is used to describe the pseudo column "rowid". The database
-types :data:`DB_TYPE_ROWID` and :data:`DB_TYPE_UROWID` will compare equal to
-this value. If a variable is created with this type, the database type
-:data:`DB_TYPE_VARCHAR` will be used.
-"""
-
-STRING: ApiType = base_impl.STRING
-"""
-This type object is used to describe columns in a database that are strings.
-The database types :data:`DB_TYPE_CHAR`, :data:`DB_TYPE_LONG`,
-:data:`DB_TYPE_NCHAR`, :data:`DB_TYPE_NVARCHAR` and :data:`DB_TYPE_VARCHAR`
-will all compare equal to this value. If a variable is created with this type,
-the database type :data:`DB_TYPE_VARCHAR` will be used.
-"""
-
-
-# connection authorization modes
-AUTH_MODE_DEFAULT: AuthMode = AuthMode.DEFAULT
-"""
-This constant is used to specify that default authentication is to take place.
-This is the default value if no mode is passed at all.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``DEFAULT_AUTH`` constant that was used in the
-obsolete cx_Oracle driver, and was the default ``mode`` value.
-"""
-
-AUTH_MODE_PRELIM: AuthMode = AuthMode.PRELIM
-"""
-This constant is used to specify that preliminary authentication is to be used.
-This is needed for performing database startup and shutdown.
-
-It can only be used in python-oracledb Thick mode for standalone connections.
-
-This constant deprecates the ``PRELIM_AUTH`` constant that was used in the
-obsolete cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSASM: AuthMode = AuthMode.SYSASM
-"""
-This constant is used to specify that SYSASM access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSASM`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSBKP: AuthMode = AuthMode.SYSBKP
-"""
-This constant is used to specify that SYSBACKUP access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSBKP`` constant that was used in the
-obsolete cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSDBA: AuthMode = AuthMode.SYSDBA
-"""
-This constant is used to specify that SYSDBA access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSDBA`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSDGD: AuthMode = AuthMode.SYSDGD
-"""
-This constant is used to specify that SYSDG access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSDGD`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSKMT: AuthMode = AuthMode.SYSKMT
-"""
-This constant is used to specify that SYSKM access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSKMT`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSOPER: AuthMode = AuthMode.SYSOPER
-"""
-This constant is used to specify that SYSOPER access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSOPER`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-AUTH_MODE_SYSRAC: AuthMode = AuthMode.SYSRAC
-"""
-This constant is used to specify that SYSRAC access is to be acquired.
-
-It can be used for standalone and pooled connections in python-oracledb Thin
-mode, and for standalone connections in Thick mode.
-
-This constant deprecates the ``SYSRAC`` constant that was used in the obsolete
-cx_Oracle driver.
-"""
-
-
-# database shutdown modes
-DBSHUTDOWN_ABORT: int = constants.DBSHUTDOWN_ABORT
-"""
-This constant is used to specify that the caller should not wait for current
-processing to complete or for users to disconnect from the database. This
-should only be used in unusual circumstances since database recovery may be
-necessary upon next startup.
-"""
-
-DBSHUTDOWN_FINAL: int = constants.DBSHUTDOWN_FINAL
-"""
-This constant is used to specify that the instance can be truly halted. This
-should only be done after the database has been shutdown with one of the other
-modes (except abort) and the database has been closed and dismounted using the
-appropriate SQL commands.
-"""
-
-DBSHUTDOWN_IMMEDIATE: int = constants.DBSHUTDOWN_IMMEDIATE
-"""
-This constant is used to specify that all uncommitted transactions should be
-rolled back and any connected users should be disconnected.
-"""
-
-DBSHUTDOWN_TRANSACTIONAL: int = constants.DBSHUTDOWN_TRANSACTIONAL
-"""
-This constant is used to specify that further connections to the database
-should be prohibited and no new transactions should be allowed. It then waits
-for all active transactions to complete.
-"""
-
-DBSHUTDOWN_TRANSACTIONAL_LOCAL: int = constants.DBSHUTDOWN_TRANSACTIONAL_LOCAL
-"""
-This constant is used to specify that further connections to the database
-should be prohibited and no new transactions should be allowed. It then waits
-for only local active transactions to complete.
-"""
-
-
-# database types
-DB_TYPE_BFILE: DbType = base_impl.DB_TYPE_BFILE
-"""
-Describes columns, attributes or array elements in a database that are of type
-BFILE. It will compare equal to the DB API type :data:`BINARY`.
-"""
-
-DB_TYPE_BINARY_DOUBLE: DbType = base_impl.DB_TYPE_BINARY_DOUBLE
-"""
-Describes columns, attributes or array elements in a database that are of type
-BINARY_DOUBLE. It will compare equal to the DB API type :data:`NUMBER`.
-"""
-
-DB_TYPE_BINARY_FLOAT: DbType = base_impl.DB_TYPE_BINARY_FLOAT
-"""
-Describes columns, attributes or array elements in a database that are of type
-BINARY_FLOAT. It will compare equal to the DB API type :data:`NUMBER`.
-"""
-
-DB_TYPE_BINARY_INTEGER: DbType = base_impl.DB_TYPE_BINARY_INTEGER
-"""
-Describes attributes or array elements in a database that are of type
-BINARY_INTEGER. It will compare equal to the DB API type :data:`NUMBER`.
-"""
-
-DB_TYPE_BLOB: DbType = base_impl.DB_TYPE_BLOB
-"""
-Describes columns, attributes or array elements in a database that are of type
-BLOB. It will compare equal to the DB API type :data:`BINARY`.
-"""
-
-DB_TYPE_BOOLEAN: DbType = base_impl.DB_TYPE_BOOLEAN
-"""
-Describes attributes or array elements in a database that are of type BOOLEAN.
-It is only available in Oracle 12.1 and higher and only within PL/SQL.
-"""
-
-DB_TYPE_CHAR: DbType = base_impl.DB_TYPE_CHAR
-"""
-Describes columns, attributes or array elements in a database that are of type
-CHAR. It will compare equal to the DB API type :data:`STRING`.
-
-Note that these are fixed length string values and behave differently from
-VARCHAR2.
-"""
-
-DB_TYPE_CLOB: DbType = base_impl.DB_TYPE_CLOB
-"""
-Describes columns, attributes or array elements in a database that are of type
-CLOB. It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_CURSOR: DbType = base_impl.DB_TYPE_CURSOR
-"""
-Describes columns in a database that are of type CURSOR. In PL/SQL, these are
-known as REF CURSOR.
-"""
-
-DB_TYPE_DATE: DbType = base_impl.DB_TYPE_DATE
-"""
-Describes columns, attributes or array elements in a database that are of type
-DATE. It will compare equal to the DB API type :data:`DATETIME`.
-"""
-
-DB_TYPE_INTERVAL_DS: DbType = base_impl.DB_TYPE_INTERVAL_DS
-"""
-Describes columns, attributes or array elements in a database that are of type
-INTERVAL DAY TO SECOND.
-"""
-
-DB_TYPE_INTERVAL_YM: DbType = base_impl.DB_TYPE_INTERVAL_YM
-"""
-Describes columns, attributes or array elements in a database that are of type
-INTERVAL YEAR TO MONTH.
-"""
-
-DB_TYPE_JSON: DbType = base_impl.DB_TYPE_JSON
-"""
-Describes columns in a database that are of type JSON (with Oracle Database 21
-or later).
-"""
-
-DB_TYPE_LONG: DbType = base_impl.DB_TYPE_LONG
-"""
-Describes columns, attributes or array elements in a database that are of type
-LONG. It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_LONG_NVARCHAR: DbType = base_impl.DB_TYPE_LONG_NVARCHAR
-"""
-This constant can be used in output type handlers when fetching NCLOB columns
-as a string.  (Note a type handler is not needed if
-:data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`, or the equivalent
-execution parameter, is set to *False*).  For IN binds, this constant can be
-used to create a bind variable in :meth:`Cursor.var()` or via
-:meth:`Cursor.setinputsizes()`.  The ``DB_TYPE_LONG_NVARCHAR`` value won't be
-shown in query metadata since it is not a database type.
-
-It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_LONG_RAW: DbType = base_impl.DB_TYPE_LONG_RAW
-"""
-Describes columns, attributes or array elements in a database that are of type
-LONG RAW. It will compare equal to the DB API type :data:`BINARY`.
-"""
-
-DB_TYPE_NCHAR: DbType = base_impl.DB_TYPE_NCHAR
-"""
-Describes columns, attributes or array elements in a database that are of type
-NCHAR. It will compare equal to the DB API type :data:`STRING`.
-
-Note that these are fixed length string values and behave differently from
-NVARCHAR2.
-"""
-
-DB_TYPE_NCLOB: DbType = base_impl.DB_TYPE_NCLOB
-"""
-Describes columns, attributes or array elements in a database that are of type
-NCLOB. It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_NUMBER: DbType = base_impl.DB_TYPE_NUMBER
-"""
-Describes columns, attributes or array elements in a database that are of type
-NUMBER. It will compare equal to the DB API type :data:`NUMBER`.
-"""
-
-DB_TYPE_NVARCHAR: DbType = base_impl.DB_TYPE_NVARCHAR
-"""
-Describes columns, attributes or array elements in a database that are of type
-NVARCHAR2. It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_OBJECT: DbType = base_impl.DB_TYPE_OBJECT
-"""
-Describes columns, attributes or array elements in a database that are an
-instance of a named SQL or PL/SQL type.
-"""
-
-DB_TYPE_RAW: DbType = base_impl.DB_TYPE_RAW
-"""
-Describes columns, attributes or array elements in a database that are of type
-RAW. It will compare equal to the DB API type :data:`BINARY`.
-"""
-
-DB_TYPE_ROWID: DbType = base_impl.DB_TYPE_ROWID
-"""
-Describes columns, attributes or array elements in a database that are of type
-ROWID or UROWID. It will compare equal to the DB API type :data:`ROWID`.
-"""
-
-DB_TYPE_TIMESTAMP: DbType = base_impl.DB_TYPE_TIMESTAMP
-"""
-Describes columns, attributes or array elements in a database that are of type
-TIMESTAMP. It will compare equal to the DB API type :data:`DATETIME`.
-"""
-
-DB_TYPE_TIMESTAMP_LTZ: DbType = base_impl.DB_TYPE_TIMESTAMP_LTZ
-"""
-Describes columns, attributes or array elements in a database that are of type
-TIMESTAMP WITH LOCAL TIME ZONE. It will compare equal to the DB API type
-:data:`DATETIME`.
-"""
-
-DB_TYPE_TIMESTAMP_TZ: DbType = base_impl.DB_TYPE_TIMESTAMP_TZ
-"""
-Describes columns, attributes or array elements in a database that are of type
-TIMESTAMP WITH TIME ZONE. It will compare equal to the DB API type
-:data:`DATETIME`.
-"""
-
-DB_TYPE_UNKNOWN: DbType = base_impl.DB_TYPE_UNKNOWN
-"""
-Describes columns, attributes or array elements in a database that are of an
-unknown type.
-"""
-
-DB_TYPE_UROWID: DbType = base_impl.DB_TYPE_UROWID
-"""
-Describes columns, attributes or array elements in a database that are of type
-UROWID. It will compare equal to the DB API type :data:`ROWID`.
-"""
-
-DB_TYPE_VARCHAR: DbType = base_impl.DB_TYPE_VARCHAR
-"""
-Describes columns, attributes or array elements in a database that are of type
-VARCHAR2. It will compare equal to the DB API type :data:`STRING`.
-"""
-
-DB_TYPE_VECTOR: DbType = base_impl.DB_TYPE_VECTOR
-"""
-Describes columns, attributes or array elements in a database that are of type
-VECTOR (with Oracle Database 23 or later).
-"""
-
-DB_TYPE_XMLTYPE: DbType = base_impl.DB_TYPE_XMLTYPE
-"""
-Describes columns, attributes or array elements in a database that are of type
-SYS.XMLTYPE.
-"""
-
-
-# AQ dequeue modes
-DEQ_BROWSE: int = constants.DEQ_BROWSE
-"""
-This constant is used to specify that dequeue should read the message without
-acquiring any lock on the message (equivalent to a select statement).
-"""
-
-DEQ_LOCKED: int = constants.DEQ_LOCKED
-"""
-This constant is used to specify that dequeue should read and obtain a write
-lock on the message for the duration of the transaction (equivalent to a select
-for update statement).
-"""
-
-DEQ_REMOVE: int = constants.DEQ_REMOVE
-"""
-This constant is used to specify that dequeue should read the message and
-update or delete it. This is the default value.
-"""
-
-DEQ_REMOVE_NODATA: int = constants.DEQ_REMOVE_NODATA
-"""
-This constant is used to specify that dequeue should confirm receipt of the
-message but not deliver the actual message content.
-"""
-
-
-# AQ dequeue navigation modes
-DEQ_FIRST_MSG: int = constants.DEQ_FIRST_MSG
-"""
-This constant is used to specify that dequeue should retrieve the first
-available message that matches the search criteria. This resets the
-position to the beginning of the queue.
-"""
-
-DEQ_NEXT_MSG: int = constants.DEQ_NEXT_MSG
-"""
-This constant is used to specify that dequeue should retrieve the next
-available message that matches the search criteria. If the previous message
-belongs to a message group, AQ retrieves the next available message that
-matches the search criteria and belongs to the message group. This is the
-default.
-"""
-
-DEQ_NEXT_TRANSACTION: int = constants.DEQ_NEXT_TRANSACTION
-"""
-This constant is used to specify that dequeue should skip the remainder of the
-transaction group and retrieve the first message of the next transaction group.
-This option can only be used if message grouping is enabled for the current
-queue.
-"""
-
-
-# AQ dequeue visibility modes
-DEQ_IMMEDIATE: int = constants.DEQ_IMMEDIATE
-"""
-This constant is used to specify that dequeue should perform its work as part
-of an independent transaction.
-"""
-
-DEQ_ON_COMMIT: int = constants.DEQ_ON_COMMIT
-"""
-This constant is used to specify that dequeue should be part of the current
-transaction. This is the default value.
-"""
-
-
-# AQ dequeue wait modes
-DEQ_NO_WAIT: int = constants.DEQ_NO_WAIT
-"""
-This constant is used to specify that dequeue not wait for messages to be
-available for dequeuing.
-"""
-
-DEQ_WAIT_FOREVER: int = constants.DEQ_WAIT_FOREVER
-"""
-This constant is used to specify that dequeue should wait forever for messages
-to be available for dequeuing. This is the default value.
-"""
-
-
-# AQ enqueue visibility modes
-ENQ_IMMEDIATE: int = constants.ENQ_IMMEDIATE
-"""
-This constant is used to specify that enqueue should perform its work as
-part of an independent transaction.
-
-The use of this constant with bulk enqueuing is only supported in
-python-oracledb Thick mode.
-"""
-
-ENQ_ON_COMMIT: int = constants.ENQ_ON_COMMIT
-"""
-This constant is used to specify that enqueue should be part of the current
-transaction. This is the default value.
-"""
-
-
-# event types
-EVENT_AQ: int = constants.EVENT_AQ
-"""
-This constant is used to specify that one or more messages are available for
-dequeuing on the queue specified when the subscription was created.
-"""
-
-EVENT_DEREG: int = constants.EVENT_DEREG
-"""
-This constant is used to specify that the subscription has been deregistered
-and no further notifications will be sent.
-"""
-
-EVENT_NONE: int = constants.EVENT_NONE
-"""
-This constant is used to specify no information is available about the event.
-"""
-
-EVENT_OBJCHANGE: int = constants.EVENT_OBJCHANGE
-"""
-This constant is used to specify that a database change has taken place on a
-table registered with the :meth:`Subscription.registerquery()` method.
-"""
-
-EVENT_QUERYCHANGE: int = constants.EVENT_QUERYCHANGE
-"""
-This constant is used to specify that the result set of a query registered with
-the :meth:`Subscription.registerquery()` method has been changed.
-"""
-
-EVENT_SHUTDOWN: int = constants.EVENT_SHUTDOWN
-"""
-This constant is used to specify that the instance is in the process of being
-shut down.
-"""
-
-EVENT_SHUTDOWN_ANY: int = constants.EVENT_SHUTDOWN_ANY
-"""
-This constant is used to specify that any instance (when running RAC) is in the
-process of being shut down.
-"""
-
-EVENT_STARTUP: int = constants.EVENT_STARTUP
-"""
-This constant is used to specify that the instance is in the process of being
-started up.
-"""
-
-
-# AQ delivery modes
-MSG_BUFFERED: int = constants.MSG_BUFFERED
-"""
-This constant is used to specify that enqueue or dequeue operations should
-enqueue or dequeue buffered messages, respectively. For multi-consumer queues,
-a `subscriber <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-&id=GUID-5FB46C6A-BB22-4CDE-B7D6-E242DC8808D8>`__ with buffered delivery mode
-needs to be created prior to enqueuing buffered messages.
-
-This mode is not supported for bulk array operations in python-oracledb Thick
-mode, and for JSON payloads.
-"""
-
-MSG_PERSISTENT: int = constants.MSG_PERSISTENT
-"""
-This constant is used to specify that enqueue/dequeue operations should enqueue
-or dequeue persistent messages. This is the default value.
-"""
-
-MSG_PERSISTENT_OR_BUFFERED: int = constants.MSG_PERSISTENT_OR_BUFFERED
-"""
-This constant is used to specify that dequeue operations should dequeue either
-persistent or buffered messages.
-"""
-
-
-# AQ message states
-MSG_EXPIRED: int = constants.MSG_EXPIRED
-"""
-This constant is used to specify that the message has been moved to the
-exception queue.
-"""
-
-MSG_PROCESSED: int = constants.MSG_PROCESSED
-"""
-This constant is used to specify that the message has been processed and has
-been retained.
-"""
-
-MSG_READY: int = constants.MSG_READY
-"""
-This constant is used to specify that the message is ready to be processed.
-"""
-
-MSG_WAITING: int = constants.MSG_WAITING
-"""
-This constant is used to specify that the message delay has not yet been
-reached.
-"""
-
-
-# other AQ constants
-MSG_NO_DELAY: int = constants.MSG_NO_DELAY
-"""
-This constant is a possible value for the :attr:`~MessageProperties.delay`
-attribute of the message properties object passed as the ``msgproperties``
-parameter to the :meth:`Queue.deqone()` or :meth:`Queue.deqmany()` and
-:meth:`Queue.enqone()` or :meth:`Queue.enqmany()` methods. It specifies that
-no delay should be imposed and the message should be immediately available for
-dequeuing. This is also the default value.
-"""
-
-MSG_NO_EXPIRATION: int = constants.MSG_NO_EXPIRATION
-"""
-This constant is a possible value for the :attr:`~MessageProperties.expiration`
-attribute of the message properties object passed as the ``msgproperties``
-parameter to the :meth:`Queue.deqone()` or :meth:`Queue.deqmany()` and
-:meth:`Queue.enqone()` or :meth:`Queue.enqmany()` methods. It specifies that
-the message never expires. This is also the default value.
-"""
-
-
-# operation codes (CQN)
-OPCODE_ALLOPS: int = constants.OPCODE_ALLOPS
-"""
-This constant is used to specify that messages should be sent for all
-operations.
-"""
-
-OPCODE_ALLROWS: int = constants.OPCODE_ALLROWS
-"""
-This constant is used to specify that the table or query has been completely
-invalidated.
-"""
-
-OPCODE_ALTER: int = constants.OPCODE_ALTER
-"""
-This constant is used to specify that messages should be sent when a registered
-table has been altered in some fashion by DDL, or that the message identifies a
-table that has been altered.
-"""
-
-OPCODE_DELETE: int = constants.OPCODE_DELETE
-"""
-This constant is used to specify that messages should be sent when data is
-deleted, or that the message identifies a row that has been deleted.
-"""
-
-OPCODE_DROP: int = constants.OPCODE_DROP
-"""
-This constant is used to specify that messages should be sent when a registered
-table has been dropped, or that the message identifies a table that has been
-dropped.
-"""
-
-OPCODE_INSERT: int = constants.OPCODE_INSERT
-"""
-This constant is used to specify that messages should be sent when data is
-inserted, or that the message identifies a row that has been inserted.
-"""
-
-OPCODE_UPDATE: int = constants.OPCODE_UPDATE
-"""
-This constant is used to specify that messages should be sent when data is
-updated, or that the message identifies a row that has been updated.
-"""
-
-
-# pipeline operation types
-PIPELINE_OP_TYPE_CALL_FUNC: PipelineOpType = PipelineOpType.CALL_FUNC
-"""
-This constant identifies the type of operation as the calling of a stored
-function.
-"""
-
-PIPELINE_OP_TYPE_CALL_PROC: PipelineOpType = PipelineOpType.CALL_PROC
-"""
-This constant identifies the type of operation as the calling of a stored
-procedure.
-"""
-
-PIPELINE_OP_TYPE_COMMIT: PipelineOpType = PipelineOpType.COMMIT
-"""
-This constant identifies the type of operation as the performing of a commit.
-"""
-
-PIPELINE_OP_TYPE_EXECUTE: PipelineOpType = PipelineOpType.EXECUTE
-"""
-This constant identifies the type of operation as the executing of a statement.
-"""
-
-PIPELINE_OP_TYPE_EXECUTE_MANY: PipelineOpType = PipelineOpType.EXECUTE_MANY
-"""
-This constant identifies the type of operations as the executing of a statement
-multiple times.
-"""
-
-PIPELINE_OP_TYPE_FETCH_ALL: PipelineOpType = PipelineOpType.FETCH_ALL
-"""
-This constant identifies the type of operation as the executing of a query and
-returning all of the rows from the result set.
-"""
-
-PIPELINE_OP_TYPE_FETCH_MANY: PipelineOpType = PipelineOpType.FETCH_MANY
-"""
-This constant identifies the type of operation as the executing of a query and
-returning up to the specified number of rows from the result set.
-"""
-
-PIPELINE_OP_TYPE_FETCH_ONE: PipelineOpType = PipelineOpType.FETCH_ONE
-"""
-This constant identifies the type of operation as the executing of a query and
-returning the first row of the result set.
-"""
-
-
-# connection pool "get" modes
-POOL_GETMODE_FORCEGET: PoolGetMode = PoolGetMode.FORCEGET
-"""
-This constant is used to specify that a new connection should be created and
-returned by :meth:`ConnectionPool.acquire()` if there are no free connections
-available in the pool and the pool is already at its maximum size.
-
-When a connection acquired in this mode is eventually released back to the
-pool, it will be dropped and not added to the pool if the pool is still at its
-maximum size.
-
-This constant deprecates the ``SPOOL_ATTRVAL_FORCEGET`` constant that was used
-in the obsolete cx_Oracle driver.
-"""
-
-POOL_GETMODE_NOWAIT: PoolGetMode = PoolGetMode.NOWAIT
-"""
-This constant is used to specify that an exception should be raised by
-:meth:`ConnectionPool.acquire()` when all currently created connections are
-already in use and so :meth:`~ConnectionPool.acquire()` cannot immediately
-return a connection. Note the exception may occur even if the pool is smaller
-than its maximum size.
-
-This constant deprecates the ``SPOOL_ATTRVAL_NOWAIT`` constant that was used in
-the obsolete cx_Oracle driver, and was the default ``getmode`` value.
-"""
-
-POOL_GETMODE_TIMEDWAIT: PoolGetMode = PoolGetMode.TIMEDWAIT
-"""
-This constant is used to specify that :meth:`ConnectionPool.acquire()` should
-wait for a period of time (defined by the ``wait_timeout`` parameter) for a
-connection to become available before returning with an error.
-
-This constant deprecates the ``SPOOL_ATTRVAL_TIMEDWAIT`` constant that was used
-in the obsolete cx_Oracle driver.
-"""
-
-POOL_GETMODE_WAIT: PoolGetMode = PoolGetMode.WAIT
-"""
-This constant is used to specify that :meth:`ConnectionPool.acquire()` should
-wait until a connection is available if there are currently no free connections
-available in the pool.  This is the default value.
-
-This constant deprecates the ``SPOOL_ATTRVAL_WAIT`` constant that was used in
-the obsolete cx_Oracle driver.
-"""
-
-
-# connection pool purity
-PURITY_DEFAULT: Purity = Purity.DEFAULT
-"""
-This constant is used to specify that the purity of the session is the default
-value identified by Oracle (see Oracle's documentation for more information).
-This is the default value.
-
-This constant deprecates the ``ATTR_PURITY_DEFAULT`` constant that was used in
-the obsolete cx_Oracle driver, and was the default ``purity`` value.
-"""
-
-PURITY_NEW: Purity = Purity.NEW
-"""
-This constant is used to specify that the session acquired from the pool should
-be new and not have any prior session state.
-
-This constant deprecates the ``ATTR_PURITY_NEW`` constant that was used in the
-obsolete cx_Oracle driver.
-"""
-
-PURITY_SELF: Purity = Purity.SELF
-"""
-This constant is used to specify that the session acquired from the pool need
-not be new and may have prior session state.
-
-This constant deprecates the ``ATTR_PURITY_SELF`` constant that was used in the
-obsolete cx_Oracle driver.
-"""
-
-
-# subscription grouping classes
-SUBSCR_GROUPING_CLASS_NONE: int = constants.SUBSCR_GROUPING_CLASS_NONE
-"""
-This constant is used to specify that no grouping should take place.
-"""
-
-SUBSCR_GROUPING_CLASS_TIME: int = constants.SUBSCR_GROUPING_CLASS_TIME
-"""
-This constant is used to specify that events are to be grouped by the period of
-time in which they are received.
-"""
-
-
-# subscription grouping types
-SUBSCR_GROUPING_TYPE_SUMMARY: int = constants.SUBSCR_GROUPING_TYPE_SUMMARY
-"""
-This constant is used to specify that when events are grouped a summary of the
-events should be sent instead of the individual events. This is the default
-value.
-"""
-
-SUBSCR_GROUPING_TYPE_LAST: int = constants.SUBSCR_GROUPING_TYPE_LAST
-"""
-This constant is used to specify that when events are grouped the last event
-that makes up the group should be sent instead of the individual events.
-"""
-
-
-# subscription namespaces
-SUBSCR_NAMESPACE_AQ: int = constants.SUBSCR_NAMESPACE_AQ
-"""
-This constant is used to specify that notifications should be sent when a queue
-has messages available to dequeue.
-"""
-
-SUBSCR_NAMESPACE_DBCHANGE: int = constants.SUBSCR_NAMESPACE_DBCHANGE
-"""
-This constant is used to specify that database change notification or query
-change notification messages are to be sent. This is the default value.
-"""
-
-
-# subscription protocols
-SUBSCR_PROTO_CALLBACK: int = constants.SUBSCR_PROTO_CALLBACK
-"""
-This constant is used to specify that notifications will be sent to the
-callback routine identified when the subscription was created. It is the
-default value and the only value currently supported.
-"""
-
-SUBSCR_PROTO_HTTP: int = constants.SUBSCR_PROTO_HTTP
-"""
-This constant is used to specify that notifications will be sent to an HTTP
-URL when a message is generated. This value is currently not supported.
-"""
-
-SUBSCR_PROTO_MAIL: int = constants.SUBSCR_PROTO_MAIL
-"""
-This constant is used to specify that notifications will be sent to an e-mail
-address when a message is generated. This value is currently not supported.
-"""
-
-SUBSCR_PROTO_SERVER: int = constants.SUBSCR_PROTO_SERVER
-"""
-This constant is used to specify that notifications will be sent to a PL/SQL
-procedure when a message is generated. This value is currently not supported.
-"""
-
-
-# subscription quality of service
-SUBSCR_QOS_BEST_EFFORT: int = constants.SUBSCR_QOS_BEST_EFFORT
-"""
-This constant is used to specify that best effort filtering for query result
-set changes is acceptable. False positive notifications may be received. This
-behaviour may be suitable for caching applications.
-"""
-
-SUBSCR_QOS_DEFAULT: int = constants.SUBSCR_QOS_DEFAULT
-"""
-This constant is used to specify that the default behavior for subscriptions
-should be used.
-"""
-
-SUBSCR_QOS_DEREG_NFY: int = constants.SUBSCR_QOS_DEREG_NFY
-"""
-This constant is used to specify that the subscription should be automatically
-unregistered after the first notification is received.
-"""
-
-SUBSCR_QOS_QUERY: int = constants.SUBSCR_QOS_QUERY
-"""
-This constant is used to specify that notifications should be sent if the
-result set of the registered query changes. By default, no false positive
-notifications will be generated.
-"""
-
-SUBSCR_QOS_RELIABLE: int = constants.SUBSCR_QOS_RELIABLE
-"""
-This constant is used to specify that notifications should not be lost in the
-event of database failure.
-"""
-
-SUBSCR_QOS_ROWIDS: int = constants.SUBSCR_QOS_ROWIDS
-"""
-This constant is used to specify that the rowids of the inserted, updated or
-deleted rows should be included in the message objects that are sent.
-"""
-
-
-# flags for tpc_begin()
-TPC_BEGIN_JOIN: int = base_impl.TPC_TXN_FLAGS_JOIN
-"""
-This constant is used to join an existing TPC transaction.
-"""
-
-TPC_BEGIN_NEW: int = base_impl.TPC_TXN_FLAGS_NEW
-"""
-This constant is used to create a new TPC transaction.
-"""
-
-TPC_BEGIN_PROMOTE: int = base_impl.TPC_TXN_FLAGS_PROMOTE
-"""
-This constant is used to promote a local transaction to a TPC transaction.
-"""
-
-TPC_BEGIN_RESUME: int = base_impl.TPC_TXN_FLAGS_RESUME
-"""
-This constant is used to resume an existing TPC transaction.
-"""
-
-
-# flags for tpc_end()
-TPC_END_NORMAL: int = constants.TPC_END_NORMAL
-"""
-This constant is used to end TPC transaction participation normally.
-"""
-
-TPC_END_SUSPEND: int = constants.TPC_END_SUSPEND
-"""
-This constant is used to suspend a TPC transaction.
-"""
-
-
-# vector formats
-VECTOR_FORMAT_BINARY: VectorFormat = VectorFormat.BINARY
-"""
-This constant is used to represent the storage format of VECTOR columns using
-8-bit unsigned integers.
-"""
-
-VECTOR_FORMAT_FLOAT32: VectorFormat = VectorFormat.FLOAT32
-"""
-This constant is used to represent the storage format of VECTOR columns using
-32-bit floating point numbers.
-"""
-
-VECTOR_FORMAT_FLOAT64: VectorFormat = VectorFormat.FLOAT64
-"""
-This constant is used to represent the storage format of VECTOR columns using
-64-bit floating point numbers.
-"""
-
-VECTOR_FORMAT_INT8: VectorFormat = VectorFormat.INT8
-"""
-This constant is used to represent the storage format of VECTOR columns using
-8-bit signed integers.
-"""
-
-
-from .connection import (  # noqa: E402
-    AsyncConnection as AsyncConnection,
-    connect as connect,
-    connect_async as connect_async,
-    Connection as Connection,
-)
-
-from .cursor import (  # noqa: E402
-    AsyncCursor as AsyncCursor,
-    Cursor as Cursor,
-)
-
-from .pool import (  # noqa: E402
-    AsyncConnectionPool as AsyncConnectionPool,
-    ConnectionPool as ConnectionPool,
-    create_pool as create_pool,
-    create_pool_async as create_pool_async,
-    get_pool as get_pool,
-)
-
-from .subscr import (  # noqa: E402
-    Subscription as Subscription,
-    Message as Message,
-    MessageQuery as MessageQuery,
-    MessageRow as MessageRow,
-    MessageTable as MessageTable,
-)
-
-from .aq import (  # noqa: E402
-    Queue as Queue,
-    AsyncQueue as AsyncQueue,
-    DeqOptions as DeqOptions,
-    EnqOptions as EnqOptions,
-    MessageProperties as MessageProperties,
-)
-
-from .connect_params import ConnectParams as ConnectParams  # noqa: E402
-
-from .pool_params import PoolParams as PoolParams  # noqa: E402
-
-from . import builtin_hooks  # noqa: E402
-
-IntervalYM = collections.namedtuple("IntervalYM", ["years", "months"])
-
-
-class JsonId(bytes):
-    pass
-
-
-# initialize implementations
-package = sys.modules[__name__]
-base_impl.init_base_impl(package)
-thick_impl.init_thick_impl(package)
-thin_impl.init_thin_impl(package)
-del package
-
-# remove unnecessary symbols
-del (
-    aq,  # noqa
-    base_impl,  # noqa
-    builtin_hooks,  # noqa
-    connect_params,  # noqa
-    connection,  # noqa
-    constants,  # noqa
-    constructors,  # noqa
-    cursor,  # noqa
-    dbobject,  # noqa
-    driver_mode,  # noqa
-    dsn,  # noqa
-    errors,  # noqa
-    exceptions,  # noqa
-    fetch_info,  # noqa
-    future,  # noqa
-    lob,  # noqa
-    pipeline,  # noqa
-    pool,  # noqa
-    pool_params,  # noqa
-    sparse_vector,  # noqa
-    soda,  # noqa
-    subscr,  # noqa
-    sys,  # noqa
-    thick_impl,  # noqa
-    thin_impl,  # noqa
-    utils,  # noqa
-    var,  # noqa
-    warnings,  # noqa
-)
-
-# general aliases (for backwards compatibility)
-ObjectType = DbObjectType
-Object = DbObject
-SessionPool = ConnectionPool
-version = __version__
-
-# aliases for database types (for backwards compatibility)
-BFILE = DB_TYPE_BFILE
-BLOB = DB_TYPE_BLOB
-BOOLEAN = DB_TYPE_BOOLEAN
-CLOB = DB_TYPE_CLOB
-CURSOR = DB_TYPE_CURSOR
-FIXED_CHAR = DB_TYPE_CHAR
-FIXED_NCHAR = DB_TYPE_NCHAR
-INTERVAL = DB_TYPE_INTERVAL_DS
-LONG_BINARY = DB_TYPE_LONG_RAW
-LONG_STRING = DB_TYPE_LONG
-NATIVE_INT = DB_TYPE_BINARY_INTEGER
-NATIVE_FLOAT = DB_TYPE_BINARY_DOUBLE
-NCHAR = DB_TYPE_NVARCHAR
-OBJECT = DB_TYPE_OBJECT
-NCLOB = DB_TYPE_NCLOB
-TIMESTAMP = DB_TYPE_TIMESTAMP
-
-# aliases for authentication modes (for backwards compatibility)
-DEFAULT_AUTH = AUTH_MODE_DEFAULT
-SYSASM = AUTH_MODE_SYSASM
-SYSBKP = AUTH_MODE_SYSBKP
-SYSDBA = AUTH_MODE_SYSDBA
-SYSDGD = AUTH_MODE_SYSDGD
-SYSKMT = AUTH_MODE_SYSKMT
-SYSOPER = AUTH_MODE_SYSOPER
-SYSRAC = AUTH_MODE_SYSRAC
-PRELIM_AUTH = AUTH_MODE_PRELIM
-
-# aliases for pool "get" modes (for backwards compatibility)
-SPOOL_ATTRVAL_WAIT = POOL_GETMODE_WAIT
-SPOOL_ATTRVAL_NOWAIT = POOL_GETMODE_NOWAIT
-SPOOL_ATTRVAL_FORCEGET = POOL_GETMODE_FORCEGET
-SPOOL_ATTRVAL_TIMEDWAIT = POOL_GETMODE_TIMEDWAIT
-
-# aliases for purity (for backwards compatibility)
-ATTR_PURITY_DEFAULT = PURITY_DEFAULT
-ATTR_PURITY_NEW = PURITY_NEW
-ATTR_PURITY_SELF = PURITY_SELF
-
-# aliases for subscription protocols (for backwards compatibility)
-SUBSCR_PROTO_OCI = SUBSCR_PROTO_CALLBACK
diff --git a/src/oracledb/aq.py b/src/oracledb/aq.py
deleted file mode 100644
index ebca3ec8..00000000
--- a/src/oracledb/aq.py
+++ /dev/null
@@ -1,659 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# aq.py
-#
-# Contains the classes used for handling Advanced Queuing (AQ): Queue,
-# DeqOptions, EnqOptions and MessageProperties.
-# -----------------------------------------------------------------------------
-
-import datetime
-
-from . import connection as connection_module
-from typing import Any, Union
-from . import errors
-from .base import BaseMetaClass
-from .dbobject import DbObject, DbObjectType
-
-
-class BaseQueue(metaclass=BaseMetaClass):
-    @classmethod
-    def _from_impl(cls, connection, impl):
-        queue = cls.__new__(cls)
-        queue._connection = connection
-        queue._deq_options = DeqOptions._from_impl(impl.deq_options_impl)
-        queue._enq_options = EnqOptions._from_impl(impl.enq_options_impl)
-        queue._payload_type = None
-        queue._impl = impl
-        return queue
-
-    def _verify_message(self, message: "MessageProperties") -> None:
-        """
-        Internal method used for verifying a message.
-        """
-        if not isinstance(message, MessageProperties):
-            raise TypeError("expecting MessageProperties object")
-        if message.payload is None:
-            errors._raise_err(errors.ERR_MESSAGE_HAS_NO_PAYLOAD)
-        if isinstance(self.payload_type, DbObjectType):
-            if (
-                not isinstance(message.payload, DbObject)
-                or message.payload.type != self.payload_type
-            ):
-                errors._raise_err(errors.ERR_PAYLOAD_CANNOT_BE_ENQUEUED)
-        elif self.payload_type == "JSON":
-            if not isinstance(message.payload, (dict, list)):
-                errors._raise_err(errors.ERR_PAYLOAD_CANNOT_BE_ENQUEUED)
-        else:
-            if not isinstance(message.payload, (str, bytes)):
-                errors._raise_err(errors.ERR_PAYLOAD_CANNOT_BE_ENQUEUED)
-
-    @property
-    def connection(self) -> "connection_module.Connection":
-        """
-        This read-only attribute returns a reference to the connection object
-        on which the queue was created.
-        """
-        return self._connection
-
-    @property
-    def deqoptions(self) -> "DeqOptions":
-        """
-        This read-only attribute returns a reference to the options that will
-        be used when dequeuing messages from the queue.
-        """
-        return self._deq_options
-
-    @property
-    def deqOptions(self) -> "DeqOptions":
-        """
-        Deprecated: use deqoptions instead.
-        """
-        return self.deqoptions
-
-    @property
-    def enqoptions(self) -> "EnqOptions":
-        """
-        This read-only attribute returns a reference to the options that will
-        be used when enqueuing messages into the queue.
-        """
-        return self._enq_options
-
-    @property
-    def enqOptions(self) -> "EnqOptions":
-        """
-        Deprecated: use enqoptions() instead.
-        """
-        return self.enqoptions
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name of the queue.
-        """
-        return self._impl.name
-
-    @property
-    def payload_type(self) -> Union[DbObjectType, None]:
-        """
-        This read-only attribute returns the object type for payloads that can
-        be enqueued and dequeued. If using a JSON queue, this returns the value
-        "JSON". If using a raw queue, this returns the value *None*.
-        """
-        if self._payload_type is None:
-            if self._impl.is_json:
-                self._payload_type = "JSON"
-            elif self._impl.payload_type is not None:
-                self._payload_type = DbObjectType._from_impl(
-                    self._impl.payload_type
-                )
-        return self._payload_type
-
-    @property
-    def payloadType(self) -> Union[DbObjectType, None]:
-        """
-        Deprecated: use payload_type instead.
-        """
-        return self.payload_type
-
-
-class Queue(BaseQueue):
-
-    def deqmany(self, max_num_messages: int) -> list["MessageProperties"]:
-        """
-        Dequeues up to the specified number of messages from the queue and
-        returns a list of these messages.
-        """
-        if self._impl._supports_deq_many(self._connection._impl):
-            message_impls = self._impl.deq_many(max_num_messages)
-        else:
-            message_impls = []
-            while len(message_impls) < max_num_messages:
-                message_impl = self._impl.deq_one()
-                if message_impl is None:
-                    break
-                message_impls.append(message_impl)
-        return [MessageProperties._from_impl(impl) for impl in message_impls]
-
-    def deqMany(self, max_num_messages: int) -> list["MessageProperties"]:
-        """
-        Deprecated: use deqmany() instead.
-        """
-        return self.deqmany(max_num_messages)
-
-    def deqone(self) -> Union["MessageProperties", None]:
-        """
-        Dequeues at most one message from the queue and returns it. If no
-        message is dequeued, None is returned.
-        """
-        message_impl = self._impl.deq_one()
-        if message_impl is not None:
-            return MessageProperties._from_impl(message_impl)
-
-    def deqOne(self) -> Union["MessageProperties", None]:
-        """
-        Deprecated: use deqone() instead.
-        """
-        return self.deqone()
-
-    def enqmany(self, messages: list["MessageProperties"]) -> None:
-        """
-        Enqueues multiple messages into the queue. The messages parameter must
-        be a sequence containing message property objects which have all had
-        their payload attribute set to a value that the queue supports.
-
-        Warning: In python-oracledb Thick mode using Oracle Client libraries
-        prior to 21c, calling :meth:`Queue.enqmany()` in parallel on different
-        connections acquired from the same connection pool may fail due to
-        Oracle bug 29928074. To avoid this, do one of: upgrade the client
-        libraries, ensure that :meth:`Queue.enqmany()` is not run in parallel,
-        use standalone connections or connections from different pools, or make
-        multiple calls to :meth:`Queue.enqone()`. The function
-        :meth:`Queue.deqmany()` call is not affected.
-        """
-        for message in messages:
-            self._verify_message(message)
-        message_impls = [m._impl for m in messages]
-        self._impl.enq_many(message_impls)
-
-    def enqMany(self, messages: list["MessageProperties"]) -> None:
-        """
-        Deprecated: use enqmany() instead.
-        """
-        return self.enqmany(messages)
-
-    def enqone(self, message: "MessageProperties") -> None:
-        """
-        Enqueues a single message into the queue. The message must be a message
-        property object which has had its payload attribute set to a value that
-        the queue supports.
-        """
-        self._verify_message(message)
-        self._impl.enq_one(message._impl)
-
-    def enqOne(self, message: "MessageProperties") -> None:
-        """
-        Deprecated: use enqone() instead.
-        """
-        return self.enqone(message)
-
-
-class AsyncQueue(BaseQueue):
-
-    async def deqmany(
-        self, max_num_messages: int
-    ) -> list["MessageProperties"]:
-        """
-        Dequeues up to the specified number of messages from the queue and
-        returns a list of these messages.
-        """
-        message_impls = await self._impl.deq_many(max_num_messages)
-        return [MessageProperties._from_impl(impl) for impl in message_impls]
-
-    async def deqone(self) -> Union["MessageProperties", None]:
-        """
-        Dequeues at most one message from the queue and returns it. If no
-        message is dequeued, None is returned.
-        """
-        message_impl = await self._impl.deq_one()
-        if message_impl is not None:
-            return MessageProperties._from_impl(message_impl)
-
-    async def enqmany(self, messages: list["MessageProperties"]) -> None:
-        """
-        Enqueues multiple messages into the queue. The messages parameter must
-        be a sequence containing message property objects which have all had
-        their payload attribute set to a value that the queue supports.
-
-        Warning: calling this function in parallel on different connections
-        acquired from the same pool may fail due to Oracle bug 29928074. Ensure
-        that this function is not run in parallel, use standalone connections
-        or connections from different pools, or make multiple calls to
-        enqone() instead. The function Queue.deqmany() call is not affected.
-        """
-        for message in messages:
-            self._verify_message(message)
-        message_impls = [m._impl for m in messages]
-        await self._impl.enq_many(message_impls)
-
-    async def enqone(self, message: "MessageProperties") -> None:
-        """
-        Enqueues a single message into the queue. The message must be a message
-        property object which has had its payload attribute set to a value that
-        the queue supports.
-        """
-        self._verify_message(message)
-        await self._impl.enq_one(message._impl)
-
-
-class DeqOptions(metaclass=BaseMetaClass):
-    @classmethod
-    def _from_impl(cls, impl):
-        options = cls.__new__(cls)
-        options._impl = impl
-        return options
-
-    @property
-    def condition(self) -> str:
-        """
-        This read-write attribute specifies a boolean expression similar to the
-        where clause of a SQL query. The boolean expression can include
-        conditions on message properties, user data properties, and PL/SQL or
-        SQL functions. The default is to have no condition specified.
-        """
-        return self._impl.get_condition()
-
-    @condition.setter
-    def condition(self, value: str) -> None:
-        self._impl.set_condition(value)
-
-    @property
-    def consumername(self) -> str:
-        """
-        This read-write attribute specifies the name of the consumer. Only
-        messages matching the consumer name will be accessed. If the queue is
-        not set up for multiple consumers this attribute should not be set. The
-        default is to have no consumer name specified.
-        """
-        return self._impl.get_consumer_name()
-
-    @consumername.setter
-    def consumername(self, value: str) -> None:
-        self._impl.set_consumer_name(value)
-
-    @property
-    def correlation(self) -> str:
-        """
-        This read-write attribute specifies the correlation identifier of the
-        message to be dequeued. Special pattern-matching characters, such as
-        the percent sign (%) and the underscore (_), can be used. If multiple
-        messages satisfy the pattern, the order of dequeuing is indeterminate.
-        The default is to have no correlation specified.
-        """
-        return self._impl.get_correlation()
-
-    @correlation.setter
-    def correlation(self, value: str) -> None:
-        self._impl.set_correlation(value)
-
-    @property
-    def deliverymode(self) -> int:
-        """
-        This write-only attribute specifies what types of messages should be
-        dequeued. It should be one of the values
-        :data:`~oracledb.MSG_PERSISTENT` (default),
-        :data:`~oracledb.MSG_BUFFERED`, or
-        :data:`~oracledb.MSG_PERSISTENT_OR_BUFFERED`.
-
-        Note that :data:`~oracledb.MSG_BUFFERED` is not supported for JSON
-        payloads.
-        """
-        raise AttributeError("deliverymode can only be written")
-
-    @deliverymode.setter
-    def deliverymode(self, value: int) -> None:
-        self._impl.set_delivery_mode(value)
-
-    @property
-    def mode(self) -> int:
-        """
-        This read-write attribute specifies the locking behaviour associated
-        with the dequeue operation. It should be one of the values
-        :data:`~oracledb.DEQ_BROWSE`, :data:`~oracledb.DEQ_LOCKED`,
-        :data:`~oracledb.DEQ_REMOVE` (default), or
-        :data:`~oracledb.DEQ_REMOVE_NODATA`.
-        """
-        return self._impl.get_mode()
-
-    @mode.setter
-    def mode(self, value: int) -> None:
-        self._impl.set_mode(value)
-
-    @property
-    def msgid(self) -> bytes:
-        """
-        This read-write attribute specifies the identifier of the message to
-        be dequeued. The default is to have no message identifier specified.
-        """
-        return self._impl.get_message_id()
-
-    @msgid.setter
-    def msgid(self, value: bytes) -> None:
-        self._impl.set_message_id(value)
-
-    @property
-    def navigation(self) -> int:
-        """
-        This read-write attribute specifies the position of the message that is
-        retrieved. It should be one of the values
-        :data:`~oracledb.DEQ_FIRST_MSG`, :data:`~oracledb.DEQ_NEXT_MSG`
-        (default), or :data:`~oracledb.DEQ_NEXT_TRANSACTION`.
-        """
-        return self._impl.get_navigation()
-
-    @navigation.setter
-    def navigation(self, value: int) -> None:
-        self._impl.set_navigation(value)
-
-    @property
-    def transformation(self) -> str:
-        """
-        This read-write attribute specifies the name of the transformation that
-        must be applied after the message is dequeued from the database but
-        before it is returned to the calling application. The transformation
-        must be created using dbms_transform. The default is to have no
-        transformation specified.
-        """
-        return self._impl.get_transformation()
-
-    @transformation.setter
-    def transformation(self, value: str) -> None:
-        self._impl.set_transformation(value)
-
-    @property
-    def visibility(self) -> int:
-        """
-        This read-write attribute specifies the transactional behavior of the
-        dequeue request. It should be one of the values
-        :data:`~oracledb.DEQ_ON_COMMIT` (default) or
-        :data:`~oracledb.DEQ_IMMEDIATE`. This attribute is ignored when using
-        the :data:`~oracledb.DEQ_BROWSE` mode. Note the value of
-        :attr:`~Connection.autocommit` is always ignored.
-        """
-        return self._impl.get_visibility()
-
-    @visibility.setter
-    def visibility(self, value: int) -> None:
-        self._impl.set_visibility(value)
-
-    @property
-    def wait(self) -> int:
-        """
-        This read-write attribute specifies the time to wait, in seconds, for a
-        message matching the search criteria to become available for dequeuing.
-        One of the values :data:`~oracledb.DEQ_NO_WAIT` or
-        :data:`~oracledb.DEQ_WAIT_FOREVER` can also be used. The default is
-        :data:`~oracledb.DEQ_WAIT_FOREVER`.
-        """
-        return self._impl.get_wait()
-
-    @wait.setter
-    def wait(self, value: int) -> None:
-        self._impl.set_wait(value)
-
-
-class EnqOptions(metaclass=BaseMetaClass):
-    @classmethod
-    def _from_impl(cls, impl):
-        options = cls.__new__(cls)
-        options._impl = impl
-        return options
-
-    @property
-    def deliverymode(self) -> int:
-        """
-        This write-only attribute specifies what type of messages should be
-        enqueued. It should be one of the values
-        :data:`~oracledb.MSG_PERSISTENT` (default) or
-        :data:`~oracledb.MSG_BUFFERED`.
-
-        Note that :data:`~oracledb.MSG_BUFFERED` is not supported for JSON
-        payloads.
-        """
-        raise AttributeError("deliverymode can only be written")
-
-    @deliverymode.setter
-    def deliverymode(self, value: int) -> None:
-        self._impl.set_delivery_mode(value)
-
-    @property
-    def transformation(self) -> str:
-        """
-        This read-write attribute specifies the name of the transformation that
-        must be applied before the message is enqueued into the database. The
-        transformation must be created using dbms_transform. The default is to
-        have no transformation specified.
-        """
-        return self._impl.get_transformation()
-
-    @transformation.setter
-    def transformation(self, value: str) -> None:
-        self._impl.set_transformation(value)
-
-    @property
-    def visibility(self) -> int:
-        """
-        This read-write attribute specifies the transactional behavior of the
-        enqueue request. It should be one of the values
-        :data:`~oracledb.ENQ_ON_COMMIT` (default) or
-        :data:`~oracledb.ENQ_IMMEDIATE`. Note the value of
-        :attr:`~Connection.autocommit` is ignored.
-        """
-        return self._impl.get_visibility()
-
-    @visibility.setter
-    def visibility(self, value: int) -> None:
-        self._impl.set_visibility(value)
-
-
-class MessageProperties(metaclass=BaseMetaClass):
-    _recipients = []
-
-    @classmethod
-    def _from_impl(cls, impl):
-        props = cls.__new__(cls)
-        props._impl = impl
-        return props
-
-    @property
-    def attempts(self) -> int:
-        """
-        This read-only attribute specifies the number of attempts that have
-        been made to dequeue the message.
-        """
-        return self._impl.get_num_attempts()
-
-    @property
-    def correlation(self) -> str:
-        """
-        This read-write attribute specifies the correlation used when the
-        message was enqueued.
-        """
-        return self._impl.get_correlation()
-
-    @correlation.setter
-    def correlation(self, value: str) -> None:
-        self._impl.set_correlation(value)
-
-    @property
-    def delay(self) -> int:
-        """
-        This read-write attribute specifies the number of seconds to delay an
-        enqueued message. Any integer is acceptable but the constant
-        :data:`~oracledb.MSG_NO_DELAY` can also be used indicating that the
-        message is available for immediate dequeuing.
-        """
-        return self._impl.get_delay()
-
-    @delay.setter
-    def delay(self, value: int) -> None:
-        self._impl.set_delay(value)
-
-    @property
-    def deliverymode(self) -> int:
-        """
-        This read-only attribute specifies the type of message that was
-        dequeued. It will be one of the values
-        :data:`~oracledb.MSG_PERSISTENT` or
-        :data:`~oracledb.MSG_BUFFERED`.
-        """
-        return self._impl.get_delivery_mode()
-
-    @property
-    def enqtime(self) -> datetime.datetime:
-        """
-        This read-only attribute specifies the time that the message was
-        enqueued.
-        """
-        return self._impl.get_enq_time()
-
-    @property
-    def exceptionq(self) -> str:
-        """
-        This read-write attribute specifies the name of the queue to which the
-        message is moved if it cannot be processed successfully. Messages are
-        moved if the number of unsuccessful dequeue attempts has exceeded the
-        maximum number of retries or if the message has expired. All messages
-        in the exception queue are in the :data:`~oracledb.MSG_EXPIRED` state.
-        The default value is the name of the exception queue associated with
-        the queue table.
-        """
-        return self._impl.get_exception_queue()
-
-    @exceptionq.setter
-    def exceptionq(self, value: str) -> None:
-        self._impl.set_exception_queue(value)
-
-    @property
-    def expiration(self) -> int:
-        """
-        This read-write attribute specifies, in seconds, how long the message
-        is available for dequeuing. This attribute is an offset from the delay
-        attribute. Expiration processing requires the queue monitor to be
-        running. Any integer is accepted but the constant
-        :data:`~oracledb.MSG_NO_EXPIRATION` can also be used indicating that
-        the message never expires.
-        """
-        return self._impl.get_expiration()
-
-    @expiration.setter
-    def expiration(self, value: int) -> None:
-        self._impl.set_expiration(value)
-
-    @property
-    def msgid(self) -> bytes:
-        """
-        This read-only attribute specifies the id of the message in the last
-        queue that enqueued or dequeued this message. If the message has never
-        been dequeued or enqueued, the value will be `None`.
-        """
-        return self._impl.get_message_id()
-
-    @property
-    def payload(self) -> Union[bytes, DbObject]:
-        """
-        This read-write attribute specifies the payload that will be enqueued
-        or the payload that was dequeued when using a queue. When enqueuing,
-        the value is checked to ensure that it conforms to the type expected
-        by that queue. For RAW queues, the value can be a bytes object or a
-        string. If the value is a string it will be converted to bytes in the
-        encoding UTF-8.
-        """
-        return self._impl.payload
-
-    @payload.setter
-    def payload(self, value: Any) -> None:
-        if isinstance(value, DbObject):
-            self._impl.set_payload_object(value._impl)
-        elif not isinstance(value, (str, bytes)):
-            self._impl.set_payload_json(value)
-        else:
-            if isinstance(value, str):
-                value_bytes = value.encode()
-            elif isinstance(value, bytes):
-                value_bytes = value
-            self._impl.set_payload_bytes(value_bytes)
-        self._impl.payload = value
-
-    @property
-    def priority(self) -> int:
-        """
-        This read-write attribute specifies the priority of the message. A
-        smaller number indicates a higher priority. The priority can be any
-        integer, including negative numbers. The default value is 0.
-        """
-        return self._impl.get_priority()
-
-    @priority.setter
-    def priority(self, value: int) -> None:
-        self._impl.set_priority(value)
-
-    @property
-    def recipients(self) -> list[str]:
-        """
-        This read-write attribute specifies a list of recipient names that can
-        be associated with a message at the time a message is enqueued. This
-        allows a limited set of recipients to dequeue each message. The
-        recipient list associated with the message overrides the queue
-        subscriber list, if there is one. The recipient names need not be in
-        the subscriber list but can be, if desired.
-
-        To dequeue a message, the consumername attribute can be set to one of
-        the recipient names. The original message recipient list is not
-        available on dequeued messages. All recipients have to dequeue a
-        message before it gets removed from the queue.
-
-        Subscribing to a queue is like subscribing to a magazine: each
-        subscriber can dequeue all the messages placed into a specific queue,
-        just as each magazine subscriber has access to all its articles. Being
-        a recipient, however, is like getting a letter: each recipient is a
-        designated target of a particular message.
-        """
-        return self._recipients
-
-    @recipients.setter
-    def recipients(self, value: list) -> None:
-        self._impl.set_recipients(value)
-        self._recipients = value
-
-    @property
-    def state(self) -> int:
-        """
-        This read-only attribute specifies the state of the message at the time
-        of the dequeue. It will be one of the values
-        :data:`~oracledb.MSG_WAITING`, :data:`~oracledb.MSG_READY`,
-        :data:`~oracledb.MSG_PROCESSED`, or :data:`~oracledb.MSG_EXPIRED`.
-        """
-        return self._impl.get_state()
diff --git a/src/oracledb/arrow_array.py b/src/oracledb/arrow_array.py
deleted file mode 100644
index 5ecb1c8f..00000000
--- a/src/oracledb/arrow_array.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# arrow_array.py
-#
-# Implement an ArrowArray that is used for efficiently transferring Arrow
-# array data to other data frame libraries.
-# -----------------------------------------------------------------------------
-
-from .arrow_impl import ArrowArrayImpl
-from .base import BaseMetaClass
-
-from . import errors
-
-
-class ArrowArray(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(self):
-        errors._raise_err(errors.ERR_INTERNAL_CREATION_REQUIRED)
-
-    def __len__(self):
-        return self.num_rows
-
-    def __repr__(self):
-        return (
-            f"ArrowArray(name={self.name}, "
-            f"len={self.num_rows}, "
-            f"type={self.dtype})"
-        )
-
-    def __str__(self):
-        return self.__repr__()
-
-    @classmethod
-    def _from_arrow(cls, obj):
-        array = cls.__new__(cls)
-        array._impl = ArrowArrayImpl.from_arrow_array(obj)
-        return array
-
-    @classmethod
-    def _from_impl(cls, impl):
-        array = cls.__new__(cls)
-        array._impl = impl
-        return array
-
-    def __arrow_c_array__(self, requested_schema=None):
-        """
-        Returns a tuple containing an ArrowSchema and ArrowArray PyCapsules.
-        """
-        if requested_schema is not None:
-            raise NotImplementedError("requested_schema")
-        return (
-            self._impl.get_schema_capsule(),
-            self._impl.get_array_capsule(),
-        )
-
-    def __arrow_c_schema__(self):
-        """
-        Returns an ArrowSchema PyCapsule.
-        """
-        return self._impl.get_schema_capsule()
-
-    @property
-    def dtype(self) -> str:
-        """
-        Returns the data type associated with the array.
-        """
-        return self._impl.get_data_type()
-
-    @property
-    def name(self) -> str:
-        """
-        Returns the name associated with the array.
-        """
-        return self._impl.get_name()
-
-    @property
-    def null_count(self) -> int:
-        """
-        Returns the number of rows that contain null values.
-        """
-        return self._impl.get_null_count()
-
-    @property
-    def num_rows(self) -> int:
-        """
-        Returns the number of rows in the array.
-        """
-        return self._impl.get_num_rows()
diff --git a/src/oracledb/arrow_impl.pxd b/src/oracledb/arrow_impl.pxd
deleted file mode 100644
index a73550b9..00000000
--- a/src/oracledb/arrow_impl.pxd
+++ /dev/null
@@ -1,170 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# arrow_impl.pxd
-#
-# Cython definition file declaring the classes used for implementing the Arrow
-# interface.
-#------------------------------------------------------------------------------
-
-# cython: language_level = 3
-
-from libc.stdint cimport int8_t, uint8_t, int16_t, uint16_t
-from libc.stdint cimport int32_t, uint32_t, int64_t, uint64_t
-from cpython cimport array
-
-cdef extern from "nanoarrow.h":
-
-    cdef struct ArrowArray:
-        int64_t length
-        int64_t null_count
-        int64_t offset
-        int64_t n_buffers
-        int64_t n_children
-        ArrowArray** children
-        const void** buffers
-        void (*release)(ArrowArray*)
-        void *private_data
-
-    cdef struct ArrowSchema:
-        const char *format
-        const char *name
-        const char *metadata
-        int64_t flags
-        int64_t n_children
-        ArrowSchema **children
-        ArrowSchema *dictionary
-        void (*release)(ArrowSchema*)
-        void *private_data
-
-    cpdef enum ArrowType:
-        NANOARROW_TYPE_BOOL
-        NANOARROW_TYPE_BINARY
-        NANOARROW_TYPE_DATE32
-        NANOARROW_TYPE_DATE64
-        NANOARROW_TYPE_DECIMAL128
-        NANOARROW_TYPE_DOUBLE
-        NANOARROW_TYPE_FIXED_SIZE_BINARY
-        NANOARROW_TYPE_FIXED_SIZE_LIST
-        NANOARROW_TYPE_FLOAT
-        NANOARROW_TYPE_INT8
-        NANOARROW_TYPE_INT16
-        NANOARROW_TYPE_INT32
-        NANOARROW_TYPE_INT64
-        NANOARROW_TYPE_LARGE_BINARY
-        NANOARROW_TYPE_LARGE_STRING
-        NANOARROW_TYPE_LIST
-        NANOARROW_TYPE_NA
-        NANOARROW_TYPE_STRING
-        NANOARROW_TYPE_STRUCT
-        NANOARROW_TYPE_TIMESTAMP
-        NANOARROW_TYPE_UINT8
-        NANOARROW_TYPE_UINT16
-        NANOARROW_TYPE_UINT32
-        NANOARROW_TYPE_UINT64
-        NANOARROW_TYPE_UNINITIALIZED
-
-    cpdef enum ArrowTimeUnit:
-        NANOARROW_TIME_UNIT_SECOND
-        NANOARROW_TIME_UNIT_MILLI
-        NANOARROW_TIME_UNIT_MICRO
-        NANOARROW_TIME_UNIT_NANO
-
-cdef class ArrowSchemaImpl:
-
-    cdef:
-        int32_t precision
-        int32_t scale
-        int32_t fixed_size
-        str name
-        ArrowType arrow_type
-        ArrowTimeUnit time_unit
-        int time_factor
-        ArrowSchema *arrow_schema
-        ArrowType child_arrow_type
-        int child_element_size
-        list child_schemas
-
-    cdef bint _is_sparse_vector(self) except*
-    cdef int _set_child_arrow_type(self, ArrowType child_arrow_type) except -1
-    cdef int _set_time_unit(self, ArrowTimeUnit time_unit) except -1
-    cdef str get_type_name(self)
-    cdef int populate_from_schema(self, ArrowSchema* schema) except -1
-    cdef int populate_from_metadata(self, ArrowType arrow_type, str name,
-                                    int8_t precision, int8_t scale,
-                                    ArrowTimeUnit time_unit,
-                                    ArrowType child_arrow_type) except -1
-
-
-cdef class ArrowArrayImpl:
-    cdef:
-        ArrowArray *arrow_array
-        ArrowSchemaImpl schema_impl
-
-    cdef int _extract_int(self, const void* ptr, ArrowType arrow_type,
-                          int64_t index, int64_t* value) except -1
-    cdef int _extract_uint(self, const void* ptr, ArrowType arrow_type,
-                           int64_t index, uint64_t* value) except -1
-    cdef int _get_is_null(self, int64_t index, bint* is_null) except -1
-    cdef int _get_list_info(self, int64_t index, ArrowArray* arrow_array,
-                            int64_t* offset, int64_t* num_elements) except -1
-    cdef int append_bytes(self, void* ptr, int64_t num_bytes) except -1
-    cdef int append_decimal(self, void* ptr, int64_t num_bytes) except -1
-    cdef int append_double(self, double value) except -1
-    cdef int append_float(self, float value) except -1
-    cdef int append_int(self, int64_t value) except -1
-    cdef int append_last_value(self, ArrowArrayImpl array) except -1
-    cdef int append_null(self) except -1
-    cdef int append_sparse_vector(self, int64_t num_dimensions,
-                                  array.array indices,
-                                  array.array values) except -1
-    cdef int append_uint(self, uint64_t value) except -1
-    cdef int append_vector(self, array.array value) except -1
-    cdef int finish_building(self) except -1
-    cdef int get_bool(self, int64_t index, bint* is_null,
-                      bint* value) except -1
-    cdef int get_bytes(self, int64_t index, bint* is_null, char **ptr,
-                       ssize_t *num_bytes) except -1
-    cdef bytes get_decimal(self, int64_t index, bint* is_null)
-    cdef int get_double(self, int64_t index, bint* is_null,
-                        double* value) except -1
-    cdef int get_float(self, int64_t index, bint* is_null,
-                       float* value) except -1
-    cdef int get_int(self, ArrowType arrow_type, int64_t index, bint* is_null,
-                     int64_t* value) except -1
-    cdef int get_length(self, int64_t* length) except -1
-    cdef object get_sparse_vector(self, int64_t index, bint* is_null)
-    cdef int get_uint(self, ArrowType arrow_type, int64_t index, bint* is_null,
-                      uint64_t* value) except -1
-    cdef object get_vector(self, int64_t index, bint* is_null)
-    cdef int populate_from_array(self, ArrowSchemaImpl schema_impl,
-                                 ArrowArray* array) except -1
-    cdef int populate_from_schema(self, ArrowSchemaImpl schema_impl) except -1
-
-
-cdef class DataFrameImpl:
-    cdef:
-        list schema_impls
-        list arrays
diff --git a/src/oracledb/arrow_impl.pyx b/src/oracledb/arrow_impl.pyx
deleted file mode 100644
index 2792ed43..00000000
--- a/src/oracledb/arrow_impl.pyx
+++ /dev/null
@@ -1,58 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# arrow_impl.pyx
-#
-# Cython file for the Arrow implementation.
-#------------------------------------------------------------------------------
-
-# cython: language_level=3
-
-cimport cpython
-
-from libc.errno cimport EINVAL, EOVERFLOW
-from libc.stdint cimport uintptr_t
-from libc.string cimport memcpy, memset, strlen, strchr
-from cpython cimport array
-
-import array
-
-from . import errors
-
-cdef array.array float_template = array.array('f')
-cdef array.array double_template = array.array('d')
-cdef array.array int8_template = array.array('b')
-cdef array.array uint8_template = array.array('B')
-cdef array.array uint32_template
-
-if array.array("I").itemsize == 4:
-    uint32_template = array.array("I")
-else:
-    uint32_template = array.array("L")
-
-include "impl/arrow/utils.pyx"
-include "impl/arrow/schema.pyx"
-include "impl/arrow/array.pyx"
-include "impl/arrow/dataframe.pyx"
diff --git a/src/oracledb/base.py b/src/oracledb/base.py
deleted file mode 100644
index 251414c2..00000000
--- a/src/oracledb/base.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# base.py
-#
-# Contains base classes and methods that have no internal dependencies.
-# -----------------------------------------------------------------------------
-
-from . import __name__ as MODULE_NAME
-
-
-# metaclass used by all oracledb classes; currently this only ensures that when
-# the class is displayed it only shows the overall module name instead of any
-# subpackage names
-class BaseMetaClass(type):
-
-    def __new__(cls, name, bases, attrs):
-        module_name = attrs["__module__"]
-        qual_name = attrs["__qualname__"]
-        if module_name.startswith(MODULE_NAME):
-            module_name = MODULE_NAME
-        attrs["_public_name"] = f"{module_name}.{qual_name}"
-        return super().__new__(cls, name, bases, attrs)
-
-    def __repr__(cls):
-        return f"<class '{cls._public_name}'>"
diff --git a/src/oracledb/base_impl.pxd b/src/oracledb/base_impl.pxd
deleted file mode 100644
index 6d1061ff..00000000
--- a/src/oracledb/base_impl.pxd
+++ /dev/null
@@ -1,1062 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# base_impl.pxd
-#
-# Cython definition file defining the base classes from which the thick and
-# thin implementations derive their classes.
-#------------------------------------------------------------------------------
-
-# cython: language_level=3
-
-from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
-from libc.stdlib cimport abs
-from cpython cimport array
-cimport cpython.datetime as cydatetime
-
-ctypedef unsigned char char_type
-
-from .arrow_impl cimport (
-    ArrowTimeUnit,
-    ArrowType,
-    ArrowArrayImpl,
-    ArrowSchemaImpl,
-    DataFrameImpl,
-)
-
-cdef enum:
-    PY_TYPE_NUM_ARRAY = 13
-    PY_TYPE_NUM_BOOL = 4
-    PY_TYPE_NUM_BYTES = 10
-    PY_TYPE_NUM_DATETIME = 7
-    PY_TYPE_NUM_DECIMAL = 14
-    PY_TYPE_NUM_FLOAT = 2
-    PY_TYPE_NUM_INT = 3
-    PY_TYPE_NUM_OBJECT = 9
-    PY_TYPE_NUM_ORACLE_CURSOR = 6
-    PY_TYPE_NUM_ORACLE_INTERVAL_YM = 12
-    PY_TYPE_NUM_ORACLE_LOB = 1
-    PY_TYPE_NUM_ORACLE_OBJECT = 11
-    PY_TYPE_NUM_STR = 5
-    PY_TYPE_NUM_TIMEDELTA = 8
-
-cdef enum:
-    DB_TYPE_NUM_MIN = 2000
-    DB_TYPE_NUM_MAX = 2034
-
-    DB_TYPE_NUM_BFILE = 2020
-    DB_TYPE_NUM_BINARY_DOUBLE = 2008
-    DB_TYPE_NUM_BINARY_FLOAT = 2007
-    DB_TYPE_NUM_BINARY_INTEGER = 2009
-    DB_TYPE_NUM_BLOB = 2019
-    DB_TYPE_NUM_BOOLEAN = 2022
-    DB_TYPE_NUM_CHAR = 2003
-    DB_TYPE_NUM_CLOB = 2017
-    DB_TYPE_NUM_CURSOR = 2021
-    DB_TYPE_NUM_DATE = 2011
-    DB_TYPE_NUM_INTERVAL_DS = 2015
-    DB_TYPE_NUM_INTERVAL_YM = 2016
-    DB_TYPE_NUM_JSON = 2027
-    DB_TYPE_NUM_LONG_NVARCHAR = 2031
-    DB_TYPE_NUM_LONG_RAW = 2025
-    DB_TYPE_NUM_LONG_VARCHAR = 2024
-    DB_TYPE_NUM_NCHAR = 2004
-    DB_TYPE_NUM_NCLOB = 2018
-    DB_TYPE_NUM_NUMBER = 2010
-    DB_TYPE_NUM_NVARCHAR = 2002
-    DB_TYPE_NUM_OBJECT = 2023
-    DB_TYPE_NUM_RAW = 2006
-    DB_TYPE_NUM_ROWID = 2005
-    DB_TYPE_NUM_TIMESTAMP = 2012
-    DB_TYPE_NUM_TIMESTAMP_LTZ = 2014
-    DB_TYPE_NUM_TIMESTAMP_TZ = 2013
-    DB_TYPE_NUM_UNKNOWN = 0
-    DB_TYPE_NUM_UROWID = 2030
-    DB_TYPE_NUM_VARCHAR = 2001
-    DB_TYPE_NUM_VECTOR = 2033
-    DB_TYPE_NUM_XMLTYPE = 2032
-
-cdef enum:
-    NATIVE_TYPE_NUM_BOOLEAN = 3011
-    NATIVE_TYPE_NUM_BYTES = 3004
-    NATIVE_TYPE_NUM_DOUBLE = 3003
-    NATIVE_TYPE_NUM_FLOAT = 3002
-    NATIVE_TYPE_NUM_INTERVAL_DS = 3006
-    NATIVE_TYPE_NUM_INTERVAL_YM = 3007
-    NATIVE_TYPE_NUM_INT64 = 3000
-    NATIVE_TYPE_NUM_JSON = 3013
-    NATIVE_TYPE_NUM_LOB = 3008
-    NATIVE_TYPE_NUM_OBJECT = 3009
-    NATIVE_TYPE_NUM_ROWID = 3012
-    NATIVE_TYPE_NUM_STMT = 3010
-    NATIVE_TYPE_NUM_TIMESTAMP = 3005
-    NATIVE_TYPE_NUM_VECTOR = 3017
-
-cdef enum:
-    ORA_TYPE_NUM_BFILE = 114
-    ORA_TYPE_NUM_BINARY_DOUBLE = 101
-    ORA_TYPE_NUM_BINARY_FLOAT = 100
-    ORA_TYPE_NUM_BINARY_INTEGER = 3
-    ORA_TYPE_NUM_BLOB = 113
-    ORA_TYPE_NUM_BOOLEAN = 252
-    ORA_TYPE_NUM_CHAR = 96
-    ORA_TYPE_NUM_CLOB = 112
-    ORA_TYPE_NUM_CURSOR = 102
-    ORA_TYPE_NUM_DATE = 12
-    ORA_TYPE_NUM_INTERVAL_DS = 183
-    ORA_TYPE_NUM_INTERVAL_YM = 182
-    ORA_TYPE_NUM_JSON = 119
-    ORA_TYPE_NUM_LONG = 8
-    ORA_TYPE_NUM_LONG_RAW = 24
-    ORA_TYPE_NUM_NUMBER = 2
-    ORA_TYPE_NUM_OBJECT = 109
-    ORA_TYPE_NUM_RAW = 23
-    ORA_TYPE_NUM_ROWID = 11
-    ORA_TYPE_NUM_TIMESTAMP = 180
-    ORA_TYPE_NUM_TIMESTAMP_LTZ = 231
-    ORA_TYPE_NUM_TIMESTAMP_TZ = 181
-    ORA_TYPE_NUM_UROWID = 208
-    ORA_TYPE_NUM_VARCHAR = 1
-    ORA_TYPE_NUM_VECTOR = 127
-
-cdef enum:
-    CS_FORM_IMPLICIT = 1
-    CS_FORM_NCHAR = 2
-
-cdef enum:
-    TNS_LONG_LENGTH_INDICATOR = 254
-    TNS_NULL_LENGTH_INDICATOR = 255
-
-cpdef enum:
-    AUTH_MODE_DEFAULT = 0
-    AUTH_MODE_PRELIM = 0x00000008
-    AUTH_MODE_SYSASM = 0x00008000
-    AUTH_MODE_SYSBKP = 0x00020000
-    AUTH_MODE_SYSDBA = 0x00000002
-    AUTH_MODE_SYSDGD = 0x00040000
-    AUTH_MODE_SYSKMT = 0x00080000
-    AUTH_MODE_SYSOPER = 0x00000004
-    AUTH_MODE_SYSRAC = 0x00100000
-
-cpdef enum:
-    PIPELINE_OP_TYPE_CALL_FUNC = 1
-    PIPELINE_OP_TYPE_CALL_PROC = 2
-    PIPELINE_OP_TYPE_COMMIT = 3
-    PIPELINE_OP_TYPE_EXECUTE = 4
-    PIPELINE_OP_TYPE_EXECUTE_MANY = 5
-    PIPELINE_OP_TYPE_FETCH_ALL = 6
-    PIPELINE_OP_TYPE_FETCH_MANY = 7
-    PIPELINE_OP_TYPE_FETCH_ONE = 8
-
-cpdef enum:
-    POOL_GETMODE_WAIT = 0
-    POOL_GETMODE_NOWAIT = 1
-    POOL_GETMODE_FORCEGET = 2
-    POOL_GETMODE_TIMEDWAIT = 3
-
-cpdef enum:
-    PURITY_DEFAULT = 0
-    PURITY_NEW = 1
-    PURITY_SELF = 2
-
-cpdef enum:
-    TPC_TXN_FLAGS_JOIN = 0x00000002
-    TPC_TXN_FLAGS_NEW = 0x00000001
-    TPC_TXN_FLAGS_PROMOTE = 0x00000008
-    TPC_TXN_FLAGS_RESUME = 0x00000004
-    TPC_TXN_FLAGS_SESSIONLESS = 0x00000010
-
-cpdef enum:
-    VECTOR_FORMAT_BINARY = 5
-    VECTOR_FORMAT_FLOAT32 = 2
-    VECTOR_FORMAT_FLOAT64 = 3
-    VECTOR_FORMAT_INT8 = 4
-
-cdef type PY_TYPE_ASYNC_LOB
-cdef type PY_TYPE_DATE
-cdef type PY_TYPE_DATETIME
-cdef type PY_TYPE_DB_OBJECT
-cdef type PY_TYPE_DECIMAL
-cdef type PY_TYPE_INTERVAL_YM
-cdef type PY_TYPE_JSON_ID
-cdef type PY_TYPE_LOB
-cdef type PY_TYPE_MESSAGE
-cdef type PY_TYPE_MESSAGE_QUERY
-cdef type PY_TYPE_MESSAGE_ROW
-cdef type PY_TYPE_MESSAGE_TABLE
-cdef type PY_TYPE_SPARSE_VECTOR
-cdef type PY_TYPE_TIMEDELTA
-
-cdef str DRIVER_NAME
-cdef str DRIVER_VERSION
-cdef str DRIVER_INSTALLATION_URL
-cdef str ARRAY_TYPE_CODE_UINT32
-
-cdef const char* ENCODING_UTF8
-cdef const char* ENCODING_UTF16
-
-cdef class ApiType:
-    cdef:
-        readonly str name
-        tuple dbtypes
-
-
-cdef class DbType:
-    cdef:
-        readonly uint32_t num
-        readonly str name
-        readonly uint32_t default_size
-        uint32_t _native_num
-        uint32_t _buffer_size_factor
-        str _ora_name
-        uint8_t _ora_type_num
-        uint8_t _csfrm
-        uint8_t _default_py_type_num
-        bint _is_fast
-
-    @staticmethod
-    cdef DbType _from_num(uint32_t num)
-
-    @staticmethod
-    cdef DbType _from_ora_name(str name)
-
-    @staticmethod
-    cdef DbType _from_ora_type_and_csfrm(uint8_t ora_type_num, uint8_t csfrm)
-
-
-cdef class DefaultsImpl:
-    cdef:
-        public uint32_t arraysize
-        public str config_dir
-        public bint fetch_lobs
-        public bint fetch_decimals
-        public bint thick_mode_dsn_passthrough
-        public uint32_t prefetchrows
-        public uint32_t stmtcachesize
-        public str program
-        public str machine
-        public str terminal
-        public str osuser
-        public str driver_name
-
-cdef DefaultsImpl C_DEFAULTS
-
-
-cdef class BatchLoadManager:
-    cdef:
-        readonly uint32_t num_rows
-        readonly uint64_t message_offset
-        uint64_t offset
-        BaseCursorImpl cursor_impl
-        uint32_t batch_size
-        uint32_t batch_num
-        object type_handler
-        object cursor
-        object conn
-
-    cdef int _calculate_num_rows_in_batch(self, uint64_t total_rows) except -1
-    @staticmethod
-    cdef BatchLoadManager _create(
-        object parameters,
-        uint32_t batch_size,
-        int error_num,
-    )
-    cdef list _get_all_rows(self)
-    cdef list _get_arrow_arrays(self)
-    cdef int _next_batch(self) except -1
-    cdef int _setup_cursor(self) except -1
-    cdef int _verify_metadata(self, list column_metadata) except -1
-    @staticmethod
-    cdef BatchLoadManager create_for_direct_path_load(
-        object parameters,
-        list column_metadata,
-        uint32_t batch_size,
-    )
-    @staticmethod
-    cdef BatchLoadManager create_for_executemany(
-        object cursor,
-        BaseCursorImpl cursor_impl,
-        object parameters,
-        uint32_t batch_size,
-    )
-
-
-cdef class Buffer:
-    cdef:
-        ssize_t _max_size, _size, _pos
-        char_type[:] _data_view
-        char_type *_data
-        bytearray _data_obj
-
-    cdef int _get_int_length_and_sign(self, uint8_t *length,
-                                      bint *is_negative,
-                                      uint8_t max_length) except -1
-    cdef const char_type* _get_raw(self, ssize_t num_bytes) except NULL
-    cdef int _initialize(self, ssize_t max_size=*) except -1
-    cdef int _populate_from_bytes(self, bytes data) except -1
-    cdef int _read_raw_bytes_and_length(self, const char_type **ptr,
-                                        ssize_t *num_bytes) except -1
-    cdef int _resize(self, ssize_t new_max_size) except -1
-    cdef int _skip_int(self, uint8_t max_length, bint *is_negative) except -1
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1
-    cdef int _write_raw_bytes_and_length(self, const char_type *ptr,
-                                         ssize_t num_bytes) except -1
-    cdef inline ssize_t bytes_left(self)
-    cdef object read_bytes(self)
-    cdef object read_bytes_with_length(self)
-    cdef int read_int32be(self, int32_t *value) except -1
-    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL
-    cdef int read_raw_bytes_and_length(self, const char_type **ptr,
-                                       ssize_t *num_bytes) except -1
-    cdef int read_sb1(self, int8_t *value) except -1
-    cdef int read_sb2(self, int16_t *value) except -1
-    cdef int read_sb4(self, int32_t *value) except -1
-    cdef int read_sb8(self, int64_t *value) except -1
-    cdef bytes read_null_terminated_bytes(self)
-    cdef object read_oracle_data(self, OracleMetadata metadata,
-                                 OracleData* data, bint from_dbobject,
-                                 bint decode_str)
-    cdef object read_str(self, int csfrm, const char* encoding_errors=*)
-    cdef object read_str_with_length(self)
-    cdef int read_ub1(self, uint8_t *value) except -1
-    cdef int read_ub2(self, uint16_t *value) except -1
-    cdef int read_ub4(self, uint32_t *value) except -1
-    cdef int read_ub8(self, uint64_t *value) except -1
-    cdef int read_uint16be(self, uint16_t *value) except -1
-    cdef int read_uint16le(self, uint16_t *value) except -1
-    cdef int read_uint32be(self, uint32_t *value) except -1
-    cdef int skip_raw_bytes(self, ssize_t num_bytes) except -1
-    cdef inline int skip_sb4(self) except -1
-    cdef inline void skip_to(self, ssize_t pos)
-    cdef inline int skip_ub1(self) except -1
-    cdef inline int skip_ub2(self) except -1
-    cdef inline int skip_ub4(self) except -1
-    cdef inline int skip_ub8(self) except -1
-    cdef int write_binary_double(self, double value) except -1
-    cdef int write_binary_float(self, float value) except -1
-    cdef int write_bool(self, bint value) except -1
-    cdef int write_bytes(self, bytes value) except -1
-    cdef int write_bytes_with_length(self, bytes value) except -1
-    cdef int write_interval_ds(self, object value) except -1
-    cdef int write_interval_ym(self, object value) except -1
-    cdef int write_oracle_date(self, object value, uint8_t length) except -1
-    cdef int write_oracle_number(self, bytes num_bytes) except -1
-    cdef int write_oson(self, value, ssize_t max_fname_size,
-                        bint write_length=*) except -1
-    cdef int write_raw(self, const char_type *data, ssize_t length) except -1
-    cdef int write_sb4(self, int32_t value) except -1
-    cdef int write_str(self, str value) except -1
-    cdef int write_uint8(self, uint8_t value) except -1
-    cdef int write_uint16be(self, uint16_t value) except -1
-    cdef int write_uint16le(self, uint16_t value) except -1
-    cdef int write_uint32be(self, uint32_t value) except -1
-    cdef int write_uint64be(self, uint64_t value) except -1
-    cdef int write_ub2(self, uint16_t value) except -1
-    cdef int write_ub4(self, uint32_t value) except -1
-    cdef int write_ub8(self, uint64_t value) except -1
-    cdef int write_vector(self, value) except -1
-
-
-cdef class GrowableBuffer(Buffer):
-
-    cdef int _reserve_space(self, ssize_t num_bytes) except -1
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1
-
-
-cdef class OsonDecoder(Buffer):
-
-    cdef:
-        uint16_t primary_flags, secondary_flags
-        ssize_t field_id_length
-        ssize_t tree_seg_pos
-        list field_names
-        uint8_t version
-        bint relative_offsets
-
-    cdef object _decode_container_node(self, uint8_t node_type)
-    cdef object _decode_node(self)
-    cdef list _get_long_field_names(self, uint32_t num_fields,
-                                    ssize_t offsets_size,
-                                    uint32_t field_names_seg_size)
-    cdef int _get_num_children(self, uint8_t node_type, uint32_t* num_children,
-                               bint* is_shared) except -1
-    cdef int _get_offset(self, uint8_t node_type, uint32_t* offset) except -1
-    cdef list _get_short_field_names(self, uint32_t num_fields,
-                                     ssize_t offsets_size,
-                                     uint32_t field_names_seg_size)
-    cdef object decode(self, bytes data)
-
-
-cdef class OsonFieldName:
-
-    cdef:
-        str name
-        bytes name_bytes
-        ssize_t name_bytes_len
-        uint32_t hash_id
-        uint32_t offset
-        uint32_t field_id
-
-    cdef int _calc_hash_id(self) except -1
-    @staticmethod
-    cdef OsonFieldName create(str name, ssize_t max_fname_size)
-
-
-cdef class OsonFieldNamesSegment(GrowableBuffer):
-
-    cdef:
-        uint32_t num_field_names
-        list field_names
-
-    cdef int add_name(self, OsonFieldName field_name) except -1
-    @staticmethod
-    cdef OsonFieldNamesSegment create()
-    cdef int process_field_names(self, ssize_t field_id_offset) except -1
-
-
-cdef class OsonEncoder(GrowableBuffer):
-
-    cdef:
-        OsonFieldNamesSegment short_fnames_seg
-        OsonFieldNamesSegment long_fnames_seg
-        uint32_t num_field_names
-        ssize_t max_fname_size
-        dict field_names_dict
-        uint8_t field_id_size
-
-    cdef int _add_field_name(self, str name) except -1
-    cdef int _determine_flags(self, object value, uint16_t *flags) except -1
-    cdef int _examine_node(self, object value) except -1
-    cdef int _write_extended_header(self) except -1
-    cdef int _write_fnames_seg(self, OsonFieldNamesSegment seg) except -1
-    cdef int encode(self, object value, ssize_t max_fname_size) except -1
-
-
-cdef class VectorDecoder(Buffer):
-
-    cdef array.array _decode_values(self, uint32_t num_elements,
-                                    uint8_t vector_format)
-    cdef object decode(self, bytes data)
-
-
-cdef class VectorEncoder(GrowableBuffer):
-
-    cdef int _encode_values(self, array.array value, uint32_t num_elements,
-                            uint8_t vector_format) except -1
-    cdef uint8_t _get_vector_format(self, array.array value)
-    cdef int encode(self, object value) except -1
-
-
-cdef class OracleMetadata:
-    cdef:
-        readonly str name
-        readonly DbType dbtype
-        readonly BaseDbObjectTypeImpl objtype
-        readonly int8_t precision
-        readonly int8_t scale
-        readonly uint32_t max_size
-        readonly uint32_t buffer_size
-        readonly bint nulls_allowed
-        readonly bint is_json
-        readonly bint is_oson
-        readonly str domain_schema
-        readonly str domain_name
-        readonly dict annotations
-        readonly uint32_t vector_dimensions
-        readonly uint8_t vector_format
-        readonly uint8_t vector_flags
-        ArrowSchemaImpl _schema_impl
-        uint8_t _py_type_num
-
-    cdef int _create_arrow_schema(self) except -1
-    cdef int _finalize_init(self) except -1
-    cdef int _set_arrow_schema(self, ArrowSchemaImpl schema_impl) except -1
-    cdef int check_convert_from_arrow(self,
-                                      ArrowSchemaImpl schema_impl) except -1
-    cdef int check_convert_to_arrow(self,
-                                    ArrowSchemaImpl schema_impl) except -1
-    cdef OracleMetadata copy(self)
-    @staticmethod
-    cdef OracleMetadata from_arrow_schema(ArrowSchemaImpl schema_impl)
-    @staticmethod
-    cdef OracleMetadata from_type(object typ)
-    @staticmethod
-    cdef OracleMetadata from_value(object value)
-
-
-cdef class ConnectParamsNode:
-    cdef:
-        public bint source_route
-        public bint load_balance
-        public bint failover
-        public bint must_have_children
-        public list children
-        list active_children
-
-    cdef int _copy(self, ConnectParamsNode source) except -1
-    cdef list _get_initial_connect_string_parts(self)
-    cdef int _set_active_children(self, list children) except -1
-
-
-cdef class Address(ConnectParamsNode):
-    cdef:
-        public str host
-        public uint32_t port
-        public str protocol
-        public str https_proxy
-        public uint32_t https_proxy_port
-        str ip_address
-        int ip_family
-
-    cdef str build_connect_string(self)
-    cdef int set_protocol(self, str value) except -1
-    cdef list resolve_host_name(self)
-
-
-cdef class AddressList(ConnectParamsNode):
-
-    cdef bint _uses_tcps(self)
-    cdef str build_connect_string(self)
-
-
-cdef class Description(ConnectParamsNode):
-    cdef:
-        public uint32_t expire_time
-        public uint32_t retry_count
-        public uint32_t retry_delay
-        public uint32_t sdu
-        public double tcp_connect_timeout
-        public str service_name
-        public str instance_name
-        public str server_type
-        public str sid
-        public str cclass
-        public str connection_id_prefix
-        public str pool_boundary
-        public str pool_name
-        public uint32_t purity
-        public bint ssl_server_dn_match
-        public bint use_tcp_fast_open
-        public bint use_sni
-        public str ssl_server_cert_dn
-        public object ssl_version
-        public str wallet_location
-        dict extra_connect_data_args
-        dict extra_security_args
-        dict extra_args
-        str connection_id
-
-    cdef str _build_duration_str(self, double value)
-    cdef str _value_repr(self, object value)
-    cdef str build_connect_string(self, str cid=*)
-    cdef int set_server_type(self, str value) except -1
-
-
-cdef class DescriptionList(ConnectParamsNode):
-
-    cdef str build_connect_string(self)
-    cdef list get_addresses(self)
-    cdef int set_active_children(self) except -1
-
-
-cdef class ConnectParamsImpl:
-    cdef:
-        public str config_dir
-        public str user
-        public str proxy_user
-        public bint events
-        public bint externalauth
-        public uint32_t mode
-        public str edition
-        public list appcontext
-        public str tag
-        public bint matchanytag
-        public list shardingkey
-        public list supershardingkey
-        public uint32_t stmtcachesize
-        public bint disable_oob
-        public object ssl_context
-        public DescriptionList description_list
-        uint64_t _external_handle
-        public str debug_jdwp
-        object access_token_callback
-        object access_token_expires
-        Description _default_description
-        Address _default_address
-        bytearray _password
-        bytearray _password_obfuscator
-        bytearray _new_password
-        bytearray _new_password_obfuscator
-        bytearray _wallet_password
-        bytearray _wallet_password_obfuscator
-        bytearray _token
-        bytearray _token_obfuscator
-        bytearray _private_key
-        bytearray _private_key_obfuscator
-        public str program
-        public str machine
-        public str terminal
-        public str osuser
-        public str driver_name
-        public dict extra_auth_params
-        public bint thick_mode_dsn_passthrough
-        public str _config_cache_key
-
-    cdef int _check_credentials(self) except -1
-    cdef int _copy(self, ConnectParamsImpl other_params) except -1
-    cdef str _get_connect_string(self)
-    cdef bytes _get_new_password(self)
-    cdef bytearray _get_obfuscator(self, str secret_value)
-    cdef bytes _get_password(self)
-    cdef str _get_private_key(self)
-    cdef str _get_token(self)
-    cdef object _get_public_instance(self)
-    cdef object _get_token_expires(self, str token)
-    cdef bint _get_uses_drcp(self)
-    cdef str _get_wallet_password(self)
-    cdef int _parse_connect_string(self, str connect_string) except -1
-    cdef int _set_access_token(self, object val, int error_num) except -1
-    cdef int _set_access_token_param(self, object val) except -1
-    cdef int _set_new_password(self, object password) except -1
-    cdef int _set_password(self, object password) except -1
-    cdef int _set_wallet_password(self, object password) except -1
-    cdef str _transform_password(self, object password)
-    cdef bytearray _xor_bytes(self, bytearray a, bytearray b)
-
-
-cdef class PoolParamsImpl(ConnectParamsImpl):
-    cdef:
-        public uint32_t min
-        public uint32_t max
-        public uint32_t increment
-        public object connectiontype
-        public uint32_t getmode
-        public bint homogeneous
-        public uint32_t timeout
-        public uint32_t wait_timeout
-        public uint32_t max_lifetime_session
-        public object session_callback
-        public uint32_t max_sessions_per_shard
-        public bint soda_metadata_cache
-        public int ping_interval
-        public uint32_t ping_timeout
-
-
-cdef class BaseConnImpl:
-    cdef:
-        readonly bint thin
-        readonly str username
-        readonly str dsn
-        readonly str proxy_user
-        public object inputtypehandler
-        public object outputtypehandler
-        public object warning
-        public bint autocommit
-        public bint invoke_session_callback
-        readonly tuple server_version
-        readonly bint supports_bool
-        ssize_t _oson_max_fname_size
-        bint _allow_bind_str_to_lob
-        bint _in_request
-
-    cdef object _check_value(self, OracleMetadata type_info, object value,
-                             bint* is_ok)
-    cdef BaseCursorImpl _create_cursor_impl(self)
-
-
-cdef class BasePoolImpl:
-    cdef:
-        readonly str dsn
-        readonly bint homogeneous
-        readonly uint32_t increment
-        readonly uint32_t min
-        readonly uint32_t max
-        readonly str username
-        readonly str name
-        ConnectParamsImpl connect_params
-
-
-cdef class BaseCursorImpl:
-    cdef:
-        readonly str statement
-        readonly uint64_t rowcount
-        public uint32_t arraysize
-        public uint32_t prefetchrows
-        public object inputtypehandler
-        public object outputtypehandler
-        public object rowfactory
-        public bint scrollable
-        public bint set_input_sizes
-        public list fetch_metadata
-        public list fetch_vars
-        public list fetch_var_impls
-        public list bind_vars
-        public type bind_style
-        public dict bind_vars_by_name
-        public object warning
-        public bint fetching_arrow
-        public bint suspend_on_success
-        public bint fetch_lobs
-        public bint fetch_decimals
-        public ArrowSchemaImpl schema_impl
-        uint32_t _buffer_rowcount
-        uint32_t _buffer_index
-        uint32_t _fetch_array_size
-        bint _more_rows_to_fetch
-
-    cdef int _bind_values(self, object cursor, object type_handler,
-                          object params, uint32_t num_rows, uint32_t row_num,
-                          bint defer_type_assignment) except -1
-    cdef int _bind_values_by_name(self, object cursor, object type_handler,
-                                  dict params, uint32_t num_rows,
-                                  uint32_t row_num,
-                                  bint defer_type_assignment) except -1
-    cdef int _bind_values_by_position(self, object cursor, object type_handler,
-                                      object params, uint32_t num_rows,
-                                      uint32_t row_num,
-                                      bint defer_type_assignment) except -1
-    cdef int _close(self, bint in_del) except -1
-    cdef BaseVarImpl _create_fetch_var(self, object conn, object cursor,
-                                       object type_handler, bint
-                                       uses_metadata, ssize_t pos,
-                                       OracleMetadata metadata)
-    cdef object _create_row(self)
-    cdef BaseVarImpl _create_var_impl(self, object conn)
-    cdef int _fetch_rows(self, object cursor) except -1
-    cdef BaseConnImpl _get_conn_impl(self)
-    cdef object _get_input_type_handler(self)
-    cdef object _get_output_type_handler(self, bint* uses_fetch_info)
-    cdef int _init_fetch_vars(self, uint32_t num_columns) except -1
-    cdef bint _is_plsql(self)
-    cdef int _perform_binds(self, object conn, uint32_t num_execs) except -1
-    cdef int _prepare(self, str statement, str tag,
-                      bint cache_statement) except -1
-    cdef int _reset_bind_vars(self, uint64_t array_offset,
-                              uint32_t num_rows) except -1
-    cdef int _verify_var(self, object var) except -1
-    cdef int bind_one(self, object cursor, object parameters) except -1
-    cdef object _finish_building_arrow_arrays(self)
-    cdef int _create_arrow_arrays(self) except -1
-
-
-
-cdef class BaseVarImpl:
-    cdef:
-        readonly OracleMetadata metadata
-        readonly uint32_t num_elements
-        readonly object inconverter
-        readonly object outconverter
-        readonly bint bypass_decode
-        readonly str encoding_errors
-        readonly bint is_array
-        readonly bint convert_nulls
-        public uint32_t num_elements_in_array
-        bytes _encoding_error_bytes
-        const char *_encoding_errors
-        BaseConnImpl _conn_impl
-        OracleMetadata _fetch_metadata
-        list _values
-        ArrowArrayImpl _arrow_array
-        bint _has_returned_data
-        bint _is_value_set
-
-    cdef int _bind(self, object conn, BaseCursorImpl cursor,
-                   uint32_t num_execs, object name, uint32_t pos) except -1
-    cdef int _check_and_set_scalar_value(self, uint32_t pos, object value,
-                                         bint* was_set) except -1
-    cdef int _check_and_set_value(self, uint32_t pos, object value,
-                                  bint* was_set) except -1
-    cdef DbType _check_fetch_conversion(self)
-    cdef int _create_arrow_array(self) except -1
-    cdef int _finalize_init(self) except -1
-    cdef ArrowArrayImpl _finish_building_arrow_array(self)
-    cdef DbType _get_adjusted_type(self, uint8_t ora_type_num)
-    cdef list _get_array_value(self)
-    cdef object _get_scalar_value(self, uint32_t pos)
-    cdef int _on_reset_bind(self, uint64_t array_offset,
-                            uint32_t num_rows) except -1
-    cdef int _resize(self, uint32_t new_size) except -1
-    cdef int _set_metadata_from_type(self, object typ) except -1
-    cdef int _set_metadata_from_value(self, object value,
-                                      bint is_plsql) except -1
-    cdef int _set_num_elements_in_array(self, uint32_t num_elements) except -1
-    cdef int _set_scalar_value(self, uint32_t pos, object value) except -1
-
-
-cdef class BaseLobImpl:
-    cdef:
-        readonly DbType dbtype
-
-
-cdef class BaseDbObjectTypeImpl:
-    cdef:
-        readonly str schema
-        readonly str name
-        readonly str package_name
-        readonly list attrs
-        readonly bint is_collection
-        readonly dict attrs_by_name
-        readonly OracleMetadata element_metadata
-        readonly BaseConnImpl _conn_impl
-
-    cpdef str _get_fqn(self)
-
-
-cdef class BaseDbObjectAttrImpl(OracleMetadata):
-    pass
-
-
-cdef class BaseDbObjectImpl:
-    cdef:
-        readonly BaseDbObjectTypeImpl type
-
-    cdef int _check_max_size(self, object value, uint32_t max_size,
-                             ssize_t* actual_size, bint* violated) except -1
-
-
-cdef class BaseSodaDbImpl:
-    cdef:
-        public bint supports_json
-        object _conn
-
-
-cdef class BaseSodaCollImpl:
-    cdef:
-        readonly str name
-
-
-cdef class BaseSodaDocImpl:
-    pass
-
-
-cdef class BaseSodaDocCursorImpl:
-    pass
-
-
-cdef class BaseQueueImpl:
-    cdef:
-        readonly str name
-        readonly BaseDbObjectTypeImpl payload_type
-        readonly BaseDeqOptionsImpl deq_options_impl
-        readonly BaseEnqOptionsImpl enq_options_impl
-        readonly bint is_json
-
-
-cdef class BaseDeqOptionsImpl:
-    pass
-
-
-cdef class BaseEnqOptionsImpl:
-    pass
-
-
-cdef class BaseMsgPropsImpl:
-    cdef:
-        public object payload
-
-
-cdef class BaseSubscrImpl:
-    cdef:
-        readonly object callback
-        readonly object connection
-        readonly uint32_t namespace
-        readonly str name
-        readonly uint32_t protocol
-        readonly str ip_address
-        readonly uint32_t port
-        readonly uint32_t timeout
-        readonly uint32_t operations
-        readonly uint32_t qos
-        readonly uint64_t id
-        readonly uint8_t grouping_class
-        readonly uint32_t grouping_value
-        readonly uint8_t grouping_type
-        readonly bint client_initiated
-
-
-cdef class BindVar:
-    cdef:
-        object var
-        BaseVarImpl var_impl
-        object name
-        ssize_t pos
-        bint has_value
-
-    cdef int _create_var_from_type(self, object conn,
-                                   BaseCursorImpl cursor_impl,
-                                   object value) except -1
-    cdef int _create_var_from_value(self, object conn,
-                                    BaseCursorImpl cursor_impl, object value,
-                                    uint32_t num_elements) except -1
-    cdef int _set_by_type(self, object conn, BaseCursorImpl cursor_impl,
-                          object typ) except -1
-    cdef int _set_by_value(self, object conn, BaseCursorImpl cursor_impl,
-                           object cursor, object value, object type_handler,
-                           uint32_t row_num, uint32_t num_elements,
-                           bint defer_type_assignment) except -1
-
-
-cdef class BaseParser:
-
-    cdef:
-        ssize_t pos, temp_pos, num_chars
-        str data_as_str
-        int data_kind
-        void *data
-
-    cdef Py_UCS4 get_current_char(self)
-    cdef int initialize(self, str data_to_parse) except -1
-    cdef int parse_keyword(self) except -1
-    cdef int parse_quoted_string(self, Py_UCS4 quote_type) except -1
-    cdef int skip_spaces(self) except -1
-
-
-cdef class PipelineImpl:
-    cdef:
-        readonly list operations
-
-
-cdef class PipelineOpImpl:
-    cdef:
-        readonly str statement
-        readonly str name
-        readonly object parameters
-        readonly object keyword_parameters
-        readonly object return_type
-        readonly object rowfactory
-        readonly uint32_t arraysize
-        readonly uint32_t num_rows
-        readonly uint8_t op_type
-        readonly bint fetch_lobs
-        readonly bint fetch_decimals
-        BatchLoadManager batch_load_manager
-        uint32_t num_execs
-
-
-cdef class PipelineOpResultImpl:
-    cdef:
-        readonly PipelineOpImpl operation
-        readonly object return_value
-        readonly list rows
-        readonly object error
-        readonly object warning
-        readonly list fetch_metadata
-
-    cdef int _capture_err(self, Exception exc) except -1
-
-
-cdef class SparseVectorImpl:
-    cdef:
-        readonly uint32_t num_dimensions
-        readonly array.array indices
-        readonly array.array values
-
-
-cdef struct OracleDate:
-    int16_t year
-    uint8_t month
-    uint8_t day
-    uint8_t hour
-    uint8_t minute
-    uint8_t second
-    uint32_t fsecond
-    int8_t tz_hour_offset
-    int8_t tz_minute_offset
-
-
-cdef struct OracleIntervalDS:
-    int32_t days
-    int8_t hours
-    int8_t minutes
-    int8_t seconds
-    int32_t fseconds
-
-
-cdef struct OracleIntervalYM:
-    int32_t years
-    int8_t months
-
-
-cdef struct OracleNumber:
-    bint is_integer
-    bint is_max_negative_value
-    uint8_t num_chars
-    char_type chars[173]
-
-
-cdef struct OracleRawBytes:
-    const char_type *ptr
-    ssize_t num_bytes
-
-
-cdef union OracleDataBuffer:
-    OracleDate as_date
-    OracleNumber as_number
-    OracleIntervalDS as_interval_ds
-    OracleIntervalYM as_interval_ym
-    OracleRawBytes as_raw_bytes
-    int32_t as_integer
-    double as_double
-    float as_float
-    bint as_bool
-
-
-cdef struct OracleData:
-    bint is_null
-    OracleDataBuffer buffer
-
-
-cdef object convert_arrow_to_oracle_data(OracleMetadata metadata,
-                                         OracleData* data,
-                                         ArrowArrayImpl array_impl,
-                                         ssize_t array_index)
-cdef int convert_oracle_data_to_arrow(OracleMetadata from_metadata,
-                                      OracleMetadata to_metadatda,
-                                      OracleData* data,
-                                      ArrowArrayImpl array_impl) except -1
-cdef object convert_oracle_data_to_python(OracleMetadata from_metadata,
-                                          OracleMetadata to_metadatda,
-                                          OracleData* data,
-                                          const char* encoding_errors,
-                                          bint from_dbobject)
-cdef object convert_python_to_oracle_data(OracleMetadata metadata,
-                                          OracleData* data,
-                                          object value)
-cdef int convert_vector_to_arrow(ArrowArrayImpl array_impl,
-                                 object vector) except -1
-cdef cydatetime.datetime convert_date_to_python(OracleDataBuffer *buffer)
-cdef uint16_t decode_uint16be(const char_type *buf)
-cdef uint32_t decode_uint32be(const char_type *buf)
-cdef uint16_t decode_uint16le(const char_type *buf)
-cdef uint64_t decode_uint64be(const char_type *buf)
-cdef int decode_date(const uint8_t* ptr, ssize_t num_bytes,
-                     OracleDataBuffer *buffer)
-cdef void encode_uint16be(char_type *buf, uint16_t value)
-cdef void encode_uint16le(char_type *buf, uint16_t value)
-cdef void encode_uint32be(char_type *buf, uint32_t value)
-cdef void encode_uint64be(char_type *buf, uint64_t value)
diff --git a/src/oracledb/base_impl.pyx b/src/oracledb/base_impl.pyx
deleted file mode 100644
index 5eadf008..00000000
--- a/src/oracledb/base_impl.pyx
+++ /dev/null
@@ -1,179 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# base_impl.pyx
-#
-# Cython file for the base implementation that the thin and thick
-# implementations use.
-#------------------------------------------------------------------------------
-
-# cython: language_level=3
-
-cimport cython
-cimport cpython
-cimport cpython.datetime as cydatetime
-
-from libc cimport errno
-from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
-from libc.stdint cimport UINT8_MAX, UINT16_MAX, UINT32_MAX, UINT64_MAX
-from libc.stdlib cimport strtod, strtof, strtoll, strtoull
-from libc.string cimport memcpy
-from cpython cimport array
-from cpython.conversion cimport PyOS_snprintf
-
-from .constants import VECTOR_META_FLAG_SPARSE_VECTOR
-
-from .arrow_impl cimport (
-    DataFrameImpl,
-    NANOARROW_TIME_UNIT_SECOND,
-    NANOARROW_TIME_UNIT_MILLI,
-    NANOARROW_TIME_UNIT_MICRO,
-    NANOARROW_TIME_UNIT_NANO,
-    NANOARROW_TYPE_NA,
-    NANOARROW_TYPE_BOOL,
-    NANOARROW_TYPE_BINARY,
-    NANOARROW_TYPE_DATE32,
-    NANOARROW_TYPE_DATE64,
-    NANOARROW_TYPE_DECIMAL128,
-    NANOARROW_TYPE_DOUBLE,
-    NANOARROW_TYPE_FIXED_SIZE_BINARY,
-    NANOARROW_TYPE_FIXED_SIZE_LIST,
-    NANOARROW_TYPE_FLOAT,
-    NANOARROW_TYPE_INT8,
-    NANOARROW_TYPE_INT16,
-    NANOARROW_TYPE_INT32,
-    NANOARROW_TYPE_INT64,
-    NANOARROW_TYPE_LIST,
-    NANOARROW_TYPE_LARGE_BINARY,
-    NANOARROW_TYPE_LARGE_STRING,
-    NANOARROW_TYPE_STRING,
-    NANOARROW_TYPE_STRUCT,
-    NANOARROW_TYPE_TIMESTAMP,
-    NANOARROW_TYPE_UINT8,
-    NANOARROW_TYPE_UINT16,
-    NANOARROW_TYPE_UINT32,
-    NANOARROW_TYPE_UINT64,
-    ArrowArrayImpl,
-)
-
-import array
-
-import base64
-import collections
-import copy
-import copy
-import datetime
-import decimal
-import getpass
-import inspect
-import json
-import os
-import random
-import secrets
-import socket
-import ssl
-import string
-import sys
-import time
-import warnings
-
-cydatetime.import_datetime()
-
-# Python types used by the driver
-cdef type PY_TYPE_ARROW_ARRAY
-cdef type PY_TYPE_ASYNC_CURSOR
-cdef type PY_TYPE_ASYNC_LOB
-cdef type PY_TYPE_BOOL = bool
-cdef type PY_TYPE_CURSOR
-cdef type PY_TYPE_DATAFRAME
-cdef type PY_TYPE_DATE = datetime.date
-cdef type PY_TYPE_DATETIME = datetime.datetime
-cdef type PY_TYPE_DB_OBJECT
-cdef type PY_TYPE_DECIMAL = decimal.Decimal
-cdef type PY_TYPE_DB_OBJECT_TYPE
-cdef type PY_TYPE_FETCHINFO
-cdef type PY_TYPE_JSON_ID
-cdef type PY_TYPE_INTERVAL_YM
-cdef type PY_TYPE_LOB
-cdef type PY_TYPE_MESSAGE
-cdef type PY_TYPE_MESSAGE_QUERY
-cdef type PY_TYPE_MESSAGE_ROW
-cdef type PY_TYPE_MESSAGE_TABLE
-cdef type PY_TYPE_SPARSE_VECTOR
-cdef type PY_TYPE_TIMEDELTA = datetime.timedelta
-cdef type PY_TYPE_VAR
-
-# enumerations used by the driver in connect parameters
-cdef object ENUM_AUTH_MODE
-cdef object ENUM_POOL_GET_MODE
-cdef object ENUM_PURITY
-
-cdef const char* DRIVER_NAME = "python-oracledb"
-cdef const char* DRIVER_VERSION
-cdef const char* DRIVER_INSTALLATION_URL = \
-        "https://python-oracledb.readthedocs.io/en/" \
-        "latest/user_guide/initialization.html"
-cdef const char* ENCODING_UTF8 = "UTF-8"
-cdef const char* ENCODING_UTF16 = "UTF-16BE"
-
-# variables needed for dates when using pyarrow
-cdef cydatetime.datetime EPOCH_DATE = datetime.datetime(1970, 1, 1)
-
-# protocols registered with the library
-REGISTERED_PROTOCOLS = {}
-
-# password types registered with the library
-REGISTERED_PASSWORD_TYPES = {}
-
-# params hooks registered with the library
-REGISTERED_PARAMS_HOOKS = []
-
-include "impl/base/types.pyx"
-include "impl/base/constants.pxi"
-include "impl/base/decoders.pyx"
-include "impl/base/encoders.pyx"
-include "impl/base/metadata.pyx"
-include "impl/base/utils.pyx"
-include "impl/base/defaults.pyx"
-include "impl/base/pipeline.pyx"
-include "impl/base/converters.pyx"
-include "impl/base/buffer.pyx"
-include "impl/base/parsers.pyx"
-include "impl/base/oson.pyx"
-include "impl/base/vector.pyx"
-include "impl/base/connect_params.pyx"
-include "impl/base/pool_params.pyx"
-include "impl/base/connection.pyx"
-include "impl/base/pool.pyx"
-include "impl/base/cursor.pyx"
-include "impl/base/var.pyx"
-include "impl/base/bind_var.pyx"
-include "impl/base/batch_load_manager.pyx"
-include "impl/base/dbobject.pyx"
-include "impl/base/lob.pyx"
-include "impl/base/soda.pyx"
-include "impl/base/queue.pyx"
-include "impl/base/subscr.pyx"
diff --git a/src/oracledb/builtin_hooks.py b/src/oracledb/builtin_hooks.py
deleted file mode 100644
index 00324b1e..00000000
--- a/src/oracledb/builtin_hooks.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# config_provider.py
-#
-# Contains the built-in config providers.
-# -----------------------------------------------------------------------------
-
-import base64
-import json
-import os
-import urllib.parse
-import warnings
-
-from . import errors
-from .utils import register_password_type, register_protocol
-
-
-def config_provider_file_hook(protocol, protocol_arg, connect_params):
-    """
-    Hook for "config-file://". The protocol_arg is expected to be the name of a
-    file containing one or more configurations. An optional "key" parameter is
-    allowed which will choose a configuration from a set of configurations
-    stored in the file.
-    """
-    pos = protocol_arg.find("?")
-    if pos < 0:
-        file_name = protocol_arg
-        key = None
-    else:
-        file_name = protocol_arg[:pos]
-        args = urllib.parse.parse_qs(protocol_arg[pos + 1 :])
-        key = args.get("key")
-        if key is not None:
-            key = key[0]
-    if not os.path.isabs(file_name):
-        if connect_params.config_dir is None:
-            errors._raise_err(errors.ERR_NO_CONFIG_DIR)
-        file_name = os.path.join(connect_params.config_dir, file_name)
-    config = json.load(open(file_name))
-    if key is not None:
-        config = config[key]
-    connect_params.set_from_config(config)
-
-
-register_protocol("config-file", config_provider_file_hook)
-
-
-def ldap_hook(protocol, arg, params):
-    """
-    Default hook for LDAP which simply points the user to the documentation
-    which explains how they can write their own hook for LDAP.
-    This hook is needed for python-oracledb Thin mode,or when
-    defaults.thick_mode_dsn_passthrough is False in Thick mode.
-    """
-    doc_url = (
-        "https://python-oracledb.readthedocs.io/en/latest"
-        "/user_guide/connection_handling.html#ldap-directory-naming"
-    )
-    message = (
-        f"To use an LDAP URL in python-oracledb, "
-        f"register an LDAP resolution function as shown in {doc_url}"
-    )
-    raise Exception(message)
-
-
-register_protocol("ldap", ldap_hook)
-register_protocol("ldaps", ldap_hook)
-
-
-def password_type_base64_hook(args):
-    """
-    Hook for password type "base64". The key "value" in the supplied args is
-    expected to be a base64-encoded string.
-    """
-    warnings.warn("base64 encoded passwords are insecure")
-    return base64.b64decode(args["value"].encode()).decode()
-
-
-register_password_type("base64", password_type_base64_hook)
diff --git a/src/oracledb/connect_params.py b/src/oracledb/connect_params.py
deleted file mode 100644
index 68410a63..00000000
--- a/src/oracledb/connect_params.py
+++ /dev/null
@@ -1,1266 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# connect_params.py
-#
-# Contains the ConnectParams class used for managing the parameters required to
-# establish a connection to the database.
-#
-# *** NOTICE *** This file is generated from a template and should not be
-# modified directly. See build_from_template.py in the utils subdirectory for
-# more information.
-# -----------------------------------------------------------------------------
-
-import functools
-import ssl
-from typing import Union, Callable, Any, Optional
-
-import oracledb
-
-from .base import BaseMetaClass
-from . import base_impl, utils
-
-
-class ConnectParams(metaclass=BaseMetaClass):
-    """
-    Contains all parameters used for establishing a connection to the
-    database.
-    """
-
-    __slots__ = ["_impl"]
-    _impl_class = base_impl.ConnectParamsImpl
-
-    @utils.params_initer
-    def __init__(
-        self,
-        *,
-        user: Optional[str] = None,
-        proxy_user: Optional[str] = None,
-        password: Optional[str] = None,
-        newpassword: Optional[str] = None,
-        wallet_password: Optional[str] = None,
-        access_token: Optional[Union[str, tuple, Callable]] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        protocol: Optional[str] = None,
-        https_proxy: Optional[str] = None,
-        https_proxy_port: Optional[int] = None,
-        service_name: Optional[str] = None,
-        instance_name: Optional[str] = None,
-        sid: Optional[str] = None,
-        server_type: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: Optional[oracledb.Purity] = None,
-        expire_time: Optional[int] = None,
-        retry_count: Optional[int] = None,
-        retry_delay: Optional[int] = None,
-        tcp_connect_timeout: Optional[float] = None,
-        ssl_server_dn_match: Optional[bool] = None,
-        ssl_server_cert_dn: Optional[str] = None,
-        wallet_location: Optional[str] = None,
-        events: Optional[bool] = None,
-        externalauth: Optional[bool] = None,
-        mode: Optional[oracledb.AuthMode] = None,
-        disable_oob: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        edition: Optional[str] = None,
-        tag: Optional[str] = None,
-        matchanytag: Optional[bool] = None,
-        config_dir: Optional[str] = None,
-        appcontext: Optional[list] = None,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-        debug_jdwp: Optional[str] = None,
-        connection_id_prefix: Optional[str] = None,
-        ssl_context: Optional[Any] = None,
-        sdu: Optional[int] = None,
-        pool_boundary: Optional[str] = None,
-        use_tcp_fast_open: Optional[bool] = None,
-        ssl_version: Optional[ssl.TLSVersion] = None,
-        program: Optional[str] = None,
-        machine: Optional[str] = None,
-        terminal: Optional[str] = None,
-        osuser: Optional[str] = None,
-        driver_name: Optional[str] = None,
-        use_sni: Optional[bool] = None,
-        thick_mode_dsn_passthrough: Optional[bool] = None,
-        extra_auth_params: Optional[dict] = None,
-        pool_name: Optional[str] = None,
-        handle: Optional[int] = None,
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        - ``user``: the name of the database user to connect to
-          (default: None)
-
-        - ``proxy_user``: the name of the proxy user to connect to. If this
-          value is not specified, it will be parsed out of user if user is in
-          the form "user[proxy_user]"
-          (default: None)
-
-        - ``password``: the password for the database user
-          (default: None)
-
-        - ``newpassword``: a new password for the database user. The new
-          password will take effect immediately upon a successful connection to
-          the database
-          (default: None)
-
-        - ``wallet_password``: the password to use to decrypt the wallet, if it
-          is encrypted. This is not the database password. For Oracle
-          Autonomous Database this is the password created when downloading the
-          wallet. This value is only used in python-oracledb Thin mode.
-          (default: None)
-
-        - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-          string, it specifies an Entra ID OAuth2 token used for Open
-          Authorization (OAuth 2.0) token based authentication. If it is a
-          2-tuple, it specifies the token and private key strings used for
-          Oracle Cloud Infrastructure (OCI) Identity and Access Management
-          (IAM) token based authentication. If it is a callable, it returns
-          either a string or a 2-tuple used for OAuth 2.0 or OCI IAM token
-          based authentication and is useful when the pool needs to expand and
-          create new connections but the current authentication token has
-          expired
-          (default: None)
-
-        - ``host``: the hostname or IP address of the machine hosting the
-          database or the database listener
-          (default: None)
-
-        - ``port``: the port number on which the database listener is listening
-          (default: 1521)
-
-        - ``protocol``: one of the strings "tcp" or "tcps" indicating whether
-          to use unencrypted network traffic or encrypted network traffic (TLS)
-          (default: "tcp")
-
-        - ``https_proxy``: the hostname or IP address of a proxy host to use
-          for tunneling secure connections
-          (default: None)
-
-        - ``https_proxy_port``: the port on which to communicate with the proxy
-          host
-          (default: 0)
-
-        - ``service_name``: the service name of the database
-          (default: None)
-
-        - ``instance_name``: the instance name of the database
-          (default: None)
-
-        - ``sid``: the system identifier (SID) of the database. Note using a
-          service_name instead is recommended
-          (default: None)
-
-        - ``server_type``: the type of server connection that should be
-          established. If specified, it should be one of strings "dedicated",
-          "shared" or "pooled"
-          (default: None)
-
-        - ``cclass``: the connection class to use for Database Resident
-          Connection Pooling (DRCP)
-          (default: None)
-
-        - ``purity``: the connection purity to use for Database Resident
-          Connection Pooling (DRCP)
-          (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-        - ``expire_time``: the number of minutes between the sending of
-          keepalive probes. If this parameter is set to a value greater than
-          zero it enables keepalive
-          (default: 0)
-
-        - ``retry_count``: the number of times that initial connection
-          establishment should be retried before the connection attempt is
-          terminated
-          (default: 0)
-
-        - ``retry_delay``: the number of seconds to wait before retrying to
-          establish a connection
-          (default: 1)
-
-        - ``tcp_connect_timeout``: a float indicating the maximum number of
-          seconds to wait when establishing a connection to the database host
-          (default: 20.0)
-
-        - ``ssl_server_dn_match``: a boolean indicating whether the server
-          certificate distinguished name (DN) should be matched in addition to
-          the regular certificate verification that is performed. Note that if
-          the ssl_server_cert_dn parameter is not privided, host name matching
-          is performed instead
-          (default: True)
-
-        - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-          matched with the server. This value is ignored if the
-          ssl_server_dn_match parameter is not set to the value True. If
-          specified this value is used for any verfication. Otherwise the
-          hostname will be used
-          (default: None)
-
-        - ``wallet_location``: the directory where the wallet can be found. In
-          python-oracledb Thin mode this must be the directory containing the
-          PEM-encoded wallet file ewallet.pem. In python-oracledb Thick mode
-          this must be the directory containing the file cwallet.sso
-          (default: None)
-
-        - ``events``: a boolean specifying whether events mode should be
-          enabled. This value is only used in python-oracledb Thick mode and is
-          needed for continuous query notification and high availability event
-          notifications
-          (default: False)
-
-        - ``externalauth``: a boolean indicating whether to use external
-          authentication
-          (default: False)
-
-        - ``mode``: the authorization mode to use. One of the constants
-          :data:`oracledb.AUTH_MODE_DEFAULT`,
-          :data:`oracledb.AUTH_MODE_PRELIM`, :data:`oracledb.AUTH_MODE_SYSASM`,
-          :data:`oracledb.AUTH_MODE_SYSBKP`, :data:`oracledb.AUTH_MODE_SYSDBA`,
-          :data:`oracledb.AUTH_MODE_SYSDGD`, :data:`oracledb.AUTH_MODE_SYSKMT`,
-          :data:`oracledb.AUTH_MODE_SYSOPER`, or
-          :data:`oracledb.AUTH_MODE_SYSRAC`
-          (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-        - ``disable_oob``: a boolean indicating whether out-of-band breaks
-          should be disabled. This value is only used in python-oracledb Thin
-          mode. It has no effect on Windows which does not support this
-          functionality
-          (default: False)
-
-        - ``stmtcachesize``: the size of the statement cache
-          (default: :attr:`oracledb.defaults.stmtcachesize
-          <Defaults.stmtcachesize>`)
-
-        - ``edition``: edition to use for the connection. This parameter cannot
-          be used simultaneously with the cclass parameter
-          (default: None)
-
-        - ``tag``: identifies the type of connection that should be returned
-          from a pool. This value is only used in python-oracledb Thick mode
-          (default: None)
-
-        - ``matchanytag``: a boolean specifying whether any tag can be used
-          when acquiring a connection from the pool. This value is only used in
-          python-oracledb Thick mode
-          (default: False)
-
-        - ``config_dir``: a directory in which the optional tnsnames.ora
-          configuration file is located. This value is only used in python-
-          oracledb Thin mode. For python-oracledb Thick mode, it is used if
-          :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-          mode use the ``config_dir`` parameter of
-          :meth:`oracledb.init_oracle_client()`
-          (default: :attr:`oracledb.defaults.config_dir
-          <Defaults.config_dir>`)
-
-        - ``appcontext``: application context used by the connection. It should
-          be a list of 3-tuples (namespace, name, value) and each entry in the
-          tuple should be a string
-          (default: None)
-
-        - ``shardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-          (default: None)
-
-        - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-          (default: None)
-
-        - ``debug_jdwp``: a string with the format "host=<host>;port=<port>"
-          that specifies the host and port of the PL/SQL debugger. This value
-          is only used in python-oracledb Thin mode.  For python-oracledb Thick
-          mode set the ORA_DEBUG_JDWP environment variable
-          (default: None)
-
-        - ``connection_id_prefix``: an application specific prefix that is
-          added to the connection identifier used for tracing
-          (default: None)
-
-        - ``ssl_context``: an SSLContext object used for connecting to the
-          database using TLS.  This SSL context will be modified to include the
-          private key or any certificates found in a separately supplied
-          wallet. This parameter should only be specified if the default
-          SSLContext object cannot be used
-          (default: None)
-
-        - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes.
-          The value tunes internal buffers used for communication to the
-          database. Bigger values can increase throughput for large queries or
-          bulk data loads, but at the cost of higher memory use. The SDU size
-          that will actually be used is negotiated down to the lower of this
-          value and the database network SDU configuration value
-          (default: 8192)
-
-        - ``pool_boundary``: one of the values "statement" or "transaction"
-          indicating when pooled DRCP connections can be returned to the pool.
-          This requires the use of DRCP with Oracle Database 23.4 or higher
-          (default: None)
-
-        - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast
-          open. This is an Oracle Autonomous Database Serverless (ADB-S)
-          specific property for clients connecting from within OCI Cloud
-          network. Please refer to the ADB-S documentation for more information
-          (default: False)
-
-        - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-          ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-          (default: None)
-
-        - ``program``: a string recorded by Oracle Database as the program from
-          which the connection originates
-          (default: :attr:`oracledb.defaults.program
-          <Defaults.program>`)
-
-        - ``machine``: a string recorded by Oracle Database as the name of the
-          machine from which the connection originates
-          (default: :attr:`oracledb.defaults.machine
-          <Defaults.machine>`)
-
-        - ``terminal``: a string recorded by Oracle Database as the terminal
-          identifier from which the connection originates
-          (default: :attr:`oracledb.defaults.terminal
-          <Defaults.terminal>`)
-
-        - ``osuser``: a string recorded by Oracle Database as the operating
-          system user who originated the connection
-          (default: :attr:`oracledb.defaults.osuser
-          <Defaults.osuser>`)
-
-        - ``driver_name``: a string recorded by Oracle Database as the name of
-          the driver which originated the connection
-          (default: :attr:`oracledb.defaults.driver_name
-          <Defaults.driver_name>`)
-
-        - ``use_sni``: a boolean indicating whether to use the TLS SNI
-          extension to bypass the second TLS neogiation that would otherwise be
-          required
-          (default: False)
-
-        - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass
-          the connect string to the Oracle Client libraries unchanged without
-          parsing by the driver. Setting this to False makes python-oracledb
-          Thick and Thin mode applications behave similarly regarding
-          connection string parameter handling and locating any optional
-          tnsnames.ora configuration file
-          (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>`)
-
-        - ``extra_auth_params``: a dictionary containing configuration
-          parameters necessary for Oracle Database authentication using
-          plugins, such as the Azure and OCI cloud-native authentication
-          plugins
-          (default: None)
-
-        - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP
-          with Oracle Database 23.4, or higher
-          (default: None)
-
-        - ``handle``: an integer representing a pointer to a valid service
-          context handle. This value is only used in python-oracledb Thick
-          mode. It should be used with extreme caution
-          (default: 0)
-        """
-        pass
-
-    def __repr__(self):
-        return (
-            self.__class__.__qualname__ + "("
-            f"user={self.user!r}, "
-            f"proxy_user={self.proxy_user!r}, "
-            f"host={self.host!r}, "
-            f"port={self.port!r}, "
-            f"protocol={self.protocol!r}, "
-            f"https_proxy={self.https_proxy!r}, "
-            f"https_proxy_port={self.https_proxy_port!r}, "
-            f"service_name={self.service_name!r}, "
-            f"instance_name={self.instance_name!r}, "
-            f"sid={self.sid!r}, "
-            f"server_type={self.server_type!r}, "
-            f"cclass={self.cclass!r}, "
-            f"purity={self.purity!r}, "
-            f"expire_time={self.expire_time!r}, "
-            f"retry_count={self.retry_count!r}, "
-            f"retry_delay={self.retry_delay!r}, "
-            f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
-            f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
-            f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
-            f"wallet_location={self.wallet_location!r}, "
-            f"events={self.events!r}, "
-            f"externalauth={self.externalauth!r}, "
-            f"mode={self.mode!r}, "
-            f"disable_oob={self.disable_oob!r}, "
-            f"stmtcachesize={self.stmtcachesize!r}, "
-            f"edition={self.edition!r}, "
-            f"tag={self.tag!r}, "
-            f"matchanytag={self.matchanytag!r}, "
-            f"config_dir={self.config_dir!r}, "
-            f"appcontext={self.appcontext!r}, "
-            f"shardingkey={self.shardingkey!r}, "
-            f"supershardingkey={self.supershardingkey!r}, "
-            f"debug_jdwp={self.debug_jdwp!r}, "
-            f"connection_id_prefix={self.connection_id_prefix!r}, "
-            f"ssl_context={self.ssl_context!r}, "
-            f"sdu={self.sdu!r}, "
-            f"pool_boundary={self.pool_boundary!r}, "
-            f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
-            f"ssl_version={self.ssl_version!r}, "
-            f"program={self.program!r}, "
-            f"machine={self.machine!r}, "
-            f"terminal={self.terminal!r}, "
-            f"osuser={self.osuser!r}, "
-            f"driver_name={self.driver_name!r}, "
-            f"use_sni={self.use_sni!r}, "
-            f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}, "
-            f"extra_auth_params={self.extra_auth_params!r}, "
-            f"pool_name={self.pool_name!r}"
-            ")"
-        )
-
-    def _flatten_value(f):
-        """
-        Helper function used to flatten arrays of values if they only contain a
-        single item.
-        """
-
-        @functools.wraps(f)
-        def wrapped(self):
-            values = f(self)
-            return values if len(values) > 1 else values[0]
-
-        return wrapped
-
-    @property
-    def appcontext(self) -> list:
-        """
-        Application context used by the connection. It should be a list of
-        3-tuples (namespace, name, value) and each entry in the tuple should be
-        a string.
-        """
-        return self._impl.appcontext
-
-    @property
-    @_flatten_value
-    def cclass(self) -> Union[list, str]:
-        """
-        The connection class to use for Database Resident Connection Pooling
-        (DRCP).
-        """
-        return [d.cclass for d in self._impl.description_list.children]
-
-    @property
-    def config_dir(self) -> str:
-        """
-        A directory in which the optional tnsnames.ora configuration file is
-        located. This value is only used in python-oracledb Thin mode. For
-        python-oracledb Thick mode, it is used if
-        :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-        <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-        mode use the ``config_dir`` parameter of
-        :meth:`oracledb.init_oracle_client()`.
-        """
-        return self._impl.config_dir
-
-    @property
-    @_flatten_value
-    def connection_id_prefix(self) -> Union[list, str]:
-        """
-        An application specific prefix that is added to the connection
-        identifier used for tracing.
-        """
-        return [
-            d.connection_id_prefix
-            for d in self._impl.description_list.children
-        ]
-
-    @property
-    def debug_jdwp(self) -> str:
-        """
-        A string with the format "host=<host>;port=<port>" that specifies the
-        host and port of the PL/SQL debugger. This value is only used in
-        python-oracledb Thin mode.  For python-oracledb Thick mode set the
-        ORA_DEBUG_JDWP environment variable.
-        """
-        return self._impl.debug_jdwp
-
-    @property
-    def disable_oob(self) -> bool:
-        """
-        A boolean indicating whether out-of-band breaks should be disabled.
-        This value is only used in python-oracledb Thin mode. It has no effect
-        on Windows which does not support this functionality.
-        """
-        return self._impl.disable_oob
-
-    @property
-    def driver_name(self) -> str:
-        """
-        A string recorded by Oracle Database as the name of the driver which
-        originated the connection.
-        """
-        return self._impl.driver_name
-
-    @property
-    def edition(self) -> str:
-        """
-        Edition to use for the connection. This parameter cannot be used
-        simultaneously with the cclass parameter.
-        """
-        return self._impl.edition
-
-    @property
-    def events(self) -> bool:
-        """
-        A boolean specifying whether events mode should be enabled. This value
-        is only used in python-oracledb Thick mode and is needed for continuous
-        query notification and high availability event notifications.
-        """
-        return self._impl.events
-
-    @property
-    @_flatten_value
-    def expire_time(self) -> Union[list, int]:
-        """
-        The number of minutes between the sending of keepalive probes. If this
-        parameter is set to a value greater than zero it enables keepalive.
-        """
-        return [d.expire_time for d in self._impl.description_list.children]
-
-    @property
-    def externalauth(self) -> bool:
-        """
-        A boolean indicating whether to use external authentication.
-        """
-        return self._impl.externalauth
-
-    @property
-    def extra_auth_params(self) -> dict:
-        """
-        A dictionary containing configuration parameters necessary for Oracle
-        Database authentication using plugins, such as the Azure and OCI cloud-
-        native authentication plugins.
-        """
-        return self._impl.extra_auth_params
-
-    @property
-    @_flatten_value
-    def host(self) -> Union[list, str]:
-        """
-        The hostname or IP address of the machine hosting the database or the
-        database listener.
-        """
-        return [a.host for a in self._impl._get_addresses()]
-
-    @property
-    @_flatten_value
-    def https_proxy(self) -> Union[list, str]:
-        """
-        The hostname or IP address of a proxy host to use for tunneling secure
-        connections.
-        """
-        return [a.https_proxy for a in self._impl._get_addresses()]
-
-    @property
-    @_flatten_value
-    def https_proxy_port(self) -> Union[list, int]:
-        """
-        The port on which to communicate with the proxy host.
-        """
-        return [a.https_proxy_port for a in self._impl._get_addresses()]
-
-    @property
-    @_flatten_value
-    def instance_name(self) -> Union[list, str]:
-        """
-        The instance name of the database.
-        """
-        return [d.instance_name for d in self._impl.description_list.children]
-
-    @property
-    def machine(self) -> str:
-        """
-        A string recorded by Oracle Database as the name of the machine from
-        which the connection originates.
-        """
-        return self._impl.machine
-
-    @property
-    def matchanytag(self) -> bool:
-        """
-        A boolean specifying whether any tag can be used when acquiring a
-        connection from the pool. This value is only used in python-oracledb
-        Thick mode.
-        """
-        return self._impl.matchanytag
-
-    @property
-    def mode(self) -> oracledb.AuthMode:
-        """
-        The authorization mode to use. One of the constants
-        :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-        :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-        :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-        :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`,
-        or :data:`oracledb.AUTH_MODE_SYSRAC`.
-        """
-        return oracledb.AuthMode(self._impl.mode)
-
-    @property
-    def osuser(self) -> str:
-        """
-        A string recorded by Oracle Database as the operating system user who
-        originated the connection.
-        """
-        return self._impl.osuser
-
-    @property
-    @_flatten_value
-    def pool_boundary(self) -> Union[list, str]:
-        """
-        One of the values "statement" or "transaction" indicating when pooled
-        DRCP connections can be returned to the pool. This requires the use of
-        DRCP with Oracle Database 23.4 or higher.
-        """
-        return [d.pool_boundary for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def pool_name(self) -> Union[list, str]:
-        """
-        The name of the DRCP pool when using multi-pool DRCP with Oracle
-        Database 23.4, or higher.
-        """
-        return [d.pool_name for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def port(self) -> Union[list, int]:
-        """
-        The port number on which the database listener is listening.
-        """
-        return [a.port for a in self._impl._get_addresses()]
-
-    @property
-    def program(self) -> str:
-        """
-        A string recorded by Oracle Database as the program from which the
-        connection originates.
-        """
-        return self._impl.program
-
-    @property
-    @_flatten_value
-    def protocol(self) -> Union[list, str]:
-        """
-        One of the strings "tcp" or "tcps" indicating whether to use
-        unencrypted network traffic or encrypted network traffic (TLS).
-        """
-        return [a.protocol for a in self._impl._get_addresses()]
-
-    @property
-    def proxy_user(self) -> str:
-        """
-        The name of the proxy user to connect to. If this value is not
-        specified, it will be parsed out of user if user is in the form
-        "user[proxy_user]".
-        """
-        return self._impl.proxy_user
-
-    @property
-    @_flatten_value
-    def purity(self) -> Union[list, oracledb.Purity]:
-        """
-        The connection purity to use for Database Resident Connection Pooling
-        (DRCP).
-        """
-        return [
-            oracledb.Purity(d.purity)
-            for d in self._impl.description_list.children
-        ]
-
-    @property
-    @_flatten_value
-    def retry_count(self) -> Union[list, int]:
-        """
-        The number of times that initial connection establishment should be
-        retried before the connection attempt is terminated.
-        """
-        return [d.retry_count for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def retry_delay(self) -> Union[list, int]:
-        """
-        The number of seconds to wait before retrying to establish a
-        connection.
-        """
-        return [d.retry_delay for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def sdu(self) -> Union[list, int]:
-        """
-        The requested size of the Session Data Unit (SDU), in bytes. The value
-        tunes internal buffers used for communication to the database. Bigger
-        values can increase throughput for large queries or bulk data loads,
-        but at the cost of higher memory use. The SDU size that will actually
-        be used is negotiated down to the lower of this value and the database
-        network SDU configuration value.
-        """
-        return [d.sdu for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def server_type(self) -> Union[list, str]:
-        """
-        The type of server connection that should be established. If specified,
-        it should be one of strings "dedicated", "shared" or "pooled".
-        """
-        return [d.server_type for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def service_name(self) -> Union[list, str]:
-        """
-        The service name of the database.
-        """
-        return [d.service_name for d in self._impl.description_list.children]
-
-    @property
-    def shardingkey(self) -> list:
-        """
-        A list of strings, numbers, bytes or dates that identify the database
-        shard to connect to. This value is only used in python-oracledb Thick
-        mode.
-        """
-        return self._impl.shardingkey
-
-    @property
-    @_flatten_value
-    def sid(self) -> Union[list, str]:
-        """
-        The system identifier (SID) of the database. Note using a service_name
-        instead is recommended.
-        """
-        return [d.sid for d in self._impl.description_list.children]
-
-    @property
-    def ssl_context(self) -> Any:
-        """
-        An SSLContext object used for connecting to the database using TLS.
-        This SSL context will be modified to include the private key or any
-        certificates found in a separately supplied wallet. This parameter
-        should only be specified if the default SSLContext object cannot be
-        used.
-        """
-        return self._impl.ssl_context
-
-    @property
-    @_flatten_value
-    def ssl_server_cert_dn(self) -> Union[list, str]:
-        """
-        The distinguished name (DN) which should be matched with the server.
-        This value is ignored if the ssl_server_dn_match parameter is not set
-        to the value True. If specified this value is used for any verfication.
-        Otherwise the hostname will be used.
-        """
-        return [
-            d.ssl_server_cert_dn for d in self._impl.description_list.children
-        ]
-
-    @property
-    @_flatten_value
-    def ssl_server_dn_match(self) -> Union[list, bool]:
-        """
-        A boolean indicating whether the server certificate distinguished name
-        (DN) should be matched in addition to the regular certificate
-        verification that is performed. Note that if the ssl_server_cert_dn
-        parameter is not privided, host name matching is performed instead.
-        """
-        return [
-            d.ssl_server_dn_match for d in self._impl.description_list.children
-        ]
-
-    @property
-    @_flatten_value
-    def ssl_version(self) -> Union[list, ssl.TLSVersion]:
-        """
-        One of the values ssl.TLSVersion.TLSv1_2 or ssl.TLSVersion.TLSv1_3
-        indicating which TLS version to use.
-        """
-        return [d.ssl_version for d in self._impl.description_list.children]
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        The size of the statement cache.
-        """
-        return self._impl.stmtcachesize
-
-    @property
-    def supershardingkey(self) -> list:
-        """
-        A list of strings, numbers, bytes or dates that identify the database
-        shard to connect to. This value is only used in python-oracledb Thick
-        mode.
-        """
-        return self._impl.supershardingkey
-
-    @property
-    def tag(self) -> str:
-        """
-        Identifies the type of connection that should be returned from a pool.
-        This value is only used in python-oracledb Thick mode.
-        """
-        return self._impl.tag
-
-    @property
-    @_flatten_value
-    def tcp_connect_timeout(self) -> Union[list, float]:
-        """
-        A float indicating the maximum number of seconds to wait when
-        establishing a connection to the database host.
-        """
-        return [
-            d.tcp_connect_timeout for d in self._impl.description_list.children
-        ]
-
-    @property
-    def terminal(self) -> str:
-        """
-        A string recorded by Oracle Database as the terminal identifier from
-        which the connection originates.
-        """
-        return self._impl.terminal
-
-    @property
-    def thick_mode_dsn_passthrough(self) -> bool:
-        """
-        A boolean indicating whether to pass the connect string to the Oracle
-        Client libraries unchanged without parsing by the driver. Setting this
-        to False makes python-oracledb Thick and Thin mode applications behave
-        similarly regarding connection string parameter handling and locating
-        any optional tnsnames.ora configuration file.
-        """
-        return self._impl.thick_mode_dsn_passthrough
-
-    @property
-    def user(self) -> str:
-        """
-        The name of the database user to connect to.
-        """
-        return self._impl.user
-
-    @property
-    @_flatten_value
-    def use_sni(self) -> Union[list, bool]:
-        """
-        A boolean indicating whether to use the TLS SNI extension to bypass the
-        second TLS neogiation that would otherwise be required.
-        """
-        return [d.use_sni for d in self._impl.description_list.children]
-
-    @property
-    @_flatten_value
-    def use_tcp_fast_open(self) -> Union[list, bool]:
-        """
-        A boolean indicating whether to use TCP fast open. This is an Oracle
-        Autonomous Database Serverless (ADB-S) specific property for clients
-        connecting from within OCI Cloud network. Please refer to the ADB-S
-        documentation for more information.
-        """
-        return [
-            d.use_tcp_fast_open for d in self._impl.description_list.children
-        ]
-
-    @property
-    @_flatten_value
-    def wallet_location(self) -> Union[list, str]:
-        """
-        The directory where the wallet can be found. In python-oracledb Thin
-        mode this must be the directory containing the PEM-encoded wallet file
-        ewallet.pem. In python-oracledb Thick mode this must be the directory
-        containing the file cwallet.sso.
-        """
-        return [
-            d.wallet_location for d in self._impl.description_list.children
-        ]
-
-    def copy(self) -> "ConnectParams":
-        """
-        Creates a copy of the ConnectParams instance and returns it.
-        """
-        params = ConnectParams.__new__(ConnectParams)
-        params._impl = self._impl.copy()
-        return params
-
-    def get_connect_string(self) -> str:
-        """
-        Returns the connection string associated with the instance.
-        """
-        return self._impl.get_connect_string()
-
-    def get_network_service_names(self) -> list:
-        """
-        Returns a list of the network service names found in the
-        :ref:`tnsnames.ora <optnetfiles>` file which is inside the directory
-        that can be identified by the attribute
-        :attr:`~ConnectParams.config_dir`.  If a tnsnames.ora file does not
-        exist, then an exception is raised.
-        """
-        return self._impl.get_network_service_names()
-
-    def parse_connect_string(self, connect_string: str) -> None:
-        """
-        Parses the connect string into its components and stores the
-        parameters.
-
-        The ``connect string`` parameter can be an Easy Connect string,
-        name-value pairs, or a simple alias which is looked up in
-        ``tnsnames.ora``. Parameters that are found in the connect string
-        override any currently stored values.
-        """
-        self._impl.parse_connect_string(connect_string)
-
-    def parse_dsn_with_credentials(self, dsn: str) -> tuple:
-        """
-        Parses a DSN in the form <user>/<password>@<connect_string> or in the
-        form <user>/<password> and returns a 3-tuple containing the parsed
-        user, password and connect string. Empty strings are returned as the
-        value *None*.
-        """
-        return self._impl.parse_dsn_with_credentials(dsn)
-
-    @utils.params_setter
-    def set(
-        self,
-        *,
-        user: Optional[str] = None,
-        proxy_user: Optional[str] = None,
-        password: Optional[str] = None,
-        newpassword: Optional[str] = None,
-        wallet_password: Optional[str] = None,
-        access_token: Optional[Union[str, tuple, Callable]] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        protocol: Optional[str] = None,
-        https_proxy: Optional[str] = None,
-        https_proxy_port: Optional[int] = None,
-        service_name: Optional[str] = None,
-        instance_name: Optional[str] = None,
-        sid: Optional[str] = None,
-        server_type: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: Optional[oracledb.Purity] = None,
-        expire_time: Optional[int] = None,
-        retry_count: Optional[int] = None,
-        retry_delay: Optional[int] = None,
-        tcp_connect_timeout: Optional[float] = None,
-        ssl_server_dn_match: Optional[bool] = None,
-        ssl_server_cert_dn: Optional[str] = None,
-        wallet_location: Optional[str] = None,
-        events: Optional[bool] = None,
-        externalauth: Optional[bool] = None,
-        mode: Optional[oracledb.AuthMode] = None,
-        disable_oob: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        edition: Optional[str] = None,
-        tag: Optional[str] = None,
-        matchanytag: Optional[bool] = None,
-        config_dir: Optional[str] = None,
-        appcontext: Optional[list] = None,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-        debug_jdwp: Optional[str] = None,
-        connection_id_prefix: Optional[str] = None,
-        ssl_context: Optional[Any] = None,
-        sdu: Optional[int] = None,
-        pool_boundary: Optional[str] = None,
-        use_tcp_fast_open: Optional[bool] = None,
-        ssl_version: Optional[ssl.TLSVersion] = None,
-        program: Optional[str] = None,
-        machine: Optional[str] = None,
-        terminal: Optional[str] = None,
-        osuser: Optional[str] = None,
-        driver_name: Optional[str] = None,
-        use_sni: Optional[bool] = None,
-        thick_mode_dsn_passthrough: Optional[bool] = None,
-        extra_auth_params: Optional[dict] = None,
-        pool_name: Optional[str] = None,
-        handle: Optional[int] = None,
-    ):
-        """
-        Sets the values for one or more of the parameters of a ConnectParams
-        object.  All parameters are optional. A brief description of each
-        parameter follows:
-
-        - ``user``: the name of the database user to connect to
-
-        - ``proxy_user``: the name of the proxy user to connect to. If this
-          value is not specified, it will be parsed out of user if user is in
-          the form "user[proxy_user]"
-
-        - ``password``: the password for the database user
-
-        - ``newpassword``: a new password for the database user. The new
-          password will take effect immediately upon a successful connection to
-          the database
-
-        - ``wallet_password``: the password to use to decrypt the wallet, if it
-          is encrypted. This is not the database password. For Oracle
-          Autonomous Database this is the password created when downloading the
-          wallet. This value is only used in python-oracledb Thin mode.
-
-        - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-          string, it specifies an Entra ID OAuth2 token used for Open
-          Authorization (OAuth 2.0) token based authentication. If it is a
-          2-tuple, it specifies the token and private key strings used for
-          Oracle Cloud Infrastructure (OCI) Identity and Access Management
-          (IAM) token based authentication. If it is a callable, it returns
-          either a string or a 2-tuple used for OAuth 2.0 or OCI IAM token
-          based authentication and is useful when the pool needs to expand and
-          create new connections but the current authentication token has
-          expired
-
-        - ``host``: the hostname or IP address of the machine hosting the
-          database or the database listener
-
-        - ``port``: the port number on which the database listener is listening
-
-        - ``protocol``: one of the strings "tcp" or "tcps" indicating whether
-          to use unencrypted network traffic or encrypted network traffic (TLS)
-
-        - ``https_proxy``: the hostname or IP address of a proxy host to use
-          for tunneling secure connections
-
-        - ``https_proxy_port``: the port on which to communicate with the proxy
-          host
-
-        - ``service_name``: the service name of the database
-
-        - ``instance_name``: the instance name of the database
-
-        - ``sid``: the system identifier (SID) of the database. Note using a
-          service_name instead is recommended
-
-        - ``server_type``: the type of server connection that should be
-          established. If specified, it should be one of strings "dedicated",
-          "shared" or "pooled"
-
-        - ``cclass``: the connection class to use for Database Resident
-          Connection Pooling (DRCP)
-
-        - ``purity``: the connection purity to use for Database Resident
-          Connection Pooling (DRCP)
-
-        - ``expire_time``: the number of minutes between the sending of
-          keepalive probes. If this parameter is set to a value greater than
-          zero it enables keepalive
-
-        - ``retry_count``: the number of times that initial connection
-          establishment should be retried before the connection attempt is
-          terminated
-
-        - ``retry_delay``: the number of seconds to wait before retrying to
-          establish a connection
-
-        - ``tcp_connect_timeout``: a float indicating the maximum number of
-          seconds to wait when establishing a connection to the database host
-
-        - ``ssl_server_dn_match``: a boolean indicating whether the server
-          certificate distinguished name (DN) should be matched in addition to
-          the regular certificate verification that is performed. Note that if
-          the ssl_server_cert_dn parameter is not privided, host name matching
-          is performed instead
-
-        - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-          matched with the server. This value is ignored if the
-          ssl_server_dn_match parameter is not set to the value True. If
-          specified this value is used for any verfication. Otherwise the
-          hostname will be used
-
-        - ``wallet_location``: the directory where the wallet can be found. In
-          python-oracledb Thin mode this must be the directory containing the
-          PEM-encoded wallet file ewallet.pem. In python-oracledb Thick mode
-          this must be the directory containing the file cwallet.sso
-
-        - ``events``: a boolean specifying whether events mode should be
-          enabled. This value is only used in python-oracledb Thick mode and is
-          needed for continuous query notification and high availability event
-          notifications
-
-        - ``externalauth``: a boolean indicating whether to use external
-          authentication
-
-        - ``mode``: the authorization mode to use. One of the constants
-          :data:`oracledb.AUTH_MODE_DEFAULT`,
-          :data:`oracledb.AUTH_MODE_PRELIM`, :data:`oracledb.AUTH_MODE_SYSASM`,
-          :data:`oracledb.AUTH_MODE_SYSBKP`, :data:`oracledb.AUTH_MODE_SYSDBA`,
-          :data:`oracledb.AUTH_MODE_SYSDGD`, :data:`oracledb.AUTH_MODE_SYSKMT`,
-          :data:`oracledb.AUTH_MODE_SYSOPER`, or
-          :data:`oracledb.AUTH_MODE_SYSRAC`
-
-        - ``disable_oob``: a boolean indicating whether out-of-band breaks
-          should be disabled. This value is only used in python-oracledb Thin
-          mode. It has no effect on Windows which does not support this
-          functionality
-
-        - ``stmtcachesize``: the size of the statement cache
-
-        - ``edition``: edition to use for the connection. This parameter cannot
-          be used simultaneously with the cclass parameter
-
-        - ``tag``: identifies the type of connection that should be returned
-          from a pool. This value is only used in python-oracledb Thick mode
-
-        - ``matchanytag``: a boolean specifying whether any tag can be used
-          when acquiring a connection from the pool. This value is only used in
-          python-oracledb Thick mode
-
-        - ``config_dir``: a directory in which the optional tnsnames.ora
-          configuration file is located. This value is only used in python-
-          oracledb Thin mode. For python-oracledb Thick mode, it is used if
-          :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-          mode use the ``config_dir`` parameter of
-          :meth:`oracledb.init_oracle_client()`
-
-        - ``appcontext``: application context used by the connection. It should
-          be a list of 3-tuples (namespace, name, value) and each entry in the
-          tuple should be a string
-
-        - ``shardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-
-        - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-
-        - ``debug_jdwp``: a string with the format "host=<host>;port=<port>"
-          that specifies the host and port of the PL/SQL debugger. This value
-          is only used in python-oracledb Thin mode.  For python-oracledb Thick
-          mode set the ORA_DEBUG_JDWP environment variable
-
-        - ``connection_id_prefix``: an application specific prefix that is
-          added to the connection identifier used for tracing
-
-        - ``ssl_context``: an SSLContext object used for connecting to the
-          database using TLS.  This SSL context will be modified to include the
-          private key or any certificates found in a separately supplied
-          wallet. This parameter should only be specified if the default
-          SSLContext object cannot be used
-
-        - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes.
-          The value tunes internal buffers used for communication to the
-          database. Bigger values can increase throughput for large queries or
-          bulk data loads, but at the cost of higher memory use. The SDU size
-          that will actually be used is negotiated down to the lower of this
-          value and the database network SDU configuration value
-
-        - ``pool_boundary``: one of the values "statement" or "transaction"
-          indicating when pooled DRCP connections can be returned to the pool.
-          This requires the use of DRCP with Oracle Database 23.4 or higher
-
-        - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast
-          open. This is an Oracle Autonomous Database Serverless (ADB-S)
-          specific property for clients connecting from within OCI Cloud
-          network. Please refer to the ADB-S documentation for more information
-
-        - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-          ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-
-        - ``program``: a string recorded by Oracle Database as the program from
-          which the connection originates
-
-        - ``machine``: a string recorded by Oracle Database as the name of the
-          machine from which the connection originates
-
-        - ``terminal``: a string recorded by Oracle Database as the terminal
-          identifier from which the connection originates
-
-        - ``osuser``: a string recorded by Oracle Database as the operating
-          system user who originated the connection
-
-        - ``driver_name``: a string recorded by Oracle Database as the name of
-          the driver which originated the connection
-
-        - ``use_sni``: a boolean indicating whether to use the TLS SNI
-          extension to bypass the second TLS neogiation that would otherwise be
-          required
-
-        - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass
-          the connect string to the Oracle Client libraries unchanged without
-          parsing by the driver. Setting this to False makes python-oracledb
-          Thick and Thin mode applications behave similarly regarding
-          connection string parameter handling and locating any optional
-          tnsnames.ora configuration file
-
-        - ``extra_auth_params``: a dictionary containing configuration
-          parameters necessary for Oracle Database authentication using
-          plugins, such as the Azure and OCI cloud-native authentication
-          plugins
-
-        - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP
-          with Oracle Database 23.4, or higher
-
-        - ``handle``: an integer representing a pointer to a valid service
-          context handle. This value is only used in python-oracledb Thick
-          mode. It should be used with extreme caution
-        """
-        pass
-
-    def set_from_config(self, config: dict) -> None:
-        """
-        Sets the property values based on the specified configuration. This
-        method is intended for use with Centralized Configuration Providers.
-
-        The ``config`` parameter is a dictionary which consists of the
-        following optional keys: "connect_descriptor", "user", "password", and
-        "pyo".
-
-        If the key "connect_descriptor" is specified, it is expected to be a
-        string, which will be parsed and the properties found within it are
-        stored in the ConnectParams instance.
-
-        If the keys "user" or "password" are specified, and the parameters do
-        not already have a user or password set, these values will be stored;
-        otherwise, they will be ignored. The key "user" is expected to be a
-        string. The "key" password may be a string or it may be a dictionary
-        which will be examined by a :ref:`registered password type handler
-        <registerpasswordtype>` to determine the actual password.
-
-        If the key "pyo" is specified, it is expected to be a dictionary
-        containing keys corresponding to property names. Any property names
-        accepted by the ConnectParams class will be stored in the ConnectParams
-        instance; all other values will be ignored.
-        """
-        self._impl.set_from_config(config)
diff --git a/src/oracledb/connection.py b/src/oracledb/connection.py
deleted file mode 100644
index 310e8ba4..00000000
--- a/src/oracledb/connection.py
+++ /dev/null
@@ -1,3320 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# connection.py
-#
-# Contains the Connection class and the factory method connect() used for
-# establishing connections to the database.
-#
-# *** NOTICE *** This file is generated from a template and should not be
-# modified directly. See build_from_template.py in the utils subdirectory for
-# more information.
-# -----------------------------------------------------------------------------
-
-import collections
-import functools
-import ssl
-from typing import Any, Callable, Iterator, Type, Optional, Union
-
-import oracledb
-
-from . import base_impl, driver_mode, errors, thick_impl, thin_impl
-from . import pool as pool_module
-from .aq import AsyncQueue, Queue, MessageProperties
-from .arrow_impl import ArrowSchemaImpl
-from .base import BaseMetaClass
-from .base_impl import DB_TYPE_BLOB, DB_TYPE_CLOB, DB_TYPE_NCLOB, DbType
-from .connect_params import ConnectParams
-from .cursor import AsyncCursor, Cursor
-from .dataframe import DataFrame
-from .dbobject import DbObjectType, DbObject
-from .lob import AsyncLOB, LOB
-from .pipeline import Pipeline, PipelineOpResult
-from .soda import SodaDatabase
-from .subscr import Subscription
-from .utils import normalize_sessionless_transaction_id
-
-# named tuple used for representing global transactions
-Xid = collections.namedtuple(
-    "Xid", ["format_id", "global_transaction_id", "branch_qualifier"]
-)
-
-
-class BaseConnection(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(self):
-        self._version = None
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        if self._impl is None:
-            return f"<{cls_name} disconnected>"
-        elif self.username is None:
-            return f"<{cls_name} to externally identified user>"
-        return f"<{cls_name} to {self.username}@{self.dsn}>"
-
-    def _verify_connected(self) -> None:
-        """
-        Verifies that the connection is connected to the database. If it is
-        not, an exception is raised.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_NOT_CONNECTED)
-
-    def _verify_xid(self, xid: Xid) -> None:
-        """
-        Verifies that the supplied xid is of the correct type.
-        """
-        if not isinstance(xid, Xid):
-            message = "expecting transaction id created with xid()"
-            raise TypeError(message)
-
-    @property
-    def action(self) -> str:
-        """
-        This write-only attribute sets the ACTION column in the V$SESSION view.
-        It is a string attribute but the value *None* is accepted and treated
-        as an empty string.
-        """
-        raise AttributeError("action is not readable")
-
-    @action.setter
-    def action(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_action(value)
-
-    @property
-    def autocommit(self) -> bool:
-        """
-        This read-write attribute determines whether autocommit mode is on or
-        off.  When autocommit mode is on, all statements are committed as soon
-        as they have completed executing.
-        """
-        self._verify_connected()
-        return self._impl.autocommit
-
-    @autocommit.setter
-    def autocommit(self, value: bool) -> None:
-        self._verify_connected()
-        self._impl.autocommit = value
-
-    def begin_sessionless_transaction(
-        self,
-        transaction_id: Optional[Union[str, bytes]] = None,
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Begins a new sessionless transaction. This method returns the
-        transaction identifier specified by the user or generated by
-        python-oracledb.
-
-        The ``transaction_id`` parameter should be of type string or bytes. If
-        specified, it represents a unique identifier for the transaction. If a
-        string is passed, then it will be UTF-8 encoded to bytes. If this value
-        is not specified, then python-oracledb generates a a random
-        `universally-unique identifier (UUID)
-        <https://www.rfc-editor.org/rfc/rfc4122.txt>`__ value.  An example is
-        "36b8f84d-df4e-4d49-b662-bcde71a8764f". Any user-chosen value cannot
-        exceed 64 bytes in length.
-
-        The ``timeout`` parameter is the number of seconds that this
-        transaction can stay suspended when
-        :meth:`suspend_sessionless_transaction()` is later called,
-        or if the transaction is automatically suspended when the
-        ``suspend_on_success`` parameter is set to to *True* in
-        :meth:`Cursor.execute()` or :meth:`Cursor.executemany()`. The default
-        value is *60* seconds. If a transaction is not resumed within this
-        specified duration, the transaction will be rolled back.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to start a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not isinstance(timeout, int) or timeout <= 0:
-            raise TypeError("timeout must be a positive integer")
-
-        self._impl.begin_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    @property
-    def call_timeout(self) -> int:
-        """
-        This read-write attribute specifies the amount of time (in
-        milliseconds) that a single round-trip to the database may take before
-        a timeout will occur. A value of *0* means that no timeout will take
-        place.
-
-        In python-oracledb Thick mode, this attribute is only available in
-        Oracle Client 18c or later.
-
-        If a timeout occurs, the error ``DPI-1067`` will be returned if the
-        connection is still usable.  Alternatively the error ``DPI-1080`` will
-        be returned if the connection has become invalid and can no longer be
-        used.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        attribute ``callTimeout`` was renamed to ``call_timeout``. The old name
-        will continue to work for a period of time.  The error ``DPI-1080`` was
-        also introduced in this release.
-        """
-        self._verify_connected()
-        return self._impl.get_call_timeout()
-
-    @call_timeout.setter
-    def call_timeout(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_call_timeout(value)
-
-    def cancel(self) -> None:
-        """
-        Breaks a long-running statement.
-        """
-        self._verify_connected()
-        self._impl.cancel()
-
-    @property
-    def client_identifier(self) -> str:
-        """
-        This write-only attribute sets the CLIENT_IDENTIFIER column in the
-        V$SESSION view.
-        """
-        raise AttributeError("client_identifier is not readable")
-
-    @client_identifier.setter
-    def client_identifier(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_client_identifier(value)
-
-    @property
-    def clientinfo(self) -> str:
-        """
-        This write-only attribute sets the CLIENT_INFO column in the V$SESSION
-        view.
-        """
-        raise AttributeError("clientinfo is not readable")
-
-    @clientinfo.setter
-    def clientinfo(self, value: str) -> None:
-        """
-        Specifies the client_info column in the v$session table.
-        """
-        self._verify_connected()
-        self._impl.set_client_info(value)
-
-    @property
-    def current_schema(self) -> str:
-        """
-        This read-write attribute sets the current schema attribute for the
-        session. Setting this value is the same as executing the SQL statement
-        ``ALTER SESSION SET CURRENT_SCHEMA``. The attribute is set (and
-        verified) on the next call that does a round trip to the server. The
-        value is placed before unqualified database objects in SQL statements
-        you then execute.
-        """
-        self._verify_connected()
-        return self._impl.get_current_schema()
-
-    @current_schema.setter
-    def current_schema(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_current_schema(value)
-
-    @property
-    def db_domain(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database domain name
-        associated with the connection. It is the same value returned by the
-        SQL ``SELECT value FROM V$PARAMETER WHERE NAME = 'db_domain'``.
-        """
-        self._verify_connected()
-        return self._impl.get_db_domain()
-
-    @property
-    def db_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database name associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        NAME FROM V$DATABASE``.
-        """
-        self._verify_connected()
-        return self._impl.get_db_name()
-
-    @property
-    def dbop(self) -> str:
-        """
-        This write-only attribute sets the database operation that is to be
-        monitored. This can be viewed in the DBOP_NAME column of the
-        V$SQL_MONITOR view.
-        """
-        raise AttributeError("dbop is not readable")
-
-    @dbop.setter
-    def dbop(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_dbop(value)
-
-    def decode_oson(self, data: bytes) -> Any:
-        """
-        Decodes `OSON-encoded
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-        &id=GUID-911D302C-CFAF-406B-B6A5-4E99DD38ABAD>`__ bytes and returns the
-        object encoded in those bytes.  This is useful for fetching columns
-        which have the check constraint ``IS JSON FORMAT OSON`` enabled.
-        """
-        self._verify_connected()
-        return self._impl.decode_oson(data)
-
-    @property
-    def dsn(self) -> str:
-        """
-        This read-only attribute returns the TNS entry of the database to which
-        a connection has been established.
-        """
-        self._verify_connected()
-        return self._impl.dsn
-
-    @property
-    def econtext_id(self) -> str:
-        """
-        This write-only attribute specifies the execution context id. This
-        value can be found as the ECID column in the V$SESSION view and
-        ECONTEXT_ID in the auditing tables. The maximum length is 64 bytes.
-        """
-        raise AttributeError("econtext_id is not readable")
-
-    @econtext_id.setter
-    def econtext_id(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_econtext_id(value)
-
-    @property
-    def edition(self) -> str:
-        """
-        This read-only attribute gets the session edition and is only available
-        with Oracle Database 11.2, or later.
-        """
-        self._verify_connected()
-        return self._impl.get_edition()
-
-    def encode_oson(self, value: Any) -> bytes:
-        """
-        Encodes a Python value into `OSON-encoded
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-        &id=GUID-911D302C-CFAF-406B-B6A5-4E99DD38ABAD>`__ bytes and returns
-        them. This is useful for inserting into columns which have the check
-        constraint ``IS JSON FORMAT OSON`` enabled.
-        """
-        self._verify_connected()
-        return self._impl.encode_oson(value)
-
-    @property
-    def external_name(self) -> str:
-        """
-        This read-write attribute specifies the external name that is used by
-        the connection when logging distributed transactions.
-        """
-        self._verify_connected()
-        return self._impl.get_external_name()
-
-    @external_name.setter
-    def external_name(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_external_name(value)
-
-    @property
-    def inputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each value that
-        is bound to a statement executed on any cursor associated with this
-        connection.  The method signature is handler(cursor, value, arraysize)
-        and the return value is expected to be a variable object or *None* in
-        which case a default variable object will be created. If this attribute
-        is *None*, the default behavior will take place for all values bound to
-        statements.
-        """
-        self._verify_connected()
-        return self._impl.inputtypehandler
-
-    @inputtypehandler.setter
-    def inputtypehandler(self, value: Callable) -> None:
-        self._verify_connected()
-        self._impl.inputtypehandler = value
-
-    @property
-    def instance_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database instance name
-        associated with the connection. It is the same value as the SQL
-        expression ``sys_context('userenv', 'instance_name')``.
-        """
-        self._verify_connected()
-        return self._impl.get_instance_name()
-
-    @property
-    def internal_name(self) -> str:
-        """
-        This read-write attribute specifies the internal name that is used by
-        the connection when logging distributed transactions.
-        """
-        self._verify_connected()
-        return self._impl.get_internal_name()
-
-    @internal_name.setter
-    def internal_name(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_internal_name(value)
-
-    def is_healthy(self) -> bool:
-        """
-        This function returns a boolean indicating the health status of a
-        connection.
-
-        Connections may become unusable in several cases, such as, if the
-        network socket is broken, if an Oracle error indicates the connection
-        is unusable, or, after receiving a planned down notification from the
-        database.
-
-        This function is best used before starting a new database request on an
-        existing :ref:`standalone connections <standaloneconnection>`. For
-        pooled connections, the :meth:`ConnectionPool.acquire()` method
-        internally performs this check before returning a connection to the
-        application, see :ref:`poolhealth`.
-
-        If this function returns *False*, the connection should be not be used
-        by the application and a new connection should be established instead.
-
-        This function performs a local check. To fully check a connection's
-        health, use :meth:`ping()` which performs a round-trip to
-        the database.
-        """
-        return self._impl is not None and self._impl.get_is_healthy()
-
-    @property
-    def ltxid(self) -> bytes:
-        """
-        This read-only attribute returns the logical transaction id for the
-        connection. It is used within Oracle Transaction Guard as a means of
-        ensuring that transactions are not duplicated. See :ref:`tg` for more
-        information.
-
-        This is only available with Oracle Database 12.1 or later. In
-        python-oracledb Thick mode, it also requires Oracle Client libraries
-        12.1 or later.
-        """
-        self._verify_connected()
-        return self._impl.get_ltxid()
-
-    @property
-    def max_identifier_length(self) -> int:
-        """
-        This read-only attribute specifies the maximum database identifier
-        length in bytes supported by the database to which the connection has
-        been established.  See `Database Object Naming Rules
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-        id=GUID-75337742-67FD-4EC0-985F-741C93D918DA>`__. The value may be
-        *None*, *30*, or *128*. The value *None* indicates the size cannot be
-        reliably determined by python-oracledb, which occurs when using Thick
-        mode with Oracle Client libraries 12.1 (or older) to connect to Oracle
-        Database 12.2, or later.
-        """
-        self._verify_connected()
-        return self._impl.get_max_identifier_length()
-
-    @property
-    def max_open_cursors(self) -> int:
-        """
-        This read-only attribute specifies the maximum number of cursors that
-        the database can have open concurrently. It is the same value returned
-        by the SQL ``SELECT VALUE FROM V$PARAMETER WHERE NAME =
-        'open_cursors'``. When using python-oracledb Thick mode, Oracle Client
-        libraries 12.1 (or later) are required.
-        """
-        self._verify_connected()
-        return self._impl.get_max_open_cursors()
-
-    @property
-    def module(self) -> str:
-        """
-        This write-only attribute sets the MODULE column in the V$SESSION view.
-        The maximum length for this string is 48 and if you exceed this length
-        you will get ``ORA-24960``.
-        """
-        raise AttributeError("module is not readable")
-
-    @module.setter
-    def module(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_module(value)
-
-    def msgproperties(
-        self,
-        payload: Optional[Union[bytes, str, DbObject]] = None,
-        correlation: Optional[str] = None,
-        delay: Optional[int] = None,
-        exceptionq: Optional[str] = None,
-        expiration: Optional[int] = None,
-        priority: Optional[int] = None,
-        recipients: Optional[list] = None,
-    ) -> MessageProperties:
-        """
-        Returns an object specifying the properties of messages used in
-        advanced queuing.
-
-        Each of the parameters are optional. If specified, they act as a
-        shortcut for setting each of the equivalently named properties.
-        """
-        impl = self._impl.create_msg_props_impl()
-        props = MessageProperties._from_impl(impl)
-        if payload is not None:
-            props.payload = payload
-        if correlation is not None:
-            props.correlation = correlation
-        if delay is not None:
-            props.delay = delay
-        if exceptionq is not None:
-            props.exceptionq = exceptionq
-        if expiration is not None:
-            props.expiration = expiration
-        if priority is not None:
-            props.priority = priority
-        if recipients is not None:
-            props.recipients = recipients
-        return props
-
-    def queue(
-        self,
-        name: str,
-        payload_type: Optional[Union[DbObjectType, str]] = None,
-        *,
-        payloadType: Optional[DbObjectType] = None,
-    ) -> Union[Queue, AsyncQueue]:
-        """
-        Creates a queue which is used to enqueue and dequeue messages in
-        Advanced Queuing.
-
-        The ``name`` parameter is expected to be a string identifying the queue
-        in which messages are to be enqueued or dequeued.
-
-        The ``payload_type`` parameter, if specified, is expected to be an
-        :ref:`object type <dbobjecttype>` that identifies the type of payload
-        the queue expects. If the string "JSON" is specified, JSON data is
-        enqueued and dequeued. If not specified, RAW data is enqueued and
-        dequeued.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``payloadType`` was renamed to ``payload_type``. The old name
-        will continue to work as a keyword parameter for a period of time.
-        """
-        self._verify_connected()
-        payload_type_impl = None
-        is_json = False
-        if payloadType is not None:
-            if payload_type is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="payloadType",
-                    new_name="payload_type",
-                )
-            payload_type = payloadType
-        if payload_type is not None:
-            if payload_type == "JSON":
-                is_json = True
-            elif not isinstance(payload_type, DbObjectType):
-                raise TypeError("expecting DbObjectType")
-            else:
-                payload_type_impl = payload_type._impl
-        impl = self._impl.create_queue_impl()
-        impl.initialize(self._impl, name, payload_type_impl, is_json)
-        return self._create_queue(impl)
-
-    @property
-    def outputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each column
-        that is going to be fetched from any cursor associated with this
-        connection. The method signature is ``handler(cursor, metadata)`` and
-        the return value is expected to be a :ref:`variable object<varobj>` or
-        *None* in which case a default variable object will be created. If this
-        attribute is *None*, the default behavior will take place for all
-        columns fetched from cursors.
-        """
-        self._verify_connected()
-        return self._impl.outputtypehandler
-
-    @outputtypehandler.setter
-    def outputtypehandler(self, value: Callable) -> None:
-        self._verify_connected()
-        self._impl.outputtypehandler = value
-
-    @property
-    def proxy_user(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the user which was used as
-        a proxy when creating the connection to the database.
-        """
-        self._verify_connected()
-        return self._impl.proxy_user
-
-    def resume_sessionless_transaction(
-        self,
-        transaction_id: Union[str, bytes],
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Resumes an existing sessionless transaction using the specified
-        transaction identifier. This method returns the transaction identifier
-        used to resume the sessionless transaction.
-
-        The ``transaction_id`` parameter should be a string or bytes value that
-        uniquely identifies an existing sessionless transaction that is to be
-        resumed.
-
-        The ``timeout`` parameter is the number of seconds that the current
-        connection waits to resume a transaction if another connection is using
-        it.  When ``defer_round_trip`` is set to *False*, the wait happens in
-        the ``resume_sessionless_transaction()`` call itself, and the function
-        blocks until the transaction becomes available or the timeout expires.
-        When ``defer_round_trip`` is set to *True*, the resume is deferred and
-        the wait occurs at the time of the next database operation instead. At
-        the start of the wait period, if the transaction is not in use by any
-        other connection, the resume happens immediately. If the transaction
-        remains in use by the other connection after the timeout period, the
-        error `ORA-25351
-        <https://docs.oracle.com/en/error-help/db/ora-25351>`__ is raised. If
-        another connection completes the transaction, the error `ORA-24756
-        <https://docs.oracle.com/en/error-help/db/ora-24756>`__ is raised.
-        These error messages are only thrown for non-RAC instances. For
-        information on using Oracle RAC, see :ref:`Sessionless Transactions
-        with Oracle RAC <sessionlesstxnswithrac>`.  The default value is *60*
-        seconds.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to resume a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        if transaction_id is None:
-            raise ValueError("transaction_id is required for resuming")
-
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not (isinstance(timeout, int) and timeout >= 0):
-            raise TypeError("timeout must be a non-negative integer")
-
-        self._impl.resume_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    @property
-    def sdu(self) -> int:
-        """
-        This read-only attribute specifies the size of the Session Data Unit
-        (SDU) that is being used by the connection. The value will be the
-        lesser of the requested python-oracledb size and the maximum size
-        allowed by the database network configuration. It is available only in
-        python-oracledb Thin mode. To set the SDU in Thick mode, use a
-        connection string SDU parameter or set a value for DEFAULT_SDU_SIZE in
-        a sqlnet.ora configuration file.
-        """
-        self._verify_connected()
-        return self._impl.get_sdu()
-
-    @property
-    def serial_num(self) -> int:
-        """
-        This read-only attribute specifies the session serial number associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        SERIAL# FROM V$SESSION WHERE SID=SYS_CONTEXT('USERENV', 'SID')``.  It
-        is available only in python-oracledb Thin mode.
-
-        For applications using :ref:`drcp`, the ``serial_num`` attribute may
-        not contain the current session state until a round-trip is made to the
-        database after acquiring a session.  It is recommended to not use this
-        attribute if your application uses DRCP but may not perform a
-        round-trip.
-        """
-        self._verify_connected()
-        return self._impl.get_serial_num()
-
-    @property
-    def service_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database service name
-        associated with the connection.  This is the same value returned by the
-        SQL ``SELECT SYS_CONTEXT('USERENV', 'SERVICE_NAME') FROM DUAL``.
-        """
-        self._verify_connected()
-        return self._impl.get_service_name()
-
-    @property
-    def session_id(self) -> int:
-        """
-        This read-only attribute specifies the session identifier associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        SYS_CONTEXT('USERENV', 'SID') FROM DUAL``. It is available only in
-        python-oracledb Thin mode.
-
-        For applications using :ref:`drcp`, the ``session_id`` attribute may
-        not contain the current session state until a round-trip is made to the
-        database after acquiring a session.  It is recommended to not use this
-        attribute if your application uses DRCP but may not perform a
-        round-trip.
-        """
-        self._verify_connected()
-        return self._impl.get_session_id()
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        This read-write attribute specifies the size of the statement cache.
-        This value can make a significant difference in performance if you have
-        a small number of statements that you execute repeatedly.
-
-        The default value is *20*.
-        """
-        self._verify_connected()
-        return self._impl.get_stmt_cache_size()
-
-    @stmtcachesize.setter
-    def stmtcachesize(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_stmt_cache_size(value)
-
-    @property
-    def tag(self) -> str:
-        """
-        This read-write attribute initially contains the actual tag of the
-        session that was acquired from a pool by
-        :meth:`ConnectionPool.acquire()`. If the connection was not acquired
-        from a pool or no tagging parameters were specified (``tag`` and
-        ``matchanytag``) when the connection was acquired from the pool, this
-        value will be None. If the value is changed, it must be a string
-        containing name=value pairs like "k1=v1;k2=v2".
-
-        If this value is not *None* when the connection is released back to the
-        pool it will be used to retag the session. This value can be overridden
-        in the call to :meth:`ConnectionPool.release()`.
-        """
-        self._verify_connected()
-        return self._impl.tag
-
-    @tag.setter
-    def tag(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.tag = value
-
-    @property
-    def thin(self) -> bool:
-        """
-        This read-only attribute returns a boolean indicating if
-        python-oracledb is in Thin mode (*True*) or Thick mode (*False*).
-        """
-        self._verify_connected()
-        return self._impl.thin
-
-    @property
-    def transaction_in_progress(self) -> bool:
-        """
-        This read-only attribute specifies whether a transaction is currently
-        in progress on the database associated with the connection.
-        """
-        self._verify_connected()
-        return self._impl.get_transaction_in_progress()
-
-    @property
-    def username(self) -> str:
-        """
-        This read-only attribute returns the name of the user which established
-        the connection to the database.
-        """
-        self._verify_connected()
-        return self._impl.username
-
-    @property
-    def version(self) -> str:
-        """
-        This read-only attribute returns the version of the database to which a
-        connection has been established.
-        """
-        if self._version is None:
-            self._verify_connected()
-            self._version = ".".join(str(c) for c in self._impl.server_version)
-        return self._version
-
-    @property
-    def warning(self) -> Union[errors._Error, None]:
-        """
-        This read-only attribute provides an
-        :ref:`oracledb._Error<exchandling>` object giving information about any
-        database warnings (such as the password being in the grace period, or
-        the pool being created with a smaller than requested size due to
-        database resource restrictions) that were generated during connection
-        establishment or by :meth:`oracledb.create_pool()`. The attribute will
-        be present if there was a warning, but creation otherwise completed
-        successfully. The connection will be usable despite the warning.
-
-        For :ref:`standalone connections <standaloneconnection>`,
-        ``Connection.warning`` will be present for the lifetime of the
-        connection.
-
-        For :ref:`pooled connections <connpooling>`, ``Connection.warning``
-        will be cleared when a connection is released to the pool such as with
-        :meth:`ConnectionPool.release()`.
-
-        In python-oracledb Thick mode, warnings may be generated during pool
-        creation itself.  These warnings will be placed on new connections
-        created by the pool, provided no warnings were generated by the
-        individual connection creations, in which case those connection
-        warnings will be returned.
-
-        If no warning was generated the value *None* is returned.
-        """
-        self._verify_connected()
-        return self._impl.warning
-
-    def xid(
-        self,
-        format_id: int,
-        global_transaction_id: Union[bytes, str],
-        branch_qualifier: Union[bytes, str],
-    ) -> Xid:
-        """
-        Returns a global transaction identifier (xid) that can be used with the
-        Two-Phase Commit (TPC) functions.
-
-        The ``xid`` contains a format identifier, a global transaction
-        identifier, and a branch identifier. There are no checks performed at
-        the Python level. The values are checked by ODPI-C when they are passed
-        to the relevant functions.  .. When this functionality is also
-        supported in the thin driver the checks will be performed at the Python
-        level as well.
-
-        The ``format_id`` parameter should be a positive 32-bit integer. This
-        value identifies the format of the ``global_transaction_id`` and
-        ``branch_qualifier`` parameters and the value is determined by the
-        Transaction Manager (TM), if one is in use.
-
-        The ``global_transaction_id`` and ``branch_qualifier`` parameters
-        should be of type bytes or string. If a value of type string is passed,
-        then this value will be UTF-8 encoded to bytes. The values cannot
-        exceed 64 bytes in length.
-        """
-        return Xid(format_id, global_transaction_id, branch_qualifier)
-
-
-class Connection(BaseConnection):
-
-    def __init__(
-        self,
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.ConnectionPool"] = None,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> None:
-        """
-        Constructor for creating a connection to the database.
-        """
-
-        super().__init__()
-        self._pool = pool
-
-        # determine if thin mode is being used
-        with driver_mode.get_manager() as mode_mgr:
-            thin = mode_mgr.thin
-
-            # determine which connection parameters to use
-            if params is None:
-                params_impl = base_impl.ConnectParamsImpl()
-            elif not isinstance(params, ConnectParams):
-                errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-            else:
-                params_impl = params._impl.copy()
-            dsn = params_impl.process_args(dsn, kwargs, thin)
-
-            # see if connection is being acquired from a pool
-            if pool is None:
-                pool_impl = None
-            else:
-                pool._verify_open()
-                pool_impl = pool._impl
-
-            # create thin or thick implementation object
-            if thin:
-                if (
-                    params_impl.shardingkey is not None
-                    or params_impl.supershardingkey is not None
-                ):
-                    errors._raise_err(
-                        errors.ERR_FEATURE_NOT_SUPPORTED,
-                        feature="sharding",
-                        driver_type="thick",
-                    )
-                if pool is not None:
-                    impl = pool_impl.acquire(params_impl)
-                else:
-                    impl = thin_impl.ThinConnImpl(dsn, params_impl)
-                    impl.connect(params_impl)
-            else:
-                impl = thick_impl.ThickConnImpl(dsn, params_impl)
-                impl.connect(params_impl, pool_impl)
-            self._impl = impl
-
-            # invoke callback, if applicable
-            if (
-                impl.invoke_session_callback
-                and pool is not None
-                and pool.session_callback is not None
-                and callable(pool.session_callback)
-            ):
-                pool.session_callback(self, params_impl.tag)
-                impl.invoke_session_callback = False
-
-    def __del__(self):
-        if self._impl is not None:
-            self._close(in_del=True)
-
-    def __enter__(self):
-        """
-        The entry point for the connection as a context manager. It returns
-        itself.
-        """
-        self._verify_connected()
-        return self
-
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        """
-        The exit point for the connection as a context manager. This will close
-        the connection and roll back any uncommitted transaction.
-        """
-        if self._impl is not None:
-            self._close()
-
-    def _close(self, in_del=False):
-        """
-        Closes the connection and makes it unusable for further operations. An
-        Error exception will be raised if any operation is attempted with this
-        connection after this method completes successfully.
-        """
-        if self._pool is not None:
-            pool_impl = self._pool._impl
-            if pool_impl is not None:
-                pool_impl.return_connection(self._impl, in_del)
-        else:
-            self._impl.close(in_del)
-        self._impl = None
-
-    def _create_queue(self, impl):
-        """
-        Returns a queue object that the user can use to dequeue and enqueue
-        messages.
-        """
-        return Queue._from_impl(self, impl)
-
-    def _get_oci_attr(
-        self, handle_type: int, attr_num: int, attr_type: int
-    ) -> Any:
-        """
-        Returns the value of the specified OCI attribute from the internal
-        handle. This is only supported in python-oracledb thick mode and should
-        only be used as directed by Oracle.
-        """
-        self._verify_connected()
-        return self._impl._get_oci_attr(handle_type, attr_num, attr_type)
-
-    def _set_oci_attr(
-        self, handle_type: int, attr_num: int, attr_type: int, value: Any
-    ) -> None:
-        """
-        Sets the value of the specified OCI attribute on the internal handle.
-        This is only supported in python-oracledb thick mode and should only
-        be used as directed by Oracle.
-        """
-        self._verify_connected()
-        self._impl._set_oci_attr(handle_type, attr_num, attr_type, value)
-
-    def begin(
-        self,
-        format_id: int = -1,
-        transaction_id: str = "",
-        branch_id: str = "",
-    ) -> None:
-        """
-        Explicitly begins a new transaction. Without parameters, this
-        explicitly begins a local transaction; otherwise, this explicitly
-        begins a distributed (global) transaction with the given parameters.
-        See the Oracle documentation for more details.
-
-        Note that in order to make use of global (distributed) transactions,
-        the :attr:`~Connection.internal_name` and
-        :attr:`~Connection.external_name` attributes must be set.
-        """
-        if format_id != -1:
-            self.tpc_begin(self.xid(format_id, transaction_id, branch_id))
-
-    @property
-    def callTimeout(self) -> int:
-        """
-        Deprecated. Use property call_timeout instead.
-        """
-        return self.call_timeout
-
-    @callTimeout.setter
-    def callTimeout(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_call_timeout(value)
-
-    def changepassword(self, old_password: str, new_password: str) -> None:
-        """
-        Changes the password for the user to which the connection is connected.
-        """
-        self._verify_connected()
-        self._impl.change_password(old_password, new_password)
-
-    def close(self) -> None:
-        """
-        Closes the connection now and makes it unusable for further operations.
-        An Error exception will be raised if any operation is attempted with
-        this connection after this method is completed successfully.
-
-        All open cursors and LOBs created by the connection will be closed and
-        will also no longer be usable.
-
-        Internally, references to the connection are held by cursor objects,
-        LOB objects, subscription objects, etc. Once all of these references
-        are released, the connection itself will be closed automatically.
-        Either control references to these related objects carefully or
-        explicitly close connections in order to ensure sufficient resources
-        are available.
-        """
-        self._verify_connected()
-        self._close()
-
-    def commit(self) -> None:
-        """
-        Commits any pending transactions to the database.
-        """
-        self._verify_connected()
-        self._impl.commit()
-
-    def createlob(
-        self, lob_type: DbType, data: Optional[Union[str, bytes]] = None
-    ) -> LOB:
-        """
-        Creates and returns a new temporary LOB object of the specified type.
-        The ``lob_type`` parameter should be one of
-        :data:`oracledb.DB_TYPE_CLOB`, :data:`oracledb.DB_TYPE_BLOB`, or
-        :data:`oracledb.DB_TYPE_NCLOB`.
-
-        If data is supplied, it will be written to the temporary LOB before it
-        is returned.
-        """
-        self._verify_connected()
-        if lob_type not in (DB_TYPE_CLOB, DB_TYPE_NCLOB, DB_TYPE_BLOB):
-            message = (
-                "parameter should be one of oracledb.DB_TYPE_CLOB, "
-                "oracledb.DB_TYPE_BLOB or oracledb.DB_TYPE_NCLOB"
-            )
-            raise TypeError(message)
-        impl = self._impl.create_temp_lob_impl(lob_type)
-        lob = LOB._from_impl(impl)
-        if data:
-            lob.write(data)
-        return lob
-
-    def cursor(self, scrollable: bool = False) -> Cursor:
-        """
-        Returns a new :ref:`cursor object <cursorobj>` using the connection.
-        """
-        self._verify_connected()
-        return Cursor(self, scrollable)
-
-    def direct_path_load(
-        self,
-        schema_name: str,
-        table_name: str,
-        column_names: list[str],
-        data: Any,
-        *,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Load data into Oracle Database using the Direct Path Load interface.
-        It is available only in python-oracledb Thin mode.
-
-        The ``data`` parameter can be a list of sequences, a DataFrame, or a
-        third-party DataFrame instance that supports the Apache Arrow PyCapsule
-        Interface.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance.
-        """
-        self._verify_connected()
-        self._impl.direct_path_load(
-            schema_name, table_name, column_names, data, batch_size
-        )
-
-    def fetch_df_all(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> DataFrame:
-        """
-        Fetches all rows of the SQL query ``statement``, returning them in a
-        :ref:`DataFrame <oracledataframeobj>` object. An empty DataFrame is
-        returned if there are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``arraysize`` parameter can be specified to tune performance of
-        fetching data across the network. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_all()``'s :attr:`Cursor.prefetchrows` size is always set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-
-        Any LOB fetched must be less than 1 GB.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if arraysize is not None:
-            cursor.arraysize = arraysize
-        cursor.prefetchrows = cursor.arraysize
-        cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        return cursor._impl.fetch_df_all(cursor)
-
-    def fetch_df_batches(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        size: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> Iterator[DataFrame]:
-        """
-        This returns an iterator yielding the next ``size`` rows of the SQL
-        query ``statement`` in each iteration as a :ref:`DataFrame
-        <oracledataframeobj>` object. An empty DataFrame is returned if there
-        are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``size`` parameter controls the number of records fetched in each
-        batch. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_batches()``'s :attr:`Cursor.arraysize` and
-        :attr:`Cursor.prefetchrows` sizes are always set to the value of the
-        explicit or default ``size`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-
-        Any LOB fetched must be less than 1 GB.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if size is not None:
-            cursor.arraysize = size
-        cursor.prefetchrows = cursor.arraysize
-        cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        if size is None:
-            yield cursor._impl.fetch_df_all(cursor)
-        else:
-            yield from cursor._impl.fetch_df_batches(cursor, batch_size=size)
-
-    def getSodaDatabase(self) -> SodaDatabase:
-        """
-        Returns a SodaDatabase object for Simple Oracle Document Access (SODA).
-        All SODA operations are performed either on the returned SodaDatabase
-        object or from objects created by the returned SodaDatabase object. See
-        `here <https://www.oracle.com/pls/topic/lookup?
-        ctx=dblatest&id=GUID-BE42F8D3-B86B-43B4-B2A3-5760A4DF79FB>`__ for
-        additional information on SODA.
-        """
-        self._verify_connected()
-        db_impl = self._impl.create_soda_database_impl(self)
-        return SodaDatabase._from_impl(self, db_impl)
-
-    def gettype(self, name: str) -> DbObjectType:
-        """
-        Returns a type object given its name. This can then be used to create
-        objects which can be bound to cursors created by this connection.
-        """
-        self._verify_connected()
-        obj_type_impl = self._impl.get_type(self, name)
-        return DbObjectType._from_impl(obj_type_impl)
-
-    @property
-    def handle(self) -> int:
-        """
-        This read-only attribute returns the Oracle Call Interface (OCI)
-        service context handle for the connection. It is primarily provided to
-        facilitate testing the creation of a connection using the OCI service
-        context handle.
-
-        This property is only relevant to python-oracledb's thick mode.
-        """
-        self._verify_connected()
-        return self._impl.get_handle()
-
-    @property
-    def maxBytesPerCharacter(self) -> int:
-        """
-        Deprecated. Use the constant value 4 instead.
-        """
-        return 4
-
-    def ping(self) -> None:
-        """
-        Pings the database to verify if the connection is valid. An exception
-        is thrown if it is not, in which case the connection should not be used
-        by the application and a new connection should be established instead.
-
-        This function performs a :ref:`round-trip <roundtrips>` to the
-        database, so it should not be used unnecessarily.
-
-        Note connection pools will perform the same health check automatically,
-        based on configuration settings. See :ref:`poolhealth`.
-
-        Also, see :meth:`is_healthy()` for a lightweight alternative.
-        """
-        self._verify_connected()
-        self._impl.ping()
-
-    def prepare(self) -> bool:
-        """
-        Prepares the distributed (global) transaction for commit. Returns a
-        boolean indicating if a transaction was actually prepared in order to
-        avoid the error ``ORA-24756 (transaction does not exist)``.
-        """
-        return self.tpc_prepare()
-
-    def rollback(self) -> None:
-        """
-        Rolls back any pending transactions.
-        """
-        self._verify_connected()
-        self._impl.rollback()
-
-    def shutdown(self, mode: int = 0) -> None:
-        """
-        Shuts down the database. In order to do this the connection must be
-        connected as :data:`~oracledb.SYSDBA` or :data:`~oracledb.SYSOPER`. Two
-        calls must be made unless the mode specified is
-        :data:`~oracledb.DBSHUTDOWN_ABORT`.
-        """
-        self._verify_connected()
-        self._impl.shutdown(mode)
-
-    def startup(
-        self,
-        force: bool = False,
-        restrict: bool = False,
-        pfile: Optional[str] = None,
-    ) -> None:
-        """
-        Starts up the database. This is equivalent to the SQL*Plus command
-        ``startup nomount``. The connection must be connected as
-        :data:`~oracledb.SYSDBA` or :data:`~oracledb.SYSOPER` with the
-        :data:`~oracledb.PRELIM_AUTH` option specified for this to work.
-
-        The ``pfile`` parameter, if specified, is expected to be a string
-        identifying the location of the parameter file (PFILE) which will be
-        used instead of the stored parameter file (SPFILE).
-        """
-        self._verify_connected()
-        self._impl.startup(force, restrict, pfile)
-
-    def subscribe(
-        self,
-        namespace: int = oracledb.SUBSCR_NAMESPACE_DBCHANGE,
-        protocol: int = oracledb.SUBSCR_PROTO_CALLBACK,
-        callback: Optional[Callable] = None,
-        timeout: int = 0,
-        operations: int = oracledb.OPCODE_ALLOPS,
-        port: int = 0,
-        qos: int = oracledb.SUBSCR_QOS_DEFAULT,
-        ip_address: Optional[str] = None,
-        grouping_class: int = oracledb.SUBSCR_GROUPING_CLASS_NONE,
-        grouping_value: int = 0,
-        grouping_type: int = oracledb.SUBSCR_GROUPING_TYPE_SUMMARY,
-        name: Optional[str] = None,
-        client_initiated: bool = False,
-        *,
-        ipAddress: Optional[str] = None,
-        groupingClass: int = oracledb.SUBSCR_GROUPING_CLASS_NONE,
-        groupingValue: int = 0,
-        groupingType: int = oracledb.SUBSCR_GROUPING_TYPE_SUMMARY,
-        clientInitiated: bool = False,
-    ) -> Subscription:
-        """
-        Returns a new subscription object that receives notifications for
-        events that take place in the database that match the given parameters.
-
-        The ``namespace`` parameter specifies the namespace the subscription
-        uses.  It can be one of :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE` or
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ`.
-
-        The ``protocol`` parameter specifies the protocol to use when
-        notifications are sent. Currently the only valid value is
-        :data:`oracledb.SUBSCR_PROTO_OCI`.
-
-        The ``callback`` is expected to be a callable that accepts a single
-        parameter. A :ref:`message object <msgobjects>` is passed to this
-        callback whenever a notification is received.
-
-        The ``timeout`` value specifies that the subscription expires after the
-        given time in seconds. The default value of *0* indicates that the
-        subscription never expires.
-
-        The ``operations`` parameter enables filtering of the messages that are
-        sent (insert, update, delete). The default value will send
-        notifications for all operations. This parameter is only used when the
-        namespace is set to :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE`.
-
-        The ``port`` parameter specifies the listening port for callback
-        notifications from the database server. If not specified, an unused
-        port will be selected by the Oracle Client libraries.
-
-        The ``qos`` parameter specifies quality of service options. It should
-        be one or more of the following flags, OR'ed together:
-        :data:`oracledb.SUBSCR_QOS_RELIABLE`,
-        :data:`oracledb.SUBSCR_QOS_DEREG_NFY`,
-        :data:`oracledb.SUBSCR_QOS_ROWIDS`, :data:`oracledb.SUBSCR_QOS_QUERY`,
-        :data:`oracledb.SUBSCR_QOS_BEST_EFFORT`.
-
-        The ``ip_address`` parameter specifies the IP address (*IPv4* or
-        *IPv6*) in standard string notation to bind for callback notifications
-        from the database server. If not specified, the client IP address will
-        be determined by the Oracle Client libraries.
-
-        The ``grouping_class`` parameter specifies what type of grouping of
-        notifications should take place. Currently, if set, this value can only
-        be set to the value :data:`oracledb.SUBSCR_GROUPING_CLASS_TIME`, which
-        will group notifications by the number of seconds specified in the
-        ``grouping_value`` parameter. The ``grouping_type`` parameter should be
-        one of the values :data:`oracledb.SUBSCR_GROUPING_TYPE_SUMMARY` (the
-        default) or :data:`oracledb.SUBSCR_GROUPING_TYPE_LAST`.
-
-        The ``name`` parameter is used to identify the subscription and is
-        specific to the selected namespace. If the namespace parameter is
-        :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE` then the name is optional
-        and can be any value. If the namespace parameter is
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ`, however, the name must be in the
-        format '<QUEUE_NAME>' for single consumer queues and
-        '<QUEUE_NAME>:<CONSUMER_NAME>' for multiple consumer queues, and
-        identifies the queue that will be monitored for messages. The queue
-        name may include the schema, if needed.
-
-        The ``client_initiated`` parameter is used to determine if client
-        initiated connections or server initiated connections (the default)
-        will be established. Client initiated connections are only available in
-        Oracle Client 19.4 and Oracle Database 19.4 and higher.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``ipAddress`` was renamed to ``ip_address``, the parameter
-        ``groupingClass`` was renamed to ``grouping_class``, the parameter
-        ``groupingValue`` was renamed to ``grouping_value``, the parameter
-        ``groupingType`` was renamed to ``grouping_type`` and the parameter
-        ``clientInitiated`` was renamed to ``client_initiated``. The old names
-        will continue to work as keyword parameters for a period of time.
-        """
-        self._verify_connected()
-        if ipAddress is not None:
-            if ip_address is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="ipAddress",
-                    new_name="ip_address",
-                )
-            ip_address = ipAddress
-        if groupingClass != oracledb.SUBSCR_GROUPING_CLASS_NONE:
-            if grouping_class != oracledb.SUBSCR_GROUPING_CLASS_NONE:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingClass",
-                    new_name="grouping_class",
-                )
-            grouping_class = groupingClass
-        if groupingValue != 0:
-            if grouping_value != 0:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingValue",
-                    new_name="grouping_value",
-                )
-            grouping_value = groupingValue
-        if groupingType != oracledb.SUBSCR_GROUPING_TYPE_SUMMARY:
-            if grouping_type != oracledb.SUBSCR_GROUPING_TYPE_SUMMARY:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingType",
-                    new_name="grouping_type",
-                )
-            grouping_type = groupingType
-        if clientInitiated:
-            if client_initiated:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="clientInitiated",
-                    new_name="client_initiated",
-                )
-            client_initiated = clientInitiated
-        impl = self._impl.create_subscr_impl(
-            self,
-            callback,
-            namespace,
-            name,
-            protocol,
-            ip_address,
-            port,
-            timeout,
-            operations,
-            qos,
-            grouping_class,
-            grouping_value,
-            grouping_type,
-            client_initiated,
-        )
-        subscr = Subscription._from_impl(impl)
-        impl.subscribe(subscr, self._impl)
-        return subscr
-
-    def suspend_sessionless_transaction(self) -> None:
-        """
-        Suspends the currently active sessionless transaction immediately.
-
-        This detaches the transaction from the connection, allowing it to be
-        resumed later with the transaction identifier that was specified during
-        creation of the sessionless transaction. The ``timeout`` previously
-        passed to :meth:`begin_sessionless_transaction()` determines how long
-        the transaction can stay suspended before it is automatically rolled
-        back.
-        """
-        self._verify_connected()
-        self._impl.suspend_sessionless_transaction()
-
-    def tpc_begin(
-        self, xid: Xid, flags: int = oracledb.TPC_BEGIN_NEW, timeout: int = 0
-    ) -> None:
-        """
-        Begins a Two-Phase Commit (TPC) on a global transaction using the
-        specified transaction identifier (xid).
-
-        The ``xid`` parameter should be an object returned by the
-        :meth:`xid()` method.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_BEGIN_JOIN`, :data:`oracledb.TPC_BEGIN_NEW`,
-        :data:`oracledb.TPC_BEGIN_PROMOTE`, or
-        :data:`oracledb.TPC_BEGIN_RESUME`.  The default is
-        :data:`oracledb.TPC_BEGIN_NEW`.
-
-        The ``timeout`` parameter is the number of seconds to wait for a
-        transaction to become available for resumption when
-        :data:`~oracledb.TPC_BEGIN_RESUME` is specified in the ``flags``
-        parameter.  When :data:`~oracledb.TPC_BEGIN_NEW` is specified in the
-        ``flags`` parameter, the ``timeout`` parameter indicates the number of
-        seconds the transaction can be inactive before it is automatically
-        terminated by the system. A transaction is inactive between the time it
-        is detached with :meth:`tpc_end()` and the time it is resumed with
-        :meth:`tpc_begin()`.The default is *0* seconds.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        if flags not in (
-            oracledb.TPC_BEGIN_NEW,
-            oracledb.TPC_BEGIN_JOIN,
-            oracledb.TPC_BEGIN_RESUME,
-            oracledb.TPC_BEGIN_PROMOTE,
-        ):
-            errors._raise_err(errors.ERR_INVALID_TPC_BEGIN_FLAGS)
-        self._impl.tpc_begin(xid, flags, timeout)
-
-    def tpc_commit(
-        self, xid: Optional[Xid] = None, one_phase: bool = False
-    ) -> None:
-        """
-        Commits a global transaction. When called with no arguments, this
-        method commits a transaction previously prepared with
-        :meth:`tpc_begin()` and optionally prepared with :meth:`tpc_prepare()`.
-        If :meth:`tpc_prepare()` is not called, a single phase commit is
-        performed. A transaction manager may choose to do this if only a single
-        resource is participating in the global transaction.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. This form should be called outside of a
-        transaction and is intended for use in recovery.
-
-        The ``one_phase`` parameter is a boolean identifying whether to perform
-        a one-phase or two-phase commit. If ``one_phase`` parameter is *True*,
-        a single-phase commit is performed. The default value is *False*. This
-        parameter is only examined if a value is provided for the ``xid``
-        parameter. Otherwise, the driver already knows whether
-        :meth:`tpc_prepare()` was called for the transaction and whether a
-        one-phase or two-phase commit is required.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        self._impl.tpc_commit(xid, one_phase)
-
-    def tpc_end(
-        self, xid: Optional[Xid] = None, flags: int = oracledb.TPC_END_NORMAL
-    ) -> None:
-        """
-        Ends or suspends work on a global transaction. This function is only
-        intended for use by transaction managers.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If no xid parameter is passed, then the
-        transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_END_NORMAL` or :data:`oracledb.TPC_END_SUSPEND`.
-        The default is :data:`oracledb.TPC_END_NORMAL`.
-
-        If the flag is :data:`oracledb.TPC_END_SUSPEND` then the transaction
-        may be resumed later by calling :meth:`tpc_begin()` with the flag
-        :data:`oracledb.TPC_BEGIN_RESUME`.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        if flags not in (oracledb.TPC_END_NORMAL, oracledb.TPC_END_SUSPEND):
-            errors._raise_err(errors.ERR_INVALID_TPC_END_FLAGS)
-        self._impl.tpc_end(xid, flags)
-
-    def tpc_forget(self, xid: Xid) -> None:
-        """
-        Causes the database to forget a heuristically completed TPC
-        transaction.  This function is only intended to be called by
-        transaction managers.
-
-        The ``xid`` parameter is mandatory and should be an object should be
-        returned by the :meth:`xid()` function.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        self._impl.tpc_forget(xid)
-
-    def tpc_prepare(self, xid: Optional[Xid] = None) -> bool:
-        """
-        Prepares a two-phase transaction for commit. After this function is
-        called, no further activity should take place on this connection until
-        either :meth:`tpc_commit()` or :meth:`tpc_rollback()` have been called.
-
-        Returns a boolean indicating whether a commit is needed or not. If you
-        attempt to commit when not needed, then it results in the error
-        ``ORA-24756: transaction does not exist``.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If an ``xid`` parameter is not passed, then
-        the transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        return self._impl.tpc_prepare(xid)
-
-    def tpc_recover(self) -> list:
-        """
-        Returns a list of pending transaction identifiers that require
-        recovery.  Objects of type ``Xid`` (as returned by the
-        :meth:`xid()` function) are returned and these can be passed to
-        :meth:`tpc_commit()` or :meth:`tpc_rollback()` as needed.
-
-        This function queries the DBA_PENDING_TRANSACTIONS view and requires
-        "SELECT" privilege on that view.
-        """
-        with self.cursor() as cursor:
-            cursor.execute(
-                """
-                    select
-                        formatid,
-                        globalid,
-                        branchid
-                    from dba_pending_transactions"""
-            )
-            cursor.rowfactory = Xid
-            return cursor.fetchall()
-
-    def tpc_rollback(self, xid: Optional[Xid] = None) -> None:
-        """
-        If an ``xid`` parameter is not passed, then it rolls back the
-        transaction that was previously started with
-        :meth:`tpc_begin()`.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        :meth:`xid()` and the specified transaction is rolled back.  This form
-        should be called outside of a transaction and is intended for use in
-        recovery.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        self._impl.tpc_rollback(xid)
-
-    def unsubscribe(self, subscr: Subscription) -> None:
-        """
-        Unsubscribe from events in the database that were originally subscribed
-        to using :meth:`subscribe()`. The connection used to unsubscribe should
-        be the same one used to create the subscription, or should access the
-        same database and be connected as the same user name.
-        """
-        self._verify_connected()
-        if not isinstance(subscr, Subscription):
-            raise TypeError("expecting subscription")
-        subscr._impl.unsubscribe(self._impl)
-
-
-def _connection_factory(
-    f: Callable[..., Connection],
-) -> Callable[..., Connection]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested Connection class. The base Connection
-    class constructor does not check the validity of the supplied keyword
-    parameters.
-    """
-
-    @functools.wraps(f)
-    def connect(
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.ConnectionPool"] = None,
-        pool_alias: Optional[str] = None,
-        conn_class: Type[Connection] = Connection,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> Connection:
-        f(
-            dsn=dsn,
-            pool=pool,
-            pool_alias=pool_alias,
-            conn_class=conn_class,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(conn_class, Connection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        if pool is not None and pool_alias is not None:
-            errors._raise_err(
-                errors.ERR_DUPLICATED_PARAMETER,
-                deprecated_name="pool",
-                new_name="pool_alias",
-            )
-        if pool_alias is not None:
-            pool = pool_module.named_pools.pools.get(pool_alias)
-            if pool is None:
-                errors._raise_err(
-                    errors.ERR_NAMED_POOL_MISSING, alias=pool_alias
-                )
-        if pool is not None and not isinstance(
-            pool, pool_module.ConnectionPool
-        ):
-            message = "pool must be an instance of oracledb.ConnectionPool"
-            raise TypeError(message)
-        return conn_class(dsn=dsn, pool=pool, params=params, **kwargs)
-
-    return connect
-
-
-@_connection_factory
-def connect(
-    dsn: Optional[str] = None,
-    *,
-    pool: Optional["pool_module.ConnectionPool"] = None,
-    pool_alias: Optional[str] = None,
-    conn_class: Type[Connection] = Connection,
-    params: Optional[ConnectParams] = None,
-    user: Optional[str] = None,
-    proxy_user: Optional[str] = None,
-    password: Optional[str] = None,
-    newpassword: Optional[str] = None,
-    wallet_password: Optional[str] = None,
-    access_token: Optional[Union[str, tuple, Callable]] = None,
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    https_proxy: Optional[str] = None,
-    https_proxy_port: Optional[int] = None,
-    service_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    sid: Optional[str] = None,
-    server_type: Optional[str] = None,
-    cclass: Optional[str] = None,
-    purity: Optional[oracledb.Purity] = None,
-    expire_time: Optional[int] = None,
-    retry_count: Optional[int] = None,
-    retry_delay: Optional[int] = None,
-    tcp_connect_timeout: Optional[float] = None,
-    ssl_server_dn_match: Optional[bool] = None,
-    ssl_server_cert_dn: Optional[str] = None,
-    wallet_location: Optional[str] = None,
-    events: Optional[bool] = None,
-    externalauth: Optional[bool] = None,
-    mode: Optional[oracledb.AuthMode] = None,
-    disable_oob: Optional[bool] = None,
-    stmtcachesize: Optional[int] = None,
-    edition: Optional[str] = None,
-    tag: Optional[str] = None,
-    matchanytag: Optional[bool] = None,
-    config_dir: Optional[str] = None,
-    appcontext: Optional[list] = None,
-    shardingkey: Optional[list] = None,
-    supershardingkey: Optional[list] = None,
-    debug_jdwp: Optional[str] = None,
-    connection_id_prefix: Optional[str] = None,
-    ssl_context: Optional[Any] = None,
-    sdu: Optional[int] = None,
-    pool_boundary: Optional[str] = None,
-    use_tcp_fast_open: Optional[bool] = None,
-    ssl_version: Optional[ssl.TLSVersion] = None,
-    program: Optional[str] = None,
-    machine: Optional[str] = None,
-    terminal: Optional[str] = None,
-    osuser: Optional[str] = None,
-    driver_name: Optional[str] = None,
-    use_sni: Optional[bool] = None,
-    thick_mode_dsn_passthrough: Optional[bool] = None,
-    extra_auth_params: Optional[dict] = None,
-    pool_name: Optional[str] = None,
-    handle: Optional[int] = None,
-) -> Connection:
-    """
-    Factory function which creates a connection to the database and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool`` parameter is expected to be a pool object. This parameter was
-    deprecated in python-oracledb 3.0.0. Use :meth:`ConnectionPool.acquire()`
-    instead since the use of this parameter is the equivalent of calling this
-    method.
-
-    The ``conn_class`` parameter is expected to be Connection or a subclass of
-    Connection.
-
-    The ``params`` parameter is expected to be of type ConnectParams and
-    contains connection parameters that will be used when establishing the
-    connection. See the documentation on ConnectParams for more information.
-    If this parameter is not specified, the additional keyword parameters will
-    be used to create an instance of ConnectParams. If both the ``params``
-    parameter and additional keyword parameters are specified, the values in
-    the keyword parameters have precedence. Note that if a ``dsn`` is also
-    supplied, then in python-oracledb Thin mode, the values of the parameters
-    specified (if any) within the ``dsn`` will override the values passed as
-    additional keyword parameters, which themselves override the values set in
-    the ``params`` parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    - ``user``: the name of the database user to connect to
-      (default: None)
-
-    - ``proxy_user``: the name of the proxy user to connect to. If this value
-      is not specified, it will be parsed out of user if user is in the form
-      "user[proxy_user]"
-      (default: None)
-
-    - ``password``: the password for the database user
-      (default: None)
-
-    - ``newpassword``: a new password for the database user. The new password
-      will take effect immediately upon a successful connection to the database
-      (default: None)
-
-    - ``wallet_password``: the password to use to decrypt the wallet, if it is
-      encrypted. This is not the database password. For Oracle Autonomous
-      Database this is the password created when downloading the wallet. This
-      value is only used in python-oracledb Thin mode.
-      (default: None)
-
-    - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-      string, it specifies an Entra ID OAuth2 token used for Open Authorization
-      (OAuth 2.0) token based authentication. If it is a 2-tuple, it specifies
-      the token and private key strings used for Oracle Cloud Infrastructure
-      (OCI) Identity and Access Management (IAM) token based authentication. If
-      it is a callable, it returns either a string or a 2-tuple used for OAuth
-      2.0 or OCI IAM token based authentication and is useful when the pool
-      needs to expand and create new connections but the current authentication
-      token has expired
-      (default: None)
-
-    - ``host``: the hostname or IP address of the machine hosting the database
-      or the database listener
-      (default: None)
-
-    - ``port``: the port number on which the database listener is listening
-      (default: 1521)
-
-    - ``protocol``: one of the strings "tcp" or "tcps" indicating whether to
-      use unencrypted network traffic or encrypted network traffic (TLS)
-      (default: "tcp")
-
-    - ``https_proxy``: the hostname or IP address of a proxy host to use for
-      tunneling secure connections
-      (default: None)
-
-    - ``https_proxy_port``: the port on which to communicate with the proxy
-      host
-      (default: 0)
-
-    - ``service_name``: the service name of the database
-      (default: None)
-
-    - ``instance_name``: the instance name of the database
-      (default: None)
-
-    - ``sid``: the system identifier (SID) of the database. Note using a
-      service_name instead is recommended
-      (default: None)
-
-    - ``server_type``: the type of server connection that should be
-      established. If specified, it should be one of strings "dedicated",
-      "shared" or "pooled"
-      (default: None)
-
-    - ``cclass``: the connection class to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: None)
-
-    - ``purity``: the connection purity to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-    - ``expire_time``: the number of minutes between the sending of keepalive
-      probes. If this parameter is set to a value greater than zero it enables
-      keepalive
-      (default: 0)
-
-    - ``retry_count``: the number of times that initial connection
-      establishment should be retried before the connection attempt is
-      terminated
-      (default: 0)
-
-    - ``retry_delay``: the number of seconds to wait before retrying to
-      establish a connection
-      (default: 1)
-
-    - ``tcp_connect_timeout``: a float indicating the maximum number of seconds
-      to wait when establishing a connection to the database host
-      (default: 20.0)
-
-    - ``ssl_server_dn_match``: a boolean indicating whether the server
-      certificate distinguished name (DN) should be matched in addition to the
-      regular certificate verification that is performed. Note that if the
-      ssl_server_cert_dn parameter is not privided, host name matching is
-      performed instead
-      (default: True)
-
-    - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-      matched with the server. This value is ignored if the ssl_server_dn_match
-      parameter is not set to the value True. If specified this value is used
-      for any verfication. Otherwise the hostname will be used
-      (default: None)
-
-    - ``wallet_location``: the directory where the wallet can be found. In
-      python-oracledb Thin mode this must be the directory containing the PEM-
-      encoded wallet file ewallet.pem. In python-oracledb Thick mode this must
-      be the directory containing the file cwallet.sso
-      (default: None)
-
-    - ``events``: a boolean specifying whether events mode should be enabled.
-      This value is only used in python-oracledb Thick mode and is needed for
-      continuous query notification and high availability event notifications
-      (default: False)
-
-    - ``externalauth``: a boolean indicating whether to use external
-      authentication
-      (default: False)
-
-    - ``mode``: the authorization mode to use. One of the constants
-      :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-      :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-      :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-      :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`, or
-      :data:`oracledb.AUTH_MODE_SYSRAC`
-      (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-    - ``disable_oob``: a boolean indicating whether out-of-band breaks should
-      be disabled. This value is only used in python-oracledb Thin mode. It has
-      no effect on Windows which does not support this functionality
-      (default: False)
-
-    - ``stmtcachesize``: the size of the statement cache
-      (default: :attr:`oracledb.defaults.stmtcachesize
-      <Defaults.stmtcachesize>`)
-
-    - ``edition``: edition to use for the connection. This parameter cannot be
-      used simultaneously with the cclass parameter
-      (default: None)
-
-    - ``tag``: identifies the type of connection that should be returned from a
-      pool. This value is only used in python-oracledb Thick mode
-      (default: None)
-
-    - ``matchanytag``: a boolean specifying whether any tag can be used when
-      acquiring a connection from the pool. This value is only used in python-
-      oracledb Thick mode
-      (default: False)
-
-    - ``config_dir``: a directory in which the optional tnsnames.ora
-      configuration file is located. This value is only used in python-oracledb
-      Thin mode. For python-oracledb Thick mode, it is used if
-      :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-      mode use the ``config_dir`` parameter of
-      :meth:`oracledb.init_oracle_client()`
-      (default: :attr:`oracledb.defaults.config_dir
-      <Defaults.config_dir>`)
-
-    - ``appcontext``: application context used by the connection. It should be
-      a list of 3-tuples (namespace, name, value) and each entry in the tuple
-      should be a string
-      (default: None)
-
-    - ``shardingkey``: a list of strings, numbers, bytes or dates that identify
-      the database shard to connect to. This value is only used in python-
-      oracledb Thick mode
-      (default: None)
-
-    - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-      identify the database shard to connect to. This value is only used in
-      python-oracledb Thick mode
-      (default: None)
-
-    - ``debug_jdwp``: a string with the format "host=<host>;port=<port>" that
-      specifies the host and port of the PL/SQL debugger. This value is only
-      used in python-oracledb Thin mode.  For python-oracledb Thick mode set
-      the ORA_DEBUG_JDWP environment variable
-      (default: None)
-
-    - ``connection_id_prefix``: an application specific prefix that is added to
-      the connection identifier used for tracing
-      (default: None)
-
-    - ``ssl_context``: an SSLContext object used for connecting to the database
-      using TLS.  This SSL context will be modified to include the private key
-      or any certificates found in a separately supplied wallet. This parameter
-      should only be specified if the default SSLContext object cannot be used
-      (default: None)
-
-    - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes. The
-      value tunes internal buffers used for communication to the database.
-      Bigger values can increase throughput for large queries or bulk data
-      loads, but at the cost of higher memory use. The SDU size that will
-      actually be used is negotiated down to the lower of this value and the
-      database network SDU configuration value
-      (default: 8192)
-
-    - ``pool_boundary``: one of the values "statement" or "transaction"
-      indicating when pooled DRCP connections can be returned to the pool. This
-      requires the use of DRCP with Oracle Database 23.4 or higher
-      (default: None)
-
-    - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast open.
-      This is an Oracle Autonomous Database Serverless (ADB-S) specific
-      property for clients connecting from within OCI Cloud network. Please
-      refer to the ADB-S documentation for more information
-      (default: False)
-
-    - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-      ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-      (default: None)
-
-    - ``program``: a string recorded by Oracle Database as the program from
-      which the connection originates
-      (default: :attr:`oracledb.defaults.program
-      <Defaults.program>`)
-
-    - ``machine``: a string recorded by Oracle Database as the name of the
-      machine from which the connection originates
-      (default: :attr:`oracledb.defaults.machine
-      <Defaults.machine>`)
-
-    - ``terminal``: a string recorded by Oracle Database as the terminal
-      identifier from which the connection originates
-      (default: :attr:`oracledb.defaults.terminal
-      <Defaults.terminal>`)
-
-    - ``osuser``: a string recorded by Oracle Database as the operating system
-      user who originated the connection
-      (default: :attr:`oracledb.defaults.osuser
-      <Defaults.osuser>`)
-
-    - ``driver_name``: a string recorded by Oracle Database as the name of the
-      driver which originated the connection
-      (default: :attr:`oracledb.defaults.driver_name
-      <Defaults.driver_name>`)
-
-    - ``use_sni``: a boolean indicating whether to use the TLS SNI extension to
-      bypass the second TLS neogiation that would otherwise be required
-      (default: False)
-
-    - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass the
-      connect string to the Oracle Client libraries unchanged without parsing
-      by the driver. Setting this to False makes python-oracledb Thick and Thin
-      mode applications behave similarly regarding connection string parameter
-      handling and locating any optional tnsnames.ora configuration file
-      (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>`)
-
-    - ``extra_auth_params``: a dictionary containing configuration parameters
-      necessary for Oracle Database authentication using plugins, such as the
-      Azure and OCI cloud-native authentication plugins
-      (default: None)
-
-    - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP with
-      Oracle Database 23.4, or higher
-      (default: None)
-
-    - ``handle``: an integer representing a pointer to a valid service context
-      handle. This value is only used in python-oracledb Thick mode. It should
-      be used with extreme caution
-      (default: 0)
-    """
-    pass
-
-
-class AsyncConnection(BaseConnection):
-
-    def __init__(
-        self,
-        dsn: str,
-        pool: pool_module.AsyncConnectionPool,
-        params: ConnectParams,
-        kwargs: dict,
-    ) -> None:
-        """
-        Constructor for creating an asynchronous connection to the database.
-        """
-        super().__init__()
-        self._pool = pool
-        self._connect_coroutine = self._connect(dsn, pool, params, kwargs)
-
-    def __await__(self):
-        coroutine = self._connect_coroutine
-        self._connect_coroutine = None
-        return coroutine.__await__()
-
-    async def __aenter__(self):
-        """
-        The entry point for the asynchronous connection as a context manager.
-        It returns itself.
-        """
-        if self._connect_coroutine is not None:
-            await self._connect_coroutine
-        else:
-            self._verify_connected()
-        return self
-
-    async def __aexit__(self, *exc_info):
-        """
-        The exit point for the asynchronous connection as a context manager.
-        This will close the connection and roll back any uncommitted
-        transaction.
-        """
-        if self._impl is not None:
-            await self._close()
-
-    async def _close(self, in_del=False):
-        """
-        Closes the connection and makes it unusable for further operations. An
-        Error exception will be raised if any operation is attempted with this
-        connection after this method completes successfully.
-        """
-        if self._pool is not None:
-            pool_impl = self._pool._impl
-            if pool_impl is not None:
-                await pool_impl.return_connection(self._impl, in_del)
-        else:
-            await self._impl.close(in_del)
-        self._impl = None
-
-    async def _connect(self, dsn, pool, params, kwargs):
-        """
-        Internal method for establishing a connection to the database using
-        asyncio.
-        """
-
-        # mandate that thin mode is required; with asyncio, only thin mode is
-        # supported and only one thread is executing, so the manager can be
-        # manipulated directly
-        driver_mode.manager.thin_mode = True
-
-        # determine which connection parameters to use
-        if params is None:
-            params_impl = base_impl.ConnectParamsImpl()
-        elif not isinstance(params, ConnectParams):
-            errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-        else:
-            params_impl = params._impl.copy()
-        dsn = params_impl.process_args(dsn, kwargs, thin=True)
-
-        # see if connection is being acquired from a pool
-        if pool is None:
-            pool_impl = None
-        elif not isinstance(pool, pool_module.AsyncConnectionPool):
-            message = (
-                "pool must be an instance of oracledb.AsyncConnectionPool"
-            )
-            raise TypeError(message)
-        else:
-            pool._verify_open()
-            pool_impl = pool._impl
-
-        # create implementation object
-        if pool is not None:
-            impl = await pool_impl.acquire(params_impl)
-        else:
-            impl = thin_impl.AsyncThinConnImpl(dsn, params_impl)
-            await impl.connect(params_impl)
-        self._impl = impl
-
-        # invoke callback, if applicable
-        if (
-            impl.invoke_session_callback
-            and pool is not None
-            and pool.session_callback is not None
-            and callable(pool.session_callback)
-        ):
-            await pool.session_callback(self, params_impl.tag)
-            impl.invoke_session_callback = False
-
-        return self
-
-    def _create_queue(self, impl):
-        """
-        Returns a queue object that the user can use to dequeue and enqueue
-        messages.
-        """
-        return AsyncQueue._from_impl(self, impl)
-
-    def _verify_can_execute(
-        self, parameters: Any, keyword_parameters: Any
-    ) -> Any:
-        """
-        Verifies that the connection can be used to execute
-        Verifies that the connection is connected to the database. If it is
-        not, an exception is raised.
-        """
-        self._verify_connected()
-        if keyword_parameters:
-            if parameters:
-                errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
-            return keyword_parameters
-        elif parameters is not None and not isinstance(
-            parameters, (list, tuple, dict)
-        ):
-            errors._raise_err(errors.ERR_WRONG_EXECUTE_PARAMETERS_TYPE)
-        return parameters
-
-    async def begin_sessionless_transaction(
-        self,
-        transaction_id: Optional[Union[str, bytes]] = None,
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Begins a new sessionless transaction. This method returns the
-        transaction identifier specified by the user or generated by
-        python-oracledb.
-
-        The ``transaction_id`` parameter should be of type string or bytes. If
-        specified, it represents a unique identifier for the transaction. If a
-        string is passed, then it will be UTF-8 encoded to bytes. If this value
-        is not specified, then python-oracledb generates a a random
-        `universally-unique identifier (UUID) <https://www.rfc-editor.org/rfc/
-        rfc4122.txt>`__ value when this function is called. An example is
-        "36b8f84d-df4e-4d49-b662-bcde71a8764f". The user-chosen value cannot
-        exceed 64 bytes in length.
-
-        The ``timeout`` parameter is the number of seconds that this
-        transaction can stay suspended when
-        :meth:`suspend_sessionless_transaction()` is later called, or if the
-        transaction is automatically suspended when the ``suspend_on_success``
-        parameter is set to to *True* in :meth:`AsyncCursor.execute()` or
-        :meth:`AsyncCursor.executemany()`. The default value is *60* seconds.
-        If a transaction is not resumed within this specified duration, the
-        transaction will be rolled back.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to start a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not isinstance(timeout, int) or timeout <= 0:
-            raise TypeError("timeout must be a positive integer")
-
-        await self._impl.begin_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    async def callfunc(
-        self,
-        name: str,
-        return_type: Any,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> Any:
-        """
-        Calls a PL/SQL function with the given name.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.callfunc()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            return await cursor.callfunc(
-                name, return_type, parameters, keyword_parameters
-            )
-
-    async def callproc(
-        self,
-        name: str,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> list:
-        """
-        Calls a PL/SQL procedure with the given name.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.callproc()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            return await cursor.callproc(name, parameters, keyword_parameters)
-
-    async def changepassword(
-        self, old_password: str, new_password: str
-    ) -> None:
-        """
-        Changes the password for the user to which the connection is connected.
-        """
-        self._verify_connected()
-        await self._impl.change_password(old_password, new_password)
-
-    async def close(self) -> None:
-        """
-        Closes the connection.
-        """
-        self._verify_connected()
-        await self._close()
-
-    async def commit(self) -> None:
-        """
-        Commits any pending transaction to the database.
-        """
-        self._verify_connected()
-        await self._impl.commit()
-
-    async def createlob(
-        self, lob_type: DbType, data: Optional[Union[str, bytes]] = None
-    ) -> AsyncLOB:
-        """
-        Creates and returns a new temporary LOB of the specified type.
-        """
-        self._verify_connected()
-        if lob_type not in (DB_TYPE_CLOB, DB_TYPE_NCLOB, DB_TYPE_BLOB):
-            message = (
-                "parameter should be one of oracledb.DB_TYPE_CLOB, "
-                "oracledb.DB_TYPE_BLOB or oracledb.DB_TYPE_NCLOB"
-            )
-            raise TypeError(message)
-        impl = await self._impl.create_temp_lob_impl(lob_type)
-        lob = AsyncLOB._from_impl(impl)
-        if data:
-            await lob.write(data)
-        return lob
-
-    def cursor(self, scrollable: bool = False) -> AsyncCursor:
-        """
-        Returns an :ref:`AsyncCursor object <asynccursorobj>` associated with
-        the connection.
-        """
-        self._verify_connected()
-        return AsyncCursor(self, scrollable)
-
-    async def execute(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-    ) -> None:
-        """
-        Executes a statement against the database.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.execute()`, and then :meth:`AsyncCursor.close()`
-        """
-        with self.cursor() as cursor:
-            await cursor.execute(statement, parameters)
-
-    async def executemany(
-        self, statement: Union[str, None], parameters: Any
-    ) -> None:
-        """
-        Executes a SQL statement once using all bind value mappings or
-        sequences found in the sequence parameters. This can be used to insert,
-        update, or delete multiple rows in a table with a single
-        python-oracledb call. It can also invoke a PL/SQL procedure multiple
-        times.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one bind variable placeholder in ``statement``. It can
-        also be a list of dictionaries, where the keys match the bind variable
-        placeholder names in ``statement``. If there are no bind values, or
-        values have previously been bound, the ``parameters`` value can be an
-        integer specifying the number of iterations.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.executemany()`, and then
-        :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            await cursor.executemany(statement, parameters)
-
-    async def fetchall(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> list:
-        """
-        Executes a query and returns all of the rows.
-
-        The default value for ``arraysize`` is
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this method's :attr:`AsyncCursor.prefetchrows` size is set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchall()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            if arraysize is not None:
-                cursor.arraysize = arraysize
-            cursor.prefetchrows = cursor.arraysize
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchall()
-
-    async def direct_path_load(
-        self,
-        schema_name: str,
-        table_name: str,
-        column_names: list[str],
-        data: Any,
-        *,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Load data into Oracle Database using the Direct Path Load interface.
-        It is available only in python-oracledb Thin mode.
-
-        The ``data`` parameter can be a list of sequences, a DataFrame, or a
-        third-party DataFrame instance that supports the Apache Arrow PyCapsule
-        Interface.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance.
-        """
-        self._verify_connected()
-        await self._impl.direct_path_load(
-            schema_name, table_name, column_names, data, batch_size
-        )
-
-    async def fetch_df_all(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> DataFrame:
-        """
-        Fetches all rows of the SQL query ``statement``, returning them in a
-        :ref:`DataFrame <oracledataframeobj>` object. An empty DataFrame is
-        returned if there are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``arraysize`` parameter can be specified to tune performance of
-        fetching data across the network. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.  Internally,
-        the ``fetch_df_all()``'s :attr:`Cursor.prefetchrows` size is always set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if arraysize is not None:
-            cursor.arraysize = arraysize
-        cursor.prefetchrows = cursor.arraysize
-        await cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        return await cursor._impl.fetch_df_all(cursor)
-
-    async def fetch_df_batches(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        size: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> Iterator[DataFrame]:
-        """
-        This returns an iterator yielding the next ``size`` rows of the SQL
-        query ``statement`` in each iteration as a :ref:`DataFrame
-        <oracledataframeobj>` object. An empty DataFrame is returned if there
-        are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``size`` parameter controls the number of records fetched in each
-        batch. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_batches()``'s :attr:`Cursor.arraysize` and
-        :attr:`Cursor.prefetchrows` sizes are always set to the value of the
-        explicit or default ``size`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        decimal values when fetching columns of type ``NUMBER`` that are
-        capable of being represented in Arrow Decimal128 format. The default
-        value is
-        :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if size is not None:
-            cursor.arraysize = size
-        cursor.prefetchrows = cursor.arraysize
-        await cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        if size is None:
-            yield await cursor._impl.fetch_df_all(cursor)
-        else:
-            async for df in cursor._impl.fetch_df_batches(cursor, size):
-                yield df
-
-    async def fetchmany(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        num_rows: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> list:
-        """
-        Executes a query and returns up to the specified number of rows.
-
-        The default value for ``num_rows`` is the value of
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this method's :attr:`AsyncCursor.prefetchrows` size is set
-        to the value of the explicit or default ``num_rows`` parameter,
-        allowing all rows to be fetched in one :ref:`round-trip <roundtrips>`
-
-        Since only one fetch is performed for a query, consider adding a
-        ``FETCH NEXT`` clause to the statement to prevent the database
-        processing rows that will never be fetched, see :ref:`rowlimit`.
-
-        This a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchmany()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            if num_rows is None:
-                num_rows = cursor.arraysize
-            elif num_rows <= 0:
-                return []
-            cursor.arraysize = cursor.prefetchrows = num_rows
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchmany(num_rows)
-
-    async def fetchone(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> Any:
-        """
-        Executes a query and returns the first row of the result set if one
-        exists (or *None* if no rows exist).
-
-        Internally, this method's :attr:`Cursor.prefetchrows` and
-        :attr:`Cursor.arraysize` sizes will be set to *1*.
-
-        Since only one fetch is performed for a query, consider adding a
-        ``WHERE`` condition or using a ``FETCH NEXT`` clause in the statement
-        to prevent the database processing rows that will never be fetched, see
-        :ref:`rowlimit`.
-
-        This a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchone()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            cursor.prefetchrows = cursor.arraysize = 1
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchone()
-
-    async def gettype(self, name: str) -> DbObjectType:
-        """
-        Returns a type object given its name. This can then be used to create
-        objects which can be bound to cursors created by this connection.
-        """
-        self._verify_connected()
-        obj_type_impl = await self._impl.get_type(self, name)
-        return DbObjectType._from_impl(obj_type_impl)
-
-    async def ping(self) -> None:
-        """
-        Pings the database to verify if the connection is valid.
-        """
-        self._verify_connected()
-        await self._impl.ping()
-
-    async def resume_sessionless_transaction(
-        self,
-        transaction_id: Union[str, bytes],
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Resumes an existing sessionless transaction using the specified
-        transaction identifier. This method returns the transaction identifier
-        used to resume the sessionless transaction.
-
-        The ``transaction_id`` parameter should be a string or bytes value that
-        uniquely identifies an existing sessionless transaction that is to be
-        resumed.
-
-        The ``timeout`` parameter is the number of seconds that the current
-        connection waits to resume a transaction if another connection is using
-        it.  When ``defer_round_trip`` is set to *False*, the wait happens in
-        the ``resume_sessionless_transaction()`` call itself, and the function
-        blocks until the transaction becomes available or the timeout expires.
-        When ``defer_round_trip`` is set to *True*, the resume is deferred and
-        the wait occurs at the time of the next database operation instead. At
-        the start of the wait period, if the transaction is not in use by any
-        other connection, the resume happens immediately. If the transaction
-        remains in use by the other connection after the timeout period, the
-        error `ORA-25351
-        <https://docs.oracle.com/en/error-help/db/ora-25351>`__ is raised. If
-        another connection completes the transaction, the error `ORA-24756
-        <https://docs.oracle.com/en/error-help/db/ora-24756>`__ is raised.
-        These error messages are only thrown for non-RAC instances. For
-        information on using Oracle RAC, see :ref:`Sessionless Transactions
-        with Oracle RAC <sessionlesstxnswithrac>`.  The default value is *60*
-        seconds.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to resume a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        if transaction_id is None:
-            raise ValueError("transaction_id is required for resuming")
-
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not (isinstance(timeout, int) and timeout >= 0):
-            raise TypeError("timeout must be a non-negative integer")
-
-        await self._impl.resume_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    async def rollback(self) -> None:
-        """
-        Rolls back any pending transaction.
-        """
-        self._verify_connected()
-        await self._impl.rollback()
-
-    async def run_pipeline(
-        self,
-        pipeline: Pipeline,
-        continue_on_error: bool = False,
-    ) -> list[PipelineOpResult]:
-        """
-        Runs all of the operations in the pipeline and returns a list of
-        PipelineOpResult, each entry corresponding to an operation executed in
-        the pipeline.
-
-        The ``continue_on_error`` parameter determines whether operations
-        should continue to run after an error has occurred. If this parameter
-        is set to *True*, then the :attr:`PipelineOpResult.error` attribute
-        will be populated with an :ref:`_Error <exchandling>` instance which
-        identifies the error that occurred. If this parameter is set to
-        *False*, then an exception will be raised as soon as an error is
-        detected and all subsequent operations will be terminated. The default
-        value is *False*.
-        """
-        self._verify_connected()
-        results = [op._create_result() for op in pipeline.operations]
-        if self._impl.supports_pipelining() and len(results) > 1:
-            await self._impl.run_pipeline_with_pipelining(
-                self, results, continue_on_error
-            )
-        else:
-            await self._impl.run_pipeline_without_pipelining(
-                self, results, continue_on_error
-            )
-        return results
-
-    async def suspend_sessionless_transaction(self) -> None:
-        """
-        Suspends the currently active sessionless transaction immediately.
-
-        This detaches the transaction from the connection, allowing it to be
-        resumed later with the transaction identifier that was specified during
-        creation of the sessionless transaction. The ``timeout`` previously
-        passed to :meth:`AsyncConnection.begin_sessionless_transaction()`
-        determines how long the transaction can stay suspended before it is
-        automatically rolled back.
-        """
-        self._verify_connected()
-        await self._impl.suspend_sessionless_transaction()
-
-    async def tpc_begin(
-        self, xid: Xid, flags: int = oracledb.TPC_BEGIN_NEW, timeout: int = 0
-    ) -> None:
-        """
-        Begins a Two-Phase Commit (TPC) on a global transaction using the
-        specified transaction identifier (xid).
-
-        The ``xid`` parameter should be an object returned by the
-        :meth:`xid()` method.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_BEGIN_JOIN`, :data:`oracledb.TPC_BEGIN_NEW`,
-        :data:`oracledb.TPC_BEGIN_PROMOTE`, or
-        :data:`oracledb.TPC_BEGIN_RESUME`.  The default is
-        :data:`oracledb.TPC_BEGIN_NEW`.
-
-        The ``timeout`` parameter is the number of seconds to wait for a
-        transaction to become available for resumption when
-        :data:`~oracledb.TPC_BEGIN_RESUME` is specified in the ``flags``
-        parameter.  When :data:`~oracledb.TPC_BEGIN_NEW` is specified in the
-        ``flags`` parameter, the ``timeout`` parameter indicates the number of
-        seconds the transaction can be inactive before it is automatically
-        terminated by the system. A transaction is inactive between the time it
-        is detached with :meth:`AsyncConnection.tpc_end()` and the time it is
-        resumed with :meth:`AsyncConnection.tpc_begin()`.The default is *0*
-        seconds.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        if flags not in (
-            oracledb.TPC_BEGIN_NEW,
-            oracledb.TPC_BEGIN_JOIN,
-            oracledb.TPC_BEGIN_RESUME,
-            oracledb.TPC_BEGIN_PROMOTE,
-        ):
-            errors._raise_err(errors.ERR_INVALID_TPC_BEGIN_FLAGS)
-        await self._impl.tpc_begin(xid, flags, timeout)
-
-    async def tpc_commit(
-        self, xid: Optional[Xid] = None, one_phase: bool = False
-    ) -> None:
-        """
-        Commits a global transaction. When called with no arguments, this
-        method commits a transaction previously prepared with
-        :meth:`~AsyncConnection.tpc_begin()` and optionally prepared with
-        :meth:`~AsyncConnection.tpc_prepare()`. If
-        :meth:`~AsyncConnection.tpc_prepare()` is not called, a single phase
-        commit is performed. A transaction manager may choose to do this if
-        only a single resource is participating in the global transaction.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`~Connection.xid()` function. This form should be called
-        outside of a transaction and is intended for use in recovery.
-
-        The ``one_phase`` parameter is a boolean identifying whether to perform
-        a one-phase or two-phase commit. If ``one_phase`` parameter is *True*,
-        a single-phase commit is performed.  The default value is *False*. This
-        parameter is only examined if a value is provided for the ``xid``
-        parameter. Otherwise, the driver already knows whether
-        :meth:`tpc_prepare()` was called for the transaction and whether a
-        one-phase or two-phase commit is required.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        await self._impl.tpc_commit(xid, one_phase)
-
-    async def tpc_end(
-        self, xid: Optional[Xid] = None, flags: int = oracledb.TPC_END_NORMAL
-    ) -> None:
-        """
-        Ends or suspends work on a global transaction. This function is only
-        intended for use by transaction managers.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`~Connection.xid()` function. If no xid parameter is passed,
-        then the transaction identifier used by the previous
-        :meth:`~Connection.tpc_begin()` is used.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_END_NORMAL` or :data:`oracledb.TPC_END_SUSPEND`.
-        The default is :data:`oracledb.TPC_END_NORMAL`.
-
-        If the flag is :data:`oracledb.TPC_END_SUSPEND` then the transaction
-        may be resumed later by calling :meth:`AsyncConnection.tpc_begin()`
-        with the flag :data:`oracledb.TPC_BEGIN_RESUME`.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        if flags not in (oracledb.TPC_END_NORMAL, oracledb.TPC_END_SUSPEND):
-            errors._raise_err(errors.ERR_INVALID_TPC_END_FLAGS)
-        await self._impl.tpc_end(xid, flags)
-
-    async def tpc_forget(self, xid: Xid) -> None:
-        """
-        Causes the database to forget a heuristically completed TPC
-        transaction.  This function is only intended to be called by
-        transaction managers.
-
-        The ``xid`` parameter is mandatory and should be an object should be
-        returned by the :meth:`xid()` function.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        await self._impl.tpc_forget(xid)
-
-    async def tpc_prepare(self, xid: Optional[Xid] = None) -> bool:
-        """
-        Prepares a two-phase transaction for commit. After this function is
-        called, no further activity should take place on this connection until
-        either :meth:`tpc_commit()` or :meth:`tpc_rollback()` have been called.
-
-        Returns a boolean indicating whether a commit is needed or not. If you
-        attempt to commit when not needed, then it results in the error
-        ``ORA-24756: transaction does not exist``.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If an ``xid`` parameter is not passed, then
-        the transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        return await self._impl.tpc_prepare(xid)
-
-    async def tpc_recover(self) -> list:
-        """
-        Returns a list of pending transaction identifiers that require
-        recovery.  Objects of type ``Xid`` (as returned by the
-        :meth:`~Connection.xid()` function) are returned and these can be
-        passed to :meth:`tpc_commit()` or :meth:`tpc_rollback()` as needed.
-
-        This function queries the view ``DBA_PENDING_TRANSACTIONS`` and
-        requires ``SELECT`` privilege on that view.
-        """
-        with self.cursor() as cursor:
-            await cursor.execute(
-                """
-                    select
-                        formatid,
-                        globalid,
-                        branchid
-                    from dba_pending_transactions"""
-            )
-            cursor.rowfactory = Xid
-            return await cursor.fetchall()
-
-    async def tpc_rollback(self, xid: Optional[Xid] = None) -> None:
-        """
-        Rolls back a global transaction.
-
-        If an ``xid`` parameter is not passed, then it rolls back the
-        transaction that was previously started with
-        :meth:`~AsyncConnection.tpc_begin()`.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        :meth:`~Connection.xid()` and the specified transaction is rolled back.
-        This form should be called outside of a transaction and is intended for
-        use in recovery.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        await self._impl.tpc_rollback(xid)
-
-
-def _async_connection_factory(
-    f: Callable[..., AsyncConnection],
-) -> Callable[..., AsyncConnection]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested AsyncConnection class.
-    """
-
-    @functools.wraps(f)
-    def connect_async(
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.AsyncConnectionPool"] = None,
-        pool_alias: Optional[str] = None,
-        conn_class: Type[AsyncConnection] = AsyncConnection,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> AsyncConnection:
-        # check arguments
-        f(
-            dsn=dsn,
-            pool=pool,
-            pool_alias=pool_alias,
-            conn_class=conn_class,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(conn_class, AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-
-        if pool is not None and pool_alias is not None:
-            errors._raise_err(
-                errors.ERR_DUPLICATED_PARAMETER,
-                deprecated_name="pool",
-                new_name="pool_alias",
-            )
-        if pool_alias is not None:
-            pool = pool_module.named_pools.pools.get(pool_alias)
-            if pool is None:
-                errors._raise_err(
-                    errors.ERR_NAMED_POOL_MISSING, alias=pool_alias
-                )
-        if pool is not None and not isinstance(
-            pool, pool_module.AsyncConnectionPool
-        ):
-            message = (
-                "pool must be an instance of oracledb.AsyncConnectionPool"
-            )
-            raise TypeError(message)
-        if params is not None and not isinstance(params, ConnectParams):
-            errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-
-        # build connection class and call the implementation connect to
-        # actually establish the connection
-        oracledb.enable_thin_mode()
-        return conn_class(dsn, pool, params, kwargs)
-
-    return connect_async
-
-
-@_async_connection_factory
-def connect_async(
-    dsn: Optional[str] = None,
-    *,
-    pool: Optional["pool_module.AsyncConnectionPool"] = None,
-    pool_alias: Optional[str] = None,
-    conn_class: Type[AsyncConnection] = AsyncConnection,
-    params: Optional[ConnectParams] = None,
-    user: Optional[str] = None,
-    proxy_user: Optional[str] = None,
-    password: Optional[str] = None,
-    newpassword: Optional[str] = None,
-    wallet_password: Optional[str] = None,
-    access_token: Optional[Union[str, tuple, Callable]] = None,
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    https_proxy: Optional[str] = None,
-    https_proxy_port: Optional[int] = None,
-    service_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    sid: Optional[str] = None,
-    server_type: Optional[str] = None,
-    cclass: Optional[str] = None,
-    purity: Optional[oracledb.Purity] = None,
-    expire_time: Optional[int] = None,
-    retry_count: Optional[int] = None,
-    retry_delay: Optional[int] = None,
-    tcp_connect_timeout: Optional[float] = None,
-    ssl_server_dn_match: Optional[bool] = None,
-    ssl_server_cert_dn: Optional[str] = None,
-    wallet_location: Optional[str] = None,
-    events: Optional[bool] = None,
-    externalauth: Optional[bool] = None,
-    mode: Optional[oracledb.AuthMode] = None,
-    disable_oob: Optional[bool] = None,
-    stmtcachesize: Optional[int] = None,
-    edition: Optional[str] = None,
-    tag: Optional[str] = None,
-    matchanytag: Optional[bool] = None,
-    config_dir: Optional[str] = None,
-    appcontext: Optional[list] = None,
-    shardingkey: Optional[list] = None,
-    supershardingkey: Optional[list] = None,
-    debug_jdwp: Optional[str] = None,
-    connection_id_prefix: Optional[str] = None,
-    ssl_context: Optional[Any] = None,
-    sdu: Optional[int] = None,
-    pool_boundary: Optional[str] = None,
-    use_tcp_fast_open: Optional[bool] = None,
-    ssl_version: Optional[ssl.TLSVersion] = None,
-    program: Optional[str] = None,
-    machine: Optional[str] = None,
-    terminal: Optional[str] = None,
-    osuser: Optional[str] = None,
-    driver_name: Optional[str] = None,
-    use_sni: Optional[bool] = None,
-    thick_mode_dsn_passthrough: Optional[bool] = None,
-    extra_auth_params: Optional[dict] = None,
-    pool_name: Optional[str] = None,
-    handle: Optional[int] = None,
-) -> AsyncConnection:
-    """
-    Factory function which creates a connection to the database and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool`` parameter is expected to be a pool object. This parameter was
-    deprecated in python-oracledb 3.0.0. Use :meth:`ConnectionPool.acquire()`
-    instead since the use of this parameter is the equivalent of calling this
-    method.
-
-    The ``conn_class`` parameter is expected to be AsyncConnection or a
-    subclass of AsyncConnection.
-
-    The ``params`` parameter is expected to be of type ConnectParams and
-    contains connection parameters that will be used when establishing the
-    connection. See the documentation on ConnectParams for more information. If
-    this parameter is not specified, the additional keyword parameters will be
-    used to create an instance of ConnectParams. If both the ``params``
-    parameter and additional keyword parameters are specified, the values in
-    the keyword parameters have precedence. Note that if a ``dsn`` is also
-    supplied, then in python-oracledb Thin mode, the values of the parameters
-    specified (if any) within the dsn will override the values passed as
-    additional keyword parameters, which themselves override the values set in
-    the ``params`` parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    - ``user``: the name of the database user to connect to
-      (default: None)
-
-    - ``proxy_user``: the name of the proxy user to connect to. If this value
-      is not specified, it will be parsed out of user if user is in the form
-      "user[proxy_user]"
-      (default: None)
-
-    - ``password``: the password for the database user
-      (default: None)
-
-    - ``newpassword``: a new password for the database user. The new password
-      will take effect immediately upon a successful connection to the database
-      (default: None)
-
-    - ``wallet_password``: the password to use to decrypt the wallet, if it is
-      encrypted. This is not the database password. For Oracle Autonomous
-      Database this is the password created when downloading the wallet. This
-      value is only used in python-oracledb Thin mode.
-      (default: None)
-
-    - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-      string, it specifies an Entra ID OAuth2 token used for Open Authorization
-      (OAuth 2.0) token based authentication. If it is a 2-tuple, it specifies
-      the token and private key strings used for Oracle Cloud Infrastructure
-      (OCI) Identity and Access Management (IAM) token based authentication. If
-      it is a callable, it returns either a string or a 2-tuple used for OAuth
-      2.0 or OCI IAM token based authentication and is useful when the pool
-      needs to expand and create new connections but the current authentication
-      token has expired
-      (default: None)
-
-    - ``host``: the hostname or IP address of the machine hosting the database
-      or the database listener
-      (default: None)
-
-    - ``port``: the port number on which the database listener is listening
-      (default: 1521)
-
-    - ``protocol``: one of the strings "tcp" or "tcps" indicating whether to
-      use unencrypted network traffic or encrypted network traffic (TLS)
-      (default: "tcp")
-
-    - ``https_proxy``: the hostname or IP address of a proxy host to use for
-      tunneling secure connections
-      (default: None)
-
-    - ``https_proxy_port``: the port on which to communicate with the proxy
-      host
-      (default: 0)
-
-    - ``service_name``: the service name of the database
-      (default: None)
-
-    - ``instance_name``: the instance name of the database
-      (default: None)
-
-    - ``sid``: the system identifier (SID) of the database. Note using a
-      service_name instead is recommended
-      (default: None)
-
-    - ``server_type``: the type of server connection that should be
-      established. If specified, it should be one of strings "dedicated",
-      "shared" or "pooled"
-      (default: None)
-
-    - ``cclass``: the connection class to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: None)
-
-    - ``purity``: the connection purity to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-    - ``expire_time``: the number of minutes between the sending of keepalive
-      probes. If this parameter is set to a value greater than zero it enables
-      keepalive
-      (default: 0)
-
-    - ``retry_count``: the number of times that initial connection
-      establishment should be retried before the connection attempt is
-      terminated
-      (default: 0)
-
-    - ``retry_delay``: the number of seconds to wait before retrying to
-      establish a connection
-      (default: 1)
-
-    - ``tcp_connect_timeout``: a float indicating the maximum number of seconds
-      to wait when establishing a connection to the database host
-      (default: 20.0)
-
-    - ``ssl_server_dn_match``: a boolean indicating whether the server
-      certificate distinguished name (DN) should be matched in addition to the
-      regular certificate verification that is performed. Note that if the
-      ssl_server_cert_dn parameter is not privided, host name matching is
-      performed instead
-      (default: True)
-
-    - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-      matched with the server. This value is ignored if the ssl_server_dn_match
-      parameter is not set to the value True. If specified this value is used
-      for any verfication. Otherwise the hostname will be used
-      (default: None)
-
-    - ``wallet_location``: the directory where the wallet can be found. In
-      python-oracledb Thin mode this must be the directory containing the PEM-
-      encoded wallet file ewallet.pem. In python-oracledb Thick mode this must
-      be the directory containing the file cwallet.sso
-      (default: None)
-
-    - ``events``: a boolean specifying whether events mode should be enabled.
-      This value is only used in python-oracledb Thick mode and is needed for
-      continuous query notification and high availability event notifications
-      (default: False)
-
-    - ``externalauth``: a boolean indicating whether to use external
-      authentication
-      (default: False)
-
-    - ``mode``: the authorization mode to use. One of the constants
-      :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-      :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-      :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-      :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`, or
-      :data:`oracledb.AUTH_MODE_SYSRAC`
-      (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-    - ``disable_oob``: a boolean indicating whether out-of-band breaks should
-      be disabled. This value is only used in python-oracledb Thin mode. It has
-      no effect on Windows which does not support this functionality
-      (default: False)
-
-    - ``stmtcachesize``: the size of the statement cache
-      (default: :attr:`oracledb.defaults.stmtcachesize
-      <Defaults.stmtcachesize>`)
-
-    - ``edition``: edition to use for the connection. This parameter cannot be
-      used simultaneously with the cclass parameter
-      (default: None)
-
-    - ``tag``: identifies the type of connection that should be returned from a
-      pool. This value is only used in python-oracledb Thick mode
-      (default: None)
-
-    - ``matchanytag``: a boolean specifying whether any tag can be used when
-      acquiring a connection from the pool. This value is only used in python-
-      oracledb Thick mode
-      (default: False)
-
-    - ``config_dir``: a directory in which the optional tnsnames.ora
-      configuration file is located. This value is only used in python-oracledb
-      Thin mode. For python-oracledb Thick mode, it is used if
-      :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-      mode use the ``config_dir`` parameter of
-      :meth:`oracledb.init_oracle_client()`
-      (default: :attr:`oracledb.defaults.config_dir
-      <Defaults.config_dir>`)
-
-    - ``appcontext``: application context used by the connection. It should be
-      a list of 3-tuples (namespace, name, value) and each entry in the tuple
-      should be a string
-      (default: None)
-
-    - ``shardingkey``: a list of strings, numbers, bytes or dates that identify
-      the database shard to connect to. This value is only used in python-
-      oracledb Thick mode
-      (default: None)
-
-    - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-      identify the database shard to connect to. This value is only used in
-      python-oracledb Thick mode
-      (default: None)
-
-    - ``debug_jdwp``: a string with the format "host=<host>;port=<port>" that
-      specifies the host and port of the PL/SQL debugger. This value is only
-      used in python-oracledb Thin mode.  For python-oracledb Thick mode set
-      the ORA_DEBUG_JDWP environment variable
-      (default: None)
-
-    - ``connection_id_prefix``: an application specific prefix that is added to
-      the connection identifier used for tracing
-      (default: None)
-
-    - ``ssl_context``: an SSLContext object used for connecting to the database
-      using TLS.  This SSL context will be modified to include the private key
-      or any certificates found in a separately supplied wallet. This parameter
-      should only be specified if the default SSLContext object cannot be used
-      (default: None)
-
-    - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes. The
-      value tunes internal buffers used for communication to the database.
-      Bigger values can increase throughput for large queries or bulk data
-      loads, but at the cost of higher memory use. The SDU size that will
-      actually be used is negotiated down to the lower of this value and the
-      database network SDU configuration value
-      (default: 8192)
-
-    - ``pool_boundary``: one of the values "statement" or "transaction"
-      indicating when pooled DRCP connections can be returned to the pool. This
-      requires the use of DRCP with Oracle Database 23.4 or higher
-      (default: None)
-
-    - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast open.
-      This is an Oracle Autonomous Database Serverless (ADB-S) specific
-      property for clients connecting from within OCI Cloud network. Please
-      refer to the ADB-S documentation for more information
-      (default: False)
-
-    - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-      ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-      (default: None)
-
-    - ``program``: a string recorded by Oracle Database as the program from
-      which the connection originates
-      (default: :attr:`oracledb.defaults.program
-      <Defaults.program>`)
-
-    - ``machine``: a string recorded by Oracle Database as the name of the
-      machine from which the connection originates
-      (default: :attr:`oracledb.defaults.machine
-      <Defaults.machine>`)
-
-    - ``terminal``: a string recorded by Oracle Database as the terminal
-      identifier from which the connection originates
-      (default: :attr:`oracledb.defaults.terminal
-      <Defaults.terminal>`)
-
-    - ``osuser``: a string recorded by Oracle Database as the operating system
-      user who originated the connection
-      (default: :attr:`oracledb.defaults.osuser
-      <Defaults.osuser>`)
-
-    - ``driver_name``: a string recorded by Oracle Database as the name of the
-      driver which originated the connection
-      (default: :attr:`oracledb.defaults.driver_name
-      <Defaults.driver_name>`)
-
-    - ``use_sni``: a boolean indicating whether to use the TLS SNI extension to
-      bypass the second TLS neogiation that would otherwise be required
-      (default: False)
-
-    - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass the
-      connect string to the Oracle Client libraries unchanged without parsing
-      by the driver. Setting this to False makes python-oracledb Thick and Thin
-      mode applications behave similarly regarding connection string parameter
-      handling and locating any optional tnsnames.ora configuration file
-      (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>`)
-
-    - ``extra_auth_params``: a dictionary containing configuration parameters
-      necessary for Oracle Database authentication using plugins, such as the
-      Azure and OCI cloud-native authentication plugins
-      (default: None)
-
-    - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP with
-      Oracle Database 23.4, or higher
-      (default: None)
-
-    - ``handle``: an integer representing a pointer to a valid service context
-      handle. This value is only used in python-oracledb Thick mode. It should
-      be used with extreme caution
-      (default: 0)
-    """
-    pass
diff --git a/src/oracledb/constants.py b/src/oracledb/constants.py
deleted file mode 100644
index e7b556dd..00000000
--- a/src/oracledb/constants.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# constants.py
-#
-# Contains the constants defined by the package.
-# -----------------------------------------------------------------------------
-
-# AQ delivery modes
-MSG_BUFFERED = 2
-MSG_PERSISTENT = 1
-MSG_PERSISTENT_OR_BUFFERED = 3
-
-# AQ dequeue modes
-DEQ_BROWSE = 1
-DEQ_LOCKED = 2
-DEQ_REMOVE = 3
-DEQ_REMOVE_NODATA = 4
-
-# AQ dequeue navigation modes
-DEQ_FIRST_MSG = 1
-DEQ_NEXT_MSG = 3
-DEQ_NEXT_TRANSACTION = 2
-
-# AQ dequeue visibility modes
-DEQ_IMMEDIATE = 1
-DEQ_ON_COMMIT = 2
-
-# AQ dequeue wait modes
-DEQ_NO_WAIT = 0
-DEQ_WAIT_FOREVER = 2**32 - 1
-
-# AQ enqueue visibility modes
-ENQ_IMMEDIATE = 1
-ENQ_ON_COMMIT = 2
-
-# AQ message states
-MSG_EXPIRED = 3
-MSG_PROCESSED = 2
-MSG_READY = 0
-MSG_WAITING = 1
-
-# AQ other constants
-MSG_NO_DELAY = 0
-MSG_NO_EXPIRATION = -1
-
-# shutdown modes
-DBSHUTDOWN_ABORT = 4
-DBSHUTDOWN_FINAL = 5
-DBSHUTDOWN_IMMEDIATE = 3
-DBSHUTDOWN_TRANSACTIONAL = 1
-DBSHUTDOWN_TRANSACTIONAL_LOCAL = 2
-
-# subscription grouping classes
-SUBSCR_GROUPING_CLASS_NONE = 0
-SUBSCR_GROUPING_CLASS_TIME = 1
-
-# subscription grouping types
-SUBSCR_GROUPING_TYPE_SUMMARY = 1
-SUBSCR_GROUPING_TYPE_LAST = 2
-
-# subscription namespaces
-SUBSCR_NAMESPACE_AQ = 1
-SUBSCR_NAMESPACE_DBCHANGE = 2
-
-# subscription protocols
-SUBSCR_PROTO_HTTP = 3
-SUBSCR_PROTO_MAIL = 1
-SUBSCR_PROTO_CALLBACK = 0
-SUBSCR_PROTO_SERVER = 2
-
-# subscription quality of service
-SUBSCR_QOS_BEST_EFFORT = 0x10
-SUBSCR_QOS_DEFAULT = 0
-SUBSCR_QOS_DEREG_NFY = 0x02
-SUBSCR_QOS_QUERY = 0x08
-SUBSCR_QOS_RELIABLE = 0x01
-SUBSCR_QOS_ROWIDS = 0x04
-
-# event types
-EVENT_AQ = 100
-EVENT_DEREG = 5
-EVENT_NONE = 0
-EVENT_OBJCHANGE = 6
-EVENT_QUERYCHANGE = 7
-EVENT_SHUTDOWN = 2
-EVENT_SHUTDOWN_ANY = 3
-EVENT_STARTUP = 1
-
-# operation codes
-OPCODE_ALLOPS = 0
-OPCODE_ALLROWS = 0x01
-OPCODE_ALTER = 0x10
-OPCODE_DELETE = 0x08
-OPCODE_DROP = 0x20
-OPCODE_INSERT = 0x02
-OPCODE_UPDATE = 0x04
-
-# flags for tpc_end()
-TPC_END_NORMAL = 0
-TPC_END_SUSPEND = 0x00100000
-
-# vector metadata flags
-VECTOR_META_FLAG_FLEXIBLE_DIM = 0x01
-VECTOR_META_FLAG_SPARSE_VECTOR = 0x02
diff --git a/src/oracledb/constructors.py b/src/oracledb/constructors.py
deleted file mode 100644
index 8a58245d..00000000
--- a/src/oracledb/constructors.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# constructors.py
-#
-# Contains the constructors mandated by the Python Database API.
-# -----------------------------------------------------------------------------
-
-import datetime
-from typing import Any
-
-from . import errors
-
-
-def Binary(value: Any) -> bytes:
-    """
-    Constructs an object holding a binary (long) string value.
-    """
-    return bytes(value)
-
-
-def Date(year: int, month: int, day: int) -> datetime.date:
-    """
-    Constructs an object holding a date value.
-    """
-    return datetime.date(year, month, day)
-
-
-def DateFromTicks(ticks: float) -> datetime.date:
-    """
-    Constructor mandated by the database API for creating a date value given
-    the number of seconds since the epoch (January 1, 1970). This is equivalent
-    to using datetime.date.fromtimestamp() and that should be used instead.
-    """
-    return datetime.date.fromtimestamp(ticks)
-
-
-def Time(hour: int, minute: int, second: int) -> None:
-    """
-    Constructor mandated by the database API for creating a time value. Since
-    Oracle doesn't support time only values, an exception is raised when this
-    method is called.
-    """
-    errors._raise_err(errors.ERR_TIME_NOT_SUPPORTED)
-
-
-def TimeFromTicks(ticks: float) -> None:
-    """
-    Constructor mandated by the database API for creating a time value given
-    the number of seconds since the epoch (January 1, 1970). Since Oracle
-    doesn't support time only values, an exception is raised when this method
-    is called.
-    """
-    errors._raise_err(errors.ERR_TIME_NOT_SUPPORTED)
-
-
-def Timestamp(
-    year: int,
-    month: int,
-    day: int,
-    hour: int = 0,
-    minute: int = 0,
-    second: int = 0,
-) -> datetime.datetime:
-    """
-    Constructs an object holding a time stamp value.
-    """
-    return datetime.datetime(year, month, day, hour, minute, second)
-
-
-def TimestampFromTicks(ticks: float) -> datetime.datetime:
-    """
-    Constructor mandated by the database API for creating a timestamp value
-    given the number of seconds since the epoch (January 1, 1970). This is
-    equivalent to using datetime.datetime.fromtimestamp() and that should be
-    used instead.
-    """
-    return datetime.datetime.fromtimestamp(ticks)
diff --git a/src/oracledb/cursor.py b/src/oracledb/cursor.py
deleted file mode 100644
index 7d1a2ed3..00000000
--- a/src/oracledb/cursor.py
+++ /dev/null
@@ -1,1373 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# cursor.py
-#
-# Contains the Cursor class used for executing statements on connections and
-# fetching results from queries.
-# -----------------------------------------------------------------------------
-
-from typing import Any, Union, Callable, Optional
-
-from . import connection as connection_module
-from . import errors
-from . import utils
-from .base import BaseMetaClass
-from .base_impl import DbType, DB_TYPE_OBJECT
-from .dbobject import DbObjectType
-from .fetch_info import FetchInfo
-from .var import Var
-
-
-class BaseCursor(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(
-        self,
-        connection: "connection_module.Connection",
-        scrollable: bool = False,
-    ) -> None:
-        self._connection = connection
-        self._impl = connection._impl.create_cursor_impl(scrollable)
-
-    def __del__(self):
-        if self._impl is not None:
-            self._impl.close(in_del=True)
-
-    def __enter__(self):
-        """
-        The entry point for the cursor as a context manager. It returns itself.
-        """
-        self._verify_open()
-        return self
-
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        """
-        The exit point for the cursor as a context manager. It closes the
-        cursor.
-        """
-        self._verify_open()
-        self._impl.close(in_del=True)
-        self._impl = None
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return f"<{cls_name} on {self.connection!r}>"
-
-    def _call(
-        self,
-        name: str,
-        parameters: Union[list, tuple],
-        keyword_parameters: dict,
-        return_value: Any = None,
-    ) -> None:
-        """
-        Internal method used for generating the PL/SQL block used to call
-        stored procedures.
-        """
-        utils.verify_stored_proc_args(parameters, keyword_parameters)
-        self._verify_open()
-        statement, bind_values = self._call_get_execute_args(
-            name, parameters, keyword_parameters, return_value
-        )
-        return self.execute(statement, bind_values)
-
-    def _call_get_execute_args(
-        self,
-        name: str,
-        parameters: Union[list, tuple],
-        keyword_parameters: dict,
-        return_value: str = None,
-    ) -> None:
-        """
-        Internal method used for generating the PL/SQL block used to call
-        stored procedures and functions. A tuple containing this statement and
-        the bind values is returned.
-        """
-        bind_names = []
-        bind_values = []
-        statement_parts = ["begin "]
-        if return_value is not None:
-            statement_parts.append(":retval := ")
-            bind_values.append(return_value)
-        statement_parts.append(name + "(")
-        if parameters:
-            bind_values.extend(parameters)
-            bind_names = [":%d" % (i + 1) for i in range(len(parameters))]
-        if keyword_parameters:
-            for arg_name, arg_value in keyword_parameters.items():
-                bind_values.append(arg_value)
-                bind_names.append(f"{arg_name} => :{len(bind_names) + 1}")
-        statement_parts.append(",".join(bind_names))
-        statement_parts.append("); end;")
-        statement = "".join(statement_parts)
-        return (statement, bind_values)
-
-    def _normalize_statement(self, statement: Optional[str]) -> Optional[str]:
-        """
-        Normalizes a statement by stripping leading and trailing spaces. If the
-        result is an empty string, an error is raised immediately.
-        """
-        if statement is not None:
-            statement = statement.strip()
-            if not statement:
-                errors._raise_err(errors.ERR_EMPTY_STATEMENT)
-        return statement
-
-    def _prepare(
-        self, statement: str, tag: str = None, cache_statement: bool = True
-    ) -> None:
-        """
-        Internal method used for preparing a statement for execution.
-        """
-        self._impl.prepare(statement, tag, cache_statement)
-
-    def _prepare_for_execute(
-        self, statement, parameters, keyword_parameters=None
-    ):
-        """
-        Internal method for preparing a statement for execution.
-        """
-        self._verify_open()
-        self._impl._prepare_for_execute(
-            self,
-            self._normalize_statement(statement),
-            parameters,
-            keyword_parameters,
-        )
-
-    def _verify_fetch(self) -> None:
-        """
-        Verifies that fetching is possible from this cursor.
-        """
-        self._verify_open()
-        if not self._impl.is_query(self):
-            errors._raise_err(errors.ERR_NOT_A_QUERY)
-
-    def _verify_open(self) -> None:
-        """
-        Verifies that the cursor is open and the associated connection is
-        connected. If either condition is false an exception is raised.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_CURSOR_NOT_OPEN)
-        self.connection._verify_connected()
-
-    @property
-    def arraysize(self) -> int:
-        """
-        This read-write attribute can be used to tune the number of rows
-        internally fetched and buffered by internal calls to the database when
-        fetching rows from SELECT statements and REF CURSORS.
-
-        The value of ``arraysize`` can drastically affect the performance of a
-        query since it directly affects the number of network round trips
-        between Python and the database.  For methods like :meth:`fetchone()`
-        and :meth:`fetchall()` it affects internal behavior but does not change
-        how many rows are returned to the application. For :meth:`fetchmany()`
-        it is the default number of rows to fetch.
-
-        The attribute is only used for tuning row and SODA document fetches
-        from the database.  It does not affect data inserts.
-
-        Due to the performance benefits, the default ``arraysize`` is *100*
-        instead of the *1* that the Python DB API recommends.
-        """
-        self._verify_open()
-        return self._impl.arraysize
-
-    @arraysize.setter
-    def arraysize(self, value: int) -> None:
-        self._verify_open()
-        if not isinstance(value, int) or value <= 0:
-            errors._raise_err(errors.ERR_INVALID_ARRAYSIZE)
-        self._impl.arraysize = value
-
-    def arrayvar(
-        self,
-        typ: Union[DbType, DbObjectType, type],
-        value: Union[list, int],
-        size: int = 0,
-    ) -> Var:
-        """
-        Creates an array variable associated with the cursor of the given type
-        and size and returns a :ref:`variable object <varobj>`. The value is
-        either an integer specifying the number of elements to allocate or it
-        is a list and the number of elements allocated is drawn from the size
-        of the list. If the value is a list, the variable is also set with the
-        contents of the list. If the size is not specified and the type is a
-        string or binary, 4000 bytes is allocated. This is needed for passing
-        arrays to PL/SQL (in cases where the list might be empty and the type
-        cannot be determined automatically) or returning arrays from PL/SQL.
-        """
-        self._verify_open()
-        if isinstance(value, list):
-            num_elements = len(value)
-        elif isinstance(value, int):
-            num_elements = value
-        else:
-            raise TypeError("expecting integer or list of values")
-        var = self._impl.create_var(
-            self.connection,
-            typ,
-            size=size,
-            num_elements=num_elements,
-            is_array=True,
-        )
-        if isinstance(value, list):
-            var.setvalue(0, value)
-        return var
-
-    def bindnames(self) -> list:
-        """
-        Returns the list of bind variable names bound to the statement. Note
-        that a statement must have been prepared first.
-        """
-        self._verify_open()
-        if self._impl.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT_PREPARED)
-        return self._impl.get_bind_names()
-
-    @property
-    def bindvars(self) -> list:
-        """
-        This read-only attribute provides the bind variables used for the last
-        statement that was executed on the cursor. The value will be either a
-        list or a dictionary, depending on whether binding was done by position
-        or name. Care should be taken when referencing this attribute. In
-        particular, elements should not be removed or replaced.
-        """
-        self._verify_open()
-        return self._impl.get_bind_vars()
-
-    def close(self) -> None:
-        """
-        Closes the cursor now, rather than whenever ``__del__`` is called. The
-        cursor will be unusable from this point forward; an Error exception
-        will be raised if any operation is attempted with the cursor.
-        """
-        self._verify_open()
-        self._impl.close()
-        self._impl = None
-
-    @property
-    def description(self) -> Union[list[FetchInfo], None]:
-        """
-        This read-only attribute contains information about the columns used in
-        a query. It is a list of FetchInfo objects, one per column. This
-        attribute will be *None* for statements that are not SELECT or WITH
-        statements, or if the cursor has not had :meth:`execute()` invoked yet.
-        """
-        self._verify_open()
-        if self._impl.is_query(self):
-            return [FetchInfo._from_impl(i) for i in self._impl.fetch_metadata]
-
-    @property
-    def fetchvars(self) -> list:
-        """
-        This read-only attribute specifies the list of variables created for
-        the last SELECT query that was executed on the cursor.  Care should be
-        taken when referencing this attribute. In particular, elements should
-        not be removed or replaced.
-        """
-        self._verify_open()
-        return self._impl.get_fetch_vars()
-
-    def getarraydmlrowcounts(self) -> list:
-        """
-        Retrieves the DML row counts after a call to :meth:`executemany()` with
-        ``arraydmlrowcounts`` enabled. This will return a list of integers
-        corresponding to the number of rows affected by the DML statement for
-        each element of the array passed to :meth:`executemany()`.
-
-        This method is only available for Oracle Database 12.1 and later.
-        """
-        self._verify_open()
-        return self._impl.get_array_dml_row_counts()
-
-    def getbatcherrors(self) -> list:
-        """
-        Retrieves the exceptions that took place after a call to
-        :meth:`executemany()` with ``batcherrors`` enabled. This will
-        return a list of Error objects, one error for each iteration that
-        failed. The offset can be determined by looking at the offset attribute
-        of the error object.
-        """
-        self._verify_open()
-        return self._impl.get_batch_errors()
-
-    def getimplicitresults(self) -> list:
-        """
-        Returns a list of cursors which correspond to implicit results made
-        available from a PL/SQL block or procedure without the use of OUT ref
-        cursor parameters. The PL/SQL block or procedure opens the cursors and
-        marks them for return to the client using the procedure
-        dbms_sql.return_result. In python-oracledb Thick mode, closing the
-        parent cursor will result in the automatic closure of the implicit
-        result set cursors. See :ref:`implicitresults`.
-
-        This method is only available for Oracle Database 12.1 (or later). For
-        python-oracledb :ref:`Thick <enablingthick>` mode, Oracle Client 12.1
-        (or later) is additionally required.
-        """
-        self._verify_open()
-        return self._impl.get_implicit_results(self.connection)
-
-    @property
-    def inputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each value that
-        is bound to a statement executed on the cursor and overrides the
-        attribute with the same name on the connection if specified. The method
-        signature is handler(cursor, value, arraysize) and the return value is
-        expected to be a variable object or *None* in which case a default
-        variable object will be created. If this attribute is *None*, the
-        default behavior will take place for all values bound to the
-        statements.
-        """
-        self._verify_open()
-        return self._impl.inputtypehandler
-
-    @inputtypehandler.setter
-    def inputtypehandler(self, value: Callable) -> None:
-        self._verify_open()
-        self._impl.inputtypehandler = value
-
-    @property
-    def lastrowid(self) -> str:
-        """
-        This read-only attribute returns the rowid of the last row modified by
-        the cursor. If no row was modified by the last operation performed on
-        the cursor, the value *None* is returned.
-        """
-        self._verify_open()
-        return self._impl.get_lastrowid()
-
-    @property
-    def outputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each column
-        that is to be fetched from this cursor. The method signature is
-        handler(cursor, metadata) and the return value is expected to be a
-        :ref:`variable object <varobj>` or *None* in which case a default
-        variable object will be created. If this attribute is *None*, then the
-        default behavior will take place for all columns fetched from this
-        cursor.
-        """
-        self._verify_open()
-        return self._impl.outputtypehandler
-
-    @outputtypehandler.setter
-    def outputtypehandler(self, value: Callable) -> None:
-        self._verify_open()
-        self._impl.outputtypehandler = value
-
-    @property
-    def prefetchrows(self) -> int:
-        """
-        This read-write attribute can be used to tune the number of rows that
-        python-oracledb initially fetches from Oracle Database when a SELECT
-        query is executed. The value can improve performance by reducing the
-        number of round-trips to the database. The attribute does not affect
-        data insertion.
-
-        In python-oracledb Thin mode, prefetching can reuse the
-        :attr:`arraysize` buffer. However in Thick mode, extra memory is
-        required.
-
-        Setting this value to *0* can be useful when the timing of fetches must
-        be explicitly controlled.
-
-        Queries that return :ref:`LOB <lobobj>` objects and similar types do
-        not support prefetching. The ``prefetchrows`` attribute is ignored in
-        queries that involve these types.
-        """
-        self._verify_open()
-        return self._impl.prefetchrows
-
-    @prefetchrows.setter
-    def prefetchrows(self, value: int) -> None:
-        self._verify_open()
-        self._impl.prefetchrows = value
-
-    def prepare(
-        self, statement: str, tag: str = None, cache_statement: bool = True
-    ) -> None:
-        """
-        This can be used before a call to :meth:`execute()` or
-        :meth:`executemany()` to define the statement that will be
-        executed. When this is done, the prepare phase will not be performed
-        when the call to :meth:`execute()` or :meth:`executemany()` is made
-        with *None* or the same string object as the statement.
-
-        If the ``tag`` parameter is specified and the ``cache_statement``
-        parameter is *True*, the statement will be returned to the statement
-        cache with the given tag.
-
-        If the ``cache_statement`` parameter is *False*, the statement will be
-        removed from the statement cache (if it was found there) or will simply
-        not be cached.
-        """
-        self._verify_open()
-        self._prepare(statement, tag, cache_statement)
-
-    @property
-    def rowcount(self) -> int:
-        """
-        This read-only attribute specifies the number of rows that have
-        currently been fetched from the cursor (for select statements) or that
-        have been affected by the operation (for insert, update, delete, and
-        merge statements). For all other statements the value is always *0*. If
-        the cursor or connection is closed, the value returned is *-1*.
-        """
-        if self._impl is not None and self.connection._impl is not None:
-            return self._impl.rowcount
-        return -1
-
-    @property
-    def rowfactory(self) -> Callable:
-        """
-        This read-write attribute specifies a method to call for each row that
-        is retrieved from the database. Ordinarily, a tuple is returned for
-        each row but if this attribute is set, the method is called with the
-        tuple that would normally be returned, and the result of the method is
-        returned instead.
-
-        The ``rowfactory`` attribute should be set after each statement
-        execution before data is fetched from the cursor.
-        """
-        self._verify_open()
-        return self._impl.rowfactory
-
-    @rowfactory.setter
-    def rowfactory(self, value: Callable) -> None:
-        self._verify_open()
-        self._impl.rowfactory = value
-
-    @property
-    def scrollable(self) -> bool:
-        """
-        This read-write boolean attribute specifies whether the cursor can be
-        scrolled or not. By default, cursors are not scrollable, as the server
-        resources and response times are greater than nonscrollable cursors.
-        This attribute is checked and the corresponding mode set in Oracle when
-        calling the method :meth:`execute()`.
-        """
-        self._verify_open()
-        return self._impl.scrollable
-
-    @scrollable.setter
-    def scrollable(self, value: bool) -> None:
-        self._verify_open()
-        self._impl.scrollable = value
-
-    def setinputsizes(self, *args: Any, **kwargs: Any) -> Union[list, dict]:
-        """
-        This can be used before calls to :meth:`execute()` or
-        :meth:`executemany()` to predefine memory areas used for
-        :ref:`bind variables <bind>`. Each parameter should be a type object
-        corresponding to the data that will be used for a bind variable
-        placeholder in the SQL or PL/SQL statement. Alternatively, it can be an
-        integer specifying the maximum length of a string bind variable value.
-
-        Use keyword parameters when :ref:`binding by name <bindbyname>`. Use
-        positional parameters when :ref:`binding by position <bindbyposition>`.
-        The parameter value can be *None* to indicate that python-oracledb
-        should determine the required space from the data value provided.
-
-        The parameters or keyword names correspond to the bind variable
-        placeholders used in the SQL or PL/SQL statement. Note this means that
-        for use with :meth:`executemany()` it does not correspond to the number
-        of bind value mappings or sequences being passed.
-
-        When repeated calls to :meth:`execute()` or :meth:`executemany()` are
-        made binding different string data lengths, using
-        :meth:`setinputsizes()` can help reduce the database's SQL "version
-        count" for the statement. See
-        :ref:`Reducing the SQL Version Count <sqlversioncount>`.
-        """
-        if args and kwargs:
-            errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
-        elif args or kwargs:
-            self._verify_open()
-            return self._impl.setinputsizes(self.connection, args, kwargs)
-        return []
-
-    def setoutputsize(self, size: int, column: int = 0) -> None:
-        """
-        This method does nothing and is retained solely for compatibility with
-        the DB API. Python-oracledb automatically allocates as much space as
-        needed to fetch LONG and LONG RAW columns, and also to fetch CLOB as
-        string and BLOB as bytes.
-        """
-        pass
-
-    @property
-    def statement(self) -> Union[str, None]:
-        """
-        This read-only attribute provides the string object that was previously
-        prepared with :meth:`prepare()` or executed with :meth:`execute()`.
-        """
-        if self._impl is not None:
-            return self._impl.statement
-
-    def var(
-        self,
-        typ: Union[DbType, DbObjectType, type],
-        size: int = 0,
-        arraysize: int = 1,
-        inconverter: Callable = None,
-        outconverter: Callable = None,
-        typename: str = None,
-        encoding_errors: str = None,
-        bypass_decode: bool = False,
-        convert_nulls: bool = False,
-        *,
-        encodingErrors: str = None,
-    ) -> "Var":
-        """
-        Creates a :ref:`variable object <varobj>` with the specified
-        characteristics. This method can be used for binding to PL/SQL IN and
-        OUT parameters where the length or type cannot be determined
-        automatically from the Python variable being bound. It can also be used
-        in :ref:`input <inputtypehandlers>` and :ref:`output
-        <outputtypehandlers>` type handlers.
-
-        The ``typ`` parameter specifies the type of data that should be stored
-        in the variable. This should be one of the :ref:`database type
-        constants <dbtypes>`, :ref:`DB API constants <types>`, an object type
-        returned from the method :meth:`Connection.gettype()` or one of the
-        following Python types:
-
-        - bool (uses :attr:`oracledb.DB_TYPE_BOOLEAN`)
-        - bytes (uses :attr:`oracledb.DB_TYPE_RAW`)
-        - datetime.date (uses :attr:`oracledb.DB_TYPE_DATE`)
-        - datetime.datetime (uses :attr:`oracledb.DB_TYPE_DATE`)
-        - datetime.timedelta (uses :attr:`oracledb.DB_TYPE_INTERVAL_DS`)
-        - decimal.Decimal (uses :attr:`oracledb.DB_TYPE_NUMBER`)
-        - float (uses :attr:`oracledb.DB_TYPE_NUMBER`)
-        - int (uses :attr:`oracledb.DB_TYPE_NUMBER`)
-        - str (uses :attr:`oracledb.DB_TYPE_VARCHAR`)
-
-        The ``size`` parameter specifies the length of string and raw variables
-        and is ignored in all other cases. If not specified for string and raw
-        variables, the value *4000* is used.
-
-        The ``arraysize`` parameter specifies the number of elements the
-        variable will have. If not specified the bind array size (usually *1*)
-        is used. When a variable is created in an output type handler this
-        parameter should be set to the cursor's array size.
-
-        The ``inconverter`` and ``outconverter`` parameters specify methods
-        used for converting values to/from the database. More information can
-        be found in the section on :ref:`variable objects<varobj>`.
-
-        The ``typename`` parameter specifies the name of a SQL object type and
-        must be specified when using type :data:`oracledb.OBJECT` unless the
-        type object was passed directly as the first parameter.
-
-        The ``encoding_errors`` parameter specifies what should happen when
-        decoding byte strings fetched from the database into strings. It should
-        be one of the values noted in the builtin `decode
-        <https://docs.python.org/3/library/stdtypes.html#bytes.decode>`__
-        function.
-
-        The ``bypass_decode`` parameter, if specified, should be passed as a
-        boolean value. Passing a *True* value causes values of database types
-        :data:`~oracledb.DB_TYPE_VARCHAR`, :data:`~oracledb.DB_TYPE_CHAR`,
-        :data:`~oracledb.DB_TYPE_NVARCHAR`, :data:`~oracledb.DB_TYPE_NCHAR` and
-        :data:`~oracledb.DB_TYPE_LONG` to be returned as bytes instead of str,
-        meaning that python-oracledb does not do any decoding. See
-        :ref:`Fetching raw data <fetching-raw-data>` for more information.
-
-        The ``convert_nulls`` parameter, if specified, should be passed as a
-        boolean value. Passing the value *True* causes the ``outconverter`` to
-        be called when a null value is fetched from the database; otherwise,
-        the ``outconverter`` is only called when non-null values are fetched
-        from the database.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``encodingErrors`` was renamed to ``encoding_errors``. The
-        old name will continue to work as a keyword parameter for a period of
-        time.
-        """
-        self._verify_open()
-        if typename is not None:
-            typ = self.connection.gettype(typename)
-        elif typ is DB_TYPE_OBJECT:
-            errors._raise_err(errors.ERR_MISSING_TYPE_NAME_FOR_OBJECT_VAR)
-        if encodingErrors is not None:
-            if encoding_errors is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="encodingErrors",
-                    new_name="encoding_errors",
-                )
-            encoding_errors = encodingErrors
-        return self._impl.create_var(
-            self.connection,
-            typ,
-            size,
-            arraysize,
-            inconverter,
-            outconverter,
-            encoding_errors,
-            bypass_decode,
-            convert_nulls=convert_nulls,
-        )
-
-    @property
-    def warning(self) -> Union[errors._Error, None]:
-        """
-        This read-only attribute provides an
-        :ref:`oracledb._Error<exchandling>` object giving information about any
-        database warnings (such as PL/SQL compilation warnings) that were
-        generated during the last call to :meth:`execute()` or
-        :meth:`executemany()`. This value is automatically cleared on
-        the next call to :meth:`execute()` or :meth:`executemany()`. If no
-        warning was generated the value *None* is returned.
-        """
-        self._verify_open()
-        return self._impl.warning
-
-
-class Cursor(BaseCursor):
-
-    def __iter__(self):
-        """
-        Returns the cursor itself to be used as an iterator.
-        """
-        return self
-
-    def __next__(self):
-        self._verify_fetch()
-        row = self._impl.fetch_next_row(self)
-        if row is not None:
-            return row
-        raise StopIteration
-
-    def _get_oci_attr(self, attr_num: int, attr_type: int) -> Any:
-        """
-        Returns the value of the specified OCI attribute from the internal
-        handle. This is only supported in python-oracledb's thick mode and
-        should only be used as directed by Oracle.
-        """
-        self._verify_open()
-        return self._impl._get_oci_attr(attr_num, attr_type)
-
-    def _set_oci_attr(self, attr_num: int, attr_type: int, value: Any) -> None:
-        """
-        Sets the value of the specified OCI attribute on the internal handle.
-        This is only supported in python-oracledb's thick mode and should only
-        be used as directed by Oracle.
-        """
-        self._verify_open()
-        self._impl._set_oci_attr(attr_num, attr_type, value)
-
-    def callfunc(
-        self,
-        name: str,
-        return_type: Any,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-        *,
-        keywordParameters: Optional[dict] = None,
-    ) -> Any:
-        """
-        Calls a PL/SQL function with the given name and returns its value.
-
-        The ``return_type`` parameter is expected to be a Python type, one of
-        the :ref:`oracledb types <types>` or an
-        :ref:`Object Type <dbobjecttype>`.
-
-        The sequence of parameters must contain one entry for each parameter
-        that the PL/SQL function expects. Any keyword parameters will be
-        included after the positional parameters.
-
-        Use :meth:`var()` to define any OUT or IN OUT parameters, if necessary.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``keywordParameters`` was renamed to ``keyword_parameters``.
-        The old name will continue to work for a period of time.
-        """
-        var = self.var(return_type)
-        if keywordParameters is not None:
-            if keyword_parameters is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="keywordParameters",
-                    new_name="keyword_parameters",
-                )
-            keyword_parameters = keywordParameters
-        self._call(name, parameters, keyword_parameters, var)
-        return var.getvalue()
-
-    def callproc(
-        self,
-        name: str,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-        *,
-        keywordParameters: Optional[dict] = None,
-    ) -> list:
-        """
-        Calls a PL/SQL procedure with the given name.
-
-        The sequence of parameters must contain one entry for each parameter
-        that the procedure expects. The result of the call is a modified copy
-        of the input sequence. Input parameters are left untouched; output and
-        input/output parameters are replaced with possibly new values. Keyword
-        parameters will be included after the positional parameters and are not
-        returned as part of the output sequence.
-
-        Use :meth:`var()` to define any OUT or IN OUT parameters if necessary.
-
-        No query result set is returned by this method. Instead, use
-        :ref:`REF CURSOR <refcur>` parameters or
-        :ref:`Implicit Results <implicitresults>`.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``keywordParameters`` was renamed to ``keyword_parameters``.
-        The old name will continue to work for a period of time.
-        """
-        if keywordParameters is not None:
-            if keyword_parameters is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="keywordParameters",
-                    new_name="keyword_parameters",
-                )
-            keyword_parameters = keywordParameters
-        self._call(name, parameters, keyword_parameters)
-        if parameters is None:
-            return []
-        return [
-            v.get_value(0) for v in self._impl.bind_vars[: len(parameters)]
-        ]
-
-    @property
-    def connection(self) -> "connection_module.Connection":
-        """
-        This read-only attribute returns a reference to the connection object
-        on which the cursor was created.
-        """
-        return self._connection
-
-    def execute(
-        self,
-        statement: Optional[str],
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        *,
-        suspend_on_success: bool = False,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-        **keyword_parameters: Any,
-    ) -> Any:
-        """
-        Executes a statement against the database. See :ref:`sqlexecution`.
-
-        Parameters may be passed as a dictionary or sequence or as keyword
-        parameters. If the parameters are a dictionary, the values will be
-        bound by name and if the parameters are a sequence the values will be
-        bound by position. Note that if the values are bound by position, the
-        order of the variables is from left to right as they are encountered in
-        the statement and SQL statements are processed differently than PL/SQL
-        statements. For this reason, it is generally recommended to bind
-        parameters by name instead of by position.
-
-        Parameters passed as a dictionary are name and value pairs. The name
-        maps to the bind variable name used by the statement and the value maps
-        to the Python value you wish bound to that bind variable.
-
-        A reference to the statement will be retained by the cursor. If *None*
-        or the same string object is passed in again, the cursor will execute
-        that statement again without performing a prepare or rebinding and
-        redefining.  This is most effective for algorithms where the same
-        statement is used, but different parameters are bound to it (many
-        times). Note that parameters that are not passed in during subsequent
-        executions will retain the value passed in during the last execution
-        that contained them.
-
-        The ``suspend_on_success`` parameter is specific to :ref:`sessionless
-        transactions <sessionlesstxns>`. When set to *True*, the active
-        sessionless transaction will be suspended when ``execute()`` completes
-        successfully.  See :ref:`suspendtxns`.
-
-        The ``fetch_lobs`` parameter specifies whether to return LOB locators
-        or ``str``/``bytes`` values when fetching LOB columns. The default
-        value is :data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        ``decimal.Decimal`` values when fetching columns of type ``NUMBER``.
-        The default value is :data:`oracledb.defaults.fetch_decimals
-        <Defaults.fetch_decimals>`.
-
-        For maximum efficiency when reusing a statement, it is best to use the
-        :meth:`Cursor.setinputsizes()` method to specify the parameter types
-        and sizes ahead of time; in particular, *None* is assumed to be a
-        string of length 1 so any values that are later bound as numbers or
-        dates will raise a TypeError exception.
-
-        If the statement is a SELECT query, the cursor is returned as a
-        convenience to the caller (so it can be used directly as an iterator
-        over the rows in the cursor); otherwise, *None* is returned.
-        """
-        self._prepare_for_execute(statement, parameters, keyword_parameters)
-        impl = self._impl
-        if fetch_lobs is not None:
-            impl.fetch_lobs = fetch_lobs
-        if fetch_decimals is not None:
-            impl.fetch_decimals = fetch_decimals
-        impl.suspend_on_success = suspend_on_success
-        impl.execute(self)
-        if impl.fetch_vars is not None:
-            return self
-
-    def executemany(
-        self,
-        statement: Optional[str],
-        parameters: Any,
-        *,
-        batcherrors: bool = False,
-        arraydmlrowcounts: bool = False,
-        suspend_on_success: bool = False,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Executes a SQL statement once using all bind value mappings or
-        sequences found in the sequence parameters. This can be used to insert,
-        update, or delete multiple rows in a table with a single
-        python-oracledb call. It can also invoke a PL/SQL procedure multiple
-        times. See :ref:`batchstmnt`.
-
-        The ``statement`` parameter is managed in the same way as the
-        :meth:`execute()` method manages it.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one bind variable placeholder in ``statement``. It can
-        also be a list of dictionaries, where the keys match the bind variable
-        placeholder names in ``statement``. If there are no bind values, or
-        values have previously been bound, the ``parameters`` value can be an
-        integer specifying the number of iterations. The ``parameters``
-        parameter can also be a :ref:`DataFrame <oracledataframeobj>`, or a
-        third-party data frame that supports the `Apache Arrow PyCapsule
-        <https://arrow.apache.org/docs/
-        format/CDataInterface/PyCapsuleInterface.html>`__ Interface.
-
-        In python-oracledb Thick mode, if the size of the buffers allocated for
-        any of the parameters exceeds 2 GB, you will receive the error
-        ``DPI-1015: array size of <n> is too large``. If you receive this
-        error, decrease the number of rows being inserted.
-
-        When *True*, the ``batcherrors`` parameter enables batch error support
-        within Oracle Database and ensures that the call succeeds even if an
-        exception takes place in one or more of the sequence of bind values.
-        The errors can then be retrieved using :meth:`getbatcherrors()`.
-
-        When *True*, the ``arraydmlrowcounts`` parameter enables DML row counts
-        to be retrieved from Oracle after the method has completed. The row
-        counts can then be retrieved using
-        :meth:`getarraydmlrowcounts()`.
-
-        Both the ``batcherrors`` parameter and the ``arraydmlrowcounts``
-        parameter can only be *True* when executing an insert, update, delete,
-        or merge statement; in all other cases an error will be raised.
-
-        The ``suspend_on_success`` parameter is specific to :ref:`sessionless
-        transactions <sessionlesstxns>`. When set to *True*, the active
-        sessionless transaction will be suspended when ``executemany()``
-        completes successfully. See :ref:`suspendtxns`.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance. When
-        ``Connection.autocommit`` is *True*, a commit will take place for each
-        batch.
-
-        For maximum efficiency, it is best to use the :meth:`setinputsizes()`
-        method to specify the bind value types and sizes. In particular, if the
-        type is not explicitly specified, the value *None* is assumed to be a
-        string of length 1 so any values that are later bound as numbers or
-        dates will raise a TypeError exception.
-        """
-        self._verify_open()
-        manager = self._impl._prepare_for_executemany(
-            self,
-            self._normalize_statement(statement),
-            parameters,
-            batch_size,
-        )
-        self._impl.suspend_on_success = suspend_on_success
-        while manager.num_rows > 0:
-            self._impl.executemany(
-                self,
-                manager.num_rows,
-                batcherrors,
-                arraydmlrowcounts,
-                manager.message_offset,
-            )
-            manager.next_batch()
-
-    def fetchall(self) -> list:
-        """
-        Fetches all (remaining) rows of a SELECT query result, returning them
-        as a list of tuples. An empty list is returned if no more rows are
-        available. An exception is raised if the previous call to
-        :meth:`execute()` did not produce any result set or no call was issued
-        yet.
-
-        Note that the cursor's :attr:`~Cursor.arraysize` attribute can affect
-        the performance of this operation, as internally data is fetched in
-        batches of that size from the database. See :ref:`Tuning Fetch
-        Performance <tuningfetch>`.
-
-        An exception is raised if the previous call to :meth:`execute()` did
-        not produce any result set or no call was issued yet.
-        """
-        self._verify_fetch()
-        result = []
-        fetch_next_row = self._impl.fetch_next_row
-        while True:
-            row = fetch_next_row(self)
-            if row is None:
-                break
-            result.append(row)
-        return result
-
-    def fetchmany(
-        self, size: Optional[int] = None, numRows: Optional[int] = None
-    ) -> list:
-        """
-        Fetches the next set of rows of a SELECT query result, returning a list
-        of tuples.  An empty list is returned if no more rows are available.
-        Note that the cursor's :attr:`arraysize` attribute can affect the
-        performance of this operation.
-
-        The number of rows to fetch is specified by the ``size`` parameter. If
-        it is not given, the cursor's :attr:`arraysize` attribute determines
-        the number of rows to be fetched. If the number of rows available to be
-        fetched is fewer than the amount requested, fewer rows will be
-        returned.
-
-        An exception is raised if the previous call to :meth:`execute()` did
-        not produce any result set or no call was issued yet.
-        """
-        self._verify_fetch()
-        if size is None:
-            if numRows is not None:
-                size = numRows
-            else:
-                size = self._impl.arraysize
-        elif numRows is not None:
-            errors._raise_err(
-                errors.ERR_DUPLICATED_PARAMETER,
-                deprecated_name="numRows",
-                new_name="size",
-            )
-        result = []
-        fetch_next_row = self._impl.fetch_next_row
-        while len(result) < size:
-            row = fetch_next_row(self)
-            if row is None:
-                break
-            result.append(row)
-        return result
-
-    def fetchone(self) -> Any:
-        """
-        Fetches the next row of a SELECT query result set, returning a single
-        tuple or *None* when no more data is available.  An exception is raised
-        if the previous call to :meth:`execute()` did not produce any result
-        set or no call was issued yet.
-
-        When ``fetchone()`` is used to iterate over a result set, the cursor’s
-        :attr:`arraysize` attribute can affect performance, as internally data
-        is fetched in batches of that size from Oracle Database.
-        """
-        self._verify_fetch()
-        return self._impl.fetch_next_row(self)
-
-    def parse(self, statement: str) -> None:
-        """
-        This can be used to parse a statement without actually executing it
-        (parsing step is done automatically by Oracle when a statement is
-        :meth:`executed <execute>`).
-        """
-        self._verify_open()
-        self._prepare(statement)
-        self._impl.parse(self)
-
-    def scroll(self, value: int = 0, mode: str = "relative") -> None:
-        """
-        Scrolls the cursor in the result set to a new position according to the
-        mode.
-
-        If mode is *relative* (the default value), the value is taken as an
-        offset to the current position in the result set. If set to *absolute*,
-        value states an absolute target position. If set to *first*, the cursor
-        is positioned at the first row and if set to *last*, the cursor is set
-        to the last row in the result set.
-
-        An error is raised if the mode is *relative* or *absolute* and the
-        scroll operation would position the cursor outside of the result set.
-        """
-        self._verify_open()
-        if not self._impl.scrollable:
-            errors._raise_err(errors.ERR_SCROLL_NOT_SUPPORTED)
-        self._impl.scroll(self, value, mode)
-
-
-class AsyncCursor(BaseCursor):
-
-    async def __aenter__(self):
-        """
-        The entry point for the cursor as a context manager. It returns itself.
-        """
-        self._verify_open()
-        return self
-
-    async def __aexit__(self, *exc_info):
-        """
-        The exit point for the cursor as a context manager. It closes the
-        cursor.
-        """
-        self._verify_open()
-        self._impl.close(in_del=True)
-        self._impl = None
-
-    def __aiter__(self):
-        """
-        Returns the cursor itself to be used as an asynchronous iterator.
-        """
-        return self
-
-    async def __anext__(self):
-        self._verify_fetch()
-        row = await self._impl.fetch_next_row(self)
-        if row is not None:
-            return row
-        raise StopAsyncIteration
-
-    async def callfunc(
-        self,
-        name: str,
-        return_type: Any,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> Any:
-        """
-        Calls a PL/SQL function with the given name and returns its value.
-
-        The ``return_type`` parameter is expected to be a Python type, one of
-        the :ref:`oracledb types <types>` or an :ref:`Object Type
-        <dbobjecttype>`.
-
-        The sequence of parameters must contain one entry for each parameter
-        that the PL/SQL function expects. Any keyword parameters will be
-        included after the positional parameters.
-
-        Use :meth:`var()` to define any OUT or IN OUT parameters, if necessary.
-        """
-        var = self.var(return_type)
-        await self._call(name, parameters, keyword_parameters, var)
-        return var.getvalue()
-
-    async def callproc(
-        self,
-        name: str,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> list:
-        """
-        Calls a PL/SQL procedure with the given name.
-
-        The sequence of parameters must contain one entry for each parameter
-        that the procedure expects. The result of the call is a modified copy
-        of the input sequence. Input parameters are left untouched; output and
-        input/output parameters are replaced with possibly new values. Keyword
-        parameters will be included after the positional parameters and are not
-        returned as part of the output sequence.
-
-        Use :meth:`var()` to define any OUT or IN OUT parameters if necessary.
-
-        No query result set is returned by :meth:`callproc()`.  Instead, use
-        :ref:`REF CURSOR <refcur>` parameters or :ref:`Implicit Results
-        <implicitresults>`.
-        """
-        await self._call(name, parameters, keyword_parameters)
-        if parameters is None:
-            return []
-        return [
-            v.get_value(0) for v in self._impl.bind_vars[: len(parameters)]
-        ]
-
-    @property
-    def connection(self) -> "connection_module.AsyncConnection":
-        """
-        This read-only attribute returns a reference to the connection object
-        on which the cursor was created.
-        """
-        return self._connection
-
-    async def execute(
-        self,
-        statement: Optional[str],
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        *,
-        suspend_on_success: bool = False,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-        **keyword_parameters: Any,
-    ) -> None:
-        """
-        Executes a statement against the database. See :ref:`sqlexecution`.
-
-        Parameters may be passed as a dictionary or sequence or as keyword
-        parameters. If the parameters are a dictionary, the values will be
-        bound by name and if the parameters are a sequence the values will be
-        bound by position. Note that if the values are bound by position, the
-        order of the variables is from left to right as they are encountered in
-        the statement and SQL statements are processed differently than PL/SQL
-        statements. For this reason, it is generally recommended to bind
-        parameters by name instead of by position.
-
-        Parameters passed as a dictionary are name and value pairs. The name
-        maps to the bind variable name used by the statement and the value maps
-        to the Python value you wish bound to that bind variable.
-
-        A reference to the statement will be retained by the cursor. If *None*
-        or the same string object is passed in again, the cursor will execute
-        that statement again without performing a prepare or rebinding and
-        redefining.  This is most effective for algorithms where the same
-        statement is used, but different parameters are bound to it (many
-        times). Note that parameters that are not passed in during subsequent
-        executions will retain the value passed in during the last execution
-        that contained them.
-
-        The ``suspend_on_success`` parameter is specific to :ref:`sessionless
-        transactions <sessionlesstxns>`. When set to *True*, the active
-        sessionless transaction will be suspended when ``execute()`` completes
-        successfully.  See :ref:`suspendtxns`.
-
-        The ``fetch_lobs`` parameter specifies whether to return LOB locators
-        or ``str``/``bytes`` values when fetching LOB columns. The default
-        value is :data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        ``decimal.Decimal`` values when fetching columns of type ``NUMBER``.
-        The default value is :data:`oracledb.defaults.fetch_decimals
-        <Defaults.fetch_decimals>`.
-
-        For maximum efficiency when reusing a statement, it is best to use the
-        :meth:`setinputsizes()` method to specify the parameter types and sizes
-        ahead of time; in particular, *None* is assumed to be a string of
-        length 1 so any values that are later bound as numbers or dates will
-        raise a TypeError exception.
-
-        If the statement is a SELECT query, the cursor is returned as a
-        convenience to the caller (so it can be used directly as an iterator
-        over the rows in the cursor); otherwise, *None* is returned.
-        """
-        self._prepare_for_execute(statement, parameters, keyword_parameters)
-        impl = self._impl
-        impl.suspend_on_success = suspend_on_success
-        if fetch_lobs is not None:
-            impl.fetch_lobs = fetch_lobs
-        if fetch_decimals is not None:
-            impl.fetch_decimals = fetch_decimals
-        await self._impl.execute(self)
-
-    async def executemany(
-        self,
-        statement: Optional[str],
-        parameters: Any,
-        *,
-        batcherrors: bool = False,
-        arraydmlrowcounts: bool = False,
-        suspend_on_success: bool = False,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Executes a SQL statement once using all bind value mappings or
-        sequences found in the sequence parameters. This can be used to insert,
-        update, or delete multiple rows in a table with a single
-        python-oracledb call. It can also invoke a PL/SQL procedure multiple
-        times. See :ref:`batchstmnt`.
-
-        The ``statement`` parameter is managed in the same way as the
-        :meth:`execute()` method manages it.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one bind variable placeholder in ``statement``. It can
-        also be a list of dictionaries, where the keys match the bind variable
-        placeholder names in ``statement``. If there are no bind values, or
-        values have previously been bound, the ``parameters`` value can be an
-        integer specifying the number of iterations. The ``parameters``
-        parameter can also be a :ref:`DataFrame <oracledataframeobj>`, or a
-        third-party data frame that supports the `Apache Arrow PyCapsule
-        <https://arrow.apache.org/docs/
-        format/CDataInterface/PyCapsuleInterface.html>`__ Interface.
-
-        In python-oracledb Thick mode, if the size of the buffers allocated for
-        any of the parameters exceeds 2 GB, you will receive the error
-        ``DPI-1015: array size of <n> is too large``. If you receive this
-        error, decrease the number of rows being inserted.
-
-        When True, the ``batcherrors`` parameter enables batch error support
-        within Oracle and ensures that the call succeeds even if an exception
-        takes place in one or more of the sequence of parameters. The errors
-        can then be retrieved using :meth:`getbatcherrors()`.
-
-        When True, the ``arraydmlrowcounts`` parameter enables DML row counts
-        to be retrieved from Oracle after the method has completed. The row
-        counts can then be retrieved using :meth:`getarraydmlrowcounts()`.
-
-        Both the ``batcherrors`` parameter and the ``arraydmlrowcounts``
-        parameter can only be True when executing an insert, update, delete, or
-        merge statement. In all other cases, an error will be raised.
-
-        The ``suspend_on_success`` parameter is specific to :ref:`sessionless
-        transactions <sessionlesstxns>`. When set to *True*, the active
-        sessionless transaction will be suspended when ``executemany()``
-        completes successfully. See :ref:`suspendtxns`.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance. When
-        ``Connection.autocommit`` is *True*, a commit will take place for each
-        batch. Do not set ``batch_size`` when ``suspend_on_success`` is *True*.
-
-        For maximum efficiency, it is best to use the :meth:`setinputsizes()`
-        method to specify the parameter types and sizes ahead of time. In
-        particular, the value *None* is assumed to be a string of length 1 so
-        any values that are later bound as numbers or dates will raise a
-        TypeError exception.
-        """
-        self._verify_open()
-        manager = self._impl._prepare_for_executemany(
-            self, self._normalize_statement(statement), parameters, batch_size
-        )
-        self._impl.suspend_on_success = suspend_on_success
-        while manager.num_rows > 0:
-            await self._impl.executemany(
-                self,
-                manager.num_rows,
-                batcherrors,
-                arraydmlrowcounts,
-                manager.message_offset,
-            )
-            manager.next_batch()
-
-    async def fetchall(self) -> list:
-        """
-        Fetches all (remaining) rows of a SELECT query result, returning them
-        as a list of tuples. An empty list is returned if no more rows are
-        available. An exception is raised if the previous call to
-        :meth:`execute()` did not produce any result set or no call was issued
-        yet.
-
-        Note that the cursor's :attr:`~AsyncCursor.arraysize` attribute can
-        affect the performance of this operation, as internally data is fetched
-        in batches of that size from the database.
-        """
-        self._verify_fetch()
-        result = []
-        fetch_next_row = self._impl.fetch_next_row
-        while True:
-            row = await fetch_next_row(self)
-            if row is None:
-                break
-            result.append(row)
-        return result
-
-    async def fetchmany(self, size: Optional[int] = None) -> list:
-        """
-        Fetches the next set of rows of a SELECT query result, returning a list
-        of tuples.  An empty list is returned if no more rows are available.
-        Note that the cursor's :attr:`arraysize` attribute can affect the
-        performance of this operation.
-
-        The number of rows to fetch is specified by the parameter. If it is not
-        given, the cursor's :attr:`arraysize` attribute determines the number
-        of rows to be fetched. If the number of rows available to be fetched is
-        fewer than the amount requested, fewer rows will be returned.
-
-        An exception is raised if the previous call to :meth:`execute()` did
-        not produce any result set or no call was issued yet.
-        """
-        self._verify_fetch()
-        if size is None:
-            size = self._impl.arraysize
-        result = []
-        fetch_next_row = self._impl.fetch_next_row
-        while len(result) < size:
-            row = await fetch_next_row(self)
-            if row is None:
-                break
-            result.append(row)
-        return result
-
-    async def fetchone(self) -> Any:
-        """
-        Fetches the next row of a SELECT query result set, returning a single
-        tuple or *None* when no more data is available.  An exception is raised
-        if the previous call to :meth:`execute()` did not produce any result
-        set or no call was issued yet.
-
-        When ``fetchone()`` is used to iterate over a result set, the cursor’s
-        :attr:`arraysize` attribute can affect performance, as internally data
-        is fetched in batches of that size from Oracle Database.
-        """
-        self._verify_fetch()
-        return await self._impl.fetch_next_row(self)
-
-    async def parse(self, statement: str) -> None:
-        """
-        This can be used to parse a statement without actually executing it
-        (parsing step is done automatically by Oracle when a statement is
-        :meth:`executed <execute>`).
-        """
-        self._verify_open()
-        self._prepare(statement)
-        await self._impl.parse(self)
-
-    async def scroll(self, value: int = 0, mode: str = "relative") -> None:
-        """
-        Scrolls the cursor in the result set to a new position according to the
-        mode.
-
-        If mode is *relative* (the default value), the value is taken as an
-        offset to the current position in the result set. If set to *absolute*,
-        value states an absolute target position. If set to *first*, the cursor
-        is positioned at the first row and if set to *last*, the cursor is set
-        to the last row in the result set.
-
-        An error is raised if the mode is *relative* or *absolute* and the
-        scroll operation would position the cursor outside of the result set.
-        """
-        self._verify_open()
-        if not self._impl.scrollable:
-            errors._raise_err(errors.ERR_SCROLL_NOT_SUPPORTED)
-        await self._impl.scroll(self, value, mode)
diff --git a/src/oracledb/dataframe.py b/src/oracledb/dataframe.py
deleted file mode 100644
index feb74c4c..00000000
--- a/src/oracledb/dataframe.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dataframe.py
-#
-# Implement a data frame that can be used for efficiently transferring Arrow
-# array data to other data frame libraries.
-# -----------------------------------------------------------------------------
-
-from .arrow_array import ArrowArray
-from .arrow_impl import DataFrameImpl
-from .base import BaseMetaClass
-from . import errors
-
-
-class DataFrame(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(self):
-        errors._raise_err(errors.ERR_INTERNAL_CREATION_REQUIRED)
-
-    @classmethod
-    def _from_arrow(cls, obj):
-        df = cls.__new__(cls)
-        df._initialize(DataFrameImpl.from_arrow_stream(obj))
-        return df
-
-    @classmethod
-    def _from_impl(cls, impl):
-        df = cls.__new__(cls)
-        df._initialize(impl)
-        return df
-
-    def _initialize(self, impl):
-        """
-        Initializes the object given the implementation.
-        """
-        self._impl = impl
-        self._arrays = [ArrowArray._from_impl(a) for a in impl.get_arrays()]
-        self._arrays_by_name = {}
-        for array in self._arrays:
-            self._arrays_by_name[array.name] = array
-
-    def __arrow_c_stream__(self, requested_schema=None):
-        """
-        Returns the ArrowArrayStream PyCapsule which allows direct conversion
-        to foreign data frames that support this interface.
-        """
-        if requested_schema is not None:
-            raise NotImplementedError("requested_schema")
-        return self._impl.get_stream_capsule()
-
-    def column_arrays(self) -> list[ArrowArray]:
-        """
-        Returns a list of ArrowArray objects, each containing a select list
-        column.
-        """
-        return self._arrays
-
-    def column_names(self) -> list[str]:
-        """
-        Returns a list of the column names in the data frame.
-        """
-        return [a.name for a in self._arrays]
-
-    def get_column(self, i: int) -> ArrowArray:
-        """
-        Returns an :ref:`ArrowArray <oraclearrowarrayobj>` object for the
-        column at the given index ``i``. If the index is out of range, an
-        IndexError exception is raised.
-        """
-        if i < 0 or i >= self.num_columns():
-            raise IndexError(
-                f"Column index {i} is out of bounds for "
-                f"DataFrame with {self.num_columns()} columns"
-            )
-        return self._arrays[i]
-
-    def get_column_by_name(self, name: str) -> ArrowArray:
-        """
-        Returns an :ref:`ArrowArray <oraclearrowarrayobj>` object for the
-        column with the given name ``name``. If the column name is not found,
-        a KeyError exception is raised.
-        """
-        try:
-            return self._arrays_by_name[name]
-        except KeyError:
-            raise KeyError(f"Column {name} not found in DataFrame")
-
-    def num_columns(self) -> int:
-        """
-        Returns the number of columns in the data frame.
-        """
-        return len(self._arrays)
-
-    def num_rows(self) -> int:
-        """
-        Returns the number of rows in the data frame.
-        """
-        return len(self._arrays[0])
diff --git a/src/oracledb/dbobject.py b/src/oracledb/dbobject.py
deleted file mode 100644
index fef230ed..00000000
--- a/src/oracledb/dbobject.py
+++ /dev/null
@@ -1,392 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dbobject.py
-#
-# Contains the classes used for managing database objects and the database
-# object type metadata: DbObject, DbObjectType and DbObjectAttr.
-# -----------------------------------------------------------------------------
-
-from typing import Any, Sequence, Union
-
-from . import errors
-from .base import BaseMetaClass
-from .base_impl import DbType
-
-
-class DbObject(metaclass=BaseMetaClass):
-
-    def __getattr__(self, name):
-        try:
-            attr_impl = self._impl.type.attrs_by_name[name]
-        except KeyError:
-            return super().__getattribute__(name)
-        return self._impl.get_attr_value(attr_impl)
-
-    def __iter__(self):
-        self._ensure_is_collection()
-        ix = self._impl.get_first_index()
-        while ix is not None:
-            yield self._impl.get_element_by_index(ix)
-            ix = self._impl.get_next_index(ix)
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return f"<{cls_name} {self.type._get_full_name()} at {hex(id(self))}>"
-
-    def __setattr__(self, name, value):
-        if name == "_impl" or name == "_type":
-            super().__setattr__(name, value)
-        else:
-            attr_impl = self._impl.type.attrs_by_name[name]
-            self._impl.set_attr_value(attr_impl, value)
-
-    def _ensure_is_collection(self):
-        """
-        Ensures that the object refers to a collection. If not, an exception is
-        raised.
-        """
-        if not self.type.iscollection:
-            errors._raise_err(
-                errors.ERR_OBJECT_IS_NOT_A_COLLECTION,
-                name=self.type._get_full_name(),
-            )
-
-    @classmethod
-    def _from_impl(cls, impl):
-        obj = cls.__new__(cls)
-        obj._impl = impl
-        obj._type = None
-        return obj
-
-    def append(self, element: Any) -> None:
-        """
-        Appends an element to the collection object. If no elements exist in
-        the collection, this creates an element at index 0; otherwise, it
-        creates an element immediately following the highest index available in
-        the collection.
-        """
-        self._ensure_is_collection()
-        self._impl.append(element)
-
-    def asdict(self) -> dict:
-        """
-        Returns a dictionary where the collection’s indexes are the keys and
-        the elements are its values.
-        """
-        self._ensure_is_collection()
-        result = {}
-        ix = self._impl.get_first_index()
-        while ix is not None:
-            result[ix] = self._impl.get_element_by_index(ix)
-            ix = self._impl.get_next_index(ix)
-        return result
-
-    def aslist(self) -> list:
-        """
-        Returns a list of each of the collection’s elements in index order.
-        """
-        return list(self)
-
-    def copy(self) -> "DbObject":
-        """
-        Creates a copy of the object and returns it.
-        """
-        copied_impl = self._impl.copy()
-        return DbObject._from_impl(copied_impl)
-
-    def delete(self, index: int) -> None:
-        """
-        Delete the element at the specified index of the collection. If the
-        element does not exist or is otherwise invalid, an error is raised.
-        Note that the indices of the remaining elements in the collection are
-        not changed. In other words, the delete operation creates holes in the
-        collection.
-        """
-        self._ensure_is_collection()
-        self._impl.delete_by_index(index)
-
-    def exists(self, index: int) -> bool:
-        """
-        Return True or False indicating if an element exists in the collection
-        at the specified index.
-        """
-        self._ensure_is_collection()
-        return self._impl.exists_by_index(index)
-
-    def extend(self, seq: list) -> None:
-        """
-        Appends all of the elements in the sequence to the collection. This is
-        the equivalent of performing append() for each element found in the
-        sequence.
-        """
-        self._ensure_is_collection()
-        for value in seq:
-            self.append(value)
-
-    def first(self) -> int:
-        """
-        Returns the index of the first element in the collection. If the
-        collection is empty, None is returned.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_first_index()
-
-    def getelement(self, index: int) -> Any:
-        """
-        Returns the element at the specified index of the collection. If no
-        element exists at that index, an exception is raised.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_element_by_index(index)
-
-    def last(self) -> int:
-        """
-        Returns the index of the last element in the collection. If the
-        collection is empty, None is returned.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_last_index()
-
-    def next(self, index: int) -> int:
-        """
-        Returns the index of the next element in the collection following the
-        specified index. If there are no elements in the collection following
-        the specified index, None is returned.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_next_index(index)
-
-    def prev(self, index: int) -> int:
-        """
-        Returns the index of the element in the collection preceding the
-        specified index. If there are no elements in the collection preceding
-        the specified index, None is returned.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_prev_index(index)
-
-    def setelement(self, index: int, value: Any) -> None:
-        """
-        Sets the value in the collection at the specified index to the given
-        value.
-        """
-        self._ensure_is_collection()
-        self._impl.set_element_by_index(index, value)
-
-    def size(self) -> int:
-        """
-        Returns the number of elements in the collection.
-        """
-        self._ensure_is_collection()
-        return self._impl.get_size()
-
-    def trim(self, num: int) -> None:
-        """
-        Removes the specified number of elements from the end of the
-        collection.
-        """
-        self._ensure_is_collection()
-        self._impl.trim(num)
-
-    @property
-    def type(self) -> "DbObjectType":
-        """
-        This read-only attribute arturns an ObjectType corresponding to the
-        type of the object.
-        """
-        if self._type is None:
-            self._type = DbObjectType._from_impl(self._impl.type)
-        return self._type
-
-
-class DbObjectAttr(metaclass=BaseMetaClass):
-
-    def __repr__(self):
-        return f"<oracledb.DbObjectAttr {self.name}>"
-
-    @classmethod
-    def _from_impl(cls, impl):
-        attr = cls.__new__(cls)
-        attr._impl = impl
-        attr._type = None
-        return attr
-
-    @property
-    def max_size(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the maximum size (in bytes) of the
-        attribute when the attribute's type is one of
-        DB_TYPE_RAW, DB_TYPE_CHAR, DB_TYPE_NCHAR, DB_TYPE_VARCHAR and
-        DB_TYPE_NVARCHAR. For all other types, the value returned is None.
-        """
-        if self._impl.max_size:
-            return self._impl.max_size
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name of the attribute.
-        """
-        return self._impl.name
-
-    @property
-    def precision(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the precision of the attribute when
-        the attribute's type is DB_TYPE_NUMBER. For all other types, the value
-        returned is None.
-        """
-        if self._impl.precision or self._impl.scale:
-            return self._impl.precision
-
-    @property
-    def scale(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the scale of the attribute when the
-        attribute's type is DB_TYPE_NUMBER. For all other types, the value
-        returned is None.
-        """
-        if self._impl.precision or self._impl.scale:
-            return self._impl.scale
-
-    @property
-    def type(self) -> Union["DbObjectType", DbType]:
-        """
-        This read-only attribute returns the type of the attribute. This will
-        be an Oracle Object Type if the variable binds Oracle objects;
-        otherwise, it will be one of the database type constants.
-        """
-        if self._type is None:
-            if self._impl.objtype is not None:
-                self._type = DbObjectType._from_impl(self._impl.objtype)
-            else:
-                self._type = self._impl.dbtype
-        return self._type
-
-
-class DbObjectType(metaclass=BaseMetaClass):
-
-    def __call__(self, value: Sequence = None) -> DbObject:
-        """
-        The object type may be called directly and serves as an alternative way
-        of calling :meth:`~DbObjectType.newobject()`.
-        """
-        return self.newobject(value)
-
-    def __eq__(self, other):
-        if isinstance(other, DbObjectType):
-            return other._impl == self._impl
-        return NotImplemented
-
-    def __repr__(self):
-        return f"<oracledb.DbObjectType {self._get_full_name()}>"
-
-    @classmethod
-    def _from_impl(cls, impl):
-        typ = cls.__new__(cls)
-        typ._impl = impl
-        typ._attributes = None
-        typ._element_type = None
-        return typ
-
-    def _get_full_name(self):
-        """
-        Returns the full name of the type.
-        """
-        return self._impl._get_fqn()
-
-    @property
-    def attributes(self) -> list["DbObjectAttr"]:
-        """
-        This read-only attribute returns a list of the attributes that make up
-        the object type.
-        """
-        if self._attributes is None:
-            self._attributes = [
-                DbObjectAttr._from_impl(i) for i in self._impl.attrs
-            ]
-        return self._attributes
-
-    @property
-    def iscollection(self) -> bool:
-        """
-        This read-only attribute returns a boolean indicating if the object
-        type refers to a collection or not.
-        """
-        return self._impl.is_collection
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name of the type.
-        """
-        return self._impl.name
-
-    @property
-    def element_type(self) -> Union["DbObjectType", DbType]:
-        """
-        This read-only attribute returns the type of elements found in
-        collections of this type, if iscollection is True; otherwise, it
-        returns None. If the collection contains objects, this will be another
-        object type; otherwise, it will be one of the database type constants.
-        """
-        if self._element_type is None:
-            if self._impl.element_metadata.objtype is not None:
-                typ_impl = self._impl.element_metadata.objtype
-                self._element_type = DbObjectType._from_impl(typ_impl)
-            else:
-                self._element_type = self._impl.element_metadata.dbtype
-        return self._element_type
-
-    def newobject(self, value: Sequence = None) -> DbObject:
-        """
-        Returns a new Oracle object of the given type. This object can then be
-        modified by setting its attributes and then bound to a cursor for
-        interaction with Oracle. If the object type refers to a collection, a
-        sequence may be passed and the collection will be initialized with the
-        items in that sequence.
-        """
-        obj_impl = self._impl.create_new_object()
-        obj = DbObject._from_impl(obj_impl)
-        if value is not None:
-            obj.extend(value)
-        return obj
-
-    @property
-    def package_name(self) -> str:
-        """
-        This read-only attribute returns the name of the package containing the
-        PL/SQL type or None if the type is not a PL/SQL type.
-        """
-        return self._impl.package_name
-
-    @property
-    def schema(self) -> str:
-        """
-        This read-only attribute returns the name of the schema that owns the
-        type.
-        """
-        return self._impl.schema
diff --git a/src/oracledb/defaults.py b/src/oracledb/defaults.py
deleted file mode 100644
index c717c844..00000000
--- a/src/oracledb/defaults.py
+++ /dev/null
@@ -1,329 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# defaults.py
-#
-# Contains the Defaults class used for managing default values used throughout
-# the module.
-# -----------------------------------------------------------------------------
-
-from . import base_impl
-from . import errors
-from .base import BaseMetaClass
-
-
-class Defaults(metaclass=BaseMetaClass):
-    """
-    A singleton Defaults object contains attributes to adjust default
-    behaviors of python-oracledb. It is accessed using the :data:`defaults`
-    attribute of the imported module.
-    """
-
-    def __init__(self) -> None:
-        self._impl = base_impl.DEFAULTS
-
-    @property
-    def arraysize(self) -> int:
-        """
-        This read-write attribute specifies the default arraysize to use when
-        cursors are created.
-
-        It is an attribute for tuning the performance of fetching rows from
-        Oracle Database. It does not affect data insertion.
-
-        This value is the default for :attr:`Cursor.arraysize` and
-        :attr:`AsyncCursor.arraysize`.
-
-        This attribute has an initial value of *100*.
-        """
-        return self._impl.arraysize
-
-    @arraysize.setter
-    def arraysize(self, value: int):
-        self._impl.arraysize = value
-
-    @property
-    def config_dir(self) -> str:
-        """
-        This read-write attribute specifies the directory in which the optional
-        configuration file ``tnsnames.ora`` will be read in python-oracledb
-        Thin mode. It is also used in Thick mode if
-        :attr:`Defaults.thick_mode_dsn_passthrough` is *False*.
-
-        At time of ``import oracledb`` the value of
-        ``oracledb.defaults.config_dir`` will be set to (first one wins):
-
-        - the value of ``$TNS_ADMIN``, if ``TNS_ADMIN`` is set.
-
-        - ``$ORACLE_HOME/network/admin``, if ``$ORACLE_HOME`` is set.
-
-        Otherwise, ``oracledb.defaults.config_dir`` will not be set.
-
-        At completion of a call to :meth:`oracledb.init_oracle_client()` in
-        python-oracledb Thick mode, the value of ``config_dir`` may get
-        changed.
-        """
-        return self._impl.config_dir
-
-    @config_dir.setter
-    def config_dir(self, value: str):
-        self._impl.config_dir = value
-
-    @property
-    def fetch_lobs(self) -> bool:
-        """
-        This read-write attribute specifies whether queries that contain LOBs
-        should return LOB objects or their contents instead.
-
-        When the value of this attribute is *True*, then queries to LOB columns
-        return LOB locators. When the value of this attribute is *False*, then
-        CLOBs and NCLOBs are fetched as strings, and BLOBs are fetched as
-        bytes. If LOBs are larger than 1 GB, then this attribute should be set
-        to *True* and the LOBs should be streamed.
-
-        The value of ``oracledb.defaults.fetch_lobs`` does not affect LOBs
-        returned as OUT binds.
-
-        The value of ``fetch_lobs`` can be overridden at statement execution by
-        passing an equivalent parameter.
-
-        An output type handler such as the one previously required in the
-        obsolete cx_Oracle driver can alternatively be used to adjust the
-        returned type.  If a type handler exists and returns a variable (that
-        is, `cursor.var(...)`), then that return variable is used. If the type
-        handler returns *None*, then the value of
-        ``oracledb.defaults.fetch_lobs`` is used.
-
-        This attribute has an initial value of *True*.
-        """
-        return self._impl.fetch_lobs
-
-    @fetch_lobs.setter
-    def fetch_lobs(self, value: bool):
-        self._impl.fetch_lobs = value
-
-    @property
-    def fetch_decimals(self) -> bool:
-        """
-        This read-write attribute specifies whether queries that contain
-        numbers should be fetched as Python decimal.Decimal objects or floating
-        point numbers. This can help avoid issues with converting numbers from
-        Oracle Database's decimal format to Python's binary format.
-
-        The value of ``fetch_decimals`` can be overridden at statement
-        execution by passing an equivalent parameter.
-
-        An output type handler such as previously required in the obsolete
-        cx_Oracle driver can alternatively be used to adjust the returned type.
-        If a type handler exists and returns a variable (that is,
-        ``cursor.var(...)``), then that return variable is used. If the type
-        handler returns *None*, then the value of
-        ``oracledb.defaults.fetch_decimals`` is used to determine whether to
-        return ``decimal.Decimal`` values.
-
-        This attribute has an initial value of *False*.
-        """
-        return self._impl.fetch_decimals
-
-    @fetch_decimals.setter
-    def fetch_decimals(self, value: bool):
-        self._impl.fetch_decimals = value
-
-    @property
-    def prefetchrows(self) -> int:
-        """
-        This read-write attribute specifies the default number of rows to
-        prefetch when cursors are executed.
-
-        This is an attribute for tuning the performance of fetching rows from
-        Oracle Database. It does not affect data insertion.
-
-        This value is the default for :attr:`Cursor.prefetchrows` and
-        :attr:`AsyncCursor.prefetchrows`.
-
-        This attribute is ignored when using :meth:`Connection.fetch_df_all()`
-        or :meth:`Connection.fetch_df_batches()` since these methods always set
-        the internal prefetch size to their relevant ``arraysize`` or ``size``
-        parameter value.
-
-        This attribute has an initial value of *2*.
-        """
-        return self._impl.prefetchrows
-
-    @prefetchrows.setter
-    def prefetchrows(self, value: int):
-        self._impl.prefetchrows = value
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        This read-write attribute specifies the default size of the statement
-        cache.
-
-        This is an attribute for tuning statement execution performance when a
-        statement is executed more than once.
-
-        This value is the default for :attr:`Connection.stmtcachesize`,
-        :attr:`ConnectionPool.stmtcachesize`,
-        :attr:`AsyncConnection.stmtcachesize`, and
-        :attr:`AsyncConnectionPool.stmtcachesize`.
-
-        This attribute has an initial value of *20*.
-        """
-        return self._impl.stmtcachesize
-
-    @stmtcachesize.setter
-    def stmtcachesize(self, value: int):
-        self._impl.stmtcachesize = value
-
-    @property
-    def program(self) -> str:
-        """
-        This read-write attribute is a string recorded by Oracle Database
-        as the program from which the connection originates.  This is the value
-        used in the PROGRAM column of the V$SESSION view.
-
-        This attribute has an initial value that is populated by
-        `sys.executable <https://docs.python.org/3/library/sys.html#
-        sys.executable>`__.
-
-        This attribute is only used in python-oracledb Thin mode.
-        """
-        return self._impl.program
-
-    @program.setter
-    def program(self, value: str):
-        if base_impl.sanitize(value) != value:
-            errors._raise_err(errors.ERR_INVALID_NETWORK_NAME, name="program")
-        self._impl.program = value
-
-    @property
-    def machine(self) -> str:
-        """
-        This read-write attribute is a string recorded by Oracle Database as
-        the name of machine from which the connection originates. This is the
-        value used in the MACHINE column of the V$SESSION view.
-
-        This attribute takes the host name where the application is running as
-        its initial value.
-
-        This attribute is only used in python-oracledb Thin mode.
-        """
-        return self._impl.machine
-
-    @machine.setter
-    def machine(self, value: str):
-        if base_impl.sanitize(value) != value:
-            errors._raise_err(errors.ERR_INVALID_NETWORK_NAME, name="machine")
-        self._impl.machine = value
-
-    @property
-    def terminal(self) -> str:
-        """
-        This read-write attribute specifies the terminal identifier from which
-        the connection originates. This is the value used in the TERMINAL
-        column of the V$SESSION view.
-
-        This attribute has an initial value of "unknown".
-
-        This attribute is only used in python-oracledb Thin mode.
-        """
-        return self._impl.terminal
-
-    @terminal.setter
-    def terminal(self, value: str):
-        self._impl.terminal = value
-
-    @property
-    def osuser(self) -> str:
-        """
-        This read-write attribute is a string recorded by Oracle Database
-        as the operating system user who originated the connection. This is the
-        value used in the OSUSER column of the V$SESSION view.
-
-        This attribute takes the login name of the user as its initial value.
-
-        This attribute is only used in python-oracledb Thin mode.
-        """
-        return self._impl.osuser
-
-    @osuser.setter
-    def osuser(self, value: str):
-        if base_impl.sanitize(value) != value:
-            errors._raise_err(errors.ERR_INVALID_NETWORK_NAME, name="osuser")
-        self._impl.osuser = value
-
-    @property
-    def driver_name(self) -> str:
-        """
-        This read-write attribute is a string recorded by Oracle Database
-        as the name of the driver which originated the connection. This is the
-        value used in the CLIENT_DRIVER column of the V$SESSION_CONNECT_INFO
-        view.
-
-        This attribute has an initial value of *None*. It is used as required
-        in python-oracledb Thick and Thin mode.
-
-        In python-oracledb Thick mode, this attribute is used if the
-        ``driver_name`` parameter is not specified in
-        :meth:`oracledb.init_oracle_client()`. In Thin mode, this attribute is
-        used if the ``driver_name`` parameter is not specified in
-        :meth:`oracledb.connect()`, :meth:`oracledb.connect_async()`,
-        :meth:`oracledb.create_pool()`, or
-        :meth:`oracledb.create_pool_async()`. If the value of this attribute is
-        *None*, the value set when connecting in python-oracledb Thick mode is
-        like "python-oracledb thk : <version>" and in Thin mode is like
-        "python-oracledb thn : <version>".
-        """
-        return self._impl.driver_name
-
-    @driver_name.setter
-    def driver_name(self, value: str):
-        self._impl.driver_name = value
-
-    @property
-    def thick_mode_dsn_passthrough(self) -> bool:
-        """
-        This read-write attribute determines whether
-        connection strings passed as the ``dsn`` parameter to
-        :meth:`oracledb.connect()`, :meth:`oracledb.create_pool()`,
-        :meth:`oracledb.connect_async()`, and
-        :meth:`oracledb.create_pool_async()` in python-oracledb Thick mode will
-        be parsed by Oracle Client libraries or by python-oracledb itself.
-
-        The value of ``thick_mode_dsn_passthrough`` is ignored in
-        python-oracledb Thin mode, which always parses all connect strings
-        (including reading a tnsnames.ora file, if required).
-
-        This attribute has an initial value of *True*.
-        """
-        return self._impl.thick_mode_dsn_passthrough
-
-    @thick_mode_dsn_passthrough.setter
-    def thick_mode_dsn_passthrough(self, value: str):
-        self._impl.thick_mode_dsn_passthrough = value
-
-
-defaults = Defaults()
diff --git a/src/oracledb/driver_mode.py b/src/oracledb/driver_mode.py
deleted file mode 100644
index 15c93dc9..00000000
--- a/src/oracledb/driver_mode.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# driver_mode.py
-#
-# Contains a simple method for checking and returning which mode the driver is
-# currently using. The driver only supports creating connections and pools with
-# either the thin implementation or the thick implementation, not both
-# simultaneously.
-# -----------------------------------------------------------------------------
-
-import threading
-
-from . import errors
-
-
-# The DriverModeHandler class is used to manage which mode the driver is using.
-#
-# The "thin_mode" flag contains the current state:
-#     None: neither thick nor thin implementation has been used yet
-#     False: thick implementation is being used
-#     True: thin implementation is being used
-#
-# The "requested_thin_mode" flag is set to the mode that is being requested:
-#     False: thick implementation is being initialized
-#     True: thin implementation is being initialized
-class DriverModeManager:
-    """
-    Manages the mode the driver is using. The "thin_mode" flag contains the
-    current state:
-        None: neither thick nor thin implementation has been used yet
-        False: thick implementation is being used
-        True: thin implementation is being used
-    The "requested_thin_mode" is set to the mode that is being requested, but
-    only while initialization is taking place (otherwise, it contains the value
-    None):
-        False: thick implementation is being initialized
-        True: thin implementation is being initialized
-    The condition is used to ensure that only one thread is performing
-    initialization.
-    """
-
-    def __init__(self):
-        self.thin_mode = None
-        self.requested_thin_mode = None
-        self.condition = threading.Condition()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        with self.condition:
-            if (
-                exc_type is None
-                and exc_value is None
-                and exc_tb is None
-                and self.requested_thin_mode is not None
-            ):
-                self.thin_mode = self.requested_thin_mode
-            self.requested_thin_mode = None
-            self.condition.notify()
-
-    @property
-    def thin(self):
-        if self.requested_thin_mode is not None:
-            return self.requested_thin_mode
-        return self.thin_mode
-
-
-manager = DriverModeManager()
-
-
-def get_manager(requested_thin_mode=None):
-    """
-    Returns the manager, but only after ensuring that no other threads are
-    attempting to initialize the mode.
-    """
-    with manager.condition:
-        if manager.thin_mode is None:
-            if manager.requested_thin_mode is not None:
-                manager.condition.wait()
-            if manager.thin_mode is None:
-                if requested_thin_mode is None:
-                    manager.requested_thin_mode = True
-                else:
-                    manager.requested_thin_mode = requested_thin_mode
-        elif (
-            requested_thin_mode is not None
-            and requested_thin_mode != manager.thin_mode
-        ):
-            if requested_thin_mode:
-                errors._raise_err(errors.ERR_THICK_MODE_ENABLED)
-            else:
-                errors._raise_err(errors.ERR_THIN_CONNECTION_ALREADY_CREATED)
-    return manager
-
-
-def is_thin_mode() -> bool:
-    """
-    Returns a boolean indicating if python-oracledb is in Thin mode.
-
-    Immediately after python-oracledb is imported, this function will return
-    *True* indicating that python-oracledb defaults to Thin mode. If a call to
-    :func:`oracledb.init_oracle_client()` returns successfully, then a
-    subsequent call to ``is_thin_mode()`` will return False indicating that
-    Thick mode is enabled. Once the first standalone connection or connection
-    pool is created, or a successful call to ``oracledb.init_oracle_client()``
-    is made, or :meth:`oracledb.enable_thin_mode()` is called, then
-    python-oracledb’s mode is fixed and the value returned by
-    ``is_thin_mode()`` will never change for the lifetime of the process.
-
-    The attribute :attr:`Connection.thin` can be used to check a connection's
-    mode. The attribute :attr:`ConnectionPool.thin` can be used to check a
-    pool's mode.
-    """
-    if manager.thin_mode is not None:
-        return manager.thin_mode
-    return True
diff --git a/src/oracledb/dsn.py b/src/oracledb/dsn.py
deleted file mode 100644
index 13bb31cb..00000000
--- a/src/oracledb/dsn.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# dsn.py
-#
-# Contains makedsn(), a method available for backwards compatibility with
-# cx_Oracle. Use of the ConnectParams class or the keyword arguments to
-# connect() and create_pool() is recommended instead.
-# -----------------------------------------------------------------------------
-
-from . import errors
-
-
-def _check_arg(name: str, value: str) -> None:
-    """
-    Checks the argument to ensure that it does not contain (, ) or = as these
-    characters are not permitted within connect strings.
-    """
-    if "(" in value or ")" in value or "=" in value:
-        errors._raise_err(errors.ERR_INVALID_MAKEDSN_ARG, name=name)
-
-
-def makedsn(
-    host: str,
-    port: int,
-    sid: str = None,
-    service_name: str = None,
-    region: str = None,
-    sharding_key: str = None,
-    super_sharding_key: str = None,
-) -> str:
-    """
-    Returns a string suitable for use as the ``dsn`` parameter for
-    :meth:`~oracledb.connect()`. This string is identical to the strings that
-    are defined by the Oracle names server or defined in the ``tnsnames.ora``
-    file.
-    """
-    connect_data_parts = []
-    _check_arg("host", host)
-    if service_name is not None:
-        _check_arg("service_name", service_name)
-        connect_data_parts.append(f"(SERVICE_NAME={service_name})")
-    elif sid is not None:
-        _check_arg("sid", sid)
-        connect_data_parts.append(f"(SID={sid})")
-    if region is not None:
-        _check_arg("region", region)
-        connect_data_parts.append(f"(REGION={region})")
-    if sharding_key is not None:
-        _check_arg("sharding_key", sharding_key)
-        connect_data_parts.append(f"(SHARDING_KEY={sharding_key})")
-    if super_sharding_key is not None:
-        _check_arg("super_sharding_key", super_sharding_key)
-        connect_data_parts.append(f"(SUPER_SHARDING_KEY={super_sharding_key})")
-    connect_data = "".join(connect_data_parts)
-    return (
-        f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})"
-        f"(PORT={port}))(CONNECT_DATA={connect_data}))"
-    )
diff --git a/src/oracledb/enums.py b/src/oracledb/enums.py
deleted file mode 100644
index 64ad2122..00000000
--- a/src/oracledb/enums.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# enums.py
-#
-# Contains the enumerations of various constants used throughout the package.
-# -----------------------------------------------------------------------------
-
-import enum
-
-from . import base_impl
-
-
-class AuthMode(enum.IntFlag):
-    DEFAULT = base_impl.AUTH_MODE_DEFAULT
-    PRELIM = base_impl.AUTH_MODE_PRELIM
-    SYSASM = base_impl.AUTH_MODE_SYSASM
-    SYSBKP = base_impl.AUTH_MODE_SYSBKP
-    SYSDBA = base_impl.AUTH_MODE_SYSDBA
-    SYSDGD = base_impl.AUTH_MODE_SYSDGD
-    SYSKMT = base_impl.AUTH_MODE_SYSKMT
-    SYSOPER = base_impl.AUTH_MODE_SYSOPER
-    SYSRAC = base_impl.AUTH_MODE_SYSRAC
-
-
-class PipelineOpType(enum.IntFlag):
-    CALL_FUNC = base_impl.PIPELINE_OP_TYPE_CALL_FUNC
-    CALL_PROC = base_impl.PIPELINE_OP_TYPE_CALL_PROC
-    COMMIT = base_impl.PIPELINE_OP_TYPE_COMMIT
-    EXECUTE = base_impl.PIPELINE_OP_TYPE_EXECUTE
-    EXECUTE_MANY = base_impl.PIPELINE_OP_TYPE_EXECUTE_MANY
-    FETCH_ALL = base_impl.PIPELINE_OP_TYPE_FETCH_ALL
-    FETCH_MANY = base_impl.PIPELINE_OP_TYPE_FETCH_MANY
-    FETCH_ONE = base_impl.PIPELINE_OP_TYPE_FETCH_ONE
-
-
-class PoolGetMode(enum.IntEnum):
-    FORCEGET = base_impl.POOL_GETMODE_FORCEGET
-    NOWAIT = base_impl.POOL_GETMODE_NOWAIT
-    TIMEDWAIT = base_impl.POOL_GETMODE_TIMEDWAIT
-    WAIT = base_impl.POOL_GETMODE_WAIT
-
-
-class Purity(enum.IntEnum):
-    DEFAULT = base_impl.PURITY_DEFAULT
-    NEW = base_impl.PURITY_NEW
-    SELF = base_impl.PURITY_SELF
-
-
-class VectorFormat(enum.IntEnum):
-    BINARY = base_impl.VECTOR_FORMAT_BINARY
-    FLOAT32 = base_impl.VECTOR_FORMAT_FLOAT32
-    FLOAT64 = base_impl.VECTOR_FORMAT_FLOAT64
-    INT8 = base_impl.VECTOR_FORMAT_INT8
diff --git a/src/oracledb/errors.py b/src/oracledb/errors.py
deleted file mode 100644
index 44d406f7..00000000
--- a/src/oracledb/errors.py
+++ /dev/null
@@ -1,1019 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# errors.py
-#
-# Contains the _Error class and all of the errors that are raised explicitly by
-# the package. Oracle Database errors and ODPI-C errors (when using thick mode)
-# are only referenced here if they are transformed into package specific
-# errors.
-# -----------------------------------------------------------------------------
-
-import re
-
-from .driver_mode import is_thin_mode
-from . import exceptions
-
-
-class _Error:
-    """
-    Error class which is used for all errors that are raised by the driver.
-    """
-
-    def __init__(
-        self,
-        message: str = None,
-        context: str = None,
-        isrecoverable: bool = False,
-        iswarning: bool = False,
-        code: int = 0,
-        offset: int = 0,
-    ) -> None:
-        self.message = message
-        self.context = context
-        self.isrecoverable = isrecoverable
-        self.iswarning = iswarning
-        self.code = code
-        self.offset = offset
-        self.is_session_dead = False
-        self.full_code = ""
-        self.exc_type = exceptions.DatabaseError
-        self._make_adjustments()
-
-    def _make_adjustments(self):
-        """
-        Make adjustments to the error, if needed, and calculate the full_code
-        attribute.
-        """
-        if self.message is not None:
-            pos = self.message.find(":")
-            if pos > 0:
-                self.full_code = self.message[:pos]
-
-                # add Oracle Database Error Help Portal URL for database error
-                # messages, but only in thin mode since this is done
-                # automatically in thick mode with Oracle Client version 23 and
-                # higher
-                if (
-                    self.code != 0
-                    and (self.code < 20000 or self.code >= 21000)
-                    and is_thin_mode()
-                ):
-                    self.message = (
-                        self.message
-                        + "\n"
-                        + "Help: https://docs.oracle.com/error-help/db/ora-"
-                        + f"{self.code:05}/"
-                    )
-                elif self.full_code in ERR_TROUBLESHOOTING_AVAILABLE:
-                    self.message = (
-                        self.message
-                        + "\n"
-                        + "Help: https://python-oracledb.readthedocs.io/en/"
-                        + "latest/user_guide/troubleshooting.html#"
-                        + self.full_code.lower()
-                    )
-
-        # transform Oracle and ODPI-C specific error codes to driver errors,
-        # if applicable
-        if self.code != 0 or self.full_code.startswith("DPI-"):
-            args = {}
-            if self.code != 0:
-                driver_error_info = ERR_ORACLE_ERROR_XREF.get(self.code)
-            else:
-                error_num = int(self.full_code[4:])
-                driver_error_info = ERR_DPI_ERROR_XREF.get(error_num)
-            if driver_error_info is not None:
-                if isinstance(driver_error_info, tuple):
-                    driver_error_num, pattern = driver_error_info
-                    match = re.search(pattern, self.message)
-                    args = {} if match is None else match.groupdict()
-                else:
-                    driver_error_num = driver_error_info
-                driver_error = _get_error_text(driver_error_num, **args)
-                self.message = f"{driver_error}\n{self.message}"
-                self.full_code = f"{ERR_PREFIX}-{driver_error_num:04}"
-
-        # determine exception class to use when raising this error
-        # also determine whether error is recoverable and whether the session
-        # is deemed "dead"
-        if self.full_code.startswith("DPY-"):
-            driver_error_num = int(self.full_code[4:])
-            if driver_error_num == ERR_CONNECTION_CLOSED:
-                self.is_session_dead = self.isrecoverable = True
-            self.exc_type = ERR_EXCEPTION_TYPES[driver_error_num // 1000]
-        elif self.code != 0:
-            if self.code in ERR_RECOVERABLE_ERROR_CODES:
-                self.isrecoverable = True
-            if self.code in ERR_INTEGRITY_ERROR_CODES:
-                self.exc_type = exceptions.IntegrityError
-            elif self.code in ERR_INTERFACE_ERROR_CODES:
-                self.exc_type = exceptions.InterfaceError
-            elif self.code in ERR_OPERATIONAL_ERROR_CODES:
-                self.exc_type = exceptions.OperationalError
-
-    def __str__(self):
-        return self.message
-
-
-def _get_error_text(error_num: int, **args) -> str:
-    """
-    Return the error text for the driver specific error number.
-    """
-    message_format = ERR_MESSAGE_FORMATS.get(error_num)
-    if message_format is None:
-        message_format = "missing error {error_num}"
-        args = dict(error_num=error_num)
-        error_num = ERR_MISSING_ERROR
-    try:
-        message = message_format.format(**args)
-    except KeyError:
-        message = (
-            message_format
-            + "\nWrong arguments to message format:\n"
-            + repr(args)
-        )
-    return f"{ERR_PREFIX}-{error_num:04}: {message}"
-
-
-def _create_err(
-    error_num: int,
-    context_error_message: str = None,
-    cause: Exception = None,
-    **args,
-) -> _Error:
-    """
-    Returns a driver specific error object for the specified error number and
-    supplied arguments.
-    """
-    message = _get_error_text(error_num, **args)
-    if context_error_message is None and cause is not None:
-        context_error_message = str(cause)
-    if context_error_message is not None:
-        message = f"{message}\n{context_error_message}"
-    return _Error(message)
-
-
-def _create_warning(error_num: int, **args) -> _Error:
-    """
-    Returns a warning error object for the specified error number and supplied
-    arguments.
-    """
-    message = _get_error_text(error_num, **args)
-    return _Error(message, iswarning=True)
-
-
-def _raise_err(
-    error_num: int,
-    context_error_message: str = None,
-    cause: Exception = None,
-    **args,
-) -> None:
-    """
-    Raises a driver specific exception from the specified error number and
-    supplied arguments.
-    """
-    error = _create_err(error_num, context_error_message, cause, **args)
-    raise error.exc_type(error) from cause
-
-
-def _raise_not_supported(feature: str) -> None:
-    """
-    Raises an exception that the specified feature is not supported. This is
-    used as the default implementation of all functions for the implementation
-    objects.
-    """
-    driver_type = "thick" if is_thin_mode() else "thin"
-    _raise_err(
-        ERR_FEATURE_NOT_SUPPORTED, feature=feature, driver_type=driver_type
-    )
-
-
-# prefix used for all error messages
-ERR_PREFIX = "DPY"
-
-# error numbers that result in InterfaceError
-ERR_MISSING_ERROR = 1000
-ERR_NOT_CONNECTED = 1001
-ERR_POOL_NOT_OPEN = 1002
-ERR_NOT_A_QUERY = 1003
-ERR_NO_STATEMENT_EXECUTED = 1004
-ERR_POOL_HAS_BUSY_CONNECTIONS = 1005
-ERR_CURSOR_NOT_OPEN = 1006
-
-# error numbers that result in ProgrammingError
-ERR_MESSAGE_HAS_NO_PAYLOAD = 2000
-ERR_NO_STATEMENT = 2001
-ERR_NO_STATEMENT_PREPARED = 2002
-ERR_WRONG_EXECUTE_PARAMETERS_TYPE = 2003
-ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE = 2004
-ERR_ARGS_AND_KEYWORD_ARGS = 2005
-ERR_MIXED_POSITIONAL_AND_NAMED_BINDS = 2006
-ERR_EXPECTING_TYPE = 2007
-ERR_WRONG_OBJECT_TYPE = 2008
-ERR_WRONG_SCROLL_MODE = 2009
-ERR_MIXED_ELEMENT_TYPES = 2010
-ERR_WRONG_ARRAY_DEFINITION = 2011
-ERR_ARGS_MUST_BE_LIST_OR_TUPLE = 2012
-ERR_KEYWORD_ARGS_MUST_BE_DICT = 2013
-ERR_DUPLICATED_PARAMETER = 2014
-ERR_EXPECTING_VAR = 2015
-ERR_INCORRECT_VAR_ARRAYSIZE = 2016
-ERR_LIBRARY_ALREADY_INITIALIZED = 2017
-ERR_WALLET_FILE_MISSING = 2018
-ERR_THIN_CONNECTION_ALREADY_CREATED = 2019
-ERR_INVALID_MAKEDSN_ARG = 2020
-ERR_INIT_ORACLE_CLIENT_NOT_CALLED = 2021
-ERR_INVALID_OCI_ATTR_TYPE = 2022
-ERR_INVALID_CONN_CLASS = 2023
-ERR_INVALID_CONNECT_PARAMS = 2025
-ERR_INVALID_POOL_CLASS = 2026
-ERR_INVALID_POOL_PARAMS = 2027
-ERR_EXPECTING_LIST_FOR_ARRAY_VAR = 2028
-ERR_HTTPS_PROXY_REQUIRES_TCPS = 2029
-ERR_INVALID_LOB_OFFSET = 2030
-ERR_INVALID_ACCESS_TOKEN_PARAM = 2031
-ERR_INVALID_ACCESS_TOKEN_RETURNED = 2032
-ERR_EXPIRED_ACCESS_TOKEN = 2033
-ERR_ACCESS_TOKEN_REQUIRES_TCPS = 2034
-ERR_INVALID_OBJECT_TYPE_NAME = 2035
-ERR_OBJECT_IS_NOT_A_COLLECTION = 2036
-ERR_MISSING_TYPE_NAME_FOR_OBJECT_VAR = 2037
-ERR_INVALID_COLL_INDEX_GET = 2038
-ERR_INVALID_COLL_INDEX_SET = 2039
-ERR_EXECUTE_MODE_ONLY_FOR_DML = 2040
-ERR_MISSING_ENDING_SINGLE_QUOTE = 2041
-ERR_MISSING_ENDING_DOUBLE_QUOTE = 2042
-ERR_DBOBJECT_ATTR_MAX_SIZE_VIOLATED = 2043
-ERR_DBOBJECT_ELEMENT_MAX_SIZE_VIOLATED = 2044
-ERR_INVALID_ARRAYSIZE = 2045
-ERR_CURSOR_HAS_BEEN_CLOSED = 2046
-ERR_INVALID_LOB_AMOUNT = 2047
-ERR_DML_RETURNING_DUP_BINDS = 2048
-ERR_MISSING_ADDRESS = 2049
-ERR_INVALID_TPC_BEGIN_FLAGS = 2050
-ERR_INVALID_TPC_END_FLAGS = 2051
-ERR_MISMATCHED_TOKEN = 2052
-ERR_THICK_MODE_ENABLED = 2053
-ERR_NAMED_POOL_MISSING = 2054
-ERR_NAMED_POOL_EXISTS = 2055
-ERR_PROTOCOL_HANDLER_FAILED = 2056
-ERR_PASSWORD_TYPE_HANDLER_FAILED = 2057
-ERR_PLAINTEXT_PASSWORD_IN_CONFIG = 2058
-ERR_MISSING_CONNECT_DESCRIPTOR = 2059
-ERR_ARROW_C_API_ERROR = 2060
-ERR_PARAMS_HOOK_HANDLER_FAILED = 2061
-ERR_PAYLOAD_CANNOT_BE_ENQUEUED = 2062
-ERR_SCROLL_OUT_OF_RESULT_SET = 2063
-ERR_POOL_MAX_LESS_THAN_MIN = 2064
-ERR_ARROW_SPARSE_VECTOR_NOT_ALLOWED = 2065
-ERR_EMPTY_STATEMENT = 2066
-ERR_WRONG_DIRECT_PATH_DATA_TYPE = 2067
-ERR_SCROLL_NOT_SUPPORTED = 2068
-ERR_WRONG_REQUESTED_SCHEMA_LENGTH = 2069
-
-# error numbers that result in NotSupportedError
-ERR_TIME_NOT_SUPPORTED = 3000
-ERR_FEATURE_NOT_SUPPORTED = 3001
-ERR_PYTHON_VALUE_NOT_SUPPORTED = 3002
-ERR_PYTHON_TYPE_NOT_SUPPORTED = 3003
-ERR_UNSUPPORTED_TYPE_SET = 3004
-ERR_ARRAYS_OF_ARRAYS = 3005
-ERR_ORACLE_TYPE_NOT_SUPPORTED = 3006
-ERR_DB_TYPE_NOT_SUPPORTED = 3007
-ERR_UNSUPPORTED_INBAND_NOTIFICATION = 3008
-ERR_SELF_BIND_NOT_SUPPORTED = 3009
-ERR_SERVER_VERSION_NOT_SUPPORTED = 3010
-ERR_NCHAR_CS_NOT_SUPPORTED = 3012
-ERR_UNSUPPORTED_PYTHON_TYPE_FOR_DB_TYPE = 3013
-ERR_LOB_OF_WRONG_TYPE = 3014
-ERR_UNSUPPORTED_VERIFIER_TYPE = 3015
-ERR_NO_CRYPTOGRAPHY_PACKAGE = 3016
-ERR_ORACLE_TYPE_NAME_NOT_SUPPORTED = 3017
-ERR_TDS_TYPE_NOT_SUPPORTED = 3018
-ERR_OSON_NODE_TYPE_NOT_SUPPORTED = 3019
-ERR_OSON_FIELD_NAME_LIMITATION = 3020
-ERR_OSON_VERSION_NOT_SUPPORTED = 3021
-ERR_NAMED_TIMEZONE_NOT_SUPPORTED = 3022
-ERR_VECTOR_VERSION_NOT_SUPPORTED = 3023
-ERR_VECTOR_FORMAT_NOT_SUPPORTED = 3024
-ERR_OPERATION_NOT_SUPPORTED_ON_BFILE = 3025
-ERR_OPERATION_ONLY_SUPPORTED_ON_BFILE = 3026
-ERR_CURSOR_DIFF_CONNECTION = 3027
-ERR_UNSUPPORTED_PIPELINE_OPERATION = 3028
-ERR_INVALID_NETWORK_NAME = 3029
-ERR_ARROW_UNSUPPORTED_DATA_TYPE = 3030
-ERR_ARROW_UNSUPPORTED_VECTOR_FORMAT = 3031
-ERR_ARROW_UNSUPPORTED_DATA_FORMAT = 3032
-ERR_ARROW_UNSUPPORTED_CHILD_DATA_FORMAT = 3033
-ERR_SESSIONLESS_DIFFERING_METHODS = 3034
-ERR_SESSIONLESS_ALREADY_ACTIVE = 3035
-ERR_SESSIONLESS_INACTIVE = 3036
-ERR_UNSUPPORTED_ARROW_TYPE = 3037
-ERR_CANNOT_CONVERT_TO_ARROW_TYPE = 3038
-ERR_CANNOT_CONVERT_FROM_ARROW_TYPE = 3039
-
-# error numbers that result in DatabaseError
-ERR_TNS_ENTRY_NOT_FOUND = 4000
-ERR_NO_CREDENTIALS = 4001
-ERR_COLUMN_TRUNCATED = 4002
-ERR_ORACLE_NUMBER_NO_REPR = 4003
-ERR_INVALID_NUMBER = 4004
-ERR_POOL_NO_CONNECTION_AVAILABLE = 4005
-ERR_ARRAY_DML_ROW_COUNTS_NOT_ENABLED = 4006
-ERR_INCONSISTENT_DATATYPES = 4007
-ERR_INVALID_BIND_NAME = 4008
-ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS = 4009
-ERR_MISSING_BIND_VALUE = 4010
-ERR_CONNECTION_CLOSED = 4011
-ERR_NUMBER_WITH_INVALID_EXPONENT = 4012
-ERR_NUMBER_STRING_OF_ZERO_LENGTH = 4013
-ERR_NUMBER_STRING_TOO_LONG = 4014
-ERR_NUMBER_WITH_EMPTY_EXPONENT = 4015
-ERR_CONTENT_INVALID_AFTER_NUMBER = 4016
-ERR_INVALID_CONNECT_DESCRIPTOR = 4017
-ERR_CANNOT_PARSE_CONNECT_STRING = 4018
-ERR_INVALID_REDIRECT_DATA = 4019
-ERR_INVALID_PROTOCOL = 4021
-ERR_INVALID_ENUM_VALUE = 4022
-ERR_CALL_TIMEOUT_EXCEEDED = 4024
-ERR_INVALID_REF_CURSOR = 4025
-ERR_MISSING_FILE = 4026
-ERR_NO_CONFIG_DIR = 4027
-ERR_INVALID_SERVER_TYPE = 4028
-ERR_TOO_MANY_BATCH_ERRORS = 4029
-ERR_IFILE_CYCLE_DETECTED = 4030
-ERR_INVALID_VECTOR = 4031
-ERR_INVALID_SSL_VERSION = 4032
-ERR_EXCEEDED_IDLE_TIME = 4033
-ERR_INVALID_PASSWORD_TYPE = 4034
-ERR_INVALID_SERVER_RESPONSE = 4035
-ERR_CANNOT_CONVERT_TO_ARROW_INTEGER = 4036
-ERR_CANNOT_CONVERT_TO_ARROW_DOUBLE = 4037
-ERR_INVALID_INTEGER = 4038
-ERR_CANNOT_CONVERT_TO_ARROW_FLOAT = 4039
-ERR_ARROW_FIXED_SIZE_BINARY_VIOLATED = 4040
-ERR_DPL_TOO_MUCH_DATA = 4041
-
-# error numbers that result in InternalError
-ERR_MESSAGE_TYPE_UNKNOWN = 5000
-ERR_BUFFER_LENGTH_INSUFFICIENT = 5001
-ERR_INTEGER_TOO_LARGE = 5002
-ERR_UNEXPECTED_NEGATIVE_INTEGER = 5003
-ERR_UNEXPECTED_DATA = 5004
-ERR_UNEXPECTED_REFUSE = 5005
-ERR_UNEXPECTED_END_OF_DATA = 5006
-ERR_UNEXPECTED_XML_TYPE = 5007
-ERR_UNKNOWN_SERVER_PIGGYBACK = 5009
-ERR_UNKNOWN_TRANSACTION_STATE = 5010
-ERR_UNEXPECTED_PIPELINE_FAILURE = 5011
-ERR_NOT_IMPLEMENTED = 5012
-ERR_INTERNAL_CREATION_REQUIRED = 5013
-ERR_UNKNOWN_TRANSACTION_SYNC_VERSION = 5014
-
-# error numbers that result in OperationalError
-ERR_LISTENER_REFUSED_CONNECTION = 6000
-ERR_INVALID_SERVICE_NAME = 6001
-ERR_INVALID_SERVER_CERT_DN = 6002
-ERR_INVALID_SID = 6003
-ERR_PROXY_FAILURE = 6004
-ERR_CONNECTION_FAILED = 6005
-ERR_INVALID_SERVER_NAME = 6006
-
-# error numbers that result in Warning
-WRN_COMPILATION_ERROR = 7000
-
-# error numbers that result in DataError
-ERR_VALUE_TOO_LARGE = 8000
-ERR_NULLS_NOT_ALLOWED = 8001
-ERR_ARROW_DATA_STRUCTURE_OVERFLOW = 8002
-
-# Oracle error number cross reference
-ERR_ORACLE_ERROR_XREF = {
-    22: ERR_CONNECTION_CLOSED,
-    28: ERR_CONNECTION_CLOSED,
-    31: ERR_CONNECTION_CLOSED,
-    45: ERR_CONNECTION_CLOSED,
-    378: ERR_CONNECTION_CLOSED,
-    600: ERR_CONNECTION_CLOSED,
-    602: ERR_CONNECTION_CLOSED,
-    603: ERR_CONNECTION_CLOSED,
-    609: ERR_CONNECTION_CLOSED,
-    1005: ERR_NO_CREDENTIALS,
-    1012: ERR_CONNECTION_CLOSED,
-    1041: ERR_CONNECTION_CLOSED,
-    1043: ERR_CONNECTION_CLOSED,
-    1089: ERR_CONNECTION_CLOSED,
-    1092: ERR_CONNECTION_CLOSED,
-    1740: ERR_MISSING_ENDING_DOUBLE_QUOTE,
-    1756: ERR_MISSING_ENDING_SINGLE_QUOTE,
-    2396: ERR_CONNECTION_CLOSED,
-    3113: ERR_CONNECTION_CLOSED,
-    3114: ERR_CONNECTION_CLOSED,
-    3122: ERR_CONNECTION_CLOSED,
-    3135: ERR_CONNECTION_CLOSED,
-    12153: ERR_CONNECTION_CLOSED,
-    12537: ERR_CONNECTION_CLOSED,
-    12547: ERR_CONNECTION_CLOSED,
-    12570: ERR_CONNECTION_CLOSED,
-    12583: ERR_CONNECTION_CLOSED,
-    22165: (
-        ERR_INVALID_COLL_INDEX_SET,
-        r"index \[(?P<index>\d+)\] must be in the range of "
-        r"\[(?P<min_index>\d+)\] to \[(?P<max_index>\d+)\]",
-    ),
-    22303: (ERR_INVALID_OBJECT_TYPE_NAME, r'type "(?P<name>[^"]*"."[^"]*)"'),
-    24422: ERR_POOL_HAS_BUSY_CONNECTIONS,
-    24349: ERR_ARRAY_DML_ROW_COUNTS_NOT_ENABLED,
-    24457: ERR_POOL_NO_CONNECTION_AVAILABLE,
-    24459: ERR_POOL_NO_CONNECTION_AVAILABLE,
-    24496: ERR_POOL_NO_CONNECTION_AVAILABLE,
-    24338: ERR_INVALID_REF_CURSOR,
-    24344: WRN_COMPILATION_ERROR,
-    26202: ERR_SESSIONLESS_INACTIVE,
-    26211: ERR_SESSIONLESS_DIFFERING_METHODS,
-    26216: ERR_SESSIONLESS_ALREADY_ACTIVE,
-    27146: ERR_CONNECTION_CLOSED,
-    28511: ERR_CONNECTION_CLOSED,
-    38902: ERR_TOO_MANY_BATCH_ERRORS,
-    56600: ERR_CONNECTION_CLOSED,
-}
-
-# ODPI-C error number cross reference
-ERR_DPI_ERROR_XREF = {
-    1010: ERR_NOT_CONNECTED,
-    1024: (ERR_INVALID_COLL_INDEX_GET, r"at index (?P<index>\d+) does"),
-    1027: ERR_SCROLL_OUT_OF_RESULT_SET,
-    1043: ERR_INVALID_NUMBER,
-    1044: ERR_ORACLE_NUMBER_NO_REPR,
-    1063: ERR_EXECUTE_MODE_ONLY_FOR_DML,
-    1067: (ERR_CALL_TIMEOUT_EXCEEDED, r"call timeout of (?P<timeout>\d+) ms"),
-    1080: ERR_CONNECTION_CLOSED,
-}
-
-# Oracle error codes that result in IntegrityError exceptions
-ERR_INTEGRITY_ERROR_CODES = [
-    1,  # unique constraint violated
-    1400,  # cannot insert NULL
-    1438,  # value larger than specified precision
-    2290,  # check constraint violated
-    2291,  # integrity constraint violated - parent key not found
-    2292,  # integrity constraint violated - child record found
-    21525,  # attribute or collection element violated its constraints
-    40479,  # internal JSON serializer error
-]
-
-# Oracle error codes that result in InterfaceError exceptions
-ERR_INTERFACE_ERROR_CODES = [
-    24422,  # error occurred while trying to destroy the Session Pool
-]
-
-# Oracle error codes that result in OperationalError exceptions
-ERR_OPERATIONAL_ERROR_CODES = [
-    22,  # invalid session ID; access denied
-    378,  # buffer pools cannot be created as specified
-    600,  # internal error code
-    602,  # internal programming exception
-    603,  # ORACLE server session terminated by fatal error
-    604,  # error occurred at recursive SQL level
-    609,  # could not attach to incoming connection
-    1012,  # not logged on
-    1013,  # user requested cancel of current operation
-    1033,  # ORACLE initialization or shutdown in progress
-    1034,  # ORACLE not available
-    1041,  # internal error. hostdef extension doesn't exist
-    1043,  # user side memory corruption
-    1089,  # immediate shutdown or close in progress
-    1090,  # shutdown in progress - connection is not permitted
-    1092,  # ORACLE instance terminated. Disconnection forced
-    3111,  # break received on communication channel
-    3113,  # end-of-file on communication channel
-    3114,  # not connected to ORACLE
-    3122,  # attempt to close ORACLE-side window on user side
-    3135,  # connection lost contact
-    12153,  # TNS:not connected
-    12203,  # TNS:unable to connect to destination
-    12500,  # TNS:listener failed to start a dedicated server process
-    12571,  # TNS:packet writer failure
-    27146,  # post/wait initialization failed
-    28511,  # lost RPC connection to heterogeneous remote agent
-]
-
-# Oracle error codes that are deemed recoverable
-# NOTE: this does not include the errors that are mapped to
-# ERR_CONNECTION_CLOSED since those are all deemed recoverable
-ERR_RECOVERABLE_ERROR_CODES = [
-    376,  # file %s cannot be read at this time
-    1033,  # ORACLE initialization or shutdown in progress
-    1034,  # the Oracle instance is not available for use
-    1090,  # shutdown in progress
-    1115,  # IO error reading block from file %s (block # %s)
-    12514,  # Service %s is not registered with the listener
-    12571,  # TNS:packet writer failure
-    12757,  # instance does not currently know of requested service
-    16456,  # missing or invalid value
-]
-
-# driver error message exception types (multiples of 1000)
-ERR_EXCEPTION_TYPES = {
-    1: exceptions.InterfaceError,
-    2: exceptions.ProgrammingError,
-    3: exceptions.NotSupportedError,
-    4: exceptions.DatabaseError,
-    5: exceptions.InternalError,
-    6: exceptions.OperationalError,
-    7: exceptions.Warning,
-    8: exceptions.DataError,
-}
-
-# error messages that have a troubleshooting section available
-ERR_TROUBLESHOOTING_AVAILABLE = set(
-    [
-        "DPI-1047",  # Oracle Client library cannot be loaded
-        "DPI-1072",  # Oracle Client library version is unsupported
-        "DPY-3010",  # connections to Oracle Database version not supported
-        "DPY-3015",  # password verifier type is not supported
-        "DPY-4011",  # the database or network closed the connection
-    ]
-)
-
-# error message formats
-ERR_MESSAGE_FORMATS = {
-    ERR_ACCESS_TOKEN_REQUIRES_TCPS: (
-        "access_token requires use of the tcps protocol"
-    ),
-    ERR_ARGS_AND_KEYWORD_ARGS: (
-        "expecting positional arguments or keyword arguments, not both"
-    ),
-    ERR_ARGS_MUST_BE_LIST_OR_TUPLE: "arguments must be a list or tuple",
-    ERR_ARRAY_DML_ROW_COUNTS_NOT_ENABLED: (
-        "array DML row counts mode is not enabled"
-    ),
-    ERR_ARRAYS_OF_ARRAYS: "arrays of arrays are not supported",
-    ERR_ARROW_C_API_ERROR: (
-        "Apache Arrow C Data Interface operation failed with error code {code}"
-    ),
-    ERR_ARROW_DATA_STRUCTURE_OVERFLOW: (
-        "Apache Arrow C Data structure overflow detected. A larger structure "
-        "is needed."
-    ),
-    ERR_ARROW_FIXED_SIZE_BINARY_VIOLATED: (
-        "value of length {actual_len} does not match the Apache Arrow fixed "
-        "size binary length of {fixed_size_len}"
-    ),
-    ERR_ARROW_SPARSE_VECTOR_NOT_ALLOWED: (
-        "Apache Arrow format does not support sparse vectors with flexible "
-        "dimensions"
-    ),
-    ERR_ARROW_UNSUPPORTED_CHILD_DATA_FORMAT: (
-        "conversion from Apache Arrow list with child format "
-        '"{schema_format}" to Oracle Database vector is not supported'
-    ),
-    ERR_ARROW_UNSUPPORTED_DATA_FORMAT: (
-        'conversion from Apache Arrow format "{schema_format}" to Oracle '
-        "Database is not supported"
-    ),
-    ERR_ARROW_UNSUPPORTED_DATA_TYPE: (
-        "conversion from Oracle Database type {db_type_name} to Apache "
-        "Arrow format is not supported"
-    ),
-    ERR_ARROW_UNSUPPORTED_VECTOR_FORMAT: (
-        "flexible vector formats are not supported. Only fixed 'FLOAT32', "
-        "'FLOAT64', 'INT8' or 'BINARY' formats are supported"
-    ),
-    ERR_BUFFER_LENGTH_INSUFFICIENT: (
-        "internal error: buffer of length {actual_buffer_len} "
-        "insufficient to hold {required_buffer_len} bytes"
-    ),
-    ERR_CALL_TIMEOUT_EXCEEDED: "call timeout of {timeout} ms exceeded",
-    ERR_CANNOT_CONVERT_FROM_ARROW_TYPE: (
-        'Apache Arrow type "{arrow_type}" cannot be converted to database '
-        'type "{db_type}"'
-    ),
-    ERR_CANNOT_CONVERT_TO_ARROW_DOUBLE: (
-        "{value} cannot be converted to an Apache Arrow double"
-    ),
-    ERR_CANNOT_CONVERT_TO_ARROW_FLOAT: (
-        "{value} cannot be converted to an Apache Arrow float"
-    ),
-    ERR_CANNOT_CONVERT_TO_ARROW_INTEGER: (
-        "{value} cannot be converted to an Apache Arrow integer"
-    ),
-    ERR_CANNOT_CONVERT_TO_ARROW_TYPE: (
-        'database type "{db_type}" cannot be converted to Apache Arrow type '
-        '"{arrow_type}"'
-    ),
-    ERR_CANNOT_PARSE_CONNECT_STRING: 'cannot parse connect string "{data}"',
-    ERR_COLUMN_TRUNCATED: (
-        "column truncated to {col_value_len} {unit}. "
-        "Untruncated was {actual_len}"
-    ),
-    ERR_CONNECTION_CLOSED: "the database or network closed the connection",
-    ERR_CONNECTION_FAILED: (
-        "cannot connect to database (CONNECTION_ID={connection_id})."
-    ),
-    ERR_CONTENT_INVALID_AFTER_NUMBER: "invalid number (content after number)",
-    ERR_CURSOR_DIFF_CONNECTION: (
-        "binding a cursor from a different connection is not supported"
-    ),
-    ERR_CURSOR_HAS_BEEN_CLOSED: "cursor has been closed by the database",
-    ERR_CURSOR_NOT_OPEN: "cursor is not open",
-    ERR_DBOBJECT_ATTR_MAX_SIZE_VIOLATED: (
-        "attribute {attr_name} of type {type_name} exceeds its maximum size "
-        "(actual: {actual_size}, maximum: {max_size})"
-    ),
-    ERR_DBOBJECT_ELEMENT_MAX_SIZE_VIOLATED: (
-        "element {index} of type {type_name} exceeds its maximum size "
-        "(actual: {actual_size}, maximum: {max_size})"
-    ),
-    ERR_DB_TYPE_NOT_SUPPORTED: 'database type "{name}" is not supported',
-    ERR_DML_RETURNING_DUP_BINDS: (
-        'the bind variable placeholder ":{name}" cannot be used both before '
-        "and after the RETURNING clause in a DML RETURNING statement"
-    ),
-    ERR_DPL_TOO_MUCH_DATA: (
-        "the maximum size of a Direct Path load has been exceeded"
-    ),
-    ERR_DUPLICATED_PARAMETER: (
-        '"{deprecated_name}" and "{new_name}" cannot be specified together'
-    ),
-    ERR_EMPTY_STATEMENT: ("an empty statement cannot be executed"),
-    ERR_EXCEEDED_IDLE_TIME: (
-        "the database closed the connection because the connection's idle "
-        "time has been exceeded"
-    ),
-    ERR_EXECUTE_MODE_ONLY_FOR_DML: (
-        'parameters "batcherrors" and "arraydmlrowcounts" may only be '
-        "true when used with insert, update, delete and merge statements"
-    ),
-    ERR_EXPECTING_LIST_FOR_ARRAY_VAR: (
-        "expecting list when setting array variables"
-    ),
-    ERR_EXPECTING_TYPE: "expected a type",
-    ERR_EXPECTING_VAR: (
-        "type handler should return None or the value returned by a call "
-        "to cursor.var()"
-    ),
-    ERR_EXPIRED_ACCESS_TOKEN: "access token has expired",
-    ERR_FEATURE_NOT_SUPPORTED: (
-        "{feature} is only supported in python-oracledb {driver_type} mode"
-    ),
-    ERR_HTTPS_PROXY_REQUIRES_TCPS: (
-        "https_proxy requires use of the tcps protocol"
-    ),
-    ERR_IFILE_CYCLE_DETECTED: (
-        "file '{including_file_name}' includes file '{included_file_name}', "
-        "which forms a cycle"
-    ),
-    ERR_INCONSISTENT_DATATYPES: (
-        "cannot convert from data type {input_type} to {output_type}"
-    ),
-    ERR_INCORRECT_VAR_ARRAYSIZE: (
-        "variable array size of {var_arraysize} is "
-        "too small (should be at least {required_arraysize})"
-    ),
-    ERR_INIT_ORACLE_CLIENT_NOT_CALLED: (
-        "init_oracle_client() must be called first"
-    ),
-    ERR_INTEGER_TOO_LARGE: (
-        "internal error: read integer of length {length} when expecting "
-        "integer of no more than length {max_length}"
-    ),
-    ERR_INTERNAL_CREATION_REQUIRED: "object may not be created directly",
-    ERR_INVALID_ACCESS_TOKEN_PARAM: (
-        "invalid access token: value must be a string (for OAuth), a "
-        "2-tuple containing the token and private key strings (for IAM), "
-        "or a callable that returns a string or 2-tuple"
-    ),
-    ERR_INVALID_ACCESS_TOKEN_RETURNED: (
-        "invalid access token returned from callable: value must be a "
-        "string (for OAuth) or a 2-tuple containing the token and private "
-        "key strings (for IAM)"
-    ),
-    ERR_INVALID_ARRAYSIZE: "arraysize must be an integer greater than zero",
-    ERR_INVALID_BIND_NAME: (
-        'no bind placeholder named ":{name}" was found in the SQL text'
-    ),
-    ERR_INVALID_CONN_CLASS: "invalid connection class",
-    ERR_INVALID_CONNECT_DESCRIPTOR: 'invalid connect descriptor "{data}"',
-    ERR_INVALID_CONNECT_PARAMS: "invalid connection params",
-    ERR_INVALID_COLL_INDEX_GET: "element at index {index} does not exist",
-    ERR_INVALID_COLL_INDEX_SET: (
-        "given index {index} must be in the range of {min_index} to "
-        "{max_index}"
-    ),
-    ERR_INVALID_ENUM_VALUE: "invalid value for enumeration {name}: {value}",
-    ERR_INVALID_INTEGER: (
-        "integer {value} cannot be represented as Apache Arrow type "
-        "{arrow_type}"
-    ),
-    ERR_INVALID_LOB_AMOUNT: "LOB amount must be greater than zero",
-    ERR_INVALID_LOB_OFFSET: "LOB offset must be greater than zero",
-    ERR_INVALID_MAKEDSN_ARG: '"{name}" argument contains invalid values',
-    ERR_INVALID_NETWORK_NAME: (
-        '"{name}" includes characters that are not allowed'
-    ),
-    ERR_INVALID_NUMBER: "invalid number",
-    ERR_INVALID_OBJECT_TYPE_NAME: 'invalid object type name: "{name}"',
-    ERR_INVALID_OCI_ATTR_TYPE: "invalid OCI attribute type {attr_type}",
-    ERR_INVALID_PASSWORD_TYPE: 'invalid password type "{password_type}"',
-    ERR_INVALID_POOL_CLASS: "invalid connection pool class",
-    ERR_INVALID_POOL_PARAMS: "invalid pool params",
-    ERR_INVALID_PROTOCOL: 'invalid protocol "{protocol}"',
-    ERR_INVALID_REDIRECT_DATA: "invalid redirect data {data}",
-    ERR_INVALID_REF_CURSOR: "invalid REF CURSOR: never opened in PL/SQL",
-    ERR_INVALID_SERVER_CERT_DN: (
-        "The distinguished name (DN) on the server certificate does not "
-        "match the expected value: {expected_dn}"
-    ),
-    ERR_INVALID_SERVER_NAME: (
-        "The name on the server certificate does not match the expected "
-        'value: "{expected_name}"'
-    ),
-    ERR_INVALID_SERVER_RESPONSE: (
-        "invalid server response to connection request"
-    ),
-    ERR_INVALID_SERVER_TYPE: "invalid server_type: {server_type}",
-    ERR_INVALID_SERVICE_NAME: (
-        'Service "{service_name}" is not registered with the listener at '
-        'host "{host}" port {port}. (Similar to ORA-12514)'
-    ),
-    ERR_INVALID_SID: (
-        'SID "{sid}" is not registered with the listener at host "{host}" '
-        "port {port}. (Similar to ORA-12505)"
-    ),
-    ERR_INVALID_SSL_VERSION: 'invalid value for ssl_version: "{ssl_version}"',
-    ERR_INVALID_TPC_BEGIN_FLAGS: "invalid flags for tpc_begin()",
-    ERR_INVALID_TPC_END_FLAGS: "invalid flags for tpc_end()",
-    ERR_INVALID_VECTOR: "vector cannot contain zero dimensions",
-    ERR_KEYWORD_ARGS_MUST_BE_DICT: (
-        '"keyword_parameters" argument must be a dict'
-    ),
-    ERR_LIBRARY_ALREADY_INITIALIZED: (
-        "init_oracle_client() was already called with different arguments"
-    ),
-    ERR_LISTENER_REFUSED_CONNECTION: (
-        "Listener refused connection. (Similar to ORA-{error_code})"
-    ),
-    ERR_LOB_OF_WRONG_TYPE: (
-        "LOB is of type {actual_type_name} but must be of type "
-        "{expected_type_name}"
-    ),
-    ERR_MESSAGE_HAS_NO_PAYLOAD: "message has no payload",
-    ERR_MESSAGE_TYPE_UNKNOWN: (
-        "internal error: unknown protocol message type {message_type} "
-        "at position {position}"
-    ),
-    ERR_MISMATCHED_TOKEN: (
-        "internal error: pipeline token number {token_num} does not match "
-        "expected token number {expected_token_num}"
-    ),
-    ERR_MISSING_ADDRESS: (
-        "no addresses are defined in connect descriptor: {connect_string}"
-    ),
-    ERR_MISSING_BIND_VALUE: (
-        'a bind variable replacement value for placeholder ":{name}" was '
-        "not provided"
-    ),
-    ERR_MISSING_CONNECT_DESCRIPTOR: (
-        '"connect_descriptor" key missing from configuration'
-    ),
-    ERR_MISSING_ENDING_DOUBLE_QUOTE: 'missing ending quote (")',
-    ERR_MISSING_ENDING_SINGLE_QUOTE: "missing ending quote (')",
-    ERR_MISSING_FILE: "file '{file_name}' is missing or unreadable",
-    ERR_MISSING_TYPE_NAME_FOR_OBJECT_VAR: (
-        "no object type specified for object variable"
-    ),
-    ERR_MIXED_ELEMENT_TYPES: (
-        "element {element} is not the same data type as previous elements"
-    ),
-    ERR_MIXED_POSITIONAL_AND_NAMED_BINDS: (
-        "positional and named binds cannot be intermixed"
-    ),
-    ERR_NAMED_POOL_EXISTS: (
-        'connection pool with alias "{alias}" already exists'
-    ),
-    ERR_NAMED_POOL_MISSING: (
-        'connection pool with alias "{alias}" does not exist'
-    ),
-    ERR_NAMED_TIMEZONE_NOT_SUPPORTED: (
-        "named time zones are not supported in thin mode"
-    ),
-    ERR_NCHAR_CS_NOT_SUPPORTED: (
-        "national character set id {charset_id} is not supported by "
-        "python-oracledb in thin mode"
-    ),
-    ERR_NO_CONFIG_DIR: "no configuration directory specified",
-    ERR_NO_CREDENTIALS: "no credentials specified",
-    ERR_NO_CRYPTOGRAPHY_PACKAGE: (
-        "python-oracledb thin mode cannot be used because the "
-        "cryptography package cannot be imported"
-    ),
-    ERR_NO_STATEMENT: "no statement specified and no prior statement prepared",
-    ERR_NO_STATEMENT_EXECUTED: "no statement executed",
-    ERR_NO_STATEMENT_PREPARED: "statement must be prepared first",
-    ERR_NOT_A_QUERY: "the executed statement does not return rows",
-    ERR_NOT_CONNECTED: "not connected to database",
-    ERR_NOT_IMPLEMENTED: "not implemented",
-    ERR_NULLS_NOT_ALLOWED: (
-        'value for column "{column_name}" may not be null on row {row_num}'
-    ),
-    ERR_NUMBER_STRING_OF_ZERO_LENGTH: "invalid number: zero length string",
-    ERR_NUMBER_STRING_TOO_LONG: "invalid number: string too long",
-    ERR_NUMBER_WITH_EMPTY_EXPONENT: "invalid number: empty exponent",
-    ERR_NUMBER_WITH_INVALID_EXPONENT: "invalid number: invalid exponent",
-    ERR_OBJECT_IS_NOT_A_COLLECTION: "object {name} is not a collection",
-    ERR_OPERATION_NOT_SUPPORTED_ON_BFILE: (
-        "operation is not supported on BFILE LOBs"
-    ),
-    ERR_OPERATION_ONLY_SUPPORTED_ON_BFILE: (
-        "operation is only supported on BFILE LOBs"
-    ),
-    ERR_ORACLE_NUMBER_NO_REPR: (
-        "value cannot be represented as an Oracle number"
-    ),
-    ERR_ORACLE_TYPE_NAME_NOT_SUPPORTED: (
-        'Oracle data type name "{name}" is not supported'
-    ),
-    ERR_ORACLE_TYPE_NOT_SUPPORTED: "Oracle data type {num} is not supported",
-    ERR_OSON_FIELD_NAME_LIMITATION: (
-        "OSON field names may not exceed {max_fname_size} UTF-8 encoded bytes"
-    ),
-    ERR_OSON_NODE_TYPE_NOT_SUPPORTED: (
-        "OSON node type 0x{node_type:x} is not supported"
-    ),
-    ERR_OSON_VERSION_NOT_SUPPORTED: "OSON version {version} is not supported",
-    ERR_PARAMS_HOOK_HANDLER_FAILED: (
-        "registered handler for params hook failed"
-    ),
-    ERR_PASSWORD_TYPE_HANDLER_FAILED: (
-        'registered handler for password type "{password_type}" failed'
-    ),
-    ERR_PAYLOAD_CANNOT_BE_ENQUEUED: (
-        "payload cannot be enqueued since it does not match the payload type "
-        "supported by the queue"
-    ),
-    ERR_PLAINTEXT_PASSWORD_IN_CONFIG: (
-        "password in configuration must specify a type"
-    ),
-    ERR_POOL_HAS_BUSY_CONNECTIONS: (
-        "connection pool cannot be closed because connections are busy"
-    ),
-    ERR_POOL_MAX_LESS_THAN_MIN: (
-        "parameter 'max' should be greater than or equal to parameter 'min'"
-    ),
-    ERR_POOL_NO_CONNECTION_AVAILABLE: (
-        "timed out waiting for the connection pool to return a connection"
-    ),
-    ERR_POOL_NOT_OPEN: "connection pool is not open",
-    ERR_PROTOCOL_HANDLER_FAILED: (
-        'registered handler for protocol "{protocol}" failed for arg "{arg}"'
-    ),
-    ERR_PROXY_FAILURE: "network proxy failed: response was {response}",
-    ERR_PYTHON_TYPE_NOT_SUPPORTED: "Python type {typ} is not supported",
-    ERR_PYTHON_VALUE_NOT_SUPPORTED: (
-        'Python value of type "{type_name}" is not supported'
-    ),
-    ERR_SCROLL_NOT_SUPPORTED: (
-        "scroll operation is not supported on a non-scrollable cursor"
-    ),
-    ERR_SCROLL_OUT_OF_RESULT_SET: (
-        "scroll operation would go out of the result set"
-    ),
-    ERR_SELF_BIND_NOT_SUPPORTED: "binding to self is not supported",
-    ERR_SERVER_VERSION_NOT_SUPPORTED: (
-        "connections to this database server version are not supported "
-        "by python-oracledb in thin mode"
-    ),
-    ERR_SESSIONLESS_ALREADY_ACTIVE: (
-        "suspend, commit, or rollback the current active sessionless "
-        "transaction before beginning or resuming another one"
-    ),
-    ERR_SESSIONLESS_DIFFERING_METHODS: (
-        "suspending or resuming a Sessionless Transaction can be done with "
-        "DBMS_TRANSACTION or with python-oracledb, but not both"
-    ),
-    ERR_SESSIONLESS_INACTIVE: ("no Sessionless Transaction is active"),
-    ERR_TDS_TYPE_NOT_SUPPORTED: "Oracle TDS data type {num} is not supported",
-    ERR_THICK_MODE_ENABLED: (
-        "python-oracledb thin mode cannot be used because thick mode has "
-        "already been enabled"
-    ),
-    ERR_THIN_CONNECTION_ALREADY_CREATED: (
-        "python-oracledb thick mode cannot be used because thin mode has "
-        "already been enabled or a thin mode connection has already been "
-        "created"
-    ),
-    ERR_TIME_NOT_SUPPORTED: (
-        "Oracle Database does not support time only variables"
-    ),
-    ERR_TNS_ENTRY_NOT_FOUND: 'unable to find "{name}" in {file_name}',
-    ERR_TOO_MANY_BATCH_ERRORS: (
-        "the number of batch errors from executemany() exceeds 65535"
-    ),
-    ERR_UNEXPECTED_DATA: "unexpected data received: {data}",
-    ERR_UNEXPECTED_END_OF_DATA: (
-        "unexpected end of data: want {num_bytes_wanted} bytes but "
-        "only {num_bytes_available} bytes are available"
-    ),
-    ERR_UNEXPECTED_NEGATIVE_INTEGER: (
-        "internal error: read a negative integer when expecting a "
-        "positive integer"
-    ),
-    ERR_UNEXPECTED_REFUSE: (
-        "the listener refused the connection but an unexpected error "
-        "format was returned"
-    ),
-    ERR_UNEXPECTED_PIPELINE_FAILURE: "unexpected pipeline failure",
-    ERR_UNEXPECTED_XML_TYPE: "unexpected XMLType with flag {flag}",
-    ERR_UNKNOWN_SERVER_PIGGYBACK: (
-        "internal error: unknown server side piggyback opcode {opcode}"
-    ),
-    ERR_UNKNOWN_TRANSACTION_STATE: (
-        "internal error: unknown transaction state {state}"
-    ),
-    ERR_UNKNOWN_TRANSACTION_SYNC_VERSION: (
-        "internal error: unknown transaction sync version {version}"
-    ),
-    ERR_UNSUPPORTED_ARROW_TYPE: 'unsupported Apache Arrow type "{arrow_type}"',
-    ERR_UNSUPPORTED_INBAND_NOTIFICATION: (
-        "unsupported in-band notification with error number {err_num}"
-    ),
-    ERR_UNSUPPORTED_PIPELINE_OPERATION: (
-        "unsupported pipeline operation type: {op_type}"
-    ),
-    ERR_UNSUPPORTED_PYTHON_TYPE_FOR_DB_TYPE: (
-        "unsupported Python type {py_type_name} for database type "
-        "{db_type_name}"
-    ),
-    ERR_UNSUPPORTED_TYPE_SET: "type {db_type_name} does not support being set",
-    ERR_UNSUPPORTED_VERIFIER_TYPE: (
-        "password verifier type 0x{verifier_type:x} is not supported by "
-        "python-oracledb in thin mode"
-    ),
-    ERR_VALUE_TOO_LARGE: (
-        "value of size {actual_size} exeeds maximum allowed size of "
-        '{max_size} for column "{column_name}" of row {row_num}'
-    ),
-    ERR_VECTOR_FORMAT_NOT_SUPPORTED: (
-        "VECTOR type {vector_format} is not supported"
-    ),
-    ERR_VECTOR_VERSION_NOT_SUPPORTED: (
-        "VECTOR version {version} is not supported"
-    ),
-    ERR_WALLET_FILE_MISSING: "wallet file {name} was not found",
-    ERR_WRONG_ARRAY_DEFINITION: (
-        "expecting a list of two elements [type, numelems]"
-    ),
-    ERR_WRONG_DIRECT_PATH_DATA_TYPE: (
-        "expecting a list or an object implementing the Apache Arrow "
-        "PyCapsule interface __arrow_c_stream__()"
-    ),
-    ERR_WRONG_EXECUTE_PARAMETERS_TYPE: (
-        "expecting a dictionary, list or tuple, or keyword args"
-    ),
-    ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE: (
-        '"parameters" argument should be a list of sequences or '
-        "dictionaries, or an integer specifying the number of "
-        "times to execute the statement, or an object implementing the Apache "
-        "Arrow PyCapsule interface __arrow_c_stream__()"
-    ),
-    ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS: (
-        "{expected_num} positional bind values are required but "
-        "{actual_num} were provided"
-    ),
-    ERR_WRONG_OBJECT_TYPE: (
-        'found object of type "{actual_schema}.{actual_name}" when '
-        'expecting object of type "{expected_schema}.{expected_name}"'
-    ),
-    ERR_WRONG_REQUESTED_SCHEMA_LENGTH: (
-        "requested schema has {num_schema_columns} columns defined but "
-        "{num_fetched_columns} are being fetched"
-    ),
-    ERR_WRONG_SCROLL_MODE: (
-        "scroll mode must be relative, absolute, first or last"
-    ),
-    WRN_COMPILATION_ERROR: "creation succeeded with compilation errors",
-}
diff --git a/src/oracledb/exceptions.py b/src/oracledb/exceptions.py
deleted file mode 100644
index b262cac2..00000000
--- a/src/oracledb/exceptions.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# exceptions.py
-#
-# Contains the exception classes mandated by the Python Database API.
-# -----------------------------------------------------------------------------
-
-
-class Warning(Exception):
-    """
-    Exception raised for warnings.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 9000 - 9999.
-    """
-
-
-class Error(Exception):
-    """
-    Exception that is the base class of all other exceptions defined by
-    python-oracledb.
-    """
-
-
-class DatabaseError(Error):
-    """
-    Exception raised for errors that are related to the database. It is a
-    subclass of Error.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 4000 - 4999.
-    """
-
-
-class DataError(DatabaseError):
-    """
-    Exception raised for errors that are due to problems with the processed
-    data. It is a subclass of DatabaseError.
-
-    Exception messages of this class are generated by the database and will
-    have a prefix such as ORA.
-    """
-
-
-class IntegrityError(DatabaseError):
-    """
-    Exception raised when the relational integrity of the database is affected.
-    It is a subclass of DatabaseError.
-
-    Exception messages of this class are generated by the database and will
-    have a prefix such as ORA.
-    """
-
-
-class InterfaceError(Error):
-    """
-    Exception raised for errors that are related to the database interface
-    rather than the database itself. It is a subclass of Error.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 1000 - 1999.
-    """
-
-
-class InternalError(DatabaseError):
-    """
-    Exception raised when the database encounters an internal error. It is a
-    subclass of DatabaseError.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 5000 - 5999.
-    """
-
-
-class NotSupportedError(DatabaseError):
-    """
-    Exception raised when a method or database API was used which is not
-    supported by the database. It is a subclass of DatabaseError.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 3000 - 3999.
-    """
-
-
-class OperationalError(DatabaseError):
-    """
-    Exception raised for errors that are related to the operation of the
-    database but are not necessarily under the control of the programmer. It is
-    a subclass of DatabaseError.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 6000 - 6999.
-    """
-
-
-class ProgrammingError(DatabaseError):
-    """
-    Exception raised for programming errors. It is a subclass of DatabaseError.
-
-    Exception messages of this class will have the prefix DPY and an error
-    number in the range 2000 - 2999.
-    """
diff --git a/src/oracledb/fetch_info.py b/src/oracledb/fetch_info.py
deleted file mode 100644
index a6900272..00000000
--- a/src/oracledb/fetch_info.py
+++ /dev/null
@@ -1,310 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# fetch_info.py
-#
-# Contains the FetchInfo class which stores metadata about columns that are
-# being fetched.
-# -----------------------------------------------------------------------------
-
-from typing import Union
-
-import oracledb
-
-from . import constants
-from .base import BaseMetaClass
-from .base_impl import (
-    DbType,
-    DB_TYPE_DATE,
-    DB_TYPE_TIMESTAMP,
-    DB_TYPE_TIMESTAMP_LTZ,
-    DB_TYPE_TIMESTAMP_TZ,
-    DB_TYPE_BINARY_FLOAT,
-    DB_TYPE_BINARY_DOUBLE,
-    DB_TYPE_BINARY_INTEGER,
-    DB_TYPE_NUMBER,
-    DB_TYPE_VECTOR,
-)
-from .dbobject import DbObjectType
-
-
-class FetchInfo(metaclass=BaseMetaClass):
-    """
-    Identifies metadata of columns that are being fetched.
-    """
-
-    def __eq__(self, other):
-        return tuple(self) == other
-
-    def __getitem__(self, index):
-        """
-        Return the parts mandated by the Python Database API.
-        """
-        if index == 0 or index == -7:
-            return self.name
-        elif index == 1 or index == -6:
-            return self.type_code
-        elif index == 2 or index == -5:
-            return self.display_size
-        elif index == 3 or index == -4:
-            return self.internal_size
-        elif index == 4 or index == -3:
-            return self.precision
-        elif index == 5 or index == -2:
-            return self.scale
-        elif index == 6 or index == -1:
-            return self.null_ok
-        elif isinstance(index, slice):
-            return tuple(self).__getitem__(index)
-        raise IndexError("list index out of range")
-
-    def __len__(self):
-        """
-        Length mandated by the Python Database API.
-        """
-        return 7
-
-    def __repr__(self):
-        return repr(tuple(self))
-
-    def __str__(self):
-        return str(tuple(self))
-
-    @classmethod
-    def _from_impl(cls, impl):
-        info = cls.__new__(cls)
-        info._impl = impl
-        info._type = None
-        return info
-
-    @property
-    def annotations(self) -> Union[dict, None]:
-        """
-        This read-only attribute returns a dictionary containing the
-        `annotations <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=
-        GUID-1AC16117-BBB6-4435-8794-2B99F8F68052>`__ associated with the
-        fetched column. If there are no annotations, the value *None* is
-        returned. Annotations require Oracle Database version 23, or later. If
-        using python-oracledb Thick mode, Oracle Client version 23 or later is
-        also required.
-        """
-        return self._impl.annotations
-
-    @property
-    def display_size(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the display size of the column.
-        """
-        if self._impl.max_size > 0:
-            return self._impl.max_size
-        dbtype = self._impl.dbtype
-        if (
-            dbtype is DB_TYPE_DATE
-            or dbtype is DB_TYPE_TIMESTAMP
-            or dbtype is DB_TYPE_TIMESTAMP_LTZ
-            or dbtype is DB_TYPE_TIMESTAMP_TZ
-        ):
-            return 23
-        elif (
-            dbtype is DB_TYPE_BINARY_FLOAT
-            or dbtype is DB_TYPE_BINARY_DOUBLE
-            or dbtype is DB_TYPE_BINARY_INTEGER
-            or dbtype is DB_TYPE_NUMBER
-        ):
-            if self._impl.precision:
-                display_size = self._impl.precision + 1
-                if self._impl.scale > 0:
-                    display_size += self._impl.scale + 1
-            else:
-                display_size = 127
-            return display_size
-
-    @property
-    def domain_name(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the `data use case
-        domain
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-17D3A9C6
-        -D993-4E94-BF6B-CACA56581F41>`__ associated with the fetched column. If
-        there is no data use case domain, the value *None* is returned. `Data
-        use case domains <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-        &id=GUID-4743FDE1-7C6E-471B-BC9D-442383CCA2F9>`__ require Oracle
-        Database version 23, or later. If using python-oracledb Thick mode,
-        Oracle Client version 23 or later is also required.
-        """
-        return self._impl.domain_name
-
-    @property
-    def domain_schema(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the schema of the `data use case
-        domain <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-
-        17D3A9C6-D993-4E94-BF6B-CACA56581F41>`__ associated with the fetched
-        column. If there is no data use case domain, the value *None* is
-        returned. `Data use case domains <https://www.oracle.com/pls/topic/
-        lookup?ctx=dblatest&id=GUID-4743FDE1-7C6E-471B-BC9D-442383CCA2F9>`__
-        require Oracle Database version 23, or later. If using python-oracledb
-        Thick mode, Oracle Client version 23 or later is also required.
-        """
-        return self._impl.domain_schema
-
-    @property
-    def internal_size(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the internal size of the column as
-        mandated by the Python Database API.
-        """
-        if self._impl.max_size > 0:
-            return self._impl.buffer_size
-
-    @property
-    def is_json(self) -> bool:
-        """
-        This read-only attribute returns whether the column is known to contain
-        JSON data. This will be *True* when the type code is
-        :data:`oracledb.DB_TYPE_JSON` as well as when an "IS JSON" constraint
-        is enabled on LOB and VARCHAR2 columns.
-        """
-        return self._impl.is_json
-
-    @property
-    def is_oson(self) -> bool:
-        """
-        This read-only attribute returns whether the column is known to contain
-        binary encoded `OSON <https://www.oracle.com/pls/topic/lookup?ctx=
-        dblatest&id=GUID-911D302C-CFAF-406B-B6A5-4E99DD38ABAD>`__ data. This
-        will be *True* when an "IS JSON FORMAT OSON" check constraint is
-        enabled on BLOB columns.
-        """
-        return self._impl.is_oson
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name of the column as mandated by
-        the Python Database API.
-        """
-        return self._impl.name
-
-    @property
-    def null_ok(self) -> bool:
-        """
-        This read-only attribute returns whether nulls are allowed in the
-        column as mandated by the Python Database API.
-        """
-        return self._impl.nulls_allowed
-
-    @property
-    def precision(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the precision of the column as
-        mandated by the Python Database API.
-        """
-        if self._impl.precision or self._impl.scale:
-            return self._impl.precision
-
-    @property
-    def scale(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the scale of the column as mandated by
-        the Python Database API.
-        """
-        if self._impl.precision or self._impl.scale:
-            return self._impl.scale
-
-    @property
-    def type(self) -> Union[DbType, DbObjectType]:
-        """
-        This read-only attribute returns the type of the column. This will be
-        an :ref:`Oracle Object Type <dbobjecttype>` if the column contains
-        Oracle objects; otherwise, it will be one of the
-        :ref:`database type constants <dbtypes>` defined at the module level.
-        """
-        if self._type is None:
-            if self._impl.objtype is not None:
-                self._type = DbObjectType._from_impl(self._impl.objtype)
-            else:
-                self._type = self._impl.dbtype
-        return self._type
-
-    @property
-    def type_code(self) -> DbType:
-        """
-        This read-only attribute returns the type of the column as mandated by
-        the Python Database API. The type will be one of the
-        :ref:`database type constants <dbtypes>` defined at the module level.
-        """
-        return self._impl.dbtype
-
-    @property
-    def vector_dimensions(self) -> Union[int, None]:
-        """
-        This read-only attribute returns the number of dimensions required by
-        VECTOR columns. If the column is not a VECTOR column or allows for any
-        number of dimensions, the value returned is *None*.
-        """
-        if self._impl.dbtype is DB_TYPE_VECTOR:
-            flags = self._impl.vector_flags
-            if not (flags & constants.VECTOR_META_FLAG_FLEXIBLE_DIM):
-                return self._impl.vector_dimensions
-
-    @property
-    def vector_format(self) -> Union[oracledb.VectorFormat, None]:
-        """
-        This read-only attribute returns the storage type used by VECTOR
-        columns. The value of this attribute can be:
-
-        - :data:`oracledb.VECTOR_FORMAT_BINARY` which represents 8-bit unsigned
-          integers
-        - :data:`oracledb.VECTOR_FORMAT_INT8` which represents 8-bit signed
-          integers
-        - :data:`oracledb.VECTOR_FORMAT_FLOAT32` which represents 32-bit
-          floating-point numbers
-        - :data:`oracledb.VECTOR_FORMAT_FLOAT64` which represents 64-bit
-          floating-point numbers
-
-        If the column is not a VECTOR column or allows for any type of storage,
-        the value returned is *None*.
-        """
-        if (
-            self._impl.dbtype is DB_TYPE_VECTOR
-            and self._impl.vector_format != 0
-        ):
-            return oracledb.VectorFormat(self._impl.vector_format)
-
-    @property
-    def vector_is_sparse(self) -> Union[bool, None]:
-        """
-        This read-only attribute returns a boolean indicating if the vector is
-        sparse or not.
-
-        If the column contains vectors that are SPARSE, the value returned is
-        *True*. If the column contains vectors that are DENSE, the value
-        returned is *False*. If the column is not a VECTOR column, the value
-        returned is *None*.
-        """
-        if self._impl.dbtype is DB_TYPE_VECTOR:
-            flags = self._impl.vector_flags
-            return bool(flags & constants.VECTOR_META_FLAG_SPARSE_VECTOR)
diff --git a/src/oracledb/future.py b/src/oracledb/future.py
deleted file mode 100644
index dff545d1..00000000
--- a/src/oracledb/future.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# future.py
-#
-# Module for handling backwards incompatible changes.
-# -----------------------------------------------------------------------------
-
-FEATURES = []
-
-
-# future object used for managing backwards incompatible changes
-class Future:
-    def __getattr__(self, name):
-        if name in FEATURES:
-            return super().__getattr__(name)
-        return None
-
-    def __setattr__(self, name, value):
-        if name in FEATURES:
-            return super().__setattr__(name, value)
-
-
-__future__ = Future()
diff --git a/src/oracledb/impl/arrow/array.pyx b/src/oracledb/impl/arrow/array.pyx
deleted file mode 100644
index 14f8b623..00000000
--- a/src/oracledb/impl/arrow/array.pyx
+++ /dev/null
@@ -1,647 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# array.pyx
-#
-# Cython implementation of the ArrowArrayImpl class.
-#------------------------------------------------------------------------------
-
-cdef class ArrowArrayImpl:
-
-    def __cinit__(self):
-        self.arrow_array = \
-                <ArrowArray*> cpython.PyMem_Calloc(1, sizeof(ArrowArray))
-
-    def __dealloc__(self):
-        if self.arrow_array != NULL:
-            if self.arrow_array.release != NULL:
-                ArrowArrayRelease(self.arrow_array)
-            cpython.PyMem_Free(self.arrow_array)
-
-    cdef int _extract_int(self, const void* ptr, ArrowType arrow_type,
-                          int64_t index, int64_t* value) except -1:
-        """
-        Return an int64_t value at the specified index from the buffer for all
-        signed integer types.
-        """
-        if arrow_type == NANOARROW_TYPE_INT8:
-            value[0] = (<int8_t*> ptr)[index]
-        elif arrow_type == NANOARROW_TYPE_INT16:
-            value[0] = (<int16_t*> ptr)[index]
-        elif arrow_type in (NANOARROW_TYPE_INT32, NANOARROW_TYPE_DATE32):
-            value[0] = (<int32_t*> ptr)[index]
-        else:
-            value[0] = (<int64_t*> ptr)[index]
-
-    cdef int _extract_uint(self, const void* ptr, ArrowType arrow_type,
-                           int64_t index, uint64_t* value) except -1:
-        """
-        Return a uint64_t value at the specified index from the buffer for all
-        unsigned integer types.
-        """
-        if arrow_type == NANOARROW_TYPE_UINT8:
-            value[0] = (<uint8_t*> ptr)[index]
-        elif arrow_type == NANOARROW_TYPE_UINT16:
-            value[0] = (<uint16_t*> ptr)[index]
-        elif arrow_type == NANOARROW_TYPE_UINT32:
-            value[0] = (<uint32_t*> ptr)[index]
-        else:
-            value[0] = (<uint64_t*> ptr)[index]
-
-    cdef int _get_is_null(self, int64_t index, bint* is_null) except -1:
-        """
-        Returns whether or not the value at the specified index is null.
-        """
-        cdef:
-            ArrowBitmap *bitamp
-            int8_t as_bool
-        bitmap = ArrowArrayValidityBitmap(self.arrow_array)
-        if bitmap != NULL and bitmap.buffer.data != NULL:
-            as_bool = ArrowBitGet(bitmap.buffer.data, index)
-            is_null[0] = not as_bool
-        else:
-            is_null[0] = False
-
-    cdef int _get_list_info(self, int64_t index, ArrowArray* arrow_array,
-                            int64_t* offset, int64_t* num_elements) except -1:
-        """
-        Returns the number of elements in the list stored in the array at the
-        given index.
-        """
-        cdef:
-            int32_t end_offset
-            int32_t* offsets
-        offsets = <int32_t*> arrow_array.buffers[1]
-        offset[0] = offsets[index]
-        if index >= arrow_array.length - 1:
-            end_offset = arrow_array.children[0].length
-        else:
-            end_offset = offsets[index + 1]
-        num_elements[0] = end_offset - offsets[index]
-
-    cdef int append_bytes(self, void* ptr, int64_t num_bytes) except -1:
-        """
-        Append a value of type bytes to the array.
-        """
-        cdef ArrowBufferView data
-        data.data.data = ptr
-        data.size_bytes = num_bytes
-        if self.schema_impl.fixed_size > 0 \
-                and num_bytes != self.schema_impl.fixed_size:
-            errors._raise_err(errors.ERR_ARROW_FIXED_SIZE_BINARY_VIOLATED,
-                              actual_len=num_bytes,
-                              fixed_size_len=self.schema_impl.fixed_size)
-        _check_nanoarrow(ArrowArrayAppendBytes(self.arrow_array, data))
-
-    cdef int append_decimal(self, void* ptr, int64_t num_bytes) except -1:
-        """
-        Append a value of type ArrowDecimal to the array
-
-        Arrow decimals are fixed-point decimal numbers encoded as a
-        scaled integer. decimal128(7, 3) can exactly represent the numbers
-        1234.567 and -1234.567 encoded internally as the 128-bit integers
-        1234567 and -1234567, respectively.
-        """
-        cdef:
-            ArrowStringView decimal_view
-            ArrowDecimal decimal
-        decimal_view.data = <char*> ptr
-        decimal_view.size_bytes = num_bytes
-        ArrowDecimalInit(&decimal, 128, self.schema_impl.precision,
-                         self.schema_impl.scale)
-        _check_nanoarrow(ArrowDecimalSetDigits(&decimal, decimal_view))
-        _check_nanoarrow(ArrowArrayAppendDecimal(self.arrow_array, &decimal))
-
-    cdef int append_double(self, double value) except -1:
-        """
-        Append a value of type double to the array.
-        """
-        _check_nanoarrow(ArrowArrayAppendDouble(self.arrow_array, value))
-
-    cdef int append_float(self, float value) except -1:
-        """
-        Append a value of type float to the array.
-        """
-        self.append_double(value)
-
-    cdef int append_int(self, int64_t value) except -1:
-        """
-        Append a signed integer value to the array.
-        """
-        cdef:
-            str arrow_type
-            int result
-        result = ArrowArrayAppendInt(self.arrow_array, value)
-        if result == EINVAL:
-            arrow_type = ArrowTypeString(self.schema_impl.arrow_type).decode()
-            errors._raise_err(errors.ERR_INVALID_INTEGER, value=value,
-                              arrow_type=arrow_type)
-        _check_nanoarrow(result)
-
-    cdef int append_last_value(self, ArrowArrayImpl array) except -1:
-        """
-        Appends the last value of the given array to this array.
-        """
-        cdef:
-            int32_t start_offset, end_offset
-            ArrowBuffer *offsets_buffer
-            ArrowBuffer *data_buffer
-            uint64_t uint64_value
-            ArrowDecimal decimal
-            int64_t int64_value
-            int64_t *as_int64
-            int32_t *as_int32
-            double *as_double
-            float *as_float
-            int8_t as_bool
-            int64_t index
-            bint is_null
-            uint8_t *ptr
-            void* temp
-        if array is None:
-            array = self
-        index = array.arrow_array.length - 1
-        array._get_is_null(index, &is_null)
-        if is_null:
-            self.append_null()
-        elif array.schema_impl.arrow_type in (
-                NANOARROW_TYPE_INT8,
-                NANOARROW_TYPE_INT16,
-                NANOARROW_TYPE_INT32,
-                NANOARROW_TYPE_INT64,
-                NANOARROW_TYPE_TIMESTAMP
-        ):
-            self._extract_int(ArrowArrayBuffer(array.arrow_array, 1).data,
-                              array.schema_impl.arrow_type, index,
-                              &int64_value)
-            self.append_int(int64_value)
-        elif array.schema_impl.arrow_type in (
-                NANOARROW_TYPE_UINT8,
-                NANOARROW_TYPE_UINT16,
-                NANOARROW_TYPE_UINT32,
-                NANOARROW_TYPE_UINT64
-        ):
-            self._extract_uint(ArrowArrayBuffer(array.arrow_array, 1).data,
-                               array.schema_impl.arrow_type, index,
-                               &uint64_value)
-            self.append_uint(uint64_value)
-        elif array.schema_impl.arrow_type == NANOARROW_TYPE_DOUBLE:
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            as_double = <double*> data_buffer.data
-            self.append_double(as_double[index])
-        elif array.schema_impl.arrow_type == NANOARROW_TYPE_FLOAT:
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            as_float = <float*> data_buffer.data
-            self.append_double(as_float[index])
-        elif array.schema_impl.arrow_type == NANOARROW_TYPE_BOOL:
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            as_bool = ArrowBitGet(data_buffer.data, index)
-            self.append_int(as_bool)
-        elif array.schema_impl.arrow_type == NANOARROW_TYPE_DECIMAL128:
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            ArrowDecimalInit(&decimal, 128, self.schema_impl.precision,
-                             self.schema_impl.scale)
-            ptr = data_buffer.data + index * 16
-            ArrowDecimalSetBytes(&decimal, ptr)
-            _check_nanoarrow(ArrowArrayAppendDecimal(self.arrow_array,
-                                                     &decimal))
-        elif array.schema_impl.arrow_type in (
-                NANOARROW_TYPE_BINARY,
-                NANOARROW_TYPE_STRING
-        ):
-            offsets_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 2)
-            as_int32 = <int32_t*> offsets_buffer.data
-            start_offset = as_int32[index]
-            end_offset = as_int32[index + 1]
-            temp = cpython.PyMem_Malloc(end_offset - start_offset)
-            memcpy(temp, &data_buffer.data[start_offset],
-                   end_offset - start_offset)
-            try:
-                self.append_bytes(temp, end_offset - start_offset)
-            finally:
-                cpython.PyMem_Free(temp)
-
-        elif array.schema_impl.arrow_type in (
-                NANOARROW_TYPE_LARGE_BINARY,
-                NANOARROW_TYPE_LARGE_STRING
-        ):
-            offsets_buffer = ArrowArrayBuffer(array.arrow_array, 1)
-            data_buffer = ArrowArrayBuffer(array.arrow_array, 2)
-            as_int64 = <int64_t*> offsets_buffer.data
-            start_offset = as_int64[index]
-            end_offset = as_int64[index + 1]
-            temp = cpython.PyMem_Malloc(end_offset - start_offset)
-            memcpy(temp, &data_buffer.data[start_offset],
-                   end_offset - start_offset)
-            try:
-                self.append_bytes(temp, end_offset - start_offset)
-            finally:
-                cpython.PyMem_Free(temp)
-
-    cdef int append_null(self) except -1:
-        """
-        Append a null value to the array.
-        """
-        _check_nanoarrow(ArrowArrayAppendNull(self.arrow_array, 1))
-
-    cdef int append_uint(self, uint64_t value) except -1:
-        """
-        Append an unsigned integer to the array.
-        """
-        cdef:
-            str arrow_type
-            int result
-        result = ArrowArrayAppendUInt(self.arrow_array, value)
-        if result == EINVAL:
-            arrow_type = ArrowTypeString(self.schema_impl.arrow_type).decode()
-            errors._raise_err(errors.ERR_INVALID_INTEGER, value=value,
-                              arrow_type=arrow_type)
-        _check_nanoarrow(result)
-
-    cdef int append_vector(self, array.array value) except -1:
-        """
-        Append a vector to the array.
-        """
-        if self.schema_impl.child_arrow_type == NANOARROW_TYPE_FLOAT:
-            append_float_array(self.arrow_array, value)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_DOUBLE:
-            append_double_array(self.arrow_array, value)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_INT8:
-            append_int8_array(self.arrow_array, value)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_UINT8:
-            append_uint8_array(self.arrow_array, value)
-
-    cdef int append_sparse_vector(self,
-                                  int64_t num_dims,
-                                  array.array indices,
-                                  array.array values) except -1:
-        """
-        Append a sparse vector to the array.
-        """
-        cdef ArrowArray *array
-
-        # validate that the array supports sparse vectors
-        if self.schema_impl.arrow_type != NANOARROW_TYPE_STRUCT:
-            errors._raise_err(errors.ERR_ARROW_SPARSE_VECTOR_NOT_ALLOWED)
-
-        # append number of dimensions
-        array = self.arrow_array.children[0]
-        _check_nanoarrow(ArrowArrayAppendInt(array, num_dims))
-
-        # append indices array
-        array = self.arrow_array.children[1]
-        append_uint32_array(array, indices)
-
-        # append values array
-        array = self.arrow_array.children[2]
-        if self.schema_impl.child_arrow_type == NANOARROW_TYPE_FLOAT:
-            append_float_array(array, values)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_DOUBLE:
-            append_double_array(array, values)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_INT8:
-            append_int8_array(array, values)
-        elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_UINT8:
-            append_uint8_array(array, values)
-
-        # indicate structure is completed
-        _check_nanoarrow(ArrowArrayFinishElement(self.arrow_array))
-
-    cdef int finish_building(self) except -1:
-        """
-        Finish building the array. No more data will be added to it.
-        """
-        _check_nanoarrow(ArrowArrayFinishBuildingDefault(self.arrow_array,
-                                                         NULL))
-
-    cdef int get_bool(self, int64_t index, bint* is_null,
-                      bint* value) except -1:
-        """
-        Return boolean at the specified index from the Arrow array.
-        """
-        cdef uint8_t *ptr
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            ptr = <uint8_t*> self.arrow_array.buffers[1]
-            value[0] = ArrowBitGet(ptr, index)
-
-    cdef int get_bytes(self, int64_t index, bint* is_null, char **ptr,
-                       ssize_t *num_bytes) except -1:
-        """
-        Return bytes at the specified index from the Arrow array.
-        """
-        cdef:
-            int64_t start_offset, end_offset
-            int64_t *as_in64
-            int32_t *as_int32
-            char *source_ptr
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            if self.schema_impl.arrow_type == NANOARROW_TYPE_FIXED_SIZE_BINARY:
-                source_ptr = <char*> self.arrow_array.buffers[1]
-                start_offset = index * self.schema_impl.fixed_size
-                end_offset = start_offset + self.schema_impl.fixed_size
-            elif self.schema_impl.arrow_type in (
-                NANOARROW_TYPE_BINARY,
-                NANOARROW_TYPE_STRING
-            ):
-                source_ptr = <char*> self.arrow_array.buffers[2]
-                as_int32 = <int32_t*> self.arrow_array.buffers[1]
-                start_offset = as_int32[index]
-                end_offset = as_int32[index + 1]
-            else:
-                source_ptr = <char*> self.arrow_array.buffers[2]
-                as_int64 = <int64_t*> self.arrow_array.buffers[1]
-                start_offset = as_int64[index]
-                end_offset = as_int64[index + 1]
-            ptr[0] = source_ptr + start_offset
-            num_bytes[0] = end_offset - start_offset
-
-    cdef bytes get_decimal(self, int64_t index, bint* is_null):
-        """
-        Return bytes corresponding to the decimal value.
-        """
-        cdef:
-            ArrowDecimal decimal
-            ArrowBuffer buf
-            uint8_t *ptr
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            ptr = <uint8_t*> self.arrow_array.buffers[1]
-            ArrowDecimalInit(&decimal, 128, self.schema_impl.precision,
-                             self.schema_impl.scale)
-            ArrowDecimalSetBytes(&decimal, ptr + index * 16)
-            ArrowBufferInit(&buf)
-            try:
-                _check_nanoarrow(ArrowDecimalAppendStringToBuffer(
-                    &decimal, &buf
-                ))
-                return buf.data[:buf.size_bytes]
-            finally:
-                ArrowBufferReset(&buf)
-
-    cdef int get_double(self, int64_t index, bint* is_null,
-                        double* value) except -1:
-        """
-        Return a double value at the specified index from the Arrow array.
-        """
-        cdef double* ptr
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            ptr = <double*> self.arrow_array.buffers[1]
-            value[0] = ptr[index]
-
-    cdef int get_float(self, int64_t index, bint* is_null,
-                       float* value) except -1:
-        """
-        Return a float value at the specified index from the Arrow array.
-        """
-        cdef float* ptr
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            ptr = <float*> self.arrow_array.buffers[1]
-            value[0] = ptr[index]
-
-    cdef int get_int(self, ArrowType arrow_type, int64_t index, bint* is_null,
-                     int64_t* value) except -1:
-        """
-        Return an int64_t value at the specified index from the Arrow array
-        for all signed integer types.
-        """
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            self._extract_int(self.arrow_array.buffers[1], arrow_type, index,
-                              value)
-
-    cdef int get_length(self, int64_t* length) except -1:
-        """
-        Return the number of rows in the array.
-        """
-        length[0] = self.arrow_array.length
-
-    cdef object get_sparse_vector(self, int64_t index, bint* is_null):
-        """
-        Return a sparse vector value at the specified index from the Arrow
-        array.
-        """
-        cdef:
-            int64_t num_dimensions, offset, num_elements
-            array.array indices, values
-            ArrowArray *arrow_array
-            uint32_t* uint32_ptr
-            int64_t* int64_ptr
-            char *source_buf
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-
-            # get the number of dimensions from the sparse vector
-            int64_ptr = <int64_t*> self.arrow_array.children[0].buffers[1]
-            num_dimensions = int64_ptr[index]
-
-            # get the indices from the sparse vector
-            arrow_array = self.arrow_array.children[1]
-            self._get_list_info(index, arrow_array, &offset, &num_elements)
-            indices = array.clone(uint32_template, num_elements, False)
-            uint32_ptr = <uint32_t*> arrow_array.children[0].buffers[1]
-            memcpy(indices.data.as_voidptr, &uint32_ptr[offset],
-                   num_elements * sizeof(uint32_t))
-
-            # get the values from the sparse vector
-            arrow_array = self.arrow_array.children[2]
-            self._get_list_info(index, arrow_array, &offset, &num_elements)
-            source_buf = <char*> arrow_array.children[0].buffers[1] + \
-                    offset * self.schema_impl.child_element_size
-            if self.schema_impl.child_arrow_type == NANOARROW_TYPE_FLOAT:
-                values = array.clone(float_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_DOUBLE:
-                values = array.clone(double_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_INT8:
-                values = array.clone(int8_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_UINT8:
-                values = array.clone(uint8_template, num_elements, False)
-            else:
-                errors._raise_err(errors.ERR_UNEXPECTED_DATA,
-                                  data=self.schema_impl.child_arrow_type)
-            memcpy(values.data.as_voidptr, source_buf,
-                   num_elements * self.schema_impl.child_element_size)
-            return (num_dimensions, indices, values)
-
-    cdef int get_uint(self, ArrowType arrow_type, int64_t index, bint* is_null,
-                      uint64_t* value) except -1:
-        """
-        Return a uint64_t value at the specified index from the Arrow array
-        for all unsigned integer types.
-        """
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            self._extract_uint(self.arrow_array.buffers[1], arrow_type, index,
-                               value)
-
-    cdef object get_vector(self, int64_t index, bint* is_null):
-        """
-        Return a vector value at the specified index from the Arrow array.
-        """
-        cdef:
-            int64_t offset, end_offset, num_elements
-            ArrowBuffer *offsets_buffer
-            array.array result
-            int32_t *as_int32
-            char *source_buf
-        self._get_is_null(index, is_null)
-        if not is_null[0]:
-            if self.schema_impl.arrow_type == NANOARROW_TYPE_FIXED_SIZE_LIST:
-                offset = index * self.schema_impl.fixed_size
-                num_elements = self.schema_impl.fixed_size
-            else:
-                self._get_list_info(index, self.arrow_array, &offset,
-                                    &num_elements)
-            source_buf = <char*> self.arrow_array.children[0].buffers[1] + \
-                    offset * self.schema_impl.child_element_size
-            if self.schema_impl.child_arrow_type == NANOARROW_TYPE_FLOAT:
-                result = array.clone(float_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_DOUBLE:
-                result = array.clone(double_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_INT8:
-                result = array.clone(int8_template, num_elements, False)
-            elif self.schema_impl.child_arrow_type == NANOARROW_TYPE_UINT8:
-                result = array.clone(uint8_template, num_elements, False)
-            else:
-                errors._raise_err(errors.ERR_UNEXPECTED_DATA,
-                                  data=self.schema_impl.child_arrow_type)
-            memcpy(result.data.as_voidptr, source_buf,
-                   num_elements * self.schema_impl.child_element_size)
-            return result
-
-    @classmethod
-    def from_arrow_array(cls, obj):
-        """
-        Create an ArrowArrayImpl instance by extracting the information an
-        object implementing the PyCapsule Arrow array interface.
-        """
-        cdef:
-            ArrowSchemaImpl schema_impl
-            ArrowArrayImpl array_impl
-            ArrowSchema *arrow_schema
-            ArrowArray *arrow_array
-
-        # convert schema
-        schema_capsule, array_capsule = obj.__arrow_c_array__()
-        arrow_schema = <ArrowSchema*> cpython.PyCapsule_GetPointer(
-            schema_capsule, "arrow_schema"
-        )
-        schema_impl = ArrowSchemaImpl.__new__(ArrowSchemaImpl)
-        schema_impl.populate_from_schema(arrow_schema)
-
-        # convert array
-        arrow_array = <ArrowArray*> cpython.PyCapsule_GetPointer(
-            array_capsule, "arrow_array"
-        )
-        array_impl = ArrowArrayImpl.__new__(ArrowArrayImpl)
-        array_impl.populate_from_array(schema_impl, arrow_array)
-        return array_impl
-
-    cdef int populate_from_array(self, ArrowSchemaImpl schema_impl,
-                                 ArrowArray* array) except -1:
-        """
-        Populate the array from another array.
-        """
-        self.schema_impl = schema_impl
-        ArrowArrayMove(array, self.arrow_array)
-
-    cdef int populate_from_schema(self, ArrowSchemaImpl schema_impl) except -1:
-        """
-        Populate the array from a schema.
-        """
-        self.schema_impl = schema_impl
-        _check_nanoarrow(
-            ArrowArrayInitFromSchema(
-                self.arrow_array,
-                self.schema_impl.arrow_schema,
-                NULL
-            )
-        )
-        _check_nanoarrow(ArrowArrayStartAppending(self.arrow_array))
-
-    def get_array_capsule(self):
-        """
-        Internal method for getting a PyCapsule pointer to the array.
-        """
-        cdef ArrowArray *array
-        array = <ArrowArray*> cpython.PyMem_Malloc(sizeof(ArrowArray))
-        try:
-            copy_arrow_array(self, self.arrow_array, array)
-        except:
-            cpython.PyMem_Free(array)
-            raise
-        return cpython.PyCapsule_New(
-            array, 'arrow_array', &pycapsule_array_deleter
-        )
-
-    def get_data_type(self):
-        """
-        Internal method for getting the data type associated with the array.
-        """
-        cdef char buffer[81]
-        ArrowSchemaToString(self.schema_impl.arrow_schema, buffer,
-                            sizeof(buffer), 0)
-        return buffer.decode()
-
-    def get_name(self):
-        """
-        Internal method for getting the name associated with the array.
-        """
-        return self.schema_impl.name
-
-    def get_null_count(self):
-        """
-        Internal method for getting the number of rows containing null values.
-        """
-        return self.arrow_array.null_count
-
-    def get_num_rows(self):
-        """
-        Internal method for getting the number of rows in the array.
-        """
-        return self.arrow_array.length
-
-    def get_schema_capsule(self):
-        """
-        Internal method for getting a PyCapsule pointer to the schema.
-        """
-        return self.schema_impl.get_schema_capsule()
-
-
-cdef void pycapsule_array_deleter(object array_capsule) noexcept:
-    """
-    Called when the PyCapsule pointer is no longer required and performs the
-    necessary cleanup.
-    """
-    cdef ArrowArray* array
-    array = <ArrowArray*> cpython.PyCapsule_GetPointer(
-        array_capsule, "arrow_array"
-    )
-    if array.release != NULL:
-        ArrowArrayRelease(array)
-    cpython.PyMem_Free(array)
diff --git a/src/oracledb/impl/arrow/dataframe.pyx b/src/oracledb/impl/arrow/dataframe.pyx
deleted file mode 100644
index 837b621d..00000000
--- a/src/oracledb/impl/arrow/dataframe.pyx
+++ /dev/null
@@ -1,165 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# dataframe.pyx
-#
-# Cython implementation of the DataFrameImpl class.
-#------------------------------------------------------------------------------
-
-cdef class DataFrameImpl:
-
-    @classmethod
-    def from_arrow_stream(cls, obj):
-        """
-        Extract Arrow arrays from an object implementing the PyCapsule arrow
-        stream interface.
-        """
-        cdef:
-            ArrowArrayStream *arrow_stream
-            ArrowSchemaImpl schema_impl
-            ArrowArrayImpl array_impl
-            ArrowSchema arrow_schema
-            ArrowArray arrow_array
-            DataFrameImpl df_impl
-            ssize_t i
-
-        # initialization
-        df_impl = DataFrameImpl.__new__(DataFrameImpl)
-        df_impl.schema_impls = []
-        df_impl.arrays = []
-        capsule = obj.__arrow_c_stream__()
-        arrow_stream = <ArrowArrayStream*> cpython.PyCapsule_GetPointer(
-            capsule, "arrow_array_stream"
-        )
-
-        # populate list of schemas
-        _check_nanoarrow(arrow_stream.get_schema(arrow_stream, &arrow_schema))
-        for i in range(arrow_schema.n_children):
-            schema_impl = ArrowSchemaImpl.__new__(ArrowSchemaImpl)
-            schema_impl.populate_from_schema(arrow_schema.children[i])
-            df_impl.schema_impls.append(schema_impl)
-
-        # populate list of arrays
-        while True:
-            _check_nanoarrow(arrow_stream.get_next(arrow_stream, &arrow_array))
-            if arrow_array.release == NULL:
-                break
-            for i in range(arrow_schema.n_children):
-                array_impl = ArrowArrayImpl.__new__(ArrowArrayImpl)
-                array_impl.populate_from_array(df_impl.schema_impls[i],
-                                               arrow_array.children[i])
-                df_impl.arrays.append(array_impl)
-
-        ArrowArrayStreamRelease(arrow_stream)
-        return df_impl
-
-    def get_arrays(self):
-        """
-        Internal method for getting the list of arrays associated with the data
-        frame.
-        """
-        return self.arrays
-
-    def get_stream_capsule(self):
-        """
-        Internal method for getting a PyCapsule pointer to a stream that
-        encapsulates the arrays found in the data frame.
-        """
-        cdef:
-            ArrowSchemaImpl schema_impl
-            ArrowArrayImpl array_impl
-            ArrowArrayStream *stream
-            int64_t i, num_arrays
-            ArrowSchema schema
-            ArrowArray array
-
-        # initialization
-        stream = NULL
-        array.release = NULL
-        schema.release = NULL
-        num_arrays = <int64_t> len(self.arrays)
-
-        try:
-
-            # create schema/array encompassing all of the arrays
-            _check_nanoarrow(
-                ArrowSchemaInitFromType(&schema, NANOARROW_TYPE_STRUCT)
-            )
-            _check_nanoarrow(ArrowSchemaAllocateChildren(&schema, num_arrays))
-            _check_nanoarrow(
-                ArrowArrayInitFromType(&array, NANOARROW_TYPE_STRUCT)
-            )
-            _check_nanoarrow(ArrowArrayAllocateChildren(&array, num_arrays))
-            for i, schema_impl in enumerate(self.schema_impls):
-                array_impl = self.arrays[i]
-                array.length = array_impl.arrow_array.length
-                copy_arrow_array(
-                    array_impl, array_impl.arrow_array, array.children[i]
-                )
-                _check_nanoarrow(
-                    ArrowSchemaDeepCopy(
-                        schema_impl.arrow_schema, schema.children[i]
-                    )
-                )
-
-            # create stream and populate it
-            stream = <ArrowArrayStream*> \
-                    cpython.PyMem_Calloc(1, sizeof(ArrowArrayStream))
-            _check_nanoarrow(
-                ArrowBasicArrayStreamInit(stream, &schema, num_arrays)
-            )
-            ArrowBasicArrayStreamSetArray(stream, 0, &array)
-
-        except:
-            if schema.release:
-                ArrowSchemaRelease(&schema)
-            if array.release:
-                ArrowArrayRelease(&array)
-            if stream != NULL:
-                if stream.release:
-                    ArrowArrayStreamRelease(stream)
-                cpython.PyMem_Free(stream)
-            raise
-
-        # create and return capsule
-        return cpython.PyCapsule_New(
-            stream,
-            "arrow_array_stream",
-            &pycapsule_array_stream_deleter
-        )
-
-
-cdef void pycapsule_array_stream_deleter(object stream_capsule) noexcept:
-    """
-    Called when the PyCapsule pointer is no longer required and performs the
-    necessary cleanup.
-    """
-    cdef ArrowArrayStream* stream
-    stream = <ArrowArrayStream*> cpython.PyCapsule_GetPointer(
-        stream_capsule, 'arrow_array_stream'
-    )
-    if stream.release != NULL:
-        ArrowArrayStreamRelease(stream)
-    cpython.PyMem_Free(stream)
diff --git a/src/oracledb/impl/arrow/nanoarrow/nanoarrow.c b/src/oracledb/impl/arrow/nanoarrow/nanoarrow.c
deleted file mode 100644
index 80b79eee..00000000
--- a/src/oracledb/impl/arrow/nanoarrow/nanoarrow.c
+++ /dev/null
@@ -1,4087 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "nanoarrow.h"
-
-const char* ArrowNanoarrowVersion(void) { return NANOARROW_VERSION; }
-
-int ArrowNanoarrowVersionInt(void) { return NANOARROW_VERSION_INT; }
-
-ArrowErrorCode ArrowErrorSet(struct ArrowError* error, const char* fmt, ...) {
-  if (error == NULL) {
-    return NANOARROW_OK;
-  }
-
-  memset(error->message, 0, sizeof(error->message));
-
-  va_list args;
-  va_start(args, fmt);
-  int chars_needed = vsnprintf(error->message, sizeof(error->message), fmt, args);
-  va_end(args);
-
-  if (chars_needed < 0) {
-    return EINVAL;
-  } else if (((size_t)chars_needed) >= sizeof(error->message)) {
-    return ERANGE;
-  } else {
-    return NANOARROW_OK;
-  }
-}
-
-void ArrowLayoutInit(struct ArrowLayout* layout, enum ArrowType storage_type) {
-  layout->buffer_type[0] = NANOARROW_BUFFER_TYPE_VALIDITY;
-  layout->buffer_data_type[0] = NANOARROW_TYPE_BOOL;
-  layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA;
-  layout->buffer_data_type[1] = storage_type;
-  layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_NONE;
-  layout->buffer_data_type[2] = NANOARROW_TYPE_UNINITIALIZED;
-
-  layout->element_size_bits[0] = 1;
-  layout->element_size_bits[1] = 0;
-  layout->element_size_bits[2] = 0;
-
-  layout->child_size_elements = 0;
-
-  switch (storage_type) {
-    case NANOARROW_TYPE_UNINITIALIZED:
-    case NANOARROW_TYPE_NA:
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      layout->buffer_type[0] = NANOARROW_BUFFER_TYPE_NONE;
-      layout->buffer_data_type[0] = NANOARROW_TYPE_UNINITIALIZED;
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_NONE;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_UNINITIALIZED;
-      layout->element_size_bits[0] = 0;
-      break;
-
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_MAP:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[1] = 32;
-      break;
-
-    case NANOARROW_TYPE_LARGE_LIST:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT64;
-      layout->element_size_bits[1] = 64;
-      break;
-
-    case NANOARROW_TYPE_STRUCT:
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_NONE;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_UNINITIALIZED;
-      break;
-
-    case NANOARROW_TYPE_BOOL:
-      layout->element_size_bits[1] = 1;
-      break;
-
-    case NANOARROW_TYPE_UINT8:
-    case NANOARROW_TYPE_INT8:
-      layout->element_size_bits[1] = 8;
-      break;
-
-    case NANOARROW_TYPE_UINT16:
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_HALF_FLOAT:
-      layout->element_size_bits[1] = 16;
-      break;
-
-    case NANOARROW_TYPE_UINT32:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_FLOAT:
-    case NANOARROW_TYPE_DECIMAL32:
-      layout->element_size_bits[1] = 32;
-      break;
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[1] = 32;
-      break;
-
-    case NANOARROW_TYPE_UINT64:
-    case NANOARROW_TYPE_INT64:
-    case NANOARROW_TYPE_DOUBLE:
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME:
-    case NANOARROW_TYPE_DECIMAL64:
-      layout->element_size_bits[1] = 64;
-      break;
-
-    case NANOARROW_TYPE_DECIMAL128:
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO:
-      layout->element_size_bits[1] = 128;
-      break;
-
-    case NANOARROW_TYPE_DECIMAL256:
-      layout->element_size_bits[1] = 256;
-      break;
-
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      layout->buffer_data_type[1] = NANOARROW_TYPE_BINARY;
-      break;
-
-    case NANOARROW_TYPE_DENSE_UNION:
-      layout->buffer_type[0] = NANOARROW_BUFFER_TYPE_TYPE_ID;
-      layout->buffer_data_type[0] = NANOARROW_TYPE_INT8;
-      layout->element_size_bits[0] = 8;
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_UNION_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[1] = 32;
-      break;
-
-    case NANOARROW_TYPE_SPARSE_UNION:
-      layout->buffer_type[0] = NANOARROW_BUFFER_TYPE_TYPE_ID;
-      layout->buffer_data_type[0] = NANOARROW_TYPE_INT8;
-      layout->element_size_bits[0] = 8;
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_NONE;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_UNINITIALIZED;
-      break;
-
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_BINARY:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[1] = 32;
-      layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_DATA;
-      layout->buffer_data_type[2] = storage_type;
-      break;
-
-    case NANOARROW_TYPE_LARGE_STRING:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT64;
-      layout->element_size_bits[1] = 64;
-      layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_DATA;
-      layout->buffer_data_type[2] = NANOARROW_TYPE_STRING;
-      break;
-    case NANOARROW_TYPE_LARGE_BINARY:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT64;
-      layout->element_size_bits[1] = 64;
-      layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_DATA;
-      layout->buffer_data_type[2] = NANOARROW_TYPE_BINARY;
-      break;
-
-    case NANOARROW_TYPE_BINARY_VIEW:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_BINARY_VIEW;
-      layout->element_size_bits[1] = 128;
-      break;
-    case NANOARROW_TYPE_STRING_VIEW:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_DATA;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_STRING_VIEW;
-      layout->element_size_bits[1] = 128;
-      break;
-
-    case NANOARROW_TYPE_LIST_VIEW:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_VIEW_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[1] = 32;
-      layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_SIZE;
-      layout->buffer_data_type[2] = NANOARROW_TYPE_INT32;
-      layout->element_size_bits[2] = 32;
-      break;
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      layout->buffer_type[1] = NANOARROW_BUFFER_TYPE_VIEW_OFFSET;
-      layout->buffer_data_type[1] = NANOARROW_TYPE_INT64;
-      layout->element_size_bits[1] = 64;
-      layout->buffer_type[2] = NANOARROW_BUFFER_TYPE_SIZE;
-      layout->buffer_data_type[2] = NANOARROW_TYPE_INT64;
-      layout->element_size_bits[2] = 64;
-      break;
-
-    default:
-      break;
-  }
-}
-
-void* ArrowMalloc(int64_t size) { return malloc(size); }
-
-void* ArrowRealloc(void* ptr, int64_t size) { return realloc(ptr, size); }
-
-void ArrowFree(void* ptr) { free(ptr); }
-
-static uint8_t* ArrowBufferAllocatorMallocReallocate(
-    struct ArrowBufferAllocator* allocator, uint8_t* ptr, int64_t old_size,
-    int64_t new_size) {
-  NANOARROW_UNUSED(allocator);
-  NANOARROW_UNUSED(old_size);
-  return (uint8_t*)ArrowRealloc(ptr, new_size);
-}
-
-static void ArrowBufferAllocatorMallocFree(struct ArrowBufferAllocator* allocator,
-                                           uint8_t* ptr, int64_t size) {
-  NANOARROW_UNUSED(allocator);
-  NANOARROW_UNUSED(size);
-  if (ptr != NULL) {
-    ArrowFree(ptr);
-  }
-}
-
-static struct ArrowBufferAllocator ArrowBufferAllocatorMalloc = {
-    &ArrowBufferAllocatorMallocReallocate, &ArrowBufferAllocatorMallocFree, NULL};
-
-struct ArrowBufferAllocator ArrowBufferAllocatorDefault(void) {
-  return ArrowBufferAllocatorMalloc;
-}
-
-static uint8_t* ArrowBufferDeallocatorReallocate(struct ArrowBufferAllocator* allocator,
-                                                 uint8_t* ptr, int64_t old_size,
-                                                 int64_t new_size) {
-  NANOARROW_UNUSED(new_size);
-
-  // Attempting to reallocate a buffer with a custom deallocator is
-  // a programming error. In debug mode, crash here.
-#if defined(NANOARROW_DEBUG)
-  NANOARROW_PRINT_AND_DIE(ENOMEM,
-                          "It is an error to reallocate a buffer whose allocator is "
-                          "ArrowBufferDeallocator()");
-#endif
-
-  // In release mode, ensure the the deallocator is called exactly
-  // once using the pointer it was given and return NULL, which
-  // will trigger the caller to return ENOMEM.
-  allocator->free(allocator, ptr, old_size);
-  *allocator = ArrowBufferAllocatorDefault();
-  return NULL;
-}
-
-struct ArrowBufferAllocator ArrowBufferDeallocator(
-    void (*custom_free)(struct ArrowBufferAllocator* allocator, uint8_t* ptr,
-                        int64_t size),
-    void* private_data) {
-  struct ArrowBufferAllocator allocator;
-  allocator.reallocate = &ArrowBufferDeallocatorReallocate;
-  allocator.free = custom_free;
-  allocator.private_data = private_data;
-  return allocator;
-}
-
-static const int kInt32DecimalDigits = 9;
-
-static const uint64_t kUInt32PowersOfTen[] = {
-    1ULL,      10ULL,      100ULL,      1000ULL,      10000ULL,
-    100000ULL, 1000000ULL, 10000000ULL, 100000000ULL, 1000000000ULL};
-
-// Adapted from Arrow C++ to use 32-bit words for better C portability
-// https://github.com/apache/arrow/blob/cd3321b28b0c9703e5d7105d6146c1270bbadd7f/cpp/src/arrow/util/decimal.cc#L524-L544
-static void ShiftAndAdd(struct ArrowStringView value, uint32_t* out, int64_t out_size) {
-  // We use strtoll for parsing, which needs input that is null-terminated
-  char chunk_string[16];
-
-  for (int64_t posn = 0; posn < value.size_bytes;) {
-    int64_t remaining = value.size_bytes - posn;
-
-    int64_t group_size;
-    if (remaining > kInt32DecimalDigits) {
-      group_size = kInt32DecimalDigits;
-    } else {
-      group_size = remaining;
-    }
-
-    const uint64_t multiple = kUInt32PowersOfTen[group_size];
-
-    memcpy(chunk_string, value.data + posn, group_size);
-    chunk_string[group_size] = '\0';
-    uint32_t chunk = (uint32_t)strtoll(chunk_string, NULL, 10);
-
-    for (int64_t i = 0; i < out_size; i++) {
-      uint64_t tmp = out[i];
-      tmp *= multiple;
-      tmp += chunk;
-      out[i] = (uint32_t)(tmp & 0xFFFFFFFFULL);
-      chunk = (uint32_t)(tmp >> 32);
-    }
-    posn += group_size;
-  }
-}
-
-ArrowErrorCode ArrowDecimalSetDigits(struct ArrowDecimal* decimal,
-                                     struct ArrowStringView value) {
-  // Check for sign
-  int is_negative = value.data[0] == '-';
-  int has_sign = is_negative || value.data[0] == '+';
-  value.data += has_sign;
-  value.size_bytes -= has_sign;
-
-  // Check all characters are digits that are not the negative sign
-  for (int64_t i = 0; i < value.size_bytes; i++) {
-    char c = value.data[i];
-    if (c < '0' || c > '9') {
-      return EINVAL;
-    }
-  }
-
-  // Skip over leading 0s
-  int64_t n_leading_zeroes = 0;
-  for (int64_t i = 0; i < value.size_bytes; i++) {
-    if (value.data[i] == '0') {
-      n_leading_zeroes++;
-    } else {
-      break;
-    }
-  }
-
-  value.data += n_leading_zeroes;
-  value.size_bytes -= n_leading_zeroes;
-
-  // Use 32-bit words for portability
-  uint32_t words32[8];
-  memset(words32, 0, sizeof(words32));
-  int n_words32 = decimal->n_words > 0 ? decimal->n_words * 2 : 1;
-  NANOARROW_DCHECK(n_words32 <= 8);
-  memset(words32, 0, sizeof(words32));
-
-  ShiftAndAdd(value, words32, n_words32);
-
-  if (_ArrowIsLittleEndian() || n_words32 == 1) {
-    memcpy(decimal->words, words32, sizeof(uint32_t) * n_words32);
-  } else {
-    uint64_t lo;
-    uint64_t hi;
-
-    for (int i = 0; i < decimal->n_words; i++) {
-      lo = (uint64_t)words32[i * 2];
-      hi = (uint64_t)words32[i * 2 + 1] << 32;
-      decimal->words[decimal->n_words - i - 1] = lo | hi;
-    }
-  }
-
-  if (is_negative) {
-    ArrowDecimalNegate(decimal);
-  }
-
-  return NANOARROW_OK;
-}
-
-// Adapted from Arrow C++ for C
-// https://github.com/apache/arrow/blob/cd3321b28b0c9703e5d7105d6146c1270bbadd7f/cpp/src/arrow/util/decimal.cc#L365
-ArrowErrorCode ArrowDecimalAppendDigitsToBuffer(const struct ArrowDecimal* decimal,
-                                                struct ArrowBuffer* buffer) {
-  NANOARROW_DCHECK(decimal->n_words == 0 || decimal->n_words == 1 ||
-                   decimal->n_words == 2 || decimal->n_words == 4);
-
-  // For the 32-bit case, just use snprintf()
-  if (decimal->n_words == 0) {
-    int32_t value;
-    memcpy(&value, decimal->words, sizeof(int32_t));
-    NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, 16));
-    int n_chars = snprintf((char*)buffer->data + buffer->size_bytes,
-                           (buffer->capacity_bytes - buffer->size_bytes), "%d", value);
-    if (n_chars <= 0) {
-      return EINVAL;
-    }
-
-    buffer->size_bytes += n_chars;
-    return NANOARROW_OK;
-  }
-
-  int is_negative = ArrowDecimalSign(decimal) < 0;
-
-  uint64_t words_little_endian[4];
-  if (decimal->n_words == 0) {
-    words_little_endian[0] = 0;
-    memcpy(words_little_endian, decimal->words, sizeof(uint32_t));
-  } else if (decimal->low_word_index == 0) {
-    memcpy(words_little_endian, decimal->words, decimal->n_words * sizeof(uint64_t));
-  } else {
-    for (int i = 0; i < decimal->n_words; i++) {
-      words_little_endian[i] = decimal->words[decimal->n_words - i - 1];
-    }
-  }
-
-  // We've already made a copy, so negate that if needed
-  if (is_negative) {
-    if (decimal->n_words == 0) {
-      uint32_t elem = (uint32_t)words_little_endian[0];
-      elem = ~elem + 1;
-      words_little_endian[0] = (int32_t)elem;
-    } else {
-      uint64_t carry = 1;
-      for (int i = 0; i < decimal->n_words; i++) {
-        uint64_t elem = words_little_endian[i];
-        elem = ~elem + carry;
-        carry &= (elem == 0);
-        words_little_endian[i] = elem;
-      }
-    }
-  }
-
-  // Find the most significant word that is non-zero
-  int most_significant_elem_idx = -1;
-  if (decimal->n_words == 0) {
-    if (words_little_endian[0] != 0) {
-      most_significant_elem_idx = 0;
-    }
-  } else {
-    for (int i = decimal->n_words - 1; i >= 0; i--) {
-      if (words_little_endian[i] != 0) {
-        most_significant_elem_idx = i;
-        break;
-      }
-    }
-  }
-
-  // If they are all zero, the output is just '0'
-  if (most_significant_elem_idx == -1) {
-    NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt8(buffer, '0'));
-    return NANOARROW_OK;
-  }
-
-  // Define segments such that each segment represents 9 digits with the
-  // least significant group of 9 digits first. For example, if the input represents
-  // 9876543210123456789, then segments will be [123456789, 876543210, 9].
-  // We handle at most a signed 256 bit integer, whose maximum value occupies 77
-  // characters. Thus, we need at most 9 segments.
-  const uint32_t k1e9 = 1000000000U;
-  int num_segments = 0;
-  uint32_t segments[9];
-  memset(segments, 0, sizeof(segments));
-  uint64_t* most_significant_elem = words_little_endian + most_significant_elem_idx;
-
-  do {
-    // Compute remainder = words_little_endian % 1e9 and words_little_endian =
-    // words_little_endian / 1e9.
-    uint32_t remainder = 0;
-    uint64_t* elem = most_significant_elem;
-
-    do {
-      // Compute dividend = (remainder << 32) | *elem  (a virtual 96-bit integer);
-      // *elem = dividend / 1e9;
-      // remainder = dividend % 1e9.
-      uint32_t hi = (uint32_t)(*elem >> 32);
-      uint32_t lo = (uint32_t)(*elem & 0xFFFFFFFFULL);
-      uint64_t dividend_hi = ((uint64_t)(remainder) << 32) | hi;
-      uint64_t quotient_hi = dividend_hi / k1e9;
-      remainder = (uint32_t)(dividend_hi % k1e9);
-      uint64_t dividend_lo = ((uint64_t)(remainder) << 32) | lo;
-      uint64_t quotient_lo = dividend_lo / k1e9;
-      remainder = (uint32_t)(dividend_lo % k1e9);
-
-      *elem = (quotient_hi << 32) | quotient_lo;
-    } while (elem-- != words_little_endian);
-
-    segments[num_segments++] = remainder;
-  } while (*most_significant_elem != 0 || most_significant_elem-- != words_little_endian);
-
-  // We know our output has no more than 9 digits per segment, plus a negative sign,
-  // plus any further digits between our output of 9 digits plus enough
-  // extra characters to ensure that snprintf() with n = 21 (maximum length of %lu
-  // including a the null terminator) is bounded properly.
-  NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, num_segments * 9 + 1 + 21 - 9));
-  if (is_negative) {
-    buffer->data[buffer->size_bytes++] = '-';
-  }
-
-  // The most significant segment should have no leading zeroes
-  int n_chars = snprintf((char*)buffer->data + buffer->size_bytes, 21, "%lu",
-                         (unsigned long)segments[num_segments - 1]);
-
-  // Ensure that an encoding error from snprintf() does not result
-  // in an out-of-bounds access.
-  if (n_chars < 0) {
-    return ERANGE;
-  }
-
-  buffer->size_bytes += n_chars;
-
-  // Subsequent output needs to be left-padded with zeroes such that each segment
-  // takes up exactly 9 digits.
-  for (int i = num_segments - 2; i >= 0; i--) {
-    int n_chars = snprintf((char*)buffer->data + buffer->size_bytes, 21, "%09lu",
-                           (unsigned long)segments[i]);
-    buffer->size_bytes += n_chars;
-    NANOARROW_DCHECK(buffer->size_bytes <= buffer->capacity_bytes);
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowDecimalAppendStringToBuffer(const struct ArrowDecimal* decimal,
-                                                struct ArrowBuffer* buffer) {
-  int64_t buffer_size = buffer->size_bytes;
-  NANOARROW_RETURN_NOT_OK(ArrowDecimalAppendDigitsToBuffer(decimal, buffer));
-  int64_t digits_size = buffer->size_bytes - buffer_size;
-
-  if (decimal->scale <= 0) {
-    // e.g., digits are -12345 and scale is -2 -> -1234500
-    // Just add zeros to the end
-    for (int i = decimal->scale; i < 0; i++) {
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt8(buffer, '0'));
-    }
-    return NANOARROW_OK;
-  }
-
-  int is_negative = buffer->data[0] == '-';
-  int64_t num_digits = digits_size - is_negative;
-  if (num_digits <= decimal->scale) {
-    // e.g., digits are -12345 and scale is 6 -> -0.012345
-    // Insert "0.<some zeros>" between the (maybe) negative sign and the digits
-    int64_t num_zeros_after_decimal = decimal->scale - num_digits;
-    NANOARROW_RETURN_NOT_OK(
-        ArrowBufferResize(buffer, buffer->size_bytes + num_zeros_after_decimal + 2, 0));
-
-    uint8_t* digits_start = buffer->data + is_negative;
-    memmove(digits_start + num_zeros_after_decimal + 2, digits_start, num_digits);
-    *digits_start++ = '0';
-    *digits_start++ = '.';
-    for (int i = 0; i < num_zeros_after_decimal; i++) {
-      *digits_start++ = '0';
-    }
-
-  } else {
-    // e.g., digits are -12345 and scale is 4 -> -1.2345
-    // Insert a decimal point before scale digits of output
-    NANOARROW_RETURN_NOT_OK(ArrowBufferResize(buffer, buffer->size_bytes + 1, 0));
-    uint8_t* decimal_point_to_be = buffer->data + buffer->size_bytes - 1 - decimal->scale;
-    memmove(decimal_point_to_be + 1, decimal_point_to_be, decimal->scale);
-    *decimal_point_to_be = '.';
-  }
-
-  return NANOARROW_OK;
-}
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "nanoarrow.h"
-
-static void ArrowSchemaReleaseInternal(struct ArrowSchema* schema) {
-  if (schema->format != NULL) ArrowFree((void*)schema->format);
-  if (schema->name != NULL) ArrowFree((void*)schema->name);
-  if (schema->metadata != NULL) ArrowFree((void*)schema->metadata);
-
-  // This object owns the memory for all the children, but those
-  // children may have been generated elsewhere and might have
-  // their own release() callback.
-  if (schema->children != NULL) {
-    for (int64_t i = 0; i < schema->n_children; i++) {
-      if (schema->children[i] != NULL) {
-        if (schema->children[i]->release != NULL) {
-          ArrowSchemaRelease(schema->children[i]);
-        }
-
-        ArrowFree(schema->children[i]);
-      }
-    }
-
-    ArrowFree(schema->children);
-  }
-
-  // This object owns the memory for the dictionary but it
-  // may have been generated somewhere else and have its own
-  // release() callback.
-  if (schema->dictionary != NULL) {
-    if (schema->dictionary->release != NULL) {
-      ArrowSchemaRelease(schema->dictionary);
-    }
-
-    ArrowFree(schema->dictionary);
-  }
-
-  // private data not currently used
-  if (schema->private_data != NULL) {
-    ArrowFree(schema->private_data);
-  }
-
-  schema->release = NULL;
-}
-
-static const char* ArrowSchemaFormatTemplate(enum ArrowType type) {
-  switch (type) {
-    case NANOARROW_TYPE_UNINITIALIZED:
-      return NULL;
-    case NANOARROW_TYPE_NA:
-      return "n";
-    case NANOARROW_TYPE_BOOL:
-      return "b";
-
-    case NANOARROW_TYPE_UINT8:
-      return "C";
-    case NANOARROW_TYPE_INT8:
-      return "c";
-    case NANOARROW_TYPE_UINT16:
-      return "S";
-    case NANOARROW_TYPE_INT16:
-      return "s";
-    case NANOARROW_TYPE_UINT32:
-      return "I";
-    case NANOARROW_TYPE_INT32:
-      return "i";
-    case NANOARROW_TYPE_UINT64:
-      return "L";
-    case NANOARROW_TYPE_INT64:
-      return "l";
-
-    case NANOARROW_TYPE_HALF_FLOAT:
-      return "e";
-    case NANOARROW_TYPE_FLOAT:
-      return "f";
-    case NANOARROW_TYPE_DOUBLE:
-      return "g";
-
-    case NANOARROW_TYPE_STRING:
-      return "u";
-    case NANOARROW_TYPE_LARGE_STRING:
-      return "U";
-    case NANOARROW_TYPE_STRING_VIEW:
-      return "vu";
-    case NANOARROW_TYPE_BINARY:
-      return "z";
-    case NANOARROW_TYPE_BINARY_VIEW:
-      return "vz";
-    case NANOARROW_TYPE_LARGE_BINARY:
-      return "Z";
-
-    case NANOARROW_TYPE_DATE32:
-      return "tdD";
-    case NANOARROW_TYPE_DATE64:
-      return "tdm";
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-      return "tiM";
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME:
-      return "tiD";
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO:
-      return "tin";
-
-    case NANOARROW_TYPE_LIST:
-      return "+l";
-    case NANOARROW_TYPE_LARGE_LIST:
-      return "+L";
-    case NANOARROW_TYPE_LIST_VIEW:
-      return "+vl";
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      return "+vL";
-    case NANOARROW_TYPE_STRUCT:
-      return "+s";
-    case NANOARROW_TYPE_MAP:
-      return "+m";
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      return "+r";
-
-    default:
-      return NULL;
-  }
-}
-
-static int ArrowSchemaInitChildrenIfNeeded(struct ArrowSchema* schema,
-                                           enum ArrowType type) {
-  switch (type) {
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_LARGE_LIST:
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-    case NANOARROW_TYPE_LIST_VIEW:
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema, 1));
-      ArrowSchemaInit(schema->children[0]);
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaSetName(schema->children[0], "item"));
-      break;
-    case NANOARROW_TYPE_MAP:
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema, 1));
-      NANOARROW_RETURN_NOT_OK(
-          ArrowSchemaInitFromType(schema->children[0], NANOARROW_TYPE_STRUCT));
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaSetName(schema->children[0], "entries"));
-      schema->children[0]->flags &= ~ARROW_FLAG_NULLABLE;
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema->children[0], 2));
-      ArrowSchemaInit(schema->children[0]->children[0]);
-      ArrowSchemaInit(schema->children[0]->children[1]);
-      NANOARROW_RETURN_NOT_OK(
-          ArrowSchemaSetName(schema->children[0]->children[0], "key"));
-      schema->children[0]->children[0]->flags &= ~ARROW_FLAG_NULLABLE;
-      NANOARROW_RETURN_NOT_OK(
-          ArrowSchemaSetName(schema->children[0]->children[1], "value"));
-      break;
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema, 2));
-      ArrowSchemaInit(schema->children[0]);
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaSetName(schema->children[0], "run_ends"));
-      schema->children[0]->flags &= ~ARROW_FLAG_NULLABLE;
-      ArrowSchemaInit(schema->children[1]);
-      NANOARROW_RETURN_NOT_OK(ArrowSchemaSetName(schema->children[1], "values"));
-    default:
-      break;
-  }
-
-  return NANOARROW_OK;
-}
-
-void ArrowSchemaInit(struct ArrowSchema* schema) {
-  schema->format = NULL;
-  schema->name = NULL;
-  schema->metadata = NULL;
-  schema->flags = ARROW_FLAG_NULLABLE;
-  schema->n_children = 0;
-  schema->children = NULL;
-  schema->dictionary = NULL;
-  schema->private_data = NULL;
-  schema->release = &ArrowSchemaReleaseInternal;
-}
-
-ArrowErrorCode ArrowSchemaSetType(struct ArrowSchema* schema, enum ArrowType type) {
-  // We don't allocate the dictionary because it has to be nullptr
-  // for non-dictionary-encoded arrays.
-
-  // Set the format to a valid format string for type
-  const char* template_format = ArrowSchemaFormatTemplate(type);
-
-  // If type isn't recognized and not explicitly unset
-  if (template_format == NULL && type != NANOARROW_TYPE_UNINITIALIZED) {
-    return EINVAL;
-  }
-
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetFormat(schema, template_format));
-
-  // For types with an umabiguous child structure, allocate children
-  return ArrowSchemaInitChildrenIfNeeded(schema, type);
-}
-
-ArrowErrorCode ArrowSchemaSetTypeStruct(struct ArrowSchema* schema, int64_t n_children) {
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema, NANOARROW_TYPE_STRUCT));
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema, n_children));
-  for (int64_t i = 0; i < n_children; i++) {
-    ArrowSchemaInit(schema->children[i]);
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaInitFromType(struct ArrowSchema* schema, enum ArrowType type) {
-  ArrowSchemaInit(schema);
-
-  int result = ArrowSchemaSetType(schema, type);
-  if (result != NANOARROW_OK) {
-    ArrowSchemaRelease(schema);
-    return result;
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaSetTypeFixedSize(struct ArrowSchema* schema,
-                                           enum ArrowType type, int32_t fixed_size) {
-  if (fixed_size <= 0) {
-    return EINVAL;
-  }
-
-  char buffer[64];
-  int n_chars;
-  switch (type) {
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      n_chars = snprintf(buffer, sizeof(buffer), "w:%" PRId32, fixed_size);
-      break;
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      n_chars = snprintf(buffer, sizeof(buffer), "+w:%" PRId32, fixed_size);
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (((size_t)n_chars) >= sizeof(buffer) || n_chars < 0) {
-    return ERANGE;
-  }
-
-  buffer[n_chars] = '\0';
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetFormat(schema, buffer));
-
-  if (type == NANOARROW_TYPE_FIXED_SIZE_LIST) {
-    NANOARROW_RETURN_NOT_OK(ArrowSchemaInitChildrenIfNeeded(schema, type));
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaSetTypeDecimal(struct ArrowSchema* schema, enum ArrowType type,
-                                         int32_t decimal_precision,
-                                         int32_t decimal_scale) {
-  if (decimal_precision <= 0) {
-    return EINVAL;
-  }
-
-  char buffer[64];
-  int n_chars;
-  switch (type) {
-    case NANOARROW_TYPE_DECIMAL32:
-      if (decimal_precision > 9) {
-        return EINVAL;
-      }
-
-      n_chars = snprintf(buffer, sizeof(buffer), "d:%d,%d,32", decimal_precision,
-                         decimal_scale);
-      break;
-    case NANOARROW_TYPE_DECIMAL64:
-      if (decimal_precision > 18) {
-        return EINVAL;
-      }
-
-      n_chars = snprintf(buffer, sizeof(buffer), "d:%d,%d,64", decimal_precision,
-                         decimal_scale);
-      break;
-    case NANOARROW_TYPE_DECIMAL128:
-      if (decimal_precision > 38) {
-        return EINVAL;
-      }
-
-      n_chars =
-          snprintf(buffer, sizeof(buffer), "d:%d,%d", decimal_precision, decimal_scale);
-      break;
-    case NANOARROW_TYPE_DECIMAL256:
-      if (decimal_precision > 76) {
-        return EINVAL;
-      }
-
-      n_chars = snprintf(buffer, sizeof(buffer), "d:%d,%d,256", decimal_precision,
-                         decimal_scale);
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (((size_t)n_chars) >= sizeof(buffer) || n_chars < 0) {
-    return ERANGE;
-  }
-
-  buffer[n_chars] = '\0';
-  return ArrowSchemaSetFormat(schema, buffer);
-}
-
-ArrowErrorCode ArrowSchemaSetTypeRunEndEncoded(struct ArrowSchema* schema,
-                                               enum ArrowType run_end_type) {
-  switch (run_end_type) {
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_INT64:
-      break;
-    default:
-      return EINVAL;
-  }
-
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetFormat(
-      schema, ArrowSchemaFormatTemplate(NANOARROW_TYPE_RUN_END_ENCODED)));
-  NANOARROW_RETURN_NOT_OK(
-      ArrowSchemaInitChildrenIfNeeded(schema, NANOARROW_TYPE_RUN_END_ENCODED));
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema->children[0], run_end_type));
-  NANOARROW_RETURN_NOT_OK(
-      ArrowSchemaSetType(schema->children[1], NANOARROW_TYPE_UNINITIALIZED));
-
-  return NANOARROW_OK;
-}
-
-static const char* ArrowTimeUnitFormatString(enum ArrowTimeUnit time_unit) {
-  switch (time_unit) {
-    case NANOARROW_TIME_UNIT_SECOND:
-      return "s";
-    case NANOARROW_TIME_UNIT_MILLI:
-      return "m";
-    case NANOARROW_TIME_UNIT_MICRO:
-      return "u";
-    case NANOARROW_TIME_UNIT_NANO:
-      return "n";
-    default:
-      return NULL;
-  }
-}
-
-ArrowErrorCode ArrowSchemaSetTypeDateTime(struct ArrowSchema* schema, enum ArrowType type,
-                                          enum ArrowTimeUnit time_unit,
-                                          const char* timezone) {
-  const char* time_unit_str = ArrowTimeUnitFormatString(time_unit);
-  if (time_unit_str == NULL) {
-    return EINVAL;
-  }
-
-  char buffer[128];
-  int n_chars;
-  switch (type) {
-    case NANOARROW_TYPE_TIME32:
-      if (timezone != NULL) {
-        return EINVAL;
-      }
-
-      switch (time_unit) {
-        case NANOARROW_TIME_UNIT_MICRO:
-        case NANOARROW_TIME_UNIT_NANO:
-          return EINVAL;
-        default:
-          break;
-      }
-
-      n_chars = snprintf(buffer, sizeof(buffer), "tt%s", time_unit_str);
-      break;
-    case NANOARROW_TYPE_TIME64:
-      if (timezone != NULL) {
-        return EINVAL;
-      }
-
-      switch (time_unit) {
-        case NANOARROW_TIME_UNIT_SECOND:
-        case NANOARROW_TIME_UNIT_MILLI:
-          return EINVAL;
-        default:
-          break;
-      }
-
-      n_chars = snprintf(buffer, sizeof(buffer), "tt%s", time_unit_str);
-      break;
-    case NANOARROW_TYPE_TIMESTAMP:
-      if (timezone == NULL) {
-        timezone = "";
-      }
-      n_chars = snprintf(buffer, sizeof(buffer), "ts%s:%s", time_unit_str, timezone);
-      break;
-    case NANOARROW_TYPE_DURATION:
-      if (timezone != NULL) {
-        return EINVAL;
-      }
-      n_chars = snprintf(buffer, sizeof(buffer), "tD%s", time_unit_str);
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (((size_t)n_chars) >= sizeof(buffer) || n_chars < 0) {
-    return ERANGE;
-  }
-
-  buffer[n_chars] = '\0';
-
-  return ArrowSchemaSetFormat(schema, buffer);
-}
-
-ArrowErrorCode ArrowSchemaSetTypeUnion(struct ArrowSchema* schema, enum ArrowType type,
-                                       int64_t n_children) {
-  if (n_children < 0 || n_children > 127) {
-    return EINVAL;
-  }
-
-  // Max valid size would be +ud:0,1,...126 = 401 characters + null terminator
-  char format_out[512];
-  int64_t format_out_size = 512;
-  memset(format_out, 0, format_out_size);
-  int n_chars;
-  char* format_cursor = format_out;
-
-  switch (type) {
-    case NANOARROW_TYPE_SPARSE_UNION:
-      n_chars = snprintf(format_cursor, format_out_size, "+us:");
-      format_cursor += n_chars;
-      format_out_size -= n_chars;
-      break;
-    case NANOARROW_TYPE_DENSE_UNION:
-      n_chars = snprintf(format_cursor, format_out_size, "+ud:");
-      format_cursor += n_chars;
-      format_out_size -= n_chars;
-      break;
-    default:
-      return EINVAL;
-  }
-
-  // Ensure that an encoding error from snprintf() does not result
-  // in an out-of-bounds access.
-  if (n_chars < 0) {
-    return ERANGE;
-  }
-
-  if (n_children > 0) {
-    n_chars = snprintf(format_cursor, format_out_size, "0");
-    format_cursor += n_chars;
-    format_out_size -= n_chars;
-
-    for (int64_t i = 1; i < n_children; i++) {
-      n_chars = snprintf(format_cursor, format_out_size, ",%" PRId64, i);
-      format_cursor += n_chars;
-      format_out_size -= n_chars;
-    }
-  }
-
-  // Ensure that an encoding error from snprintf() does not result
-  // in an out-of-bounds access.
-  if (n_chars < 0) {
-    return ERANGE;
-  }
-
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaSetFormat(schema, format_out));
-
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaAllocateChildren(schema, n_children));
-  for (int64_t i = 0; i < n_children; i++) {
-    ArrowSchemaInit(schema->children[i]);
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaSetFormat(struct ArrowSchema* schema, const char* format) {
-  if (schema->format != NULL) {
-    ArrowFree((void*)schema->format);
-  }
-
-  if (format != NULL) {
-    size_t format_size = strlen(format) + 1;
-    schema->format = (const char*)ArrowMalloc(format_size);
-    if (schema->format == NULL) {
-      return ENOMEM;
-    }
-
-    memcpy((void*)schema->format, format, format_size);
-  } else {
-    schema->format = NULL;
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaSetName(struct ArrowSchema* schema, const char* name) {
-  if (schema->name != NULL) {
-    ArrowFree((void*)schema->name);
-  }
-
-  if (name != NULL) {
-    size_t name_size = strlen(name) + 1;
-    schema->name = (const char*)ArrowMalloc(name_size);
-    if (schema->name == NULL) {
-      return ENOMEM;
-    }
-
-    memcpy((void*)schema->name, name, name_size);
-  } else {
-    schema->name = NULL;
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaSetMetadata(struct ArrowSchema* schema, const char* metadata) {
-  if (schema->metadata != NULL) {
-    ArrowFree((void*)schema->metadata);
-  }
-
-  if (metadata != NULL) {
-    size_t metadata_size = ArrowMetadataSizeOf(metadata);
-    schema->metadata = (const char*)ArrowMalloc(metadata_size);
-    if (schema->metadata == NULL) {
-      return ENOMEM;
-    }
-
-    memcpy((void*)schema->metadata, metadata, metadata_size);
-  } else {
-    schema->metadata = NULL;
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaAllocateChildren(struct ArrowSchema* schema,
-                                           int64_t n_children) {
-  if (schema->children != NULL) {
-    return EEXIST;
-  }
-
-  if (n_children > 0) {
-    schema->children =
-        (struct ArrowSchema**)ArrowMalloc(n_children * sizeof(struct ArrowSchema*));
-
-    if (schema->children == NULL) {
-      return ENOMEM;
-    }
-
-    schema->n_children = n_children;
-
-    memset(schema->children, 0, n_children * sizeof(struct ArrowSchema*));
-
-    for (int64_t i = 0; i < n_children; i++) {
-      schema->children[i] = (struct ArrowSchema*)ArrowMalloc(sizeof(struct ArrowSchema));
-
-      if (schema->children[i] == NULL) {
-        return ENOMEM;
-      }
-
-      schema->children[i]->release = NULL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaAllocateDictionary(struct ArrowSchema* schema) {
-  if (schema->dictionary != NULL) {
-    return EEXIST;
-  }
-
-  schema->dictionary = (struct ArrowSchema*)ArrowMalloc(sizeof(struct ArrowSchema));
-  if (schema->dictionary == NULL) {
-    return ENOMEM;
-  }
-
-  schema->dictionary->release = NULL;
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaDeepCopy(const struct ArrowSchema* schema,
-                                   struct ArrowSchema* schema_out) {
-  ArrowSchemaInit(schema_out);
-
-  int result = ArrowSchemaSetFormat(schema_out, schema->format);
-  if (result != NANOARROW_OK) {
-    ArrowSchemaRelease(schema_out);
-    return result;
-  }
-
-  schema_out->flags = schema->flags;
-
-  result = ArrowSchemaSetName(schema_out, schema->name);
-  if (result != NANOARROW_OK) {
-    ArrowSchemaRelease(schema_out);
-    return result;
-  }
-
-  result = ArrowSchemaSetMetadata(schema_out, schema->metadata);
-  if (result != NANOARROW_OK) {
-    ArrowSchemaRelease(schema_out);
-    return result;
-  }
-
-  result = ArrowSchemaAllocateChildren(schema_out, schema->n_children);
-  if (result != NANOARROW_OK) {
-    ArrowSchemaRelease(schema_out);
-    return result;
-  }
-
-  for (int64_t i = 0; i < schema->n_children; i++) {
-    result = ArrowSchemaDeepCopy(schema->children[i], schema_out->children[i]);
-    if (result != NANOARROW_OK) {
-      ArrowSchemaRelease(schema_out);
-      return result;
-    }
-  }
-
-  if (schema->dictionary != NULL) {
-    result = ArrowSchemaAllocateDictionary(schema_out);
-    if (result != NANOARROW_OK) {
-      ArrowSchemaRelease(schema_out);
-      return result;
-    }
-
-    result = ArrowSchemaDeepCopy(schema->dictionary, schema_out->dictionary);
-    if (result != NANOARROW_OK) {
-      ArrowSchemaRelease(schema_out);
-      return result;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static void ArrowSchemaViewSetPrimitive(struct ArrowSchemaView* schema_view,
-                                        enum ArrowType type) {
-  schema_view->type = type;
-  schema_view->storage_type = type;
-}
-
-static ArrowErrorCode ArrowSchemaViewParse(struct ArrowSchemaView* schema_view,
-                                           const char* format,
-                                           const char** format_end_out,
-                                           struct ArrowError* error) {
-  *format_end_out = format;
-
-  // needed for decimal parsing
-  const char* parse_start;
-  char* parse_end;
-
-  switch (format[0]) {
-    case 'n':
-      schema_view->type = NANOARROW_TYPE_NA;
-      schema_view->storage_type = NANOARROW_TYPE_NA;
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'b':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_BOOL);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'c':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT8);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'C':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_UINT8);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 's':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT16);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'S':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_UINT16);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'i':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT32);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'I':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_UINT32);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'l':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'L':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_UINT64);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'e':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_HALF_FLOAT);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'f':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_FLOAT);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'g':
-      ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_DOUBLE);
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-
-    // decimal
-    case 'd':
-      if (format[1] != ':' || format[2] == '\0') {
-        ArrowErrorSet(error, "Expected ':precision,scale[,bitwidth]' following 'd'");
-        return EINVAL;
-      }
-
-      parse_start = format + 2;
-      schema_view->decimal_precision = (int32_t)strtol(parse_start, &parse_end, 10);
-      if (parse_end == parse_start || parse_end[0] != ',') {
-        ArrowErrorSet(error, "Expected 'precision,scale[,bitwidth]' following 'd:'");
-        return EINVAL;
-      }
-
-      parse_start = parse_end + 1;
-      schema_view->decimal_scale = (int32_t)strtol(parse_start, &parse_end, 10);
-      if (parse_end == parse_start) {
-        ArrowErrorSet(error, "Expected 'scale[,bitwidth]' following 'd:precision,'");
-        return EINVAL;
-      } else if (parse_end[0] != ',') {
-        schema_view->decimal_bitwidth = 128;
-      } else {
-        parse_start = parse_end + 1;
-        schema_view->decimal_bitwidth = (int32_t)strtol(parse_start, &parse_end, 10);
-        if (parse_start == parse_end) {
-          ArrowErrorSet(error, "Expected precision following 'd:precision,scale,'");
-          return EINVAL;
-        }
-      }
-
-      *format_end_out = parse_end;
-
-      switch (schema_view->decimal_bitwidth) {
-        case 32:
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_DECIMAL32);
-          return NANOARROW_OK;
-        case 64:
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_DECIMAL64);
-          return NANOARROW_OK;
-        case 128:
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_DECIMAL128);
-          return NANOARROW_OK;
-        case 256:
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_DECIMAL256);
-          return NANOARROW_OK;
-        default:
-          ArrowErrorSet(error,
-                        "Expected decimal bitwidth of 128 or 256 but found %" PRId32,
-                        schema_view->decimal_bitwidth);
-          return EINVAL;
-      }
-
-    // validity + data
-    case 'w':
-      schema_view->type = NANOARROW_TYPE_FIXED_SIZE_BINARY;
-      schema_view->storage_type = NANOARROW_TYPE_FIXED_SIZE_BINARY;
-      if (format[1] != ':' || format[2] == '\0') {
-        ArrowErrorSet(error, "Expected ':<width>' following 'w'");
-        return EINVAL;
-      }
-
-      schema_view->fixed_size = (int32_t)strtol(format + 2, (char**)format_end_out, 10);
-      return NANOARROW_OK;
-
-    // validity + offset + data
-    case 'z':
-      schema_view->type = NANOARROW_TYPE_BINARY;
-      schema_view->storage_type = NANOARROW_TYPE_BINARY;
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'u':
-      schema_view->type = NANOARROW_TYPE_STRING;
-      schema_view->storage_type = NANOARROW_TYPE_STRING;
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-
-    // validity + large_offset + data
-    case 'Z':
-      schema_view->type = NANOARROW_TYPE_LARGE_BINARY;
-      schema_view->storage_type = NANOARROW_TYPE_LARGE_BINARY;
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-    case 'U':
-      schema_view->type = NANOARROW_TYPE_LARGE_STRING;
-      schema_view->storage_type = NANOARROW_TYPE_LARGE_STRING;
-      *format_end_out = format + 1;
-      return NANOARROW_OK;
-
-    // nested types
-    case '+':
-      switch (format[1]) {
-        // list has validity + offset or offset
-        case 'l':
-          schema_view->storage_type = NANOARROW_TYPE_LIST;
-          schema_view->type = NANOARROW_TYPE_LIST;
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-
-        // large list has validity + large_offset or large_offset
-        case 'L':
-          schema_view->storage_type = NANOARROW_TYPE_LARGE_LIST;
-          schema_view->type = NANOARROW_TYPE_LARGE_LIST;
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-
-        // run end encoded has no buffer at all
-        case 'r':
-          schema_view->storage_type = NANOARROW_TYPE_RUN_END_ENCODED;
-          schema_view->type = NANOARROW_TYPE_RUN_END_ENCODED;
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-
-        // just validity buffer
-        case 'w':
-          if (format[2] != ':' || format[3] == '\0') {
-            ArrowErrorSet(error, "Expected ':<width>' following '+w'");
-            return EINVAL;
-          }
-
-          schema_view->storage_type = NANOARROW_TYPE_FIXED_SIZE_LIST;
-          schema_view->type = NANOARROW_TYPE_FIXED_SIZE_LIST;
-          schema_view->fixed_size =
-              (int32_t)strtol(format + 3, (char**)format_end_out, 10);
-          return NANOARROW_OK;
-        case 's':
-          schema_view->storage_type = NANOARROW_TYPE_STRUCT;
-          schema_view->type = NANOARROW_TYPE_STRUCT;
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-        case 'm':
-          schema_view->storage_type = NANOARROW_TYPE_MAP;
-          schema_view->type = NANOARROW_TYPE_MAP;
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-
-        // unions
-        case 'u':
-          switch (format[2]) {
-            case 'd':
-              schema_view->storage_type = NANOARROW_TYPE_DENSE_UNION;
-              schema_view->type = NANOARROW_TYPE_DENSE_UNION;
-              break;
-            case 's':
-              schema_view->storage_type = NANOARROW_TYPE_SPARSE_UNION;
-              schema_view->type = NANOARROW_TYPE_SPARSE_UNION;
-              break;
-            default:
-              ArrowErrorSet(error,
-                            "Expected union format string +us:<type_ids> or "
-                            "+ud:<type_ids> but found '%s'",
-                            format);
-              return EINVAL;
-          }
-
-          if (format[3] == ':') {
-            schema_view->union_type_ids = format + 4;
-            int64_t n_type_ids =
-                _ArrowParseUnionTypeIds(schema_view->union_type_ids, NULL);
-            if (n_type_ids != schema_view->schema->n_children) {
-              ArrowErrorSet(error,
-                            "Expected union type_ids parameter to be a comma-separated "
-                            "list of %" PRId64 " values between 0 and 127 but found '%s'",
-                            schema_view->schema->n_children, schema_view->union_type_ids);
-              return EINVAL;
-            }
-            *format_end_out = format + strlen(format);
-            return NANOARROW_OK;
-          } else {
-            ArrowErrorSet(error,
-                          "Expected union format string +us:<type_ids> or +ud:<type_ids> "
-                          "but found '%s'",
-                          format);
-            return EINVAL;
-          }
-
-        // views
-        case 'v':
-          switch (format[2]) {
-            case 'l':
-              schema_view->storage_type = NANOARROW_TYPE_LIST_VIEW;
-              schema_view->type = NANOARROW_TYPE_LIST_VIEW;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'L':
-              schema_view->storage_type = NANOARROW_TYPE_LARGE_LIST_VIEW;
-              schema_view->type = NANOARROW_TYPE_LARGE_LIST_VIEW;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            default:
-              ArrowErrorSet(
-                  error, "Expected view format string +vl or +vL but found '%s'", format);
-              return EINVAL;
-          }
-        default:
-          ArrowErrorSet(error, "Expected nested type format string but found '%s'",
-                        format);
-          return EINVAL;
-      }
-
-    // date/time types
-    case 't':
-      switch (format[1]) {
-        // date
-        case 'd':
-          switch (format[2]) {
-            case 'D':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT32);
-              schema_view->type = NANOARROW_TYPE_DATE32;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'm':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_DATE64;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            default:
-              ArrowErrorSet(error, "Expected 'D' or 'm' following 'td' but found '%s'",
-                            format + 2);
-              return EINVAL;
-          }
-
-        // time of day
-        case 't':
-          switch (format[2]) {
-            case 's':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT32);
-              schema_view->type = NANOARROW_TYPE_TIME32;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_SECOND;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'm':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT32);
-              schema_view->type = NANOARROW_TYPE_TIME32;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MILLI;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'u':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIME64;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MICRO;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'n':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIME64;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_NANO;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            default:
-              ArrowErrorSet(
-                  error, "Expected 's', 'm', 'u', or 'n' following 'tt' but found '%s'",
-                  format + 2);
-              return EINVAL;
-          }
-
-        // timestamp
-        case 's':
-          switch (format[2]) {
-            case 's':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIMESTAMP;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_SECOND;
-              break;
-            case 'm':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIMESTAMP;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MILLI;
-              break;
-            case 'u':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIMESTAMP;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MICRO;
-              break;
-            case 'n':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_TIMESTAMP;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_NANO;
-              break;
-            default:
-              ArrowErrorSet(
-                  error, "Expected 's', 'm', 'u', or 'n' following 'ts' but found '%s'",
-                  format + 2);
-              return EINVAL;
-          }
-
-          if (format[3] != ':') {
-            ArrowErrorSet(error, "Expected ':' following '%.3s' but found '%s'", format,
-                          format + 3);
-            return EINVAL;
-          }
-
-          schema_view->timezone = format + 4;
-          *format_end_out = format + strlen(format);
-          return NANOARROW_OK;
-
-        // duration
-        case 'D':
-          switch (format[2]) {
-            case 's':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_DURATION;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_SECOND;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'm':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_DURATION;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MILLI;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'u':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_DURATION;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_MICRO;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'n':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INT64);
-              schema_view->type = NANOARROW_TYPE_DURATION;
-              schema_view->time_unit = NANOARROW_TIME_UNIT_NANO;
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            default:
-              ArrowErrorSet(error,
-                            "Expected 's', 'm', u', or 'n' following 'tD' but found '%s'",
-                            format + 2);
-              return EINVAL;
-          }
-
-        // interval
-        case 'i':
-          switch (format[2]) {
-            case 'M':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INTERVAL_MONTHS);
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'D':
-              ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_INTERVAL_DAY_TIME);
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            case 'n':
-              ArrowSchemaViewSetPrimitive(schema_view,
-                                          NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO);
-              *format_end_out = format + 3;
-              return NANOARROW_OK;
-            default:
-              ArrowErrorSet(error,
-                            "Expected 'M', 'D', or 'n' following 'ti' but found '%s'",
-                            format + 2);
-              return EINVAL;
-          }
-
-        default:
-          ArrowErrorSet(
-              error, "Expected 'd', 't', 's', 'D', or 'i' following 't' but found '%s'",
-              format + 1);
-          return EINVAL;
-      }
-
-    // view types
-    case 'v': {
-      switch (format[1]) {
-        case 'u':
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_STRING_VIEW);
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-        case 'z':
-          ArrowSchemaViewSetPrimitive(schema_view, NANOARROW_TYPE_BINARY_VIEW);
-          *format_end_out = format + 2;
-          return NANOARROW_OK;
-        default:
-          ArrowErrorSet(error, "Expected 'u', or 'z' following 'v' but found '%s'",
-                        format + 1);
-          return EINVAL;
-      }
-    }
-
-    default:
-      ArrowErrorSet(error, "Unknown format: '%s'", format);
-      return EINVAL;
-  }
-}
-
-static ArrowErrorCode ArrowSchemaViewValidateNChildren(
-    struct ArrowSchemaView* schema_view, int64_t n_children, struct ArrowError* error) {
-  if (n_children != -1 && schema_view->schema->n_children != n_children) {
-    ArrowErrorSet(
-        error, "Expected schema with %" PRId64 " children but found %" PRId64 " children",
-        n_children, schema_view->schema->n_children);
-    return EINVAL;
-  }
-
-  // Don't do a full validation of children but do check that they won't
-  // segfault if inspected
-  struct ArrowSchema* child;
-  for (int64_t i = 0; i < schema_view->schema->n_children; i++) {
-    child = schema_view->schema->children[i];
-    if (child == NULL) {
-      ArrowErrorSet(
-          error, "Expected valid schema at schema->children[%" PRId64 "] but found NULL",
-          i);
-      return EINVAL;
-    } else if (child->release == NULL) {
-      ArrowErrorSet(error,
-                    "Expected valid schema at schema->children[%" PRId64
-                    "] but found a released schema",
-                    i);
-      return EINVAL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowSchemaViewValidateUnion(struct ArrowSchemaView* schema_view,
-                                                   struct ArrowError* error) {
-  return ArrowSchemaViewValidateNChildren(schema_view, -1, error);
-}
-
-static ArrowErrorCode ArrowSchemaViewValidateMap(struct ArrowSchemaView* schema_view,
-                                                 struct ArrowError* error) {
-  NANOARROW_RETURN_NOT_OK(ArrowSchemaViewValidateNChildren(schema_view, 1, error));
-
-  if (schema_view->schema->children[0]->n_children != 2) {
-    ArrowErrorSet(error,
-                  "Expected child of map type to have 2 children but found %" PRId64,
-                  schema_view->schema->children[0]->n_children);
-    return EINVAL;
-  }
-
-  if (strcmp(schema_view->schema->children[0]->format, "+s") != 0) {
-    ArrowErrorSet(error, "Expected format of child of map type to be '+s' but found '%s'",
-                  schema_view->schema->children[0]->format);
-    return EINVAL;
-  }
-
-  if (schema_view->schema->children[0]->flags & ARROW_FLAG_NULLABLE) {
-    ArrowErrorSet(error,
-                  "Expected child of map type to be non-nullable but was nullable");
-    return EINVAL;
-  }
-
-  if (schema_view->schema->children[0]->children[0]->flags & ARROW_FLAG_NULLABLE) {
-    ArrowErrorSet(error, "Expected key of map type to be non-nullable but was nullable");
-    return EINVAL;
-  }
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowSchemaViewValidateDictionary(
-    struct ArrowSchemaView* schema_view, struct ArrowError* error) {
-  // check for valid index type
-  switch (schema_view->storage_type) {
-    case NANOARROW_TYPE_UINT8:
-    case NANOARROW_TYPE_INT8:
-    case NANOARROW_TYPE_UINT16:
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_UINT32:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_UINT64:
-    case NANOARROW_TYPE_INT64:
-      break;
-    default:
-      ArrowErrorSet(
-          error,
-          "Expected dictionary schema index type to be an integral type but found '%s'",
-          schema_view->schema->format);
-      return EINVAL;
-  }
-
-  struct ArrowSchemaView dictionary_schema_view;
-  return ArrowSchemaViewInit(&dictionary_schema_view, schema_view->schema->dictionary,
-                             error);
-}
-
-static ArrowErrorCode ArrowSchemaViewValidate(struct ArrowSchemaView* schema_view,
-                                              enum ArrowType type,
-                                              struct ArrowError* error) {
-  switch (type) {
-    case NANOARROW_TYPE_NA:
-    case NANOARROW_TYPE_BOOL:
-    case NANOARROW_TYPE_UINT8:
-    case NANOARROW_TYPE_INT8:
-    case NANOARROW_TYPE_UINT16:
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_UINT32:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_UINT64:
-    case NANOARROW_TYPE_INT64:
-    case NANOARROW_TYPE_HALF_FLOAT:
-    case NANOARROW_TYPE_FLOAT:
-    case NANOARROW_TYPE_DOUBLE:
-    case NANOARROW_TYPE_DECIMAL32:
-    case NANOARROW_TYPE_DECIMAL64:
-    case NANOARROW_TYPE_DECIMAL128:
-    case NANOARROW_TYPE_DECIMAL256:
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_BINARY:
-    case NANOARROW_TYPE_LARGE_BINARY:
-    case NANOARROW_TYPE_DATE32:
-    case NANOARROW_TYPE_DATE64:
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME:
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO:
-    case NANOARROW_TYPE_TIMESTAMP:
-    case NANOARROW_TYPE_TIME32:
-    case NANOARROW_TYPE_TIME64:
-    case NANOARROW_TYPE_DURATION:
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      return ArrowSchemaViewValidateNChildren(schema_view, 0, error);
-
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      if (schema_view->fixed_size <= 0) {
-        ArrowErrorSet(error, "Expected size > 0 for fixed size binary but found size %d",
-                      schema_view->fixed_size);
-        return EINVAL;
-      }
-      return ArrowSchemaViewValidateNChildren(schema_view, 0, error);
-
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_LIST_VIEW:
-    case NANOARROW_TYPE_LARGE_LIST:
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      return ArrowSchemaViewValidateNChildren(schema_view, 1, error);
-
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      return ArrowSchemaViewValidateNChildren(schema_view, 2, error);
-
-    case NANOARROW_TYPE_STRUCT:
-      return ArrowSchemaViewValidateNChildren(schema_view, -1, error);
-
-    case NANOARROW_TYPE_SPARSE_UNION:
-    case NANOARROW_TYPE_DENSE_UNION:
-      return ArrowSchemaViewValidateUnion(schema_view, error);
-
-    case NANOARROW_TYPE_MAP:
-      return ArrowSchemaViewValidateMap(schema_view, error);
-
-    case NANOARROW_TYPE_DICTIONARY:
-      return ArrowSchemaViewValidateDictionary(schema_view, error);
-
-    default:
-      ArrowErrorSet(error, "Expected a valid enum ArrowType value but found %d",
-                    schema_view->type);
-      return EINVAL;
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowSchemaViewInit(struct ArrowSchemaView* schema_view,
-                                   const struct ArrowSchema* schema,
-                                   struct ArrowError* error) {
-  if (schema == NULL) {
-    ArrowErrorSet(error, "Expected non-NULL schema");
-    return EINVAL;
-  }
-
-  if (schema->release == NULL) {
-    ArrowErrorSet(error, "Expected non-released schema");
-    return EINVAL;
-  }
-
-  schema_view->schema = schema;
-
-  const char* format = schema->format;
-  if (format == NULL) {
-    ArrowErrorSet(
-        error,
-        "Error parsing schema->format: Expected a null-terminated string but found NULL");
-    return EINVAL;
-  }
-
-  size_t format_len = strlen(format);
-  if (format_len == 0) {
-    ArrowErrorSet(error, "Error parsing schema->format: Expected a string with size > 0");
-    return EINVAL;
-  }
-
-  const char* format_end_out;
-  int result = ArrowSchemaViewParse(schema_view, format, &format_end_out, error);
-
-  if (result != NANOARROW_OK) {
-    if (error != NULL) {
-      char child_error[1024];
-      memcpy(child_error, ArrowErrorMessage(error), 1024);
-      ArrowErrorSet(error, "Error parsing schema->format: %s", child_error);
-    }
-
-    return result;
-  }
-
-  if ((format + format_len) != format_end_out) {
-    ArrowErrorSet(error, "Error parsing schema->format '%s': parsed %d/%zu characters",
-                  format, (int)(format_end_out - format), format_len);
-    return EINVAL;
-  }
-
-  if (schema->dictionary != NULL) {
-    schema_view->type = NANOARROW_TYPE_DICTIONARY;
-  }
-
-  NANOARROW_RETURN_NOT_OK(
-      ArrowSchemaViewValidate(schema_view, schema_view->storage_type, error));
-
-  if (schema_view->storage_type != schema_view->type) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowSchemaViewValidate(schema_view, schema_view->type, error));
-  }
-
-  int64_t unknown_flags = schema->flags & ~NANOARROW_FLAG_ALL_SUPPORTED;
-  if (unknown_flags != 0) {
-    ArrowErrorSet(error, "Unknown ArrowSchema flag");
-    return EINVAL;
-  }
-
-  if (schema->flags & ARROW_FLAG_DICTIONARY_ORDERED &&
-      schema_view->type != NANOARROW_TYPE_DICTIONARY) {
-    ArrowErrorSet(error,
-                  "ARROW_FLAG_DICTIONARY_ORDERED is only relevant for dictionaries");
-    return EINVAL;
-  }
-
-  if (schema->flags & ARROW_FLAG_MAP_KEYS_SORTED &&
-      schema_view->type != NANOARROW_TYPE_MAP) {
-    ArrowErrorSet(error, "ARROW_FLAG_MAP_KEYS_SORTED is only relevant for a map type");
-    return EINVAL;
-  }
-
-  ArrowLayoutInit(&schema_view->layout, schema_view->storage_type);
-  if (schema_view->storage_type == NANOARROW_TYPE_FIXED_SIZE_BINARY) {
-    schema_view->layout.element_size_bits[1] = (int64_t)schema_view->fixed_size * 8;
-  } else if (schema_view->storage_type == NANOARROW_TYPE_FIXED_SIZE_LIST) {
-    schema_view->layout.child_size_elements = schema_view->fixed_size;
-  }
-
-  schema_view->extension_name = ArrowCharView(NULL);
-  schema_view->extension_metadata = ArrowCharView(NULL);
-  NANOARROW_RETURN_NOT_OK(ArrowMetadataGetValue(schema->metadata,
-                                                ArrowCharView("ARROW:extension:name"),
-                                                &schema_view->extension_name));
-  NANOARROW_RETURN_NOT_OK(ArrowMetadataGetValue(schema->metadata,
-                                                ArrowCharView("ARROW:extension:metadata"),
-                                                &schema_view->extension_metadata));
-
-  return NANOARROW_OK;
-}
-
-static int64_t ArrowSchemaTypeToStringInternal(struct ArrowSchemaView* schema_view,
-                                               char* out, int64_t n) {
-  const char* type_string = ArrowTypeString(schema_view->type);
-  switch (schema_view->type) {
-    case NANOARROW_TYPE_DECIMAL32:
-    case NANOARROW_TYPE_DECIMAL64:
-    case NANOARROW_TYPE_DECIMAL128:
-    case NANOARROW_TYPE_DECIMAL256:
-      return snprintf(out, n, "%s(%" PRId32 ", %" PRId32 ")", type_string,
-                      schema_view->decimal_precision, schema_view->decimal_scale);
-    case NANOARROW_TYPE_TIMESTAMP:
-      return snprintf(out, n, "%s('%s', '%s')", type_string,
-                      ArrowTimeUnitString(schema_view->time_unit), schema_view->timezone);
-    case NANOARROW_TYPE_TIME32:
-    case NANOARROW_TYPE_TIME64:
-    case NANOARROW_TYPE_DURATION:
-      return snprintf(out, n, "%s('%s')", type_string,
-                      ArrowTimeUnitString(schema_view->time_unit));
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      return snprintf(out, n, "%s(%" PRId32 ")", type_string, schema_view->fixed_size);
-    case NANOARROW_TYPE_SPARSE_UNION:
-    case NANOARROW_TYPE_DENSE_UNION:
-      return snprintf(out, n, "%s([%s])", type_string, schema_view->union_type_ids);
-    default:
-      return snprintf(out, n, "%s", type_string);
-  }
-}
-
-// Helper for bookkeeping to emulate sprintf()-like behaviour spread
-// among multiple sprintf calls.
-static inline void ArrowToStringLogChars(char** out, int64_t n_chars_last,
-                                         int64_t* n_remaining, int64_t* n_chars) {
-  // In the unlikely snprintf() returning a negative value (encoding error),
-  // ensure the result won't cause an out-of-bounds access.
-  if (n_chars_last < 0) {
-    n_chars_last = 0;
-  }
-
-  *n_chars += n_chars_last;
-  *n_remaining -= n_chars_last;
-
-  // n_remaining is never less than 0
-  if (*n_remaining < 0) {
-    *n_remaining = 0;
-  }
-
-  // Can't do math on a NULL pointer
-  if (*out != NULL) {
-    *out += n_chars_last;
-  }
-}
-
-int64_t ArrowSchemaToString(const struct ArrowSchema* schema, char* out, int64_t n,
-                            char recursive) {
-  if (schema == NULL) {
-    return snprintf(out, n, "[invalid: pointer is null]");
-  }
-
-  if (schema->release == NULL) {
-    return snprintf(out, n, "[invalid: schema is released]");
-  }
-
-  struct ArrowSchemaView schema_view;
-  struct ArrowError error;
-
-  if (ArrowSchemaViewInit(&schema_view, schema, &error) != NANOARROW_OK) {
-    return snprintf(out, n, "[invalid: %s]", ArrowErrorMessage(&error));
-  }
-
-  // Extension type and dictionary should include both the top-level type
-  // and the storage type.
-  int is_extension = schema_view.extension_name.size_bytes > 0;
-  int is_dictionary = schema->dictionary != NULL;
-  int64_t n_chars = 0;
-  int64_t n_chars_last = 0;
-
-  // Uncommon but not technically impossible that both are true
-  if (is_extension && is_dictionary) {
-    n_chars_last = snprintf(
-        out, n, "%.*s{dictionary(%s)<", (int)schema_view.extension_name.size_bytes,
-        schema_view.extension_name.data, ArrowTypeString(schema_view.storage_type));
-  } else if (is_extension) {
-    n_chars_last = snprintf(out, n, "%.*s{", (int)schema_view.extension_name.size_bytes,
-                            schema_view.extension_name.data);
-  } else if (is_dictionary) {
-    n_chars_last =
-        snprintf(out, n, "dictionary(%s)<", ArrowTypeString(schema_view.storage_type));
-  }
-
-  ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-
-  if (!is_dictionary) {
-    n_chars_last = ArrowSchemaTypeToStringInternal(&schema_view, out, n);
-  } else {
-    n_chars_last = ArrowSchemaToString(schema->dictionary, out, n, recursive);
-  }
-
-  ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-
-  if (recursive && schema->format[0] == '+') {
-    n_chars_last = snprintf(out, n, "<");
-    ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-
-    for (int64_t i = 0; i < schema->n_children; i++) {
-      if (i > 0) {
-        n_chars_last = snprintf(out, n, ", ");
-        ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-      }
-
-      // ArrowSchemaToStringInternal() will validate the child and print the error,
-      // but we need the name first
-      if (schema->children[i] != NULL && schema->children[i]->release != NULL &&
-          schema->children[i]->name != NULL) {
-        n_chars_last = snprintf(out, n, "%s: ", schema->children[i]->name);
-        ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-      }
-
-      n_chars_last = ArrowSchemaToString(schema->children[i], out, n, recursive);
-      ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-    }
-
-    n_chars_last = snprintf(out, n, ">");
-    ArrowToStringLogChars(&out, n_chars_last, &n, &n_chars);
-  }
-
-  if (is_extension && is_dictionary) {
-    n_chars += snprintf(out, n, ">}");
-  } else if (is_extension) {
-    n_chars += snprintf(out, n, "}");
-  } else if (is_dictionary) {
-    n_chars += snprintf(out, n, ">");
-  }
-
-  // Ensure that we always return a positive result
-  if (n_chars > 0) {
-    return n_chars;
-  } else {
-    return 0;
-  }
-}
-
-ArrowErrorCode ArrowMetadataReaderInit(struct ArrowMetadataReader* reader,
-                                       const char* metadata) {
-  reader->metadata = metadata;
-
-  if (reader->metadata == NULL) {
-    reader->offset = 0;
-    reader->remaining_keys = 0;
-  } else {
-    memcpy(&reader->remaining_keys, reader->metadata, sizeof(int32_t));
-    reader->offset = sizeof(int32_t);
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowMetadataReaderRead(struct ArrowMetadataReader* reader,
-                                       struct ArrowStringView* key_out,
-                                       struct ArrowStringView* value_out) {
-  if (reader->remaining_keys <= 0) {
-    return EINVAL;
-  }
-
-  int64_t pos = 0;
-
-  int32_t key_size;
-  memcpy(&key_size, reader->metadata + reader->offset + pos, sizeof(int32_t));
-  pos += sizeof(int32_t);
-
-  key_out->data = reader->metadata + reader->offset + pos;
-  key_out->size_bytes = key_size;
-  pos += key_size;
-
-  int32_t value_size;
-  memcpy(&value_size, reader->metadata + reader->offset + pos, sizeof(int32_t));
-  pos += sizeof(int32_t);
-
-  value_out->data = reader->metadata + reader->offset + pos;
-  value_out->size_bytes = value_size;
-  pos += value_size;
-
-  reader->offset += pos;
-  reader->remaining_keys--;
-  return NANOARROW_OK;
-}
-
-int64_t ArrowMetadataSizeOf(const char* metadata) {
-  if (metadata == NULL) {
-    return 0;
-  }
-
-  struct ArrowMetadataReader reader;
-  struct ArrowStringView key;
-  struct ArrowStringView value;
-  if (ArrowMetadataReaderInit(&reader, metadata) != NANOARROW_OK) {
-    return 0;
-  }
-
-  int64_t size = sizeof(int32_t);
-  while (ArrowMetadataReaderRead(&reader, &key, &value) == NANOARROW_OK) {
-    size += sizeof(int32_t) + key.size_bytes + sizeof(int32_t) + value.size_bytes;
-  }
-
-  return size;
-}
-
-static ArrowErrorCode ArrowMetadataGetValueInternal(const char* metadata,
-                                                    struct ArrowStringView* key,
-                                                    struct ArrowStringView* value_out) {
-  struct ArrowMetadataReader reader;
-  struct ArrowStringView existing_key;
-  struct ArrowStringView existing_value;
-  NANOARROW_RETURN_NOT_OK(ArrowMetadataReaderInit(&reader, metadata));
-
-  while (ArrowMetadataReaderRead(&reader, &existing_key, &existing_value) ==
-         NANOARROW_OK) {
-    int key_equal = key->size_bytes == existing_key.size_bytes &&
-                    strncmp(key->data, existing_key.data, existing_key.size_bytes) == 0;
-    if (key_equal) {
-      value_out->data = existing_value.data;
-      value_out->size_bytes = existing_value.size_bytes;
-      break;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowMetadataGetValue(const char* metadata, struct ArrowStringView key,
-                                     struct ArrowStringView* value_out) {
-  if (value_out == NULL) {
-    return EINVAL;
-  }
-
-  return ArrowMetadataGetValueInternal(metadata, &key, value_out);
-}
-
-char ArrowMetadataHasKey(const char* metadata, struct ArrowStringView key) {
-  struct ArrowStringView value = ArrowCharView(NULL);
-  if (ArrowMetadataGetValue(metadata, key, &value) != NANOARROW_OK) {
-    return 0;
-  }
-
-  return value.data != NULL;
-}
-
-ArrowErrorCode ArrowMetadataBuilderInit(struct ArrowBuffer* buffer,
-                                        const char* metadata) {
-  ArrowBufferInit(buffer);
-  return ArrowBufferAppend(buffer, metadata, ArrowMetadataSizeOf(metadata));
-}
-
-static ArrowErrorCode ArrowMetadataBuilderAppendInternal(struct ArrowBuffer* buffer,
-                                                         struct ArrowStringView* key,
-                                                         struct ArrowStringView* value) {
-  if (value == NULL) {
-    return NANOARROW_OK;
-  }
-
-  if (buffer->capacity_bytes == 0) {
-    NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(buffer, 0));
-  }
-
-  if (((size_t)buffer->capacity_bytes) < sizeof(int32_t)) {
-    return EINVAL;
-  }
-
-  int32_t n_keys;
-  memcpy(&n_keys, buffer->data, sizeof(int32_t));
-
-  int32_t key_size = (int32_t)key->size_bytes;
-  int32_t value_size = (int32_t)value->size_bytes;
-  NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(
-      buffer, sizeof(int32_t) + key_size + sizeof(int32_t) + value_size));
-
-  ArrowBufferAppendUnsafe(buffer, &key_size, sizeof(int32_t));
-  ArrowBufferAppendUnsafe(buffer, key->data, key_size);
-  ArrowBufferAppendUnsafe(buffer, &value_size, sizeof(int32_t));
-  ArrowBufferAppendUnsafe(buffer, value->data, value_size);
-
-  n_keys++;
-  memcpy(buffer->data, &n_keys, sizeof(int32_t));
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowMetadataBuilderSetInternal(struct ArrowBuffer* buffer,
-                                                      struct ArrowStringView* key,
-                                                      struct ArrowStringView* value) {
-  // Inspect the current value to see if we can avoid copying the buffer
-  struct ArrowStringView current_value = ArrowCharView(NULL);
-  NANOARROW_RETURN_NOT_OK(
-      ArrowMetadataGetValueInternal((const char*)buffer->data, key, &current_value));
-
-  // The key should be removed but no key exists
-  if (value == NULL && current_value.data == NULL) {
-    return NANOARROW_OK;
-  }
-
-  // The key/value can be appended because no key exists
-  if (value != NULL && current_value.data == NULL) {
-    return ArrowMetadataBuilderAppendInternal(buffer, key, value);
-  }
-
-  struct ArrowMetadataReader reader;
-  struct ArrowStringView existing_key;
-  struct ArrowStringView existing_value;
-  NANOARROW_RETURN_NOT_OK(ArrowMetadataReaderInit(&reader, (const char*)buffer->data));
-
-  struct ArrowBuffer new_buffer;
-  NANOARROW_RETURN_NOT_OK(ArrowMetadataBuilderInit(&new_buffer, NULL));
-
-  while (reader.remaining_keys > 0) {
-    int result = ArrowMetadataReaderRead(&reader, &existing_key, &existing_value);
-    if (result != NANOARROW_OK) {
-      ArrowBufferReset(&new_buffer);
-      return result;
-    }
-
-    if (key->size_bytes == existing_key.size_bytes &&
-        strncmp((const char*)key->data, (const char*)existing_key.data,
-                existing_key.size_bytes) == 0) {
-      result = ArrowMetadataBuilderAppendInternal(&new_buffer, key, value);
-      value = NULL;
-    } else {
-      result =
-          ArrowMetadataBuilderAppendInternal(&new_buffer, &existing_key, &existing_value);
-    }
-
-    if (result != NANOARROW_OK) {
-      ArrowBufferReset(&new_buffer);
-      return result;
-    }
-  }
-
-  ArrowBufferReset(buffer);
-  ArrowBufferMove(&new_buffer, buffer);
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowMetadataBuilderAppend(struct ArrowBuffer* buffer,
-                                          struct ArrowStringView key,
-                                          struct ArrowStringView value) {
-  return ArrowMetadataBuilderAppendInternal(buffer, &key, &value);
-}
-
-ArrowErrorCode ArrowMetadataBuilderSet(struct ArrowBuffer* buffer,
-                                       struct ArrowStringView key,
-                                       struct ArrowStringView value) {
-  return ArrowMetadataBuilderSetInternal(buffer, &key, &value);
-}
-
-ArrowErrorCode ArrowMetadataBuilderRemove(struct ArrowBuffer* buffer,
-                                          struct ArrowStringView key) {
-  return ArrowMetadataBuilderSetInternal(buffer, &key, NULL);
-}
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "nanoarrow.h"
-
-static void ArrowArrayReleaseInternal(struct ArrowArray* array) {
-  // Release buffers held by this array
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  if (private_data != NULL) {
-    ArrowBitmapReset(&private_data->bitmap);
-    ArrowBufferReset(&private_data->buffers[0]);
-    ArrowBufferReset(&private_data->buffers[1]);
-    ArrowFree(private_data->buffer_data);
-    for (int32_t i = 0; i < private_data->n_variadic_buffers; ++i) {
-      ArrowBufferReset(&private_data->variadic_buffers[i]);
-    }
-    ArrowFree(private_data->variadic_buffers);
-    ArrowFree(private_data->variadic_buffer_sizes);
-    ArrowFree(private_data);
-  }
-
-  // This object owns the memory for all the children, but those
-  // children may have been generated elsewhere and might have
-  // their own release() callback.
-  if (array->children != NULL) {
-    for (int64_t i = 0; i < array->n_children; i++) {
-      if (array->children[i] != NULL) {
-        if (array->children[i]->release != NULL) {
-          ArrowArrayRelease(array->children[i]);
-        }
-
-        ArrowFree(array->children[i]);
-      }
-    }
-
-    ArrowFree(array->children);
-  }
-
-  // This object owns the memory for the dictionary but it
-  // may have been generated somewhere else and have its own
-  // release() callback.
-  if (array->dictionary != NULL) {
-    if (array->dictionary->release != NULL) {
-      ArrowArrayRelease(array->dictionary);
-    }
-
-    ArrowFree(array->dictionary);
-  }
-
-  // Mark released
-  array->release = NULL;
-}
-
-static ArrowErrorCode ArrowArraySetStorageType(struct ArrowArray* array,
-                                               enum ArrowType storage_type) {
-  switch (storage_type) {
-    case NANOARROW_TYPE_UNINITIALIZED:
-    case NANOARROW_TYPE_NA:
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      array->n_buffers = 0;
-      break;
-
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-    case NANOARROW_TYPE_STRUCT:
-    case NANOARROW_TYPE_SPARSE_UNION:
-      array->n_buffers = 1;
-      break;
-
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_LARGE_LIST:
-    case NANOARROW_TYPE_MAP:
-    case NANOARROW_TYPE_BOOL:
-    case NANOARROW_TYPE_UINT8:
-    case NANOARROW_TYPE_INT8:
-    case NANOARROW_TYPE_UINT16:
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_UINT32:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_UINT64:
-    case NANOARROW_TYPE_INT64:
-    case NANOARROW_TYPE_HALF_FLOAT:
-    case NANOARROW_TYPE_FLOAT:
-    case NANOARROW_TYPE_DOUBLE:
-    case NANOARROW_TYPE_DECIMAL32:
-    case NANOARROW_TYPE_DECIMAL64:
-    case NANOARROW_TYPE_DECIMAL128:
-    case NANOARROW_TYPE_DECIMAL256:
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME:
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO:
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-    case NANOARROW_TYPE_DENSE_UNION:
-      array->n_buffers = 2;
-      break;
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      array->n_buffers = NANOARROW_BINARY_VIEW_FIXED_BUFFERS + 1;
-      break;
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_BINARY:
-    case NANOARROW_TYPE_LARGE_BINARY:
-    case NANOARROW_TYPE_LIST_VIEW:
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      array->n_buffers = 3;
-      break;
-
-    default:
-      return EINVAL;
-
-      return NANOARROW_OK;
-  }
-
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  private_data->storage_type = storage_type;
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayInitFromType(struct ArrowArray* array,
-                                      enum ArrowType storage_type) {
-  array->length = 0;
-  array->null_count = 0;
-  array->offset = 0;
-  array->n_buffers = 0;
-  array->n_children = 0;
-  array->buffers = NULL;
-  array->children = NULL;
-  array->dictionary = NULL;
-  array->release = &ArrowArrayReleaseInternal;
-  array->private_data = NULL;
-
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)ArrowMalloc(sizeof(struct ArrowArrayPrivateData));
-  if (private_data == NULL) {
-    array->release = NULL;
-    return ENOMEM;
-  }
-
-  ArrowBitmapInit(&private_data->bitmap);
-  ArrowBufferInit(&private_data->buffers[0]);
-  ArrowBufferInit(&private_data->buffers[1]);
-  private_data->buffer_data =
-      (const void**)ArrowMalloc(sizeof(void*) * NANOARROW_MAX_FIXED_BUFFERS);
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; ++i) {
-    private_data->buffer_data[i] = NULL;
-  }
-  private_data->n_variadic_buffers = 0;
-  private_data->variadic_buffers = NULL;
-  private_data->variadic_buffer_sizes = NULL;
-  private_data->list_view_offset = 0;
-
-  array->private_data = private_data;
-  array->buffers = (const void**)(private_data->buffer_data);
-
-  // These are not technically "storage" in the sense that they do not appear
-  // in the ArrowSchemaView's storage_type member; however, allowing them here
-  // is helpful to maximize the number of types that can avoid going through
-  // ArrowArrayInitFromSchema().
-  switch (storage_type) {
-    case NANOARROW_TYPE_DURATION:
-    case NANOARROW_TYPE_TIMESTAMP:
-    case NANOARROW_TYPE_TIME64:
-    case NANOARROW_TYPE_DATE64:
-      storage_type = NANOARROW_TYPE_INT64;
-      break;
-    case NANOARROW_TYPE_TIME32:
-    case NANOARROW_TYPE_DATE32:
-      storage_type = NANOARROW_TYPE_INT32;
-      break;
-    default:
-      break;
-  }
-
-  int result = ArrowArraySetStorageType(array, storage_type);
-  if (result != NANOARROW_OK) {
-    ArrowArrayRelease(array);
-    return result;
-  }
-
-  ArrowLayoutInit(&private_data->layout, storage_type);
-  // We can only know this not to be true when initializing based on a schema
-  // so assume this to be true.
-  private_data->union_type_id_is_child_index = 1;
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayInitFromArrayView(struct ArrowArray* array,
-                                           const struct ArrowArrayView* array_view,
-                                           struct ArrowError* error) {
-  NANOARROW_RETURN_NOT_OK_WITH_ERROR(
-      ArrowArrayInitFromType(array, array_view->storage_type), error);
-  int result;
-
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  private_data->layout = array_view->layout;
-
-  if (array_view->n_children > 0) {
-    result = ArrowArrayAllocateChildren(array, array_view->n_children);
-    if (result != NANOARROW_OK) {
-      ArrowArrayRelease(array);
-      return result;
-    }
-
-    for (int64_t i = 0; i < array_view->n_children; i++) {
-      result =
-          ArrowArrayInitFromArrayView(array->children[i], array_view->children[i], error);
-      if (result != NANOARROW_OK) {
-        ArrowArrayRelease(array);
-        return result;
-      }
-    }
-  }
-
-  if (array_view->dictionary != NULL) {
-    result = ArrowArrayAllocateDictionary(array);
-    if (result != NANOARROW_OK) {
-      ArrowArrayRelease(array);
-      return result;
-    }
-
-    result =
-        ArrowArrayInitFromArrayView(array->dictionary, array_view->dictionary, error);
-    if (result != NANOARROW_OK) {
-      ArrowArrayRelease(array);
-      return result;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayInitFromSchema(struct ArrowArray* array,
-                                        const struct ArrowSchema* schema,
-                                        struct ArrowError* error) {
-  struct ArrowArrayView array_view;
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewInitFromSchema(&array_view, schema, error));
-  NANOARROW_RETURN_NOT_OK(ArrowArrayInitFromArrayView(array, &array_view, error));
-  if (array_view.storage_type == NANOARROW_TYPE_DENSE_UNION ||
-      array_view.storage_type == NANOARROW_TYPE_SPARSE_UNION) {
-    struct ArrowArrayPrivateData* private_data =
-        (struct ArrowArrayPrivateData*)array->private_data;
-    // We can still build arrays if this isn't true; however, the append
-    // functions won't work. Instead, we store this value and error only
-    // when StartAppending is called.
-    private_data->union_type_id_is_child_index =
-        _ArrowUnionTypeIdsWillEqualChildIndices(schema->format + 4, schema->n_children);
-  }
-
-  ArrowArrayViewReset(&array_view);
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayAllocateChildren(struct ArrowArray* array, int64_t n_children) {
-  if (array->children != NULL) {
-    return EINVAL;
-  }
-
-  if (n_children == 0) {
-    return NANOARROW_OK;
-  }
-
-  array->children =
-      (struct ArrowArray**)ArrowMalloc(n_children * sizeof(struct ArrowArray*));
-  if (array->children == NULL) {
-    return ENOMEM;
-  }
-
-  memset(array->children, 0, n_children * sizeof(struct ArrowArray*));
-
-  for (int64_t i = 0; i < n_children; i++) {
-    array->children[i] = (struct ArrowArray*)ArrowMalloc(sizeof(struct ArrowArray));
-    if (array->children[i] == NULL) {
-      return ENOMEM;
-    }
-    array->children[i]->release = NULL;
-  }
-
-  array->n_children = n_children;
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayAllocateDictionary(struct ArrowArray* array) {
-  if (array->dictionary != NULL) {
-    return EINVAL;
-  }
-
-  array->dictionary = (struct ArrowArray*)ArrowMalloc(sizeof(struct ArrowArray));
-  if (array->dictionary == NULL) {
-    return ENOMEM;
-  }
-
-  array->dictionary->release = NULL;
-  return NANOARROW_OK;
-}
-
-void ArrowArraySetValidityBitmap(struct ArrowArray* array, struct ArrowBitmap* bitmap) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  ArrowBufferMove(&bitmap->buffer, &private_data->bitmap.buffer);
-  private_data->bitmap.size_bits = bitmap->size_bits;
-  bitmap->size_bits = 0;
-  private_data->buffer_data[0] = private_data->bitmap.buffer.data;
-  array->null_count = -1;
-}
-
-ArrowErrorCode ArrowArraySetBuffer(struct ArrowArray* array, int64_t i,
-                                   struct ArrowBuffer* buffer) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  switch (i) {
-    case 0:
-      ArrowBufferMove(buffer, &private_data->bitmap.buffer);
-      private_data->buffer_data[i] = private_data->bitmap.buffer.data;
-      break;
-    case 1:
-    case 2:
-      ArrowBufferMove(buffer, &private_data->buffers[i - 1]);
-      private_data->buffer_data[i] = private_data->buffers[i - 1].data;
-      break;
-    default:
-      return EINVAL;
-  }
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowArrayViewInitFromArray(struct ArrowArrayView* array_view,
-                                                  struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  ArrowArrayViewInitFromType(array_view, private_data->storage_type);
-  array_view->layout = private_data->layout;
-  array_view->array = array;
-  array_view->length = array->length;
-  array_view->offset = array->offset;
-  array_view->null_count = array->null_count;
-
-  array_view->buffer_views[0].data.as_uint8 = private_data->bitmap.buffer.data;
-  array_view->buffer_views[0].size_bytes = private_data->bitmap.buffer.size_bytes;
-  array_view->buffer_views[1].data.as_uint8 = private_data->buffers[0].data;
-  array_view->buffer_views[1].size_bytes = private_data->buffers[0].size_bytes;
-  array_view->buffer_views[2].data.as_uint8 = private_data->buffers[1].data;
-  array_view->buffer_views[2].size_bytes = private_data->buffers[1].size_bytes;
-
-  int result = ArrowArrayViewAllocateChildren(array_view, array->n_children);
-  if (result != NANOARROW_OK) {
-    ArrowArrayViewReset(array_view);
-    return result;
-  }
-
-  for (int64_t i = 0; i < array->n_children; i++) {
-    result = ArrowArrayViewInitFromArray(array_view->children[i], array->children[i]);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-  }
-
-  if (array->dictionary != NULL) {
-    result = ArrowArrayViewAllocateDictionary(array_view);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-
-    result = ArrowArrayViewInitFromArray(array_view->dictionary, array->dictionary);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowArrayReserveInternal(struct ArrowArray* array,
-                                                struct ArrowArrayView* array_view) {
-  // Loop through buffers and reserve the extra space that we know about
-  for (int64_t i = 0; i < array->n_buffers; i++) {
-    // Don't reserve on a validity buffer that hasn't been allocated yet
-    if (array_view->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_VALIDITY &&
-        ArrowArrayBuffer(array, i)->data == NULL) {
-      continue;
-    }
-
-    int64_t additional_size_bytes =
-        array_view->buffer_views[i].size_bytes - ArrowArrayBuffer(array, i)->size_bytes;
-
-    if (additional_size_bytes > 0) {
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferReserve(ArrowArrayBuffer(array, i), additional_size_bytes));
-    }
-  }
-
-  // Recursively reserve children
-  for (int64_t i = 0; i < array->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowArrayReserveInternal(array->children[i], array_view->children[i]));
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayReserve(struct ArrowArray* array,
-                                 int64_t additional_size_elements) {
-  struct ArrowArrayView array_view;
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewInitFromArray(&array_view, array));
-
-  // Calculate theoretical buffer sizes (recursively)
-  ArrowArrayViewSetLength(&array_view, array->length + additional_size_elements);
-
-  // Walk the structure (recursively)
-  int result = ArrowArrayReserveInternal(array, &array_view);
-  ArrowArrayViewReset(&array_view);
-  if (result != NANOARROW_OK) {
-    return result;
-  }
-
-  return NANOARROW_OK;
-}
-
-static ArrowErrorCode ArrowArrayFinalizeBuffers(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    if (private_data->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_VALIDITY ||
-        private_data->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_NONE) {
-      continue;
-    }
-
-    struct ArrowBuffer* buffer = ArrowArrayBuffer(array, i);
-    if (buffer->data == NULL) {
-      NANOARROW_RETURN_NOT_OK((ArrowBufferReserve(buffer, 1)));
-    }
-  }
-
-  for (int64_t i = 0; i < array->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayFinalizeBuffers(array->children[i]));
-  }
-
-  if (array->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayFinalizeBuffers(array->dictionary));
-  }
-
-  return NANOARROW_OK;
-}
-
-static void ArrowArrayFlushInternalPointers(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  const bool is_binary_view = private_data->storage_type == NANOARROW_TYPE_STRING_VIEW ||
-                              private_data->storage_type == NANOARROW_TYPE_BINARY_VIEW;
-  const int32_t nfixed_buf = is_binary_view ? 2 : NANOARROW_MAX_FIXED_BUFFERS;
-
-  for (int32_t i = 0; i < nfixed_buf; i++) {
-    private_data->buffer_data[i] = ArrowArrayBuffer(array, i)->data;
-  }
-
-  if (is_binary_view) {
-    const int32_t nvirt_buf = private_data->n_variadic_buffers;
-    private_data->buffer_data = (const void**)ArrowRealloc(
-        private_data->buffer_data, sizeof(void*) * (nfixed_buf + nvirt_buf + 1));
-    for (int32_t i = 0; i < nvirt_buf; i++) {
-      private_data->buffer_data[nfixed_buf + i] = private_data->variadic_buffers[i].data;
-    }
-    private_data->buffer_data[nfixed_buf + nvirt_buf] =
-        private_data->variadic_buffer_sizes;
-    array->buffers = (const void**)(private_data->buffer_data);
-  }
-
-  for (int64_t i = 0; i < array->n_children; i++) {
-    ArrowArrayFlushInternalPointers(array->children[i]);
-  }
-
-  if (array->dictionary != NULL) {
-    ArrowArrayFlushInternalPointers(array->dictionary);
-  }
-}
-
-ArrowErrorCode ArrowArrayFinishBuilding(struct ArrowArray* array,
-                                        enum ArrowValidationLevel validation_level,
-                                        struct ArrowError* error) {
-  // Even if the data buffer is size zero, the pointer value needed to be non-null
-  // in some implementations (at least one version of Arrow C++ at the time this
-  // was added and C# as later discovered). Only do this fix if we can assume
-  // CPU data access.
-  if (validation_level >= NANOARROW_VALIDATION_LEVEL_DEFAULT) {
-    NANOARROW_RETURN_NOT_OK_WITH_ERROR(ArrowArrayFinalizeBuffers(array), error);
-  }
-
-  // Make sure the value we get with array->buffers[i] is set to the actual
-  // pointer (which may have changed from the original due to reallocation)
-  ArrowArrayFlushInternalPointers(array);
-
-  if (validation_level == NANOARROW_VALIDATION_LEVEL_NONE) {
-    return NANOARROW_OK;
-  }
-
-  // For validation, initialize an ArrowArrayView with our known buffer sizes
-  struct ArrowArrayView array_view;
-  NANOARROW_RETURN_NOT_OK_WITH_ERROR(ArrowArrayViewInitFromArray(&array_view, array),
-                                     error);
-  int result = ArrowArrayViewValidate(&array_view, validation_level, error);
-  ArrowArrayViewReset(&array_view);
-  return result;
-}
-
-ArrowErrorCode ArrowArrayFinishBuildingDefault(struct ArrowArray* array,
-                                               struct ArrowError* error) {
-  return ArrowArrayFinishBuilding(array, NANOARROW_VALIDATION_LEVEL_DEFAULT, error);
-}
-
-void ArrowArrayViewInitFromType(struct ArrowArrayView* array_view,
-                                enum ArrowType storage_type) {
-  memset(array_view, 0, sizeof(struct ArrowArrayView));
-  array_view->storage_type = storage_type;
-  ArrowLayoutInit(&array_view->layout, storage_type);
-}
-
-ArrowErrorCode ArrowArrayViewAllocateChildren(struct ArrowArrayView* array_view,
-                                              int64_t n_children) {
-  if (array_view->children != NULL) {
-    return EINVAL;
-  }
-
-  if (n_children == 0) {
-    array_view->n_children = 0;
-    return NANOARROW_OK;
-  }
-
-  array_view->children =
-      (struct ArrowArrayView**)ArrowMalloc(n_children * sizeof(struct ArrowArrayView*));
-  if (array_view->children == NULL) {
-    return ENOMEM;
-  }
-
-  for (int64_t i = 0; i < n_children; i++) {
-    array_view->children[i] = NULL;
-  }
-
-  array_view->n_children = n_children;
-
-  for (int64_t i = 0; i < n_children; i++) {
-    array_view->children[i] =
-        (struct ArrowArrayView*)ArrowMalloc(sizeof(struct ArrowArrayView));
-    if (array_view->children[i] == NULL) {
-      return ENOMEM;
-    }
-    ArrowArrayViewInitFromType(array_view->children[i], NANOARROW_TYPE_UNINITIALIZED);
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayViewAllocateDictionary(struct ArrowArrayView* array_view) {
-  if (array_view->dictionary != NULL) {
-    return EINVAL;
-  }
-
-  array_view->dictionary =
-      (struct ArrowArrayView*)ArrowMalloc(sizeof(struct ArrowArrayView));
-  if (array_view->dictionary == NULL) {
-    return ENOMEM;
-  }
-
-  ArrowArrayViewInitFromType(array_view->dictionary, NANOARROW_TYPE_UNINITIALIZED);
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayViewInitFromSchema(struct ArrowArrayView* array_view,
-                                            const struct ArrowSchema* schema,
-                                            struct ArrowError* error) {
-  struct ArrowSchemaView schema_view;
-  int result = ArrowSchemaViewInit(&schema_view, schema, error);
-  if (result != NANOARROW_OK) {
-    return result;
-  }
-
-  ArrowArrayViewInitFromType(array_view, schema_view.storage_type);
-  array_view->layout = schema_view.layout;
-
-  result = ArrowArrayViewAllocateChildren(array_view, schema->n_children);
-  if (result != NANOARROW_OK) {
-    ArrowErrorSet(error, "ArrowArrayViewAllocateChildren() failed");
-    ArrowArrayViewReset(array_view);
-    return result;
-  }
-
-  for (int64_t i = 0; i < schema->n_children; i++) {
-    result =
-        ArrowArrayViewInitFromSchema(array_view->children[i], schema->children[i], error);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-  }
-
-  if (schema->dictionary != NULL) {
-    result = ArrowArrayViewAllocateDictionary(array_view);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-
-    result =
-        ArrowArrayViewInitFromSchema(array_view->dictionary, schema->dictionary, error);
-    if (result != NANOARROW_OK) {
-      ArrowArrayViewReset(array_view);
-      return result;
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_SPARSE_UNION ||
-      array_view->storage_type == NANOARROW_TYPE_DENSE_UNION) {
-    array_view->union_type_id_map = (int8_t*)ArrowMalloc(256 * sizeof(int8_t));
-    if (array_view->union_type_id_map == NULL) {
-      return ENOMEM;
-    }
-
-    memset(array_view->union_type_id_map, -1, 256);
-    int32_t n_type_ids = _ArrowParseUnionTypeIds(schema_view.union_type_ids,
-                                                 array_view->union_type_id_map + 128);
-    for (int8_t child_index = 0; child_index < n_type_ids; child_index++) {
-      int8_t type_id = array_view->union_type_id_map[128 + child_index];
-      array_view->union_type_id_map[type_id] = child_index;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-void ArrowArrayViewReset(struct ArrowArrayView* array_view) {
-  if (array_view->children != NULL) {
-    for (int64_t i = 0; i < array_view->n_children; i++) {
-      if (array_view->children[i] != NULL) {
-        ArrowArrayViewReset(array_view->children[i]);
-        ArrowFree(array_view->children[i]);
-      }
-    }
-
-    ArrowFree(array_view->children);
-  }
-
-  if (array_view->dictionary != NULL) {
-    ArrowArrayViewReset(array_view->dictionary);
-    ArrowFree(array_view->dictionary);
-  }
-
-  if (array_view->union_type_id_map != NULL) {
-    ArrowFree(array_view->union_type_id_map);
-  }
-
-  ArrowArrayViewInitFromType(array_view, NANOARROW_TYPE_UNINITIALIZED);
-}
-
-void ArrowArrayViewSetLength(struct ArrowArrayView* array_view, int64_t length) {
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    int64_t element_size_bytes = array_view->layout.element_size_bits[i] / 8;
-
-    switch (array_view->layout.buffer_type[i]) {
-      case NANOARROW_BUFFER_TYPE_VALIDITY:
-        array_view->buffer_views[i].size_bytes = _ArrowBytesForBits(length);
-        continue;
-      case NANOARROW_BUFFER_TYPE_DATA_OFFSET:
-        // Probably don't want/need to rely on the producer to have allocated an
-        // offsets buffer of length 1 for a zero-size array
-        array_view->buffer_views[i].size_bytes =
-            (length != 0) * element_size_bytes * (length + 1);
-        continue;
-      case NANOARROW_BUFFER_TYPE_DATA:
-        array_view->buffer_views[i].size_bytes =
-            _ArrowRoundUpToMultipleOf8(array_view->layout.element_size_bits[i] * length) /
-            8;
-        continue;
-      case NANOARROW_BUFFER_TYPE_TYPE_ID:
-      case NANOARROW_BUFFER_TYPE_UNION_OFFSET:
-      case NANOARROW_BUFFER_TYPE_VIEW_OFFSET:
-      case NANOARROW_BUFFER_TYPE_SIZE:
-        array_view->buffer_views[i].size_bytes = element_size_bytes * length;
-        continue;
-      case NANOARROW_BUFFER_TYPE_VARIADIC_DATA:
-      case NANOARROW_BUFFER_TYPE_VARIADIC_SIZE:
-      case NANOARROW_BUFFER_TYPE_NONE:
-        array_view->buffer_views[i].size_bytes = 0;
-        continue;
-    }
-  }
-
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_STRUCT:
-    case NANOARROW_TYPE_SPARSE_UNION:
-      for (int64_t i = 0; i < array_view->n_children; i++) {
-        ArrowArrayViewSetLength(array_view->children[i], length);
-      }
-      break;
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      if (array_view->n_children >= 1) {
-        ArrowArrayViewSetLength(array_view->children[0],
-                                length * array_view->layout.child_size_elements);
-      }
-    default:
-      break;
-  }
-}
-
-// This version recursively extracts information from the array and stores it
-// in the array view, performing any checks that require the original array.
-static int ArrowArrayViewSetArrayInternal(struct ArrowArrayView* array_view,
-                                          const struct ArrowArray* array,
-                                          struct ArrowError* error) {
-  array_view->array = array;
-  array_view->offset = array->offset;
-  array_view->length = array->length;
-  array_view->null_count = array->null_count;
-  array_view->variadic_buffer_sizes = NULL;
-  array_view->variadic_buffers = NULL;
-  array_view->n_variadic_buffers = 0;
-
-  int64_t buffers_required = 0;
-  const int nfixed_buf = array_view->storage_type == NANOARROW_TYPE_STRING_VIEW ||
-                                 array_view->storage_type == NANOARROW_TYPE_BINARY_VIEW
-                             ? NANOARROW_BINARY_VIEW_FIXED_BUFFERS
-                             : NANOARROW_MAX_FIXED_BUFFERS;
-  for (int i = 0; i < nfixed_buf; i++) {
-    if (array_view->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_NONE) {
-      break;
-    }
-
-    buffers_required++;
-
-    // Set buffer pointer
-    array_view->buffer_views[i].data.data = array->buffers[i];
-
-    // If non-null, set buffer size to unknown.
-    if (array->buffers[i] == NULL) {
-      array_view->buffer_views[i].size_bytes = 0;
-    } else {
-      array_view->buffer_views[i].size_bytes = -1;
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_STRING_VIEW ||
-      array_view->storage_type == NANOARROW_TYPE_BINARY_VIEW) {
-    const int64_t n_buffers = array->n_buffers;
-    const int32_t nfixed_buf = NANOARROW_BINARY_VIEW_FIXED_BUFFERS;
-
-    const int32_t nvariadic_buf = (int32_t)(n_buffers - nfixed_buf - 1);
-    array_view->n_variadic_buffers = nvariadic_buf;
-    buffers_required += nvariadic_buf + 1;
-    array_view->variadic_buffers = array->buffers + NANOARROW_BINARY_VIEW_FIXED_BUFFERS;
-    array_view->variadic_buffer_sizes = (int64_t*)array->buffers[n_buffers - 1];
-  }
-
-  if (buffers_required != array->n_buffers) {
-    ArrowErrorSet(error,
-                  "Expected array with %" PRId64 " buffer(s) but found %" PRId64
-                  " buffer(s)",
-                  buffers_required, array->n_buffers);
-    return EINVAL;
-  }
-
-  // Check number of children
-  if (array_view->n_children != array->n_children) {
-    ArrowErrorSet(error, "Expected %" PRId64 " children but found %" PRId64 " children",
-                  array_view->n_children, array->n_children);
-    return EINVAL;
-  }
-
-  // Recurse for children
-  for (int64_t i = 0; i < array_view->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayViewSetArrayInternal(array_view->children[i],
-                                                           array->children[i], error));
-  }
-
-  // Check dictionary
-  if (array->dictionary == NULL && array_view->dictionary != NULL) {
-    ArrowErrorSet(error, "Expected dictionary but found NULL");
-    return EINVAL;
-  }
-
-  if (array->dictionary != NULL && array_view->dictionary == NULL) {
-    ArrowErrorSet(error, "Expected NULL dictionary but found dictionary member");
-    return EINVAL;
-  }
-
-  if (array->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowArrayViewSetArrayInternal(array_view->dictionary, array->dictionary, error));
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowArrayViewValidateMinimal(struct ArrowArrayView* array_view,
-                                         struct ArrowError* error) {
-  if (array_view->length < 0) {
-    ArrowErrorSet(error, "Expected length >= 0 but found length %" PRId64,
-                  array_view->length);
-    return EINVAL;
-  }
-
-  if (array_view->offset < 0) {
-    ArrowErrorSet(error, "Expected offset >= 0 but found offset %" PRId64,
-                  array_view->offset);
-    return EINVAL;
-  }
-
-  // Ensure that offset + length fits within an int64 before a possible overflow
-  if ((uint64_t)array_view->offset + (uint64_t)array_view->length > (uint64_t)INT64_MAX) {
-    ArrowErrorSet(error, "Offset + length is > INT64_MAX");
-    return EINVAL;
-  }
-
-  // Calculate buffer sizes that do not require buffer access. If marked as
-  // unknown, assign the buffer size; otherwise, validate it.
-  int64_t offset_plus_length = array_view->offset + array_view->length;
-
-  // Only loop over the first two buffers because the size of the third buffer
-  // is always data dependent for all current Arrow types.
-  for (int i = 0; i < 2; i++) {
-    int64_t element_size_bytes = array_view->layout.element_size_bits[i] / 8;
-    // Initialize with a value that will cause an error if accidentally used uninitialized
-    // Need to suppress the clang-tidy warning because gcc warns for possible use
-    int64_t min_buffer_size_bytes =  // NOLINT(clang-analyzer-deadcode.DeadStores)
-        array_view->buffer_views[i].size_bytes + 1;
-
-    switch (array_view->layout.buffer_type[i]) {
-      case NANOARROW_BUFFER_TYPE_VALIDITY:
-        if (array_view->null_count == 0 && array_view->buffer_views[i].size_bytes == 0) {
-          continue;
-        }
-
-        min_buffer_size_bytes = _ArrowBytesForBits(offset_plus_length);
-        break;
-      case NANOARROW_BUFFER_TYPE_SIZE:
-        min_buffer_size_bytes = element_size_bytes * offset_plus_length;
-        break;
-      case NANOARROW_BUFFER_TYPE_DATA_OFFSET:
-        // Probably don't want/need to rely on the producer to have allocated an
-        // offsets buffer of length 1 for a zero-size array
-        min_buffer_size_bytes =
-            (offset_plus_length != 0) * element_size_bytes * (offset_plus_length + 1);
-        break;
-      case NANOARROW_BUFFER_TYPE_VIEW_OFFSET:
-        min_buffer_size_bytes =
-            (offset_plus_length != 0) * element_size_bytes * offset_plus_length;
-        break;
-      case NANOARROW_BUFFER_TYPE_DATA:
-        min_buffer_size_bytes =
-            _ArrowRoundUpToMultipleOf8(array_view->layout.element_size_bits[i] *
-                                       offset_plus_length) /
-            8;
-        break;
-      case NANOARROW_BUFFER_TYPE_TYPE_ID:
-      case NANOARROW_BUFFER_TYPE_UNION_OFFSET:
-        min_buffer_size_bytes = element_size_bytes * offset_plus_length;
-        break;
-      case NANOARROW_BUFFER_TYPE_VARIADIC_DATA:
-      case NANOARROW_BUFFER_TYPE_VARIADIC_SIZE:
-      case NANOARROW_BUFFER_TYPE_NONE:
-        continue;
-    }
-
-    // Assign or validate buffer size
-    if (array_view->buffer_views[i].size_bytes == -1) {
-      array_view->buffer_views[i].size_bytes = min_buffer_size_bytes;
-    } else if (array_view->buffer_views[i].size_bytes < min_buffer_size_bytes) {
-      ArrowErrorSet(error,
-                    "Expected %s array buffer %d to have size >= %" PRId64
-                    " bytes but found "
-                    "buffer with %" PRId64 " bytes",
-                    ArrowTypeString(array_view->storage_type), i, min_buffer_size_bytes,
-                    array_view->buffer_views[i].size_bytes);
-      return EINVAL;
-    }
-  }
-
-  // For list, fixed-size list and map views, we can validate the number of children
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_LARGE_LIST:
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-    case NANOARROW_TYPE_MAP:
-    case NANOARROW_TYPE_LIST_VIEW:
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      if (array_view->n_children != 1) {
-        ArrowErrorSet(error,
-                      "Expected 1 child of %s array but found %" PRId64 " child arrays",
-                      ArrowTypeString(array_view->storage_type), array_view->n_children);
-        return EINVAL;
-      }
-      break;
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      if (array_view->n_children != 2) {
-        ArrowErrorSet(
-            error, "Expected 2 children for %s array but found %" PRId64 " child arrays",
-            ArrowTypeString(array_view->storage_type), array_view->n_children);
-        return EINVAL;
-      }
-      break;
-    default:
-      break;
-  }
-
-  // For struct, the sparse union, and the fixed-size list views, we can validate child
-  // lengths.
-  int64_t child_min_length;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_SPARSE_UNION:
-    case NANOARROW_TYPE_STRUCT:
-      child_min_length = (array_view->offset + array_view->length);
-      for (int64_t i = 0; i < array_view->n_children; i++) {
-        if (array_view->children[i]->length < child_min_length) {
-          ArrowErrorSet(error,
-                        "Expected struct child %" PRId64 " to have length >= %" PRId64
-                        " but found child with "
-                        "length %" PRId64,
-                        i + 1, child_min_length, array_view->children[i]->length);
-          return EINVAL;
-        }
-      }
-      break;
-
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      child_min_length = (array_view->offset + array_view->length) *
-                         array_view->layout.child_size_elements;
-      if (array_view->children[0]->length < child_min_length) {
-        ArrowErrorSet(error,
-                      "Expected child of fixed_size_list array to have length >= %" PRId64
-                      " but "
-                      "found array with length %" PRId64,
-                      child_min_length, array_view->children[0]->length);
-        return EINVAL;
-      }
-      break;
-
-    case NANOARROW_TYPE_RUN_END_ENCODED: {
-      if (array_view->n_children != 2) {
-        ArrowErrorSet(error,
-                      "Expected 2 children for run-end encoded array but found %" PRId64,
-                      array_view->n_children);
-        return EINVAL;
-      }
-      struct ArrowArrayView* run_ends_view = array_view->children[0];
-      struct ArrowArrayView* values_view = array_view->children[1];
-      int64_t max_length;
-      switch (run_ends_view->storage_type) {
-        case NANOARROW_TYPE_INT16:
-          max_length = INT16_MAX;
-          break;
-        case NANOARROW_TYPE_INT32:
-          max_length = INT32_MAX;
-          break;
-        case NANOARROW_TYPE_INT64:
-          max_length = INT64_MAX;
-          break;
-        default:
-          ArrowErrorSet(
-              error,
-              "Run-end encoded array only supports INT16, INT32 or INT64 run-ends "
-              "but found run-ends type %s",
-              ArrowTypeString(run_ends_view->storage_type));
-          return EINVAL;
-      }
-
-      // There is already a check above that offset_plus_length < INT64_MAX
-      if (offset_plus_length > max_length) {
-        ArrowErrorSet(error,
-                      "Offset + length of a run-end encoded array must fit in a value"
-                      " of the run end type %s but is %" PRId64 " + %" PRId64,
-                      ArrowTypeString(run_ends_view->storage_type), array_view->offset,
-                      array_view->length);
-        return EINVAL;
-      }
-
-      if (run_ends_view->length > values_view->length) {
-        ArrowErrorSet(error,
-                      "Length of run_ends is greater than the length of values: %" PRId64
-                      " > %" PRId64,
-                      run_ends_view->length, values_view->length);
-        return EINVAL;
-      }
-
-      if (run_ends_view->length == 0 && values_view->length != 0) {
-        ArrowErrorSet(error,
-                      "Run-end encoded array has zero length %" PRId64
-                      ", but values array has "
-                      "non-zero length",
-                      values_view->length);
-        return EINVAL;
-      }
-
-      if (run_ends_view->null_count != 0) {
-        ArrowErrorSet(error, "Null count must be 0 for run ends array, but is %" PRId64,
-                      run_ends_view->null_count);
-        return EINVAL;
-      }
-      break;
-    }
-
-    default:
-      break;
-  }
-
-  // Recurse for children
-  for (int64_t i = 0; i < array_view->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowArrayViewValidateMinimal(array_view->children[i], error));
-  }
-
-  // Recurse for dictionary
-  if (array_view->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateMinimal(array_view->dictionary, error));
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowArrayViewValidateDefault(struct ArrowArrayView* array_view,
-                                         struct ArrowError* error) {
-  // Perform minimal validation. This will validate or assign
-  // buffer sizes as long as buffer access is not required.
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateMinimal(array_view, error));
-
-  // Calculate buffer sizes or child lengths that require accessing the offsets
-  // buffer. Where appropriate, validate that the first offset is >= 0.
-  // If a buffer size is marked as unknown, assign it; otherwise, validate it.
-  int64_t offset_plus_length = array_view->offset + array_view->length;
-
-  int64_t first_offset;
-  int64_t last_offset;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_BINARY:
-      if (array_view->buffer_views[1].size_bytes != 0) {
-        first_offset = array_view->buffer_views[1].data.as_int32[array_view->offset];
-        if (first_offset < 0) {
-          ArrowErrorSet(error, "Expected first offset >= 0 but found %" PRId64,
-                        first_offset);
-          return EINVAL;
-        }
-
-        last_offset = array_view->buffer_views[1].data.as_int32[offset_plus_length];
-        if (last_offset < 0) {
-          ArrowErrorSet(error, "Expected last offset >= 0 but found %" PRId64,
-                        last_offset);
-          return EINVAL;
-        }
-
-        // If the data buffer size is unknown, assign it; otherwise, check it
-        if (array_view->buffer_views[2].size_bytes == -1) {
-          array_view->buffer_views[2].size_bytes = last_offset;
-        } else if (array_view->buffer_views[2].size_bytes < last_offset) {
-          ArrowErrorSet(error,
-                        "Expected %s array buffer 2 to have size >= %" PRId64
-                        " bytes but found "
-                        "buffer with %" PRId64 " bytes",
-                        ArrowTypeString(array_view->storage_type), last_offset,
-                        array_view->buffer_views[2].size_bytes);
-          return EINVAL;
-        }
-      } else if (array_view->buffer_views[2].size_bytes == -1) {
-        // If the data buffer size is unknown and there are no bytes in the offset buffer,
-        // set the data buffer size to 0.
-        array_view->buffer_views[2].size_bytes = 0;
-      }
-      break;
-
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_LARGE_BINARY:
-      if (array_view->buffer_views[1].size_bytes != 0) {
-        first_offset = array_view->buffer_views[1].data.as_int64[array_view->offset];
-        if (first_offset < 0) {
-          ArrowErrorSet(error, "Expected first offset >= 0 but found %" PRId64,
-                        first_offset);
-          return EINVAL;
-        }
-
-        last_offset = array_view->buffer_views[1].data.as_int64[offset_plus_length];
-        if (last_offset < 0) {
-          ArrowErrorSet(error, "Expected last offset >= 0 but found %" PRId64,
-                        last_offset);
-          return EINVAL;
-        }
-
-        // If the data buffer size is unknown, assign it; otherwise, check it
-        if (array_view->buffer_views[2].size_bytes == -1) {
-          array_view->buffer_views[2].size_bytes = last_offset;
-        } else if (array_view->buffer_views[2].size_bytes < last_offset) {
-          ArrowErrorSet(error,
-                        "Expected %s array buffer 2 to have size >= %" PRId64
-                        " bytes but found "
-                        "buffer with %" PRId64 " bytes",
-                        ArrowTypeString(array_view->storage_type), last_offset,
-                        array_view->buffer_views[2].size_bytes);
-          return EINVAL;
-        }
-      } else if (array_view->buffer_views[2].size_bytes == -1) {
-        // If the data buffer size is unknown and there are no bytes in the offset
-        // buffer, set the data buffer size to 0.
-        array_view->buffer_views[2].size_bytes = 0;
-      }
-      break;
-
-    case NANOARROW_TYPE_STRUCT:
-      for (int64_t i = 0; i < array_view->n_children; i++) {
-        if (array_view->children[i]->length < offset_plus_length) {
-          ArrowErrorSet(error,
-                        "Expected struct child %" PRId64 " to have length >= %" PRId64
-                        " but found child with "
-                        "length %" PRId64,
-                        i + 1, offset_plus_length, array_view->children[i]->length);
-          return EINVAL;
-        }
-      }
-      break;
-
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_MAP:
-      if (array_view->buffer_views[1].size_bytes != 0) {
-        first_offset = array_view->buffer_views[1].data.as_int32[array_view->offset];
-        if (first_offset < 0) {
-          ArrowErrorSet(error, "Expected first offset >= 0 but found %" PRId64,
-                        first_offset);
-          return EINVAL;
-        }
-
-        last_offset = array_view->buffer_views[1].data.as_int32[offset_plus_length];
-        if (last_offset < 0) {
-          ArrowErrorSet(error, "Expected last offset >= 0 but found %" PRId64,
-                        last_offset);
-          return EINVAL;
-        }
-
-        if (array_view->children[0]->length < last_offset) {
-          ArrowErrorSet(error,
-                        "Expected child of %s array to have length >= %" PRId64
-                        " but found array with "
-                        "length %" PRId64,
-                        ArrowTypeString(array_view->storage_type), last_offset,
-                        array_view->children[0]->length);
-          return EINVAL;
-        }
-      }
-      break;
-
-    case NANOARROW_TYPE_LARGE_LIST:
-      if (array_view->buffer_views[1].size_bytes != 0) {
-        first_offset = array_view->buffer_views[1].data.as_int64[array_view->offset];
-        if (first_offset < 0) {
-          ArrowErrorSet(error, "Expected first offset >= 0 but found %" PRId64,
-                        first_offset);
-          return EINVAL;
-        }
-
-        last_offset = array_view->buffer_views[1].data.as_int64[offset_plus_length];
-        if (last_offset < 0) {
-          ArrowErrorSet(error, "Expected last offset >= 0 but found %" PRId64,
-                        last_offset);
-          return EINVAL;
-        }
-
-        if (array_view->children[0]->length < last_offset) {
-          ArrowErrorSet(error,
-                        "Expected child of %s array to have length >= %" PRId64
-                        " but found array "
-                        "with length %" PRId64,
-                        ArrowTypeString(array_view->storage_type), last_offset,
-                        array_view->children[0]->length);
-          return EINVAL;
-        }
-      }
-      break;
-
-    case NANOARROW_TYPE_RUN_END_ENCODED: {
-      struct ArrowArrayView* run_ends_view = array_view->children[0];
-      if (run_ends_view->length == 0) {
-        break;
-      }
-
-      int64_t first_run_end = ArrowArrayViewGetIntUnsafe(run_ends_view, 0);
-      if (first_run_end < 1) {
-        ArrowErrorSet(
-            error,
-            "All run ends must be greater than 0 but the first run end is %" PRId64,
-            first_run_end);
-        return EINVAL;
-      }
-
-      // offset + length < INT64_MAX is checked in ArrowArrayViewValidateMinimal()
-      int64_t last_run_end =
-          ArrowArrayViewGetIntUnsafe(run_ends_view, run_ends_view->length - 1);
-      if (last_run_end < offset_plus_length) {
-        ArrowErrorSet(error,
-                      "Last run end is %" PRId64 " but it should be >= (%" PRId64
-                      " + %" PRId64 ")",
-                      last_run_end, array_view->offset, array_view->length);
-        return EINVAL;
-      }
-      break;
-    }
-    default:
-      break;
-  }
-
-  // Recurse for children
-  for (int64_t i = 0; i < array_view->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowArrayViewValidateDefault(array_view->children[i], error));
-  }
-
-  // Recurse for dictionary
-  if (array_view->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateDefault(array_view->dictionary, error));
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayViewSetArray(struct ArrowArrayView* array_view,
-                                      const struct ArrowArray* array,
-                                      struct ArrowError* error) {
-  // Extract information from the array into the array view
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewSetArrayInternal(array_view, array, error));
-
-  // Run default validation. Because we've marked all non-NULL buffers as having unknown
-  // size, validation will also update the buffer sizes as it goes.
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateDefault(array_view, error));
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayViewSetArrayMinimal(struct ArrowArrayView* array_view,
-                                             const struct ArrowArray* array,
-                                             struct ArrowError* error) {
-  // Extract information from the array into the array view
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewSetArrayInternal(array_view, array, error));
-
-  // Run default validation. Because we've marked all non-NULL buffers as having unknown
-  // size, validation will also update the buffer sizes as it goes.
-  NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateMinimal(array_view, error));
-
-  return NANOARROW_OK;
-}
-
-static int ArrowAssertIncreasingInt32(struct ArrowBufferView view,
-                                      struct ArrowError* error) {
-  if (view.size_bytes <= (int64_t)sizeof(int32_t)) {
-    return NANOARROW_OK;
-  }
-
-  for (int64_t i = 1; i < view.size_bytes / (int64_t)sizeof(int32_t); i++) {
-    if (view.data.as_int32[i] < view.data.as_int32[i - 1]) {
-      ArrowErrorSet(error, "[%" PRId64 "] Expected element size >= 0", i);
-      return EINVAL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowAssertIncreasingInt64(struct ArrowBufferView view,
-                                      struct ArrowError* error) {
-  if (view.size_bytes <= (int64_t)sizeof(int64_t)) {
-    return NANOARROW_OK;
-  }
-
-  for (int64_t i = 1; i < view.size_bytes / (int64_t)sizeof(int64_t); i++) {
-    if (view.data.as_int64[i] < view.data.as_int64[i - 1]) {
-      ArrowErrorSet(error, "[%" PRId64 "] Expected element size >= 0", i);
-      return EINVAL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowAssertRangeInt8(struct ArrowBufferView view, int8_t min_value,
-                                int8_t max_value, struct ArrowError* error) {
-  for (int64_t i = 0; i < view.size_bytes; i++) {
-    if (view.data.as_int8[i] < min_value || view.data.as_int8[i] > max_value) {
-      ArrowErrorSet(error,
-                    "[%" PRId64 "] Expected buffer value between %" PRId8 " and %" PRId8
-                    " but found value %" PRId8,
-                    i, min_value, max_value, view.data.as_int8[i]);
-      return EINVAL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowAssertInt8In(struct ArrowBufferView view, const int8_t* values,
-                             int64_t n_values, struct ArrowError* error) {
-  for (int64_t i = 0; i < view.size_bytes; i++) {
-    int item_found = 0;
-    for (int64_t j = 0; j < n_values; j++) {
-      if (view.data.as_int8[i] == values[j]) {
-        item_found = 1;
-        break;
-      }
-    }
-
-    if (!item_found) {
-      ArrowErrorSet(error, "[%" PRId64 "] Unexpected buffer value %" PRId8, i,
-                    view.data.as_int8[i]);
-      return EINVAL;
-    }
-  }
-
-  return NANOARROW_OK;
-}
-
-static int ArrowArrayViewValidateFull(struct ArrowArrayView* array_view,
-                                      struct ArrowError* error) {
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    switch (array_view->layout.buffer_type[i]) {
-      // Only validate the portion of the buffer that is strictly required,
-      // which includes not validating the offset buffer of a zero-length array.
-      case NANOARROW_BUFFER_TYPE_DATA_OFFSET:
-        if (array_view->length == 0) {
-          continue;
-        }
-        if (array_view->layout.element_size_bits[i] == 32) {
-          struct ArrowBufferView sliced_offsets;
-          sliced_offsets.data.as_int32 =
-              array_view->buffer_views[i].data.as_int32 + array_view->offset;
-          sliced_offsets.size_bytes = (array_view->length + 1) * sizeof(int32_t);
-          NANOARROW_RETURN_NOT_OK(ArrowAssertIncreasingInt32(sliced_offsets, error));
-        } else {
-          struct ArrowBufferView sliced_offsets;
-          sliced_offsets.data.as_int64 =
-              array_view->buffer_views[i].data.as_int64 + array_view->offset;
-          sliced_offsets.size_bytes = (array_view->length + 1) * sizeof(int64_t);
-          NANOARROW_RETURN_NOT_OK(ArrowAssertIncreasingInt64(sliced_offsets, error));
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_DENSE_UNION ||
-      array_view->storage_type == NANOARROW_TYPE_SPARSE_UNION) {
-    struct ArrowBufferView sliced_type_ids;
-    sliced_type_ids.size_bytes = array_view->length * sizeof(int8_t);
-    if (array_view->length > 0) {
-      sliced_type_ids.data.as_int8 =
-          array_view->buffer_views[0].data.as_int8 + array_view->offset;
-    } else {
-      sliced_type_ids.data.as_int8 = NULL;
-    }
-
-    if (array_view->union_type_id_map == NULL) {
-      // If the union_type_id map is NULL (e.g., when using ArrowArrayInitFromType() +
-      // ArrowArrayAllocateChildren() + ArrowArrayFinishBuilding()), we don't have enough
-      // information to validate this buffer.
-      ArrowErrorSet(error,
-                    "Insufficient information provided for validation of union array");
-      return EINVAL;
-    } else if (_ArrowParsedUnionTypeIdsWillEqualChildIndices(
-                   array_view->union_type_id_map, array_view->n_children,
-                   array_view->n_children)) {
-      NANOARROW_RETURN_NOT_OK(ArrowAssertRangeInt8(
-          sliced_type_ids, 0, (int8_t)(array_view->n_children - 1), error));
-    } else {
-      NANOARROW_RETURN_NOT_OK(ArrowAssertInt8In(sliced_type_ids,
-                                                array_view->union_type_id_map + 128,
-                                                array_view->n_children, error));
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_DENSE_UNION &&
-      array_view->union_type_id_map != NULL) {
-    // Check that offsets refer to child elements that actually exist
-    for (int64_t i = 0; i < array_view->length; i++) {
-      int8_t child_id = ArrowArrayViewUnionChildIndex(array_view, i);
-      int64_t offset = ArrowArrayViewUnionChildOffset(array_view, i);
-      int64_t child_length = array_view->children[child_id]->length;
-      if (offset < 0 || offset > child_length) {
-        ArrowErrorSet(error,
-                      "[%" PRId64 "] Expected union offset for child id %" PRId8
-                      " to be between 0 and %" PRId64
-                      " but "
-                      "found offset value %" PRId64,
-                      i, child_id, child_length, offset);
-        return EINVAL;
-      }
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_RUN_END_ENCODED) {
-    struct ArrowArrayView* run_ends_view = array_view->children[0];
-    if (run_ends_view->length > 0) {
-      int64_t last_run_end = ArrowArrayViewGetIntUnsafe(run_ends_view, 0);
-      for (int64_t i = 1; i < run_ends_view->length; i++) {
-        const int64_t run_end = ArrowArrayViewGetIntUnsafe(run_ends_view, i);
-        if (run_end <= last_run_end) {
-          ArrowErrorSet(
-              error,
-              "Every run end must be strictly greater than the previous run end, "
-              "but run_ends[%" PRId64 " is %" PRId64 " and run_ends[%" PRId64
-              "] is %" PRId64,
-              i, run_end, i - 1, last_run_end);
-          return EINVAL;
-        }
-        last_run_end = run_end;
-      }
-    }
-  }
-
-  if (array_view->storage_type == NANOARROW_TYPE_LIST_VIEW ||
-      array_view->storage_type == NANOARROW_TYPE_LARGE_LIST_VIEW) {
-    int64_t child_len = array_view->children[0]->length;
-
-    struct ArrowBufferView offsets, sizes;
-    offsets.data.data = array_view->buffer_views[1].data.data;
-    sizes.data.data = array_view->buffer_views[2].data.data;
-
-    for (int64_t i = array_view->offset; i < array_view->length + array_view->offset;
-         i++) {
-      int64_t offset, size;
-      if (array_view->storage_type == NANOARROW_TYPE_LIST_VIEW) {
-        offset = offsets.data.as_int32[i];
-        size = sizes.data.as_int32[i];
-      } else {
-        offset = offsets.data.as_int64[i];
-        size = sizes.data.as_int64[i];
-      }
-
-      if (offset < 0) {
-        ArrowErrorSet(error, "Invalid negative offset %" PRId64 " at index %" PRId64,
-                      offset, i);
-        return EINVAL;
-      }
-
-      if (size < 0) {
-        ArrowErrorSet(error, "Invalid negative size %" PRId64 " at index %" PRId64, size,
-                      i);
-        return EINVAL;
-      }
-
-      if ((offset + size) > child_len) {
-        ArrowErrorSet(error,
-                      "Offset: %" PRId64 " + size: %" PRId64 " at index: %" PRId64
-                      " exceeds length of child view: %" PRId64,
-                      offset, size, i, child_len);
-        return EINVAL;
-      }
-    }
-  }
-
-  // Recurse for children
-  for (int64_t i = 0; i < array_view->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateFull(array_view->children[i], error));
-  }
-
-  // Dictionary validation not implemented
-  if (array_view->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateFull(array_view->dictionary, error));
-    // TODO: validate the indices
-  }
-
-  return NANOARROW_OK;
-}
-
-ArrowErrorCode ArrowArrayViewValidate(struct ArrowArrayView* array_view,
-                                      enum ArrowValidationLevel validation_level,
-                                      struct ArrowError* error) {
-  switch (validation_level) {
-    case NANOARROW_VALIDATION_LEVEL_NONE:
-      return NANOARROW_OK;
-    case NANOARROW_VALIDATION_LEVEL_MINIMAL:
-      return ArrowArrayViewValidateMinimal(array_view, error);
-    case NANOARROW_VALIDATION_LEVEL_DEFAULT:
-      return ArrowArrayViewValidateDefault(array_view, error);
-    case NANOARROW_VALIDATION_LEVEL_FULL:
-      NANOARROW_RETURN_NOT_OK(ArrowArrayViewValidateDefault(array_view, error));
-      return ArrowArrayViewValidateFull(array_view, error);
-  }
-
-  ArrowErrorSet(error, "validation_level not recognized");
-  return EINVAL;
-}
-
-struct ArrowComparisonInternalState {
-  enum ArrowCompareLevel level;
-  int is_equal;
-  struct ArrowError* reason;
-};
-
-NANOARROW_CHECK_PRINTF_ATTRIBUTE static void ArrowComparePrependPath(
-    struct ArrowError* out, const char* fmt, ...) {
-  if (out == NULL) {
-    return;
-  }
-
-  char prefix[128];
-  prefix[0] = '\0';
-  va_list args;
-  va_start(args, fmt);
-  int prefix_len = vsnprintf(prefix, sizeof(prefix), fmt, args);
-  va_end(args);
-
-  if (prefix_len <= 0) {
-    return;
-  }
-
-  size_t out_len = strlen(out->message);
-  size_t out_len_to_move = sizeof(struct ArrowError) - prefix_len - 1;
-  if (out_len_to_move > out_len) {
-    out_len_to_move = out_len;
-  }
-
-  memmove(out->message + prefix_len, out->message, out_len_to_move);
-  memcpy(out->message, prefix, prefix_len);
-  out->message[out_len + prefix_len] = '\0';
-}
-
-#define SET_NOT_EQUAL_AND_RETURN_IF_IMPL(cond_, state_, reason_) \
-  do {                                                           \
-    if (cond_) {                                                 \
-      ArrowErrorSet(state_->reason, ": %s", reason_);            \
-      state_->is_equal = 0;                                      \
-      return;                                                    \
-    }                                                            \
-  } while (0)
-
-#define SET_NOT_EQUAL_AND_RETURN_IF(condition_, state_) \
-  SET_NOT_EQUAL_AND_RETURN_IF_IMPL(condition_, state_, #condition_)
-
-static void ArrowArrayViewCompareBuffer(const struct ArrowArrayView* actual,
-                                        const struct ArrowArrayView* expected, int i,
-                                        struct ArrowComparisonInternalState* state) {
-  SET_NOT_EQUAL_AND_RETURN_IF(
-      actual->buffer_views[i].size_bytes != expected->buffer_views[i].size_bytes, state);
-
-  int64_t buffer_size = actual->buffer_views[i].size_bytes;
-  if (buffer_size > 0) {
-    SET_NOT_EQUAL_AND_RETURN_IF(
-        memcmp(actual->buffer_views[i].data.data, expected->buffer_views[i].data.data,
-               buffer_size) != 0,
-        state);
-  }
-}
-
-static void ArrowArrayViewCompareIdentical(const struct ArrowArrayView* actual,
-                                           const struct ArrowArrayView* expected,
-                                           struct ArrowComparisonInternalState* state) {
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->storage_type != expected->storage_type, state);
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->n_children != expected->n_children, state);
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->dictionary == NULL && expected->dictionary != NULL,
-                              state);
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->dictionary != NULL && expected->dictionary == NULL,
-                              state);
-
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->length != expected->length, state);
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->offset != expected->offset, state);
-  SET_NOT_EQUAL_AND_RETURN_IF(actual->null_count != expected->null_count, state);
-
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    ArrowArrayViewCompareBuffer(actual, expected, i, state);
-    if (!state->is_equal) {
-      ArrowComparePrependPath(state->reason, ".buffers[%d]", i);
-      return;
-    }
-  }
-
-  for (int64_t i = 0; i < actual->n_children; i++) {
-    ArrowArrayViewCompareIdentical(actual->children[i], expected->children[i], state);
-    if (!state->is_equal) {
-      ArrowComparePrependPath(state->reason, ".children[%" PRId64 "]", i);
-      return;
-    }
-  }
-
-  if (actual->dictionary != NULL) {
-    ArrowArrayViewCompareIdentical(actual->dictionary, expected->dictionary, state);
-    if (!state->is_equal) {
-      ArrowComparePrependPath(state->reason, ".dictionary");
-      return;
-    }
-  }
-}
-
-// Top-level entry point to take care of creating, cleaning up, and
-// propagating the ArrowComparisonInternalState to the caller
-ArrowErrorCode ArrowArrayViewCompare(const struct ArrowArrayView* actual,
-                                     const struct ArrowArrayView* expected,
-                                     enum ArrowCompareLevel level, int* out,
-                                     struct ArrowError* reason) {
-  struct ArrowComparisonInternalState state;
-  state.level = level;
-  state.is_equal = 1;
-  state.reason = reason;
-
-  switch (level) {
-    case NANOARROW_COMPARE_IDENTICAL:
-      ArrowArrayViewCompareIdentical(actual, expected, &state);
-      break;
-    default:
-      return EINVAL;
-  }
-
-  *out = state.is_equal;
-  if (!state.is_equal) {
-    ArrowComparePrependPath(state.reason, "root");
-  }
-
-  return NANOARROW_OK;
-}
-
-#undef SET_NOT_EQUAL_AND_RETURN_IF
-#undef SET_NOT_EQUAL_AND_RETURN_IF_IMPL
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#include <errno.h>
-
-#include "nanoarrow.h"
-
-struct BasicArrayStreamPrivate {
-  struct ArrowSchema schema;
-  int64_t n_arrays;
-  struct ArrowArray* arrays;
-  int64_t arrays_i;
-};
-
-static int ArrowBasicArrayStreamGetSchema(struct ArrowArrayStream* array_stream,
-                                          struct ArrowSchema* schema) {
-  if (array_stream == NULL || array_stream->release == NULL) {
-    return EINVAL;
-  }
-
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)array_stream->private_data;
-  return ArrowSchemaDeepCopy(&private_data->schema, schema);
-}
-
-static int ArrowBasicArrayStreamGetNext(struct ArrowArrayStream* array_stream,
-                                        struct ArrowArray* array) {
-  if (array_stream == NULL || array_stream->release == NULL) {
-    return EINVAL;
-  }
-
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)array_stream->private_data;
-
-  if (private_data->arrays_i == private_data->n_arrays) {
-    array->release = NULL;
-    return NANOARROW_OK;
-  }
-
-  ArrowArrayMove(&private_data->arrays[private_data->arrays_i++], array);
-  return NANOARROW_OK;
-}
-
-static const char* ArrowBasicArrayStreamGetLastError(
-    struct ArrowArrayStream* array_stream) {
-  NANOARROW_UNUSED(array_stream);
-  return NULL;
-}
-
-static void ArrowBasicArrayStreamRelease(struct ArrowArrayStream* array_stream) {
-  if (array_stream == NULL || array_stream->release == NULL) {
-    return;
-  }
-
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)array_stream->private_data;
-
-  if (private_data->schema.release != NULL) {
-    ArrowSchemaRelease(&private_data->schema);
-  }
-
-  for (int64_t i = 0; i < private_data->n_arrays; i++) {
-    if (private_data->arrays[i].release != NULL) {
-      ArrowArrayRelease(&private_data->arrays[i]);
-    }
-  }
-
-  if (private_data->arrays != NULL) {
-    ArrowFree(private_data->arrays);
-  }
-
-  ArrowFree(private_data);
-  array_stream->release = NULL;
-}
-
-ArrowErrorCode ArrowBasicArrayStreamInit(struct ArrowArrayStream* array_stream,
-                                         struct ArrowSchema* schema, int64_t n_arrays) {
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)ArrowMalloc(
-          sizeof(struct BasicArrayStreamPrivate));
-  if (private_data == NULL) {
-    return ENOMEM;
-  }
-
-  ArrowSchemaMove(schema, &private_data->schema);
-
-  private_data->n_arrays = n_arrays;
-  private_data->arrays = NULL;
-  private_data->arrays_i = 0;
-
-  if (n_arrays > 0) {
-    private_data->arrays =
-        (struct ArrowArray*)ArrowMalloc(n_arrays * sizeof(struct ArrowArray));
-    if (private_data->arrays == NULL) {
-      ArrowBasicArrayStreamRelease(array_stream);
-      return ENOMEM;
-    }
-  }
-
-  for (int64_t i = 0; i < private_data->n_arrays; i++) {
-    private_data->arrays[i].release = NULL;
-  }
-
-  array_stream->get_schema = &ArrowBasicArrayStreamGetSchema;
-  array_stream->get_next = &ArrowBasicArrayStreamGetNext;
-  array_stream->get_last_error = ArrowBasicArrayStreamGetLastError;
-  array_stream->release = ArrowBasicArrayStreamRelease;
-  array_stream->private_data = private_data;
-  return NANOARROW_OK;
-}
-
-void ArrowBasicArrayStreamSetArray(struct ArrowArrayStream* array_stream, int64_t i,
-                                   struct ArrowArray* array) {
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)array_stream->private_data;
-  ArrowArrayMove(array, &private_data->arrays[i]);
-}
-
-ArrowErrorCode ArrowBasicArrayStreamValidate(const struct ArrowArrayStream* array_stream,
-                                             struct ArrowError* error) {
-  struct BasicArrayStreamPrivate* private_data =
-      (struct BasicArrayStreamPrivate*)array_stream->private_data;
-
-  struct ArrowArrayView array_view;
-  NANOARROW_RETURN_NOT_OK(
-      ArrowArrayViewInitFromSchema(&array_view, &private_data->schema, error));
-
-  for (int64_t i = 0; i < private_data->n_arrays; i++) {
-    if (private_data->arrays[i].release != NULL) {
-      int result = ArrowArrayViewSetArray(&array_view, &private_data->arrays[i], error);
-      if (result != NANOARROW_OK) {
-        ArrowArrayViewReset(&array_view);
-        return result;
-      }
-    }
-  }
-
-  ArrowArrayViewReset(&array_view);
-  return NANOARROW_OK;
-}
diff --git a/src/oracledb/impl/arrow/nanoarrow/nanoarrow.h b/src/oracledb/impl/arrow/nanoarrow/nanoarrow.h
deleted file mode 100644
index d0b955f6..00000000
--- a/src/oracledb/impl/arrow/nanoarrow/nanoarrow.h
+++ /dev/null
@@ -1,4440 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#ifndef NANOARROW_CONFIG_H_INCLUDED
-#define NANOARROW_CONFIG_H_INCLUDED
-
-#define NANOARROW_VERSION_MAJOR 0
-#define NANOARROW_VERSION_MINOR 7
-#define NANOARROW_VERSION_PATCH 0
-#define NANOARROW_VERSION "0.7.0"
-
-#define NANOARROW_VERSION_INT                                        \
-  (NANOARROW_VERSION_MAJOR * 10000 + NANOARROW_VERSION_MINOR * 100 + \
-   NANOARROW_VERSION_PATCH)
-
-#define NANOARROW_NAMESPACE PythonPkg
-
-#if !defined(NANOARROW_CXX_NAMESPACE)
-#define NANOARROW_CXX_NAMESPACE nanoarrow
-#endif
-
-#define NANOARROW_CXX_NAMESPACE_BEGIN namespace NANOARROW_CXX_NAMESPACE {
-#define NANOARROW_CXX_NAMESPACE_END }
-
-#endif
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#ifndef NANOARROW_NANOARROW_TYPES_H_INCLUDED
-#define NANOARROW_NANOARROW_TYPES_H_INCLUDED
-
-#include <stdint.h>
-#include <string.h>
-
-
-
-#if defined(NANOARROW_DEBUG) && !defined(NANOARROW_PRINT_AND_DIE)
-#include <stdio.h>
-#include <stdlib.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Extra guard for versions of Arrow without the canonical guard
-#ifndef ARROW_FLAG_DICTIONARY_ORDERED
-
-/// \defgroup nanoarrow-arrow-cdata Arrow C Data interface
-///
-/// The Arrow C Data (https://arrow.apache.org/docs/format/CDataInterface.html)
-/// and Arrow C Stream (https://arrow.apache.org/docs/format/CStreamInterface.html)
-/// interfaces are part of the
-/// Arrow Columnar Format specification
-/// (https://arrow.apache.org/docs/format/Columnar.html). See the Arrow documentation for
-/// documentation of these structures.
-///
-/// @{
-
-#ifndef ARROW_C_DATA_INTERFACE
-#define ARROW_C_DATA_INTERFACE
-
-#define ARROW_FLAG_DICTIONARY_ORDERED 1
-#define ARROW_FLAG_NULLABLE 2
-#define ARROW_FLAG_MAP_KEYS_SORTED 4
-
-struct ArrowSchema {
-  // Array type description
-  const char* format;
-  const char* name;
-  const char* metadata;
-  int64_t flags;
-  int64_t n_children;
-  struct ArrowSchema** children;
-  struct ArrowSchema* dictionary;
-
-  // Release callback
-  void (*release)(struct ArrowSchema*);
-  // Opaque producer-specific data
-  void* private_data;
-};
-
-struct ArrowArray {
-  // Array data description
-  int64_t length;
-  int64_t null_count;
-  int64_t offset;
-  int64_t n_buffers;
-  int64_t n_children;
-  const void** buffers;
-  struct ArrowArray** children;
-  struct ArrowArray* dictionary;
-
-  // Release callback
-  void (*release)(struct ArrowArray*);
-  // Opaque producer-specific data
-  void* private_data;
-};
-
-#endif  // ARROW_C_DATA_INTERFACE
-
-#ifndef ARROW_C_STREAM_INTERFACE
-#define ARROW_C_STREAM_INTERFACE
-
-struct ArrowArrayStream {
-  // Callback to get the stream type
-  // (will be the same for all arrays in the stream).
-  //
-  // Return value: 0 if successful, an `errno`-compatible error code otherwise.
-  //
-  // If successful, the ArrowSchema must be released independently from the stream.
-  int (*get_schema)(struct ArrowArrayStream*, struct ArrowSchema* out);
-
-  // Callback to get the next array
-  // (if no error and the array is released, the stream has ended)
-  //
-  // Return value: 0 if successful, an `errno`-compatible error code otherwise.
-  //
-  // If successful, the ArrowArray must be released independently from the stream.
-  int (*get_next)(struct ArrowArrayStream*, struct ArrowArray* out);
-
-  // Callback to get optional detailed error information.
-  // This must only be called if the last stream operation failed
-  // with a non-0 return code.
-  //
-  // Return value: pointer to a null-terminated character array describing
-  // the last error, or NULL if no description is available.
-  //
-  // The returned pointer is only valid until the next operation on this stream
-  // (including release).
-  const char* (*get_last_error)(struct ArrowArrayStream*);
-
-  // Release callback: release the stream's own resources.
-  // Note that arrays returned by `get_next` must be individually released.
-  void (*release)(struct ArrowArrayStream*);
-
-  // Opaque producer-specific data
-  void* private_data;
-};
-
-#endif  // ARROW_C_STREAM_INTERFACE
-#endif  // ARROW_FLAG_DICTIONARY_ORDERED
-
-/// @}
-
-// Utility macros
-#define _NANOARROW_CONCAT(x, y) x##y
-#define _NANOARROW_MAKE_NAME(x, y) _NANOARROW_CONCAT(x, y)
-
-#define _NANOARROW_RETURN_NOT_OK_IMPL(NAME, EXPR) \
-  do {                                            \
-    const int NAME = (EXPR);                      \
-    if (NAME) return NAME;                        \
-  } while (0)
-
-#define _NANOARROW_CHECK_RANGE(x_, min_, max_) \
-  NANOARROW_RETURN_NOT_OK((x_ >= min_ && x_ <= max_) ? NANOARROW_OK : EINVAL)
-
-#define _NANOARROW_CHECK_UPPER_LIMIT(x_, max_) \
-  NANOARROW_RETURN_NOT_OK((x_ <= max_) ? NANOARROW_OK : EINVAL)
-
-#if defined(NANOARROW_DEBUG)
-#define _NANOARROW_RETURN_NOT_OK_WITH_ERROR_IMPL(NAME, EXPR, ERROR_PTR_EXPR, EXPR_STR) \
-  do {                                                                                 \
-    const int NAME = (EXPR);                                                           \
-    if (NAME) {                                                                        \
-      ArrowErrorSet((ERROR_PTR_EXPR), "%s failed with errno %d\n* %s:%d", EXPR_STR,    \
-                    NAME, __FILE__, __LINE__);                                         \
-      return NAME;                                                                     \
-    }                                                                                  \
-  } while (0)
-#else
-#define _NANOARROW_RETURN_NOT_OK_WITH_ERROR_IMPL(NAME, EXPR, ERROR_PTR_EXPR, EXPR_STR) \
-  do {                                                                                 \
-    const int NAME = (EXPR);                                                           \
-    if (NAME) {                                                                        \
-      ArrowErrorSet((ERROR_PTR_EXPR), "%s failed with errno %d", EXPR_STR, NAME);      \
-      return NAME;                                                                     \
-    }                                                                                  \
-  } while (0)
-#endif
-
-#if defined(NANOARROW_DEBUG)
-// For checking ArrowErrorSet() calls for valid printf format strings/arguments
-// If using mingw's c99-compliant printf, we need a different format-checking attribute
-#if defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW_PRINTF_FORMAT)
-#define NANOARROW_CHECK_PRINTF_ATTRIBUTE \
-  __attribute__((format(__MINGW_PRINTF_FORMAT, 2, 3)))
-#elif defined(__GNUC__)
-#define NANOARROW_CHECK_PRINTF_ATTRIBUTE __attribute__((format(printf, 2, 3)))
-#else
-#define NANOARROW_CHECK_PRINTF_ATTRIBUTE
-#endif
-
-// For checking calls to functions that return ArrowErrorCode
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-#define NANOARROW_CHECK_RETURN_ATTRIBUTE __attribute__((warn_unused_result))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1700)
-#define NANOARROW_CHECK_RETURN_ATTRIBUTE _Check_return_
-#else
-#define NANOARROW_CHECK_RETURN_ATTRIBUTE
-#endif
-
-#else
-#define NANOARROW_CHECK_RETURN_ATTRIBUTE
-#define NANOARROW_CHECK_PRINTF_ATTRIBUTE
-#endif
-
-#define NANOARROW_UNUSED(x) (void)(x)
-
-/// \brief Return code for success.
-/// \ingroup nanoarrow-errors
-#define NANOARROW_OK 0
-
-/// \brief Represents an errno-compatible error code
-/// \ingroup nanoarrow-errors
-typedef int ArrowErrorCode;
-
-#if defined(NANOARROW_DEBUG)
-#define ArrowErrorCode NANOARROW_CHECK_RETURN_ATTRIBUTE ArrowErrorCode
-#endif
-
-/// \brief Flags supported by ArrowSchemaViewInit()
-/// \ingroup nanoarrow-schema-view
-#define NANOARROW_FLAG_ALL_SUPPORTED \
-  (ARROW_FLAG_DICTIONARY_ORDERED | ARROW_FLAG_NULLABLE | ARROW_FLAG_MAP_KEYS_SORTED)
-
-/// \brief Error type containing a UTF-8 encoded message.
-/// \ingroup nanoarrow-errors
-struct ArrowError {
-  /// \brief A character buffer with space for an error message.
-  char message[1024];
-};
-
-/// \brief Ensure an ArrowError is null-terminated by zeroing the first character.
-/// \ingroup nanoarrow-errors
-///
-/// If error is NULL, this function does nothing.
-static inline void ArrowErrorInit(struct ArrowError* error) {
-  if (error != NULL) {
-    error->message[0] = '\0';
-  }
-}
-
-/// \brief Get the contents of an error
-/// \ingroup nanoarrow-errors
-///
-/// If error is NULL, returns "", or returns the contents of the error message
-/// otherwise.
-static inline const char* ArrowErrorMessage(struct ArrowError* error) {
-  if (error == NULL) {
-    return "";
-  } else {
-    return error->message;
-  }
-}
-
-/// \brief Set the contents of an error from an existing null-terminated string
-/// \ingroup nanoarrow-errors
-///
-/// If error is NULL, this function does nothing.
-static inline void ArrowErrorSetString(struct ArrowError* error, const char* src) {
-  if (error == NULL) {
-    return;
-  }
-
-  int64_t src_len = strlen(src);
-  if (src_len >= ((int64_t)sizeof(error->message))) {
-    memcpy(error->message, src, sizeof(error->message) - 1);
-    error->message[sizeof(error->message) - 1] = '\0';
-  } else {
-    memcpy(error->message, src, src_len);
-    error->message[src_len] = '\0';
-  }
-}
-
-/// \brief Check the result of an expression and return it if not NANOARROW_OK
-/// \ingroup nanoarrow-errors
-#define NANOARROW_RETURN_NOT_OK(EXPR) \
-  _NANOARROW_RETURN_NOT_OK_IMPL(_NANOARROW_MAKE_NAME(errno_status_, __COUNTER__), EXPR)
-
-/// \brief Check the result of an expression and return it if not NANOARROW_OK,
-/// adding an auto-generated message to an ArrowError.
-/// \ingroup nanoarrow-errors
-///
-/// This macro is used to ensure that functions that accept an ArrowError
-/// as input always set its message when returning an error code (e.g., when calling
-/// a nanoarrow function that does *not* accept ArrowError).
-#define NANOARROW_RETURN_NOT_OK_WITH_ERROR(EXPR, ERROR_EXPR) \
-  _NANOARROW_RETURN_NOT_OK_WITH_ERROR_IMPL(                  \
-      _NANOARROW_MAKE_NAME(errno_status_, __COUNTER__), EXPR, ERROR_EXPR, #EXPR)
-
-#if defined(NANOARROW_DEBUG) && !defined(NANOARROW_PRINT_AND_DIE)
-#define NANOARROW_PRINT_AND_DIE(VALUE, EXPR_STR)                                 \
-  do {                                                                           \
-    fprintf(stderr, "%s failed with code %d\n* %s:%d\n", EXPR_STR, (int)(VALUE), \
-            __FILE__, (int)__LINE__);                                            \
-    abort();                                                                     \
-  } while (0)
-#endif
-
-#if defined(NANOARROW_DEBUG)
-#define _NANOARROW_ASSERT_OK_IMPL(NAME, EXPR, EXPR_STR) \
-  do {                                                  \
-    const int NAME = (EXPR);                            \
-    if (NAME) NANOARROW_PRINT_AND_DIE(NAME, EXPR_STR);  \
-  } while (0)
-
-/// \brief Assert that an expression's value is NANOARROW_OK
-/// \ingroup nanoarrow-errors
-///
-/// If nanoarrow was built in debug mode (i.e., defined(NANOARROW_DEBUG) is true),
-/// print a message to stderr and abort. If nanoarrow was built in release mode,
-/// this statement has no effect. You can customize fatal error behaviour
-/// be defining the NANOARROW_PRINT_AND_DIE macro before including nanoarrow.h
-/// This macro is provided as a convenience for users and is not used internally.
-#define NANOARROW_ASSERT_OK(EXPR) \
-  _NANOARROW_ASSERT_OK_IMPL(_NANOARROW_MAKE_NAME(errno_status_, __COUNTER__), EXPR, #EXPR)
-
-#define _NANOARROW_DCHECK_IMPL(EXPR, EXPR_STR)          \
-  do {                                                  \
-    if (!(EXPR)) NANOARROW_PRINT_AND_DIE(-1, EXPR_STR); \
-  } while (0)
-
-#define NANOARROW_DCHECK(EXPR) _NANOARROW_DCHECK_IMPL(EXPR, #EXPR)
-#else
-#define NANOARROW_ASSERT_OK(EXPR) (void)(EXPR)
-#define NANOARROW_DCHECK(EXPR)
-#endif
-
-static inline void ArrowSchemaMove(struct ArrowSchema* src, struct ArrowSchema* dst) {
-  NANOARROW_DCHECK(src != NULL);
-  NANOARROW_DCHECK(dst != NULL);
-
-  memcpy(dst, src, sizeof(struct ArrowSchema));
-  src->release = NULL;
-}
-
-static inline void ArrowSchemaRelease(struct ArrowSchema* schema) {
-  NANOARROW_DCHECK(schema != NULL);
-  schema->release(schema);
-  NANOARROW_DCHECK(schema->release == NULL);
-}
-
-static inline void ArrowArrayMove(struct ArrowArray* src, struct ArrowArray* dst) {
-  NANOARROW_DCHECK(src != NULL);
-  NANOARROW_DCHECK(dst != NULL);
-
-  memcpy(dst, src, sizeof(struct ArrowArray));
-  src->release = NULL;
-}
-
-static inline void ArrowArrayRelease(struct ArrowArray* array) {
-  NANOARROW_DCHECK(array != NULL);
-  array->release(array);
-  NANOARROW_DCHECK(array->release == NULL);
-}
-
-static inline void ArrowArrayStreamMove(struct ArrowArrayStream* src,
-                                        struct ArrowArrayStream* dst) {
-  NANOARROW_DCHECK(src != NULL);
-  NANOARROW_DCHECK(dst != NULL);
-
-  memcpy(dst, src, sizeof(struct ArrowArrayStream));
-  src->release = NULL;
-}
-
-static inline const char* ArrowArrayStreamGetLastError(
-    struct ArrowArrayStream* array_stream) {
-  NANOARROW_DCHECK(array_stream != NULL);
-
-  const char* value = array_stream->get_last_error(array_stream);
-  if (value == NULL) {
-    return "";
-  } else {
-    return value;
-  }
-}
-
-static inline ArrowErrorCode ArrowArrayStreamGetSchema(
-    struct ArrowArrayStream* array_stream, struct ArrowSchema* out,
-    struct ArrowError* error) {
-  NANOARROW_DCHECK(array_stream != NULL);
-
-  int result = array_stream->get_schema(array_stream, out);
-  if (result != NANOARROW_OK && error != NULL) {
-    ArrowErrorSetString(error, ArrowArrayStreamGetLastError(array_stream));
-  }
-
-  return result;
-}
-
-static inline ArrowErrorCode ArrowArrayStreamGetNext(
-    struct ArrowArrayStream* array_stream, struct ArrowArray* out,
-    struct ArrowError* error) {
-  NANOARROW_DCHECK(array_stream != NULL);
-
-  int result = array_stream->get_next(array_stream, out);
-  if (result != NANOARROW_OK && error != NULL) {
-    ArrowErrorSetString(error, ArrowArrayStreamGetLastError(array_stream));
-  }
-
-  return result;
-}
-
-static inline void ArrowArrayStreamRelease(struct ArrowArrayStream* array_stream) {
-  NANOARROW_DCHECK(array_stream != NULL);
-  array_stream->release(array_stream);
-  NANOARROW_DCHECK(array_stream->release == NULL);
-}
-
-static char _ArrowIsLittleEndian(void) {
-  uint32_t check = 1;
-  char first_byte;
-  memcpy(&first_byte, &check, sizeof(char));
-  return first_byte;
-}
-
-/// \brief Arrow type enumerator
-/// \ingroup nanoarrow-utils
-///
-/// These names are intended to map to the corresponding arrow::Type::type
-/// enumerator; however, the numeric values are specifically not equal
-/// (i.e., do not rely on numeric comparison).
-enum ArrowType {
-  NANOARROW_TYPE_UNINITIALIZED = 0,
-  NANOARROW_TYPE_NA = 1,
-  NANOARROW_TYPE_BOOL,
-  NANOARROW_TYPE_UINT8,
-  NANOARROW_TYPE_INT8,
-  NANOARROW_TYPE_UINT16,
-  NANOARROW_TYPE_INT16,
-  NANOARROW_TYPE_UINT32,
-  NANOARROW_TYPE_INT32,
-  NANOARROW_TYPE_UINT64,
-  NANOARROW_TYPE_INT64,
-  NANOARROW_TYPE_HALF_FLOAT,
-  NANOARROW_TYPE_FLOAT,
-  NANOARROW_TYPE_DOUBLE,
-  NANOARROW_TYPE_STRING,
-  NANOARROW_TYPE_BINARY,
-  NANOARROW_TYPE_FIXED_SIZE_BINARY,
-  NANOARROW_TYPE_DATE32,
-  NANOARROW_TYPE_DATE64,
-  NANOARROW_TYPE_TIMESTAMP,
-  NANOARROW_TYPE_TIME32,
-  NANOARROW_TYPE_TIME64,
-  NANOARROW_TYPE_INTERVAL_MONTHS,
-  NANOARROW_TYPE_INTERVAL_DAY_TIME,
-  NANOARROW_TYPE_DECIMAL128,
-  NANOARROW_TYPE_DECIMAL256,
-  NANOARROW_TYPE_LIST,
-  NANOARROW_TYPE_STRUCT,
-  NANOARROW_TYPE_SPARSE_UNION,
-  NANOARROW_TYPE_DENSE_UNION,
-  NANOARROW_TYPE_DICTIONARY,
-  NANOARROW_TYPE_MAP,
-  NANOARROW_TYPE_EXTENSION,
-  NANOARROW_TYPE_FIXED_SIZE_LIST,
-  NANOARROW_TYPE_DURATION,
-  NANOARROW_TYPE_LARGE_STRING,
-  NANOARROW_TYPE_LARGE_BINARY,
-  NANOARROW_TYPE_LARGE_LIST,
-  NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO,
-  NANOARROW_TYPE_RUN_END_ENCODED,
-  NANOARROW_TYPE_BINARY_VIEW,
-  NANOARROW_TYPE_STRING_VIEW,
-  NANOARROW_TYPE_DECIMAL32,
-  NANOARROW_TYPE_DECIMAL64,
-  NANOARROW_TYPE_LIST_VIEW,
-  NANOARROW_TYPE_LARGE_LIST_VIEW,
-};
-
-/// \brief Get a string value of an enum ArrowType value
-/// \ingroup nanoarrow-utils
-///
-/// Returns NULL for invalid values for type
-static inline const char* ArrowTypeString(enum ArrowType type);
-
-static inline const char* ArrowTypeString(enum ArrowType type) {
-  switch (type) {
-    case NANOARROW_TYPE_NA:
-      return "na";
-    case NANOARROW_TYPE_BOOL:
-      return "bool";
-    case NANOARROW_TYPE_UINT8:
-      return "uint8";
-    case NANOARROW_TYPE_INT8:
-      return "int8";
-    case NANOARROW_TYPE_UINT16:
-      return "uint16";
-    case NANOARROW_TYPE_INT16:
-      return "int16";
-    case NANOARROW_TYPE_UINT32:
-      return "uint32";
-    case NANOARROW_TYPE_INT32:
-      return "int32";
-    case NANOARROW_TYPE_UINT64:
-      return "uint64";
-    case NANOARROW_TYPE_INT64:
-      return "int64";
-    case NANOARROW_TYPE_HALF_FLOAT:
-      return "half_float";
-    case NANOARROW_TYPE_FLOAT:
-      return "float";
-    case NANOARROW_TYPE_DOUBLE:
-      return "double";
-    case NANOARROW_TYPE_STRING:
-      return "string";
-    case NANOARROW_TYPE_BINARY:
-      return "binary";
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      return "fixed_size_binary";
-    case NANOARROW_TYPE_DATE32:
-      return "date32";
-    case NANOARROW_TYPE_DATE64:
-      return "date64";
-    case NANOARROW_TYPE_TIMESTAMP:
-      return "timestamp";
-    case NANOARROW_TYPE_TIME32:
-      return "time32";
-    case NANOARROW_TYPE_TIME64:
-      return "time64";
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-      return "interval_months";
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME:
-      return "interval_day_time";
-    case NANOARROW_TYPE_DECIMAL32:
-      return "decimal32";
-    case NANOARROW_TYPE_DECIMAL64:
-      return "decimal64";
-    case NANOARROW_TYPE_DECIMAL128:
-      return "decimal128";
-    case NANOARROW_TYPE_DECIMAL256:
-      return "decimal256";
-    case NANOARROW_TYPE_LIST:
-      return "list";
-    case NANOARROW_TYPE_STRUCT:
-      return "struct";
-    case NANOARROW_TYPE_SPARSE_UNION:
-      return "sparse_union";
-    case NANOARROW_TYPE_DENSE_UNION:
-      return "dense_union";
-    case NANOARROW_TYPE_DICTIONARY:
-      return "dictionary";
-    case NANOARROW_TYPE_MAP:
-      return "map";
-    case NANOARROW_TYPE_EXTENSION:
-      return "extension";
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      return "fixed_size_list";
-    case NANOARROW_TYPE_DURATION:
-      return "duration";
-    case NANOARROW_TYPE_LARGE_STRING:
-      return "large_string";
-    case NANOARROW_TYPE_LARGE_BINARY:
-      return "large_binary";
-    case NANOARROW_TYPE_LARGE_LIST:
-      return "large_list";
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO:
-      return "interval_month_day_nano";
-    case NANOARROW_TYPE_RUN_END_ENCODED:
-      return "run_end_encoded";
-    case NANOARROW_TYPE_BINARY_VIEW:
-      return "binary_view";
-    case NANOARROW_TYPE_STRING_VIEW:
-      return "string_view";
-    case NANOARROW_TYPE_LIST_VIEW:
-      return "list_view";
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      return "large_list_view";
-    default:
-      return NULL;
-  }
-}
-
-/// \brief Arrow time unit enumerator
-/// \ingroup nanoarrow-utils
-///
-/// These names and values map to the corresponding arrow::TimeUnit::type
-/// enumerator.
-enum ArrowTimeUnit {
-  NANOARROW_TIME_UNIT_SECOND = 0,
-  NANOARROW_TIME_UNIT_MILLI = 1,
-  NANOARROW_TIME_UNIT_MICRO = 2,
-  NANOARROW_TIME_UNIT_NANO = 3
-};
-
-/// \brief Validation level enumerator
-/// \ingroup nanoarrow-array
-enum ArrowValidationLevel {
-  /// \brief Do not validate buffer sizes or content.
-  NANOARROW_VALIDATION_LEVEL_NONE = 0,
-
-  /// \brief Validate buffer sizes that depend on array length but do not validate buffer
-  /// sizes that depend on buffer data access.
-  NANOARROW_VALIDATION_LEVEL_MINIMAL = 1,
-
-  /// \brief Validate all buffer sizes, including those that require buffer data access,
-  /// but do not perform any checks that are O(1) along the length of the buffers.
-  NANOARROW_VALIDATION_LEVEL_DEFAULT = 2,
-
-  /// \brief Validate all buffer sizes and all buffer content. This is useful in the
-  /// context of untrusted input or input that may have been corrupted in transit.
-  NANOARROW_VALIDATION_LEVEL_FULL = 3
-};
-
-/// \brief Comparison level enumerator
-/// \ingroup nanoarrow-utils
-enum ArrowCompareLevel {
-  /// \brief Consider arrays equal if buffers contain identical content
-  /// and have identical offset, null count, and length. Note that this is
-  /// a much stricter check than logical equality, which would take into
-  /// account potentially different content of null slots, arrays with a
-  /// non-zero offset, and other considerations.
-  NANOARROW_COMPARE_IDENTICAL,
-};
-
-/// \brief Get a string value of an enum ArrowTimeUnit value
-/// \ingroup nanoarrow-utils
-///
-/// Returns NULL for invalid values for time_unit
-static inline const char* ArrowTimeUnitString(enum ArrowTimeUnit time_unit);
-
-static inline const char* ArrowTimeUnitString(enum ArrowTimeUnit time_unit) {
-  switch (time_unit) {
-    case NANOARROW_TIME_UNIT_SECOND:
-      return "s";
-    case NANOARROW_TIME_UNIT_MILLI:
-      return "ms";
-    case NANOARROW_TIME_UNIT_MICRO:
-      return "us";
-    case NANOARROW_TIME_UNIT_NANO:
-      return "ns";
-    default:
-      return NULL;
-  }
-}
-
-/// \brief Functional types of buffers as described in the Arrow Columnar Specification
-/// \ingroup nanoarrow-array-view
-enum ArrowBufferType {
-  NANOARROW_BUFFER_TYPE_NONE,
-  NANOARROW_BUFFER_TYPE_VALIDITY,
-  NANOARROW_BUFFER_TYPE_TYPE_ID,
-  NANOARROW_BUFFER_TYPE_UNION_OFFSET,
-  NANOARROW_BUFFER_TYPE_DATA_OFFSET,
-  NANOARROW_BUFFER_TYPE_DATA,
-  NANOARROW_BUFFER_TYPE_VARIADIC_DATA,
-  NANOARROW_BUFFER_TYPE_VARIADIC_SIZE,
-  NANOARROW_BUFFER_TYPE_VIEW_OFFSET,
-  NANOARROW_BUFFER_TYPE_SIZE,
-};
-
-/// \brief The maximum number of fixed buffers in an ArrowArrayView or ArrowLayout
-/// \ingroup nanoarrow-array-view
-#define NANOARROW_MAX_FIXED_BUFFERS 3
-
-/// \brief An non-owning view of a string
-/// \ingroup nanoarrow-utils
-struct ArrowStringView {
-  /// \brief A pointer to the start of the string
-  ///
-  /// If size_bytes is 0, this value may be NULL.
-  const char* data;
-
-  /// \brief The size of the string in bytes,
-  ///
-  /// (Not including the null terminator.)
-  int64_t size_bytes;
-};
-
-/// \brief Return a view of a const C string
-/// \ingroup nanoarrow-utils
-static inline struct ArrowStringView ArrowCharView(const char* value);
-
-static inline struct ArrowStringView ArrowCharView(const char* value) {
-  struct ArrowStringView out;
-
-  out.data = value;
-  if (value) {
-    out.size_bytes = (int64_t)strlen(value);
-  } else {
-    out.size_bytes = 0;
-  }
-
-  return out;
-}
-
-union ArrowBufferViewData {
-  const void* data;
-  const int8_t* as_int8;
-  const uint8_t* as_uint8;
-  const int16_t* as_int16;
-  const uint16_t* as_uint16;
-  const int32_t* as_int32;
-  const uint32_t* as_uint32;
-  const int64_t* as_int64;
-  const uint64_t* as_uint64;
-  const double* as_double;
-  const float* as_float;
-  const char* as_char;
-  const union ArrowBinaryView* as_binary_view;
-};
-
-/// \brief An non-owning view of a buffer
-/// \ingroup nanoarrow-utils
-struct ArrowBufferView {
-  /// \brief A pointer to the start of the buffer
-  ///
-  /// If size_bytes is 0, this value may be NULL.
-  union ArrowBufferViewData data;
-
-  /// \brief The size of the buffer in bytes
-  int64_t size_bytes;
-};
-
-/// \brief Array buffer allocation and deallocation
-/// \ingroup nanoarrow-buffer
-///
-/// Container for allocate, reallocate, and free methods that can be used
-/// to customize allocation and deallocation of buffers when constructing
-/// an ArrowArray.
-struct ArrowBufferAllocator {
-  /// \brief Reallocate a buffer or return NULL if it cannot be reallocated
-  uint8_t* (*reallocate)(struct ArrowBufferAllocator* allocator, uint8_t* ptr,
-                         int64_t old_size, int64_t new_size);
-
-  /// \brief Deallocate a buffer allocated by this allocator
-  void (*free)(struct ArrowBufferAllocator* allocator, uint8_t* ptr, int64_t size);
-
-  /// \brief Opaque data specific to the allocator
-  void* private_data;
-};
-
-typedef void (*ArrowBufferDeallocatorCallback)(struct ArrowBufferAllocator* allocator,
-                                               uint8_t* ptr, int64_t size);
-
-/// \brief An owning mutable view of a buffer
-/// \ingroup nanoarrow-buffer
-struct ArrowBuffer {
-  /// \brief A pointer to the start of the buffer
-  ///
-  /// If capacity_bytes is 0, this value may be NULL.
-  uint8_t* data;
-
-  /// \brief The size of the buffer in bytes
-  int64_t size_bytes;
-
-  /// \brief The capacity of the buffer in bytes
-  int64_t capacity_bytes;
-
-  /// \brief The allocator that will be used to reallocate and/or free the buffer
-  struct ArrowBufferAllocator allocator;
-};
-
-/// \brief An owning mutable view of a bitmap
-/// \ingroup nanoarrow-bitmap
-struct ArrowBitmap {
-  /// \brief An ArrowBuffer to hold the allocated memory
-  struct ArrowBuffer buffer;
-
-  /// \brief The number of bits that have been appended to the bitmap
-  int64_t size_bits;
-};
-
-/// \brief A description of an arrangement of buffers
-/// \ingroup nanoarrow-utils
-///
-/// Contains the minimum amount of information required to
-/// calculate the size of each buffer in an ArrowArray knowing only
-/// the length and offset of the array.
-struct ArrowLayout {
-  /// \brief The function of each buffer
-  enum ArrowBufferType buffer_type[NANOARROW_MAX_FIXED_BUFFERS];
-
-  /// \brief The data type of each buffer
-  enum ArrowType buffer_data_type[NANOARROW_MAX_FIXED_BUFFERS];
-
-  /// \brief The size of an element each buffer or 0 if this size is variable or unknown
-  int64_t element_size_bits[NANOARROW_MAX_FIXED_BUFFERS];
-
-  /// \brief The number of elements in the child array per element in this array for a
-  /// fixed-size list
-  int64_t child_size_elements;
-};
-
-/// \brief A non-owning view of an ArrowArray
-/// \ingroup nanoarrow-array-view
-///
-/// This data structure provides access to the values contained within
-/// an ArrowArray with fields provided in a more readily-extractible
-/// form. You can re-use an ArrowArrayView for multiple ArrowArrays
-/// with the same storage type, use it to represent a hypothetical
-/// ArrowArray that does not exist yet, or use it to validate the buffers
-/// of a future ArrowArray.
-struct ArrowArrayView {
-  /// \brief The underlying ArrowArray or NULL if it has not been set or
-  /// if the buffers in this ArrowArrayView are not backed by an ArrowArray.
-  const struct ArrowArray* array;
-
-  /// \brief The number of elements from the physical start of the buffers.
-  int64_t offset;
-
-  /// \brief The number of elements in this view.
-  int64_t length;
-
-  /// \brief A cached null count or -1 to indicate that this value is unknown.
-  int64_t null_count;
-
-  /// \brief The type used to store values in this array
-  ///
-  /// This type represents only the minimum required information to
-  /// extract values from the array buffers (e.g., for a Date32 array,
-  /// this value will be NANOARROW_TYPE_INT32). For dictionary-encoded
-  /// arrays, this will be the index type.
-  enum ArrowType storage_type;
-
-  /// \brief The buffer types, strides, and sizes of this Array's buffers
-  struct ArrowLayout layout;
-
-  /// \brief This Array's buffers as ArrowBufferView objects
-  struct ArrowBufferView buffer_views[NANOARROW_MAX_FIXED_BUFFERS];
-
-  /// \brief The number of children of this view
-  int64_t n_children;
-
-  /// \brief Pointers to views of this array's children
-  struct ArrowArrayView** children;
-
-  /// \brief Pointer to a view of this array's dictionary
-  struct ArrowArrayView* dictionary;
-
-  /// \brief Union type id to child index mapping
-  ///
-  /// If storage_type is a union type, a 256-byte ArrowMalloc()ed buffer
-  /// such that child_index == union_type_id_map[type_id] and
-  /// type_id == union_type_id_map[128 + child_index]. This value may be
-  /// NULL in the case where child_id == type_id.
-  int8_t* union_type_id_map;
-
-  /// \brief Number of variadic buffers
-  int32_t n_variadic_buffers;
-
-  /// \brief Pointers to variadic buffers of binary/string_view arrays
-  const void** variadic_buffers;
-
-  /// \brief Size of each variadic buffer
-  int64_t* variadic_buffer_sizes;
-};
-
-// Used as the private data member for ArrowArrays allocated here and accessed
-// internally within inline ArrowArray* helpers.
-struct ArrowArrayPrivateData {
-  // Holder for the validity buffer (or first buffer for union types, which are
-  // the only type whose first buffer is not a valdiity buffer)
-  struct ArrowBitmap bitmap;
-
-  // Holder for additional buffers as required
-  struct ArrowBuffer buffers[NANOARROW_MAX_FIXED_BUFFERS - 1];
-
-  // The array of pointers to buffers. This must be updated after a sequence
-  // of appends to synchronize its values with the actual buffer addresses
-  // (which may have been reallocated during that time)
-  const void** buffer_data;
-
-  // The storage data type, or NANOARROW_TYPE_UNINITIALIZED if unknown
-  enum ArrowType storage_type;
-
-  // The buffer arrangement for the storage type
-  struct ArrowLayout layout;
-
-  // Flag to indicate if there are non-sequence union type ids.
-  // In the future this could be replaced with a type id<->child mapping
-  // to support constructing unions in append mode where type_id != child_index
-  int8_t union_type_id_is_child_index;
-
-  // Number of variadic buffers for binary view types
-  int32_t n_variadic_buffers;
-
-  // Variadic buffers for binary view types
-  struct ArrowBuffer* variadic_buffers;
-
-  // Size of each variadic buffer in bytes
-  int64_t* variadic_buffer_sizes;
-
-  // The current offset used to build list views
-  int64_t list_view_offset;
-};
-
-/// \brief A representation of an interval.
-/// \ingroup nanoarrow-utils
-struct ArrowInterval {
-  /// \brief The type of interval being used
-  enum ArrowType type;
-  /// \brief The number of months represented by the interval
-  int32_t months;
-  /// \brief The number of days represented by the interval
-  int32_t days;
-  /// \brief The number of ms represented by the interval
-  int32_t ms;
-  /// \brief The number of ns represented by the interval
-  int64_t ns;
-};
-
-/// \brief Zero initialize an Interval with a given unit
-/// \ingroup nanoarrow-utils
-static inline void ArrowIntervalInit(struct ArrowInterval* interval,
-                                     enum ArrowType type) {
-  memset(interval, 0, sizeof(struct ArrowInterval));
-  interval->type = type;
-}
-
-/// \brief A representation of a fixed-precision decimal number
-/// \ingroup nanoarrow-utils
-///
-/// This structure should be initialized with ArrowDecimalInit() once and
-/// values set using ArrowDecimalSetInt(), ArrowDecimalSetBytes128(),
-/// or ArrowDecimalSetBytes256().
-struct ArrowDecimal {
-  /// \brief An array of 64-bit integers of n_words length defined in native-endian order.
-  /// For a 32-bit decimal value, index 0 will be a 32-bit integer value.
-  uint64_t words[4];
-
-  /// \brief The number of significant digits this decimal number can represent
-  int32_t precision;
-
-  /// \brief The number of digits after the decimal point. This can be negative.
-  int32_t scale;
-
-  /// \brief The number of 64-bit words in the words array. For the special case of a
-  /// 32-bit decimal value, this will be 0.
-  int n_words;
-
-  /// \brief Cached value used by the implementation
-  int high_word_index;
-
-  /// \brief Cached value used by the implementation
-  int low_word_index;
-};
-
-/// \brief Initialize a decimal with a given set of type parameters
-/// \ingroup nanoarrow-utils
-static inline void ArrowDecimalInit(struct ArrowDecimal* decimal, int32_t bitwidth,
-                                    int32_t precision, int32_t scale) {
-  memset(decimal->words, 0, sizeof(decimal->words));
-  decimal->precision = precision;
-  decimal->scale = scale;
-  // n_words will be 0 for bitwidth == 32
-  decimal->n_words = (int)(bitwidth / 8 / sizeof(uint64_t));
-
-  if (_ArrowIsLittleEndian()) {
-    decimal->low_word_index = 0;
-    decimal->high_word_index = decimal->n_words > 0 ? decimal->n_words - 1 : 0;
-  } else {
-    decimal->low_word_index = decimal->n_words > 0 ? decimal->n_words - 1 : 0;
-    decimal->high_word_index = 0;
-  }
-}
-
-/// \brief Get a signed integer value of a sufficiently small ArrowDecimal
-///
-/// This does not check if the decimal's precision sufficiently small to fit
-/// within the signed 64-bit integer range (A precision less than or equal
-/// to 18 is sufficiently small).
-static inline int64_t ArrowDecimalGetIntUnsafe(const struct ArrowDecimal* decimal) {
-  if (decimal->n_words == 0) {
-    int32_t value;
-    memcpy(&value, decimal->words, sizeof(int32_t));
-    return value;
-  }
-
-  return (int64_t)decimal->words[decimal->low_word_index];
-}
-
-/// \brief Copy the bytes of this decimal into a sufficiently large buffer
-/// \ingroup nanoarrow-utils
-static inline void ArrowDecimalGetBytes(const struct ArrowDecimal* decimal,
-                                        uint8_t* out) {
-  if (decimal->n_words == 0) {
-    memcpy(out, decimal->words, sizeof(int32_t));
-  } else {
-    memcpy(out, decimal->words, decimal->n_words * sizeof(uint64_t));
-  }
-}
-
-/// \brief Returns 1 if the value represented by decimal is >= 0 or -1 otherwise
-/// \ingroup nanoarrow-utils
-static inline int64_t ArrowDecimalSign(const struct ArrowDecimal* decimal) {
-  if (decimal->n_words == 0) {
-    return ArrowDecimalGetIntUnsafe(decimal) >= 0 ? 1 : -1;
-  } else {
-    return 1 | ((int64_t)(decimal->words[decimal->high_word_index]) >> 63);
-  }
-}
-
-/// \brief Sets the integer value of this decimal
-/// \ingroup nanoarrow-utils
-static inline void ArrowDecimalSetInt(struct ArrowDecimal* decimal, int64_t value) {
-  if (decimal->n_words == 0) {
-    int32_t value32 = (int32_t)value;
-    memcpy(decimal->words, &value32, sizeof(int32_t));
-    return;
-  }
-
-  if (value < 0) {
-    memset(decimal->words, 0xff, decimal->n_words * sizeof(uint64_t));
-  } else {
-    memset(decimal->words, 0, decimal->n_words * sizeof(uint64_t));
-  }
-
-  decimal->words[decimal->low_word_index] = value;
-}
-
-/// \brief Negate the value of this decimal in place
-/// \ingroup nanoarrow-utils
-static inline void ArrowDecimalNegate(struct ArrowDecimal* decimal) {
-  if (decimal->n_words == 0) {
-    int32_t value;
-    memcpy(&value, decimal->words, sizeof(int32_t));
-    value = -value;
-    memcpy(decimal->words, &value, sizeof(int32_t));
-    return;
-  }
-
-  uint64_t carry = 1;
-
-  if (decimal->low_word_index == 0) {
-    for (int i = 0; i < decimal->n_words; i++) {
-      uint64_t elem = decimal->words[i];
-      elem = ~elem + carry;
-      carry &= (elem == 0);
-      decimal->words[i] = elem;
-    }
-  } else {
-    for (int i = decimal->low_word_index; i >= 0; i--) {
-      uint64_t elem = decimal->words[i];
-      elem = ~elem + carry;
-      carry &= (elem == 0);
-      decimal->words[i] = elem;
-    }
-  }
-}
-
-/// \brief Copy bytes from a buffer into this decimal
-/// \ingroup nanoarrow-utils
-static inline void ArrowDecimalSetBytes(struct ArrowDecimal* decimal,
-                                        const uint8_t* value) {
-  if (decimal->n_words == 0) {
-    memcpy(decimal->words, value, sizeof(int32_t));
-  } else {
-    memcpy(decimal->words, value, decimal->n_words * sizeof(uint64_t));
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#ifndef NANOARROW_H_INCLUDED
-#define NANOARROW_H_INCLUDED
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-
-
-// If using CMake, optionally pass -DNANOARROW_NAMESPACE=MyNamespace which will set this
-// define in nanoarrow_config.h. If not, you can optionally #define NANOARROW_NAMESPACE
-// MyNamespace here.
-
-// This section remaps the non-prefixed symbols to the prefixed symbols so that
-// code written against this build can be used independent of the value of
-// NANOARROW_NAMESPACE.
-#ifdef NANOARROW_NAMESPACE
-#define NANOARROW_CAT(A, B) A##B
-#define NANOARROW_SYMBOL(A, B) NANOARROW_CAT(A, B)
-
-#define ArrowNanoarrowVersion NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowNanoarrowVersion)
-#define ArrowNanoarrowVersionInt \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowNanoarrowVersionInt)
-#define ArrowMalloc NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMalloc)
-#define ArrowRealloc NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowRealloc)
-#define ArrowFree NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowFree)
-#define ArrowBufferAllocatorDefault \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowBufferAllocatorDefault)
-#define ArrowBufferDeallocator \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowBufferDeallocator)
-#define ArrowErrorSet NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowErrorSet)
-#define ArrowLayoutInit NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowLayoutInit)
-#define ArrowDecimalSetDigits NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowDecimalSetDigits)
-#define ArrowDecimalAppendDigitsToBuffer \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowDecimalAppendDigitsToBuffer)
-#define ArrowDecimalAppendStringToBuffer \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowDecimalAppendStringToBuffer)
-#define ArrowSchemaInit NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaInit)
-#define ArrowSchemaInitFromType \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaInitFromType)
-#define ArrowSchemaSetType NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetType)
-#define ArrowSchemaSetTypeStruct \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeStruct)
-#define ArrowSchemaSetTypeFixedSize \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeFixedSize)
-#define ArrowSchemaSetTypeDecimal \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeDecimal)
-#define ArrowSchemaSetTypeRunEndEncoded \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeRunEndEncoded)
-#define ArrowSchemaSetTypeDateTime \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeDateTime)
-#define ArrowSchemaSetTypeUnion \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetTypeUnion)
-#define ArrowSchemaDeepCopy NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaDeepCopy)
-#define ArrowSchemaSetFormat NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetFormat)
-#define ArrowSchemaSetName NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetName)
-#define ArrowSchemaSetMetadata \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaSetMetadata)
-#define ArrowSchemaAllocateChildren \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaAllocateChildren)
-#define ArrowSchemaAllocateDictionary \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaAllocateDictionary)
-#define ArrowMetadataReaderInit \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataReaderInit)
-#define ArrowMetadataReaderRead \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataReaderRead)
-#define ArrowMetadataSizeOf NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataSizeOf)
-#define ArrowMetadataHasKey NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataHasKey)
-#define ArrowMetadataGetValue NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataGetValue)
-#define ArrowMetadataBuilderInit \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataBuilderInit)
-#define ArrowMetadataBuilderAppend \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataBuilderAppend)
-#define ArrowMetadataBuilderSet \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataBuilderSet)
-#define ArrowMetadataBuilderRemove \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowMetadataBuilderRemove)
-#define ArrowSchemaViewInit NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaViewInit)
-#define ArrowSchemaToString NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowSchemaToString)
-#define ArrowArrayInitFromType \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayInitFromType)
-#define ArrowArrayInitFromSchema \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayInitFromSchema)
-#define ArrowArrayInitFromArrayView \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayInitFromArrayView)
-#define ArrowArrayInitFromArrayView \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayInitFromArrayView)
-#define ArrowArrayAllocateChildren \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayAllocateChildren)
-#define ArrowArrayAllocateDictionary \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayAllocateDictionary)
-#define ArrowArraySetValidityBitmap \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArraySetValidityBitmap)
-#define ArrowArraySetBuffer NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArraySetBuffer)
-#define ArrowArrayReserve NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayReserve)
-#define ArrowArrayFinishBuilding \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayFinishBuilding)
-#define ArrowArrayFinishBuildingDefault \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayFinishBuildingDefault)
-#define ArrowArrayViewInitFromType \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewInitFromType)
-#define ArrowArrayViewInitFromSchema \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewInitFromSchema)
-#define ArrowArrayViewAllocateChildren \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewAllocateChildren)
-#define ArrowArrayViewAllocateDictionary \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewAllocateDictionary)
-#define ArrowArrayViewSetLength \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewSetLength)
-#define ArrowArrayViewSetArray \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewSetArray)
-#define ArrowArrayViewSetArrayMinimal \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewSetArrayMinimal)
-#define ArrowArrayViewValidate \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewValidate)
-#define ArrowArrayViewCompare NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewCompare)
-#define ArrowArrayViewReset NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowArrayViewReset)
-#define ArrowBasicArrayStreamInit \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowBasicArrayStreamInit)
-#define ArrowBasicArrayStreamSetArray \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowBasicArrayStreamSetArray)
-#define ArrowBasicArrayStreamValidate \
-  NANOARROW_SYMBOL(NANOARROW_NAMESPACE, ArrowBasicArrayStreamValidate)
-
-#endif
-
-#if (defined _WIN32 || defined __CYGWIN__) && defined(NANOARROW_BUILD_DLL)
-#if defined(NANOARROW_EXPORT_DLL)
-#define NANOARROW_DLL __declspec(dllexport)
-#else
-#define NANOARROW_DLL __declspec(dllimport)
-#endif  // defined(NANOARROW_EXPORT_DLL)
-#elif !defined(NANOARROW_DLL)
-#if defined(__GNUC__) && __GNUC__ >= 4
-#define NANOARROW_DLL __attribute__((visibility("default")))
-#else
-#define NANOARROW_DLL
-#endif  // __GNUC__ >= 4
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/// \defgroup nanoarrow Nanoarrow C library
-///
-/// Except where noted, objects are not thread-safe and clients should
-/// take care to serialize accesses to methods.
-///
-/// Because this library is intended to be vendored, it provides full type
-/// definitions and encourages clients to stack or statically allocate
-/// where convenient.
-
-/// \defgroup nanoarrow-malloc Memory management
-///
-/// Non-buffer members of a struct ArrowSchema and struct ArrowArray
-/// must be allocated using ArrowMalloc() or ArrowRealloc() and freed
-/// using ArrowFree() for schemas and arrays allocated here. Buffer members
-/// are allocated using an ArrowBufferAllocator.
-///
-/// @{
-
-/// \brief Allocate like malloc()
-NANOARROW_DLL void* ArrowMalloc(int64_t size);
-
-/// \brief Reallocate like realloc()
-NANOARROW_DLL void* ArrowRealloc(void* ptr, int64_t size);
-
-/// \brief Free a pointer allocated using ArrowMalloc() or ArrowRealloc().
-NANOARROW_DLL void ArrowFree(void* ptr);
-
-/// \brief Return the default allocator
-///
-/// The default allocator uses ArrowMalloc(), ArrowRealloc(), and
-/// ArrowFree().
-NANOARROW_DLL struct ArrowBufferAllocator ArrowBufferAllocatorDefault(void);
-
-/// \brief Create a custom deallocator
-///
-/// Creates a buffer allocator with only a free method that can be used to
-/// attach a custom deallocator to an ArrowBuffer. This may be used to
-/// avoid copying an existing buffer that was not allocated using the
-/// infrastructure provided here (e.g., by an R or Python object).
-NANOARROW_DLL struct ArrowBufferAllocator ArrowBufferDeallocator(
-    ArrowBufferDeallocatorCallback, void* private_data);
-
-/// @}
-
-/// \brief Move the contents of an src ArrowSchema into dst and set src->release to NULL
-/// \ingroup nanoarrow-arrow-cdata
-static inline void ArrowSchemaMove(struct ArrowSchema* src, struct ArrowSchema* dst);
-
-/// \brief Call the release callback of an ArrowSchema
-/// \ingroup nanoarrow-arrow-cdata
-static inline void ArrowSchemaRelease(struct ArrowSchema* schema);
-
-/// \brief Move the contents of an src ArrowArray into dst and set src->release to NULL
-/// \ingroup nanoarrow-arrow-cdata
-static inline void ArrowArrayMove(struct ArrowArray* src, struct ArrowArray* dst);
-
-/// \brief Call the release callback of an ArrowArray
-static inline void ArrowArrayRelease(struct ArrowArray* array);
-
-/// \brief Move the contents of an src ArrowArrayStream into dst and set src->release to
-/// NULL \ingroup nanoarrow-arrow-cdata
-static inline void ArrowArrayStreamMove(struct ArrowArrayStream* src,
-                                        struct ArrowArrayStream* dst);
-
-/// \brief Call the get_schema callback of an ArrowArrayStream
-/// \ingroup nanoarrow-arrow-cdata
-///
-/// Unlike the get_schema callback, this wrapper checks the return code
-/// and propagates the error reported by get_last_error into error. This
-/// makes it significantly less verbose to iterate over array streams
-/// using NANOARROW_RETURN_NOT_OK()-style error handling.
-static inline ArrowErrorCode ArrowArrayStreamGetSchema(
-    struct ArrowArrayStream* array_stream, struct ArrowSchema* out,
-    struct ArrowError* error);
-
-/// \brief Call the get_schema callback of an ArrowArrayStream
-/// \ingroup nanoarrow-arrow-cdata
-///
-/// Unlike the get_next callback, this wrapper checks the return code
-/// and propagates the error reported by get_last_error into error. This
-/// makes it significantly less verbose to iterate over array streams
-/// using NANOARROW_RETURN_NOT_OK()-style error handling.
-static inline ArrowErrorCode ArrowArrayStreamGetNext(
-    struct ArrowArrayStream* array_stream, struct ArrowArray* out,
-    struct ArrowError* error);
-
-/// \brief Call the get_next callback of an ArrowArrayStream
-/// \ingroup nanoarrow-arrow-cdata
-///
-/// Unlike the get_next callback, this function never returns NULL (i.e., its
-/// result is safe to use in printf-style error formatters). Null values from the
-/// original callback are reported as "<get_last_error() returned NULL>".
-static inline const char* ArrowArrayStreamGetLastError(
-    struct ArrowArrayStream* array_stream);
-
-/// \brief Call the release callback of an ArrowArrayStream
-static inline void ArrowArrayStreamRelease(struct ArrowArrayStream* array_stream);
-
-/// \defgroup nanoarrow-errors Error handling
-///
-/// Functions generally return an errno-compatible error code; functions that
-/// need to communicate more verbose error information accept a pointer
-/// to an ArrowError. This can be stack or statically allocated. The
-/// content of the message is undefined unless an error code has been
-/// returned. If a nanoarrow function is passed a non-null ArrowError pointer, the
-/// ArrowError pointed to by the argument will be propagated with a
-/// null-terminated error message. It is safe to pass a NULL ArrowError anywhere
-/// in the nanoarrow API.
-///
-/// Except where documented, it is generally not safe to continue after a
-/// function has returned a non-zero ArrowErrorCode. The NANOARROW_RETURN_NOT_OK and
-/// NANOARROW_ASSERT_OK macros are provided to help propagate errors. C++ clients can use
-/// the helpers provided in the nanoarrow.hpp header to facilitate using C++ idioms
-/// for memory management and error propgagtion.
-///
-/// @{
-
-/// \brief Set the contents of an error using printf syntax.
-///
-/// If error is NULL, this function does nothing and returns NANOARROW_OK.
-NANOARROW_DLL NANOARROW_CHECK_PRINTF_ATTRIBUTE int ArrowErrorSet(struct ArrowError* error,
-                                                                 const char* fmt, ...);
-
-/// @}
-
-/// \defgroup nanoarrow-utils Utility data structures
-///
-/// @{
-
-/// \brief Return a version string in the form "major.minor.patch"
-NANOARROW_DLL const char* ArrowNanoarrowVersion(void);
-
-/// \brief Return an integer that can be used to compare versions sequentially
-NANOARROW_DLL int ArrowNanoarrowVersionInt(void);
-
-/// \brief Initialize a description of buffer arrangements from a storage type
-NANOARROW_DLL void ArrowLayoutInit(struct ArrowLayout* layout,
-                                   enum ArrowType storage_type);
-
-/// \brief Create a string view from a null-terminated string
-static inline struct ArrowStringView ArrowCharView(const char* value);
-
-/// \brief Sets the integer value of an ArrowDecimal from a string
-NANOARROW_DLL ArrowErrorCode ArrowDecimalSetDigits(struct ArrowDecimal* decimal,
-                                                   struct ArrowStringView value);
-
-/// \brief Get the integer value of an ArrowDecimal as string
-NANOARROW_DLL ArrowErrorCode ArrowDecimalAppendDigitsToBuffer(
-    const struct ArrowDecimal* decimal, struct ArrowBuffer* buffer);
-
-/// \brief Get the decimal value of an ArrowDecimal as a string
-NANOARROW_DLL ArrowErrorCode ArrowDecimalAppendStringToBuffer(
-    const struct ArrowDecimal* decimal, struct ArrowBuffer* buffer);
-
-/// \brief Get the half float value of a float
-static inline uint16_t ArrowFloatToHalfFloat(float value);
-
-/// \brief Get the float value of a half float
-static inline float ArrowHalfFloatToFloat(uint16_t value);
-
-/// \brief Resolve a chunk index from increasing int64_t offsets
-///
-/// Given a buffer of increasing int64_t offsets that begin with 0 (e.g., offset buffer
-/// of a large type, run ends of a chunked array implementation), resolve a value v
-/// where lo <= v < hi such that offsets[v] <= index < offsets[v + 1].
-static inline int64_t ArrowResolveChunk64(int64_t index, const int64_t* offsets,
-                                          int64_t lo, int64_t hi);
-
-/// @}
-
-/// \defgroup nanoarrow-schema Creating schemas
-///
-/// These functions allocate, copy, and destroy ArrowSchema structures
-///
-/// @{
-
-/// \brief Initialize an ArrowSchema
-///
-/// Initializes the fields and release callback of schema_out. Caller
-/// is responsible for calling the schema->release callback if
-/// NANOARROW_OK is returned.
-NANOARROW_DLL void ArrowSchemaInit(struct ArrowSchema* schema);
-
-/// \brief Initialize an ArrowSchema from an ArrowType
-///
-/// A convenience constructor for that calls ArrowSchemaInit() and
-/// ArrowSchemaSetType() for the common case of constructing an
-/// unparameterized type. The caller is responsible for calling the schema->release
-/// callback if NANOARROW_OK is returned.
-NANOARROW_DLL ArrowErrorCode ArrowSchemaInitFromType(struct ArrowSchema* schema,
-                                                     enum ArrowType type);
-
-/// \brief Get a human-readable summary of a Schema
-///
-/// Writes a summary of an ArrowSchema to out (up to n - 1 characters)
-/// and returns the number of characters required for the output if
-/// n were sufficiently large. If recursive is non-zero, the result will
-/// also include children.
-NANOARROW_DLL int64_t ArrowSchemaToString(const struct ArrowSchema* schema, char* out,
-                                          int64_t n, char recursive);
-
-/// \brief Set the format field of a schema from an ArrowType
-///
-/// Initializes the fields and release callback of schema_out. For
-/// NANOARROW_TYPE_LIST, NANOARROW_TYPE_LARGE_LIST, and
-/// NANOARROW_TYPE_MAP, the appropriate number of children are
-/// allocated, initialized, and named; however, the caller must
-/// ArrowSchemaSetType() on the preinitialized children. Schema must have been initialized
-/// using ArrowSchemaInit() or ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetType(struct ArrowSchema* schema,
-                                                enum ArrowType type);
-
-/// \brief Set the format field and initialize children of a struct schema
-///
-/// The specified number of children are initialized; however, the caller is responsible
-/// for calling ArrowSchemaSetType() and ArrowSchemaSetName() on each child.
-/// Schema must have been initialized using ArrowSchemaInit() or ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeStruct(struct ArrowSchema* schema,
-                                                      int64_t n_children);
-
-/// \brief Set the format field of a fixed-size schema
-///
-/// Returns EINVAL for fixed_size <= 0 or for type that is not
-/// NANOARROW_TYPE_FIXED_SIZE_BINARY or NANOARROW_TYPE_FIXED_SIZE_LIST.
-/// For NANOARROW_TYPE_FIXED_SIZE_LIST, the appropriate number of children are
-/// allocated, initialized, and named; however, the caller must
-/// ArrowSchemaSetType() the first child. Schema must have been initialized using
-/// ArrowSchemaInit() or ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeFixedSize(struct ArrowSchema* schema,
-                                                         enum ArrowType type,
-                                                         int32_t fixed_size);
-
-/// \brief Set the format field of a decimal schema
-///
-/// Returns EINVAL for scale <= 0 or for type that is not
-/// NANOARROW_TYPE_DECIMAL32, NANOARROW_TYPE_DECIMAL64, NANOARROW_TYPE_DECIMAL128 or
-/// NANOARROW_TYPE_DECIMAL256. Schema must have been initialized using
-/// ArrowSchemaInit() or ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeDecimal(struct ArrowSchema* schema,
-                                                       enum ArrowType type,
-                                                       int32_t decimal_precision,
-                                                       int32_t decimal_scale);
-
-/// \brief Set the format field of a run-end encoded schema
-///
-/// Returns EINVAL for run_end_type that is not
-/// NANOARROW_TYPE_INT16, NANOARROW_TYPE_INT32 or NANOARROW_TYPE_INT64.
-/// Schema must have been initialized using ArrowSchemaInit() or ArrowSchemaDeepCopy().
-/// The caller must call `ArrowSchemaSetTypeXXX(schema->children[1])` to
-/// set the value type. Note that when building arrays using the `ArrowArrayAppendXXX()`
-/// functions, the run-end encoded array's logical length must be updated manually.
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeRunEndEncoded(struct ArrowSchema* schema,
-                                                             enum ArrowType run_end_type);
-
-/// \brief Set the format field of a time, timestamp, or duration schema
-///
-/// Returns EINVAL for type that is not
-/// NANOARROW_TYPE_TIME32, NANOARROW_TYPE_TIME64,
-/// NANOARROW_TYPE_TIMESTAMP, or NANOARROW_TYPE_DURATION. The
-/// timezone parameter must be NULL for a non-timestamp type. Schema must have been
-/// initialized using ArrowSchemaInit() or ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeDateTime(struct ArrowSchema* schema,
-                                                        enum ArrowType type,
-                                                        enum ArrowTimeUnit time_unit,
-                                                        const char* timezone);
-
-/// \brief Set the format field of a union schema
-///
-/// Returns EINVAL for a type that is not NANOARROW_TYPE_DENSE_UNION
-/// or NANOARROW_TYPE_SPARSE_UNION. The specified number of children are
-/// allocated, and initialized.
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetTypeUnion(struct ArrowSchema* schema,
-                                                     enum ArrowType type,
-                                                     int64_t n_children);
-
-/// \brief Make a (recursive) copy of a schema
-///
-/// Allocates and copies fields of schema into schema_out.
-NANOARROW_DLL ArrowErrorCode ArrowSchemaDeepCopy(const struct ArrowSchema* schema,
-                                                 struct ArrowSchema* schema_out);
-
-/// \brief Copy format into schema->format
-///
-/// schema must have been allocated using ArrowSchemaInitFromType() or
-/// ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetFormat(struct ArrowSchema* schema,
-                                                  const char* format);
-
-/// \brief Copy name into schema->name
-///
-/// schema must have been allocated using ArrowSchemaInitFromType() or
-/// ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetName(struct ArrowSchema* schema,
-                                                const char* name);
-
-/// \brief Copy metadata into schema->metadata
-///
-/// schema must have been allocated using ArrowSchemaInitFromType() or
-/// ArrowSchemaDeepCopy.
-NANOARROW_DLL ArrowErrorCode ArrowSchemaSetMetadata(struct ArrowSchema* schema,
-                                                    const char* metadata);
-
-/// \brief Allocate the schema->children array
-///
-/// Includes the memory for each child struct ArrowSchema.
-/// schema must have been allocated using ArrowSchemaInitFromType() or
-/// ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaAllocateChildren(struct ArrowSchema* schema,
-                                                         int64_t n_children);
-
-/// \brief Allocate the schema->dictionary member
-///
-/// schema must have been allocated using ArrowSchemaInitFromType() or
-/// ArrowSchemaDeepCopy().
-NANOARROW_DLL ArrowErrorCode ArrowSchemaAllocateDictionary(struct ArrowSchema* schema);
-
-/// @}
-
-/// \defgroup nanoarrow-metadata Create, read, and modify schema metadata
-///
-/// @{
-
-/// \brief Reader for key/value pairs in schema metadata
-///
-/// The ArrowMetadataReader does not own any data and is only valid
-/// for the lifetime of the underlying metadata pointer.
-struct ArrowMetadataReader {
-  /// \brief A metadata string from a schema->metadata field.
-  const char* metadata;
-
-  /// \brief The current offset into the metadata string
-  int64_t offset;
-
-  /// \brief The number of remaining keys
-  int32_t remaining_keys;
-};
-
-/// \brief Initialize an ArrowMetadataReader
-NANOARROW_DLL ArrowErrorCode ArrowMetadataReaderInit(struct ArrowMetadataReader* reader,
-                                                     const char* metadata);
-
-/// \brief Read the next key/value pair from an ArrowMetadataReader
-NANOARROW_DLL ArrowErrorCode ArrowMetadataReaderRead(struct ArrowMetadataReader* reader,
-                                                     struct ArrowStringView* key_out,
-                                                     struct ArrowStringView* value_out);
-
-/// \brief The number of bytes in in a key/value metadata string
-NANOARROW_DLL int64_t ArrowMetadataSizeOf(const char* metadata);
-
-/// \brief Check for a key in schema metadata
-NANOARROW_DLL char ArrowMetadataHasKey(const char* metadata, struct ArrowStringView key);
-
-/// \brief Extract a value from schema metadata
-///
-/// If key does not exist in metadata, value_out is unmodified
-NANOARROW_DLL ArrowErrorCode ArrowMetadataGetValue(const char* metadata,
-                                                   struct ArrowStringView key,
-                                                   struct ArrowStringView* value_out);
-
-/// \brief Initialize a builder for schema metadata from key/value pairs
-///
-/// metadata can be an existing metadata string or NULL to initialize
-/// an empty metadata string.
-NANOARROW_DLL ArrowErrorCode ArrowMetadataBuilderInit(struct ArrowBuffer* buffer,
-                                                      const char* metadata);
-
-/// \brief Append a key/value pair to a buffer containing serialized metadata
-NANOARROW_DLL ArrowErrorCode ArrowMetadataBuilderAppend(struct ArrowBuffer* buffer,
-                                                        struct ArrowStringView key,
-                                                        struct ArrowStringView value);
-
-/// \brief Set a key/value pair to a buffer containing serialized metadata
-///
-/// Ensures that the only entry for key in the metadata is set to value.
-/// This function maintains the existing position of (the first instance of)
-/// key if present in the data.
-NANOARROW_DLL ArrowErrorCode ArrowMetadataBuilderSet(struct ArrowBuffer* buffer,
-                                                     struct ArrowStringView key,
-                                                     struct ArrowStringView value);
-
-/// \brief Remove a key from a buffer containing serialized metadata
-NANOARROW_DLL ArrowErrorCode ArrowMetadataBuilderRemove(struct ArrowBuffer* buffer,
-                                                        struct ArrowStringView key);
-
-/// @}
-
-/// \defgroup nanoarrow-schema-view Reading schemas
-///
-/// @{
-
-/// \brief A non-owning view of a parsed ArrowSchema
-///
-/// Contains more readily extractable values than a raw ArrowSchema.
-/// Clients can stack or statically allocate this structure but are
-/// encouraged to use the provided getters to ensure forward
-/// compatibility.
-struct ArrowSchemaView {
-  /// \brief A pointer to the schema represented by this view
-  const struct ArrowSchema* schema;
-
-  /// \brief The data type represented by the schema
-  ///
-  /// This value may be NANOARROW_TYPE_DICTIONARY if the schema has a
-  /// non-null dictionary member; datetime types are valid values.
-  /// This value will never be NANOARROW_TYPE_EXTENSION (see
-  /// extension_name and/or extension_metadata to check for
-  /// an extension type).
-  enum ArrowType type;
-
-  /// \brief The storage data type represented by the schema
-  ///
-  /// This value will never be NANOARROW_TYPE_DICTIONARY, NANOARROW_TYPE_EXTENSION
-  /// or any datetime type. This value represents only the type required to
-  /// interpret the buffers in the array.
-  enum ArrowType storage_type;
-
-  /// \brief The storage layout represented by the schema
-  struct ArrowLayout layout;
-
-  /// \brief The extension type name if it exists
-  ///
-  /// If the ARROW:extension:name key is present in schema.metadata,
-  /// extension_name.data will be non-NULL.
-  struct ArrowStringView extension_name;
-
-  /// \brief The extension type metadata if it exists
-  ///
-  /// If the ARROW:extension:metadata key is present in schema.metadata,
-  /// extension_metadata.data will be non-NULL.
-  struct ArrowStringView extension_metadata;
-
-  /// \brief Format fixed size parameter
-  ///
-  /// This value is set when parsing a fixed-size binary or fixed-size
-  /// list schema; this value is undefined for other types. For a
-  /// fixed-size binary schema this value is in bytes; for a fixed-size
-  /// list schema this value refers to the number of child elements for
-  /// each element of the parent.
-  int32_t fixed_size;
-
-  /// \brief Decimal bitwidth
-  ///
-  /// This value is set when parsing a decimal type schema;
-  /// this value is undefined for other types.
-  int32_t decimal_bitwidth;
-
-  /// \brief Decimal precision
-  ///
-  /// This value is set when parsing a decimal type schema;
-  /// this value is undefined for other types.
-  int32_t decimal_precision;
-
-  /// \brief Decimal scale
-  ///
-  /// This value is set when parsing a decimal type schema;
-  /// this value is undefined for other types.
-  int32_t decimal_scale;
-
-  /// \brief Format time unit parameter
-  ///
-  /// This value is set when parsing a date/time type. The value is
-  /// undefined for other types.
-  enum ArrowTimeUnit time_unit;
-
-  /// \brief Format timezone parameter
-  ///
-  /// This value is set when parsing a timestamp type and represents
-  /// the timezone format parameter. This value points to
-  /// data within the schema and is undefined for other types.
-  const char* timezone;
-
-  /// \brief Union type ids parameter
-  ///
-  /// This value is set when parsing a union type and represents
-  /// type ids parameter. This value points to
-  /// data within the schema and is undefined for other types.
-  const char* union_type_ids;
-};
-
-/// \brief Initialize an ArrowSchemaView
-NANOARROW_DLL ArrowErrorCode ArrowSchemaViewInit(struct ArrowSchemaView* schema_view,
-                                                 const struct ArrowSchema* schema,
-                                                 struct ArrowError* error);
-
-/// @}
-
-/// \defgroup nanoarrow-buffer Owning, growable buffers
-///
-/// @{
-
-/// \brief Initialize an ArrowBuffer
-///
-/// Initialize a buffer with a NULL, zero-size buffer using the default
-/// buffer allocator.
-static inline void ArrowBufferInit(struct ArrowBuffer* buffer);
-
-/// \brief Set a newly-initialized buffer's allocator
-///
-/// Returns EINVAL if the buffer has already been allocated.
-static inline ArrowErrorCode ArrowBufferSetAllocator(
-    struct ArrowBuffer* buffer, struct ArrowBufferAllocator allocator);
-
-/// \brief Reset an ArrowBuffer
-///
-/// Releases the buffer using the allocator's free method if
-/// the buffer's data member is non-null, sets the data member
-/// to NULL, and sets the buffer's size and capacity to 0.
-static inline void ArrowBufferReset(struct ArrowBuffer* buffer);
-
-/// \brief Move an ArrowBuffer
-///
-/// Transfers the buffer data and lifecycle management to another
-/// address and resets buffer.
-static inline void ArrowBufferMove(struct ArrowBuffer* src, struct ArrowBuffer* dst);
-
-/// \brief Grow or shrink a buffer to a given size
-///
-/// When shrinking the size of the buffer, the buffer is only reallocated
-/// if shrink_to_fit is non-zero.
-static inline ArrowErrorCode ArrowBufferResize(struct ArrowBuffer* buffer,
-                                               int64_t new_size_bytes,
-                                               char shrink_to_fit);
-
-/// \brief Ensure a buffer has at least a given additional capacity
-///
-/// Ensures that the buffer has space to append at least
-/// additional_size_bytes, overallocating when required.
-static inline ArrowErrorCode ArrowBufferReserve(struct ArrowBuffer* buffer,
-                                                int64_t additional_size_bytes);
-
-/// \brief Write data to buffer and increment the buffer size
-///
-/// This function does not check that buffer has the required capacity
-static inline void ArrowBufferAppendUnsafe(struct ArrowBuffer* buffer, const void* data,
-                                           int64_t size_bytes);
-
-/// \brief Write data to buffer and increment the buffer size
-///
-/// This function writes and ensures that the buffer has the required capacity,
-/// possibly by reallocating the buffer. Like ArrowBufferReserve, this will
-/// overallocate when reallocation is required.
-static inline ArrowErrorCode ArrowBufferAppend(struct ArrowBuffer* buffer,
-                                               const void* data, int64_t size_bytes);
-
-/// \brief Write fill to buffer and increment the buffer size
-///
-/// This function writes the specified number of fill bytes and
-/// ensures that the buffer has the required capacity,
-static inline ArrowErrorCode ArrowBufferAppendFill(struct ArrowBuffer* buffer,
-                                                   uint8_t value, int64_t size_bytes);
-
-/// \brief Write an 8-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendInt8(struct ArrowBuffer* buffer,
-                                                   int8_t value);
-
-/// \brief Write an unsigned 8-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendUInt8(struct ArrowBuffer* buffer,
-                                                    uint8_t value);
-
-/// \brief Write a 16-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendInt16(struct ArrowBuffer* buffer,
-                                                    int16_t value);
-
-/// \brief Write an unsigned 16-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendUInt16(struct ArrowBuffer* buffer,
-                                                     uint16_t value);
-
-/// \brief Write a 32-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendInt32(struct ArrowBuffer* buffer,
-                                                    int32_t value);
-
-/// \brief Write an unsigned 32-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendUInt32(struct ArrowBuffer* buffer,
-                                                     uint32_t value);
-
-/// \brief Write a 64-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendInt64(struct ArrowBuffer* buffer,
-                                                    int64_t value);
-
-/// \brief Write an unsigned 64-bit integer to a buffer
-static inline ArrowErrorCode ArrowBufferAppendUInt64(struct ArrowBuffer* buffer,
-                                                     uint64_t value);
-
-/// \brief Write a double to a buffer
-static inline ArrowErrorCode ArrowBufferAppendDouble(struct ArrowBuffer* buffer,
-                                                     double value);
-
-/// \brief Write a float to a buffer
-static inline ArrowErrorCode ArrowBufferAppendFloat(struct ArrowBuffer* buffer,
-                                                    float value);
-
-/// \brief Write an ArrowStringView to a buffer
-static inline ArrowErrorCode ArrowBufferAppendStringView(struct ArrowBuffer* buffer,
-                                                         struct ArrowStringView value);
-
-/// \brief Write an ArrowBufferView to a buffer
-static inline ArrowErrorCode ArrowBufferAppendBufferView(struct ArrowBuffer* buffer,
-                                                         struct ArrowBufferView value);
-
-/// @}
-
-/// \defgroup nanoarrow-bitmap Bitmap utilities
-///
-/// @{
-
-/// \brief Extract a boolean value from a bitmap
-static inline int8_t ArrowBitGet(const uint8_t* bits, int64_t i);
-
-/// \brief Set a boolean value to a bitmap to true
-static inline void ArrowBitSet(uint8_t* bits, int64_t i);
-
-/// \brief Set a boolean value to a bitmap to false
-static inline void ArrowBitClear(uint8_t* bits, int64_t i);
-
-/// \brief Set a boolean value to a bitmap
-static inline void ArrowBitSetTo(uint8_t* bits, int64_t i, uint8_t value);
-
-/// \brief Set a boolean value to a range in a bitmap
-static inline void ArrowBitsSetTo(uint8_t* bits, int64_t start_offset, int64_t length,
-                                  uint8_t bits_are_set);
-
-/// \brief Count true values in a bitmap
-static inline int64_t ArrowBitCountSet(const uint8_t* bits, int64_t i_from, int64_t i_to);
-
-/// \brief Extract int8 boolean values from a range in a bitmap
-static inline void ArrowBitsUnpackInt8(const uint8_t* bits, int64_t start_offset,
-                                       int64_t length, int8_t* out);
-
-/// \brief Extract int32 boolean values from a range in a bitmap
-static inline void ArrowBitsUnpackInt32(const uint8_t* bits, int64_t start_offset,
-                                        int64_t length, int32_t* out);
-
-/// \brief Initialize an ArrowBitmap
-///
-/// Initialize the builder's buffer, empty its cache, and reset the size to zero
-static inline void ArrowBitmapInit(struct ArrowBitmap* bitmap);
-
-/// \brief Move an ArrowBitmap
-///
-/// Transfers the underlying buffer data and lifecycle management to another
-/// address and resets the bitmap.
-static inline void ArrowBitmapMove(struct ArrowBitmap* src, struct ArrowBitmap* dst);
-
-/// \brief Ensure a bitmap builder has at least a given additional capacity
-///
-/// Ensures that the buffer has space to append at least
-/// additional_size_bits, overallocating when required.
-static inline ArrowErrorCode ArrowBitmapReserve(struct ArrowBitmap* bitmap,
-                                                int64_t additional_size_bits);
-
-/// \brief Grow or shrink a bitmap to a given size
-///
-/// When shrinking the size of the bitmap, the bitmap is only reallocated
-/// if shrink_to_fit is non-zero.
-static inline ArrowErrorCode ArrowBitmapResize(struct ArrowBitmap* bitmap,
-                                               int64_t new_size_bits, char shrink_to_fit);
-
-/// \brief Reserve space for and append zero or more of the same boolean value to a bitmap
-static inline ArrowErrorCode ArrowBitmapAppend(struct ArrowBitmap* bitmap,
-                                               uint8_t bits_are_set, int64_t length);
-
-/// \brief Append zero or more of the same boolean value to a bitmap
-static inline void ArrowBitmapAppendUnsafe(struct ArrowBitmap* bitmap,
-                                           uint8_t bits_are_set, int64_t length);
-
-/// \brief Append boolean values encoded as int8_t to a bitmap
-///
-/// The values must all be 0 or 1.
-static inline void ArrowBitmapAppendInt8Unsafe(struct ArrowBitmap* bitmap,
-                                               const int8_t* values, int64_t n_values);
-
-/// \brief Append boolean values encoded as int32_t to a bitmap
-///
-/// The values must all be 0 or 1.
-static inline void ArrowBitmapAppendInt32Unsafe(struct ArrowBitmap* bitmap,
-                                                const int32_t* values, int64_t n_values);
-
-/// \brief Reset a bitmap builder
-///
-/// Releases any memory held by buffer, empties the cache, and resets the size to zero
-static inline void ArrowBitmapReset(struct ArrowBitmap* bitmap);
-
-/// @}
-
-/// \defgroup nanoarrow-array Creating arrays
-///
-/// These functions allocate, copy, and destroy ArrowArray structures.
-/// Once an ArrowArray has been initialized via ArrowArrayInitFromType()
-/// or ArrowArrayInitFromSchema(), the caller is responsible for releasing
-/// it using the embedded release callback.
-///
-/// @{
-
-/// \brief Initialize the fields of an array
-///
-/// Initializes the fields and release callback of array. Caller
-/// is responsible for calling the array->release callback if
-/// NANOARROW_OK is returned.
-NANOARROW_DLL ArrowErrorCode ArrowArrayInitFromType(struct ArrowArray* array,
-                                                    enum ArrowType storage_type);
-
-/// \brief Initialize the contents of an ArrowArray from an ArrowSchema
-///
-/// Caller is responsible for calling the array->release callback if
-/// NANOARROW_OK is returned.
-NANOARROW_DLL ArrowErrorCode ArrowArrayInitFromSchema(struct ArrowArray* array,
-                                                      const struct ArrowSchema* schema,
-                                                      struct ArrowError* error);
-
-/// \brief Initialize the contents of an ArrowArray from an ArrowArrayView
-///
-/// Caller is responsible for calling the array->release callback if
-/// NANOARROW_OK is returned.
-NANOARROW_DLL ArrowErrorCode ArrowArrayInitFromArrayView(
-    struct ArrowArray* array, const struct ArrowArrayView* array_view,
-    struct ArrowError* error);
-
-/// \brief Allocate the array->children array
-///
-/// Includes the memory for each child struct ArrowArray,
-/// whose members are marked as released and may be subsequently initialized
-/// with ArrowArrayInitFromType() or moved from an existing ArrowArray.
-/// schema must have been allocated using ArrowArrayInitFromType().
-NANOARROW_DLL ArrowErrorCode ArrowArrayAllocateChildren(struct ArrowArray* array,
-                                                        int64_t n_children);
-
-/// \brief Allocate the array->dictionary member
-///
-/// Includes the memory for the struct ArrowArray, whose contents
-/// is marked as released and may be subsequently initialized
-/// with ArrowArrayInitFromType() or moved from an existing ArrowArray.
-/// array must have been allocated using ArrowArrayInitFromType()
-NANOARROW_DLL ArrowErrorCode ArrowArrayAllocateDictionary(struct ArrowArray* array);
-
-/// \brief Set the validity bitmap of an ArrowArray
-///
-/// array must have been allocated using ArrowArrayInitFromType()
-NANOARROW_DLL void ArrowArraySetValidityBitmap(struct ArrowArray* array,
-                                               struct ArrowBitmap* bitmap);
-
-/// \brief Set a buffer of an ArrowArray
-///
-/// array must have been allocated using ArrowArrayInitFromType()
-NANOARROW_DLL ArrowErrorCode ArrowArraySetBuffer(struct ArrowArray* array, int64_t i,
-                                                 struct ArrowBuffer* buffer);
-
-/// \brief Get the validity bitmap of an ArrowArray
-///
-/// array must have been allocated using ArrowArrayInitFromType()
-static inline struct ArrowBitmap* ArrowArrayValidityBitmap(struct ArrowArray* array);
-
-/// \brief Get a buffer of an ArrowArray
-///
-/// array must have been allocated using ArrowArrayInitFromType()
-static inline struct ArrowBuffer* ArrowArrayBuffer(struct ArrowArray* array, int64_t i);
-
-/// \brief Start element-wise appending to an ArrowArray
-///
-/// Initializes any values needed to use ArrowArrayAppend*() functions.
-/// All element-wise appenders append by value and return EINVAL if the exact value
-/// cannot be represented by the underlying storage type.
-/// array must have been allocated using ArrowArrayInitFromType()
-static inline ArrowErrorCode ArrowArrayStartAppending(struct ArrowArray* array);
-
-/// \brief Reserve space for future appends
-///
-/// For buffer sizes that can be calculated (i.e., not string data buffers or
-/// child array sizes for non-fixed-size arrays), recursively reserve space for
-/// additional elements. This is useful for reducing the number of reallocations
-/// that occur using the item-wise appenders.
-NANOARROW_DLL ArrowErrorCode ArrowArrayReserve(struct ArrowArray* array,
-                                               int64_t additional_size_elements);
-
-/// \brief Append a null value to an array
-static inline ArrowErrorCode ArrowArrayAppendNull(struct ArrowArray* array, int64_t n);
-
-/// \brief Append an empty, non-null value to an array
-static inline ArrowErrorCode ArrowArrayAppendEmpty(struct ArrowArray* array, int64_t n);
-
-/// \brief Append a signed integer value to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type or EINVAL otherwise (e.g., value
-/// is outside the valid array range).
-static inline ArrowErrorCode ArrowArrayAppendInt(struct ArrowArray* array, int64_t value);
-
-/// \brief Append an unsigned integer value to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type or EINVAL otherwise (e.g., value
-/// is outside the valid array range).
-static inline ArrowErrorCode ArrowArrayAppendUInt(struct ArrowArray* array,
-                                                  uint64_t value);
-
-/// \brief Append a double value to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type or EINVAL otherwise (e.g., value
-/// is outside the valid array range or there is an attempt to append
-/// a non-integer to an array with an integer storage type).
-static inline ArrowErrorCode ArrowArrayAppendDouble(struct ArrowArray* array,
-                                                    double value);
-
-/// \brief Append a string of bytes to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type, EOVERFLOW if appending value would overflow
-/// the offset type (e.g., if the data buffer would be larger than 2 GB for a
-/// non-large string type), or EINVAL otherwise (e.g., the underlying array is not a
-/// binary, string, large binary, large string, or fixed-size binary array, or value is
-/// the wrong size for a fixed-size binary array).
-static inline ArrowErrorCode ArrowArrayAppendBytes(struct ArrowArray* array,
-                                                   struct ArrowBufferView value);
-
-/// \brief Append a string value to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type, EOVERFLOW if appending value would overflow
-/// the offset type (e.g., if the data buffer would be larger than 2 GB for a
-/// non-large string type), or EINVAL otherwise (e.g., the underlying array is not a
-/// string or large string array).
-static inline ArrowErrorCode ArrowArrayAppendString(struct ArrowArray* array,
-                                                    struct ArrowStringView value);
-
-/// \brief Append a Interval to an array
-///
-/// Returns NANOARROW_OK if value can be exactly represented by
-/// the underlying storage type or EINVAL otherwise.
-static inline ArrowErrorCode ArrowArrayAppendInterval(struct ArrowArray* array,
-                                                      const struct ArrowInterval* value);
-
-/// \brief Append a decimal value to an array
-///
-/// Returns NANOARROW_OK if array is a decimal array with the appropriate
-/// bitwidth or EINVAL otherwise.
-static inline ArrowErrorCode ArrowArrayAppendDecimal(struct ArrowArray* array,
-                                                     const struct ArrowDecimal* value);
-
-/// \brief Finish a nested array element
-///
-/// Appends a non-null element to the array based on the first child's current
-/// length. Returns NANOARROW_OK if the item was successfully added, EOVERFLOW
-/// if the child of a list or map array would exceed INT_MAX elements, or EINVAL
-/// if the underlying storage type is not a struct, list, large list, or fixed-size
-/// list, or if there was an attempt to add a struct or fixed-size list element where the
-/// length of the child array(s) did not match the expected length.
-static inline ArrowErrorCode ArrowArrayFinishElement(struct ArrowArray* array);
-
-/// \brief Finish a union array element
-///
-/// Appends an element to the union type ids buffer and increments array->length.
-/// For sparse unions, up to one element is added to non type-id children. Returns
-/// EINVAL if the underlying storage type is not a union, if type_id is not valid,
-/// or if child sizes after appending are inconsistent.
-static inline ArrowErrorCode ArrowArrayFinishUnionElement(struct ArrowArray* array,
-                                                          int8_t type_id);
-
-/// \brief Shrink buffer capacity to the size required
-///
-/// Also applies shrinking to any child arrays. array must have been allocated using
-/// ArrowArrayInitFromType
-static inline ArrowErrorCode ArrowArrayShrinkToFit(struct ArrowArray* array);
-
-/// \brief Finish building an ArrowArray
-///
-/// Flushes any pointers from internal buffers that may have been reallocated
-/// into array->buffers and checks the actual size of the buffers
-/// against the expected size based on the final length.
-/// array must have been allocated using ArrowArrayInitFromType()
-NANOARROW_DLL ArrowErrorCode ArrowArrayFinishBuildingDefault(struct ArrowArray* array,
-                                                             struct ArrowError* error);
-
-/// \brief Finish building an ArrowArray with explicit validation
-///
-/// Finish building with an explicit validation level. This could perform less validation
-/// (i.e. NANOARROW_VALIDATION_LEVEL_NONE or NANOARROW_VALIDATION_LEVEL_MINIMAL) if CPU
-/// buffer data access is not possible or more validation (i.e.,
-/// NANOARROW_VALIDATION_LEVEL_FULL) if buffer content was obtained from an untrusted or
-/// corruptible source.
-NANOARROW_DLL ArrowErrorCode ArrowArrayFinishBuilding(
-    struct ArrowArray* array, enum ArrowValidationLevel validation_level,
-    struct ArrowError* error);
-
-/// @}
-
-/// \defgroup nanoarrow-array-view Reading arrays
-///
-/// These functions read and validate the contents ArrowArray structures.
-///
-/// @{
-
-/// \brief Initialize the contents of an ArrowArrayView
-NANOARROW_DLL void ArrowArrayViewInitFromType(struct ArrowArrayView* array_view,
-                                              enum ArrowType storage_type);
-
-/// \brief Move an ArrowArrayView
-///
-/// Transfers the ArrowArrayView data and lifecycle management to another
-/// address and resets the contents of src.
-static inline void ArrowArrayViewMove(struct ArrowArrayView* src,
-                                      struct ArrowArrayView* dst);
-
-/// \brief Initialize the contents of an ArrowArrayView from an ArrowSchema
-NANOARROW_DLL ArrowErrorCode
-ArrowArrayViewInitFromSchema(struct ArrowArrayView* array_view,
-                             const struct ArrowSchema* schema, struct ArrowError* error);
-
-/// \brief Allocate the array_view->children array
-///
-/// Includes the memory for each child struct ArrowArrayView
-NANOARROW_DLL ArrowErrorCode
-ArrowArrayViewAllocateChildren(struct ArrowArrayView* array_view, int64_t n_children);
-
-/// \brief Allocate array_view->dictionary
-NANOARROW_DLL ArrowErrorCode
-ArrowArrayViewAllocateDictionary(struct ArrowArrayView* array_view);
-
-/// \brief Set data-independent buffer sizes from length
-NANOARROW_DLL void ArrowArrayViewSetLength(struct ArrowArrayView* array_view,
-                                           int64_t length);
-
-/// \brief Set buffer sizes and data pointers from an ArrowArray
-NANOARROW_DLL ArrowErrorCode ArrowArrayViewSetArray(struct ArrowArrayView* array_view,
-                                                    const struct ArrowArray* array,
-                                                    struct ArrowError* error);
-
-/// \brief Set buffer sizes and data pointers from an ArrowArray except for those
-/// that require dereferencing buffer content.
-NANOARROW_DLL ArrowErrorCode
-ArrowArrayViewSetArrayMinimal(struct ArrowArrayView* array_view,
-                              const struct ArrowArray* array, struct ArrowError* error);
-
-/// \brief Get the number of buffers
-///
-/// The number of buffers referred to by this ArrowArrayView.  In may cases this can also
-/// be calculated from the ArrowLayout member of the ArrowArrayView or ArrowSchemaView;
-/// however, for binary view and string view types, the number of total buffers depends on
-/// the number of variadic buffers.
-static inline int64_t ArrowArrayViewGetNumBuffers(struct ArrowArrayView* array_view);
-
-/// \brief Get a view of a specific buffer from an ArrowArrayView
-///
-/// This is the ArrowArrayView equivalent of ArrowArray::buffers[i] that includes
-/// size information (if known).
-static inline struct ArrowBufferView ArrowArrayViewGetBufferView(
-    struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get the function of a specific buffer in an ArrowArrayView
-///
-/// In may cases this can also be obtained from the ArrowLayout member of the
-/// ArrowArrayView or ArrowSchemaView; however, for binary view and string view types,
-/// the function of each buffer may be different between two arrays of the same type
-/// depending on the number of variadic buffers.
-static inline enum ArrowBufferType ArrowArrayViewGetBufferType(
-    struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get the data type of a specific buffer in an ArrowArrayView
-///
-/// In may cases this can also be obtained from the ArrowLayout member of the
-/// ArrowArrayView or ArrowSchemaView; however, for binary view and string view types,
-/// the data type of each buffer may be different between two arrays of the same type
-/// depending on the number of variadic buffers.
-static inline enum ArrowType ArrowArrayViewGetBufferDataType(
-    struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get the element size (in bits) of a specific buffer in an ArrowArrayView
-///
-/// In may cases this can also be obtained from the ArrowLayout member of the
-/// ArrowArrayView or ArrowSchemaView; however, for binary view and string view types,
-/// the element width of each buffer may be different between two arrays of the same type
-/// depending on the number of variadic buffers.
-static inline int64_t ArrowArrayViewGetBufferElementSizeBits(
-    struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Performs checks on the content of an ArrowArrayView
-///
-/// If using ArrowArrayViewSetArray() to back array_view with an ArrowArray,
-/// the buffer sizes and some content (fist and last offset) have already
-/// been validated at the "default" level. If setting the buffer pointers
-/// and sizes otherwise, you may wish to perform checks at a different level. See
-/// documentation for ArrowValidationLevel for the details of checks performed
-/// at each level.
-NANOARROW_DLL ArrowErrorCode ArrowArrayViewValidate(
-    struct ArrowArrayView* array_view, enum ArrowValidationLevel validation_level,
-    struct ArrowError* error);
-
-/// \brief Compare two ArrowArrayView objects for equality
-///
-/// Given two ArrowArrayView instances, place either 0 (not equal) and
-/// 1 (equal) at the address pointed to by out. If the comparison determines
-/// that actual and expected are not equal, a reason will be communicated via
-/// error if error is non-NULL.
-///
-/// Returns NANOARROW_OK if the comparison completed successfully.
-NANOARROW_DLL ArrowErrorCode ArrowArrayViewCompare(const struct ArrowArrayView* actual,
-                                                   const struct ArrowArrayView* expected,
-                                                   enum ArrowCompareLevel level, int* out,
-                                                   struct ArrowError* reason);
-
-/// \brief Reset the contents of an ArrowArrayView and frees resources
-NANOARROW_DLL void ArrowArrayViewReset(struct ArrowArrayView* array_view);
-
-/// \brief Check for a null element in an ArrowArrayView
-static inline int8_t ArrowArrayViewIsNull(const struct ArrowArrayView* array_view,
-                                          int64_t i);
-
-/// \brief Compute null count for an ArrowArrayView
-static inline int64_t ArrowArrayViewComputeNullCount(
-    const struct ArrowArrayView* array_view);
-
-/// \brief Get the type id of a union array element
-static inline int8_t ArrowArrayViewUnionTypeId(const struct ArrowArrayView* array_view,
-                                               int64_t i);
-
-/// \brief Get the child index of a union array element
-static inline int8_t ArrowArrayViewUnionChildIndex(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get the index to use into the relevant union child array
-static inline int64_t ArrowArrayViewUnionChildOffset(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as an integer
-///
-/// This function does not check for null values, that values are actually integers, or
-/// that values are within a valid range for an int64.
-static inline int64_t ArrowArrayViewGetIntUnsafe(const struct ArrowArrayView* array_view,
-                                                 int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as an unsigned integer
-///
-/// This function does not check for null values, that values are actually integers, or
-/// that values are within a valid range for a uint64.
-static inline uint64_t ArrowArrayViewGetUIntUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as a double
-///
-/// This function does not check for null values, or
-/// that values are within a valid range for a double.
-static inline double ArrowArrayViewGetDoubleUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as an ArrowStringView
-///
-/// This function does not check for null values.
-static inline struct ArrowStringView ArrowArrayViewGetStringUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as an ArrowBufferView
-///
-/// This function does not check for null values.
-static inline struct ArrowBufferView ArrowArrayViewGetBytesUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i);
-
-/// \brief Get an element in an ArrowArrayView as an ArrowDecimal
-///
-/// This function does not check for null values. The out parameter must
-/// be initialized with ArrowDecimalInit() with the proper parameters for this
-/// type before calling this for the first time.
-static inline void ArrowArrayViewGetDecimalUnsafe(const struct ArrowArrayView* array_view,
-                                                  int64_t i, struct ArrowDecimal* out);
-
-/// @}
-
-/// \defgroup nanoarrow-basic-array-stream Basic ArrowArrayStream implementation
-///
-/// An implementation of an ArrowArrayStream based on a collection of
-/// zero or more previously-existing ArrowArray objects. Users should
-/// initialize and/or validate the contents before transferring the
-/// responsibility of the ArrowArrayStream elsewhere.
-///
-/// @{
-
-/// \brief Initialize an ArrowArrayStream backed by this implementation
-///
-/// This function moves the ownership of schema to the array_stream. If
-/// this function returns NANOARROW_OK, the caller is responsible for
-/// releasing the ArrowArrayStream.
-NANOARROW_DLL ArrowErrorCode ArrowBasicArrayStreamInit(
-    struct ArrowArrayStream* array_stream, struct ArrowSchema* schema, int64_t n_arrays);
-
-/// \brief Set the ith ArrowArray in this ArrowArrayStream.
-///
-/// array_stream must have been initialized with ArrowBasicArrayStreamInit().
-/// This function move the ownership of array to the array_stream. i must
-/// be greater than zero and less than the value of n_arrays passed in
-/// ArrowBasicArrayStreamInit(). Callers are not required to fill all
-/// n_arrays members (i.e., n_arrays is a maximum bound).
-NANOARROW_DLL void ArrowBasicArrayStreamSetArray(struct ArrowArrayStream* array_stream,
-                                                 int64_t i, struct ArrowArray* array);
-
-/// \brief Validate the contents of this ArrowArrayStream
-///
-/// array_stream must have been initialized with ArrowBasicArrayStreamInit().
-/// This function uses ArrowArrayStreamInitFromSchema() and ArrowArrayStreamSetArray()
-/// to validate the contents of the arrays.
-NANOARROW_DLL ArrowErrorCode ArrowBasicArrayStreamValidate(
-    const struct ArrowArrayStream* array_stream, struct ArrowError* error);
-
-/// @}
-
-// Undefine ArrowErrorCode, which may have been defined to annotate functions that return
-// it to warn for an unused result.
-#if defined(ArrowErrorCode)
-#undef ArrowErrorCode
-#endif
-
-// Inline function definitions
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#ifndef NANOARROW_BUFFER_INLINE_H_INCLUDED
-#define NANOARROW_BUFFER_INLINE_H_INCLUDED
-
-#include <errno.h>
-#include <stdint.h>
-#include <string.h>
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Modified from Arrow C++ (1eb46f76) cpp/src/arrow/chunk_resolver.h#L133-L162
-static inline int64_t ArrowResolveChunk64(int64_t index, const int64_t* offsets,
-                                          int64_t lo, int64_t hi) {
-  // Similar to std::upper_bound(), but slightly different as our offsets
-  // array always starts with 0.
-  int64_t n = hi - lo;
-  // First iteration does not need to check for n > 1
-  // (lo < hi is guaranteed by the precondition).
-  NANOARROW_DCHECK(n > 1);
-  do {
-    const int64_t m = n >> 1;
-    const int64_t mid = lo + m;
-    if (index >= offsets[mid]) {
-      lo = mid;
-      n -= m;
-    } else {
-      n = m;
-    }
-  } while (n > 1);
-  return lo;
-}
-
-static inline int64_t ArrowResolveChunk32(int32_t index, const int32_t* offsets,
-                                          int32_t lo, int32_t hi) {
-  // Similar to std::upper_bound(), but slightly different as our offsets
-  // array always starts with 0.
-  int32_t n = hi - lo;
-  // First iteration does not need to check for n > 1
-  // (lo < hi is guaranteed by the precondition).
-  NANOARROW_DCHECK(n > 1);
-  do {
-    const int32_t m = n >> 1;
-    const int32_t mid = lo + m;
-    if (index >= offsets[mid]) {
-      lo = mid;
-      n -= m;
-    } else {
-      n = m;
-    }
-  } while (n > 1);
-  return lo;
-}
-
-static inline int64_t _ArrowGrowByFactor(int64_t current_capacity, int64_t new_capacity) {
-  int64_t doubled_capacity = current_capacity * 2;
-  if (doubled_capacity > new_capacity) {
-    return doubled_capacity;
-  } else {
-    return new_capacity;
-  }
-}
-
-// float to half float conversion, adapted from Arrow Go
-// https://github.com/apache/arrow/blob/main/go/arrow/float16/float16.go
-static inline uint16_t ArrowFloatToHalfFloat(float value) {
-  union {
-    float f;
-    uint32_t b;
-  } u;
-  u.f = value;
-
-  uint16_t sn = (uint16_t)((u.b >> 31) & 0x1);
-  uint16_t exp = (u.b >> 23) & 0xff;
-  int16_t res = (int16_t)(exp - 127 + 15);
-  uint16_t fc = (uint16_t)(u.b >> 13) & 0x3ff;
-
-  if (exp == 0) {
-    res = 0;
-  } else if (exp == 0xff) {
-    res = 0x1f;
-  } else if (res > 0x1e) {
-    res = 0x1f;
-    fc = 0;
-  } else if (res < 0x01) {
-    res = 0;
-    fc = 0;
-  }
-
-  return (uint16_t)((sn << 15) | (uint16_t)(res << 10) | fc);
-}
-
-// half float to float conversion, adapted from Arrow Go
-// https://github.com/apache/arrow/blob/main/go/arrow/float16/float16.go
-static inline float ArrowHalfFloatToFloat(uint16_t value) {
-  uint32_t sn = (uint32_t)((value >> 15) & 0x1);
-  uint32_t exp = (value >> 10) & 0x1f;
-  uint32_t res = exp + 127 - 15;
-  uint32_t fc = value & 0x3ff;
-
-  if (exp == 0) {
-    res = 0;
-  } else if (exp == 0x1f) {
-    res = 0xff;
-  }
-
-  union {
-    float f;
-    uint32_t b;
-  } u;
-  u.b = (uint32_t)(sn << 31) | (uint32_t)(res << 23) | (uint32_t)(fc << 13);
-  return u.f;
-}
-
-static inline void ArrowBufferInit(struct ArrowBuffer* buffer) {
-  buffer->data = NULL;
-  buffer->size_bytes = 0;
-  buffer->capacity_bytes = 0;
-  buffer->allocator = ArrowBufferAllocatorDefault();
-}
-
-static inline ArrowErrorCode ArrowBufferSetAllocator(
-    struct ArrowBuffer* buffer, struct ArrowBufferAllocator allocator) {
-  // This is not a perfect test for "has a buffer already been allocated"
-  // but is likely to catch most cases.
-  if (buffer->data == NULL) {
-    buffer->allocator = allocator;
-    return NANOARROW_OK;
-  } else {
-    return EINVAL;
-  }
-}
-
-static inline void ArrowBufferReset(struct ArrowBuffer* buffer) {
-  buffer->allocator.free(&buffer->allocator, (uint8_t*)buffer->data,
-                         buffer->capacity_bytes);
-  ArrowBufferInit(buffer);
-}
-
-static inline void ArrowBufferMove(struct ArrowBuffer* src, struct ArrowBuffer* dst) {
-  memcpy(dst, src, sizeof(struct ArrowBuffer));
-  src->data = NULL;
-  ArrowBufferInit(src);
-}
-
-static inline ArrowErrorCode ArrowBufferResize(struct ArrowBuffer* buffer,
-                                               int64_t new_size_bytes,
-                                               char shrink_to_fit) {
-  if (new_size_bytes < 0) {
-    return EINVAL;
-  }
-
-  int needs_reallocation = new_size_bytes > buffer->capacity_bytes ||
-                           (shrink_to_fit && new_size_bytes < buffer->capacity_bytes);
-
-  if (needs_reallocation) {
-    buffer->data = buffer->allocator.reallocate(&buffer->allocator, buffer->data,
-                                                buffer->capacity_bytes, new_size_bytes);
-
-    if (buffer->data == NULL && new_size_bytes > 0) {
-      buffer->capacity_bytes = 0;
-      buffer->size_bytes = 0;
-      return ENOMEM;
-    }
-
-    buffer->capacity_bytes = new_size_bytes;
-  }
-
-  buffer->size_bytes = new_size_bytes;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowBufferReserve(struct ArrowBuffer* buffer,
-                                                int64_t additional_size_bytes) {
-  int64_t min_capacity_bytes = buffer->size_bytes + additional_size_bytes;
-  if (min_capacity_bytes <= buffer->capacity_bytes) {
-    return NANOARROW_OK;
-  }
-
-  int64_t new_capacity_bytes =
-      _ArrowGrowByFactor(buffer->capacity_bytes, min_capacity_bytes);
-  buffer->data = buffer->allocator.reallocate(&buffer->allocator, buffer->data,
-                                              buffer->capacity_bytes, new_capacity_bytes);
-
-  if (buffer->data == NULL && new_capacity_bytes > 0) {
-    buffer->capacity_bytes = 0;
-    buffer->size_bytes = 0;
-    return ENOMEM;
-  }
-
-  buffer->capacity_bytes = new_capacity_bytes;
-  return NANOARROW_OK;
-}
-
-static inline void ArrowBufferAppendUnsafe(struct ArrowBuffer* buffer, const void* data,
-                                           int64_t size_bytes) {
-  if (size_bytes > 0) {
-    NANOARROW_DCHECK(buffer->data != NULL);
-    memcpy(buffer->data + buffer->size_bytes, data, size_bytes);
-    buffer->size_bytes += size_bytes;
-  }
-}
-
-static inline ArrowErrorCode ArrowBufferAppend(struct ArrowBuffer* buffer,
-                                               const void* data, int64_t size_bytes) {
-  NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, size_bytes));
-
-  ArrowBufferAppendUnsafe(buffer, data, size_bytes);
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowBufferAppendInt8(struct ArrowBuffer* buffer,
-                                                   int8_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(int8_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendUInt8(struct ArrowBuffer* buffer,
-                                                    uint8_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(uint8_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendInt16(struct ArrowBuffer* buffer,
-                                                    int16_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(int16_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendUInt16(struct ArrowBuffer* buffer,
-                                                     uint16_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(uint16_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendInt32(struct ArrowBuffer* buffer,
-                                                    int32_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(int32_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendUInt32(struct ArrowBuffer* buffer,
-                                                     uint32_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(uint32_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendInt64(struct ArrowBuffer* buffer,
-                                                    int64_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(int64_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendUInt64(struct ArrowBuffer* buffer,
-                                                     uint64_t value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(uint64_t));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendDouble(struct ArrowBuffer* buffer,
-                                                     double value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(double));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendFloat(struct ArrowBuffer* buffer,
-                                                    float value) {
-  return ArrowBufferAppend(buffer, &value, sizeof(float));
-}
-
-static inline ArrowErrorCode ArrowBufferAppendStringView(struct ArrowBuffer* buffer,
-                                                         struct ArrowStringView value) {
-  return ArrowBufferAppend(buffer, value.data, value.size_bytes);
-}
-
-static inline ArrowErrorCode ArrowBufferAppendBufferView(struct ArrowBuffer* buffer,
-                                                         struct ArrowBufferView value) {
-  return ArrowBufferAppend(buffer, value.data.data, value.size_bytes);
-}
-
-static inline ArrowErrorCode ArrowBufferAppendFill(struct ArrowBuffer* buffer,
-                                                   uint8_t value, int64_t size_bytes) {
-  if (size_bytes == 0) {
-    return NANOARROW_OK;
-  }
-
-  NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, size_bytes));
-
-  NANOARROW_DCHECK(buffer->data != NULL);  // To help clang-tidy
-  memset(buffer->data + buffer->size_bytes, value, size_bytes);
-  buffer->size_bytes += size_bytes;
-
-  return NANOARROW_OK;
-}
-
-static const uint8_t _ArrowkBitmask[] = {1, 2, 4, 8, 16, 32, 64, 128};
-static const uint8_t _ArrowkFlippedBitmask[] = {254, 253, 251, 247, 239, 223, 191, 127};
-static const uint8_t _ArrowkPrecedingBitmask[] = {0, 1, 3, 7, 15, 31, 63, 127};
-static const uint8_t _ArrowkTrailingBitmask[] = {255, 254, 252, 248, 240, 224, 192, 128};
-
-static const uint8_t _ArrowkBytePopcount[] = {
-    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3,
-    4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4,
-    4, 5, 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4,
-    5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5,
-    4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2,
-    3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5,
-    5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4,
-    5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6,
-    4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8};
-
-static inline int64_t _ArrowRoundUpToMultipleOf8(int64_t value) {
-  return (value + 7) & ~((int64_t)7);
-}
-
-static inline int64_t _ArrowRoundDownToMultipleOf8(int64_t value) {
-  return (value / 8) * 8;
-}
-
-static inline int64_t _ArrowBytesForBits(int64_t bits) {
-  return (bits >> 3) + ((bits & 7) != 0);
-}
-
-static inline void _ArrowBitsUnpackInt8(const uint8_t word, int8_t* out) {
-  out[0] = (word & 0x1) != 0;
-  out[1] = (word & 0x2) != 0;
-  out[2] = (word & 0x4) != 0;
-  out[3] = (word & 0x8) != 0;
-  out[4] = (word & 0x10) != 0;
-  out[5] = (word & 0x20) != 0;
-  out[6] = (word & 0x40) != 0;
-  out[7] = (word & 0x80) != 0;
-}
-
-static inline void _ArrowBitsUnpackInt32(const uint8_t word, int32_t* out) {
-  out[0] = (word & 0x1) != 0;
-  out[1] = (word & 0x2) != 0;
-  out[2] = (word & 0x4) != 0;
-  out[3] = (word & 0x8) != 0;
-  out[4] = (word & 0x10) != 0;
-  out[5] = (word & 0x20) != 0;
-  out[6] = (word & 0x40) != 0;
-  out[7] = (word & 0x80) != 0;
-}
-
-static inline void _ArrowBitmapPackInt8(const int8_t* values, uint8_t* out) {
-  *out = (uint8_t)(values[0] | ((values[1] + 0x1) & 0x2) | ((values[2] + 0x3) & 0x4) |
-                   ((values[3] + 0x7) & 0x8) | ((values[4] + 0xf) & 0x10) |
-                   ((values[5] + 0x1f) & 0x20) | ((values[6] + 0x3f) & 0x40) |
-                   ((values[7] + 0x7f) & 0x80));
-}
-
-static inline void _ArrowBitmapPackInt32(const int32_t* values, uint8_t* out) {
-  *out = (uint8_t)(values[0] | ((values[1] + 0x1) & 0x2) | ((values[2] + 0x3) & 0x4) |
-                   ((values[3] + 0x7) & 0x8) | ((values[4] + 0xf) & 0x10) |
-                   ((values[5] + 0x1f) & 0x20) | ((values[6] + 0x3f) & 0x40) |
-                   ((values[7] + 0x7f) & 0x80));
-}
-
-static inline int8_t ArrowBitGet(const uint8_t* bits, int64_t i) {
-  return (bits[i >> 3] >> (i & 0x07)) & 1;
-}
-
-static inline void ArrowBitsUnpackInt8(const uint8_t* bits, int64_t start_offset,
-                                       int64_t length, int8_t* out) {
-  if (length == 0) {
-    return;
-  }
-
-  const int64_t i_begin = start_offset;
-  const int64_t i_end = start_offset + length;
-  const int64_t i_last_valid = i_end - 1;
-
-  const int64_t bytes_begin = i_begin / 8;
-  const int64_t bytes_last_valid = i_last_valid / 8;
-
-  if (bytes_begin == bytes_last_valid) {
-    for (int i = 0; i < length; i++) {
-      out[i] = ArrowBitGet(&bits[bytes_begin], i + i_begin % 8);
-    }
-
-    return;
-  }
-
-  // first byte
-  for (int i = 0; i < 8 - (i_begin % 8); i++) {
-    *out++ = ArrowBitGet(&bits[bytes_begin], i + i_begin % 8);
-  }
-
-  // middle bytes
-  for (int64_t i = bytes_begin + 1; i < bytes_last_valid; i++) {
-    _ArrowBitsUnpackInt8(bits[i], out);
-    out += 8;
-  }
-
-  // last byte
-  const int bits_remaining = (int)(i_end % 8 == 0 ? 8 : i_end % 8);
-  for (int i = 0; i < bits_remaining; i++) {
-    *out++ = ArrowBitGet(&bits[bytes_last_valid], i);
-  }
-}
-
-static inline void ArrowBitsUnpackInt32(const uint8_t* bits, int64_t start_offset,
-                                        int64_t length, int32_t* out) {
-  if (length == 0) {
-    return;
-  }
-
-  NANOARROW_DCHECK(bits != NULL && out != NULL);
-
-  const int64_t i_begin = start_offset;
-  const int64_t i_end = start_offset + length;
-  const int64_t i_last_valid = i_end - 1;
-
-  const int64_t bytes_begin = i_begin / 8;
-  const int64_t bytes_last_valid = i_last_valid / 8;
-
-  if (bytes_begin == bytes_last_valid) {
-    for (int i = 0; i < length; i++) {
-      out[i] = ArrowBitGet(&bits[bytes_begin], i + i_begin % 8);
-    }
-
-    return;
-  }
-
-  // first byte
-  for (int i = 0; i < 8 - (i_begin % 8); i++) {
-    *out++ = ArrowBitGet(&bits[bytes_begin], i + i_begin % 8);
-  }
-
-  // middle bytes
-  for (int64_t i = bytes_begin + 1; i < bytes_last_valid; i++) {
-    _ArrowBitsUnpackInt32(bits[i], out);
-    out += 8;
-  }
-
-  // last byte
-  const int bits_remaining = (int)(i_end % 8 == 0 ? 8 : i_end % 8);
-  for (int i = 0; i < bits_remaining; i++) {
-    *out++ = ArrowBitGet(&bits[bytes_last_valid], i);
-  }
-}
-
-static inline void ArrowBitSet(uint8_t* bits, int64_t i) {
-  bits[i / 8] |= _ArrowkBitmask[i % 8];
-}
-
-static inline void ArrowBitClear(uint8_t* bits, int64_t i) {
-  bits[i / 8] &= _ArrowkFlippedBitmask[i % 8];
-}
-
-static inline void ArrowBitSetTo(uint8_t* bits, int64_t i, uint8_t bit_is_set) {
-  bits[i / 8] ^= (uint8_t)(((uint8_t)(-((uint8_t)(bit_is_set != 0)) ^ bits[i / 8])) &
-                           _ArrowkBitmask[i % 8]);
-}
-
-static inline void ArrowBitsSetTo(uint8_t* bits, int64_t start_offset, int64_t length,
-                                  uint8_t bits_are_set) {
-  if (length == 0) {
-    return;
-  }
-
-  NANOARROW_DCHECK(bits != NULL);
-
-  const int64_t i_begin = start_offset;
-  const int64_t i_end = start_offset + length;
-  const uint8_t fill_byte = (uint8_t)(-bits_are_set);
-
-  const int64_t bytes_begin = i_begin / 8;
-  const int64_t bytes_end = i_end / 8 + 1;
-
-  const uint8_t first_byte_mask = _ArrowkPrecedingBitmask[i_begin % 8];
-  const uint8_t last_byte_mask = _ArrowkTrailingBitmask[i_end % 8];
-
-  if (bytes_end == bytes_begin + 1) {
-    // set bits within a single byte
-    const uint8_t only_byte_mask =
-        i_end % 8 == 0 ? first_byte_mask : (uint8_t)(first_byte_mask | last_byte_mask);
-    bits[bytes_begin] &= only_byte_mask;
-    bits[bytes_begin] |= (uint8_t)(fill_byte & ~only_byte_mask);
-    return;
-  }
-
-  // set/clear trailing bits of first byte
-  bits[bytes_begin] &= first_byte_mask;
-  bits[bytes_begin] |= (uint8_t)(fill_byte & ~first_byte_mask);
-
-  if (bytes_end - bytes_begin > 2) {
-    // set/clear whole bytes
-    memset(bits + bytes_begin + 1, fill_byte, (size_t)(bytes_end - bytes_begin - 2));
-  }
-
-  if (i_end % 8 == 0) {
-    return;
-  }
-
-  // set/clear leading bits of last byte
-  bits[bytes_end - 1] &= last_byte_mask;
-  bits[bytes_end - 1] |= (uint8_t)(fill_byte & ~last_byte_mask);
-}
-
-static inline int64_t ArrowBitCountSet(const uint8_t* bits, int64_t start_offset,
-                                       int64_t length) {
-  if (length == 0) {
-    return 0;
-  }
-
-  NANOARROW_DCHECK(bits != NULL);
-
-  const int64_t i_begin = start_offset;
-  const int64_t i_end = start_offset + length;
-  const int64_t i_last_valid = i_end - 1;
-
-  const int64_t bytes_begin = i_begin / 8;
-  const int64_t bytes_last_valid = i_last_valid / 8;
-
-  if (bytes_begin == bytes_last_valid) {
-    // count bits within a single byte
-    const uint8_t first_byte_mask = _ArrowkPrecedingBitmask[i_end % 8];
-    const uint8_t last_byte_mask = _ArrowkTrailingBitmask[i_begin % 8];
-
-    const uint8_t only_byte_mask =
-        i_end % 8 == 0 ? last_byte_mask : (uint8_t)(first_byte_mask & last_byte_mask);
-
-    const uint8_t byte_masked = bits[bytes_begin] & only_byte_mask;
-    return _ArrowkBytePopcount[byte_masked];
-  }
-
-  const uint8_t first_byte_mask = _ArrowkPrecedingBitmask[i_begin % 8];
-  const uint8_t last_byte_mask = i_end % 8 == 0 ? 0 : _ArrowkTrailingBitmask[i_end % 8];
-  int64_t count = 0;
-
-  // first byte
-  count += _ArrowkBytePopcount[bits[bytes_begin] & ~first_byte_mask];
-
-  // middle bytes
-  for (int64_t i = bytes_begin + 1; i < bytes_last_valid; i++) {
-    count += _ArrowkBytePopcount[bits[i]];
-  }
-
-  // last byte
-  count += _ArrowkBytePopcount[bits[bytes_last_valid] & ~last_byte_mask];
-
-  return count;
-}
-
-static inline void ArrowBitmapInit(struct ArrowBitmap* bitmap) {
-  ArrowBufferInit(&bitmap->buffer);
-  bitmap->size_bits = 0;
-}
-
-static inline void ArrowBitmapMove(struct ArrowBitmap* src, struct ArrowBitmap* dst) {
-  ArrowBufferMove(&src->buffer, &dst->buffer);
-  dst->size_bits = src->size_bits;
-  src->size_bits = 0;
-}
-
-static inline ArrowErrorCode ArrowBitmapReserve(struct ArrowBitmap* bitmap,
-                                                int64_t additional_size_bits) {
-  int64_t min_capacity_bits = bitmap->size_bits + additional_size_bits;
-  int64_t min_capacity_bytes = _ArrowBytesForBits(min_capacity_bits);
-  int64_t current_size_bytes = bitmap->buffer.size_bytes;
-  int64_t current_capacity_bytes = bitmap->buffer.capacity_bytes;
-
-  if (min_capacity_bytes <= current_capacity_bytes) {
-    return NANOARROW_OK;
-  }
-
-  int64_t additional_capacity_bytes = min_capacity_bytes - current_size_bytes;
-  NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(&bitmap->buffer, additional_capacity_bytes));
-
-  // Zero out the last byte for deterministic output in the common case
-  // of reserving a known remaining size. We should have returned above
-  // if there was not at least one additional byte to allocate; however,
-  // DCHECK() just to be sure.
-  NANOARROW_DCHECK(bitmap->buffer.capacity_bytes > current_capacity_bytes);
-  bitmap->buffer.data[bitmap->buffer.capacity_bytes - 1] = 0;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowBitmapResize(struct ArrowBitmap* bitmap,
-                                               int64_t new_size_bits,
-                                               char shrink_to_fit) {
-  if (new_size_bits < 0) {
-    return EINVAL;
-  }
-
-  int64_t new_size_bytes = _ArrowBytesForBits(new_size_bits);
-  NANOARROW_RETURN_NOT_OK(
-      ArrowBufferResize(&bitmap->buffer, new_size_bytes, shrink_to_fit));
-
-  bitmap->size_bits = new_size_bits;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowBitmapAppend(struct ArrowBitmap* bitmap,
-                                               uint8_t bits_are_set, int64_t length) {
-  NANOARROW_RETURN_NOT_OK(ArrowBitmapReserve(bitmap, length));
-
-  ArrowBitmapAppendUnsafe(bitmap, bits_are_set, length);
-  return NANOARROW_OK;
-}
-
-static inline void ArrowBitmapAppendUnsafe(struct ArrowBitmap* bitmap,
-                                           uint8_t bits_are_set, int64_t length) {
-  ArrowBitsSetTo(bitmap->buffer.data, bitmap->size_bits, length, bits_are_set);
-  bitmap->size_bits += length;
-  bitmap->buffer.size_bytes = _ArrowBytesForBits(bitmap->size_bits);
-}
-
-static inline void ArrowBitmapAppendInt8Unsafe(struct ArrowBitmap* bitmap,
-                                               const int8_t* values, int64_t n_values) {
-  if (n_values == 0) {
-    return;
-  }
-
-  NANOARROW_DCHECK(bitmap->buffer.data != NULL);
-  NANOARROW_DCHECK(values != NULL);
-
-  const int8_t* values_cursor = values;
-  int64_t n_remaining = n_values;
-  int64_t out_i_cursor = bitmap->size_bits;
-  uint8_t* out_cursor = bitmap->buffer.data + bitmap->size_bits / 8;
-
-  // First byte
-  if ((out_i_cursor % 8) != 0) {
-    int64_t n_partial_bits = _ArrowRoundUpToMultipleOf8(out_i_cursor) - out_i_cursor;
-    for (int i = 0; i < n_partial_bits; i++) {
-      ArrowBitSetTo(bitmap->buffer.data, out_i_cursor++, values[i]);
-    }
-
-    out_cursor++;
-    values_cursor += n_partial_bits;
-    n_remaining -= n_partial_bits;
-  }
-
-  // Middle bytes
-  int64_t n_full_bytes = n_remaining / 8;
-  for (int64_t i = 0; i < n_full_bytes; i++) {
-    _ArrowBitmapPackInt8(values_cursor, out_cursor);
-    values_cursor += 8;
-    out_cursor++;
-  }
-
-  // Last byte
-  out_i_cursor += n_full_bytes * 8;
-  n_remaining -= n_full_bytes * 8;
-  if (n_remaining > 0) {
-    // Zero out the last byte
-    *out_cursor = 0x00;
-    for (int i = 0; i < n_remaining; i++) {
-      ArrowBitSetTo(bitmap->buffer.data, out_i_cursor++, values_cursor[i]);
-    }
-    out_cursor++;
-  }
-
-  bitmap->size_bits += n_values;
-  bitmap->buffer.size_bytes = out_cursor - bitmap->buffer.data;
-}
-
-static inline void ArrowBitmapAppendInt32Unsafe(struct ArrowBitmap* bitmap,
-                                                const int32_t* values, int64_t n_values) {
-  if (n_values == 0) {
-    return;
-  }
-
-  NANOARROW_DCHECK(bitmap->buffer.data != NULL);
-  NANOARROW_DCHECK(values != NULL);
-
-  const int32_t* values_cursor = values;
-  int64_t n_remaining = n_values;
-  int64_t out_i_cursor = bitmap->size_bits;
-  uint8_t* out_cursor = bitmap->buffer.data + bitmap->size_bits / 8;
-
-  // First byte
-  if ((out_i_cursor % 8) != 0) {
-    int64_t n_partial_bits = _ArrowRoundUpToMultipleOf8(out_i_cursor) - out_i_cursor;
-    for (int i = 0; i < n_partial_bits; i++) {
-      ArrowBitSetTo(bitmap->buffer.data, out_i_cursor++, (uint8_t)values[i]);
-    }
-
-    out_cursor++;
-    values_cursor += n_partial_bits;
-    n_remaining -= n_partial_bits;
-  }
-
-  // Middle bytes
-  int64_t n_full_bytes = n_remaining / 8;
-  for (int64_t i = 0; i < n_full_bytes; i++) {
-    _ArrowBitmapPackInt32(values_cursor, out_cursor);
-    values_cursor += 8;
-    out_cursor++;
-  }
-
-  // Last byte
-  out_i_cursor += n_full_bytes * 8;
-  n_remaining -= n_full_bytes * 8;
-  if (n_remaining > 0) {
-    // Zero out the last byte
-    *out_cursor = 0x00;
-    for (int i = 0; i < n_remaining; i++) {
-      ArrowBitSetTo(bitmap->buffer.data, out_i_cursor++, (uint8_t)values_cursor[i]);
-    }
-    out_cursor++;
-  }
-
-  bitmap->size_bits += n_values;
-  bitmap->buffer.size_bytes = out_cursor - bitmap->buffer.data;
-}
-
-static inline void ArrowBitmapReset(struct ArrowBitmap* bitmap) {
-  ArrowBufferReset(&bitmap->buffer);
-  bitmap->size_bits = 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-#ifndef NANOARROW_ARRAY_INLINE_H_INCLUDED
-#define NANOARROW_ARRAY_INLINE_H_INCLUDED
-
-#include <errno.h>
-#include <float.h>
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
-
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static inline struct ArrowBitmap* ArrowArrayValidityBitmap(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  return &private_data->bitmap;
-}
-
-static inline struct ArrowBuffer* ArrowArrayBuffer(struct ArrowArray* array, int64_t i) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  switch (i) {
-    case 0:
-      return &private_data->bitmap.buffer;
-    default:
-      return private_data->buffers + i - 1;
-  }
-}
-
-// We don't currently support the case of unions where type_id != child_index;
-// however, these functions are used to keep track of where that assumption
-// is made.
-static inline int8_t _ArrowArrayUnionChildIndex(struct ArrowArray* array,
-                                                int8_t type_id) {
-  NANOARROW_UNUSED(array);
-  return type_id;
-}
-
-static inline int8_t _ArrowArrayUnionTypeId(struct ArrowArray* array,
-                                            int8_t child_index) {
-  NANOARROW_UNUSED(array);
-  return child_index;
-}
-
-static inline int32_t _ArrowParseUnionTypeIds(const char* type_ids, int8_t* out) {
-  if (*type_ids == '\0') {
-    return 0;
-  }
-
-  int32_t i = 0;
-  long type_id;
-  char* end_ptr;
-  do {
-    type_id = strtol(type_ids, &end_ptr, 10);
-    if (end_ptr == type_ids || type_id < 0 || type_id > 127) {
-      return -1;
-    }
-
-    if (out != NULL) {
-      out[i] = (int8_t)type_id;
-    }
-
-    i++;
-
-    type_ids = end_ptr;
-    if (*type_ids == '\0') {
-      return i;
-    } else if (*type_ids != ',') {
-      return -1;
-    } else {
-      type_ids++;
-    }
-  } while (1);
-
-  return -1;
-}
-
-static inline int8_t _ArrowParsedUnionTypeIdsWillEqualChildIndices(const int8_t* type_ids,
-                                                                   int64_t n_type_ids,
-                                                                   int64_t n_children) {
-  if (n_type_ids != n_children) {
-    return 0;
-  }
-
-  for (int8_t i = 0; i < n_type_ids; i++) {
-    if (type_ids[i] != i) {
-      return 0;
-    }
-  }
-
-  return 1;
-}
-
-static inline int8_t _ArrowUnionTypeIdsWillEqualChildIndices(const char* type_id_str,
-                                                             int64_t n_children) {
-  int8_t type_ids[128];
-  int32_t n_type_ids = _ArrowParseUnionTypeIds(type_id_str, type_ids);
-  return _ArrowParsedUnionTypeIdsWillEqualChildIndices(type_ids, n_type_ids, n_children);
-}
-
-static inline ArrowErrorCode ArrowArrayStartAppending(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_UNINITIALIZED:
-      return EINVAL;
-    case NANOARROW_TYPE_SPARSE_UNION:
-    case NANOARROW_TYPE_DENSE_UNION:
-      // Note that this value could be -1 if the type_ids string was invalid
-      if (private_data->union_type_id_is_child_index != 1) {
-        return EINVAL;
-      } else {
-        break;
-      }
-    default:
-      break;
-  }
-  if (private_data->storage_type == NANOARROW_TYPE_UNINITIALIZED) {
-    return EINVAL;
-  }
-
-  // Initialize any data offset buffer with a single zero
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    if (private_data->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_DATA_OFFSET &&
-        private_data->layout.element_size_bits[i] == 64) {
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt64(ArrowArrayBuffer(array, i), 0));
-    } else if (private_data->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_DATA_OFFSET &&
-               private_data->layout.element_size_bits[i] == 32) {
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(ArrowArrayBuffer(array, i), 0));
-    }
-  }
-
-  // Start building any child arrays or dictionaries
-  for (int64_t i = 0; i < array->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayStartAppending(array->children[i]));
-  }
-
-  if (array->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayStartAppending(array->dictionary));
-  }
-
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayShrinkToFit(struct ArrowArray* array) {
-  for (int64_t i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    struct ArrowBuffer* buffer = ArrowArrayBuffer(array, i);
-    NANOARROW_RETURN_NOT_OK(ArrowBufferResize(buffer, buffer->size_bytes, 1));
-  }
-
-  for (int64_t i = 0; i < array->n_children; i++) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayShrinkToFit(array->children[i]));
-  }
-
-  if (array->dictionary != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowArrayShrinkToFit(array->dictionary));
-  }
-
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode _ArrowArrayAppendBits(struct ArrowArray* array,
-                                                   int64_t buffer_i, uint8_t value,
-                                                   int64_t n) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  struct ArrowBuffer* buffer = ArrowArrayBuffer(array, buffer_i);
-  int64_t bytes_required =
-      _ArrowRoundUpToMultipleOf8(private_data->layout.element_size_bits[buffer_i] *
-                                 (array->length + 1)) /
-      8;
-  if (bytes_required > buffer->size_bytes) {
-    NANOARROW_RETURN_NOT_OK(
-        ArrowBufferAppendFill(buffer, 0, bytes_required - buffer->size_bytes));
-  }
-
-  ArrowBitsSetTo(buffer->data, array->length, n, value);
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode _ArrowArrayAppendEmptyInternal(struct ArrowArray* array,
-                                                            int64_t n, uint8_t is_valid) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  if (n == 0) {
-    return NANOARROW_OK;
-  }
-
-  // Some type-specific handling
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_NA:
-      // (An empty value for a null array *is* a null)
-      array->null_count += n;
-      array->length += n;
-      return NANOARROW_OK;
-
-    case NANOARROW_TYPE_DENSE_UNION: {
-      // Add one null to the first child and append n references to that child
-      int8_t type_id = _ArrowArrayUnionTypeId(array, 0);
-      NANOARROW_RETURN_NOT_OK(
-          _ArrowArrayAppendEmptyInternal(array->children[0], 1, is_valid));
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendFill(ArrowArrayBuffer(array, 0), type_id, n));
-      for (int64_t i = 0; i < n; i++) {
-        NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(
-            ArrowArrayBuffer(array, 1), (int32_t)array->children[0]->length - 1));
-      }
-      // For the purposes of array->null_count, union elements are never considered "null"
-      // even if some children contain nulls.
-      array->length += n;
-      return NANOARROW_OK;
-    }
-
-    case NANOARROW_TYPE_SPARSE_UNION: {
-      // Add n nulls to the first child and append n references to that child
-      int8_t type_id = _ArrowArrayUnionTypeId(array, 0);
-      NANOARROW_RETURN_NOT_OK(
-          _ArrowArrayAppendEmptyInternal(array->children[0], n, is_valid));
-      for (int64_t i = 1; i < array->n_children; i++) {
-        NANOARROW_RETURN_NOT_OK(ArrowArrayAppendEmpty(array->children[i], n));
-      }
-
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendFill(ArrowArrayBuffer(array, 0), type_id, n));
-      // For the purposes of array->null_count, union elements are never considered "null"
-      // even if some children contain nulls.
-      array->length += n;
-      return NANOARROW_OK;
-    }
-
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      NANOARROW_RETURN_NOT_OK(ArrowArrayAppendEmpty(
-          array->children[0], n * private_data->layout.child_size_elements));
-      break;
-    case NANOARROW_TYPE_STRUCT:
-      for (int64_t i = 0; i < array->n_children; i++) {
-        NANOARROW_RETURN_NOT_OK(ArrowArrayAppendEmpty(array->children[i], n));
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  // Append n is_valid bits to the validity bitmap. If we haven't allocated a bitmap yet
-  // and we need to append nulls, do it now.
-  if (!is_valid && private_data->bitmap.buffer.data == NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapReserve(&private_data->bitmap, array->length + n));
-    ArrowBitmapAppendUnsafe(&private_data->bitmap, 1, array->length);
-    ArrowBitmapAppendUnsafe(&private_data->bitmap, is_valid, n);
-  } else if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapReserve(&private_data->bitmap, n));
-    ArrowBitmapAppendUnsafe(&private_data->bitmap, is_valid, n);
-  }
-
-  // Add appropriate buffer fill
-  struct ArrowBuffer* buffer;
-  int64_t size_bytes;
-
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    buffer = ArrowArrayBuffer(array, i);
-    size_bytes = private_data->layout.element_size_bits[i] / 8;
-
-    switch (private_data->layout.buffer_type[i]) {
-      case NANOARROW_BUFFER_TYPE_NONE:
-      case NANOARROW_BUFFER_TYPE_VARIADIC_DATA:
-      case NANOARROW_BUFFER_TYPE_VARIADIC_SIZE:
-      case NANOARROW_BUFFER_TYPE_VALIDITY:
-        continue;
-      case NANOARROW_BUFFER_TYPE_SIZE:
-        NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFill(buffer, 0, size_bytes * n));
-        continue;
-      case NANOARROW_BUFFER_TYPE_DATA_OFFSET:
-        // Append the current value at the end of the offset buffer for each element
-        NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, size_bytes * n));
-
-        for (int64_t j = 0; j < n; j++) {
-          ArrowBufferAppendUnsafe(buffer, buffer->data + size_bytes * (array->length + j),
-                                  size_bytes);
-        }
-
-        // Skip the data buffer
-        i++;
-        continue;
-      case NANOARROW_BUFFER_TYPE_DATA:
-        // Zero out the next bit of memory
-        if (private_data->layout.element_size_bits[i] % 8 == 0) {
-          NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFill(buffer, 0, size_bytes * n));
-        } else {
-          NANOARROW_RETURN_NOT_OK(_ArrowArrayAppendBits(array, i, 0, n));
-        }
-        continue;
-      case NANOARROW_BUFFER_TYPE_VIEW_OFFSET:
-        NANOARROW_RETURN_NOT_OK(ArrowBufferReserve(buffer, size_bytes * n));
-        NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFill(buffer, 0, size_bytes * n));
-        continue;
-      case NANOARROW_BUFFER_TYPE_TYPE_ID:
-      case NANOARROW_BUFFER_TYPE_UNION_OFFSET:
-        // These cases return above
-        return EINVAL;
-    }
-  }
-
-  array->length += n;
-  array->null_count += n * !is_valid;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendNull(struct ArrowArray* array, int64_t n) {
-  return _ArrowArrayAppendEmptyInternal(array, n, 0);
-}
-
-static inline ArrowErrorCode ArrowArrayAppendEmpty(struct ArrowArray* array, int64_t n) {
-  return _ArrowArrayAppendEmptyInternal(array, n, 1);
-}
-
-static inline ArrowErrorCode ArrowArrayAppendInt(struct ArrowArray* array,
-                                                 int64_t value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_INT64:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppend(data_buffer, &value, sizeof(int64_t)));
-      break;
-    case NANOARROW_TYPE_INT32:
-      _NANOARROW_CHECK_RANGE(value, INT32_MIN, INT32_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, (int32_t)value));
-      break;
-    case NANOARROW_TYPE_INT16:
-      _NANOARROW_CHECK_RANGE(value, INT16_MIN, INT16_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt16(data_buffer, (int16_t)value));
-      break;
-    case NANOARROW_TYPE_INT8:
-      _NANOARROW_CHECK_RANGE(value, INT8_MIN, INT8_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt8(data_buffer, (int8_t)value));
-      break;
-    case NANOARROW_TYPE_UINT64:
-    case NANOARROW_TYPE_UINT32:
-    case NANOARROW_TYPE_UINT16:
-    case NANOARROW_TYPE_UINT8:
-      _NANOARROW_CHECK_RANGE(value, 0, INT64_MAX);
-      return ArrowArrayAppendUInt(array, value);
-    case NANOARROW_TYPE_DOUBLE:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendDouble(data_buffer, (double)value));
-      break;
-    case NANOARROW_TYPE_FLOAT:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFloat(data_buffer, (float)value));
-      break;
-    case NANOARROW_TYPE_HALF_FLOAT:
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendUInt16(data_buffer, ArrowFloatToHalfFloat((float)value)));
-      break;
-    case NANOARROW_TYPE_BOOL:
-      NANOARROW_RETURN_NOT_OK(_ArrowArrayAppendBits(array, 1, value != 0, 1));
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendUInt(struct ArrowArray* array,
-                                                  uint64_t value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_UINT64:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppend(data_buffer, &value, sizeof(uint64_t)));
-      break;
-    case NANOARROW_TYPE_UINT32:
-      _NANOARROW_CHECK_UPPER_LIMIT(value, UINT32_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendUInt32(data_buffer, (uint32_t)value));
-      break;
-    case NANOARROW_TYPE_UINT16:
-      _NANOARROW_CHECK_UPPER_LIMIT(value, UINT16_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendUInt16(data_buffer, (uint16_t)value));
-      break;
-    case NANOARROW_TYPE_UINT8:
-      _NANOARROW_CHECK_UPPER_LIMIT(value, UINT8_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendUInt8(data_buffer, (uint8_t)value));
-      break;
-    case NANOARROW_TYPE_INT64:
-    case NANOARROW_TYPE_INT32:
-    case NANOARROW_TYPE_INT16:
-    case NANOARROW_TYPE_INT8:
-      _NANOARROW_CHECK_UPPER_LIMIT(value, INT64_MAX);
-      return ArrowArrayAppendInt(array, value);
-    case NANOARROW_TYPE_DOUBLE:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendDouble(data_buffer, (double)value));
-      break;
-    case NANOARROW_TYPE_FLOAT:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFloat(data_buffer, (float)value));
-      break;
-    case NANOARROW_TYPE_HALF_FLOAT:
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendUInt16(data_buffer, ArrowFloatToHalfFloat((float)value)));
-      break;
-    case NANOARROW_TYPE_BOOL:
-      NANOARROW_RETURN_NOT_OK(_ArrowArrayAppendBits(array, 1, value != 0, 1));
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendDouble(struct ArrowArray* array,
-                                                    double value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_DOUBLE:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppend(data_buffer, &value, sizeof(double)));
-      break;
-    case NANOARROW_TYPE_FLOAT:
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendFloat(data_buffer, (float)value));
-      break;
-    case NANOARROW_TYPE_HALF_FLOAT:
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendUInt16(data_buffer, ArrowFloatToHalfFloat((float)value)));
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-// Binary views only have two fixed buffers, but be aware that they must also
-// always have more 1 buffer to store variadic buffer sizes (even if there are none)
-#define NANOARROW_BINARY_VIEW_FIXED_BUFFERS 2
-#define NANOARROW_BINARY_VIEW_INLINE_SIZE 12
-#define NANOARROW_BINARY_VIEW_PREFIX_SIZE 4
-#define NANOARROW_BINARY_VIEW_BLOCK_SIZE (32 << 10)  // 32KB
-
-// The Arrow C++ implementation uses anonymous structs as members
-// of the ArrowBinaryView. For Cython support in this library, we define
-// those structs outside of the ArrowBinaryView
-struct ArrowBinaryViewInlined {
-  int32_t size;
-  uint8_t data[NANOARROW_BINARY_VIEW_INLINE_SIZE];
-};
-
-struct ArrowBinaryViewRef {
-  int32_t size;
-  uint8_t prefix[NANOARROW_BINARY_VIEW_PREFIX_SIZE];
-  int32_t buffer_index;
-  int32_t offset;
-};
-
-union ArrowBinaryView {
-  struct ArrowBinaryViewInlined inlined;
-  struct ArrowBinaryViewRef ref;
-  int64_t alignment_dummy;
-};
-
-static inline int32_t ArrowArrayVariadicBufferCount(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  return private_data->n_variadic_buffers;
-}
-
-static inline ArrowErrorCode ArrowArrayAddVariadicBuffers(struct ArrowArray* array,
-                                                          int32_t nbuffers) {
-  const int32_t n_current_bufs = ArrowArrayVariadicBufferCount(array);
-  const int32_t nvariadic_bufs_needed = n_current_bufs + nbuffers;
-
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  private_data->variadic_buffers = (struct ArrowBuffer*)ArrowRealloc(
-      private_data->variadic_buffers, sizeof(struct ArrowBuffer) * nvariadic_bufs_needed);
-  if (private_data->variadic_buffers == NULL) {
-    return ENOMEM;
-  }
-  private_data->variadic_buffer_sizes = (int64_t*)ArrowRealloc(
-      private_data->variadic_buffer_sizes, sizeof(int64_t) * nvariadic_bufs_needed);
-  if (private_data->variadic_buffer_sizes == NULL) {
-    return ENOMEM;
-  }
-
-  for (int32_t i = n_current_bufs; i < nvariadic_bufs_needed; i++) {
-    ArrowBufferInit(&private_data->variadic_buffers[i]);
-    private_data->variadic_buffer_sizes[i] = 0;
-  }
-  private_data->n_variadic_buffers = nvariadic_bufs_needed;
-  array->n_buffers = NANOARROW_BINARY_VIEW_FIXED_BUFFERS + 1 + nvariadic_bufs_needed;
-
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendBytes(struct ArrowArray* array,
-                                                   struct ArrowBufferView value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  if (private_data->storage_type == NANOARROW_TYPE_STRING_VIEW ||
-      private_data->storage_type == NANOARROW_TYPE_BINARY_VIEW) {
-    struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-    union ArrowBinaryView bvt;
-    bvt.inlined.size = (int32_t)value.size_bytes;
-
-    if (value.size_bytes <= NANOARROW_BINARY_VIEW_INLINE_SIZE) {
-      memcpy(bvt.inlined.data, value.data.as_char, value.size_bytes);
-      memset(bvt.inlined.data + bvt.inlined.size, 0,
-             NANOARROW_BINARY_VIEW_INLINE_SIZE - bvt.inlined.size);
-    } else {
-      int32_t current_n_vbufs = ArrowArrayVariadicBufferCount(array);
-      if (current_n_vbufs == 0 ||
-          private_data->variadic_buffers[current_n_vbufs - 1].size_bytes +
-                  value.size_bytes >
-              NANOARROW_BINARY_VIEW_BLOCK_SIZE) {
-        const int32_t additional_bufs_needed = 1;
-        NANOARROW_RETURN_NOT_OK(
-            ArrowArrayAddVariadicBuffers(array, additional_bufs_needed));
-        current_n_vbufs += additional_bufs_needed;
-      }
-
-      const int32_t buf_index = current_n_vbufs - 1;
-      struct ArrowBuffer* variadic_buf = &private_data->variadic_buffers[buf_index];
-      memcpy(bvt.ref.prefix, value.data.as_char, NANOARROW_BINARY_VIEW_PREFIX_SIZE);
-      bvt.ref.buffer_index = (int32_t)buf_index;
-      bvt.ref.offset = (int32_t)variadic_buf->size_bytes;
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppend(variadic_buf, value.data.as_char, value.size_bytes));
-      private_data->variadic_buffer_sizes[buf_index] = variadic_buf->size_bytes;
-    }
-    NANOARROW_RETURN_NOT_OK(ArrowBufferAppend(data_buffer, &bvt, sizeof(bvt)));
-  } else {
-    struct ArrowBuffer* offset_buffer = ArrowArrayBuffer(array, 1);
-    struct ArrowBuffer* data_buffer = ArrowArrayBuffer(
-        array, 1 + (private_data->storage_type != NANOARROW_TYPE_FIXED_SIZE_BINARY));
-    int32_t offset;
-    int64_t large_offset;
-    int64_t fixed_size_bytes = private_data->layout.element_size_bits[1] / 8;
-
-    switch (private_data->storage_type) {
-      case NANOARROW_TYPE_STRING:
-      case NANOARROW_TYPE_BINARY:
-        offset = ((int32_t*)offset_buffer->data)[array->length];
-        if ((((int64_t)offset) + value.size_bytes) > INT32_MAX) {
-          return EOVERFLOW;
-        }
-
-        offset += (int32_t)value.size_bytes;
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(offset_buffer, &offset, sizeof(int32_t)));
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value.data.data, value.size_bytes));
-        break;
-
-      case NANOARROW_TYPE_LARGE_STRING:
-      case NANOARROW_TYPE_LARGE_BINARY:
-        large_offset = ((int64_t*)offset_buffer->data)[array->length];
-        large_offset += value.size_bytes;
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(offset_buffer, &large_offset, sizeof(int64_t)));
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value.data.data, value.size_bytes));
-        break;
-
-      case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-        if (value.size_bytes != fixed_size_bytes) {
-          return EINVAL;
-        }
-
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value.data.data, value.size_bytes));
-        break;
-      default:
-        return EINVAL;
-    }
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendString(struct ArrowArray* array,
-                                                    struct ArrowStringView value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  struct ArrowBufferView buffer_view;
-  buffer_view.data.data = value.data;
-  buffer_view.size_bytes = value.size_bytes;
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_STRING_VIEW:
-    case NANOARROW_TYPE_BINARY:
-    case NANOARROW_TYPE_LARGE_BINARY:
-    case NANOARROW_TYPE_BINARY_VIEW:
-      return ArrowArrayAppendBytes(array, buffer_view);
-    default:
-      return EINVAL;
-  }
-}
-
-static inline ArrowErrorCode ArrowArrayAppendInterval(struct ArrowArray* array,
-                                                      const struct ArrowInterval* value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_INTERVAL_MONTHS: {
-      if (value->type != NANOARROW_TYPE_INTERVAL_MONTHS) {
-        return EINVAL;
-      }
-
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, value->months));
-      break;
-    }
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME: {
-      if (value->type != NANOARROW_TYPE_INTERVAL_DAY_TIME) {
-        return EINVAL;
-      }
-
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, value->days));
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, value->ms));
-      break;
-    }
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO: {
-      if (value->type != NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO) {
-        return EINVAL;
-      }
-
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, value->months));
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(data_buffer, value->days));
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt64(data_buffer, value->ns));
-      break;
-    }
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayAppendDecimal(struct ArrowArray* array,
-                                                     const struct ArrowDecimal* value) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-  struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1);
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_DECIMAL32:
-      if (value->n_words != 0) {
-        return EINVAL;
-      } else {
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value->words, sizeof(uint32_t)));
-        break;
-      }
-    case NANOARROW_TYPE_DECIMAL64:
-      if (value->n_words != 1) {
-        return EINVAL;
-      } else {
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value->words, sizeof(uint64_t)));
-        break;
-      }
-    case NANOARROW_TYPE_DECIMAL128:
-      if (value->n_words != 2) {
-        return EINVAL;
-      } else {
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value->words, 2 * sizeof(uint64_t)));
-        break;
-      }
-    case NANOARROW_TYPE_DECIMAL256:
-      if (value->n_words != 4) {
-        return EINVAL;
-      } else {
-        NANOARROW_RETURN_NOT_OK(
-            ArrowBufferAppend(data_buffer, value->words, 4 * sizeof(uint64_t)));
-        break;
-      }
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayFinishElement(struct ArrowArray* array) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  int64_t child_length;
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_MAP:
-      child_length = array->children[0]->length;
-      if (child_length > INT32_MAX) {
-        return EOVERFLOW;
-      }
-
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendInt32(ArrowArrayBuffer(array, 1), (int32_t)child_length));
-      break;
-    case NANOARROW_TYPE_LARGE_LIST:
-      child_length = array->children[0]->length;
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendInt64(ArrowArrayBuffer(array, 1), child_length));
-      break;
-    case NANOARROW_TYPE_FIXED_SIZE_LIST:
-      child_length = array->children[0]->length;
-      if (child_length !=
-          ((array->length + 1) * private_data->layout.child_size_elements)) {
-        return EINVAL;
-      }
-      break;
-    case NANOARROW_TYPE_LIST_VIEW: {
-      child_length = array->children[0]->length;
-      if (child_length > INT32_MAX) {
-        return EOVERFLOW;
-      }
-
-      const int32_t last_valid_offset = (int32_t)private_data->list_view_offset;
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendInt32(ArrowArrayBuffer(array, 1), last_valid_offset));
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(
-          ArrowArrayBuffer(array, 2), (int32_t)child_length - last_valid_offset));
-      private_data->list_view_offset = child_length;
-      break;
-    }
-    case NANOARROW_TYPE_LARGE_LIST_VIEW: {
-      child_length = array->children[0]->length;
-      const int64_t last_valid_offset = private_data->list_view_offset;
-      NANOARROW_RETURN_NOT_OK(
-          ArrowBufferAppendInt64(ArrowArrayBuffer(array, 1), last_valid_offset));
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt64(ArrowArrayBuffer(array, 2),
-                                                     child_length - last_valid_offset));
-      private_data->list_view_offset = child_length;
-      break;
-    }
-
-    case NANOARROW_TYPE_STRUCT:
-      for (int64_t i = 0; i < array->n_children; i++) {
-        child_length = array->children[i]->length;
-        if (child_length != (array->length + 1)) {
-          return EINVAL;
-        }
-      }
-      break;
-    default:
-      return EINVAL;
-  }
-
-  if (private_data->bitmap.buffer.data != NULL) {
-    NANOARROW_RETURN_NOT_OK(ArrowBitmapAppend(ArrowArrayValidityBitmap(array), 1, 1));
-  }
-
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline ArrowErrorCode ArrowArrayFinishUnionElement(struct ArrowArray* array,
-                                                          int8_t type_id) {
-  struct ArrowArrayPrivateData* private_data =
-      (struct ArrowArrayPrivateData*)array->private_data;
-
-  int64_t child_index = _ArrowArrayUnionChildIndex(array, type_id);
-  if (child_index < 0 || child_index >= array->n_children) {
-    return EINVAL;
-  }
-
-  switch (private_data->storage_type) {
-    case NANOARROW_TYPE_DENSE_UNION:
-      // Append the target child length to the union offsets buffer
-      _NANOARROW_CHECK_RANGE(array->children[child_index]->length, 0, INT32_MAX);
-      NANOARROW_RETURN_NOT_OK(ArrowBufferAppendInt32(
-          ArrowArrayBuffer(array, 1), (int32_t)array->children[child_index]->length - 1));
-      break;
-    case NANOARROW_TYPE_SPARSE_UNION:
-      // Append one empty to any non-target column that isn't already the right length
-      // or abort if appending a null will result in a column with invalid length
-      for (int64_t i = 0; i < array->n_children; i++) {
-        if (i == child_index || array->children[i]->length == (array->length + 1)) {
-          continue;
-        }
-
-        if (array->children[i]->length != array->length) {
-          return EINVAL;
-        }
-
-        NANOARROW_RETURN_NOT_OK(ArrowArrayAppendEmpty(array->children[i], 1));
-      }
-
-      break;
-    default:
-      return EINVAL;
-  }
-
-  // Write to the type_ids buffer
-  NANOARROW_RETURN_NOT_OK(
-      ArrowBufferAppendInt8(ArrowArrayBuffer(array, 0), (int8_t)type_id));
-  array->length++;
-  return NANOARROW_OK;
-}
-
-static inline void ArrowArrayViewMove(struct ArrowArrayView* src,
-                                      struct ArrowArrayView* dst) {
-  memcpy(dst, src, sizeof(struct ArrowArrayView));
-  ArrowArrayViewInitFromType(src, NANOARROW_TYPE_UNINITIALIZED);
-}
-
-static inline int64_t ArrowArrayViewGetNumBuffers(struct ArrowArrayView* array_view) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      return NANOARROW_BINARY_VIEW_FIXED_BUFFERS + array_view->n_variadic_buffers + 1;
-    default:
-      break;
-  }
-
-  int64_t n_buffers = 0;
-  for (int i = 0; i < NANOARROW_MAX_FIXED_BUFFERS; i++) {
-    if (array_view->layout.buffer_type[i] == NANOARROW_BUFFER_TYPE_NONE) {
-      break;
-    }
-
-    n_buffers++;
-  }
-
-  return n_buffers;
-}
-
-static inline struct ArrowBufferView ArrowArrayViewGetBufferView(
-    struct ArrowArrayView* array_view, int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      if (i < NANOARROW_BINARY_VIEW_FIXED_BUFFERS) {
-        return array_view->buffer_views[i];
-      } else if (i >=
-                 (array_view->n_variadic_buffers + NANOARROW_BINARY_VIEW_FIXED_BUFFERS)) {
-        struct ArrowBufferView view;
-        view.data.as_int64 = array_view->variadic_buffer_sizes;
-        view.size_bytes = array_view->n_variadic_buffers * sizeof(double);
-        return view;
-      } else {
-        struct ArrowBufferView view;
-        view.data.data =
-            array_view->variadic_buffers[i - NANOARROW_BINARY_VIEW_FIXED_BUFFERS];
-        view.size_bytes =
-            array_view->variadic_buffer_sizes[i - NANOARROW_BINARY_VIEW_FIXED_BUFFERS];
-        return view;
-      }
-    default:
-      // We need this check to avoid -Warray-bounds from complaining
-      if (i >= NANOARROW_MAX_FIXED_BUFFERS) {
-        struct ArrowBufferView view;
-        view.data.data = NULL;
-        view.size_bytes = 0;
-        return view;
-      } else {
-        return array_view->buffer_views[i];
-      }
-  }
-}
-
-enum ArrowBufferType ArrowArrayViewGetBufferType(struct ArrowArrayView* array_view,
-                                                 int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      if (i < NANOARROW_BINARY_VIEW_FIXED_BUFFERS) {
-        return array_view->layout.buffer_type[i];
-      } else if (i ==
-                 (array_view->n_variadic_buffers + NANOARROW_BINARY_VIEW_FIXED_BUFFERS)) {
-        return NANOARROW_BUFFER_TYPE_VARIADIC_SIZE;
-      } else {
-        return NANOARROW_BUFFER_TYPE_VARIADIC_DATA;
-      }
-    default:
-      // We need this check to avoid -Warray-bounds from complaining
-      if (i >= NANOARROW_MAX_FIXED_BUFFERS) {
-        return NANOARROW_BUFFER_TYPE_NONE;
-      } else {
-        return array_view->layout.buffer_type[i];
-      }
-  }
-}
-
-static inline enum ArrowType ArrowArrayViewGetBufferDataType(
-    struct ArrowArrayView* array_view, int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      if (i < NANOARROW_BINARY_VIEW_FIXED_BUFFERS) {
-        return array_view->layout.buffer_data_type[i];
-      } else if (i >=
-                 (array_view->n_variadic_buffers + NANOARROW_BINARY_VIEW_FIXED_BUFFERS)) {
-        return NANOARROW_TYPE_INT64;
-      } else if (array_view->storage_type == NANOARROW_TYPE_BINARY_VIEW) {
-        return NANOARROW_TYPE_BINARY;
-      } else {
-        return NANOARROW_TYPE_STRING;
-      }
-    default:
-      // We need this check to avoid -Warray-bounds from complaining
-      if (i >= NANOARROW_MAX_FIXED_BUFFERS) {
-        return NANOARROW_TYPE_UNINITIALIZED;
-      } else {
-        return array_view->layout.buffer_data_type[i];
-      }
-  }
-}
-
-static inline int64_t ArrowArrayViewGetBufferElementSizeBits(
-    struct ArrowArrayView* array_view, int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_BINARY_VIEW:
-    case NANOARROW_TYPE_STRING_VIEW:
-      if (i < NANOARROW_BINARY_VIEW_FIXED_BUFFERS) {
-        return array_view->layout.element_size_bits[i];
-      } else if (i >=
-                 (array_view->n_variadic_buffers + NANOARROW_BINARY_VIEW_FIXED_BUFFERS)) {
-        return sizeof(int64_t) * 8;
-      } else {
-        return 0;
-      }
-    default:
-      // We need this check to avoid -Warray-bounds from complaining
-      if (i >= NANOARROW_MAX_FIXED_BUFFERS) {
-        return 0;
-      } else {
-        return array_view->layout.element_size_bits[i];
-      }
-  }
-}
-
-static inline int8_t ArrowArrayViewIsNull(const struct ArrowArrayView* array_view,
-                                          int64_t i) {
-  const uint8_t* validity_buffer = array_view->buffer_views[0].data.as_uint8;
-  i += array_view->offset;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_NA:
-      return 0x01;
-    case NANOARROW_TYPE_DENSE_UNION:
-    case NANOARROW_TYPE_SPARSE_UNION:
-      // Unions are "never null" in Arrow land
-      return 0x00;
-    default:
-      return validity_buffer != NULL && !ArrowBitGet(validity_buffer, i);
-  }
-}
-
-static inline int64_t ArrowArrayViewComputeNullCount(
-    const struct ArrowArrayView* array_view) {
-  if (array_view->length == 0) {
-    return 0;
-  }
-
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_NA:
-      return array_view->length;
-    case NANOARROW_TYPE_DENSE_UNION:
-    case NANOARROW_TYPE_SPARSE_UNION:
-      // Unions are "never null" in Arrow land
-      return 0;
-    default:
-      break;
-  }
-
-  const uint8_t* validity_buffer = array_view->buffer_views[0].data.as_uint8;
-  if (validity_buffer == NULL) {
-    return 0;
-  }
-  return array_view->length -
-         ArrowBitCountSet(validity_buffer, array_view->offset, array_view->length);
-}
-
-static inline int8_t ArrowArrayViewUnionTypeId(const struct ArrowArrayView* array_view,
-                                               int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_DENSE_UNION:
-    case NANOARROW_TYPE_SPARSE_UNION:
-      return array_view->buffer_views[0].data.as_int8[array_view->offset + i];
-    default:
-      return -1;
-  }
-}
-
-static inline int8_t ArrowArrayViewUnionChildIndex(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  int8_t type_id = ArrowArrayViewUnionTypeId(array_view, i);
-  if (array_view->union_type_id_map == NULL) {
-    return type_id;
-  } else {
-    return array_view->union_type_id_map[type_id];
-  }
-}
-
-static inline int64_t ArrowArrayViewUnionChildOffset(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_DENSE_UNION:
-      return array_view->buffer_views[1].data.as_int32[array_view->offset + i];
-    case NANOARROW_TYPE_SPARSE_UNION:
-      return array_view->offset + i;
-    default:
-      return -1;
-  }
-}
-
-static inline int64_t ArrowArrayViewListChildOffset(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_LIST:
-    case NANOARROW_TYPE_LIST_VIEW:
-      return array_view->buffer_views[1].data.as_int32[i];
-    case NANOARROW_TYPE_LARGE_LIST:
-    case NANOARROW_TYPE_LARGE_LIST_VIEW:
-      return array_view->buffer_views[1].data.as_int64[i];
-    default:
-      return -1;
-  }
-}
-
-static struct ArrowBufferView ArrowArrayViewGetBytesFromViewArrayUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  const union ArrowBinaryView* bv = &array_view->buffer_views[1].data.as_binary_view[i];
-  struct ArrowBufferView out = {{NULL}, bv->inlined.size};
-  if (bv->inlined.size <= NANOARROW_BINARY_VIEW_INLINE_SIZE) {
-    out.data.as_uint8 = bv->inlined.data;
-    return out;
-  }
-
-  out.data.data = array_view->variadic_buffers[bv->ref.buffer_index];
-  out.data.as_uint8 += bv->ref.offset;
-  return out;
-}
-
-static inline int64_t ArrowArrayViewGetIntUnsafe(const struct ArrowArrayView* array_view,
-                                                 int64_t i) {
-  const struct ArrowBufferView* data_view = &array_view->buffer_views[1];
-  i += array_view->offset;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_INT64:
-      return data_view->data.as_int64[i];
-    case NANOARROW_TYPE_UINT64:
-      return data_view->data.as_uint64[i];
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-    case NANOARROW_TYPE_INT32:
-      return data_view->data.as_int32[i];
-    case NANOARROW_TYPE_UINT32:
-      return data_view->data.as_uint32[i];
-    case NANOARROW_TYPE_INT16:
-      return data_view->data.as_int16[i];
-    case NANOARROW_TYPE_UINT16:
-      return data_view->data.as_uint16[i];
-    case NANOARROW_TYPE_INT8:
-      return data_view->data.as_int8[i];
-    case NANOARROW_TYPE_UINT8:
-      return data_view->data.as_uint8[i];
-    case NANOARROW_TYPE_DOUBLE:
-      return (int64_t)data_view->data.as_double[i];
-    case NANOARROW_TYPE_FLOAT:
-      return (int64_t)data_view->data.as_float[i];
-    case NANOARROW_TYPE_HALF_FLOAT:
-      return (int64_t)ArrowHalfFloatToFloat(data_view->data.as_uint16[i]);
-    case NANOARROW_TYPE_BOOL:
-      return ArrowBitGet(data_view->data.as_uint8, i);
-    default:
-      return INT64_MAX;
-  }
-}
-
-static inline uint64_t ArrowArrayViewGetUIntUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  i += array_view->offset;
-  const struct ArrowBufferView* data_view = &array_view->buffer_views[1];
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_INT64:
-      return data_view->data.as_int64[i];
-    case NANOARROW_TYPE_UINT64:
-      return data_view->data.as_uint64[i];
-    case NANOARROW_TYPE_INTERVAL_MONTHS:
-    case NANOARROW_TYPE_INT32:
-      return data_view->data.as_int32[i];
-    case NANOARROW_TYPE_UINT32:
-      return data_view->data.as_uint32[i];
-    case NANOARROW_TYPE_INT16:
-      return data_view->data.as_int16[i];
-    case NANOARROW_TYPE_UINT16:
-      return data_view->data.as_uint16[i];
-    case NANOARROW_TYPE_INT8:
-      return data_view->data.as_int8[i];
-    case NANOARROW_TYPE_UINT8:
-      return data_view->data.as_uint8[i];
-    case NANOARROW_TYPE_DOUBLE:
-      return (uint64_t)data_view->data.as_double[i];
-    case NANOARROW_TYPE_FLOAT:
-      return (uint64_t)data_view->data.as_float[i];
-    case NANOARROW_TYPE_HALF_FLOAT:
-      return (uint64_t)ArrowHalfFloatToFloat(data_view->data.as_uint16[i]);
-    case NANOARROW_TYPE_BOOL:
-      return ArrowBitGet(data_view->data.as_uint8, i);
-    default:
-      return UINT64_MAX;
-  }
-}
-
-static inline double ArrowArrayViewGetDoubleUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  i += array_view->offset;
-  const struct ArrowBufferView* data_view = &array_view->buffer_views[1];
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_INT64:
-      return (double)data_view->data.as_int64[i];
-    case NANOARROW_TYPE_UINT64:
-      return (double)data_view->data.as_uint64[i];
-    case NANOARROW_TYPE_INT32:
-      return data_view->data.as_int32[i];
-    case NANOARROW_TYPE_UINT32:
-      return data_view->data.as_uint32[i];
-    case NANOARROW_TYPE_INT16:
-      return data_view->data.as_int16[i];
-    case NANOARROW_TYPE_UINT16:
-      return data_view->data.as_uint16[i];
-    case NANOARROW_TYPE_INT8:
-      return data_view->data.as_int8[i];
-    case NANOARROW_TYPE_UINT8:
-      return data_view->data.as_uint8[i];
-    case NANOARROW_TYPE_DOUBLE:
-      return data_view->data.as_double[i];
-    case NANOARROW_TYPE_FLOAT:
-      return data_view->data.as_float[i];
-    case NANOARROW_TYPE_HALF_FLOAT:
-      return ArrowHalfFloatToFloat(data_view->data.as_uint16[i]);
-    case NANOARROW_TYPE_BOOL:
-      return ArrowBitGet(data_view->data.as_uint8, i);
-    default:
-      return DBL_MAX;
-  }
-}
-
-static inline struct ArrowStringView ArrowArrayViewGetStringUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  i += array_view->offset;
-  const struct ArrowBufferView* offsets_view = &array_view->buffer_views[1];
-  const char* data_view = array_view->buffer_views[2].data.as_char;
-
-  struct ArrowStringView view;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_BINARY:
-      view.data = data_view + offsets_view->data.as_int32[i];
-      view.size_bytes =
-          (int64_t)offsets_view->data.as_int32[i + 1] - offsets_view->data.as_int32[i];
-      break;
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_LARGE_BINARY:
-      view.data = data_view + offsets_view->data.as_int64[i];
-      view.size_bytes =
-          offsets_view->data.as_int64[i + 1] - offsets_view->data.as_int64[i];
-      break;
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      view.size_bytes = array_view->layout.element_size_bits[1] / 8;
-      view.data = array_view->buffer_views[1].data.as_char + (i * view.size_bytes);
-      break;
-    case NANOARROW_TYPE_STRING_VIEW:
-    case NANOARROW_TYPE_BINARY_VIEW: {
-      struct ArrowBufferView buf_view =
-          ArrowArrayViewGetBytesFromViewArrayUnsafe(array_view, i);
-      view.data = buf_view.data.as_char;
-      view.size_bytes = buf_view.size_bytes;
-      break;
-    }
-    default:
-      view.data = NULL;
-      view.size_bytes = 0;
-      break;
-  }
-
-  return view;
-}
-
-static inline struct ArrowBufferView ArrowArrayViewGetBytesUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i) {
-  i += array_view->offset;
-  const struct ArrowBufferView* offsets_view = &array_view->buffer_views[1];
-  const uint8_t* data_view = array_view->buffer_views[2].data.as_uint8;
-
-  struct ArrowBufferView view;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_STRING:
-    case NANOARROW_TYPE_BINARY:
-      view.size_bytes =
-          (int64_t)offsets_view->data.as_int32[i + 1] - offsets_view->data.as_int32[i];
-      view.data.as_uint8 = data_view + offsets_view->data.as_int32[i];
-      break;
-    case NANOARROW_TYPE_LARGE_STRING:
-    case NANOARROW_TYPE_LARGE_BINARY:
-      view.size_bytes =
-          offsets_view->data.as_int64[i + 1] - offsets_view->data.as_int64[i];
-      view.data.as_uint8 = data_view + offsets_view->data.as_int64[i];
-      break;
-    case NANOARROW_TYPE_FIXED_SIZE_BINARY:
-      view.size_bytes = array_view->layout.element_size_bits[1] / 8;
-      view.data.as_uint8 =
-          array_view->buffer_views[1].data.as_uint8 + (i * view.size_bytes);
-      break;
-    case NANOARROW_TYPE_STRING_VIEW:
-    case NANOARROW_TYPE_BINARY_VIEW:
-      view = ArrowArrayViewGetBytesFromViewArrayUnsafe(array_view, i);
-      break;
-    default:
-      view.data.data = NULL;
-      view.size_bytes = 0;
-      break;
-  }
-
-  return view;
-}
-
-static inline void ArrowArrayViewGetIntervalUnsafe(
-    const struct ArrowArrayView* array_view, int64_t i, struct ArrowInterval* out) {
-  const uint8_t* data_view = array_view->buffer_views[1].data.as_uint8;
-  const int64_t offset = array_view->offset;
-  const int64_t index = offset + i;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_INTERVAL_MONTHS: {
-      const size_t size = sizeof(int32_t);
-      memcpy(&out->months, data_view + index * size, sizeof(int32_t));
-      break;
-    }
-    case NANOARROW_TYPE_INTERVAL_DAY_TIME: {
-      const size_t size = sizeof(int32_t) + sizeof(int32_t);
-      memcpy(&out->days, data_view + index * size, sizeof(int32_t));
-      memcpy(&out->ms, data_view + index * size + 4, sizeof(int32_t));
-      break;
-    }
-    case NANOARROW_TYPE_INTERVAL_MONTH_DAY_NANO: {
-      const size_t size = sizeof(int32_t) + sizeof(int32_t) + sizeof(int64_t);
-      memcpy(&out->months, data_view + index * size, sizeof(int32_t));
-      memcpy(&out->days, data_view + index * size + 4, sizeof(int32_t));
-      memcpy(&out->ns, data_view + index * size + 8, sizeof(int64_t));
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-static inline void ArrowArrayViewGetDecimalUnsafe(const struct ArrowArrayView* array_view,
-                                                  int64_t i, struct ArrowDecimal* out) {
-  i += array_view->offset;
-  const uint8_t* data_view = array_view->buffer_views[1].data.as_uint8;
-  switch (array_view->storage_type) {
-    case NANOARROW_TYPE_DECIMAL32:
-      ArrowDecimalSetBytes(out, data_view + (i * 4));
-      break;
-    case NANOARROW_TYPE_DECIMAL64:
-      ArrowDecimalSetBytes(out, data_view + (i * 8));
-      break;
-    case NANOARROW_TYPE_DECIMAL128:
-      ArrowDecimalSetBytes(out, data_view + (i * 16));
-      break;
-    case NANOARROW_TYPE_DECIMAL256:
-      ArrowDecimalSetBytes(out, data_view + (i * 32));
-      break;
-    default:
-      memset(out->words, 0, sizeof(out->words));
-      break;
-  }
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/oracledb/impl/arrow/schema.pyx b/src/oracledb/impl/arrow/schema.pyx
deleted file mode 100644
index b11f095b..00000000
--- a/src/oracledb/impl/arrow/schema.pyx
+++ /dev/null
@@ -1,281 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# schema.pyx
-#
-# Cython implementation of the ArrowSchemaImpl class.
-#------------------------------------------------------------------------------
-
-cdef class ArrowSchemaImpl:
-
-    def __cinit__(self):
-        self.arrow_schema = \
-                <ArrowSchema*> cpython.PyMem_Calloc(1, sizeof(ArrowSchema))
-
-    def __dealloc__(self):
-        if self.arrow_schema != NULL:
-            if self.arrow_schema.release != NULL:
-                ArrowSchemaRelease(self.arrow_schema)
-            cpython.PyMem_Free(self.arrow_schema)
-
-    cdef bint _is_sparse_vector(self) except*:
-        """
-        Returns a boolean indicating if the schema refers to a sparse vector.
-        This requires a structure containing the keys for number of dimensions,
-        indices and values.
-        """
-        cdef:
-            ArrowSchemaView view
-            ArrowSchema *schema
-        if self.arrow_schema.n_children != 3:
-            return False
-        schema = self.arrow_schema.children[0]
-        _check_nanoarrow(ArrowSchemaViewInit(&view, schema, NULL))
-        if view.type != NANOARROW_TYPE_INT64 \
-                or schema.name != b"num_dimensions":
-            return False
-        schema = self.arrow_schema.children[1]
-        _check_nanoarrow(ArrowSchemaViewInit(&view, schema, NULL))
-        if view.type != NANOARROW_TYPE_LIST or schema.name != b"indices":
-            return False
-        _check_nanoarrow(ArrowSchemaViewInit(&view, schema.children[0], NULL))
-        if view.type != NANOARROW_TYPE_UINT32:
-            return False
-        schema = self.arrow_schema.children[2]
-        _check_nanoarrow(ArrowSchemaViewInit(&view, schema, NULL))
-        if view.type != NANOARROW_TYPE_LIST or schema.name != b"values":
-            return False
-        return True
-
-    cdef int _set_child_arrow_type(self, ArrowType child_arrow_type) except -1:
-        """
-        Set the child Arrow type and the corresponding element size in bytes.
-        """
-        self.child_arrow_type = child_arrow_type
-        if child_arrow_type == NANOARROW_TYPE_DOUBLE:
-            self.child_element_size = sizeof(double)
-        elif child_arrow_type == NANOARROW_TYPE_FLOAT:
-            self.child_element_size = sizeof(float)
-        elif child_arrow_type == NANOARROW_TYPE_INT8:
-            self.child_element_size = sizeof(int8_t)
-        elif child_arrow_type == NANOARROW_TYPE_UINT8:
-            self.child_element_size = sizeof(uint8_t)
-
-    cdef int _set_time_unit(self, ArrowTimeUnit time_unit) except -1:
-        """
-        Sets the time unit and the corresponding factor.
-        """
-        self.time_unit = time_unit
-        if time_unit == NANOARROW_TIME_UNIT_MILLI:
-            self.time_factor = 1_000
-        elif time_unit == NANOARROW_TIME_UNIT_MICRO:
-            self.time_factor = 1_000_000
-        elif time_unit == NANOARROW_TIME_UNIT_NANO:
-            self.time_factor = 1_000_000_000
-        else:
-            self.time_factor = 1
-
-    @classmethod
-    def from_arrow_schema(cls, obj):
-        cdef:
-            ArrowSchema* arrow_schema
-            ArrowSchemaImpl schema_impl
-        schema_capsule = obj.__arrow_c_schema__()
-        arrow_schema = <ArrowSchema*> cpython.PyCapsule_GetPointer(
-            schema_capsule, "arrow_schema"
-        )
-        schema_impl = ArrowSchemaImpl.__new__(ArrowSchemaImpl)
-        schema_impl.populate_from_schema(arrow_schema)
-        return schema_impl
-
-    cdef str get_type_name(self):
-        """
-        Returns a string representation of the Arrow type.
-        """
-        return ArrowTypeString(self.arrow_type).decode()
-
-    cdef int populate_from_schema(self, ArrowSchema* schema) except -1:
-        """
-        Populate the schema from another schema.
-        """
-        cdef:
-            ArrowSchemaView schema_view
-            ArrowSchemaImpl schema_impl
-            int64_t i
-        ArrowSchemaMove(schema, self.arrow_schema)
-        memset(&schema_view, 0, sizeof(ArrowSchemaView))
-        _check_nanoarrow(
-            ArrowSchemaViewInit(&schema_view, self.arrow_schema, NULL)
-        )
-        self.arrow_type = schema_view.type
-        self.name = schema.name.decode()
-        self.precision = schema_view.decimal_precision
-        self.scale = schema_view.decimal_scale
-        self.fixed_size = schema_view.fixed_size
-        if schema_view.type == NANOARROW_TYPE_STRUCT:
-
-            # struct may refer to a sparse vector
-            if self._is_sparse_vector():
-                _check_nanoarrow(
-                    ArrowSchemaViewInit(&schema_view,
-                                        schema.children[2].children[0], NULL)
-                )
-                self._set_child_arrow_type(schema_view.type)
-
-            # otherwise, it is treated as a list of columns such as those used
-            # for a requested schema
-            else:
-                self.child_schemas = []
-                for i in range(schema.n_children):
-                    schema_impl = ArrowSchemaImpl.__new__(ArrowSchemaImpl)
-                    schema_impl.populate_from_schema(schema.children[i])
-                    self.child_schemas.append(schema_impl)
-        elif schema_view.type == NANOARROW_TYPE_TIMESTAMP:
-            self._set_time_unit(schema_view.time_unit)
-        elif schema_view.type == NANOARROW_TYPE_DATE64:
-            self._set_time_unit(NANOARROW_TIME_UNIT_MILLI)
-        elif schema_view.type in (
-                NANOARROW_TYPE_FIXED_SIZE_LIST,
-                NANOARROW_TYPE_LIST
-        ):
-            _check_nanoarrow(
-                ArrowSchemaViewInit(
-                    &schema_view, self.arrow_schema.children[0], NULL
-                )
-            )
-            self._set_child_arrow_type(schema_view.type)
-        elif schema_view.type not in (
-            NANOARROW_TYPE_BINARY,
-            NANOARROW_TYPE_BOOL,
-            NANOARROW_TYPE_DATE32,
-            NANOARROW_TYPE_DATE64,
-            NANOARROW_TYPE_DECIMAL128,
-            NANOARROW_TYPE_DOUBLE,
-            NANOARROW_TYPE_FIXED_SIZE_BINARY,
-            NANOARROW_TYPE_FLOAT,
-            NANOARROW_TYPE_INT8,
-            NANOARROW_TYPE_INT16,
-            NANOARROW_TYPE_INT32,
-            NANOARROW_TYPE_INT64,
-            NANOARROW_TYPE_LARGE_BINARY,
-            NANOARROW_TYPE_LARGE_STRING,
-            NANOARROW_TYPE_STRING,
-            NANOARROW_TYPE_UINT8,
-            NANOARROW_TYPE_UINT16,
-            NANOARROW_TYPE_UINT32,
-            NANOARROW_TYPE_UINT64,
-        ):
-            errors._raise_err(errors.ERR_ARROW_UNSUPPORTED_DATA_FORMAT,
-                              schema_format=schema.format.decode())
-        if self.child_arrow_type != 0 and self.child_element_size == 0:
-            errors._raise_err(
-                errors.ERR_ARROW_UNSUPPORTED_CHILD_DATA_FORMAT,
-                schema_format=schema.children[0].format.decode()
-            )
-
-    cdef int populate_from_metadata(self, ArrowType arrow_type, str name,
-                                    int8_t precision, int8_t scale,
-                                    ArrowTimeUnit time_unit,
-                                    ArrowType child_arrow_type) except -1:
-        """
-        Populate the schema from the supplied metadata.
-        """
-        cdef ArrowType storage_type = arrow_type
-        self.arrow_type = arrow_type
-        self._set_time_unit(time_unit)
-        self._set_child_arrow_type(child_arrow_type)
-        self.name = name
-        if arrow_type == NANOARROW_TYPE_TIMESTAMP:
-            storage_type = NANOARROW_TYPE_INT64
-
-        if arrow_type == NANOARROW_TYPE_DECIMAL128:
-            self.precision = precision
-            self.scale = scale
-            ArrowSchemaInit(self.arrow_schema)
-            _check_nanoarrow(
-                ArrowSchemaSetTypeDecimal(
-                    self.arrow_schema,
-                    arrow_type,
-                    precision,
-                    scale
-                )
-            )
-        elif arrow_type == NANOARROW_TYPE_STRUCT:
-            # Currently struct is used for Sparse vector only
-            build_arrow_schema_for_sparse_vector(self.arrow_schema,
-                                                 child_arrow_type)
-        else:
-            _check_nanoarrow(
-                ArrowSchemaInitFromType(
-                    self.arrow_schema,
-                    storage_type
-                )
-            )
-            if arrow_type == NANOARROW_TYPE_TIMESTAMP:
-                _check_nanoarrow(
-                    ArrowSchemaSetTypeDateTime(
-                        self.arrow_schema,
-                        arrow_type,
-                        time_unit,
-                        NULL
-                    )
-                )
-        if arrow_type == NANOARROW_TYPE_LIST:
-            # Set the schema for child using child_arrow_type
-            _check_nanoarrow(
-                ArrowSchemaSetType(
-                    self.arrow_schema.children[0],
-                    child_arrow_type
-                )
-            )
-        _check_nanoarrow(ArrowSchemaSetName(self.arrow_schema, name.encode()))
-
-    def get_schema_capsule(self):
-        """
-        Internal method for getting a PyCapsule pointer to the schema.
-        """
-        cdef ArrowSchema *schema
-        schema = <ArrowSchema*> cpython.PyMem_Malloc(sizeof(ArrowSchema))
-        try:
-            _check_nanoarrow(ArrowSchemaDeepCopy(self.arrow_schema, schema))
-        except:
-            cpython.PyMem_Free(schema)
-            raise
-        return cpython.PyCapsule_New(
-            schema, 'arrow_schema', &pycapsule_schema_deleter
-        )
-
-cdef void pycapsule_schema_deleter(object schema_capsule) noexcept:
-    """
-    Called when the PyCapsule pointer is no longer required and performs the
-    necessary cleanup.
-    """
-    cdef ArrowSchema* schema
-    schema = <ArrowSchema*> cpython.PyCapsule_GetPointer(
-        schema_capsule, "arrow_schema"
-    )
-    if schema.release != NULL:
-        ArrowSchemaRelease(schema)
-    cpython.PyMem_Free(schema)
diff --git a/src/oracledb/impl/arrow/utils.pyx b/src/oracledb/impl/arrow/utils.pyx
deleted file mode 100644
index bd428b28..00000000
--- a/src/oracledb/impl/arrow/utils.pyx
+++ /dev/null
@@ -1,342 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# utils.pyx
-#
-# Contains utilities and definitions used by the other files in this module.
-#------------------------------------------------------------------------------
-
-cdef extern from "nanoarrow.c":
-
-    ctypedef int ArrowErrorCode
-
-    ctypedef void (*ArrowBufferDeallocatorCallback)
-
-    cdef struct ArrowArrayStream:
-        int (*get_schema)(ArrowArrayStream *, ArrowSchema * out)
-        int (*get_next)(ArrowArrayStream * stream, ArrowArray * out)
-        void (*release)(ArrowArrayStream*)
-
-    cdef struct ArrowBufferAllocator:
-        void *private_data
-
-    cdef struct ArrowBuffer:
-        uint8_t *data
-        int64_t size_bytes
-        ArrowBufferAllocator allocator
-
-    cdef union ArrowBufferViewData:
-        const void* data
-
-    cdef struct ArrowBufferView:
-        ArrowBufferViewData data
-        int64_t size_bytes
-
-    cdef struct ArrowBitmap:
-        ArrowBuffer buffer
-
-    cdef struct ArrowArrayView:
-        ArrowBufferView *buffer_views
-
-    cdef struct ArrowDecimal:
-        pass
-
-    cdef struct ArrowError:
-        pass
-
-    cdef struct ArrowSchemaView:
-        ArrowType type
-        ArrowType storage_type
-        int32_t fixed_size
-        int32_t decimal_precision
-        int32_t decimal_scale
-        ArrowTimeUnit time_unit
-
-    cdef struct ArrowStringView:
-        const char* data
-        int64_t size_bytes
-
-    cdef ArrowErrorCode NANOARROW_OK
-
-    ArrowErrorCode ArrowArrayAllocateChildren(ArrowArray* arrow_array,
-                                              int64_t n_children)
-    ArrowErrorCode ArrowArrayAppendBytes(ArrowArray* arrow_array,
-                                         ArrowBufferView value)
-    ArrowErrorCode ArrowArrayAppendDecimal(ArrowArray* arrow_array,
-                                           const ArrowDecimal* value)
-    ArrowErrorCode ArrowArrayAppendDouble(ArrowArray* arrow_array,
-                                          double value)
-    ArrowErrorCode ArrowArrayAppendInt(ArrowArray* arrow_array, int64_t value)
-    ArrowErrorCode ArrowArrayAppendNull(ArrowArray* arrow_array, int64_t n)
-    ArrowErrorCode ArrowArrayAppendUInt(ArrowArray * arrow_array, uint64_t n)
-    ArrowBuffer* ArrowArrayBuffer(ArrowArray* arrow_array, int64_t i)
-    ArrowErrorCode ArrowArrayFinishBuildingDefault(ArrowArray* arrow_array,
-                                                   ArrowError* error)
-    ArrowErrorCode ArrowArrayFinishElement(ArrowArray* arrow_array)
-    ArrowErrorCode ArrowArrayInitFromSchema(ArrowArray* arrow_array,
-                                            ArrowSchema *schema,
-                                            ArrowError *error)
-    ArrowErrorCode ArrowArrayInitFromType(ArrowArray* arrow_array,
-                                          ArrowType storage_type)
-    void ArrowArrayMove(ArrowArray* src, ArrowArray* dst)
-    void ArrowArrayRelease(ArrowArray* arrow_array)
-    ArrowErrorCode ArrowArrayReserve(ArrowArray* arrow_array,
-                                     int64_t additional_size_elements)
-    ArrowErrorCode ArrowArrayStartAppending(ArrowArray* arrow_array)
-    void ArrowArrayStreamRelease(ArrowArrayStream *array_stream)
-    ArrowBitmap* ArrowArrayValidityBitmap(ArrowArray* arrow_array)
-    ArrowErrorCode ArrowArrayViewInitFromArray(ArrowArrayView* array_view,
-                                               ArrowArray* arrow_array)
-    ArrowErrorCode ArrowBasicArrayStreamInit(ArrowArrayStream* array_stream,
-                                             ArrowSchema* schema,
-                                             int64_t n_arrays)
-    void ArrowBasicArrayStreamSetArray(ArrowArrayStream* array_stream,
-                                       int64_t i, ArrowArray* arrow_array)
-    int8_t ArrowBitGet(const uint8_t* bits, int64_t i)
-    ArrowBufferAllocator ArrowBufferDeallocator(ArrowBufferDeallocatorCallback,
-                                                void *private_data)
-    void ArrowBufferInit(ArrowBuffer* buffer)
-    void ArrowBufferReset(ArrowBuffer* buffer)
-    ArrowErrorCode ArrowDecimalAppendStringToBuffer(const ArrowDecimal* decimal,
-                                                    ArrowBuffer* buffer)
-    void ArrowDecimalInit(ArrowDecimal* decimal, int32_t bitwidth,
-                          int32_t precision, int32_t scale)
-    void ArrowDecimalSetBytes(ArrowDecimal *decimal, const uint8_t* value)
-    ArrowErrorCode ArrowDecimalSetDigits(ArrowDecimal* decimal,
-                                         ArrowStringView value)
-    ArrowErrorCode ArrowSchemaAllocateChildren(ArrowSchema* schema,
-                                               int64_t n_children)
-    ArrowErrorCode ArrowSchemaDeepCopy(const ArrowSchema *schema,
-                                       ArrowSchema *schema_out)
-    void ArrowSchemaInit(ArrowSchema* schema)
-    ArrowErrorCode ArrowSchemaInitFromType(ArrowSchema* schema, ArrowType type)
-    void ArrowSchemaMove(ArrowSchema* src, ArrowSchema* dst)
-    void ArrowSchemaRelease(ArrowSchema *schema)
-    ArrowErrorCode ArrowSchemaSetName(ArrowSchema* schema, const char* name)
-    ArrowErrorCode ArrowSchemaSetType(ArrowSchema * schema, ArrowType type)
-    ArrowErrorCode ArrowSchemaSetTypeDateTime(ArrowSchema* schema,
-                                              ArrowType arrow_type,
-                                              ArrowTimeUnit time_unit,
-                                              const char* timezone)
-    ArrowErrorCode ArrowSchemaSetTypeStruct(ArrowSchema *schema,
-                                            int64_t n_children)
-    ArrowErrorCode ArrowSchemaSetTypeDecimal(ArrowSchema* schema,
-                                             ArrowType type,
-                                             int32_t decimal_precision,
-                                             int32_t decimal_scale)
-    int64_t ArrowSchemaToString(const ArrowSchema* schema, char* out,
-                                int64_t n, char recursive)
-    ArrowErrorCode ArrowSchemaViewInit(ArrowSchemaView* schema_view,
-                                       const ArrowSchema* schema,
-                                       ArrowError* error)
-    const char* ArrowTypeString(ArrowType type)
-
-cdef int _check_nanoarrow(int code) except -1:
-    """
-    Checks the return code of the nanoarrow function and raises an exception if
-    it is not NANOARROW_OK.
-    """
-    if code != NANOARROW_OK:
-        if code == EOVERFLOW:
-            errors._raise_err(errors.ERR_ARROW_DATA_STRUCTURE_OVERFLOW)
-        errors._raise_err(errors.ERR_ARROW_C_API_ERROR, code=code)
-
-
-
-cdef int append_double_array(ArrowArray *arrow_array,
-                             array.array value) except -1:
-    """
-    Appends an array of doubles to the Arrow array.
-    """
-    cdef:
-        ArrowArray *child_array = arrow_array.children[0]
-        double *double_buf = value.data.as_doubles
-        Py_ssize_t i
-    for i in range(len(value)):
-        _check_nanoarrow(ArrowArrayAppendDouble(child_array, double_buf[i]))
-    _check_nanoarrow(ArrowArrayFinishElement(arrow_array))
-
-
-cdef int append_float_array(ArrowArray *arrow_array,
-                            array.array value) except -1:
-    """
-    Appends an array of floats to the Arrow array.
-    """
-    cdef:
-        ArrowArray *child_array = arrow_array.children[0]
-        float *float_buf = value.data.as_floats
-        Py_ssize_t i
-    for i in range(len(value)):
-        _check_nanoarrow(ArrowArrayAppendDouble(child_array, float_buf[i]))
-    _check_nanoarrow(ArrowArrayFinishElement(arrow_array))
-
-
-cdef int append_int8_array(ArrowArray *arrow_array,
-                           array.array value) except -1:
-    """
-    Appends an array of signed one-byte integers to the Arrow array.
-    """
-    cdef:
-        ArrowArray *child_array = arrow_array.children[0]
-        int8_t *int8_buf = value.data.as_schars
-        Py_ssize_t i
-    for i in range(len(value)):
-        _check_nanoarrow(ArrowArrayAppendInt(child_array, int8_buf[i]))
-    _check_nanoarrow(ArrowArrayFinishElement(arrow_array))
-
-
-cdef int append_uint8_array(ArrowArray *arrow_array,
-                            array.array value) except -1:
-    """
-    Appends an array of unsigned one-byte integers to the Arrow array.
-    """
-    cdef:
-        ArrowArray *child_array = arrow_array.children[0]
-        uint8_t *uint8_buf = value.data.as_uchars
-        Py_ssize_t i
-    for i in range(len(value)):
-        _check_nanoarrow(ArrowArrayAppendInt(child_array, uint8_buf[i]))
-    _check_nanoarrow(ArrowArrayFinishElement(arrow_array))
-
-
-cdef int append_uint32_array(ArrowArray *arrow_array,
-                             array.array value) except -1:
-    """
-    Appends an array of unsigned four-byte integers to the Arrow array. Note
-    that Python's array.array doesn't natively support uint32_t but an upper
-    layer has verified that the data in the buffer consists of only four byte
-    integers.
-    """
-    cdef:
-        uint32_t *uint32_buf = <uint32_t*> value.data.as_voidptr
-        ArrowArray *child_array = arrow_array.children[0]
-        Py_ssize_t i
-    for i in range(len(value)):
-        _check_nanoarrow(ArrowArrayAppendInt(child_array, uint32_buf[i]))
-    _check_nanoarrow(ArrowArrayFinishElement(arrow_array))
-
-
-cdef void arrow_buffer_dealloc_callback(ArrowBufferAllocator *allocator,
-                                        uint8_t *ptr,
-                                        int64_t size) noexcept with gil:
-    """
-    ArrowBufferDeallocatorCallback for an ArrowBuffer borrowed from an Arrow
-    array.
-    """
-    cpython.Py_DECREF(<ArrowArrayImpl> allocator.private_data)
-
-
-cdef int copy_arrow_array(ArrowArrayImpl array_impl,
-                          ArrowArray *src, ArrowArray *dest) except -1:
-    """
-    Shallow copy source ArrowArray to destination ArrowArray. The source
-    ArrowArray belongs to the wrapper ArrowArrayImpl. The shallow copy idea
-    is borrowed from nanoarrow:
-    https://github.com/apache/arrow-nanoarrow/main/blob/python
-    """
-    cdef:
-        ArrowBuffer *dest_buffer
-        ArrowBuffer *src_buffer
-        ssize_t i
-    _check_nanoarrow(
-        ArrowArrayInitFromType(
-            dest, NANOARROW_TYPE_UNINITIALIZED
-        )
-    )
-
-    # Copy metadata
-    dest.length = src.length
-    dest.offset = src.offset
-    dest.null_count = src.null_count
-
-    # Borrow an ArrowBuffer belonging to ArrowArrayImpl. The ArrowBuffer can
-    # belong to an immediate ArrowArray or a child (in case of nested types).
-    # Either way, we PY_INCREF(array_impl), so that it is not
-    # prematurely garbage collected. The corresponding PY_DECREF happens in the
-    # ArrowBufferDeAllocator callback.
-    for i in range(src.n_buffers):
-        if src.buffers[i] != NULL:
-            dest_buffer = ArrowArrayBuffer(dest, i)
-            src_buffer = ArrowArrayBuffer(src, i)
-            dest_buffer.data = src_buffer.data
-            dest_buffer.size_bytes = src_buffer.size_bytes
-            dest_buffer.allocator = ArrowBufferDeallocator(
-                <ArrowBufferDeallocatorCallback> arrow_buffer_dealloc_callback,
-                <void *> array_impl
-            )
-            cpython.Py_INCREF(array_impl)
-        dest.buffers[i] = src.buffers[i]
-    dest.n_buffers = src.n_buffers
-
-    # shallow copy of children (recursive call)
-    if src.n_children > 0:
-        _check_nanoarrow(ArrowArrayAllocateChildren(dest, src.n_children))
-        for i in range(src.n_children):
-            copy_arrow_array(array_impl, src.children[i], dest.children[i])
-
-
-cdef int build_arrow_schema_for_sparse_vector(
-    ArrowSchema *schema,
-    ArrowType vector_value_type
-) except -1:
-
-    # Initialize struct with 3 fields - num_dimensions, indices, values
-    ArrowSchemaInit(schema)
-    _check_nanoarrow(ArrowSchemaSetTypeStruct(schema, 3))
-
-    # first child: "num_dimensions"
-    _check_nanoarrow(
-        ArrowSchemaSetType(schema.children[0], NANOARROW_TYPE_INT64)
-    )
-    _check_nanoarrow(ArrowSchemaSetName(schema.children[0], "num_dimensions"))
-
-    # second child: "indices"
-    _check_nanoarrow(ArrowSchemaSetType(
-            schema.children[1],
-            NANOARROW_TYPE_LIST
-        )
-    )
-    _check_nanoarrow(
-        ArrowSchemaSetType(
-            schema.children[1].children[0],
-            NANOARROW_TYPE_UINT32
-        )
-    )
-    _check_nanoarrow(ArrowSchemaSetName(schema.children[1], "indices"))
-
-    # third child: "values"
-    _check_nanoarrow(
-        ArrowSchemaSetType(
-            schema.children[2],
-            NANOARROW_TYPE_LIST
-        )
-    )
-    _check_nanoarrow(
-        ArrowSchemaSetType(
-            schema.children[2].children[0],
-            vector_value_type
-        )
-    )
-    _check_nanoarrow(ArrowSchemaSetName(schema.children[2], "values"))
diff --git a/src/oracledb/impl/base/batch_load_manager.pyx b/src/oracledb/impl/base/batch_load_manager.pyx
deleted file mode 100644
index 39033730..00000000
--- a/src/oracledb/impl/base/batch_load_manager.pyx
+++ /dev/null
@@ -1,388 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# batch_load_manager.pyx
-#
-# Cython file defining the BatchLoadManager implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BatchLoadManager:
-
-    cdef int _calculate_num_rows_in_batch(self, uint64_t total_rows) except -1:
-        """
-        Calculates the total number of rows to put in the next batch.
-        """
-        cdef uint64_t rows_remaining = total_rows - self.offset
-        self.num_rows = <uint32_t> min(rows_remaining, self.batch_size)
-
-    @staticmethod
-    cdef BatchLoadManager _create(object parameters, uint32_t batch_size,
-                                  int error_num):
-        """
-        Creates a batch manager from the parameters and batch size.
-        """
-        cdef DataFrameImpl df_impl
-
-        # batch size must be a positive integer
-        if batch_size == 0:
-            raise TypeError("batch_size must be a positive integer")
-
-        # if parameters are an int, the value refers to the number of times to
-        # execute the statement
-        if isinstance(parameters, int):
-            return PrePopulatedBatchLoadManager.create(parameters)
-
-        # if parameters are a list, the value refers to the actual data that is
-        # to be loaded
-        elif isinstance(parameters, list):
-            return FullDataBatchLoadManager.create(parameters)
-
-        # if parameters are an Oracle dataframe we can use it directly
-        elif isinstance(parameters, PY_TYPE_DATAFRAME):
-            return DataFrameBatchLoadManager.create(parameters._impl)
-
-        # if parameters implement the Arrow PyCapsule stream interface, convert
-        # it to an Oracle dataframe for further processing
-        elif hasattr(parameters, "__arrow_c_stream__"):
-            df_impl = DataFrameImpl.from_arrow_stream(parameters)
-            return DataFrameBatchLoadManager.create(df_impl)
-
-        # the parameters are of an unknown type
-        errors._raise_err(error_num)
-
-    cdef list _get_all_rows(self):
-        """
-        Returns the set of rows associated with the batch load manager, if
-        applicable.
-        """
-        pass
-
-    cdef list _get_arrow_arrays(self):
-        """
-        Returns the Arrow arrays containing the data for the current batch.
-        """
-        pass
-
-    cdef int _next_batch(self) except -1:
-        """
-        Goes to the next batch in the set of data, if applicable.
-        """
-        raise NotImplementedError()
-
-    cdef int _setup_cursor(self) except -1:
-        """
-        Called after the manager has been populated and helps set up the cursor
-        if one is being used.
-        """
-        pass
-
-    cdef int _verify_metadata(self, list column_metadata) except -1:
-        """
-        Called after the manager has been populated and helps verify the column
-        metadata is consistent with the data being loaded.
-        """
-        pass
-
-    @staticmethod
-    cdef BatchLoadManager create_for_direct_path_load(
-        object parameters,
-        list column_metadata,
-        uint32_t batch_size,
-    ):
-        """
-        Creates a batch load manager object for calling conn.direct_path_load()
-        with the given parameters. This allows splitting large source arrays
-        into multiple chunks and also supports data frames with multiple
-        chunks.
-        """
-        cdef BatchLoadManager manager
-        manager = BatchLoadManager._create(
-            parameters,
-            batch_size,
-            errors.ERR_WRONG_DIRECT_PATH_DATA_TYPE,
-        )
-        manager.batch_size = batch_size
-        manager._verify_metadata(column_metadata)
-        manager._next_batch()
-        return manager
-
-    @staticmethod
-    cdef BatchLoadManager create_for_executemany(
-        object cursor,
-        BaseCursorImpl cursor_impl,
-        object parameters,
-        uint32_t batch_size,
-    ):
-        """
-        Creates a batch load manager object for calling cursor.executemany()
-        with the given parameters. This allows splitting large source arrays
-        into multiple chunks and also supports data frames with multiple
-        chunks.
-        """
-        cdef BatchLoadManager manager
-
-        # create and populate manager object
-        manager = BatchLoadManager._create(
-            parameters,
-            batch_size,
-            errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE,
-        )
-        manager.cursor_impl = cursor_impl
-        manager.cursor = cursor
-        manager.conn = cursor.connection
-        manager.batch_size = batch_size
-        manager._setup_cursor()
-
-        # setup for first batch
-        manager._next_batch()
-
-        return manager
-
-    def next_batch(self):
-        """
-        Goes to the next batch in the set of data, if applicable.
-        """
-        self.offset += self.num_rows
-        self._next_batch()
-
-
-@cython.final
-cdef class DataFrameBatchLoadManager(BatchLoadManager):
-    cdef:
-        DataFrameImpl df_impl
-        ssize_t num_chunks
-        ssize_t chunk_index
-        ssize_t chunk_num
-        ssize_t num_cols
-        int64_t chunk_length
-        uint64_t num_rows_in_chunk
-
-    cdef int _calculate_num_rows_in_chunk(self) except -1:
-        """
-        Calculates the number of rows in the chunk and stores it for future
-        use.
-        """
-        cdef:
-            ArrowArrayImpl array_impl
-            int64_t num_rows
-        array_impl = self.df_impl.arrays[self.chunk_index]
-        array_impl.get_length(&num_rows)
-        self.num_rows_in_chunk = <uint64_t> num_rows
-
-    cdef list _get_arrow_arrays(self):
-        """
-        Returns the Arrow arrays containing the data for the current batch.
-        """
-        cdef list arrays = self.df_impl.arrays
-        return arrays[self.chunk_index:self.chunk_index + self.num_cols]
-
-    cdef int _next_batch(self) except -1:
-        """
-        Goes to the next batch of data.
-        """
-        cdef:
-            ssize_t array_index, num_cols
-            ArrowArrayImpl array_impl
-            BindVar bind_var
-            ssize_t i
-        self.message_offset = self.offset
-        self._calculate_num_rows_in_batch(self.num_rows_in_chunk)
-        if self.num_rows == 0:
-            self._next_chunk()
-        if self.num_rows > 0 and self.cursor_impl is not None:
-            for i, bind_var in enumerate(self.cursor_impl.bind_vars):
-                array_impl = self.df_impl.arrays[self.chunk_index + i]
-                bind_var.var_impl._arrow_array = array_impl
-                bind_var.var_impl._on_reset_bind(self.offset, self.num_rows)
-
-    cdef int _next_chunk(self) except -1:
-        """
-        Goes to the next chunk in the list of chunks for the dataframe.
-        """
-        while self.chunk_num + 1 < self.num_chunks:
-            self.offset = 0
-            self.message_offset = 0
-            self.chunk_num += 1
-            self.chunk_index += self.num_cols
-            self._calculate_num_rows_in_chunk()
-            self._calculate_num_rows_in_batch(self.num_rows_in_chunk)
-            if self.num_rows > 0:
-                break
-
-    cdef int _setup_cursor(self) except -1:
-        """
-        Called after the manager has been populated and helps set up the cursor
-        if one is being used.
-        """
-        cdef:
-            ArrowSchemaImpl schema_impl
-            BaseVarImpl var_impl
-            BindVar bind_var
-            ssize_t i
-        self.cursor_impl.bind_vars = []
-        for i, schema_impl in enumerate(self.df_impl.schema_impls):
-            bind_var = BindVar.__new__(BindVar)
-            bind_var.pos = i + 1
-            var_impl = self.cursor_impl._create_var_impl(self.conn)
-            var_impl.metadata = OracleMetadata.from_arrow_schema(schema_impl)
-            bind_var.var_impl = var_impl
-            self.cursor_impl.bind_vars.append(bind_var)
-
-    cdef int _verify_metadata(self, list column_metadata) except -1:
-        """
-        Called after the manager has been populated and helps verify the column
-        metadata is consistent with the data being loaded.
-        """
-        cdef:
-            ArrowSchemaImpl schema_impl
-            OracleMetadata metadata
-        if len(column_metadata) != len(self.df_impl.schema_impls):
-            errors._raise_err(
-                errors.ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS,
-                expected_num=len(column_metadata),
-                actual_num=len(self.df_impl.schema_impls)
-            )
-        if self.num_chunks > 0:
-            for metadata, schema_impl in \
-                    zip(column_metadata, self.df_impl.schema_impls):
-                metadata._set_arrow_schema(schema_impl)
-
-    @staticmethod
-    cdef BatchLoadManager create(DataFrameImpl df_impl):
-        """
-        Creates a batch load manager given a dataframe.
-        """
-        cdef DataFrameBatchLoadManager m
-        m = DataFrameBatchLoadManager.__new__(DataFrameBatchLoadManager)
-        m.df_impl = df_impl
-        m.num_cols = len(df_impl.schema_impls)
-        m.num_chunks = len(df_impl.arrays) // m.num_cols
-        if m.num_chunks > 0:
-            m._calculate_num_rows_in_chunk()
-        return m
-
-
-@cython.final
-cdef class FullDataBatchLoadManager(BatchLoadManager):
-    cdef:
-        list all_rows
-        uint64_t total_num_rows
-        object type_handler
-
-    cdef list _get_all_rows(self):
-        """
-        Returns the set of rows associated with the batch load manager, if
-        applicable.
-        """
-        return self.all_rows
-
-    cdef int _next_batch(self) except -1:
-        """
-        Goes to the next batch of data.
-        """
-        cdef:
-            bint defer_type_assignment = (self.offset == 0)
-            object row
-            ssize_t i
-        self._calculate_num_rows_in_batch(self.total_num_rows)
-        if self.cursor_impl is not None:
-            self.cursor_impl._reset_bind_vars(self.offset, self.num_rows)
-            for i in range(self.num_rows):
-                if i == self.num_rows - 1:
-                    defer_type_assignment = False
-                row = self.all_rows[self.offset + i]
-                self.cursor_impl._bind_values(self.cursor, self.type_handler,
-                                              row, self.num_rows, i,
-                                              defer_type_assignment)
-
-    cdef int _setup_cursor(self) except -1:
-        """
-        Called after the manager has been populated and helps set up the cursor
-        if one is being used.
-        """
-        self.type_handler = self.cursor_impl._get_input_type_handler()
-
-    cdef int _verify_metadata(self, list column_metadata) except -1:
-        """
-        Called after the manager has been populated and helps verify the column
-        metadata is consistent with the data being loaded.
-        """
-        cdef:
-            ssize_t num_columns
-            object row
-        num_columns = len(column_metadata)
-        for row in self.all_rows:
-            if len(row) != num_columns:
-                errors._raise_err(
-                    errors.ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS,
-                    expected_num=num_columns,
-                    actual_num=len(row)
-                )
-
-    @staticmethod
-    cdef BatchLoadManager create(list all_rows):
-        """
-        Creates a batch load manager given a list of rows.
-        """
-        cdef FullDataBatchLoadManager m
-        m = FullDataBatchLoadManager.__new__(FullDataBatchLoadManager)
-        m.all_rows = all_rows
-        m.total_num_rows = <uint64_t> len(all_rows)
-        return m
-
-
-@cython.final
-cdef class PrePopulatedBatchLoadManager(BatchLoadManager):
-    cdef:
-        uint64_t total_num_rows
-
-    cdef int _next_batch(self) except -1:
-        """
-        Goes to the next batch in the set of data, if applicable.
-        """
-        cdef:
-            BaseVarImpl var_impl
-            BindVar bind_var
-        self._calculate_num_rows_in_batch(self.total_num_rows)
-        if self.cursor_impl.bind_vars is not None:
-            for bind_var in self.cursor_impl.bind_vars:
-                if bind_var is None or bind_var.var_impl is None:
-                    continue
-                var_impl = bind_var.var_impl
-                if var_impl.num_elements < self.num_rows:
-                    errors._raise_err(errors.ERR_INCORRECT_VAR_ARRAYSIZE,
-                                      var_arraysize=var_impl.num_elements,
-                                      required_arraysize=self.num_rows)
-
-    @staticmethod
-    cdef BatchLoadManager create(uint64_t total_num_rows):
-        """
-        Creates a batch load manager given the number of pre-populated rows.
-        """
-        cdef PrePopulatedBatchLoadManager m
-        m = PrePopulatedBatchLoadManager.__new__(PrePopulatedBatchLoadManager)
-        m.total_num_rows = total_num_rows
-        return m
diff --git a/src/oracledb/impl/base/bind_var.pyx b/src/oracledb/impl/base/bind_var.pyx
deleted file mode 100644
index a3896255..00000000
--- a/src/oracledb/impl/base/bind_var.pyx
+++ /dev/null
@@ -1,177 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# bind_var.pyx
-#
-# Cython file defining the BindVar implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.freelist(20)
-cdef class BindVar:
-
-    cdef int _create_var_from_type(self, object conn,
-                                   BaseCursorImpl cursor_impl,
-                                   object value) except -1:
-        """
-        Creates a variable given type information. This may be supplied as a
-        list of size 2 (type, num_elements) which internally creates an array
-        variable, or as an integer which internally creates a string of the
-        given length, or as a database type, API type or Python type.
-        """
-        cdef BaseVarImpl var_impl
-        var_impl = cursor_impl._create_var_impl(conn)
-        var_impl.num_elements = 1
-        if isinstance(value, list):
-            if len(value) != 2:
-                errors._raise_err(errors.ERR_WRONG_ARRAY_DEFINITION)
-            var_impl._set_metadata_from_type(value[0])
-            var_impl.num_elements = value[1]
-            var_impl.is_array = True
-        elif isinstance(value, int):
-            var_impl._set_metadata_from_type(str)
-            var_impl.metadata.max_size = value
-        else:
-            var_impl._set_metadata_from_type(value)
-        var_impl._finalize_init()
-        self.var_impl = var_impl
-        if isinstance(value, PY_TYPE_DB_OBJECT_TYPE):
-            self.var = PY_TYPE_VAR._from_impl(self.var_impl, value)
-
-    cdef int _create_var_from_value(self, object conn,
-                                    BaseCursorImpl cursor_impl, object value,
-                                    uint32_t num_elements) except -1:
-        """
-        Creates a variable using the value as a template.
-        """
-        cdef:
-            bint is_plsql = cursor_impl._is_plsql()
-            OracleMetadata metadata
-            BaseVarImpl var_impl
-        var_impl = cursor_impl._create_var_impl(conn)
-        if not isinstance(value, list):
-            var_impl.num_elements = num_elements
-            var_impl._set_metadata_from_value(value, is_plsql)
-        else:
-            var_impl.is_array = True
-            var_impl.num_elements = max(num_elements, len(value))
-            for element in value:
-                if element is not None:
-                    var_impl._set_metadata_from_value(element, is_plsql)
-            if var_impl.metadata is None:
-                metadata = OracleMetadata.__new__(OracleMetadata)
-                metadata.dbtype = DB_TYPE_VARCHAR
-                metadata.max_size = 1
-                var_impl.metadata = metadata
-        var_impl._finalize_init()
-        self.var_impl = var_impl
-
-    cdef int _set_by_type(self, object conn, BaseCursorImpl cursor_impl,
-                          object typ) except -1:
-        """
-        Sets the bind variable information given a type.
-        """
-        if typ is not None:
-            if isinstance(typ, PY_TYPE_VAR):
-                self.var = typ
-                self.var_impl = typ._impl
-                if self.var_impl._has_returned_data:
-                    self.var_impl._finalize_init()
-            else:
-                self._create_var_from_type(conn, cursor_impl, typ)
-
-    cdef int _set_by_value(self, object conn, BaseCursorImpl cursor_impl,
-                           object cursor, object value, object type_handler,
-                           uint32_t row_num, uint32_t num_elements,
-                           bint defer_type_assignment) except -1:
-        """
-        Sets the bind variable information given a value. The row number
-        supplied is used as the offset into the variable value array. Type
-        assignment is deferred for None values if specified. Once a value that
-        is not None is set, an exception is raised for any non-compliant values
-        that are seen after that.
-        """
-        cdef:
-            bint was_set = True
-            object var
-
-        # a variable can be set directly in which case nothing further needs to
-        # be done!
-        if isinstance(value, PY_TYPE_VAR):
-            if value is not self.var:
-                self.var = value
-                self.var_impl = value._impl
-                if self.var_impl._has_returned_data:
-                    self.var_impl._finalize_init()
-            return 0
-
-        # if a variable already exists check to see if the value can be set on
-        # that variable; an exception is raised if a value has been previously
-        # set on that bind variable; otherwise, the variable is replaced with a
-        # new one
-        if self.var_impl is not None:
-            if self.has_value:
-                return self.var_impl._check_and_set_value(row_num, value, NULL)
-            self.var_impl._check_and_set_value(row_num, value, &was_set)
-            if was_set:
-                self.has_value = True
-                return 0
-            self.var_impl = None
-            self.var = None
-
-        # a new variable needs to be created; if the value is null (None),
-        # however, and type assignment is deferred, nothing to do!
-        if value is None and defer_type_assignment:
-            return 0
-
-        # if an input type handler is specified, call it; the input type
-        # handler should return a variable or None; the value None implies
-        # that the default processing should take place just as if no input
-        # type handler was defined
-        if type_handler is not None:
-            var = type_handler(cursor, value, num_elements)
-            if var is not None:
-                if not isinstance(var, PY_TYPE_VAR):
-                    errors._raise_err(errors.ERR_EXPECTING_VAR)
-                self.var = var
-                self.var_impl = var._impl
-                self.var_impl._check_and_set_value(row_num, value, NULL)
-                self.has_value = True
-                return 0
-
-        # otherwise, if no type handler exists or the type handler returned
-        # the value None, create a new variable deriving type information
-        # from the value that is being set
-        self._create_var_from_value(conn, cursor_impl, value, num_elements)
-        self.var_impl._check_and_set_value(row_num, value, NULL)
-        self.has_value = True
-
-    def get_value(self, uint32_t pos):
-        """
-        Internal method for getting the value of a variable at a given
-        position.
-        """
-        if self.var_impl is not None:
-            return self.var_impl.get_value(pos)
diff --git a/src/oracledb/impl/base/buffer.pyx b/src/oracledb/impl/base/buffer.pyx
deleted file mode 100644
index dd72f900..00000000
--- a/src/oracledb/impl/base/buffer.pyx
+++ /dev/null
@@ -1,758 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# buffer.pyx
-#
-# Cython file defining the low-level read and write methods for packed data.
-#------------------------------------------------------------------------------
-
-cdef enum:
-    NUMBER_AS_TEXT_CHARS = 172
-    NUMBER_MAX_DIGITS = 40
-
-cdef class Buffer:
-
-    cdef int _get_int_length_and_sign(self, uint8_t *length,
-                                      bint *is_negative,
-                                      uint8_t max_length) except -1:
-        """
-        Returns the length of an integer stored in the buffer. A check is also
-        made to ensure the integer does not exceed the maximum length. If the
-        is_negative pointer is NULL, negative integers will result in an
-        exception being raised.
-        """
-        cdef const char_type *ptr = self._get_raw(1)
-        if ptr[0] & 0x80:
-            if is_negative == NULL:
-                errors._raise_err(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER)
-            is_negative[0] = True
-            length[0] = ptr[0] & 0x7f
-        else:
-            if is_negative != NULL:
-                is_negative[0] = False
-            length[0] = ptr[0]
-        if length[0] > max_length:
-            errors._raise_err(errors.ERR_INTEGER_TOO_LARGE, length=length[0],
-                              max_length=max_length)
-
-    cdef const char_type* _get_raw(self, ssize_t num_bytes) except NULL:
-        """
-        Returns a pointer to a buffer containing the requested number of bytes.
-        """
-        cdef:
-            ssize_t num_bytes_left
-            const char_type *ptr
-        num_bytes_left = self._size - self._pos
-        if num_bytes > num_bytes_left:
-            errors._raise_err(errors.ERR_UNEXPECTED_END_OF_DATA,
-                              num_bytes_wanted=num_bytes,
-                              num_bytes_available=num_bytes_left)
-        ptr = &self._data[self._pos]
-        self._pos += num_bytes
-        return ptr
-
-    cdef int _initialize(self, ssize_t max_size = TNS_CHUNK_SIZE) except -1:
-        """
-        Initialize the buffer with an empty bytearray of the specified size.
-        """
-        self._max_size = max_size
-        self._data_obj = bytearray(max_size)
-        self._data_view = self._data_obj
-        self._data = <char_type*> self._data_obj
-
-    cdef int _populate_from_bytes(self, bytes data) except -1:
-        """
-        Initialize the buffer with the data in the specified byte string.
-        """
-        self._max_size = self._size = len(data)
-        self._data_obj = bytearray(data)
-        self._data_view = self._data_obj
-        self._data = <char_type*> self._data_obj
-
-    cdef int _read_raw_bytes_and_length(self, const char_type **ptr,
-                                        ssize_t *num_bytes) except -1:
-        """
-        Helper function that processes the length (if needed) and then acquires
-        the specified number of bytes from the buffer. The base function simply
-        uses the length as given.
-        """
-        ptr[0] = self._get_raw(num_bytes[0])
-
-    cdef int _resize(self, ssize_t new_max_size) except -1:
-        """
-        Resizes the buffer to the new maximum size, copying the data already
-        stored in the buffer first.
-        """
-        cdef:
-            bytearray data_obj
-            char_type* data
-        data_obj = bytearray(new_max_size)
-        data = <char_type*> data_obj
-        memcpy(data, self._data, self._max_size)
-        self._max_size = new_max_size
-        self._data_obj = data_obj
-        self._data_view = data_obj
-        self._data = data
-
-    cdef int _skip_int(self, uint8_t max_length, bint *is_negative) except -1:
-        """
-        Skips reading an integer of the specified maximum length from the
-        buffer.
-        """
-        cdef uint8_t length
-        self._get_int_length_and_sign(&length, is_negative, max_length)
-        self.skip_raw_bytes(length)
-
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1:
-        """
-        Called when the amount of buffer available is less than the amount of
-        data requested. By default an error is raised.
-        """
-        errors._raise_err(errors.ERR_BUFFER_LENGTH_INSUFFICIENT,
-                          required_buffer_len=num_bytes_wanted,
-                          actual_buffer_len=num_bytes_available)
-
-    cdef int _write_raw_bytes_and_length(self, const char_type *ptr,
-                                         ssize_t num_bytes) except -1:
-        """
-        Helper function that writes the length in the format required before
-        writing the bytes.
-        """
-        cdef ssize_t chunk_len
-        if num_bytes <= TNS_MAX_SHORT_LENGTH:
-            self.write_uint8(<uint8_t> num_bytes)
-            if num_bytes > 0:
-                self.write_raw(ptr, num_bytes)
-        else:
-            self.write_uint8(TNS_LONG_LENGTH_INDICATOR)
-            while num_bytes > 0:
-                chunk_len = min(num_bytes, TNS_CHUNK_SIZE)
-                self.write_ub4(chunk_len)
-                num_bytes -= chunk_len
-                self.write_raw(ptr, chunk_len)
-                ptr += chunk_len
-            self.write_ub4(0)
-
-    cdef inline ssize_t bytes_left(self):
-        """
-        Return the number of bytes remaining in the buffer.
-        """
-        return self._size - self._pos
-
-    cdef object read_oracle_data(self, OracleMetadata metadata,
-                                 OracleData* data, bint from_dbobject,
-                                 bint decode_str):
-        """
-        Reads Oracle data of the given type from the buffer.
-        """
-        cdef:
-            const char *encoding_errors = NULL
-            bytes temp_bytes = None
-            uint8_t ora_type_num
-            const uint8_t* ptr
-            ssize_t num_bytes
-        self.read_raw_bytes_and_length(&ptr, &num_bytes)
-        data.is_null = (ptr == NULL)
-        if not data.is_null:
-            ora_type_num = metadata.dbtype._ora_type_num
-            if ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-                decode_binary_double(ptr, num_bytes, &data.buffer)
-            elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-                decode_binary_float(ptr, num_bytes, &data.buffer)
-            elif ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-                decode_bool(ptr, num_bytes, &data.buffer)
-            elif ora_type_num in (
-                ORA_TYPE_NUM_CHAR,
-                ORA_TYPE_NUM_LONG,
-                ORA_TYPE_NUM_LONG_RAW,
-                ORA_TYPE_NUM_RAW,
-                ORA_TYPE_NUM_VARCHAR,
-            ):
-                if decode_str and metadata.dbtype._csfrm == CS_FORM_NCHAR:
-                    temp_bytes = \
-                            ptr[:num_bytes].decode(ENCODING_UTF16,
-                                                   encoding_errors).encode()
-                    ptr = temp_bytes
-                    num_bytes = len(temp_bytes)
-                data.buffer.as_raw_bytes.ptr = ptr
-                data.buffer.as_raw_bytes.num_bytes = num_bytes
-                return temp_bytes
-            elif ora_type_num in (
-                ORA_TYPE_NUM_DATE,
-                ORA_TYPE_NUM_TIMESTAMP,
-                ORA_TYPE_NUM_TIMESTAMP_LTZ,
-                ORA_TYPE_NUM_TIMESTAMP_TZ,
-            ):
-                decode_date(ptr, num_bytes, &data.buffer)
-            elif ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-                decode_interval_ds(ptr, num_bytes, &data.buffer)
-            elif ora_type_num == ORA_TYPE_NUM_INTERVAL_YM:
-                decode_interval_ym(ptr, num_bytes, &data.buffer)
-            elif from_dbobject and ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-                data.buffer.as_integer = \
-                        <int32_t> decode_integer(ptr, num_bytes)
-            elif ora_type_num in (ORA_TYPE_NUM_NUMBER,
-                                  ORA_TYPE_NUM_BINARY_INTEGER):
-                decode_number(ptr, num_bytes, &data.buffer)
-            else:
-                errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                                  name=metadata.dbtype.name)
-
-    cdef object read_bytes(self):
-        """
-        Read bytes from the buffer and return the corresponding Python object
-        representing that value.
-        """
-        cdef:
-            const char_type *ptr
-            ssize_t num_bytes
-        self.read_raw_bytes_and_length(&ptr, &num_bytes)
-        if ptr != NULL:
-            return ptr[:num_bytes]
-
-    cdef object read_bytes_with_length(self):
-        """
-        Reads a length from the buffer and then, if the length is non-zero,
-        reads bytes from the buffer and returns it.
-        """
-        cdef uint32_t num_bytes
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            return self.read_bytes()
-
-    cdef int read_int32be(self, int32_t *value) except -1:
-        """
-        Read a signed 32-bit integer in big endian order from the buffer.
-        """
-        value[0] = <int32_t> decode_uint32be(self._get_raw(4))
-
-    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL:
-        """
-        Returns a pointer to a contiguous buffer containing the specified
-        number of bytes found in the buffer.
-        """
-        return self._get_raw(num_bytes)
-
-    cdef int read_raw_bytes_and_length(self, const char_type **ptr,
-                                       ssize_t *num_bytes) except -1:
-        """
-        Reads bytes from the buffer into a contiguous buffer. The first byte
-        read is the number of bytes to read.
-        """
-        cdef uint8_t length
-        self.read_ub1(&length)
-        if length == 0 or length == TNS_NULL_LENGTH_INDICATOR:
-            ptr[0] = NULL
-            num_bytes[0] = 0
-        else:
-            num_bytes[0] = length
-            self._read_raw_bytes_and_length(ptr, num_bytes)
-
-    cdef int read_sb1(self, int8_t *value) except -1:
-        """
-        Reads a signed 8-bit integer from the buffer.
-        """
-        cdef const char_type *ptr = self._get_raw(1)
-        value[0] = <int8_t> ptr[0]
-
-    cdef int read_sb2(self, int16_t *value) except -1:
-        """
-        Reads a signed 16-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            bint is_negative
-            uint8_t length
-        self._get_int_length_and_sign(&length, &is_negative, 2)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = <int16_t> decode_integer(ptr, length)
-            if is_negative:
-                value[0] = -value[0]
-
-    cdef int read_sb4(self, int32_t *value) except -1:
-        """
-        Reads a signed 32-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            bint is_negative
-            uint8_t length
-        self._get_int_length_and_sign(&length, &is_negative, 4)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = <int32_t> decode_integer(ptr, length)
-            if is_negative:
-                value[0] = -value[0]
-
-    cdef int read_sb8(self, int64_t *value) except -1:
-        """
-        Reads a signed 64-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            bint is_negative
-            uint8_t length
-        self._get_int_length_and_sign(&length, &is_negative, 8)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = decode_integer(ptr, length)
-            if is_negative:
-                value[0] = -value[0]
-
-    cdef bytes read_null_terminated_bytes(self):
-        """
-        Reads null-terminated bytes from the buffer (including the null
-        terminator). It is assumed that the buffer contains the full amount. If
-        it does not, the remainder of the buffer is returned instead.
-        """
-        cdef ssize_t start_pos = self._pos, end_pos = self._pos
-        while self._data[end_pos] != 0 and end_pos < self._size:
-            end_pos += 1
-        self._pos = end_pos + 1
-        return self._data[start_pos:self._pos]
-
-    cdef object read_str(self, int csfrm, const char* encoding_errors=NULL):
-        """
-        Reads bytes from the buffer and decodes them into a string following
-        the supplied character set form.
-        """
-        cdef:
-            const char_type *ptr
-            ssize_t num_bytes
-        self.read_raw_bytes_and_length(&ptr, &num_bytes)
-        if ptr != NULL:
-            if csfrm == CS_FORM_IMPLICIT:
-                return ptr[:num_bytes].decode(ENCODING_UTF8, encoding_errors)
-            return ptr[:num_bytes].decode(ENCODING_UTF16, encoding_errors)
-
-    cdef object read_str_with_length(self):
-        """
-        Reads a length from the buffer and then, if the length is non-zero,
-        reads string from the buffer and returns it.
-        """
-        cdef uint32_t num_bytes
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            return self.read_str(CS_FORM_IMPLICIT)
-
-    cdef int read_ub1(self, uint8_t *value) except -1:
-        """
-        Reads an unsigned 8-bit integer from the buffer.
-        """
-        cdef const char_type *ptr = self._get_raw(1)
-        value[0] = ptr[0]
-
-    cdef int read_ub2(self, uint16_t *value) except -1:
-        """
-        Reads an unsigned 16-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            uint8_t length
-        self._get_int_length_and_sign(&length, NULL, 2)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = <uint16_t> decode_integer(ptr, length)
-
-    cdef int read_ub4(self, uint32_t *value) except -1:
-        """
-        Reads an unsigned 32-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            uint8_t length
-        self._get_int_length_and_sign(&length, NULL, 4)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = <uint32_t> decode_integer(ptr, length)
-
-    cdef int read_ub8(self, uint64_t *value) except -1:
-        """
-        Reads an unsigned 64-bit integer from the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            uint8_t length
-        self._get_int_length_and_sign(&length, NULL, 8)
-        if length == 0:
-            value[0] = 0
-        else:
-            ptr = self._get_raw(length)
-            value[0] = decode_integer(ptr, length)
-
-    cdef int read_uint16be(self, uint16_t *value) except -1:
-        """
-        Read a 16-bit integer in big endian order from the buffer.
-        """
-        value[0] = decode_uint16be(self._get_raw(2))
-
-    cdef int read_uint16le(self, uint16_t *value) except -1:
-        """
-        Read a 16-bit integer in little endian order from the buffer.
-        """
-        value[0] = decode_uint16le(self._get_raw(2))
-
-    cdef int read_uint32be(self, uint32_t *value) except -1:
-        """
-        Read a 32-bit integer in big endian order from the buffer.
-        """
-        value[0] = decode_uint32be(self._get_raw(4))
-
-    cdef int skip_raw_bytes(self, ssize_t num_bytes) except -1:
-        """
-        Skip the specified number of bytes in the buffer. In order to avoid
-        copying data, the number of bytes left in the packet is determined and
-        only that amount is requested.
-        """
-        cdef ssize_t num_bytes_this_time
-        while num_bytes > 0:
-            num_bytes_this_time = min(num_bytes, self.bytes_left())
-            if num_bytes_this_time == 0:
-                num_bytes_this_time = num_bytes
-            self._get_raw(num_bytes_this_time)
-            num_bytes -= num_bytes_this_time
-
-    cdef inline int skip_sb4(self) except -1:
-        """
-        Skips a signed 32-bit integer in the buffer.
-        """
-        cdef bint is_negative
-        return self._skip_int(4, &is_negative)
-
-    cdef inline void skip_to(self, ssize_t pos):
-        """
-        Skips to the specified location in the buffer.
-        """
-        self._pos = pos
-
-    cdef inline int skip_ub1(self) except -1:
-        """
-        Skips an unsigned 8-bit integer in the buffer.
-        """
-        self._get_raw(1)
-
-    cdef inline int skip_ub2(self) except -1:
-        """
-        Skips an unsigned 16-bit integer in the buffer.
-        """
-        return self._skip_int(2, NULL)
-
-    cdef inline int skip_ub4(self) except -1:
-        """
-        Skips an unsigned 32-bit integer in the buffer.
-        """
-        return self._skip_int(4, NULL)
-
-    cdef inline int skip_ub8(self) except -1:
-        """
-        Skips an unsigned 64-bit integer in the buffer.
-        """
-        return self._skip_int(8, NULL)
-
-    cdef int write_binary_double(self, double value) except -1:
-        """
-        Writes a double value to the buffer in Oracle canonical double floating
-        point format.
-        """
-        cdef char_type buf[ORA_TYPE_SIZE_BINARY_DOUBLE]
-        encode_binary_double(buf, value)
-        self._write_raw_bytes_and_length(buf, sizeof(buf))
-
-    cdef int write_binary_float(self, float value) except -1:
-        """
-        Writes a float value to the buffer in Oracle canonical floating point
-        format.
-        """
-        cdef char_type buf[ORA_TYPE_SIZE_BINARY_FLOAT]
-        encode_binary_float(buf, value)
-        self._write_raw_bytes_and_length(buf, sizeof(buf))
-
-    cdef int write_bool(self, bint value) except -1:
-        """
-        Writes a boolean value to the buffer.
-        """
-        cdef:
-            char_type buf[ORA_TYPE_SIZE_BOOLEAN]
-            ssize_t buflen
-        encode_boolean(buf, &buflen, value)
-        self._write_raw_bytes_and_length(buf, buflen)
-
-    cdef int write_bytes(self, bytes value) except -1:
-        """
-        Writes the bytes to the buffer directly.
-        """
-        cdef:
-            ssize_t value_len
-            char_type *ptr
-        cpython.PyBytes_AsStringAndSize(value, <char**> &ptr, &value_len)
-        self.write_raw(ptr, value_len)
-
-    cdef int write_bytes_with_length(self, bytes value) except -1:
-        """
-        Writes the bytes to the buffer after first writing the length.
-        """
-        cdef:
-            ssize_t value_len
-            char_type *ptr
-        cpython.PyBytes_AsStringAndSize(value, <char**> &ptr, &value_len)
-        self._write_raw_bytes_and_length(ptr, value_len)
-
-    cdef int write_interval_ds(self, object value) except -1:
-        """
-        Writes an interval to the buffer in Oracle Interval Day To Second
-        format.
-        """
-        cdef char_type buf[ORA_TYPE_SIZE_INTERVAL_DS]
-        encode_interval_ds(buf, value)
-        self._write_raw_bytes_and_length(buf, sizeof(buf))
-
-    cdef int write_interval_ym(self, object value) except -1:
-        """
-        Writes an interval to the buffer in Oracle Interval Year To Month
-        format.
-        """
-        cdef char_type buf[ORA_TYPE_SIZE_INTERVAL_YM]
-        encode_interval_ym(buf, value)
-        self._write_raw_bytes_and_length(buf, sizeof(buf))
-
-    cdef int write_oracle_date(self, object value, uint8_t length) except -1:
-        """
-        Writes a date to the buffer in Oracle Date format.
-        """
-        cdef char_type buf[ORA_TYPE_SIZE_TIMESTAMP_TZ]
-        if length == 7:
-            encode_date(buf, value)
-        elif length == 11:
-            encode_timestamp(buf, value)
-            # the protocol requires that if the fractional seconds are zero
-            # that the value be transmitted as a date, not a timestamp!
-            if decode_uint32be(&buf[7]) == 0:
-                length = 7
-        else:
-            encode_timestamp_tz(buf, value)
-        self._write_raw_bytes_and_length(buf, length)
-
-    cdef int write_oracle_number(self, bytes num_bytes) except -1:
-        """
-        Writes a number in UTF-8 encoded bytes in Oracle Number format to the
-        buffer.
-        """
-        cdef:
-            char_type buf[ORA_TYPE_SIZE_NUMBER]
-            ssize_t buflen
-        encode_number(buf, &buflen, num_bytes)
-        self._write_raw_bytes_and_length(buf, buflen)
-
-    cdef int write_oson(self, value, ssize_t max_fname_size,
-                        bint write_length=True) except -1:
-        """
-        Encodes the given value to OSON and then writes that to the buffer.
-        it.
-        """
-        cdef OsonEncoder encoder = OsonEncoder.__new__(OsonEncoder)
-        encoder.encode(value, max_fname_size)
-        self._write_raw_bytes_and_length(encoder._data, encoder._pos)
-
-    cdef int write_raw(self, const char_type *data, ssize_t length) except -1:
-        """
-        Writes raw bytes of the specified length to the buffer.
-        """
-        cdef ssize_t bytes_to_write
-        while True:
-            bytes_to_write = min(self._max_size - self._pos, length)
-            if bytes_to_write > 0:
-                memcpy(self._data + self._pos, <void*> data, bytes_to_write)
-                self._pos += bytes_to_write
-            if bytes_to_write == length:
-                break
-            self._write_more_data(self._max_size - self._pos, length)
-            length -= bytes_to_write
-            data += bytes_to_write
-
-    cdef int write_sb4(self, int32_t value) except -1:
-        """
-        Writes a 32-bit signed integer to the buffer in universal format.
-        """
-        cdef uint8_t sign = 0
-        if value < 0:
-            value = -value
-            sign = 0x80
-        if value == 0:
-            self.write_uint8(0)
-        elif value <= UINT8_MAX:
-            self.write_uint8(1 | sign)
-            self.write_uint8(<uint8_t> value)
-        elif value <= UINT16_MAX:
-            self.write_uint8(2 | sign)
-            self.write_uint16be(<uint16_t> value)
-        else:
-            self.write_uint8(4 | sign)
-            self.write_uint32be(value)
-
-    cdef int write_str(self, str value) except -1:
-        """
-        Writes a string to the buffer as UTF-8 encoded bytes.
-        """
-        self.write_bytes(value.encode())
-
-    cdef int write_uint8(self, uint8_t value) except -1:
-        """
-        Writes an 8-bit integer to the buffer.
-        """
-        if self._pos + 1 > self._max_size:
-            self._write_more_data(self._max_size - self._pos, 1)
-        self._data[self._pos] = value
-        self._pos += 1
-
-    cdef int write_uint16be(self, uint16_t value) except -1:
-        """
-        Writes a 16-bit integer to the buffer in big endian format.
-        """
-        if self._pos + 2 > self._max_size:
-            self._write_more_data(self._max_size - self._pos, 2)
-        encode_uint16be(&self._data[self._pos], value)
-        self._pos += 2
-
-    cdef int write_uint16le(self, uint16_t value) except -1:
-        """
-        Writes a 16-bit integer to the buffer in little endian format.
-        """
-        if self._pos + 2 > self._max_size:
-            self._write_more_data(self._max_size - self._pos, 2)
-        encode_uint16le(&self._data[self._pos], value)
-        self._pos += 2
-
-    cdef int write_uint32be(self, uint32_t value) except -1:
-        """
-        Writes a 32-bit integer to the buffer in big endian format.
-        """
-        if self._pos + 4 > self._max_size:
-            self._write_more_data(self._max_size - self._pos, 4)
-        encode_uint32be(&self._data[self._pos], value)
-        self._pos += 4
-
-    cdef int write_uint64be(self, uint64_t value) except -1:
-        """
-        Writes a 64-bit integer to the buffer in big endian format.
-        """
-        if self._pos + 8 > self._max_size:
-            self._write_more_data(self._max_size - self._pos, 8)
-        encode_uint64be(&self._data[self._pos], value)
-        self._pos += 8
-
-    cdef int write_ub2(self, uint16_t value) except -1:
-        """
-        Writes a 16-bit integer to the buffer in universal format.
-        """
-        if value == 0:
-            self.write_uint8(0)
-        elif value <= UINT8_MAX:
-            self.write_uint8(1)
-            self.write_uint8(<uint8_t> value)
-        else:
-            self.write_uint8(2)
-            self.write_uint16be(value)
-
-    cdef int write_ub4(self, uint32_t value) except -1:
-        """
-        Writes a 32-bit integer to the buffer in universal format.
-        """
-        if value == 0:
-            self.write_uint8(0)
-        elif value <= UINT8_MAX:
-            self.write_uint8(1)
-            self.write_uint8(<uint8_t> value)
-        elif value <= UINT16_MAX:
-            self.write_uint8(2)
-            self.write_uint16be(<uint16_t> value)
-        else:
-            self.write_uint8(4)
-            self.write_uint32be(value)
-
-    cdef int write_ub8(self, uint64_t value) except -1:
-        """
-        Writes a 64-bit integer to the buffer in universal format.
-        """
-        if value == 0:
-            self.write_uint8(0)
-        elif value <= UINT8_MAX:
-            self.write_uint8(1)
-            self.write_uint8(<uint8_t> value)
-        elif value <= UINT16_MAX:
-            self.write_uint8(2)
-            self.write_uint16be(<uint16_t> value)
-        elif value <= UINT32_MAX:
-            self.write_uint8(4)
-            self.write_uint32be(<uint32_t> value)
-        else:
-            self.write_uint8(8)
-            self.write_uint64be(value)
-
-    cdef int write_vector(self, value) except -1:
-        """
-        Encodes the given value to VECTOR and then writes that to the buffer.
-        """
-        cdef VectorEncoder encoder = VectorEncoder.__new__(VectorEncoder)
-        encoder.encode(value)
-        self._write_raw_bytes_and_length(encoder._data, encoder._pos)
-
-
-cdef class GrowableBuffer(Buffer):
-
-    cdef int _reserve_space(self, ssize_t num_bytes) except -1:
-        """
-        Reserves the requested amount of space in the buffer by moving the
-        pointer forward, allocating more space if necessary.
-        """
-        self._pos += num_bytes
-        if self._pos > self._size:
-            self._write_more_data(self._size - self._pos + num_bytes,
-                                  num_bytes)
-
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1:
-        """
-        Called when the amount of buffer available is less than the amount of
-        data requested. The buffer is increased in multiples of TNS_CHUNK_SIZE
-        in order to accomodate the number of bytes desired.
-        """
-        cdef:
-            ssize_t num_bytes_needed = num_bytes_wanted - num_bytes_available
-            ssize_t new_size
-        new_size = (self._max_size + num_bytes_needed + TNS_CHUNK_SIZE - 1) & \
-                ~(TNS_CHUNK_SIZE - 1)
-        self._resize(new_size)
diff --git a/src/oracledb/impl/base/connect_params.pyx b/src/oracledb/impl/base/connect_params.pyx
deleted file mode 100644
index 76b94d2a..00000000
--- a/src/oracledb/impl/base/connect_params.pyx
+++ /dev/null
@@ -1,1229 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# connect_params.pyx
-#
-# Cython file defining the base ConnectParams implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-# dictionary of tnsnames.ora files, indexed by the directory in which the file
-# is found; the results are cached in order to avoid parsing a file multiple
-# times; the modification time of the file is checked each time, though, to
-# ensure that no changes were made since the last time that the file was read
-# and parsed.
-_tnsnames_files = {}
-
-# internal default values
-cdef str DEFAULT_PROTOCOL = "tcp"
-cdef uint32_t DEFAULT_PORT = 1521
-cdef double DEFAULT_TCP_CONNECT_TIMEOUT = 20
-cdef uint32_t DEFAULT_RETRY_DELAY = 1
-cdef uint32_t DEFAULT_SDU = 8192
-
-
-cdef class ConnectParamsImpl:
-
-    def __init__(self):
-        cdef AddressList address_list
-        self.stmtcachesize = C_DEFAULTS.stmtcachesize
-        self.config_dir = C_DEFAULTS.config_dir
-        self._default_description = Description()
-        self._default_address = Address()
-        self.description_list = DescriptionList()
-        self.description_list.children.append(self._default_description)
-        self.debug_jdwp = os.getenv("ORA_DEBUG_JDWP")
-        self.edition = os.getenv("ORA_EDITION")
-        address_list = AddressList()
-        address_list.children.append(self._default_address)
-        self._default_description.children.append(address_list)
-        self.program = C_DEFAULTS.program
-        self.terminal = C_DEFAULTS.terminal
-        self.machine = C_DEFAULTS.machine
-        self.osuser = C_DEFAULTS.osuser
-        self.driver_name = C_DEFAULTS.driver_name
-        self.thick_mode_dsn_passthrough = C_DEFAULTS.thick_mode_dsn_passthrough
-
-    def set(self, dict args):
-        """
-        Sets the property values based on the supplied arguments. All values
-        not supplied will be left unchanged.
-        """
-        cdef:
-            Description description
-            Address address
-
-        # set parameters found directly on the ConnectParamsImpl object
-        self._external_handle = args.get("handle", self._external_handle)
-        _set_str_param(args, "user", self)
-        _set_str_param(args, "proxy_user", self)
-        if self.proxy_user is None and self.user is not None:
-            self.parse_user(self.user)
-        self._set_password(args.get("password"))
-        self._set_new_password(args.get("newpassword"))
-        self._set_wallet_password(args.get("wallet_password"))
-        _set_bool_param(args, "events", &self.events)
-        _set_enum_param(args, "mode", ENUM_AUTH_MODE, &self.mode)
-        _set_str_param(args, "edition", self)
-        _set_str_param(args, "tag", self)
-        _set_bool_param(args, "matchanytag", &self.matchanytag)
-        _set_uint_param(args, "stmtcachesize", &self.stmtcachesize)
-        _set_bool_param(args, "disable_oob", &self.disable_oob)
-        _set_obj_param(args, "ssl_context", self)
-        _set_str_param(args, "debug_jdwp", self)
-        _set_str_param(args, "config_dir", self)
-        _set_app_context_param(args, "appcontext", self)
-        _set_obj_param(args, "shardingkey", self)
-        _set_obj_param(args, "supershardingkey", self)
-        _set_bool_param(args, "externalauth", &self.externalauth)
-        _set_str_param(args, "program", self, check_network_character_set=True)
-        _set_str_param(args, "terminal", self)
-        _set_str_param(args, "machine", self, check_network_character_set=True)
-        _set_str_param(args, "osuser", self, check_network_character_set=True)
-        _set_str_param(args, "driver_name", self)
-        _set_obj_param(args, "extra_auth_params", self)
-        _set_bool_param(args, "thick_mode_dsn_passthrough",
-                        &self.thick_mode_dsn_passthrough)
-        self._set_access_token_param(args.get("access_token"))
-
-        # set parameters found on Description instances
-        self._default_description.set_from_args(args)
-        for description in self.description_list.children:
-            if description is not self._default_description:
-                description.set_from_args(args)
-
-        # set parameters found on Address instances
-        self._default_address.set_from_args(args)
-        for address in self.description_list.get_addresses():
-            if address is not self._default_address:
-                address.set_from_args(args)
-
-    def set_from_config(self, dict config, bint update_cache=True):
-        """
-        Internal method for setting the property from the supplied
-        configuration.
-        """
-        connect_string = config.get("connect_descriptor")
-        if connect_string is None:
-            errors._raise_err(errors.ERR_MISSING_CONNECT_DESCRIPTOR)
-        self.parse_connect_string(connect_string)
-        if self.user is None and self._password is None \
-                and not self.externalauth:
-            user = config.get("user")
-            password = config.get("password")
-            if password is not None and not isinstance(password, dict):
-                errors._raise_err(errors.ERR_PLAINTEXT_PASSWORD_IN_CONFIG)
-            if user is not None or password is not None:
-                self.set(dict(user=user, password=password))
-        args = config.get("pyo")
-        if args is not None:
-            self.set(args)
-        if update_cache and self._config_cache_key is not None:
-            update_config_cache(self._config_cache_key, config)
-
-    cdef int _check_credentials(self) except -1:
-        """
-        Check to see that credentials have been supplied: either a password or
-        an access token.
-        """
-        if self._password is None and self._token is None \
-                and self.access_token_callback is None:
-            errors._raise_err(errors.ERR_NO_CREDENTIALS)
-
-    cdef int _copy(self, ConnectParamsImpl other_params) except -1:
-        """
-        Internal method for copying attributes from another set of parameters.
-        """
-        self.config_dir = other_params.config_dir
-        self.user = other_params.user
-        self.proxy_user = other_params.proxy_user
-        self.events = other_params.events
-        self.externalauth = other_params.externalauth
-        self.mode = other_params.mode
-        self.edition = other_params.edition
-        self.appcontext = other_params.appcontext
-        self.tag = other_params.tag
-        self.matchanytag = other_params.matchanytag
-        self.shardingkey = other_params.shardingkey
-        self.supershardingkey = other_params.supershardingkey
-        self.stmtcachesize = other_params.stmtcachesize
-        self.disable_oob = other_params.disable_oob
-        self.debug_jdwp = other_params.debug_jdwp
-        self.ssl_context = other_params.ssl_context
-        self.description_list = other_params.description_list
-        self.access_token_callback = other_params.access_token_callback
-        self.access_token_expires = other_params.access_token_expires
-        self._external_handle = other_params._external_handle
-        self._default_description = other_params._default_description
-        self._default_address = other_params._default_address
-        self._password = other_params._password
-        self._password_obfuscator = other_params._password_obfuscator
-        self._new_password = other_params._new_password
-        self._new_password_obfuscator = other_params._new_password_obfuscator
-        self._wallet_password = other_params._wallet_password
-        self._wallet_password_obfuscator = \
-                other_params._wallet_password_obfuscator
-        self._token = other_params._token
-        self._token_obfuscator = other_params._token_obfuscator
-        self._private_key = other_params._private_key
-        self._private_key_obfuscator = other_params._private_key_obfuscator
-        self.program = other_params.program
-        self.terminal = other_params.terminal
-        self.machine = other_params.machine
-        self.osuser = other_params.osuser
-        self.driver_name = other_params.driver_name
-        self.extra_auth_params = other_params.extra_auth_params
-        self.thick_mode_dsn_passthrough = \
-                other_params.thick_mode_dsn_passthrough
-
-    cdef str _get_connect_string(self):
-        """
-        Returns the connect string to use for the stored components.
-        """
-        return self.description_list.build_connect_string()
-
-    cdef bytes _get_new_password(self):
-        """
-        Returns the new password, after removing the obfuscation.
-        """
-        if self._new_password is not None:
-            return bytes(self._xor_bytes(self._new_password,
-                                         self._new_password_obfuscator))
-
-    cdef bytearray _get_obfuscator(self, str secret_value):
-        """
-        Return a byte array suitable for obfuscating the specified secret
-        value.
-        """
-        return bytearray(secrets.token_bytes(len(secret_value.encode())))
-
-    cdef bytes _get_password(self):
-        """
-        Returns the password, after removing the obfuscation.
-        """
-        if self._password is not None:
-            return bytes(self._xor_bytes(self._password,
-                                         self._password_obfuscator))
-
-    cdef str _get_private_key(self):
-        """
-        Returns the private key, after removing the obfuscation.
-        """
-        if self._private_key is not None:
-            return self._xor_bytes(self._private_key,
-                                   self._private_key_obfuscator).decode()
-
-    cdef str _get_token(self):
-        """
-        Returns the token, after removing the obfuscation.
-
-        If a callable has been registered and there is no token stored yet, the
-        callable will be invoked with the refresh parameter set to False. If
-        the token returned by the callable is expired, the callable will be
-        invoked a second time with the refresh parameter set to True. If this
-        token is also expired, an exception will be raised.
-
-        If the stored token has expired and no callable has been registered, an
-        exception will be raised; otherwise, the callable will be invoked with
-        the refresh parameter set to True.
-        """
-        cdef:
-            object returned_val, current_date = datetime.datetime.utcnow()
-            bint expired
-        if self._token is None and self.access_token_callback is not None:
-            returned_val = self.access_token_callback(False)
-            self._set_access_token(returned_val,
-                                   errors.ERR_INVALID_ACCESS_TOKEN_RETURNED)
-        expired = self.access_token_expires < current_date
-        if expired and self.access_token_callback is not None:
-            returned_val = self.access_token_callback(True)
-            self._set_access_token(returned_val,
-                                   errors.ERR_INVALID_ACCESS_TOKEN_RETURNED)
-            expired = self.access_token_expires < current_date
-        if expired:
-            errors._raise_err(errors.ERR_EXPIRED_ACCESS_TOKEN)
-        return self._xor_bytes(self._token, self._token_obfuscator).decode()
-
-    cdef object _get_public_instance(self):
-        """
-        Returns the public instance to use when making calls out to user
-        defined code.
-        """
-        cdef object inst
-        if isinstance(self, PoolParamsImpl):
-            inst = PY_TYPE_POOL_PARAMS.__new__(PY_TYPE_POOL_PARAMS)
-        else:
-            inst = PY_TYPE_CONNECT_PARAMS.__new__(PY_TYPE_CONNECT_PARAMS)
-        inst._impl = self
-        return inst
-
-    cdef object _get_token_expires(self, str token):
-        """
-        Gets the expiry date from the token.
-        """
-        cdef:
-            str payload_segment
-            dict payload
-            int pad_needed
-        payload_segment = token.split(".")[1]
-        pad_needed = len(payload_segment) % 4
-        if pad_needed != 0:
-            payload_segment += '=' * (4 - pad_needed)
-        payload = json.loads(base64.urlsafe_b64decode(payload_segment))
-        return datetime.datetime.utcfromtimestamp(payload["exp"])
-
-    cdef bint _get_uses_drcp(self):
-        """
-        Returns a boolean indicating if any of the descriptions associated with
-        the parameters make use of DRCP.
-        """
-        cdef Description description
-        for description in self.description_list.children:
-            if description.server_type == "pooled":
-                return True
-        return False
-
-    cdef str _get_wallet_password(self):
-        """
-        Returns the wallet password, after removing the obfuscation.
-        """
-        if self._wallet_password is not None:
-            return self._xor_bytes(self._wallet_password,
-                                   self._wallet_password_obfuscator).decode()
-
-    cdef int _parse_connect_string(self, str connect_string) except -1:
-        """
-        Internal method for parsing a connect string.
-        """
-        cdef:
-            TnsnamesFile tnsnames_file
-            ConnectStringParser parser
-            TnsnamesFileReader reader
-
-        # attempt to parse the connect string directly
-        parser = ConnectStringParser.__new__(ConnectStringParser)
-        parser.template_description = self._default_description
-        parser.template_address = self._default_address
-        parser.params_impl = self
-        parser.parse(connect_string)
-
-        # otherwise, see if the name is a connect alias in a tnsnames.ora
-        # configuration file
-        if parser.description_list is None:
-            reader = TnsnamesFileReader()
-            tnsnames_file = reader.read_tnsnames(self.config_dir)
-            name = connect_string
-            connect_string = tnsnames_file.entries.get(name.upper())
-            if connect_string is None:
-                errors._raise_err(errors.ERR_TNS_ENTRY_NOT_FOUND, name=name,
-                                  file_name=tnsnames_file.file_name)
-            parser.parse(connect_string)
-            if parser.description_list is None:
-                errors._raise_err(errors.ERR_CANNOT_PARSE_CONNECT_STRING,
-                                  data=connect_string)
-        self.description_list = parser.description_list
-        if parser.parameters is not None:
-            self.set(parser.parameters)
-
-    cdef int _set_access_token(self, object val, int error_num) except -1:
-        """
-        Sets the access token either supplied directly by the user or
-        indirectly via a callback.
-        """
-        cdef:
-            str token, private_key = None
-            object token_expires
-        if isinstance(val, tuple) and len(val) == 2:
-            token, private_key = val
-            if token is None or private_key is None:
-                errors._raise_err(error_num)
-        elif isinstance(val, str):
-            token = val
-        else:
-            errors._raise_err(error_num)
-        try:
-            token_expires = self._get_token_expires(token)
-        except Exception as e:
-            errors._raise_err(error_num, cause=e)
-        self._token_obfuscator = self._get_obfuscator(token)
-        self._token = self._xor_bytes(bytearray(token.encode()),
-                                                self._token_obfuscator)
-        if private_key is not None:
-            self._private_key_obfuscator = self._get_obfuscator(private_key)
-            self._private_key = self._xor_bytes(bytearray(private_key.encode()),
-                                                self._private_key_obfuscator)
-        self.access_token_expires = token_expires
-
-    cdef int _set_access_token_param(self, object val) except -1:
-        """
-        Sets the access token parameter.
-        """
-        if val is not None:
-            if callable(val):
-                self.access_token_callback = val
-            else:
-                self._set_access_token(val,
-                                       errors.ERR_INVALID_ACCESS_TOKEN_PARAM)
-
-    cdef int _set_new_password(self, object password_in) except -1:
-        """
-        Sets the new password on the instance after first obfuscating it.
-        """
-        cdef str password
-        if password_in is not None:
-            password = self._transform_password(password_in)
-            self._new_password_obfuscator = self._get_obfuscator(password)
-            self._new_password = self._xor_bytes(bytearray(password.encode()),
-                                                 self._new_password_obfuscator)
-
-    cdef int _set_password(self, object password_in) except -1:
-        """
-        Sets the password on the instance after first obfuscating it.
-        """
-        cdef str password
-        if password_in is not None:
-            password = self._transform_password(password_in)
-            self._password_obfuscator = self._get_obfuscator(password)
-            self._password = self._xor_bytes(bytearray(password.encode()),
-                                             self._password_obfuscator)
-
-    cdef int _set_wallet_password(self, object password_in) except -1:
-        """
-        Sets the wallet password on the instance after first obfuscating it.
-        """
-        cdef str password
-        if password_in is not None:
-            password = self._transform_password(password_in)
-            self._wallet_password_obfuscator = self._get_obfuscator(password)
-            self._wallet_password = \
-                    self._xor_bytes(bytearray(password.encode()),
-                                    self._wallet_password_obfuscator)
-
-    cdef str _transform_password(self, object password):
-        """
-        Transforms the password by calling any registered password type
-        handlers if the password is supplied as a dictionary.
-        """
-        cdef str password_type
-        if isinstance(password, dict):
-            password_type = password.get("type")
-            fn = REGISTERED_PASSWORD_TYPES.get(password_type)
-            if fn is None:
-                errors._raise_err(errors.ERR_INVALID_PASSWORD_TYPE,
-                                  password_type=password_type)
-            try:
-                return fn(password)
-            except Exception as e:
-                errors._raise_err(errors.ERR_PASSWORD_TYPE_HANDLER_FAILED,
-                                  password_type=password_type, cause=e)
-        return password
-
-    cdef bytearray _xor_bytes(self, bytearray a, bytearray b):
-        """
-        Perform an XOR of two byte arrays as a means of obfuscating a password
-        that is stored on the class. It is assumed that the byte arrays are of
-        the same length.
-        """
-        cdef:
-            ssize_t length, i
-            bytearray result
-        length = len(a)
-        result = bytearray(length)
-        for i in range(length):
-            result[i] = a[i] ^ b[i]
-        return result
-
-    def copy(self):
-        """
-        Creates a copy of the connection parameters and returns it.
-        """
-        cdef ConnectParamsImpl new_params
-        new_params = ConnectParamsImpl.__new__(ConnectParamsImpl)
-        new_params._copy(self)
-        return new_params
-
-    def _get_addresses(self):
-        """
-        Return a list of the stored addresses.
-        """
-        return self.description_list.get_addresses()
-
-    def get_connect_string(self):
-        """
-        Returns a connect string generated from the parameters.
-        """
-        return self._get_connect_string()
-
-    def get_full_user(self):
-        """
-        Internal method used for getting the full user (including any proxy
-        user) which is used in thick mode exlusively and which is used in
-        the repr() methods for Connection and ConnectionPool.
-        """
-        if self.proxy_user is not None:
-            return f"{self.user}[{self.proxy_user}]"
-        return self.user
-
-    def get_network_service_names(self):
-        """
-        Returns a list of the network service names found in the tnsnames.ora
-        file found in the configuration directory associated with the
-        parameters. If no such file exists, an error is raised.
-        """
-        cdef:
-            TnsnamesFileReader reader = TnsnamesFileReader()
-            TnsnamesFile tnsnames_file
-        tnsnames_file = reader.read_tnsnames(self.config_dir)
-        return list(tnsnames_file.entries.keys())
-
-    def parse_connect_string(self, str connect_string):
-        """
-        Internal method for parsing the connect string.
-        """
-        connect_string = connect_string.strip()
-        try:
-            self._parse_connect_string(connect_string)
-        except exceptions.Error:
-            raise
-        except Exception as e:
-            errors._raise_err(errors.ERR_CANNOT_PARSE_CONNECT_STRING, cause=e,
-                              data=connect_string)
-
-    def parse_dsn_with_credentials(self, str dsn):
-        """
-        Parse a dsn (data source name) string supplied by the user. This can be
-        in the form user/password@connect_string or it can be in the form
-        user/password. The user, password and connect string are returned in a
-        3-tuple.
-        """
-        pos = dsn.rfind("@")
-        if pos >= 0:
-            credentials = dsn[:pos]
-            connect_string = dsn[pos + 1:] or None
-        else:
-            credentials = dsn
-            connect_string = None
-        pos = credentials.find("/")
-        if pos > 0 and credentials[pos - 1] != ':' \
-                or pos == 0 and len(credentials) == 1:
-            user = credentials[:pos] or None
-            password = credentials[pos + 1:] or None
-        elif connect_string is None:
-            connect_string = dsn or None
-            user = password = None
-        else:
-            user = credentials or None
-            password = None
-        return (user, password, connect_string)
-
-    def parse_user(self, str user):
-        """
-        Parses a user string into its component parts, if applicable. The user
-        string may be in the form user[proxy_user] or it may simply be a simple
-        user string.
-        """
-        start_pos = user.find("[")
-        if start_pos > 0 and user.endswith("]"):
-            self.proxy_user = user[start_pos + 1:-1]
-            self.user = user[:start_pos]
-        else:
-            self.user = user
-
-    def process_args(self, str dsn, dict kwargs, bint thin):
-        """
-        Processes the arguments to connect() and create_pool().
-
-            - the keyword arguments are set
-            - if no user was specified in the keyword arguments and a dsn is
-              specified, it is parsed to determine the user, password and
-              connect string and the user and password are stored
-            - the connect string is then parsed into its components and stored
-            - if no dsn was specified, one is built from the components
-            - the connect string is returned
-        """
-        if kwargs:
-            self.set(kwargs)
-        if self.user is None and not self.externalauth and dsn is not None:
-            user, password, dsn = self.parse_dsn_with_credentials(dsn)
-            self.set(dict(user=user, password=password))
-        if dsn is None:
-            dsn = self._get_connect_string()
-        elif thin or not self.thick_mode_dsn_passthrough:
-            self.parse_connect_string(dsn)
-        if REGISTERED_PARAMS_HOOKS:
-            params = self._get_public_instance()
-            for hook_fn in REGISTERED_PARAMS_HOOKS:
-                try:
-                    hook_fn(params)
-                except Exception as e:
-                    errors._raise_err(errors.ERR_PARAMS_HOOK_HANDLER_FAILED,
-                                      cause=e)
-        return dsn
-
-
-cdef class ConnectParamsNode:
-
-    def __init__(self, bint must_have_children):
-        self.must_have_children = must_have_children
-        self.failover = True
-        if must_have_children:
-            self.children = []
-
-    cdef int _copy(self, ConnectParamsNode source) except -1:
-        """
-        Copies data from the source to this node.
-        """
-        self.must_have_children = source.must_have_children
-        if self.must_have_children:
-            self.children = []
-            self.failover = source.failover
-            self.load_balance = source.load_balance
-            self.source_route = source.source_route
-
-    cdef list _get_initial_connect_string_parts(self):
-        """
-        Returns a list of the initial connect strings parts used for container
-        nodes.
-        """
-        cdef list parts = []
-        if not self.failover:
-            parts.append("(FAILOVER=OFF)")
-        if self.load_balance:
-            parts.append("(LOAD_BALANCE=ON)")
-        if self.source_route:
-            parts.append("(SOURCE_ROUTE=ON)")
-        return parts
-
-    cdef int _set_active_children(self, list children) except -1:
-        """
-        Set the active children to process when connecting to the database.
-        This call is recursive and will set the active children of each of its
-        children.
-        """
-        cdef ConnectParamsNode child
-
-        # if only one child is present, that child is considered active
-        if len(children) == 1:
-            self.active_children = children
-
-        # for source route, only the first child is considered active
-        elif self.source_route:
-            self.active_children = children[:1]
-
-        # for failover with load balance, all of the children are active but
-        # are processed in a random order
-        elif self.failover and self.load_balance:
-            self.active_children = random.sample(children, k=len(children))
-
-        # for failover without load balance, all of the children are active and
-        # are processed in the same order
-        elif self.failover:
-            self.active_children = children
-
-        # without failover, load balance indicates that only one of the
-        # children is considered active and which one is selected randomly
-        elif self.load_balance:
-            self.active_children = random.sample(children, k=1)
-
-        # without failover or load balance, just the first child is navigated
-        else:
-            self.active_children = children[:1]
-
-        for child in children:
-            if child.must_have_children:
-                child._set_active_children(child.children)
-
-
-cdef class Address(ConnectParamsNode):
-    """
-    Internal class used to hold parameters for an address used to create a
-    connection to the database.
-    """
-
-    def __init__(self):
-        ConnectParamsNode.__init__(self, False)
-        self.protocol = DEFAULT_PROTOCOL
-        self.port = DEFAULT_PORT
-
-    cdef str build_connect_string(self):
-        """
-        Build a connect string from the components. If no host is specified,
-        None is returned (used for bequeath connections).
-        """
-        if self.host is not None:
-            parts = [f"(PROTOCOL={self.protocol})",
-                     f"(HOST={self.host})",
-                     f"(PORT={self.port})"]
-            if self.https_proxy is not None:
-                parts.append(f"(HTTPS_PROXY={self.https_proxy})")
-            if self.https_proxy_port != 0:
-                parts.append(f"(HTTPS_PROXY_PORT={self.https_proxy_port})")
-            return f'(ADDRESS={"".join(parts)})'
-
-    def copy(self):
-        """
-        Creates a copy of the address and returns it.
-        """
-        cdef Address address = Address.__new__(Address)
-        address._copy(self)
-        address.host = self.host
-        address.port = self.port
-        address.protocol = self.protocol
-        address.https_proxy = self.https_proxy
-        address.https_proxy_port = self.https_proxy_port
-        return address
-
-    @classmethod
-    def from_args(cls, dict args):
-        """
-        Creates an address and sets the arguments before returning it. This is
-        used within connect descriptors containing address lists.
-        """
-        address = cls()
-        address.set_from_args(args)
-        return address
-
-    cdef list resolve_host_name(self):
-        """
-        Resolve the host name associated with the address and store the IP
-        address and family on the address. If multiple IP addresses are found,
-        duplicate the address and return one address for each IP address. If a
-        proxy is being used, ensure that the proxy performs name resolution
-        instead.
-        """
-        cdef:
-            list results = []
-            Address address
-            object info
-        if self.https_proxy is not None:
-            self.ip_address = self.host
-            return [self]
-        for info in socket.getaddrinfo(self.host, self.port,
-                                       proto=socket.IPPROTO_TCP,
-                                       type=socket.SOCK_STREAM):
-            address = self.copy()
-            address.ip_family = info[0]
-            address.ip_address = info[4][0]
-            results.append(address)
-        return results
-
-    def set_from_args(self, dict args):
-        """
-        Sets parameter values from an argument dictionary or an (ADDRESS) node
-        in a connect descriptor.
-        """
-        _set_str_param(args, "host", self)
-        _set_uint_param(args, "port", &self.port)
-        protocol = args.get("protocol")
-        if protocol is not None:
-            self.set_protocol(protocol)
-        _set_str_param(args, "https_proxy", self)
-        _set_uint_param(args, "https_proxy_port", &self.https_proxy_port)
-
-    cdef int set_protocol(self, str value) except -1:
-        """
-        Sets the protocol in the address to the specified value.
-        """
-        value = value.lower()
-        if value not in ("tcp", "tcps"):
-            errors._raise_err(errors.ERR_INVALID_PROTOCOL, protocol=value)
-        self.protocol = value
-
-
-cdef class AddressList(ConnectParamsNode):
-    """
-    Internal class used to hold address list parameters and a list of addresses
-    used to create connections to the database.
-    """
-
-    def __init__(self):
-        ConnectParamsNode.__init__(self, True)
-
-    cdef int _set_active_children(self, list children) except -1:
-        """
-        Set the active children to process when connecting to the database.
-        First, all names are resolved to IP addresses
-
-        This call is recursive and will set the active children of each of its
-        children.
-        """
-        cdef:
-            list addresses = []
-            Address address
-        ConnectParamsNode._set_active_children(self, children)
-        for address in self.active_children:
-            addresses.extend(address.resolve_host_name())
-        self.active_children = addresses
-
-    cdef bint _uses_tcps(self):
-        """
-        Returns a boolean indicating if any of the addresses in the address
-        list use the protocol TCPS.
-        """
-        cdef Address address
-        for address in self.children:
-            if address.protocol == "tcps":
-                return True
-        return False
-
-    cdef str build_connect_string(self):
-        """
-        Build a connect string from the components.
-        """
-        cdef:
-            Address address
-            list parts
-        parts = self._get_initial_connect_string_parts()
-        for address in self.children:
-            parts.append(address.build_connect_string())
-        if len(parts) == 1:
-            return parts[0]
-        return f'(ADDRESS_LIST={"".join(parts)})'
-
-    def set_from_args(self, dict args):
-        """
-        Set paramter values from an argument dictionary or an (ADDRESS_LIST)
-        node in a connect descriptor.
-        """
-        _set_bool_param(args, "failover", &self.failover)
-        _set_bool_param(args, "load_balance", &self.load_balance)
-        _set_bool_param(args, "source_route", &self.source_route)
-
-
-cdef class Description(ConnectParamsNode):
-    """
-    Internal class used to hold description parameters.
-    """
-
-    def __init__(self):
-        ConnectParamsNode.__init__(self, True)
-        self.tcp_connect_timeout = DEFAULT_TCP_CONNECT_TIMEOUT
-        self.retry_delay = DEFAULT_RETRY_DELAY
-        self.ssl_server_dn_match = True
-        self.sdu = DEFAULT_SDU
-
-    cdef str _build_duration_str(self, double value):
-        """
-        Build up the value to display for a duration in the connect string.
-        This must be an integer with the units following it.
-        """
-        cdef int value_int, value_minutes
-        value_int = <int> value
-        if value != value_int:
-            return f"{int(value * 1000)}ms"
-        value_minutes = (value_int // 60)
-        if value_minutes * 60 == value_int:
-            return f"{value_minutes}min"
-        return f"{value_int}"
-
-    cdef str _value_repr(self, object value):
-        """
-        Returns the representation to use for a value. Strings are returned as
-        is but dictionaries are returned as key/value pairs in the format
-        expected by the listener.
-        """
-        if isinstance(value, str):
-            return value
-        return "".join(f"({k.upper()}={self._value_repr(v)})"
-                       for k, v in value.items())
-
-    cdef str build_connect_string(self, str cid=None):
-        """
-        Build a connect string from the components.
-        """
-        cdef:
-            AddressList address_list
-            list parts, temp_parts
-            bint uses_tcps = False
-            str temp
-
-        # build top-level description parts
-        parts = self._get_initial_connect_string_parts()
-        if self.retry_count != 0:
-            parts.append(f"(RETRY_COUNT={self.retry_count})")
-            if self.retry_delay != 0:
-                parts.append(f"(RETRY_DELAY={self.retry_delay})")
-        if self.expire_time != 0:
-            parts.append(f"(EXPIRE_TIME={self.expire_time})")
-        if self.tcp_connect_timeout != DEFAULT_TCP_CONNECT_TIMEOUT:
-            temp = self._build_duration_str(self.tcp_connect_timeout)
-            parts.append(f"(TRANSPORT_CONNECT_TIMEOUT={temp})")
-        if self.use_sni:
-            parts.append("(USE_SNI=ON)")
-        if self.sdu != DEFAULT_SDU:
-            parts.append(f"(SDU={self.sdu})")
-        if self.extra_args is not None:
-            parts.extend(f"({k.upper()}={self._value_repr(v)})"
-                         for k, v in self.extra_args.items())
-
-        # add address lists, but if the address list contains only a single
-        # entry and that entry does not have a host, the other parts aren't
-        # relevant anyway!
-        for address_list in self.children:
-            temp = address_list.build_connect_string()
-            if temp is None:
-                return None
-            parts.append(temp)
-            if not uses_tcps:
-                uses_tcps = address_list._uses_tcps()
-
-        # build connect data segment
-        temp_parts = []
-        if self.service_name is not None:
-            temp_parts.append(f"(SERVICE_NAME={self.service_name})")
-        if self.instance_name is not None:
-            temp_parts.append(f"(INSTANCE_NAME={self.instance_name})")
-        elif self.sid is not None:
-            temp_parts.append(f"(SID={self.sid})")
-        if self.server_type is not None:
-            temp_parts.append(f"(SERVER={self.server_type})")
-        if self.use_tcp_fast_open:
-            temp_parts.append("(USE_TCP_FAST_OPEN=ON)")
-        if self.pool_boundary is not None:
-            temp_parts.append(f"(POOL_BOUNDARY={self.pool_boundary})")
-        if cid is not None:
-            temp_parts.append(f"(CID={cid})")
-        else:
-            if self.cclass is not None:
-                temp_parts.append(f"(POOL_CONNECTION_CLASS={self.cclass})")
-            if self.pool_name is not None:
-                temp_parts.append(f"(POOL_NAME={self.pool_name})")
-            if self.purity == PURITY_SELF:
-                temp_parts.append(f"(POOL_PURITY=SELF)")
-            elif self.purity == PURITY_NEW:
-                temp_parts.append(f"(POOL_PURITY=NEW)")
-        if self.extra_connect_data_args is not None:
-            temp_parts.extend(f"({k.upper()}={self._value_repr(v)})"
-                              for k, v in self.extra_connect_data_args.items())
-        if self.connection_id is not None:
-            temp_parts.append(f"(CONNECTION_ID={self.connection_id})")
-        if temp_parts:
-            parts.append(f'(CONNECT_DATA={"".join(temp_parts)})')
-
-        # build security segment, if applicable
-        if uses_tcps:
-            temp_parts = []
-            if self.ssl_server_dn_match:
-                temp_parts.append("(SSL_SERVER_DN_MATCH=ON)")
-            if self.ssl_server_cert_dn is not None:
-                temp = f"(SSL_SERVER_CERT_DN={self.ssl_server_cert_dn})"
-                temp_parts.append(temp)
-            if self.ssl_version is not None:
-                if self.ssl_version is ssl.TLSVersion.TLSv1_2:
-                    temp_parts.append(f"(SSL_VERSION=TLSv1.2)")
-                elif self.ssl_version is ssl.TLSVersion.TLSv1_3:
-                    temp_parts.append(f"(SSL_VERSION=TLSv1.3)")
-            if self.wallet_location is not None:
-                temp = f"(MY_WALLET_DIRECTORY={self.wallet_location})"
-                temp_parts.append(temp)
-            if self.extra_security_args is not None:
-                temp_parts.extend(f"({k.upper()}={self._value_repr(v)})"
-                                  for k, v in self.extra_security_args.items())
-            parts.append(f'(SECURITY={"".join(temp_parts)})')
-
-        return f'(DESCRIPTION={"".join(parts)})'
-
-    def copy(self):
-        """
-        Creates a copy of the description (except for the address lists) and
-        returns it.
-        """
-        cdef Description description = Description.__new__(Description)
-        description._copy(self)
-        description.expire_time = self.expire_time
-        description.retry_count = self.retry_count
-        description.retry_delay = self.retry_delay
-        description.sdu = self.sdu
-        description.tcp_connect_timeout = self.tcp_connect_timeout
-        description.service_name = self.service_name
-        description.instance_name = self.instance_name
-        description.server_type = self.server_type
-        description.sid = self.sid
-        description.cclass = self.cclass
-        description.connection_id_prefix = self.connection_id_prefix
-        description.pool_boundary = self.pool_boundary
-        description.pool_name = self.pool_name
-        description.purity = self.purity
-        description.ssl_server_dn_match = self.ssl_server_dn_match
-        description.use_tcp_fast_open = self.use_tcp_fast_open
-        description.ssl_server_cert_dn = self.ssl_server_cert_dn
-        description.ssl_version = self.ssl_version
-        description.use_sni = self.use_sni
-        description.wallet_location = self.wallet_location
-        description.extra_args = self.extra_args
-        description.extra_connect_data_args = self.extra_connect_data_args
-        description.extra_security_args = self.extra_security_args
-        return description
-
-    def set_from_args(self, dict args):
-        """
-        Set parameter values from an argument dictionary.
-        """
-        self.set_from_connect_data_args(args)
-        self.set_from_description_args(args)
-        self.set_from_security_args(args)
-
-    def set_from_connect_data_args(self, dict args):
-        """
-        Set parameter values from an argument dictionary or a (CONNECT_DATA)
-        node in a connect descriptor.
-        """
-        _set_str_param(args, "service_name", self)
-        _set_str_param(args, "instance_name", self)
-        _set_str_param(args, "sid", self)
-        server_type = args.get("server_type")
-        if server_type is not None:
-            self.set_server_type(server_type)
-        _set_str_param(args, "cclass", self)
-        _set_enum_param(args, "purity", ENUM_PURITY, &self.purity)
-        _set_str_param(args, "pool_boundary", self)
-        _set_str_param(args, "pool_name", self)
-        _set_str_param(args, "connection_id_prefix", self)
-        _set_bool_param(args, "use_tcp_fast_open", &self.use_tcp_fast_open)
-        extra_args = args.get("extra_connect_data_args")
-        if extra_args is not None:
-            self.extra_connect_data_args = extra_args
-
-    def set_from_description_args(self, dict args):
-        """
-        Set parameter values from an argument dictionary or a (DESCRIPTION)
-        node in a connect descriptor.
-        """
-        cdef Address address
-        _set_uint_param(args, "expire_time", &self.expire_time)
-        _set_bool_param(args, "failover", &self.failover)
-        _set_bool_param(args, "load_balance", &self.load_balance)
-        _set_bool_param(args, "source_route", &self.source_route)
-        _set_uint_param(args, "retry_count", &self.retry_count)
-        _set_uint_param(args, "retry_delay", &self.retry_delay)
-        _set_bool_param(args, "use_sni", &self.use_sni)
-        _set_uint_param(args, "sdu", &self.sdu)
-        self.sdu = min(max(self.sdu, 512), 2097152)         # sanitize SDU
-        _set_duration_param(args, "tcp_connect_timeout",
-                            &self.tcp_connect_timeout)
-        extra_args = args.get("extra_args")
-        if extra_args is not None:
-            self.extra_args = extra_args
-
-    def set_from_security_args(self, dict args):
-        """
-        Set parameter values from an argument dictionary or a (SECURITY)
-        node in a connect descriptor.
-        """
-        _set_bool_param(args, "ssl_server_dn_match", &self.ssl_server_dn_match)
-        _set_str_param(args, "ssl_server_cert_dn", self)
-        _set_ssl_version_param(args, "ssl_version", self)
-        _set_str_param(args, "wallet_location", self)
-        extra_args = args.get("extra_security_args")
-        if extra_args is not None:
-            self.extra_security_args = extra_args
-
-    cdef int set_server_type(self, str value) except -1:
-        """
-        Sets the server type in the description to the specified value.
-        """
-        value = value.lower()
-        if value not in ("dedicated", "pooled", "shared"):
-            errors._raise_err(errors.ERR_INVALID_SERVER_TYPE,
-                              server_type=value)
-        self.server_type = value
-
-
-cdef class DescriptionList(ConnectParamsNode):
-    """
-    Internal class used to hold description list parameters and a list of
-    descriptions.
-    """
-
-    def __init__(self):
-        ConnectParamsNode.__init__(self, True)
-
-    cdef str build_connect_string(self):
-        """
-        Build a connect string from the components.
-        """
-        cdef:
-            Description description
-            list parts
-        parts = self._get_initial_connect_string_parts()
-        for description in self.children:
-            parts.append(description.build_connect_string())
-        if len(parts) == 1:
-            return parts[0]
-        return f'(DESCRIPTION_LIST={"".join(parts)})'
-
-    cdef list get_addresses(self):
-        """
-        Return a list of the stored addresses.
-        """
-        cdef:
-            AddressList addr_list
-            Description desc
-            Address addr
-        return [addr for desc in self.children \
-                for addr_list in desc.children \
-                for addr in addr_list.children]
-
-    cdef int set_active_children(self) except -1:
-        """
-        Sets the list of active children to process when connecting to the
-        database.
-        """
-        self._set_active_children(self.children)
-
-    def set_from_args(self, dict args):
-        """
-        Set paramter values from an argument dictionary or a (DESCRIPTION_LIST)
-        node in a connect descriptor.
-        """
-        _set_bool_param(args, "failover", &self.failover)
-        _set_bool_param(args, "load_balance", &self.load_balance)
-        _set_bool_param(args, "source_route", &self.source_route)
-
-
-cdef class TnsnamesFile:
-    """
-    Internal class used to parse and retain connect descriptor entries found in
-    a tnsnames.ora file or any included file.
-    """
-    cdef:
-        str file_name
-        int mtime
-        dict entries
-        set included_files
-
-    def __init__(self, str file_name):
-        self.file_name = file_name
-        self.clear()
-        self._get_mtime(&self.mtime)
-
-    cdef int _get_mtime(self, int* mtime) except -1:
-        """
-        Returns the modification time of the file or throws an exception if the
-        file cannot be found.
-        """
-        try:
-            mtime[0] = os.stat(self.file_name).st_mtime
-        except Exception as e:
-            errors._raise_err(errors.ERR_MISSING_FILE, str(e),
-                              file_name=self.file_name)
-
-    cdef int clear(self) except -1:
-        """
-        Clear all entries in the file.
-        """
-        self.entries = {}
-        self.included_files = set()
-
-    def is_current(self):
-        """
-        Returns a boolean indicating if the contents are current or not.
-        """
-        cdef:
-            TnsnamesFile included_file
-            int mtime
-        self._get_mtime(&mtime)
-        if mtime != self.mtime:
-            return False
-        for included_file in self.included_files:
-            if not included_file.is_current():
-                return False
-        return True
-
-
-
-cdef class TnsnamesFileReader:
-    """
-    Internal class used to read a tnsnames.ora file and all of its included
-    files.
-    """
-    cdef:
-        TnsnamesFile primary_file
-        list files_in_progress
-        dict entries
-
-    cdef TnsnamesFile _get_file(self, file_name):
-        """
-        Get the file from the cache or read it from the file system.
-        """
-        cdef TnsnamesFile tnsnames_file
-        if file_name in self.files_in_progress:
-            errors._raise_err(errors.ERR_IFILE_CYCLE_DETECTED,
-                              including_file_name=self.files_in_progress[-1],
-                              included_file_name=file_name)
-        tnsnames_file = _tnsnames_files.get(file_name)
-        if tnsnames_file is None:
-            tnsnames_file = TnsnamesFile(file_name)
-        else:
-            if tnsnames_file.is_current():
-                return tnsnames_file
-            del _tnsnames_files[file_name]
-        if self.primary_file is None:
-            self.primary_file = tnsnames_file
-        self.files_in_progress.append(file_name)
-        self._read_file(tnsnames_file)
-        _tnsnames_files[file_name] = tnsnames_file
-        self.files_in_progress.pop()
-        return tnsnames_file
-
-    cdef int _read_file(self, TnsnamesFile tnsnames_file) except -1:
-        """
-        Reads the file and parses the contents.
-        """
-        cdef:
-            TnsnamesFile included_file
-            TnsnamesFileParser parser
-            int line_no = 0
-        def add_entry(key, value):
-            if key == "IFILE":
-                if not os.path.isabs(value):
-                    dir_name = os.path.dirname(tnsnames_file.file_name)
-                    value = os.path.join(dir_name, value)
-                included_file = self._get_file(value)
-                tnsnames_file.included_files.add(included_file)
-            else:
-                entry_names = [
-                    s.strip().splitlines()[-1] for s in key.split(",")
-                ]
-                for name in entry_names:
-                    self.primary_file.entries[name] = value
-                    if tnsnames_file is not self.primary_file:
-                        tnsnames_file.entries[name] = value
-        tnsnames_file.clear()
-        parser = TnsnamesFileParser.__new__(TnsnamesFileParser)
-        with open(tnsnames_file.file_name) as f:
-            parser.parse(f.read(), add_entry)
-
-    cdef TnsnamesFile read_tnsnames(self, str dir_name):
-        """
-        Read the tnsnames.ora file found in the given directory or raise an
-        exception if no such file can be found.
-        """
-        self.primary_file = None
-        self.files_in_progress = []
-        if dir_name is None:
-            errors._raise_err(errors.ERR_NO_CONFIG_DIR)
-        file_name = os.path.join(dir_name, "tnsnames.ora")
-        return self._get_file(file_name)
diff --git a/src/oracledb/impl/base/connection.pyx b/src/oracledb/impl/base/connection.pyx
deleted file mode 100644
index 51c5f4c3..00000000
--- a/src/oracledb/impl/base/connection.pyx
+++ /dev/null
@@ -1,392 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# connection.pyx
-#
-# Cython file defining the base Connection implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseConnImpl:
-
-    def __init__(self, str dsn, ConnectParamsImpl params):
-        self.dsn = dsn
-        self.username = params.user
-        self.proxy_user = params.proxy_user
-        self._oson_max_fname_size = 255
-
-    cdef object _check_value(self, OracleMetadata metadata, object value,
-                             bint* is_ok):
-        """
-        Checks that the specified Python value is acceptable for the given
-        database type. If the "is_ok" parameter is passed as NULL, an exception
-        is raised.  The value to use is returned (possibly modified from the
-        value passed in).
-        """
-        cdef:
-            uint32_t db_type_num
-            BaseLobImpl lob_impl
-
-        # null values are always accepted
-        if value is None:
-            return value
-
-        # check to see if the Python value is accepted and perform any
-        # necessary adjustments
-        db_type_num = metadata.dbtype.num
-        if db_type_num in (DB_TYPE_NUM_NUMBER,
-                           DB_TYPE_NUM_BINARY_INTEGER,
-                           DB_TYPE_NUM_BINARY_DOUBLE,
-                           DB_TYPE_NUM_BINARY_FLOAT):
-            if isinstance(value, (PY_TYPE_BOOL, int, float, PY_TYPE_DECIMAL)):
-                if db_type_num in (DB_TYPE_NUM_BINARY_FLOAT,
-                                   DB_TYPE_NUM_BINARY_DOUBLE):
-                    return float(value)
-                elif db_type_num == DB_TYPE_NUM_BINARY_INTEGER \
-                        or cpython.PyBool_Check(value):
-                    return int(value)
-                return value
-        elif db_type_num in (DB_TYPE_NUM_CHAR,
-                             DB_TYPE_NUM_VARCHAR,
-                             DB_TYPE_NUM_NCHAR,
-                             DB_TYPE_NUM_NVARCHAR,
-                             DB_TYPE_NUM_LONG_VARCHAR,
-                             DB_TYPE_NUM_LONG_NVARCHAR):
-            if isinstance(value, bytes):
-                return (<bytes> value).decode()
-            elif isinstance(value, str):
-                return value
-        elif db_type_num in (DB_TYPE_NUM_RAW, DB_TYPE_NUM_LONG_RAW):
-            if isinstance(value, str):
-                return (<str> value).encode()
-            elif isinstance(value, bytes):
-                return value
-        elif db_type_num in (DB_TYPE_NUM_DATE,
-                             DB_TYPE_NUM_TIMESTAMP,
-                             DB_TYPE_NUM_TIMESTAMP_LTZ,
-                             DB_TYPE_NUM_TIMESTAMP_TZ):
-            if cydatetime.PyDateTime_Check(value) \
-                    or cydatetime.PyDate_Check(value):
-                return value
-        elif db_type_num == DB_TYPE_NUM_INTERVAL_DS:
-            if isinstance(value, PY_TYPE_TIMEDELTA):
-                return value
-        elif db_type_num in (DB_TYPE_NUM_CLOB,
-                             DB_TYPE_NUM_NCLOB,
-                             DB_TYPE_NUM_BLOB,
-                             DB_TYPE_NUM_BFILE):
-            if isinstance(value, (PY_TYPE_LOB, PY_TYPE_ASYNC_LOB)):
-                lob_impl = value._impl
-                if lob_impl.dbtype is not metadata.dbtype:
-                    if is_ok != NULL:
-                        is_ok[0] = False
-                        return value
-                    errors._raise_err(errors.ERR_LOB_OF_WRONG_TYPE,
-                                      actual_type_name=lob_impl.dbtype.name,
-                                      expected_type_name=metadata.dbtype.name)
-                return value
-            elif self._allow_bind_str_to_lob \
-                    and db_type_num != DB_TYPE_NUM_BFILE \
-                    and isinstance(value, (bytes, str)):
-                if db_type_num == DB_TYPE_NUM_BLOB:
-                    if isinstance(value, str):
-                        value = value.encode()
-                elif isinstance(value, bytes):
-                    value = value.decode()
-                lob_impl = self.create_temp_lob_impl(metadata.dbtype)
-                if value:
-                    lob_impl.write(value, 1)
-                return PY_TYPE_LOB._from_impl(lob_impl)
-        elif db_type_num == DB_TYPE_NUM_OBJECT:
-            if isinstance(value, PY_TYPE_DB_OBJECT):
-                if value._impl.type != metadata.objtype:
-                    if is_ok != NULL:
-                        is_ok[0] = False
-                        return value
-                    errors._raise_err(errors.ERR_WRONG_OBJECT_TYPE,
-                                      actual_schema=value.type.schema,
-                                      actual_name=value.type.name,
-                                      expected_schema=metadata.objtype.schema,
-                                      expected_name=metadata.objtype.name)
-                return value
-        elif db_type_num == DB_TYPE_NUM_CURSOR:
-            if isinstance(value, (PY_TYPE_CURSOR, PY_TYPE_ASYNC_CURSOR)):
-                value._verify_open()
-                if value.connection._impl is not self:
-                    errors._raise_err(errors.ERR_CURSOR_DIFF_CONNECTION)
-                return value
-        elif db_type_num == DB_TYPE_NUM_BOOLEAN:
-            return bool(value)
-        elif db_type_num == DB_TYPE_NUM_JSON:
-            return value
-        elif db_type_num == DB_TYPE_NUM_VECTOR:
-            if isinstance(value, list):
-                if len(value) == 0:
-                    errors._raise_err(errors.ERR_INVALID_VECTOR)
-                return array.array('d', value)
-            elif isinstance(value, array.array) \
-                    and value.typecode in ('f', 'd', 'b', 'B'):
-                if len(value) == 0:
-                    errors._raise_err(errors.ERR_INVALID_VECTOR)
-                return value
-            elif isinstance(value, PY_TYPE_SPARSE_VECTOR):
-                return value
-        elif db_type_num == DB_TYPE_NUM_INTERVAL_YM:
-            if isinstance(value, PY_TYPE_INTERVAL_YM):
-                return value
-        else:
-            if is_ok != NULL:
-                is_ok[0] = False
-                return value
-            errors._raise_err(errors.ERR_UNSUPPORTED_TYPE_SET,
-                              db_type_name=metadata.dbtype.name)
-
-        # the Python value was not considered acceptable
-        if is_ok != NULL:
-            is_ok[0] = False
-            return value
-        errors._raise_err(errors.ERR_UNSUPPORTED_PYTHON_TYPE_FOR_DB_TYPE,
-                          py_type_name=type(value).__name__,
-                          db_type_name=metadata.dbtype.name)
-
-    cdef BaseCursorImpl _create_cursor_impl(self):
-        """
-        Internal method for creating an empty cursor implementation object.
-        """
-        raise NotImplementedError()
-
-    def _get_oci_attr(self, uint32_t handle_type, uint32_t attr_num,
-                      uint32_t attr_type):
-        errors._raise_not_supported("getting a connection OCI attribute")
-
-    def _set_oci_attr(self, uint32_t handle_type, uint32_t attr_num,
-                      uint32_t attr_type, object value):
-        errors._raise_not_supported("setting a connection OCI attribute")
-
-    def cancel(self):
-        errors._raise_not_supported("aborting a currently executing statement")
-
-    def change_password(self, old_password, new_password):
-        errors._raise_not_supported("changing a password")
-
-    def decode_oson(self, bytes data):
-        """
-        Decode OSON encoded bytes and return the object encoded in them.
-        """
-        cdef OsonDecoder decoder = OsonDecoder.__new__(OsonDecoder)
-        return decoder.decode(data)
-
-    def encode_oson(self, object value):
-        """
-        Return OSON encoded bytes encoded from the supplied object.
-        """
-        cdef OsonEncoder encoder = OsonEncoder.__new__(OsonEncoder)
-        encoder.encode(value, self._oson_max_fname_size)
-        return encoder._data[:encoder._pos]
-
-    def get_is_healthy(self):
-        errors._raise_not_supported("checking if the connection is healthy")
-
-    def close(self, in_del=False):
-        errors._raise_not_supported("closing a connection")
-
-    def commit(self):
-        errors._raise_not_supported("committing a transaction")
-
-    def create_cursor_impl(self, bint scrollable):
-        """
-        Create the cursor implementation object.
-        """
-        cdef BaseCursorImpl cursor_impl = self._create_cursor_impl()
-        cursor_impl.scrollable = scrollable
-        cursor_impl.arraysize = C_DEFAULTS.arraysize
-        cursor_impl.prefetchrows = C_DEFAULTS.prefetchrows
-        cursor_impl.fetch_lobs = C_DEFAULTS.fetch_lobs
-        cursor_impl.fetch_decimals = C_DEFAULTS.fetch_decimals
-        return cursor_impl
-
-    def create_msg_props_impl(self):
-        errors._raise_not_supported("creating a message property object")
-
-    def create_queue_impl(self):
-        errors._raise_not_supported("creating a queue")
-
-    def create_soda_database_impl(self, conn):
-        errors._raise_not_supported("creating a SODA database object")
-
-    def create_subscr_impl(self, object conn, object callback,
-                           uint32_t namespace, str name, uint32_t protocol,
-                           str ip_address, uint32_t port, uint32_t timeout,
-                           uint32_t operations, uint32_t qos,
-                           uint8_t grouping_class, uint32_t grouping_value,
-                           uint8_t grouping_type, bint client_initiated):
-        errors._raise_not_supported("creating a subscription")
-
-    def create_temp_lob_impl(self, DbType dbtype):
-        errors._raise_not_supported("creating a temporary LOB")
-
-    def direct_path_load(self, str schema_name, str table_name,
-                         list column_names, object data,
-                         uint32_t batch_size):
-        errors._raise_not_supported(
-            "loading data via the Direct Path Load interface"
-        )
-
-    def get_call_timeout(self):
-        errors._raise_not_supported("getting the call timeout")
-
-    def get_current_schema(self):
-        errors._raise_not_supported("getting the current schema")
-
-    def get_db_domain(self):
-        errors._raise_not_supported("getting the database domain name")
-
-    def get_db_name(self):
-        errors._raise_not_supported("getting the database name")
-
-    def get_edition(self):
-        errors._raise_not_supported("getting the edition")
-
-    def get_external_name(self):
-        errors._raise_not_supported("getting the external name")
-
-    def get_handle(self):
-        errors._raise_not_supported("getting the OCI service context handle")
-
-    def get_instance_name(self):
-        errors._raise_not_supported("getting the instance name")
-
-    def get_internal_name(self):
-        errors._raise_not_supported("getting the internal name")
-
-    def get_ltxid(self):
-        errors._raise_not_supported("getting the logical transaction id")
-
-    def get_max_identifier_length(self):
-        errors._raise_not_supported("getting the maximum identifier length")
-
-    def get_max_open_cursors(self):
-        errors._raise_not_supported(
-            "getting the maximum number of open cursors"
-        )
-
-    def get_sdu(self):
-        errors._raise_not_supported("getting the session data unit (SDU)")
-
-    def get_serial_num(self):
-        errors._raise_not_supported("getting the session serial number")
-
-    def get_service_name(self):
-        errors._raise_not_supported("getting the service name")
-
-    def get_session_id(self):
-        errors._raise_not_supported("getting the session id")
-
-    def get_stmt_cache_size(self):
-        errors._raise_not_supported("getting the statement cache size")
-
-    def get_transaction_in_progress(self):
-        errors._raise_not_supported("getting if a transaction is in progress")
-
-    def get_type(self, object conn, str name):
-        errors._raise_not_supported("getting an object type")
-
-    def ping(self):
-        errors._raise_not_supported("pinging the database")
-
-    def rollback(self):
-        errors._raise_not_supported("rolling back a transaction")
-
-    def set_action(self, value):
-        errors._raise_not_supported("setting the action")
-
-    def set_call_timeout(self, value):
-        errors._raise_not_supported("setting the call timeout")
-
-    def set_client_identifier(self, value):
-        errors._raise_not_supported("setting the client identifier")
-
-    def set_client_info(self, value):
-        errors._raise_not_supported("setting the client info")
-
-    def set_current_schema(self, value):
-        errors._raise_not_supported("setting the current schema")
-
-    def set_dbop(self, value):
-        errors._raise_not_supported("setting the database operation")
-
-    def set_econtext_id(self, value):
-        errors._raise_not_supported("setting the execution context id")
-
-    def set_external_name(self, value):
-        errors._raise_not_supported("setting the external name")
-
-    def set_internal_name(self, value):
-        errors._raise_not_supported("setting the internal name")
-
-    def set_module(self, value):
-        errors._raise_not_supported("setting the module")
-
-    def set_stmt_cache_size(self, value):
-        errors._raise_not_supported("setting the statement cache size")
-
-    def shutdown(self, uint32_t mode):
-        errors._raise_not_supported("shutting down the database")
-
-    def startup(self, bint force, bint restrict, str pfile):
-        errors._raise_not_supported("starting up the database")
-
-    def supports_pipelining(self):
-        return False
-
-    def tpc_begin(self, xid, uint32_t flags, uint32_t timeout):
-        errors._raise_not_supported(
-            "starting a TPC (two-phase commit) transaction"
-        )
-
-    def tpc_commit(self, xid, bint one_phase):
-        errors._raise_not_supported(
-            "committing a TPC (two-phase commit) transaction"
-        )
-
-    def tpc_end(self, xid, uint32_t flags):
-        errors._raise_not_supported(
-            "ending a TPC (two-phase commit) transaction"
-        )
-
-    def tpc_forget(self, xid):
-        errors._raise_not_supported(
-            "forgetting a TPC (two-phase commit) transaction"
-        )
-
-    def tpc_prepare(self, xid):
-        errors._raise_not_supported(
-            "preparing a TPC (two-phase commit) transaction"
-        )
-
-    def tpc_rollback(self, xid):
-        errors._raise_not_supported(
-            "rolling back a TPC (two-phase commit) transaction"
-        )
diff --git a/src/oracledb/impl/base/constants.pxi b/src/oracledb/impl/base/constants.pxi
deleted file mode 100644
index b8101316..00000000
--- a/src/oracledb/impl/base/constants.pxi
+++ /dev/null
@@ -1,120 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# constants.pxi
-#
-# Cython file defining constants used by the base implementation classes
-# (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-# base JSON constants
-cdef enum:
-    TNS_JSON_MAGIC_BYTE_1 = 0xff
-    TNS_JSON_MAGIC_BYTE_2 = 0x4a        # 'J'
-    TNS_JSON_MAGIC_BYTE_3 = 0x5a        # 'Z'
-    TNS_JSON_VERSION_MAX_FNAME_255 = 1
-    TNS_JSON_VERSION_MAX_FNAME_65535 = 3
-    TNS_JSON_FLAG_HASH_ID_UINT8 = 0x0100
-    TNS_JSON_FLAG_NUM_FNAMES_UINT16 = 0x0400
-    TNS_JSON_FLAG_FNAMES_SEG_UINT32 = 0x0800
-    TNS_JSON_FLAG_TINY_NODES_STAT = 0x2000
-    TNS_JSON_FLAG_TREE_SEG_UINT32 = 0x1000
-    TNS_JSON_FLAG_REL_OFFSET_MODE = 0x01
-    TNS_JSON_FLAG_INLINE_LEAF = 0x02
-    TNS_JSON_FLAG_LEN_IN_PCODE = 0x04
-    TNS_JSON_FLAG_NUM_FNAMES_UINT32 = 0x08
-    TNS_JSON_FLAG_IS_SCALAR = 0x10
-    TNS_JSON_FLAG_SEC_FNAMES_SEG_UINT16 = 0x0100
-
-# JSON data types
-cdef enum:
-    TNS_JSON_TYPE_NULL = 0x30
-    TNS_JSON_TYPE_TRUE = 0x31
-    TNS_JSON_TYPE_FALSE = 0x32
-    TNS_JSON_TYPE_STRING_LENGTH_UINT8 = 0x33
-    TNS_JSON_TYPE_NUMBER_LENGTH_UINT8 = 0x34
-    TNS_JSON_TYPE_BINARY_DOUBLE = 0x36
-    TNS_JSON_TYPE_STRING_LENGTH_UINT16 = 0x37
-    TNS_JSON_TYPE_STRING_LENGTH_UINT32 = 0x38
-    TNS_JSON_TYPE_TIMESTAMP = 0x39
-    TNS_JSON_TYPE_BINARY_LENGTH_UINT16 = 0x3a
-    TNS_JSON_TYPE_BINARY_LENGTH_UINT32 = 0x3b
-    TNS_JSON_TYPE_DATE = 0x3c
-    TNS_JSON_TYPE_INTERVAL_YM = 0x3d
-    TNS_JSON_TYPE_INTERVAL_DS = 0x3e
-    TNS_JSON_TYPE_TIMESTAMP_TZ = 0x7c
-    TNS_JSON_TYPE_TIMESTAMP7 = 0x7d
-    TNS_JSON_TYPE_ID = 0x7e
-    TNS_JSON_TYPE_BINARY_FLOAT = 0x7f
-    TNS_JSON_TYPE_OBJECT = 0x84
-    TNS_JSON_TYPE_ARRAY = 0xc0
-    TNS_JSON_TYPE_EXTENDED = 0x7b
-    TNS_JSON_TYPE_VECTOR = 0x01
-
-# VECTOR constants
-cdef enum:
-    TNS_VECTOR_MAGIC_BYTE = 0xDB
-    TNS_VECTOR_VERSION_BASE = 0
-    TNS_VECTOR_VERSION_WITH_BINARY = 1
-    TNS_VECTOR_VERSION_WITH_SPARSE = 2
-
-# VECTOR flags
-cdef enum:
-    TNS_VECTOR_FLAG_NORM = 0x0002
-    TNS_VECTOR_FLAG_NORM_RESERVED = 0x0010
-    TNS_VECTOR_FLAG_SPARSE = 0x0020
-
-# data type buffer sizes
-cdef enum:
-    ORA_TYPE_SIZE_BINARY_DOUBLE = 8
-    ORA_TYPE_SIZE_BINARY_FLOAT = 4
-    ORA_TYPE_SIZE_BOOLEAN = 4
-    ORA_TYPE_SIZE_DATE = 7
-    ORA_TYPE_SIZE_INTERVAL_DS = 11
-    ORA_TYPE_SIZE_INTERVAL_YM = 5
-    ORA_TYPE_SIZE_MAX = 22
-    ORA_TYPE_SIZE_NUMBER = 22
-    ORA_TYPE_SIZE_ROWID = 18
-    ORA_TYPE_SIZE_TIMESTAMP = 11
-    ORA_TYPE_SIZE_TIMESTAMP_TZ = 13
-
-
-# general constants
-cdef enum:
-    TNS_MAX_SHORT_LENGTH = 252
-    TNS_DURATION_MID = 0x80000000
-    TNS_DURATION_OFFSET = 60
-    TNS_CHUNK_SIZE = 32767
-    TNS_HAS_REGION_ID = 0x80
-
-# timezone offsets
-cdef enum:
-    TZ_HOUR_OFFSET = 20
-    TZ_MINUTE_OFFSET = 60
-
-# list of characters that are valid in a network name
-cdef str VALID_NETWORK_NAME_CHARS = (
-    string.ascii_letters + string.digits + '"' + r"'<>/\,.:;-_$+*#&!%?@"
-)
diff --git a/src/oracledb/impl/base/converters.pyx b/src/oracledb/impl/base/converters.pyx
deleted file mode 100644
index fa4d0adb..00000000
--- a/src/oracledb/impl/base/converters.pyx
+++ /dev/null
@@ -1,722 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# converters.pyx
-#
-# Cython file defining the low-level methods for converting the intermediate
-# form returned by the decoders to an appropriate Python value.
-#------------------------------------------------------------------------------
-
-cdef object convert_arrow_to_oracle_data(OracleMetadata metadata,
-                                         OracleData* data,
-                                         ArrowArrayImpl array_impl,
-                                         ssize_t array_index):
-    """
-    Converts the value stored in Arrow format to an OracleData structure.
-    """
-    cdef:
-        int64_t int_value, days, seconds, useconds
-        SparseVectorImpl sparse_impl
-        uint32_t db_type_num
-        ArrowType arrow_type
-        uint64_t uint_value
-        OracleRawBytes* rb
-        tuple sparse_info
-        bytes temp_bytes
-        ssize_t buf_len
-        char buf[21]
-
-    arrow_type = metadata._schema_impl.arrow_type
-    db_type_num = metadata.dbtype.num
-    if arrow_type in (
-        NANOARROW_TYPE_INT8,
-        NANOARROW_TYPE_INT16,
-        NANOARROW_TYPE_INT32,
-        NANOARROW_TYPE_INT64,
-    ):
-        array_impl.get_int(arrow_type, array_index, &data.is_null, &int_value)
-        if not data.is_null:
-            buf_len = PyOS_snprintf(buf, sizeof(buf), "%lld", int_value)
-            temp_bytes = buf[:buf_len]
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-    elif arrow_type in (
-        NANOARROW_TYPE_UINT8,
-        NANOARROW_TYPE_UINT16,
-        NANOARROW_TYPE_UINT32,
-        NANOARROW_TYPE_UINT64,
-    ):
-        array_impl.get_uint(arrow_type, array_index, &data.is_null, &uint_value)
-        if not data.is_null:
-            buf_len = PyOS_snprintf(buf, sizeof(buf), "%llu", uint_value)
-            temp_bytes = buf[:buf_len]
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-    elif arrow_type == NANOARROW_TYPE_DOUBLE:
-        array_impl.get_double(array_index, &data.is_null,
-                              &data.buffer.as_double)
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            temp_bytes = str(data.buffer.as_double).encode()
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-        elif db_type_num == DB_TYPE_NUM_BINARY_FLOAT:
-            data.buffer.as_float = <float> data.buffer.as_double
-    elif arrow_type == NANOARROW_TYPE_FLOAT:
-        array_impl.get_float(array_index, &data.is_null, &data.buffer.as_float)
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            temp_bytes = str(data.buffer.as_float).encode()
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-        elif db_type_num == DB_TYPE_NUM_BINARY_DOUBLE:
-            data.buffer.as_double = <double> data.buffer.as_float
-    elif arrow_type == NANOARROW_TYPE_BOOL:
-        array_impl.get_bool(array_index, &data.is_null, &data.buffer.as_bool)
-    elif arrow_type in (
-            NANOARROW_TYPE_BINARY,
-            NANOARROW_TYPE_STRING,
-            NANOARROW_TYPE_FIXED_SIZE_BINARY,
-            NANOARROW_TYPE_LARGE_BINARY,
-            NANOARROW_TYPE_LARGE_STRING
-    ):
-        rb = &data.buffer.as_raw_bytes
-        array_impl.get_bytes(array_index, &data.is_null, <char**> &rb.ptr,
-                             &rb.num_bytes)
-        if rb.num_bytes == 0:
-            data.is_null = True
-        elif db_type_num == DB_TYPE_NUM_LONG_NVARCHAR:
-            temp_bytes = rb.ptr[:rb.num_bytes].decode().encode(ENCODING_UTF16)
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-    elif arrow_type in (NANOARROW_TYPE_TIMESTAMP, NANOARROW_TYPE_DATE64):
-        array_impl.get_int(arrow_type, array_index, &data.is_null, &int_value)
-        if not data.is_null:
-            seconds = int_value // array_impl.schema_impl.time_factor
-            useconds = int_value % array_impl.schema_impl.time_factor
-            days = seconds // (24 * 60 * 60)
-            seconds = seconds % (24 * 60 * 60)
-            if array_impl.schema_impl.time_factor == 1_000:
-                useconds *= 1_000
-            elif array_impl.schema_impl.time_factor == 1_000_000_000:
-                useconds //= 1_000
-            return EPOCH_DATE + \
-                    cydatetime.timedelta_new(days, seconds, useconds)
-    elif arrow_type == NANOARROW_TYPE_DATE32:
-        array_impl.get_int(arrow_type, array_index, &data.is_null, &int_value)
-        if not data.is_null:
-            return EPOCH_DATE + cydatetime.timedelta_new(int_value, 0, 0)
-    elif arrow_type == NANOARROW_TYPE_DECIMAL128:
-        temp_bytes = array_impl.get_decimal(array_index, &data.is_null)
-        if not data.is_null:
-            convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-            return temp_bytes
-    elif arrow_type in (NANOARROW_TYPE_LIST, NANOARROW_TYPE_FIXED_SIZE_LIST):
-        return array_impl.get_vector(array_index, &data.is_null)
-    elif arrow_type == NANOARROW_TYPE_STRUCT:
-        sparse_info = array_impl.get_sparse_vector(array_index, &data.is_null)
-        if sparse_info is not None:
-            sparse_impl = SparseVectorImpl.__new__(SparseVectorImpl)
-            sparse_impl.num_dimensions = sparse_info[0]
-            sparse_impl.indices = sparse_info[1]
-            sparse_impl.values = sparse_info[2]
-            return PY_TYPE_SPARSE_VECTOR._from_impl(sparse_impl)
-
-
-cdef cydatetime.datetime convert_date_to_python(OracleDataBuffer *buffer):
-    """
-    Converts a DATE, TIMESTAMP, TIMESTAMP WITH LOCAL TIME ZONE or TIMESTAMP
-    WITH TIMEZONE value stored in the buffer to Python datetime.datetime().
-    """
-    cdef:
-        OracleDate *value = &buffer.as_date
-        cydatetime.datetime output
-        int32_t seconds
-    output = cydatetime.datetime_new(value.year, value.month, value.day,
-                                     value.hour, value.minute, value.second,
-                                     value.fsecond, None)
-    if value.tz_hour_offset != 0 or value.tz_minute_offset != 0:
-        seconds = value.tz_hour_offset * 3600 + value.tz_minute_offset * 60
-        output += cydatetime.timedelta_new(0, seconds, 0)
-    return output
-
-
-cdef int convert_date_to_arrow_date32(ArrowArrayImpl array_impl,
-                                      OracleDataBuffer *buffer) except -1:
-    """
-    Converts a DATE, TIMESTAMP, TIMESTAMP WITH LOCAL TIME ZONE or TIMESTMP
-    WITH TIMEZONE value stored in the buffer to Arrow date32.
-    """
-    cdef:
-        cydatetime.timedelta td
-        cydatetime.datetime dt
-        int32_t days
-    dt = convert_date_to_python(buffer)
-    td = dt - EPOCH_DATE
-    days = td.days
-    array_impl.append_int(days)
-
-
-cdef int convert_date_to_arrow_timestamp(ArrowArrayImpl array_impl,
-                                         OracleDataBuffer *buffer) except -1:
-    """
-    Converts a DATE, TIMESTAMP, TIMESTAMP WITH LOCAL TIME ZONE or TIMESTAMP
-    WITH TIMEZONE value stored in the buffer to Arrow timestamp.
-    """
-    cdef:
-        cydatetime.timedelta td
-        cydatetime.datetime dt
-        int64_t ts, us
-    dt = convert_date_to_python(buffer)
-    td = dt - EPOCH_DATE
-    ts = (<int64_t> cydatetime.timedelta_days(td)) * (24 * 60 * 60) + \
-            cydatetime.timedelta_seconds(td)
-    ts *= array_impl.schema_impl.time_factor
-    us = cydatetime.timedelta_microseconds(td)
-    if array_impl.schema_impl.time_factor == 1_000:
-        ts += us // 1_000
-    elif array_impl.schema_impl.time_factor == 1_000_000:
-        ts += us
-    elif array_impl.schema_impl.time_factor != 1:
-        ts += us * 1_000
-    array_impl.append_int(ts)
-
-
-cdef object convert_interval_ds_to_python(OracleDataBuffer *buffer):
-    """
-    Converts an INTERVAL DAYS TO SECONDS value stored in the buffer to Python
-    datetime.timedelta().
-    """
-    cdef:
-        OracleIntervalDS *value = &buffer.as_interval_ds
-        int32_t total_seconds
-    total_seconds = value.hours * 60 * 60 + value.minutes * 60 + value.seconds
-    return cydatetime.timedelta_new(value.days, total_seconds,
-                                    value.fseconds // 1000)
-
-
-cdef object convert_interval_ym_to_python(OracleDataBuffer *buffer):
-    """
-    Converts an INTERVAL YEARS TO MONTHS value stored in the buffer to Python
-    oracledb.IntervalYM().
-    """
-    cdef OracleIntervalYM *value = &buffer.as_interval_ym
-    return PY_TYPE_INTERVAL_YM(value.years, value.months)
-
-
-cdef int convert_number_to_arrow_decimal(ArrowArrayImpl array_impl,
-                                         OracleDataBuffer *buffer) except -1:
-    """
-    Converts a NUMBER value stored in the buffer to Arrow DECIMAL128.
-    """
-    cdef:
-        OracleNumber *value = &buffer.as_number
-        uint8_t num_digits, allowed_max_chars
-        char_type digits[40]
-        uint8_t actual_scale
-
-    # determine if the number can be represented as an Arrow decimal128 value
-    # only 38 decimal digits are permitted (excluding the sign and decimal
-    # point)
-    allowed_max_chars = 38
-    if value.chars[0] == b'-':
-        allowed_max_chars += 1
-    if not value.is_integer:
-        allowed_max_chars += 1
-    if value.is_max_negative_value or value.num_chars > allowed_max_chars:
-        raise ValueError("Value cannot be represented as Arrow Decimal128")
-
-    # integers can be handled directly
-    if value.is_integer and array_impl.schema_impl.scale == 0:
-        return array_impl.append_decimal(value.chars, value.num_chars)
-
-    # Arrow expects a string of digits without the decimal point; if the number
-    # does not contain at least the number of digits after the decimal point
-    # required by the scale of the Arrow array, zeros are appended
-    if value.is_integer:
-        actual_scale = 0
-        num_digits = value.num_chars
-    else:
-        actual_scale = 0
-        while True:
-            num_digits = value.num_chars - actual_scale - 1
-            if value.chars[num_digits] == b'.':
-                break
-            actual_scale += 1
-    memcpy(digits, value.chars, num_digits)
-    if actual_scale > 0:
-        memcpy(&digits[num_digits], &value.chars[num_digits + 1], actual_scale)
-        num_digits += actual_scale
-    while actual_scale < array_impl.schema_impl.scale:
-        digits[num_digits] = b'0'
-        num_digits += 1
-        actual_scale += 1
-    array_impl.append_decimal(digits, num_digits)
-
-
-cdef int convert_number_to_arrow_double(ArrowArrayImpl array_impl,
-                                        OracleDataBuffer *buffer) except -1:
-    """
-    Converts a NUMBER value stored in the buffer to Arrow DOUBLE.
-    """
-    cdef:
-        OracleNumber *value = &buffer.as_number
-        double double_value
-    if value.is_max_negative_value:
-        array_impl.append_double(-1.0e126)
-    else:
-        errno.errno = 0
-        double_value = strtod((<const char*> value.chars), NULL)
-        if errno.errno != 0:
-            errors._raise_err(errors.ERR_CANNOT_CONVERT_TO_ARROW_DOUBLE,
-                              value=value.chars[:value.num_chars].decode())
-        array_impl.append_double(double_value)
-
-
-cdef int convert_number_to_arrow_float(ArrowArrayImpl array_impl,
-                                       OracleDataBuffer *buffer) except -1:
-    """
-    Converts a NUMBER value stored in the buffer to Arrow float
-    """
-    cdef:
-        OracleNumber *value = &buffer.as_number
-        float float_value
-    if value.is_max_negative_value:
-        array_impl.append_float(-1.0e126)
-    else:
-        errno.errno = 0
-        float_value = strtof((<const char*> value.chars), NULL)
-        if errno.errno != 0:
-            errors._raise_err(errors.ERR_CANNOT_CONVERT_TO_ARROW_FLOAT,
-                              value=value.chars[:value.num_chars].decode())
-        array_impl.append_float(float_value)
-
-
-cdef int convert_number_to_arrow_int(ArrowArrayImpl array_impl,
-                                     OracleDataBuffer *buffer) except -1:
-    """
-    Converts a NUMBER value stored in the buffer to an Arrow integer.
-    """
-    cdef:
-        OracleNumber *value = &buffer.as_number
-        int64_t int64_value
-    errno.errno = 0
-    int64_value = strtoll((<const char*> value.chars), NULL, 0)
-    if errno.errno != 0:
-        errors._raise_err(errors.ERR_CANNOT_CONVERT_TO_ARROW_INTEGER,
-                          value=value.chars[:value.num_chars].decode())
-    array_impl.append_int(int64_value)
-
-
-cdef int convert_number_to_arrow_uint(ArrowArrayImpl array_impl,
-                                      OracleDataBuffer *buffer) except -1:
-    """
-    Converts a NUMBER value stored in the buffer to an Arrow unsigned integer.
-    """
-    cdef:
-        OracleNumber *value = &buffer.as_number
-        uint64_t uint64_value
-    errno.errno = 0
-    uint64_value = strtoull((<const char*> value.chars), NULL, 0)
-    if errno.errno != 0:
-        errors._raise_err(errors.ERR_CANNOT_CONVERT_TO_ARROW_INTEGER,
-                          value=value.chars[:value.num_chars].decode())
-    array_impl.append_uint(uint64_value)
-
-
-cdef object convert_number_to_python_decimal(OracleDataBuffer *buffer):
-    """
-    Converts a NUMBER value stored in the buffer to Python decimal.Decimal().
-    """
-    cdef OracleNumber *value = &buffer.as_number
-    if value.is_max_negative_value:
-        return PY_TYPE_DECIMAL("-1e126")
-    return PY_TYPE_DECIMAL(value.chars[:value.num_chars].decode())
-
-
-cdef object convert_number_to_python_float(OracleDataBuffer *buffer):
-    """
-    Converts a NUMBER value stored in the buffer to Python float.
-    """
-    cdef OracleNumber *value = &buffer.as_number
-    if value.is_max_negative_value:
-        return -1.0e126
-    return float(value.chars[:value.num_chars])
-
-
-cdef object convert_number_to_python_int(OracleDataBuffer *buffer):
-    """
-    Converts a NUMBER value stored in the buffer to Python integer, if
-    possible. If the value is not an integer, a float is returned instead.
-    """
-    cdef OracleNumber *value = &buffer.as_number
-    if value.is_max_negative_value:
-        return -10 ** 126
-    elif value.is_integer:
-        return int(value.chars[:value.num_chars])
-    return float(value.chars[:value.num_chars])
-
-
-cdef object convert_number_to_python_str(OracleDataBuffer *buffer):
-    """
-    Converts a NUMBER value stored in the buffer to Python string.
-    """
-    cdef OracleNumber *value = &buffer.as_number
-    if value.is_max_negative_value:
-        return "-1e126"
-    return value.chars[:value.num_chars].decode()
-
-
-cdef object convert_raw_to_python(OracleDataBuffer *buffer):
-    """
-    Converts a RAW or LONG RAW value stored in the buffer to Python bytes.
-    """
-    cdef OracleRawBytes *rb = &buffer.as_raw_bytes
-    return rb.ptr[:rb.num_bytes]
-
-
-cdef int convert_bytes_to_oracle_data(OracleDataBuffer *buffer,
-                                      bytes value) except -1:
-    """
-    Converts Python bytes to the format required by the OracleDataBuffer.
-    """
-    cdef OracleRawBytes *rb = &buffer.as_raw_bytes
-    cpython.PyBytes_AsStringAndSize(value, <char**> &rb.ptr, &rb.num_bytes)
-
-
-cdef int convert_str_to_arrow(ArrowArrayImpl array_impl,
-                              OracleDataBuffer *buffer) except -1:
-    """
-    Converts a CHAR, NCHAR, LONG, VARCHAR, or NVARCHAR value stored in the
-    buffer to an Arrow string.
-    """
-    cdef OracleRawBytes *rb = &buffer.as_raw_bytes
-    array_impl.append_bytes(<void*> rb.ptr, rb.num_bytes)
-
-
-cdef object convert_str_to_python(OracleDataBuffer *buffer, uint8_t csfrm,
-                                  const char* encoding_errors):
-    """
-    Converts a CHAR, NCHAR, LONG, VARCHAR, or NVARCHAR value stored in the
-    buffer to Python string.
-    """
-    cdef OracleRawBytes *rb = &buffer.as_raw_bytes
-    if csfrm == CS_FORM_IMPLICIT:
-        return rb.ptr[:rb.num_bytes].decode(ENCODING_UTF8, encoding_errors)
-    return rb.ptr[:rb.num_bytes].decode(ENCODING_UTF16, encoding_errors)
-
-
-cdef int convert_oracle_data_to_arrow(OracleMetadata from_metadata,
-                                      OracleMetadata to_metadata,
-                                      OracleData* data,
-                                      ArrowArrayImpl array_impl) except -1:
-    """
-    Converts the value stored in OracleData to Arrow format.
-    """
-    cdef:
-        ArrowType arrow_type
-        uint32_t db_type_num
-
-    # NULL values
-    if data.is_null:
-        return array_impl.append_null()
-
-    arrow_type = to_metadata._schema_impl.arrow_type
-    db_type_num = from_metadata.dbtype.num
-    if arrow_type in (
-        NANOARROW_TYPE_INT8,
-        NANOARROW_TYPE_INT16,
-        NANOARROW_TYPE_INT32,
-        NANOARROW_TYPE_INT64,
-    ):
-        convert_number_to_arrow_int(array_impl, &data.buffer)
-    elif arrow_type in (
-        NANOARROW_TYPE_UINT8,
-        NANOARROW_TYPE_UINT16,
-        NANOARROW_TYPE_UINT32,
-        NANOARROW_TYPE_UINT64,
-    ):
-        convert_number_to_arrow_uint(array_impl, &data.buffer)
-    elif arrow_type == NANOARROW_TYPE_DOUBLE:
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            convert_number_to_arrow_double(array_impl, &data.buffer)
-        elif db_type_num == DB_TYPE_NUM_BINARY_FLOAT:
-            array_impl.append_float(data.buffer.as_float)
-        else:
-            array_impl.append_double(data.buffer.as_double)
-    elif arrow_type == NANOARROW_TYPE_FLOAT:
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            convert_number_to_arrow_float(array_impl, &data.buffer)
-        elif db_type_num == DB_TYPE_NUM_BINARY_DOUBLE:
-            array_impl.append_double(data.buffer.as_double)
-        else:
-            array_impl.append_float(data.buffer.as_float)
-    elif arrow_type == NANOARROW_TYPE_BOOL:
-        array_impl.append_int(data.buffer.as_bool)
-    elif arrow_type in (
-        NANOARROW_TYPE_BINARY,
-        NANOARROW_TYPE_STRING,
-        NANOARROW_TYPE_FIXED_SIZE_BINARY,
-        NANOARROW_TYPE_LARGE_BINARY,
-        NANOARROW_TYPE_LARGE_STRING
-    ):
-        convert_str_to_arrow(array_impl, &data.buffer)
-    elif arrow_type in (
-        NANOARROW_TYPE_DATE64,
-        NANOARROW_TYPE_TIMESTAMP
-    ):
-        convert_date_to_arrow_timestamp(array_impl, &data.buffer)
-    elif arrow_type == NANOARROW_TYPE_DATE32:
-        convert_date_to_arrow_date32(array_impl, &data.buffer)
-    elif arrow_type == NANOARROW_TYPE_DECIMAL128:
-        convert_number_to_arrow_decimal(array_impl, &data.buffer)
-
-
-cdef object convert_oracle_data_to_python(OracleMetadata from_metadata,
-                                          OracleMetadata to_metadata,
-                                          OracleData* data,
-                                          const char* encoding_errors,
-                                          bint from_dbobject):
-    """
-    Converts the value stored in OracleData to a Python object.
-    """
-    cdef:
-        uint8_t py_type_num, ora_type_num, csfrm
-
-    # NULL values
-    if data.is_null:
-        return None
-
-    # reduce typing
-    ora_type_num = from_metadata.dbtype._ora_type_num
-    csfrm = from_metadata.dbtype._csfrm
-    py_type_num = to_metadata._py_type_num
-
-    # Python bytes
-    if py_type_num == PY_TYPE_NUM_BYTES:
-
-        # Oracle RAW, LONG RAW
-        # Oracle CHAR, LONG and VARCHAR (bypass decode)
-        if ora_type_num in (
-            ORA_TYPE_NUM_CHAR,
-            ORA_TYPE_NUM_LONG,
-            ORA_TYPE_NUM_LONG_RAW,
-            ORA_TYPE_NUM_RAW,
-            ORA_TYPE_NUM_VARCHAR
-        ):
-            return convert_raw_to_python(&data.buffer)
-
-    # Python string
-    elif py_type_num == PY_TYPE_NUM_STR:
-
-        # Oracle CHAR, LONG and VARCHAR
-        if ora_type_num in (
-            ORA_TYPE_NUM_CHAR,
-            ORA_TYPE_NUM_LONG,
-            ORA_TYPE_NUM_VARCHAR
-        ):
-            return convert_str_to_python(&data.buffer, csfrm, encoding_errors)
-
-        # Oracle NUMBER
-        elif ora_type_num == ORA_TYPE_NUM_NUMBER:
-            return convert_number_to_python_str(&data.buffer)
-
-        # Oracle BINARY_DOUBLE
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            return str(data.buffer.as_double)
-
-        # Oracle BINARY_FLOAT
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            return str(data.buffer.as_float)
-
-        # Oracle DATE, TIMESTAMP (WITH (LOCAL) TIME ZONE)
-        elif ora_type_num in (
-            ORA_TYPE_NUM_DATE,
-            ORA_TYPE_NUM_TIMESTAMP,
-            ORA_TYPE_NUM_TIMESTAMP_LTZ,
-            ORA_TYPE_NUM_TIMESTAMP_TZ
-        ):
-            return str(convert_date_to_python(&data.buffer))
-
-        # Oracle INTERVAL DAY TO SECOND
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-            return str(convert_interval_ds_to_python(&data.buffer))
-
-        # Oracle INTERVAL YEAR TO MONTH
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-            return str(convert_interval_ym_to_python(&data.buffer))
-
-    # Python integer (or float if data is not an integer)
-    elif py_type_num == PY_TYPE_NUM_INT:
-
-        # Oracle BINARY_INTEGER within a DbObject
-        if from_dbobject and ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-            return data.buffer.as_integer
-
-        # Oracle NUMBER, BINARY_INTEGER
-        elif ora_type_num in (ORA_TYPE_NUM_NUMBER,
-                              ORA_TYPE_NUM_BINARY_INTEGER):
-            if to_metadata.dbtype._ora_type_num != ORA_TYPE_NUM_BINARY_INTEGER:
-                return convert_number_to_python_int(&data.buffer)
-            value = convert_number_to_python_str(&data.buffer)
-            return int(PY_TYPE_DECIMAL(value))
-
-        # Oracle CHAR, LONG, VARCHAR
-        elif ora_type_num in (
-            ORA_TYPE_NUM_CHAR,
-            ORA_TYPE_NUM_LONG,
-            ORA_TYPE_NUM_VARCHAR
-        ):
-            value = convert_str_to_python(&data.buffer, csfrm, encoding_errors)
-            return int(PY_TYPE_DECIMAL(value))
-
-        # Oracle BINARY_DOUBLE
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            return int(PY_TYPE_DECIMAL(data.buffer.as_double))
-
-        # Oracle BINARY_FLOAT
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            return int(PY_TYPE_DECIMAL(data.buffer.as_float))
-
-    # Python decimal.Decimal
-    elif py_type_num == PY_TYPE_NUM_DECIMAL:
-
-        # Oracle NUMBER
-        if ora_type_num == ORA_TYPE_NUM_NUMBER:
-            return convert_number_to_python_decimal(&data.buffer)
-
-    # Python float
-    elif py_type_num == PY_TYPE_NUM_FLOAT:
-
-        # Oracle NUMBER
-        if ora_type_num == ORA_TYPE_NUM_NUMBER:
-            return convert_number_to_python_float(&data.buffer)
-
-        # Oracle BINARY_DOUBLE
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            return data.buffer.as_double
-
-        # Oracle BINARY_FLOAT
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            return data.buffer.as_float
-
-        # Oracle CHAR, LONG, VARCHAR
-        elif ora_type_num in (
-            ORA_TYPE_NUM_CHAR,
-            ORA_TYPE_NUM_LONG,
-            ORA_TYPE_NUM_VARCHAR
-        ):
-            rb = &data.buffer.as_raw_bytes
-            return float(rb.ptr[:rb.num_bytes])
-
-    # Python datetime.datetime
-    elif py_type_num == PY_TYPE_NUM_DATETIME:
-
-        # Oracle DATE, TIMESTAMP, TIMESTAMP WITH LOCAL TIMEZONE,
-        # TIMESTAMP WITH TIMEZONE
-        if ora_type_num in (
-            ORA_TYPE_NUM_DATE,
-            ORA_TYPE_NUM_TIMESTAMP,
-            ORA_TYPE_NUM_TIMESTAMP_LTZ,
-            ORA_TYPE_NUM_TIMESTAMP_TZ
-        ):
-            return convert_date_to_python(&data.buffer)
-
-    # Python datetime.timedelta
-    elif py_type_num == PY_TYPE_NUM_TIMEDELTA:
-
-        # Oracle INTERVAL DAY TO SECOND
-        if ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-            return convert_interval_ds_to_python(&data.buffer)
-
-    # Python oracledb.OracleIntervalYM
-    elif py_type_num == PY_TYPE_NUM_ORACLE_INTERVAL_YM:
-
-        # Oracle INTERVAL YEAR TO MONTH
-        if ora_type_num == ORA_TYPE_NUM_INTERVAL_YM:
-            return convert_interval_ym_to_python(&data.buffer)
-
-    # Python boolean
-    elif py_type_num == PY_TYPE_NUM_BOOL:
-
-        # Oracle BOOLEAN
-        if ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-            return data.buffer.as_bool
-
-    errors._raise_err(errors.ERR_INCONSISTENT_DATATYPES,
-                      input_type=from_metadata.dbtype.name,
-                      output_type=to_metadata.dbtype.name)
-
-
-cdef object convert_python_to_oracle_data(OracleMetadata metadata,
-                                          OracleData* data,
-                                          object value):
-    """
-    Converts a Python value to the OracleData structure. The object returned is
-    any temporary object that is required to be retained (if any).
-    """
-    cdef:
-        uint8_t ora_type_num = metadata.dbtype._ora_type_num
-        bytes temp_bytes
-    data.is_null = value is None
-    if data.is_null:
-        return None
-    elif ora_type_num in (ORA_TYPE_NUM_VARCHAR,
-                          ORA_TYPE_NUM_CHAR,
-                          ORA_TYPE_NUM_LONG):
-        if metadata.dbtype._csfrm == CS_FORM_IMPLICIT:
-            temp_bytes = (<str> value).encode()
-        else:
-            temp_bytes = (<str> value).encode(ENCODING_UTF16)
-        convert_bytes_to_oracle_data(&data.buffer, temp_bytes)
-        if data.buffer.as_raw_bytes.num_bytes == 0:
-            data.is_null = True
-        return temp_bytes
-    elif ora_type_num in (ORA_TYPE_NUM_RAW, ORA_TYPE_NUM_LONG_RAW):
-        convert_bytes_to_oracle_data(&data.buffer, value)
-    elif ora_type_num in (ORA_TYPE_NUM_NUMBER, ORA_TYPE_NUM_BINARY_INTEGER):
-        if isinstance(value, bool):
-            return b'1' if value is True else b'0'
-        return (<str> cpython.PyObject_Str(value)).encode()
-    elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-        data.buffer.as_float = value
-    elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-        data.buffer.as_double = value
-    elif ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-        data.buffer.as_bool = value
-    return value
-
-
-cdef int convert_vector_to_arrow(ArrowArrayImpl array_impl,
-                                 object vector) except -1:
-    """
-    Converts the vector to the format required by the Arrow array.
-    """
-    if vector is None:
-        array_impl.append_null()
-    elif isinstance(vector, PY_TYPE_SPARSE_VECTOR):
-        array_impl.append_sparse_vector(vector.num_dimensions,
-                                         <array.array> vector.indices,
-                                         <array.array> vector.values)
-    else:
-        array_impl.append_vector(<array.array> vector)
diff --git a/src/oracledb/impl/base/cursor.pyx b/src/oracledb/impl/base/cursor.pyx
deleted file mode 100644
index 54978d2b..00000000
--- a/src/oracledb/impl/base/cursor.pyx
+++ /dev/null
@@ -1,704 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# cursor.pyx
-#
-# Cython file defining the base Cursor implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseCursorImpl:
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef int _bind_values(self,
-                          object cursor,
-                          object type_handler,
-                          object params,
-                          uint32_t num_rows,
-                          uint32_t row_num,
-                          bint defer_type_assignment) except -1:
-        """
-        Internal method used for binding values.
-        """
-        if self.bind_vars is None:
-            self.bind_vars = []
-        if isinstance(params, dict):
-            if self.bind_style is None:
-                self.bind_style = dict
-                self.bind_vars_by_name = {}
-            elif self.bind_style is not dict:
-                errors._raise_err(errors.ERR_MIXED_POSITIONAL_AND_NAMED_BINDS)
-            self._bind_values_by_name(cursor, type_handler, <dict> params,
-                                      num_rows, row_num, defer_type_assignment)
-        elif cpython.PySequence_Check(params):
-            if self.bind_style is None:
-                self.bind_style = list
-            elif self.bind_style is not list:
-                errors._raise_err(errors.ERR_MIXED_POSITIONAL_AND_NAMED_BINDS)
-            self._bind_values_by_position(cursor, type_handler, params,
-                                          num_rows, row_num,
-                                          defer_type_assignment)
-        else:
-            errors._raise_err(errors.ERR_WRONG_EXECUTEMANY_PARAMETERS_TYPE)
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef int _bind_values_by_name(self,
-                                  object cursor,
-                                  object type_handler,
-                                  dict params,
-                                  uint32_t num_rows,
-                                  uint32_t row_num,
-                                  bint defer_type_assignment) except -1:
-        """
-        Internal method used for binding values by name.
-        """
-        cdef:
-            BindVar bind_var
-            object conn
-            ssize_t pos
-        conn = cursor.connection
-        for name, value in params.items():
-            bind_var = <BindVar> self.bind_vars_by_name.get(name)
-            if bind_var is None:
-                pos = len(self.bind_vars_by_name)
-                if pos < len(self.bind_vars):
-                    bind_var = <BindVar> self.bind_vars[pos]
-                else:
-                    bind_var = BindVar.__new__(BindVar)
-                    self.bind_vars.append(bind_var)
-                bind_var.name = name
-                self.bind_vars_by_name[name] = bind_var
-            bind_var._set_by_value(conn, self, cursor, value, type_handler,
-                                   row_num, num_rows, defer_type_assignment)
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef int _bind_values_by_position(self,
-                                      object cursor,
-                                      object type_handler,
-                                      object params,
-                                      uint32_t num_rows,
-                                      uint32_t row_num,
-                                      bint defer_type_assignment) except -1:
-        """
-        Internal method used for binding values by position.
-        """
-        cdef:
-            BindVar bind_var
-            object conn
-            ssize_t i
-        conn = cursor.connection
-        for i, value in enumerate(params):
-            if i < len(self.bind_vars):
-                bind_var = <BindVar> self.bind_vars[i]
-            else:
-                bind_var = BindVar.__new__(BindVar)
-                bind_var.pos = i + 1
-                self.bind_vars.append(bind_var)
-            bind_var._set_by_value(conn, self, cursor, value, type_handler,
-                                   row_num, num_rows, defer_type_assignment)
-
-    def _build_json_converter_fn(self):
-        """
-        Internal method for building a JSON converter function.
-        """
-        def converter(value):
-            if isinstance(value, PY_TYPE_LOB):
-                value = value.read()
-            if isinstance(value, bytes):
-                value = value.decode()
-            if value:
-                return json.loads(value)
-        return converter
-
-    cdef int _close(self, bint in_del) except -1:
-        """
-        Internal method for closing the cursor.
-        """
-        raise NotImplementedError()
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef BaseVarImpl _create_fetch_var(self, object conn, object cursor,
-                                       object type_handler, bint uses_metadata,
-                                       ssize_t pos, OracleMetadata metadata):
-        """
-        Create the fetch variable for the given position and fetch information.
-        The output type handler is consulted, if present, to make any necessary
-        adjustments.
-        """
-        cdef:
-            ArrowSchemaImpl schema_impl
-            object var, pub_metadata
-            BaseConnImpl conn_impl
-            BaseVarImpl var_impl
-            uint32_t db_type_num
-
-        # add the fetch info to the list used for handling the cursor
-        # description attribute
-        self.fetch_metadata[pos] = metadata
-
-        # if an output type handler is specified, call it; the output type
-        # handler should return a variable or None; the value None implies that
-        # the default processing should take place just as if no output type
-        # handler was defined
-        if type_handler is not None:
-            if uses_metadata:
-                pub_metadata = PY_TYPE_FETCHINFO._from_impl(metadata)
-                var = type_handler(cursor, pub_metadata)
-            else:
-                var = type_handler(cursor, metadata.name, metadata.dbtype,
-                                   metadata.max_size, metadata.precision,
-                                   metadata.scale)
-            if var is not None:
-                self._verify_var(var)
-                var_impl = var._impl
-                var_impl._fetch_metadata = metadata
-                var_impl.metadata.name = metadata.name
-                if var_impl.metadata.dbtype is not metadata.dbtype:
-                    var_impl.metadata.dbtype = \
-                            var_impl._check_fetch_conversion()
-                if var_impl.num_elements < self._fetch_array_size:
-                    var_impl.num_elements = self._fetch_array_size
-                var_impl._finalize_init()
-                self.fetch_vars[pos] = var
-                self.fetch_var_impls[pos] = var_impl
-                return var_impl
-
-        # otherwise, create a new variable using the provided fetch metadata
-        var_impl = self._create_var_impl(conn)
-        var_impl.num_elements = self._fetch_array_size
-        if self.schema_impl is not None:
-            schema_impl = self.schema_impl.child_schemas[pos]
-            metadata.check_convert_to_arrow(schema_impl)
-            var_impl.metadata = OracleMetadata.from_arrow_schema(schema_impl)
-            if metadata.dbtype.num in (DB_TYPE_NUM_NUMBER,
-                                       DB_TYPE_NUM_BINARY_DOUBLE,
-                                       DB_TYPE_NUM_BINARY_FLOAT) \
-                    and schema_impl.arrow_type in (NANOARROW_TYPE_DOUBLE,
-                                                   NANOARROW_TYPE_FLOAT):
-                var_impl.metadata.dbtype = metadata.dbtype
-        else:
-            var_impl.metadata = metadata.copy()
-        var_impl._fetch_metadata = metadata
-
-        # adjust the variable based on the defaults specified by the user, if
-        # applicable
-        db_type_num = metadata.dbtype.num
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            if self.fetch_decimals:
-                var_impl.metadata._py_type_num = PY_TYPE_NUM_DECIMAL
-        elif metadata.is_oson and db_type_num != DB_TYPE_NUM_JSON:
-            conn_impl = self._get_conn_impl()
-            var_impl.metadata.dbtype = DB_TYPE_LONG_RAW
-            var_impl._fetch_metadata.dbtype = DB_TYPE_LONG_RAW
-            var_impl.outconverter = conn_impl.decode_oson
-        elif metadata.is_json and db_type_num != DB_TYPE_NUM_JSON:
-            var_impl.outconverter = self._build_json_converter_fn()
-        elif not self.fetch_lobs or self.fetching_arrow:
-            if db_type_num == DB_TYPE_NUM_BLOB:
-                var_impl.metadata.dbtype = DB_TYPE_LONG_RAW
-                var_impl._fetch_metadata.dbtype = DB_TYPE_LONG_RAW
-            elif db_type_num == DB_TYPE_NUM_CLOB:
-                var_impl.metadata.dbtype = DB_TYPE_LONG
-                var_impl._fetch_metadata.dbtype = DB_TYPE_LONG
-            elif db_type_num == DB_TYPE_NUM_NCLOB:
-                var_impl.metadata.dbtype = DB_TYPE_LONG_NVARCHAR
-                var_impl._fetch_metadata.dbtype = DB_TYPE_LONG_NVARCHAR
-
-        # finalize variable and store in arrays
-        var_impl._finalize_init()
-        if self.fetching_arrow:
-            var_impl._create_arrow_array()
-        self.fetch_var_impls[pos] = var_impl
-        return var_impl
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef object _create_row(self):
-        """
-        Internal method for creating a row from the fetched data.
-        """
-        cdef:
-            Py_ssize_t i, num_vars
-            BaseVarImpl var_impl
-            object row, value
-        num_vars = cpython.PyList_GET_SIZE(self.fetch_var_impls)
-        row = cpython.PyTuple_New(num_vars)
-        for i in range(num_vars):
-            var_impl = self.fetch_var_impls[i]
-            value = var_impl._get_scalar_value(self._buffer_index)
-            cpython.Py_INCREF(value)
-            cpython.PyTuple_SET_ITEM(row, i, value)
-        if self.rowfactory is not None:
-            row = self.rowfactory(*row)
-        self._buffer_index += 1
-        self._buffer_rowcount -= 1
-        self.rowcount += 1
-        return row
-
-    cdef BaseVarImpl _create_var_impl(self, object conn):
-        """
-        Internal method for creating a variable.
-        """
-        raise NotImplementedError()
-
-    cdef int _fetch_rows(self, object cursor) except -1:
-        """
-        Internal method used for fetching rows from a cursor.
-        """
-        raise NotImplementedError()
-
-    cdef BaseConnImpl _get_conn_impl(self):
-        """
-        Internal method used to return the connection implementation associated
-        with the cursor implementation.
-        """
-        raise NotImplementedError()
-
-    cdef object _get_input_type_handler(self):
-        """
-        Return the input type handler to use for the cursor. If one is not
-        directly defined on the cursor then the one defined on the connection
-        is used instead.
-        """
-        cdef BaseConnImpl conn_impl
-        if self.inputtypehandler is not None:
-            return self.inputtypehandler
-        conn_impl = self._get_conn_impl()
-        return conn_impl.inputtypehandler
-
-    def _get_oci_attr(self, uint32_t attr_num, uint32_t attr_type):
-        errors._raise_not_supported("getting a cursor OCI attribute")
-
-    cdef object _get_output_type_handler(self, bint *uses_metadata):
-        """
-        Return the output type handler to use for the cursor. If one is not
-        directly defined on the cursor then the one defined on the connection
-        is used instead. When fetching Arrow data, however, no output type
-        handlers are used since for most data no conversion to Python objects
-        ever takes place.
-        """
-        cdef:
-            BaseConnImpl conn_impl
-            object type_handler
-        if self.fetching_arrow:
-            return None
-        if self.outputtypehandler is not None:
-            type_handler = self.outputtypehandler
-        else:
-            conn_impl = self._get_conn_impl()
-            type_handler = conn_impl.outputtypehandler
-        if type_handler is not None:
-            try:
-                sig = inspect.signature(type_handler)
-                uses_metadata[0] = (len(sig.parameters) == 2)
-            except (ValueError, TypeError):
-                uses_metadata[0] = False
-        return type_handler
-
-    cdef int _init_fetch_vars(self, uint32_t num_columns) except -1:
-        """
-        Initializes the fetch variable lists in preparation for creating the
-        fetch variables used in fetching rows from the database.
-        """
-        cdef ssize_t num_schema_columns
-        if self.schema_impl is not None:
-            num_schema_columns = len(self.schema_impl.child_schemas)
-            if num_schema_columns != num_columns:
-                errors._raise_err(errors.ERR_WRONG_REQUESTED_SCHEMA_LENGTH,
-                                  num_schema_columns=num_schema_columns,
-                                  num_fetched_columns=num_columns)
-        self.fetch_metadata = [None] * num_columns
-        self.fetch_vars = [None] * num_columns
-        self.fetch_var_impls = [None] * num_columns
-
-    cdef bint _is_plsql(self):
-        """
-        Internal method that indicates whether the currently prepared statement
-        is a PL/SQL statement or not.
-        """
-        raise NotImplementedError()
-
-    cdef int _perform_binds(self, object conn, uint32_t num_execs) except -1:
-        """
-        Perform all binds on the cursor.
-        """
-        cdef:
-            BindVar bind_var
-            ssize_t i
-        for i, bind_var in enumerate(self.bind_vars):
-            if bind_var is not None and bind_var.var_impl is not None:
-                bind_var.var_impl._bind(conn, self, num_execs, bind_var.name,
-                                        bind_var.pos)
-
-    cdef int _prepare(self, str statement, str tag,
-                      bint cache_statement) except -1:
-        """
-        Prepares a statement for execution.
-        """
-        self.statement = statement
-        self.rowfactory = None
-        self.fetch_vars = None
-        if not self.set_input_sizes:
-            self.bind_vars = None
-            self.bind_vars_by_name = None
-            self.bind_style = None
-
-    cdef int _create_arrow_arrays(self) except -1:
-        cdef BaseVarImpl var_impl
-        for var_impl in self.fetch_var_impls:
-            if var_impl._arrow_array is None:
-                var_impl._create_arrow_array()
-
-    def _prepare_for_execute(self, object cursor, str statement,
-                             object parameters, object keyword_parameters):
-        """
-        Internal method for preparing a statement for execution.
-        """
-        cdef:
-            bint prepare_needed
-
-        # verify parameters
-        if statement is None and self.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT)
-        if keyword_parameters:
-            if parameters:
-                errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
-            parameters = keyword_parameters
-        elif parameters is not None and not isinstance(
-            parameters, (list, tuple, dict)
-        ):
-            errors._raise_err(errors.ERR_WRONG_EXECUTE_PARAMETERS_TYPE)
-        prepare_needed = statement and statement != self.statement
-        if (
-            not (prepare_needed and not self.set_input_sizes)
-            and self.bind_vars is not None
-            and parameters is not None
-        ):
-            if (
-                self.bind_style is dict and not isinstance(parameters, dict)
-                or self.bind_style is not dict and isinstance(parameters, dict)
-            ):
-                self.set_input_sizes = False
-                errors._raise_err(errors.ERR_MIXED_POSITIONAL_AND_NAMED_BINDS)
-
-        # prepare statement, if necessary
-        try:
-            if prepare_needed:
-                self._prepare(statement, None, True)
-        finally:
-            self.set_input_sizes = False
-
-        # set default values of fetch options
-        self.fetch_lobs = C_DEFAULTS.fetch_lobs
-        self.fetch_decimals = C_DEFAULTS.fetch_decimals
-
-        # perform bind
-        if parameters is not None:
-            self.bind_one(cursor, parameters)
-
-        # clear any warning and reset rowcount
-        self.warning = None
-        self.rowcount = 0
-
-    def _prepare_for_executemany(
-        self,
-        object cursor,
-        str statement,
-        object parameters,
-        uint32_t batch_size = 2 ** 32 - 1,
-    ):
-        """
-        Internal method for preparing a statement for execution multiple times.
-        """
-
-        # prepare statement, if necessary
-        if statement is None and self.statement is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT)
-        try:
-            if statement is not None and statement != self.statement:
-                self._prepare(statement, None, True)
-        finally:
-            self.set_input_sizes = False
-
-        # clear any warning and reset rowcount
-        self.warning = None
-        self.rowcount = 0
-
-        # return a batch load manager
-        return BatchLoadManager.create_for_executemany(
-            cursor,
-            self,
-            parameters,
-            batch_size,
-        )
-
-    cdef int _reset_bind_vars(self, uint64_t array_offset,
-                              uint32_t num_rows) except -1:
-        """
-        Reset all of the existing bind variables. If any bind variables don't
-        have enough space to store the number of rows specified, expand and
-        then reinitialize that bind variable.
-        """
-        cdef:
-            BindVar bind_var
-            ssize_t i
-        if self.bind_vars is not None:
-            for i in range(len(self.bind_vars)):
-                bind_var = <BindVar> self.bind_vars[i]
-                if bind_var.var_impl is not None:
-                    bind_var.var_impl._on_reset_bind(array_offset, num_rows)
-                bind_var.has_value = False
-
-    def _set_oci_attr(self, uint32_t attr_num, uint32_t attr_type,
-                      object value):
-        errors._raise_not_supported("setting a cursor OCI attribute")
-
-    cdef int _verify_var(self, object var) except -1:
-        """
-        Internal method used for verifying if an outputtypehandler returns a
-        valid var object.
-        """
-        if not isinstance(var, PY_TYPE_VAR):
-            errors._raise_err(errors.ERR_EXPECTING_VAR)
-        if self.arraysize > var.num_elements:
-            errors._raise_err(errors.ERR_INCORRECT_VAR_ARRAYSIZE,
-                              var_arraysize=var.num_elements,
-                              required_arraysize=self.arraysize)
-
-    cdef int bind_one(self, object cursor, object parameters) except -1:
-        """
-        Internal method used for binding a single row of data.
-        """
-        cdef:
-            bint defer_type_assignment = False
-            uint32_t row_num = 0, num_rows = 1
-            ssize_t num_bind_vars, pos
-            object name, value
-            BindVar bind_var
-            dict dict_params
-        type_handler = self._get_input_type_handler()
-        self._reset_bind_vars(0, num_rows)
-        self._bind_values(cursor, type_handler, parameters, num_rows, row_num,
-                          defer_type_assignment)
-
-    cdef object _finish_building_arrow_arrays(self):
-        """
-        Flush all buffers and return an Oracle Data frame.
-        """
-        cdef:
-            ArrowArrayImpl array_impl
-            DataFrameImpl df_impl
-            BaseVarImpl var_impl
-        df_impl = DataFrameImpl.__new__(DataFrameImpl)
-        df_impl.schema_impls = []
-        df_impl.arrays = []
-        for var_impl in self.fetch_var_impls:
-            array_impl = var_impl._finish_building_arrow_array()
-            df_impl.schema_impls.append(array_impl.schema_impl)
-            df_impl.arrays.append(array_impl)
-        return PY_TYPE_DATAFRAME._from_impl(df_impl)
-
-    def close(self, bint in_del=False):
-        """
-        Closes the cursor and makes it unusable for further operations.
-        """
-        self.bind_vars = None
-        self.bind_vars_by_name = None
-        self.bind_style = None
-        self.fetch_vars = None
-        self._close(in_del)
-
-    def create_var(self, object conn, object typ, uint32_t size=0,
-                   uint32_t num_elements=1, object inconverter=None,
-                   object outconverter=None, str encoding_errors=None,
-                   bint bypass_decode=False, bint is_array=False,
-                   bint convert_nulls=False):
-        cdef BaseVarImpl var_impl
-        var_impl = self._create_var_impl(conn)
-        var_impl._set_metadata_from_type(typ)
-        var_impl.metadata.max_size = size
-        var_impl.num_elements = num_elements
-        var_impl.inconverter = inconverter
-        var_impl.outconverter = outconverter
-        var_impl.bypass_decode = bypass_decode
-        if bypass_decode:
-            var_impl.metadata._py_type_num = PY_TYPE_NUM_BYTES
-        if encoding_errors is not None:
-            var_impl.encoding_errors = encoding_errors
-            var_impl._encoding_error_bytes = encoding_errors.encode()
-            var_impl._encoding_errors = var_impl._encoding_error_bytes
-        var_impl.is_array = is_array
-        var_impl.convert_nulls = convert_nulls
-        var_impl._finalize_init()
-        return PY_TYPE_VAR._from_impl(var_impl)
-
-    def execute(self, cursor):
-        errors._raise_not_supported("executing a statement")
-
-    def executemany(self, object cursor, uint32_t num_execs, bint batcherrors,
-                    bint arraydmlrowcounts, uint32_t offset=0):
-        errors._raise_not_supported("executing a statement in batch")
-
-    def fetch_next_row(self, cursor):
-        """
-        Internal method used for fetching the next row from a cursor.
-        """
-        if self._buffer_rowcount == 0 and self._more_rows_to_fetch:
-            self._fetch_rows(cursor)
-        if self._buffer_rowcount > 0:
-            return self._create_row()
-
-    def fetch_df_all(self, cursor):
-        """
-        Internal method used for fetching all data as DataFrame
-        """
-        while self._more_rows_to_fetch:
-            self._fetch_rows(cursor)
-        return self._finish_building_arrow_arrays()
-
-    def fetch_df_batches(self, cursor, int batch_size):
-        """
-        Internal method used for fetching next batch as DataFrame
-        cursor.arraysize = batchsize
-        """
-        cdef:
-            BaseConnImpl conn_impl = self._get_conn_impl()
-            bint returned = False
-
-        # Return the prefetched batch (thin mode)
-        if conn_impl.thin:
-            returned = True
-            yield self._finish_building_arrow_arrays()
-
-        while self._more_rows_to_fetch:
-            self._create_arrow_arrays()
-            self._fetch_rows(cursor)
-            if not returned or self._buffer_rowcount > 0:
-                returned = True
-                yield self._finish_building_arrow_arrays()
-
-    def get_array_dml_row_counts(self):
-        errors._raise_not_supported("getting a list of array DML row counts")
-
-    def get_batch_errors(self):
-        errors._raise_not_supported("getting a list of batch errors")
-
-    def get_bind_names(self):
-        errors._raise_not_supported("getting a list of bind variable names")
-
-    def get_bind_vars(self):
-        """
-        Return a list (when binding by position) or a dictionary (when binding
-        by name) of the bind variables associated with the cursor.
-        """
-        cdef:
-            BindVar bind_var
-            ssize_t i
-        if self.bind_vars is None:
-            return []
-        for bind_var in self.bind_vars:
-            if bind_var.var is None and bind_var.var_impl is not None:
-                bind_var.var = PY_TYPE_VAR._from_impl(bind_var.var_impl)
-        if self.bind_style is list:
-            return [bind_var.var for bind_var in self.bind_vars]
-        return dict([(bind_var.name, bind_var.var) \
-                for bind_var in self.bind_vars])
-
-    def get_fetch_vars(self):
-        """
-        Return a list of fetch variables. Initially the list contains all
-        empty values except where a fetch type handler was used. This will
-        populate any remaining fetch variables that are needed.
-        """
-        cdef:
-            BaseVarImpl var_impl
-            ssize_t i
-        if self.fetch_vars is not None:
-            for i, var in enumerate(self.fetch_vars):
-                if var is None:
-                    var_impl = <BaseVarImpl> self.fetch_var_impls[i]
-                    self.fetch_vars[i] = PY_TYPE_VAR._from_impl(var_impl)
-        return self.fetch_vars
-
-    def get_implicit_results(self, connection):
-        errors._raise_not_supported("getting implicit results from PL/SQL")
-
-    def get_lastrowid(self):
-        errors._raise_not_supported(
-            "getting the rowid of the row last modified"
-        )
-
-    def is_query(self, cursor):
-        errors._raise_not_supported(
-            "determining if the cursor last executed a query"
-        )
-
-    def parse(self, cursor):
-        errors._raise_not_supported("parsing a statement without executing it")
-
-    def prepare(self, str statement, str tag, bint cache_statement):
-        """
-        Prepares a statement for execution.
-        """
-        self._prepare(statement, tag, cache_statement)
-
-    def scroll(self, cursor, value, mode):
-        """
-        Scrolls a scrollable cursor.
-        """
-        errors._raise_not_supported("scrolling a scrollable cursor")
-
-    def setinputsizes(self, object conn, tuple args, dict kwargs):
-        """
-        Sets type information for bind variables in advance of executing a
-        statement (and binding values).
-        """
-        cdef:
-            object name, value
-            BindVar bind_var
-            ssize_t pos
-        self.bind_vars = []
-        self.set_input_sizes = True
-        if kwargs:
-            self.bind_style = dict
-            self.bind_vars_by_name = {}
-            for name, value in kwargs.items():
-                bind_var = BindVar.__new__(BindVar)
-                self.bind_vars.append(bind_var)
-                self.bind_vars_by_name[name] = bind_var
-                bind_var._set_by_type(conn, self, value)
-                bind_var.name = name
-        else:
-            self.bind_style = list
-            for pos, value in enumerate(args):
-                bind_var = BindVar.__new__(BindVar)
-                self.bind_vars.append(bind_var)
-                bind_var._set_by_type(conn, self, value)
-                bind_var.pos = pos + 1
-        return self.get_bind_vars()
diff --git a/src/oracledb/impl/base/dbobject.pyx b/src/oracledb/impl/base/dbobject.pyx
deleted file mode 100644
index 21f7ad67..00000000
--- a/src/oracledb/impl/base/dbobject.pyx
+++ /dev/null
@@ -1,174 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# dbobject.pyx
-#
-# Cython file defining the base DbObjectType, DbObjectAttr and DbObject
-# implementation classes (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseDbObjectImpl:
-
-    cdef int _check_max_size(self, object value, uint32_t max_size,
-                             ssize_t* actual_size, bint* violated) except -1:
-        """
-        Checks to see if the maximum size has been violated.
-        """
-        violated[0] = False
-        if max_size > 0 and value is not None:
-            if isinstance(value, str):
-                actual_size[0] = len((<str> value).encode())
-            else:
-                actual_size[0] = len(<bytes> value)
-            if actual_size[0] > max_size:
-                violated[0] = True
-
-    def append(self, object value):
-        """
-        Appends a value to the collection after first checking to see if the
-        value is acceptable.
-        """
-        cdef:
-            BaseConnImpl conn_impl = self.type._conn_impl
-            ssize_t actual_size
-            bint violated
-        value = conn_impl._check_value(self.type.element_metadata, value, NULL)
-        self._check_max_size(value, self.type.element_metadata.max_size,
-                             &actual_size, &violated)
-        if violated:
-            errors._raise_err(errors.ERR_DBOBJECT_ELEMENT_MAX_SIZE_VIOLATED,
-                              index=self.get_size(),
-                              type_name=self.type._get_fqn(),
-                              actual_size=actual_size,
-                              max_size=self.type.element_metadata.max_size)
-        self.append_checked(value)
-
-    def append_checked(self, object value):
-        errors._raise_not_supported("appending a value to a collection")
-
-    def copy(self):
-        errors._raise_not_supported("creating a copy of an object")
-
-    def delete_by_index(self, int32_t index):
-        errors._raise_not_supported("deleting an element in a collection")
-
-    def exists_by_index(self, int32_t index):
-        errors._raise_not_supported(
-            "determining if an entry exists in a collection"
-        )
-
-    def get_attr_value(self, BaseDbObjectAttrImpl attr):
-        errors._raise_not_supported("getting an attribute value")
-
-    def get_element_by_index(self, int32_t index):
-        errors._raise_not_supported("getting an element of a collection")
-
-    def get_first_index(self):
-        errors._raise_not_supported("getting the first index of a collection")
-
-    def get_last_index(self):
-        errors._raise_not_supported("getting the last index of a collection")
-
-    def get_next_index(self, int32_t index):
-        errors._raise_not_supported("getting the next index of a collection")
-
-    def get_prev_index(self, int32_t index):
-        errors._raise_not_supported(
-            "getting the previous index of a collection"
-        )
-
-    def get_size(self):
-        errors._raise_not_supported("getting the size of a collection")
-
-    def set_attr_value(self, BaseDbObjectAttrImpl attr, object value):
-        """
-        Sets the attribute value after first checking to see if the value is
-        acceptable.
-        """
-        cdef:
-            BaseConnImpl conn_impl = self.type._conn_impl
-            ssize_t actual_size
-            bint violated
-        value = conn_impl._check_value(attr, value, NULL)
-        self._check_max_size(value, attr.max_size, &actual_size, &violated)
-        if violated:
-            errors._raise_err(errors.ERR_DBOBJECT_ATTR_MAX_SIZE_VIOLATED,
-                              attr_name=attr.name,
-                              type_name=self.type._get_fqn(),
-                              actual_size=actual_size, max_size=attr.max_size)
-        self.set_attr_value_checked(attr, value)
-
-    def set_attr_value_checked(self, BaseDbObjectAttrImpl attr, object value):
-        errors._raise_not_supported("setting an attribute value")
-
-    def set_element_by_index(self, int32_t index, object value):
-        """
-        Sets the element value after first checking to see if the value is
-        acceptable.
-        """
-        cdef:
-            BaseConnImpl conn_impl = self.type._conn_impl
-            ssize_t actual_size
-            bint violated
-        value = conn_impl._check_value(self.type.element_metadata, value, NULL)
-        self._check_max_size(value, self.type.element_metadata.max_size,
-                             &actual_size, &violated)
-        if violated:
-            errors._raise_err(errors.ERR_DBOBJECT_ELEMENT_MAX_SIZE_VIOLATED,
-                              index=index, type_name=self.type._get_fqn(),
-                              actual_size=actual_size,
-                              max_size=self.type.element_metadata.max_size)
-        self.set_element_by_index_checked(index, value)
-
-    def set_element_by_index_checked(self, int32_t index, object value):
-        errors._raise_not_supported("setting an element of a collection")
-
-    def trim(self, int32_t num_to_trim):
-        errors._raise_not_supported("trimming elements from a collection")
-
-
-cdef class BaseDbObjectAttrImpl(OracleMetadata):
-    pass
-
-
-cdef class BaseDbObjectTypeImpl:
-
-    def __eq__(self, other):
-        if isinstance(other, BaseDbObjectTypeImpl):
-            return other._conn_impl is self._conn_impl \
-                    and other.schema == self.schema \
-                    and other.name == self.name
-        return NotImplemented
-
-    cpdef str _get_fqn(self):
-        """
-        Return the fully qualified name of the type.
-        """
-        if self.package_name is not None:
-            return f"{self.schema}.{self.package_name}.{self.name}"
-        return f"{self.schema}.{self.name}"
-
-    def create_new_object(self):
-        errors._raise_not_supported("creating a new object")
diff --git a/src/oracledb/impl/base/decoders.pyx b/src/oracledb/impl/base/decoders.pyx
deleted file mode 100644
index 11f3894d..00000000
--- a/src/oracledb/impl/base/decoders.pyx
+++ /dev/null
@@ -1,377 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# decoders.pyx
-#
-# Cython file defining the low-level decoding routines used by the driver.
-#------------------------------------------------------------------------------
-
-cdef int decode_binary_double(const uint8_t *ptr, ssize_t num_bytes,
-                              OracleDataBuffer *buffer) except -1:
-    """
-    Decode a binary double from raw bytes.
-    """
-    cdef:
-        uint8_t b0, b1, b2, b3, b4, b5, b6, b7
-        uint64_t high_bits, low_bits, all_bits
-    b0 = ptr[0]
-    b1 = ptr[1]
-    b2 = ptr[2]
-    b3 = ptr[3]
-    b4 = ptr[4]
-    b5 = ptr[5]
-    b6 = ptr[6]
-    b7 = ptr[7]
-    if b0 & 0x80:
-        b0 = b0 & 0x7f
-    else:
-        b0 = ~b0
-        b1 = ~b1
-        b2 = ~b2
-        b3 = ~b3
-        b4 = ~b4
-        b5 = ~b5
-        b6 = ~b6
-        b7 = ~b7
-    high_bits = b0 << 24 | b1 << 16 | b2 << 8 | b3
-    low_bits = b4 << 24 | b5 << 16 | b6 << 8 | b7
-    all_bits = high_bits << 32 | (low_bits & <uint64_t> 0xffffffff)
-    memcpy(&buffer.as_double, &all_bits, 8)
-
-
-cdef int decode_binary_float(const uint8_t *ptr, ssize_t num_bytes,
-                             OracleDataBuffer *buffer) except -1:
-    """
-    Decode a binary float from raw bytes.
-    """
-    cdef:
-        uint8_t b0, b1, b2, b3
-        uint64_t all_bits
-    b0 = ptr[0]
-    b1 = ptr[1]
-    b2 = ptr[2]
-    b3 = ptr[3]
-    if b0 & 0x80:
-        b0 = b0 & 0x7f
-    else:
-        b0 = ~b0
-        b1 = ~b1
-        b2 = ~b2
-        b3 = ~b3
-    all_bits = (b0 << 24) | (b1 << 16) | (b2 << 8) | b3
-    memcpy(&buffer.as_float, &all_bits, 4)
-
-
-cdef int decode_bool(const uint8_t* ptr, ssize_t num_bytes,
-                     OracleDataBuffer *buffer) except -1:
-    """
-    Decode a boolean value from raw bytes.
-    """
-    buffer.as_bool = (ptr[num_bytes - 1] == 1)
-
-
-cdef int decode_date(const uint8_t* ptr, ssize_t num_bytes,
-                     OracleDataBuffer *buffer) except -1:
-    """
-    Decode a date from the raw bytes making up the Oracle Date.
-    """
-    cdef OracleDate *output = &buffer.as_date
-    output.year = (ptr[0] - 100) * 100 + ptr[1] - 100
-    output.month = ptr[2]
-    output.day = ptr[3]
-    output.hour = ptr[4] - 1
-    output.minute = ptr[5] - 1
-    output.second = ptr[6] - 1
-    if num_bytes < 11:
-        output.fsecond = 0
-    else:
-        output.fsecond = decode_uint32be(&ptr[7]) // 1000
-    if num_bytes <= 11 or ptr[11] == 0 or ptr[12] == 0:
-        output.tz_hour_offset = output.tz_minute_offset = 0
-    else:
-        if ptr[11] & TNS_HAS_REGION_ID:
-            errors._raise_err(errors.ERR_NAMED_TIMEZONE_NOT_SUPPORTED)
-        output.tz_hour_offset = ptr[11] - TZ_HOUR_OFFSET
-        output.tz_minute_offset = ptr[12] - TZ_MINUTE_OFFSET
-
-
-cdef uint64_t decode_integer(const uint8_t* ptr, ssize_t num_bytes):
-    """
-    Decodes an integer from raw bytes.
-    """
-    if num_bytes == 1:
-        return ptr[0]
-    elif num_bytes == 2:
-        return decode_uint16be(ptr)
-    elif num_bytes == 3:
-        return decode_uint24be(ptr)
-    elif num_bytes == 4:
-        return decode_uint32be(ptr)
-    elif num_bytes == 5:
-        return decode_uint40be(ptr)
-    elif num_bytes == 6:
-        return decode_uint48be(ptr)
-    elif num_bytes == 7:
-        return decode_uint56be(ptr)
-    elif num_bytes == 8:
-        return decode_uint64be(ptr)
-
-
-cdef int decode_interval_ds(const uint8_t *ptr, ssize_t num_bytes,
-                            OracleDataBuffer *buffer) except -1:
-    """
-    Decode an interval days to seconds from raw bytes.
-    """
-    cdef OracleIntervalDS *output = &buffer.as_interval_ds
-    output.days = decode_uint32be(ptr) - TNS_DURATION_MID
-    output.hours = ptr[4] - TNS_DURATION_OFFSET
-    output.minutes = ptr[5] - TNS_DURATION_OFFSET
-    output.seconds = ptr[6] - TNS_DURATION_OFFSET
-    output.fseconds = decode_uint32be(&ptr[7]) - TNS_DURATION_MID
-
-
-cdef int decode_interval_ym(const uint8_t *ptr, ssize_t num_bytes,
-                            OracleDataBuffer *buffer) except -1:
-    """
-    Decode an interval years to months from raw bytes.
-    """
-    cdef OracleIntervalYM *output = &buffer.as_interval_ym
-    output.years = decode_uint32be(ptr) - TNS_DURATION_MID
-    output.months = ptr[4] - TNS_DURATION_OFFSET
-
-
-cdef int decode_number(const uint8_t* ptr, ssize_t num_bytes,
-                       OracleDataBuffer *buffer) except -1:
-    """
-    Decode a number from the raw bytes making up the Oracle number.
-    """
-    cdef:
-        OracleNumber *output = &buffer.as_number
-        uint8_t byte, digit, num_digits
-        int16_t decimal_point_index
-        uint8_t digits[40]
-        bint is_positive
-        int8_t exponent
-
-    # the first byte is the exponent; positive numbers have the highest
-    # order bit set, whereas negative numbers have the highest order bit
-    # cleared and the bits inverted
-    exponent = <int8_t> ptr[0]
-    is_positive = (exponent & 0x80)
-    if not is_positive:
-        exponent = ~exponent
-    exponent -= 193
-    decimal_point_index = exponent * 2 + 2
-
-    # initialize output structure
-    output.is_max_negative_value = False
-    output.is_integer = True
-    output.num_chars = 0
-
-    # a mantissa length of 0 implies a value of 0 (if positive) or a value
-    # of -1e126 (if negative)
-    if num_bytes == 1:
-        if is_positive:
-            output.num_chars = 1
-            output.chars[0] = 48                    # zero
-            output.chars[1] = 0                     # null terminator
-        else:
-            output.is_max_negative_value = True
-        return 0
-
-    # check for the trailing 102 byte for negative numbers and, if present,
-    # reduce the number of mantissa digits
-    if not is_positive and ptr[num_bytes - 1] == 102:
-        num_bytes -= 1
-
-    # process the mantissa bytes which are the remaining bytes; each
-    # mantissa byte is a base-100 digit
-    num_digits = 0
-    for i in range(1, num_bytes):
-
-        # positive numbers have 1 added to them; negative numbers are
-        # subtracted from the value 101
-        byte = ptr[i]
-        if is_positive:
-            byte -= 1
-        else:
-            byte = 101 - byte
-
-        # process the first digit; leading zeroes are ignored
-        digit = <uint8_t> byte // 10
-        if digit == 0 and num_digits == 0:
-            decimal_point_index -= 1
-        elif digit == 10:
-            digits[num_digits] = 1
-            digits[num_digits + 1] = 0
-            num_digits += 2
-            decimal_point_index += 1
-        elif digit != 0 or i > 0:
-            digits[num_digits] = digit
-            num_digits += 1
-
-        # process the second digit; trailing zeroes are ignored
-        digit = byte % 10
-        if digit != 0 or i < num_bytes - 1:
-            digits[num_digits] = digit
-            num_digits += 1
-
-    # create string of digits for transformation to Python value
-    # if negative, include the sign
-    if not is_positive:
-        output.chars[output.num_chars] = 45         # minus sign
-        output.num_chars += 1
-
-    # if the decimal point index is 0 or less, add the decimal point and
-    # any leading zeroes that are needed
-    if decimal_point_index <= 0:
-        output.chars[output.num_chars] = 48         # zero
-        output.chars[output.num_chars + 1] = 46     # decimal point
-        output.num_chars += 2
-        output.is_integer = 0
-        for i in range(decimal_point_index, 0):
-            output.chars[output.num_chars] = 48     # zero
-            output.num_chars += 1
-
-    # add each of the digits
-    for i in range(num_digits):
-        if i > 0 and i == decimal_point_index:
-            output.chars[output.num_chars] = 46     # decimal point
-            output.is_integer = 0
-            output.num_chars += 1
-        output.chars[output.num_chars] = 48 + digits[i]
-        output.num_chars += 1
-
-    # if the decimal point index exceeds the number of digits, add any
-    # trailing zeroes that are needed
-    if decimal_point_index > num_digits:
-        for i in range(num_digits, decimal_point_index):
-            output.chars[output.num_chars] = 48     # zero
-            output.num_chars += 1
-
-    # include null terminator for use by strtoll() and strtoull()
-    output.chars[output.num_chars] = 0
-
-
-cdef inline uint16_t decode_uint16be(const char_type *buf):
-    """
-    Decodes a 16-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint16_t> buf[0] << 8) |
-        (<uint16_t> buf[1])
-    )
-
-
-cdef inline uint16_t decode_uint16le(const char_type *buf):
-    """
-    Decodes a 16-bit integer in little endian order (least significant byte
-    first).
-    """
-    return (
-        (<uint16_t> buf[1] << 8) |
-        (<uint16_t> buf[0])
-    )
-
-
-cdef inline uint32_t decode_uint24be(const char_type *buf):
-    """
-    Decodes a 24-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint32_t> buf[0] << 16) |
-        (<uint32_t> buf[1] << 8) |
-        (<uint32_t> buf[2])
-    )
-
-
-cdef inline uint32_t decode_uint32be(const char_type *buf):
-    """
-    Decodes a 32-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint32_t> buf[0] << 24) |
-        (<uint32_t> buf[1] << 16) |
-        (<uint32_t> buf[2] << 8) |
-        (<uint32_t> buf[3])
-    )
-
-
-cdef inline uint64_t decode_uint40be(const char_type *buf):
-    """
-    Decodes a 40-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint64_t> buf[0] << 32) |
-        (<uint64_t> buf[1] << 24) |
-        (<uint64_t> buf[2] << 16) |
-        (<uint64_t> buf[3] << 8) |
-        (<uint64_t> buf[4])
-    )
-
-
-cdef inline uint64_t decode_uint48be(const char_type *buf):
-    """
-    Decodes a 48-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint64_t> buf[0] << 40) |
-        (<uint64_t> buf[1] << 32) |
-        (<uint64_t> buf[2] << 24) |
-        (<uint64_t> buf[3] << 16) |
-        (<uint64_t> buf[4] << 8) |
-        (<uint64_t> buf[5])
-    )
-
-
-cdef inline uint64_t decode_uint56be(const char_type *buf):
-    """
-    Decodes a 56-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint64_t> buf[0] << 48) |
-        (<uint64_t> buf[1] << 40) |
-        (<uint64_t> buf[2] << 32) |
-        (<uint64_t> buf[3] << 24) |
-        (<uint64_t> buf[4] << 16) |
-        (<uint64_t> buf[5] << 8) |
-        (<uint64_t> buf[6])
-    )
-
-
-cdef inline uint64_t decode_uint64be(const char_type *buf):
-    """
-    Decodes a 64-bit integer in big endian order (most significant byte first).
-    """
-    return (
-        (<uint64_t> buf[0] << 56) |
-        (<uint64_t> buf[1] << 48) |
-        (<uint64_t> buf[2] << 40) |
-        (<uint64_t> buf[3] << 32) |
-        (<uint64_t> buf[4] << 24) |
-        (<uint64_t> buf[5] << 16) |
-        (<uint64_t> buf[6] << 8) |
-        (<uint64_t> buf[7])
-    )
diff --git a/src/oracledb/impl/base/defaults.pyx b/src/oracledb/impl/base/defaults.pyx
deleted file mode 100644
index 1acd65ff..00000000
--- a/src/oracledb/impl/base/defaults.pyx
+++ /dev/null
@@ -1,55 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# defaults.pyx
-#
-# Cython file defining the DefaultsImpl class (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class DefaultsImpl:
-
-    def __init__(self):
-        self.arraysize = 100
-        self.config_dir = os.environ.get("TNS_ADMIN")
-        if self.config_dir is None:
-            oracle_home = os.environ.get("ORACLE_HOME")
-            if oracle_home is not None:
-                self.config_dir = os.path.join(oracle_home, "network", "admin")
-        self.fetch_lobs = True
-        self.fetch_decimals = False
-        self.prefetchrows = 2
-        self.stmtcachesize = 20
-        self.program = sanitize(sys.executable)
-        self.machine = sanitize(socket.gethostname())
-        self.terminal = "unknown"
-        try:
-            self.osuser = sanitize(getpass.getuser())
-        except:
-            self.osuser = ""
-        self.driver_name = None
-        self.thick_mode_dsn_passthrough = True
-
-cdef DefaultsImpl C_DEFAULTS = DefaultsImpl()
-DEFAULTS = C_DEFAULTS
diff --git a/src/oracledb/impl/base/encoders.pyx b/src/oracledb/impl/base/encoders.pyx
deleted file mode 100644
index aed7e420..00000000
--- a/src/oracledb/impl/base/encoders.pyx
+++ /dev/null
@@ -1,366 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# encoders.pyx
-#
-# Cython file defining the low-level encoding routines used by the driver.
-#------------------------------------------------------------------------------
-
-cdef inline void encode_binary_double(char_type *buf, double value):
-    """
-    Encodes a double in the format expected by the Oracle Database for
-    BINARY_DOUBLE.
-    """
-    cdef:
-        uint8_t b0, b1, b2, b3, b4, b5, b6, b7
-        uint64_t all_bits
-        uint64_t *ptr
-    ptr = <uint64_t*> &value
-    all_bits = ptr[0]
-    b7 = all_bits & 0xff
-    b6 = (all_bits >> 8) & 0xff
-    b5 = (all_bits >> 16) & 0xff
-    b4 = (all_bits >> 24) & 0xff
-    b3 = (all_bits >> 32) & 0xff
-    b2 = (all_bits >> 40) & 0xff
-    b1 = (all_bits >> 48) & 0xff
-    b0 = (all_bits >> 56) & 0xff
-    if b0 & 0x80 == 0:
-        b0 = b0 | 0x80
-    else:
-        b0 = ~b0
-        b1 = ~b1
-        b2 = ~b2
-        b3 = ~b3
-        b4 = ~b4
-        b5 = ~b5
-        b6 = ~b6
-        b7 = ~b7
-    buf[0] = b0
-    buf[1] = b1
-    buf[2] = b2
-    buf[3] = b3
-    buf[4] = b4
-    buf[5] = b5
-    buf[6] = b6
-    buf[7] = b7
-
-
-cdef inline void encode_binary_float(char_type *buf, float value):
-    """
-    Encodes a float in the format expected by the Oracle Database for
-    BINARY_FLOAT.
-    """
-    cdef:
-        uint8_t b0, b1, b2, b3
-        uint32_t all_bits
-        uint32_t *ptr
-    ptr = <uint32_t*> &value
-    all_bits = ptr[0]
-    b3 = all_bits & 0xff
-    b2 = (all_bits >> 8) & 0xff
-    b1 = (all_bits >> 16) & 0xff
-    b0 = (all_bits >> 24) & 0xff
-    if b0 & 0x80 == 0:
-        b0 = b0 | 0x80
-    else:
-        b0 = ~b0
-        b1 = ~b1
-        b2 = ~b2
-        b3 = ~b3
-    buf[0] = b0
-    buf[1] = b1
-    buf[2] = b2
-    buf[3] = b3
-
-
-cdef inline void encode_boolean(char_type *buf, ssize_t *buflen, bint value):
-    """
-    Encodes a boolean in the format expected by the Oracle Database for
-    BOOLEAN.
-    """
-    if value:
-        buflen[0] = 3
-        buf[0] = 2
-        encode_uint16be(&buf[1], 0x0101)
-    else:
-        buflen[0] = 2
-        encode_uint16be(buf, 0x0100)
-
-
-cdef inline void encode_date(char_type *buf, object value):
-    """
-    Encodes a datetime.date or datetime.datetime object in the format exepcted
-    by the Oracle Database for DATE.
-    """
-    cdef unsigned int year
-    year = cydatetime.PyDateTime_GET_YEAR(value)
-    buf[0] = <uint8_t> ((year // 100) + 100)
-    buf[1] = <uint8_t> ((year % 100) + 100)
-    buf[2] = <uint8_t> cydatetime.PyDateTime_GET_MONTH(value)
-    buf[3] = <uint8_t> cydatetime.PyDateTime_GET_DAY(value)
-    buf[4] = <uint8_t> cydatetime.PyDateTime_DATE_GET_HOUR(value) + 1
-    buf[5] = <uint8_t> cydatetime.PyDateTime_DATE_GET_MINUTE(value) + 1
-    buf[6] = <uint8_t> cydatetime.PyDateTime_DATE_GET_SECOND(value) + 1
-
-
-cdef inline void encode_interval_ds(char_type *buf, object value):
-    """
-    Encodes a datetime.timedelta object in the format exepcted by the Oracle
-    Database for INTERVAL DAY TO SECOND.
-    """
-    cdef int32_t days, seconds, fseconds
-    days = cydatetime.timedelta_days(value)
-    encode_uint32be(buf, days + TNS_DURATION_MID)
-    seconds = cydatetime.timedelta_seconds(value)
-    buf[4] = (seconds // 3600) + TNS_DURATION_OFFSET
-    seconds = seconds % 3600
-    buf[5] = (seconds // 60) + TNS_DURATION_OFFSET
-    buf[6] = (seconds % 60) + TNS_DURATION_OFFSET
-    fseconds = cydatetime.timedelta_microseconds(value) * 1000
-    encode_uint32be(&buf[7], fseconds + TNS_DURATION_MID)
-
-
-cdef int encode_interval_ym(char_type *buf, object value) except -1:
-    """
-    Encodes a IntervalYM object in the format exepcted by the Oracle Database
-    for INTERVAL YEAR TO MONTH.
-    """
-    cdef int32_t years, months
-    years = (<tuple> value)[0]
-    months = (<tuple> value)[1]
-    encode_uint32be(buf, years + TNS_DURATION_MID)
-    buf[4] = months + TNS_DURATION_OFFSET
-
-
-cdef int encode_number(char_type *buf, ssize_t *buflen, bytes value) except -1:
-    """
-    Encodes bytes representing numeric data in the format exepcted by the
-    Oracle Database for NUMBER.
-    """
-    cdef:
-        uint8_t num_digits = 0, digit, num_pairs, pair_num, digits_pos
-        bint is_negative = False, prepend_zero = False
-        ssize_t value_length, exponent_pos, pos = 0
-        uint8_t digits[NUMBER_AS_TEXT_CHARS]
-        bint exponent_is_negative = False
-        int16_t decimal_point_index
-        int8_t exponent_on_wire
-        const char_type *ptr
-        int16_t exponent
-
-    # zero length string cannot be converted
-    value_length = len(value)
-    if value_length == 0:
-        errors._raise_err(errors.ERR_NUMBER_STRING_OF_ZERO_LENGTH)
-    elif value_length > NUMBER_AS_TEXT_CHARS:
-        errors._raise_err(errors.ERR_NUMBER_STRING_TOO_LONG)
-
-    # check to see if number is negative (first character is '-')
-    ptr = value
-    if ptr[0] == b'-':
-        is_negative = True
-        pos += 1
-
-    # scan for digits until the decimal point or exponent indicator found
-    while pos < value_length:
-        if ptr[pos] == b'.' or ptr[pos] == b'e' or ptr[pos] == b'E':
-            break
-        if ptr[pos] < b'0' or ptr[pos] > b'9':
-            errors._raise_err(errors.ERR_INVALID_NUMBER)
-        digit = ptr[pos] - <uint8_t> b'0'
-        pos += 1
-        if digit == 0 and num_digits == 0:
-            continue
-        digits[num_digits] = digit
-        num_digits += 1
-    decimal_point_index = num_digits
-
-    # scan for digits following the decimal point, if applicable
-    if pos < value_length and ptr[pos] == b'.':
-        pos += 1
-        while pos < value_length:
-            if ptr[pos] == b'e' or ptr[pos] == b'E':
-                break
-            digit = ptr[pos] - <uint8_t> b'0'
-            pos += 1
-            if digit == 0 and num_digits == 0:
-                decimal_point_index -= 1
-                continue
-            digits[num_digits] = digit
-            num_digits += 1
-
-    # handle exponent, if applicable
-    if pos < value_length and (ptr[pos] == b'e' or ptr[pos] == b'E'):
-        pos += 1
-        if pos < value_length:
-            if ptr[pos] == b'-':
-                exponent_is_negative = True
-                pos += 1
-            elif ptr[pos] == b'+':
-                pos += 1
-        exponent_pos = pos
-        while pos < value_length:
-            if ptr[pos] < b'0' or ptr[pos] > b'9':
-                errors._raise_err(errors.ERR_NUMBER_WITH_INVALID_EXPONENT)
-            pos += 1
-        if exponent_pos == pos:
-            errors._raise_err(errors.ERR_NUMBER_WITH_EMPTY_EXPONENT)
-        exponent = <int16_t> int(ptr[exponent_pos:pos])
-        if exponent_is_negative:
-            exponent = -exponent
-        decimal_point_index += exponent
-
-    # if there is anything left in the string, that indicates an invalid
-    # number as well
-    if pos < value_length:
-        errors._raise_err(errors.ERR_CONTENT_INVALID_AFTER_NUMBER)
-
-    # skip trailing zeros
-    while num_digits > 0 and digits[num_digits - 1] == 0:
-        num_digits -= 1
-
-    # value must be less than 1e126 and greater than 1e-129; the number of
-    # digits also cannot exceed the maximum precision of Oracle numbers
-    if num_digits > NUMBER_MAX_DIGITS or decimal_point_index > 126 \
-            or decimal_point_index < -129:
-        errors._raise_err(errors.ERR_ORACLE_NUMBER_NO_REPR)
-
-    # if the exponent is odd, prepend a zero
-    if decimal_point_index % 2 == 1:
-        prepend_zero = True
-        if num_digits > 0:
-            digits[num_digits] = 0
-            num_digits += 1
-            decimal_point_index += 1
-
-    # determine the number of digit pairs; if the number of digits is odd,
-    # append a zero to make the number of digits even
-    if num_digits % 2 == 1:
-        digits[num_digits] = 0
-        num_digits += 1
-    num_pairs = num_digits // 2
-
-    # if the number of digits is zero, the value is itself zero since all
-    # leading and trailing zeros are removed from the digits string; this
-    # is a special case
-    if num_digits == 0:
-        buf[0] = 128
-        buflen[0] = 1
-        return 0
-
-    # the total length of the buffer will be the number of pairs (each of which
-    # are encoded in a single byte) plus a single byte for the exponent
-    buflen[0] = num_pairs + 1
-
-    # encode the exponent
-    exponent_on_wire = <int8_t> (decimal_point_index / 2) + 192
-    if is_negative:
-        exponent_on_wire = ~exponent_on_wire
-    buf[0] = exponent_on_wire
-
-    # encode the mantissa bytes
-    digits_pos = 0
-    for pair_num in range(num_pairs):
-        if pair_num == 0 and prepend_zero:
-            digit = digits[digits_pos]
-            digits_pos += 1
-        else:
-            digit = digits[digits_pos] * 10 + digits[digits_pos + 1]
-            digits_pos += 2
-        if is_negative:
-            digit = 101 - digit
-        else:
-            digit += 1
-        buf[pair_num + 1] = digit
-
-    # append a sentinel 102 byte for negative numbers if the number of digits
-    # is less than the maximum allowable
-    if is_negative and num_digits < NUMBER_MAX_DIGITS:
-        buf[num_pairs + 1] = 102
-        buflen[0] += 1
-
-
-cdef inline void encode_timestamp(char_type *buf, object value):
-    """
-    Encodes a datetime.date or datetime.datetime object in the format exepcted
-    by the Oracle Database for TIMESTAMP (WITH LOCAL TIME ZONE).
-    """
-    cdef uint32_t fsecond = 0
-    encode_date(buf, value)
-    if isinstance(value, PY_TYPE_DATETIME):
-        fsecond = <uint32_t> \
-                cydatetime.PyDateTime_DATE_GET_MICROSECOND(value) * 1000
-    encode_uint32be(&buf[7], fsecond)
-
-
-cdef inline void encode_timestamp_tz(char_type *buf, object value):
-    """
-    Encodes a datetime.date or datetime.datetime object in the format exepcted
-    by the Oracle Database for TIMESTAMP WITH TIME ZONE.
-    """
-    encode_timestamp(buf, value)
-    buf[11] = TZ_HOUR_OFFSET
-    buf[12] = TZ_MINUTE_OFFSET
-
-
-cdef inline void encode_uint16be(char_type *buf, uint16_t value):
-    """
-    Encodes a 16-bit integer in big endian order (most significant byte first).
-    """
-    buf[0] = <char_type> ((value >> 8) & 0xff)
-    buf[1] = <char_type> (value & 0xff)
-
-
-cdef inline void encode_uint16le(char_type *buf, uint16_t value):
-    """
-    Encodes a 16-bit integer in big endian order (most significant byte first).
-    """
-    buf[1] = <char_type> ((value >> 8) & 0xff)
-    buf[0] = <char_type> (value & 0xff)
-
-
-cdef inline void encode_uint32be(char_type *buf, uint32_t value):
-    """
-    Encodes a 32-bit integer in big endian order (most significant byte first).
-    """
-    buf[0] = <char_type> ((value >> 24) & 0xff)
-    buf[1] = <char_type> ((value >> 16) & 0xff)
-    buf[2] = <char_type> ((value >> 8) & 0xff)
-    buf[3] = <char_type> (value & 0xff)
-
-
-cdef inline void encode_uint64be(char_type *buf, uint64_t value):
-    """
-    Decodes a 64-bit integer in big endian order (most significant byte first).
-    """
-    buf[0] = <char_type> ((value >> 56) & 0xff)
-    buf[1] = <char_type> ((value >> 48) & 0xff)
-    buf[2] = <char_type> ((value >> 40) & 0xff)
-    buf[3] = <char_type> ((value >> 32) & 0xff)
-    buf[4] = <char_type> ((value >> 24) & 0xff)
-    buf[5] = <char_type> ((value >> 16) & 0xff)
-    buf[6] = <char_type> ((value >> 8) & 0xff)
-    buf[7] = <char_type> (value & 0xff)
diff --git a/src/oracledb/impl/base/lob.pyx b/src/oracledb/impl/base/lob.pyx
deleted file mode 100644
index 98764f46..00000000
--- a/src/oracledb/impl/base/lob.pyx
+++ /dev/null
@@ -1,77 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# lob.pyx
-#
-# Cython file defining the base Lob implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseLobImpl:
-
-    def close(self):
-        errors._raise_not_supported("closing a LOB")
-
-    def file_exists(self):
-        errors._raise_not_supported("checking if a BFILE exists")
-
-    def free_lob(self):
-        errors._raise_not_supported("freeing the lob object")
-
-    def get_chunk_size(self):
-        errors._raise_not_supported("getting the chunk size of a LOB")
-
-    def get_file_name(self):
-        errors._raise_not_supported(
-            "getting the file name and directory alias of a BFILE"
-        )
-
-    def get_is_open(self):
-        errors._raise_not_supported("getting whether a LOB is open or not")
-
-    def get_max_amount(self):
-        errors._raise_not_supported(
-            "getting the maximum amount that can be read from a LOB"
-        )
-
-    def get_size(self):
-        errors._raise_not_supported("getting the size of a LOB")
-
-    def open(self):
-        errors._raise_not_supported("opening a LOB")
-
-    def read(self, uint64_t offset, uint64_t amount):
-        errors._raise_not_supported("reading data from a LOB")
-
-    def set_file_name(self, str dir_alias, str name):
-        errors._raise_not_supported(
-            "setting the file name an directory alias of a BFILE"
-        )
-
-    def trim(self, uint64_t new_size):
-        errors._raise_not_supported("trimming a LOB")
-
-    def write(self, object value, uint64_t offset):
-        errors._raise_not_supported("writing data to a LOB")
diff --git a/src/oracledb/impl/base/metadata.pyx b/src/oracledb/impl/base/metadata.pyx
deleted file mode 100644
index 049c2bbb..00000000
--- a/src/oracledb/impl/base/metadata.pyx
+++ /dev/null
@@ -1,450 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# metadata.pyx
-#
-# Cython file defining the OracleMetadata class (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.freelist(30)
-cdef class OracleMetadata:
-
-    cdef int _create_arrow_schema(self) except -1:
-        """
-        Creates an Arrow schema for the metadata.
-        """
-        cdef:
-            ArrowTimeUnit time_unit = NANOARROW_TIME_UNIT_SECOND
-            ArrowType child_arrow_type = NANOARROW_TYPE_NA
-            ArrowType arrow_type = NANOARROW_TYPE_NA
-            uint8_t py_type_num = self._py_type_num
-            uint32_t db_type_num = self.dbtype.num
-
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            if py_type_num == PY_TYPE_NUM_DECIMAL \
-                    and self.precision > 0 and self.precision <= 38:
-                arrow_type = NANOARROW_TYPE_DECIMAL128
-            elif py_type_num == PY_TYPE_NUM_STR:
-                arrow_type = NANOARROW_TYPE_LARGE_STRING
-            elif py_type_num == PY_TYPE_NUM_INT and self.scale == 0 \
-                    and 0 < self.precision <= 18:
-                arrow_type = NANOARROW_TYPE_INT64
-            else:
-                arrow_type = NANOARROW_TYPE_DOUBLE
-        elif db_type_num in (DB_TYPE_NUM_CHAR, DB_TYPE_NUM_VARCHAR,
-                             DB_TYPE_NUM_NCHAR, DB_TYPE_NUM_NVARCHAR):
-            arrow_type = NANOARROW_TYPE_LARGE_STRING
-        elif db_type_num == DB_TYPE_NUM_BINARY_FLOAT:
-            arrow_type = NANOARROW_TYPE_FLOAT
-        elif db_type_num == DB_TYPE_NUM_BINARY_DOUBLE:
-            arrow_type = NANOARROW_TYPE_DOUBLE
-        elif db_type_num == DB_TYPE_NUM_BOOLEAN:
-            arrow_type = NANOARROW_TYPE_BOOL
-        elif db_type_num in (DB_TYPE_NUM_DATE,
-                             DB_TYPE_NUM_TIMESTAMP,
-                             DB_TYPE_NUM_TIMESTAMP_LTZ,
-                             DB_TYPE_NUM_TIMESTAMP_TZ):
-            arrow_type = NANOARROW_TYPE_TIMESTAMP
-            if self.scale > 0 and self.scale <= 3:
-                time_unit = NANOARROW_TIME_UNIT_MILLI
-            elif self.scale > 3 and self.scale <= 6:
-                time_unit = NANOARROW_TIME_UNIT_MICRO
-            elif self.scale > 6 and self.scale <= 9:
-                time_unit = NANOARROW_TIME_UNIT_NANO
-        elif db_type_num == DB_TYPE_NUM_LONG_RAW:
-            arrow_type = NANOARROW_TYPE_LARGE_BINARY
-        elif db_type_num in (DB_TYPE_NUM_LONG_VARCHAR,
-                             DB_TYPE_NUM_LONG_NVARCHAR):
-            arrow_type = NANOARROW_TYPE_LARGE_STRING
-        elif db_type_num == DB_TYPE_NUM_RAW:
-            arrow_type = NANOARROW_TYPE_LARGE_BINARY
-        elif db_type_num == DB_TYPE_NUM_VECTOR:
-            if self.vector_flags & VECTOR_META_FLAG_SPARSE_VECTOR:
-                arrow_type = NANOARROW_TYPE_STRUCT
-            else:
-                arrow_type = NANOARROW_TYPE_LIST
-            if self.vector_format == VECTOR_FORMAT_FLOAT32:
-                child_arrow_type = NANOARROW_TYPE_FLOAT
-            elif self.vector_format == VECTOR_FORMAT_FLOAT64:
-                child_arrow_type = NANOARROW_TYPE_DOUBLE
-            elif self.vector_format == VECTOR_FORMAT_INT8:
-                child_arrow_type = NANOARROW_TYPE_INT8
-            elif self.vector_format == VECTOR_FORMAT_BINARY:
-                child_arrow_type = NANOARROW_TYPE_UINT8
-            else:
-                errors._raise_err(errors.ERR_ARROW_UNSUPPORTED_VECTOR_FORMAT)
-        else:
-            errors._raise_err(errors.ERR_ARROW_UNSUPPORTED_DATA_TYPE,
-                              db_type_name=self.dbtype.name)
-
-        self._schema_impl = ArrowSchemaImpl.__new__(ArrowSchemaImpl)
-        self._schema_impl.populate_from_metadata(
-            arrow_type,
-            self.name,
-            self.precision,
-            self.scale,
-            time_unit,
-            child_arrow_type,
-        )
-
-    cdef int _finalize_init(self) except -1:
-        """
-        Internal method that finalizes the initialization of metadata by
-        setting the buffer size, max size and default Python type (if they have
-        not already been set).
-        """
-        if self.dbtype.default_size == 0:
-            self.max_size = 0
-            self.buffer_size = self.dbtype._buffer_size_factor
-        else:
-            if self.max_size == 0:
-                self.max_size = self.dbtype.default_size
-            self.buffer_size = self.max_size * self.dbtype._buffer_size_factor
-        if self._py_type_num == 0:
-            if self.dbtype._ora_type_num != ORA_TYPE_NUM_NUMBER:
-                self._py_type_num = self.dbtype._default_py_type_num
-            else:
-                if self.scale == 0 or \
-                        (self.scale == -127 and self.precision == 0):
-                    self._py_type_num = PY_TYPE_NUM_INT
-                else:
-                    self._py_type_num = PY_TYPE_NUM_FLOAT
-
-    cdef int _set_arrow_schema(self, ArrowSchemaImpl schema_impl) except -1:
-        """
-        Sets an Arrow schema, which checks to see that the Arrow type is
-        compatible with the database type.
-        """
-        self.check_convert_from_arrow(schema_impl)
-        self._finalize_init()
-        self._schema_impl = schema_impl
-
-    cdef int check_convert_from_arrow(self,
-                                      ArrowSchemaImpl schema_impl) except -1:
-        """
-        Check that the conversion from the Arrow type to the database type is
-        supported.
-        """
-        cdef:
-            ArrowType arrow_type = schema_impl.arrow_type
-            uint32_t db_type_num = self.dbtype.num
-            bint ok = False
-
-        if arrow_type in (NANOARROW_TYPE_BINARY,
-                          NANOARROW_TYPE_FIXED_SIZE_BINARY,
-                          NANOARROW_TYPE_LARGE_BINARY):
-            if db_type_num in (DB_TYPE_NUM_RAW, DB_TYPE_NUM_LONG_RAW):
-                ok = True
-        elif arrow_type == NANOARROW_TYPE_BOOL:
-            if db_type_num in (DB_TYPE_NUM_BOOLEAN):
-                ok = True
-        elif arrow_type in (NANOARROW_TYPE_DECIMAL128,
-                            NANOARROW_TYPE_INT8,
-                            NANOARROW_TYPE_INT16,
-                            NANOARROW_TYPE_INT32,
-                            NANOARROW_TYPE_INT64,
-                            NANOARROW_TYPE_UINT8,
-                            NANOARROW_TYPE_UINT16,
-                            NANOARROW_TYPE_UINT32,
-                            NANOARROW_TYPE_UINT64):
-            if db_type_num == DB_TYPE_NUM_NUMBER:
-                ok = True
-        elif arrow_type in (NANOARROW_TYPE_DATE32,
-                            NANOARROW_TYPE_DATE64,
-                            NANOARROW_TYPE_TIMESTAMP):
-            if db_type_num in (DB_TYPE_NUM_DATE,
-                               DB_TYPE_NUM_TIMESTAMP,
-                               DB_TYPE_NUM_TIMESTAMP_LTZ,
-                               DB_TYPE_NUM_TIMESTAMP_TZ):
-                ok = True
-        elif arrow_type == NANOARROW_TYPE_FLOAT:
-            if db_type_num in (DB_TYPE_NUM_BINARY_DOUBLE,
-                               DB_TYPE_NUM_BINARY_FLOAT,
-                               DB_TYPE_NUM_NUMBER):
-                ok = True
-        elif arrow_type == NANOARROW_TYPE_DOUBLE:
-            if db_type_num in (DB_TYPE_NUM_BINARY_DOUBLE,
-                               DB_TYPE_NUM_BINARY_FLOAT,
-                               DB_TYPE_NUM_NUMBER):
-                ok = True
-        elif arrow_type in (NANOARROW_TYPE_STRING,
-                            NANOARROW_TYPE_LARGE_STRING):
-            if db_type_num in (DB_TYPE_NUM_CHAR,
-                               DB_TYPE_NUM_LONG_VARCHAR,
-                               DB_TYPE_NUM_VARCHAR,
-                               DB_TYPE_NUM_NCHAR,
-                               DB_TYPE_NUM_LONG_NVARCHAR,
-                               DB_TYPE_NUM_NVARCHAR):
-                ok = True
-
-        if not ok:
-            errors._raise_err(errors.ERR_CANNOT_CONVERT_FROM_ARROW_TYPE,
-                              arrow_type=schema_impl.get_type_name(),
-                              db_type=self.dbtype.name)
-
-    cdef int check_convert_to_arrow(self,
-                                    ArrowSchemaImpl schema_impl) except -1:
-        """
-        Check that the conversion to the Arrow type from the database type is
-        supported.
-        """
-        cdef:
-            ArrowType arrow_type = schema_impl.arrow_type
-            uint32_t db_type_num = self.dbtype.num
-            bint ok = False
-
-        if db_type_num == DB_TYPE_NUM_NUMBER:
-            if arrow_type in (
-                NANOARROW_TYPE_DECIMAL128,
-                NANOARROW_TYPE_DOUBLE,
-                NANOARROW_TYPE_FLOAT,
-                NANOARROW_TYPE_INT8,
-                NANOARROW_TYPE_INT16,
-                NANOARROW_TYPE_INT32,
-                NANOARROW_TYPE_INT64,
-                NANOARROW_TYPE_UINT8,
-                NANOARROW_TYPE_UINT16,
-                NANOARROW_TYPE_UINT32,
-                NANOARROW_TYPE_UINT64
-            ):
-                ok = True
-        elif db_type_num in (
-            DB_TYPE_NUM_BLOB,
-            DB_TYPE_NUM_RAW,
-            DB_TYPE_NUM_LONG_RAW
-        ):
-            if arrow_type in (
-                NANOARROW_TYPE_BINARY,
-                NANOARROW_TYPE_FIXED_SIZE_BINARY,
-                NANOARROW_TYPE_LARGE_BINARY
-            ):
-                ok = True
-        elif db_type_num == DB_TYPE_NUM_BOOLEAN:
-            if arrow_type == NANOARROW_TYPE_BOOL:
-                ok = True
-        elif db_type_num in (
-            DB_TYPE_NUM_DATE,
-            DB_TYPE_NUM_TIMESTAMP,
-            DB_TYPE_NUM_TIMESTAMP_LTZ,
-            DB_TYPE_NUM_TIMESTAMP_TZ
-        ):
-            if arrow_type in (
-                NANOARROW_TYPE_DATE32,
-                NANOARROW_TYPE_DATE64,
-                NANOARROW_TYPE_TIMESTAMP
-            ):
-                ok = True
-        elif db_type_num in (
-            DB_TYPE_NUM_BINARY_DOUBLE,
-            DB_TYPE_NUM_BINARY_FLOAT
-        ):
-            if arrow_type in (NANOARROW_TYPE_DOUBLE, NANOARROW_TYPE_FLOAT):
-                ok = True
-        elif db_type_num in (
-            DB_TYPE_NUM_CHAR,
-            DB_TYPE_NUM_CLOB,
-            DB_TYPE_NUM_LONG_NVARCHAR,
-            DB_TYPE_NUM_LONG_VARCHAR,
-            DB_TYPE_NUM_VARCHAR,
-            DB_TYPE_NUM_NCHAR,
-            DB_TYPE_NUM_NCLOB,
-            DB_TYPE_NUM_NVARCHAR
-        ):
-            if arrow_type in (
-                NANOARROW_TYPE_STRING,
-                NANOARROW_TYPE_LARGE_STRING
-            ):
-                ok = True
-
-        if not ok:
-            errors._raise_err(errors.ERR_CANNOT_CONVERT_TO_ARROW_TYPE,
-                              arrow_type=schema_impl.get_type_name(),
-                              db_type=self.dbtype.name)
-
-    cdef OracleMetadata copy(self):
-        """
-        Create a copy of the metadata and return it.
-        """
-        cdef OracleMetadata metadata = OracleMetadata.__new__(OracleMetadata)
-        metadata.name = self.name
-        metadata.dbtype = self.dbtype
-        metadata.objtype = self.objtype
-        metadata.precision = self.precision
-        metadata.scale = self.scale
-        metadata.max_size = self.max_size
-        metadata.nulls_allowed = self.nulls_allowed
-        metadata.is_json = self.is_json
-        metadata.is_oson = self.is_oson
-        metadata.domain_schema = self.domain_schema
-        metadata.domain_name = self.domain_name
-        metadata.annotations = self.annotations
-        metadata.vector_dimensions = self.vector_dimensions
-        metadata.vector_format = self.vector_format
-        metadata.vector_flags = self.vector_flags
-        return metadata
-
-    @staticmethod
-    cdef OracleMetadata from_arrow_schema(ArrowSchemaImpl schema_impl):
-        """
-        Returns a new OracleMetadata instance with attributes set from an Arrow
-        array.
-        """
-        cdef:
-            OracleMetadata metadata = OracleMetadata.__new__(OracleMetadata)
-            ArrowType arrow_type = schema_impl.arrow_type
-        if arrow_type in (
-            NANOARROW_TYPE_DECIMAL128,
-            NANOARROW_TYPE_INT8,
-            NANOARROW_TYPE_INT16,
-            NANOARROW_TYPE_INT32,
-            NANOARROW_TYPE_INT64,
-            NANOARROW_TYPE_UINT8,
-            NANOARROW_TYPE_UINT16,
-            NANOARROW_TYPE_UINT32,
-            NANOARROW_TYPE_UINT64,
-        ):
-            metadata.dbtype = DB_TYPE_NUMBER
-        elif arrow_type == NANOARROW_TYPE_STRING:
-            metadata.dbtype = DB_TYPE_VARCHAR
-        elif arrow_type in (NANOARROW_TYPE_BINARY,
-                            NANOARROW_TYPE_FIXED_SIZE_BINARY):
-            metadata.dbtype = DB_TYPE_RAW
-        elif arrow_type == NANOARROW_TYPE_FLOAT:
-            metadata.dbtype = DB_TYPE_BINARY_FLOAT
-        elif arrow_type == NANOARROW_TYPE_DOUBLE:
-            metadata.dbtype = DB_TYPE_BINARY_DOUBLE
-        elif arrow_type == NANOARROW_TYPE_BOOL:
-            metadata.dbtype = DB_TYPE_BOOLEAN
-        elif arrow_type == NANOARROW_TYPE_TIMESTAMP:
-            metadata.dbtype = DB_TYPE_TIMESTAMP
-        elif arrow_type in (NANOARROW_TYPE_DATE32, NANOARROW_TYPE_DATE64):
-            metadata.dbtype = DB_TYPE_DATE
-        elif arrow_type == NANOARROW_TYPE_LARGE_STRING:
-            metadata.dbtype = DB_TYPE_LONG
-        elif arrow_type == NANOARROW_TYPE_LARGE_BINARY:
-            metadata.dbtype = DB_TYPE_LONG_RAW
-        elif arrow_type in (NANOARROW_TYPE_LIST,
-                            NANOARROW_TYPE_STRUCT,
-                            NANOARROW_TYPE_FIXED_SIZE_LIST):
-            metadata.dbtype = DB_TYPE_VECTOR
-        else:
-            errors._raise_err(errors.ERR_UNSUPPORTED_ARROW_TYPE,
-                              arrow_type=schema_impl.get_type_name())
-        metadata._schema_impl = schema_impl
-        metadata.name = schema_impl.name
-        metadata.precision = schema_impl.precision
-        metadata.scale = schema_impl.scale
-        return metadata
-
-    @staticmethod
-    cdef OracleMetadata from_type(object typ):
-        """
-        Returns a new OracleMetadata instance with attributes set according to
-        the Python type.
-        """
-        cdef:
-            OracleMetadata metadata = OracleMetadata.__new__(OracleMetadata)
-            ApiType apitype
-        if isinstance(typ, DbType):
-            metadata.dbtype = typ
-        elif isinstance(typ, ApiType):
-            apitype = typ
-            metadata.dbtype = apitype.dbtypes[0]
-        elif isinstance(typ, PY_TYPE_DB_OBJECT_TYPE):
-            metadata.dbtype = DB_TYPE_OBJECT
-            metadata.objtype = typ._impl
-        elif not isinstance(typ, type):
-            errors._raise_err(errors.ERR_EXPECTING_TYPE)
-        elif typ is int:
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_INT
-        elif typ is float:
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_FLOAT
-        elif typ is str:
-            metadata.dbtype = DB_TYPE_VARCHAR
-        elif typ is bytes:
-            metadata.dbtype = DB_TYPE_RAW
-        elif typ is PY_TYPE_DECIMAL:
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_DECIMAL
-        elif typ is PY_TYPE_BOOL:
-            metadata.dbtype = DB_TYPE_BOOLEAN
-        elif typ is PY_TYPE_DATE:
-            metadata.dbtype = DB_TYPE_DATE
-        elif typ is PY_TYPE_DATETIME:
-            metadata.dbtype = DB_TYPE_TIMESTAMP
-        elif typ is PY_TYPE_TIMEDELTA:
-            metadata.dbtype = DB_TYPE_INTERVAL_DS
-        else:
-            errors._raise_err(errors.ERR_PYTHON_TYPE_NOT_SUPPORTED, typ=typ)
-        return metadata
-
-    @staticmethod
-    cdef OracleMetadata from_value(object value):
-        """
-        Returns a new OracleMetadata instance with attributes set according to
-        the Python type.
-        """
-        cdef OracleMetadata metadata = OracleMetadata.__new__(OracleMetadata)
-        if value is None:
-            metadata.dbtype = DB_TYPE_VARCHAR
-            metadata.max_size = 1
-        elif isinstance(value, PY_TYPE_BOOL):
-            metadata.dbtype = DB_TYPE_BOOLEAN
-        elif isinstance(value, str):
-            metadata.dbtype = DB_TYPE_VARCHAR
-            metadata.max_size = <uint32_t> len((<str> value).encode())
-        elif isinstance(value, bytes):
-            metadata.max_size = <uint32_t> len(value)
-            metadata.dbtype = DB_TYPE_RAW
-        elif isinstance(value, int):
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_INT
-        elif isinstance(value, float):
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_FLOAT
-        elif isinstance(value, PY_TYPE_DECIMAL):
-            metadata.dbtype = DB_TYPE_NUMBER
-            metadata._py_type_num = PY_TYPE_NUM_DECIMAL
-        elif isinstance(value, (PY_TYPE_DATE, PY_TYPE_DATETIME)):
-            metadata.dbtype = DB_TYPE_DATE
-        elif isinstance(value, PY_TYPE_TIMEDELTA):
-            metadata.dbtype = DB_TYPE_INTERVAL_DS
-        elif isinstance(value, PY_TYPE_DB_OBJECT):
-            metadata.dbtype = DB_TYPE_OBJECT
-            metadata.objtype = value.type._impl
-        elif isinstance(value, (PY_TYPE_LOB, PY_TYPE_ASYNC_LOB)):
-            metadata.dbtype = value.type
-        elif isinstance(value, (PY_TYPE_CURSOR, PY_TYPE_ASYNC_CURSOR)):
-            metadata.dbtype = DB_TYPE_CURSOR
-        elif isinstance(value, (array.array, PY_TYPE_SPARSE_VECTOR)):
-            metadata.dbtype = DB_TYPE_VECTOR
-        elif isinstance(value, PY_TYPE_INTERVAL_YM):
-            metadata.dbtype = DB_TYPE_INTERVAL_YM
-        else:
-            errors._raise_err(errors.ERR_PYTHON_VALUE_NOT_SUPPORTED,
-                              type_name=type(value).__name__)
-        return metadata
diff --git a/src/oracledb/impl/base/oson.pyx b/src/oracledb/impl/base/oson.pyx
deleted file mode 100644
index 86607df3..00000000
--- a/src/oracledb/impl/base/oson.pyx
+++ /dev/null
@@ -1,870 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# json.pyx
-#
-# Cython file defining the classes and methods used for encoding and decoding
-# OSON (Oracle's extensions to JSON) (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class OsonDecoder(Buffer):
-
-    cdef object _decode_container_node(self, uint8_t node_type):
-        """
-        Parses a container node (object or array) and returns it.
-        """
-        cdef:
-            bint is_shared, is_object = (node_type & 0x40) == 0
-            ssize_t field_ids_pos = 0, offsets_pos = 0, pos
-            uint32_t container_offset, offset, temp32
-            uint32_t i, num_children = 0
-            uint16_t temp16
-            uint8_t temp8
-            object value
-            str name
-
-        # determine the number of children by examining the 4th and 5th most
-        # significant bits of the node type; determine the offsets in the tree
-        # segment to the field ids array and the value offsets array
-        container_offset = self._pos - self.tree_seg_pos - 1
-        self._get_num_children(node_type, &num_children, &is_shared)
-        if is_shared:
-            value = {}
-            self._get_offset(node_type, &offset)
-            offsets_pos = self._pos
-            self.skip_to(self.tree_seg_pos + offset)
-            self.read_ub1(&temp8)
-            self._get_num_children(temp8, &num_children, &is_shared)
-            field_ids_pos = self._pos
-        elif is_object:
-            value = {}
-            field_ids_pos = self._pos
-            offsets_pos = self._pos + self.field_id_length * num_children
-        else:
-            value = [None] * num_children
-            offsets_pos = self._pos
-
-        # process each of the children
-        for i in range(num_children):
-            if is_object:
-                self.skip_to(field_ids_pos)
-                if self.field_id_length == 1:
-                    self.read_ub1(&temp8)
-                    name = self.field_names[temp8 - 1]
-                elif self.field_id_length == 2:
-                    self.read_uint16be(&temp16)
-                    name = self.field_names[temp16 - 1]
-                else:
-                    self.read_uint32be(&temp32)
-                    name = self.field_names[temp32 - 1]
-                field_ids_pos = self._pos
-            self.skip_to(offsets_pos)
-            self._get_offset(node_type, &offset)
-            if self.relative_offsets:
-                offset += container_offset
-            offsets_pos = self._pos
-            self.skip_to(self.tree_seg_pos + offset)
-            if is_object:
-                value[name] = self._decode_node()
-            else:
-                value[i] = self._decode_node()
-
-        return value
-
-    cdef object _decode_node(self):
-        """
-        Parses a node from the tree segment and returns the Python equivalent.
-        """
-        cdef:
-            VectorDecoder vector_decoder
-            uint8_t node_type, temp8
-            OracleDataBuffer data
-            const char_type* ptr
-            uint16_t temp16
-            uint32_t temp32
-
-        # if the most significant bit is set the node refers to a container
-        self.read_ub1(&node_type)
-        if node_type & 0x80:
-            return self._decode_container_node(node_type)
-
-        # handle simple scalars
-        if node_type == TNS_JSON_TYPE_NULL:
-            return None
-        elif node_type == TNS_JSON_TYPE_TRUE:
-            return True
-        elif node_type == TNS_JSON_TYPE_FALSE:
-            return False
-
-        # handle fixed length scalars
-        elif node_type in (TNS_JSON_TYPE_DATE, TNS_JSON_TYPE_TIMESTAMP7):
-            decode_date(self._get_raw(7), 7, &data)
-            return convert_date_to_python(&data)
-        elif node_type == TNS_JSON_TYPE_TIMESTAMP:
-            decode_date(self._get_raw(11), 11, &data)
-            return convert_date_to_python(&data)
-        elif node_type == TNS_JSON_TYPE_TIMESTAMP_TZ:
-            decode_date(self._get_raw(13), 13, &data)
-            return convert_date_to_python(&data)
-        elif node_type == TNS_JSON_TYPE_BINARY_FLOAT:
-            decode_binary_float(self._get_raw(4), 4, &data)
-            return data.as_float
-        elif node_type == TNS_JSON_TYPE_BINARY_DOUBLE:
-            decode_binary_double(self._get_raw(8), 8, &data)
-            return data.as_double
-        elif node_type == TNS_JSON_TYPE_INTERVAL_DS:
-            decode_interval_ds(self._get_raw(11), 11, &data)
-            return convert_interval_ds_to_python(&data)
-        elif node_type == TNS_JSON_TYPE_INTERVAL_YM:
-            errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                              name="DB_TYPE_INTERVAL_YM")
-
-        # handle scalars with lengths stored outside the node itself
-        elif node_type == TNS_JSON_TYPE_STRING_LENGTH_UINT8:
-            self.read_ub1(&temp8)
-            ptr = self._get_raw(temp8)
-            return ptr[:temp8].decode()
-        elif node_type == TNS_JSON_TYPE_STRING_LENGTH_UINT16:
-            self.read_uint16be(&temp16)
-            ptr = self._get_raw(temp16)
-            return ptr[:temp16].decode()
-        elif node_type == TNS_JSON_TYPE_STRING_LENGTH_UINT32:
-            self.read_uint32be(&temp32)
-            ptr = self._get_raw(temp32)
-            return ptr[:temp32].decode()
-        elif node_type == TNS_JSON_TYPE_NUMBER_LENGTH_UINT8:
-            self.read_ub1(&temp8)
-            ptr = self._get_raw(temp8)
-            decode_number(ptr, temp8, &data)
-            return convert_number_to_python_decimal(&data)
-        elif node_type == TNS_JSON_TYPE_ID:
-            self.read_ub1(&temp8)
-            ptr = self._get_raw(temp8)
-            return PY_TYPE_JSON_ID(ptr[:temp8])
-        elif node_type == TNS_JSON_TYPE_BINARY_LENGTH_UINT16:
-            self.read_uint16be(&temp16)
-            ptr = self._get_raw(temp16)
-            return ptr[:temp16]
-        elif node_type == TNS_JSON_TYPE_BINARY_LENGTH_UINT32:
-            self.read_uint32be(&temp32)
-            ptr = self._get_raw(temp32)
-            return ptr[:temp32]
-
-        # handle extended types
-        elif node_type == TNS_JSON_TYPE_EXTENDED:
-            self.read_ub1(&node_type)
-            if node_type == TNS_JSON_TYPE_VECTOR:
-                self.read_uint32be(&temp32)
-                ptr = self._get_raw(temp32)
-                vector_decoder = VectorDecoder.__new__(VectorDecoder)
-                return vector_decoder.decode(ptr[:temp32])
-
-        # handle number/decimal with length stored inside the node itself
-        if (node_type & 0xf0) in (0x20, 0x60):
-            temp8 = node_type & 0x0f
-            decode_number(self._get_raw(temp8 + 1), temp8 + 1, &data)
-            return convert_number_to_python_decimal(&data)
-
-        # handle integer with length stored inside the node itself
-        elif (node_type & 0xf0) in (0x40, 0x50):
-            temp8 = node_type & 0x0f
-            decode_number(self._get_raw(temp8), temp8, &data)
-            return convert_number_to_python_decimal(&data)
-
-        # handle string with length stored inside the node itself
-        elif (node_type & 0xe0) == 0:
-            if node_type == 0:
-                return ''
-            ptr = self._get_raw(node_type)
-            return ptr[:node_type].decode()
-
-        errors._raise_err(errors.ERR_OSON_NODE_TYPE_NOT_SUPPORTED,
-                          node_type=node_type)
-
-    cdef list _get_long_field_names(self, uint32_t num_fields,
-                                    ssize_t offsets_size,
-                                    uint32_t field_names_seg_size):
-        """
-        Read the long field names from the buffer.
-        """
-        cdef:
-            ssize_t offsets_pos, final_pos
-            const char_type* ptr
-            uint32_t offset, i
-            list field_names
-            uint16_t temp16
-            uint8_t temp8
-
-        # skip the hash id array (2 bytes for each field)
-        self.skip_raw_bytes(num_fields * 2)
-
-        # skip the field name offsets array for now
-        offsets_pos = self._pos
-        self.skip_raw_bytes(num_fields * offsets_size)
-        ptr = self._get_raw(field_names_seg_size)
-        final_pos = self._pos
-
-        # determine the names of the fields
-        self.skip_to(offsets_pos)
-        field_names = [None] * num_fields
-        for i in range(num_fields):
-            if offsets_size == 2:
-                self.read_uint16be(&temp16)
-                offset = temp16
-            else:
-                self.read_uint32be(&offset)
-            temp16 = decode_uint16be(&ptr[offset])
-            field_names[i] = ptr[offset + 2:offset + temp16 + 2].decode()
-        self.skip_to(final_pos)
-        return field_names
-
-    cdef int _get_num_children(self, uint8_t node_type, uint32_t* num_children,
-                               bint* is_shared) except -1:
-        """
-        Return the number of children the container has. This is determined by
-        examining the 4th and 5th signficant bits of the node type:
-
-            00 - number of children is uint8_t
-            01 - number of children is uint16_t
-            10 - number of children is uint32_t
-            11 - field ids are shared with another object whose offset follows
-
-        In the latter case the flag is_shared is set and the number of children
-        is read by the caller instead as it must examine the offset and then
-        retain the location for later use.
-        """
-        cdef:
-            uint8_t temp8, children_bits = (node_type & 0x18)
-            uint16_t temp16
-        is_shared[0] = (children_bits == 0x18)
-        if children_bits == 0:
-            self.read_ub1(&temp8)
-            num_children[0] = temp8
-        elif children_bits == 0x08:
-            self.read_uint16be(&temp16)
-            num_children[0] = temp16
-        elif children_bits == 0x10:
-            self.read_uint32be(num_children)
-
-    cdef int _get_offset(self, uint8_t node_type, uint32_t* offset) except -1:
-        """
-        Return an offset. The offset will be either a 16-bit or 32-bit value
-        depending on the value of the 3rd significant bit of the node type.
-        """
-        cdef uint16_t temp16
-        if node_type & 0x20:
-            self.read_uint32be(offset)
-        else:
-            self.read_uint16be(&temp16)
-            offset[0] = temp16
-
-    cdef list _get_short_field_names(self, uint32_t num_fields,
-                                     ssize_t offsets_size,
-                                     uint32_t field_names_seg_size):
-        """
-        Read the short field names from the buffer.
-        """
-        cdef:
-            ssize_t offsets_pos, final_pos
-            const char_type* ptr
-            uint32_t offset, i
-            list field_names
-            uint16_t temp16
-            uint8_t temp8
-
-        # skip the hash id array (1 byte for each field)
-        self.skip_raw_bytes(num_fields)
-
-        # skip the field name offsets array for now
-        offsets_pos = self._pos
-        self.skip_raw_bytes(num_fields * offsets_size)
-        ptr = self._get_raw(field_names_seg_size)
-        final_pos = self._pos
-
-        # determine the names of the fields
-        self.skip_to(offsets_pos)
-        field_names = [None] * num_fields
-        for i in range(num_fields):
-            if offsets_size == 2:
-                self.read_uint16be(&temp16)
-                offset = temp16
-            else:
-                self.read_uint32be(&offset)
-            temp8 = ptr[offset]
-            field_names[i] = ptr[offset + 1:offset + temp8 + 1].decode()
-        self.skip_to(final_pos)
-        return field_names
-
-    cdef object decode(self, bytes data):
-        """
-        Returns a Python object corresponding to the encoded OSON bytes.
-        """
-        cdef:
-            uint32_t short_field_names_seg_size, long_field_names_seg_size = 0
-            uint32_t num_short_field_names, num_long_field_names = 0
-            ssize_t hash_id_size, short_field_name_offsets_size
-            ssize_t long_field_name_offsets_size = 0
-            uint16_t num_tiny_nodes, temp16
-            ssize_t field_name_offsets_pos
-            uint32_t tree_seg_size, i
-            uint8_t version, temp8
-            const char_type* ptr
-            uint32_t offset
-
-        # populate the buffer with the data
-        self._populate_from_bytes(data)
-
-        # parse root header
-        ptr = self._get_raw(3)
-        if ptr[0] != TNS_JSON_MAGIC_BYTE_1 or \
-                ptr[1] != TNS_JSON_MAGIC_BYTE_2 or \
-                ptr[2] != TNS_JSON_MAGIC_BYTE_3:
-            errors._raise_err(errors.ERR_UNEXPECTED_DATA, data=ptr[:3])
-        self.read_ub1(&self.version)
-        if self.version not in (
-            TNS_JSON_VERSION_MAX_FNAME_255,
-            TNS_JSON_VERSION_MAX_FNAME_65535
-        ):
-            errors._raise_err(errors.ERR_OSON_VERSION_NOT_SUPPORTED,
-                              version=self.version)
-        self.read_uint16be(&self.primary_flags)
-        self.relative_offsets = \
-                self.primary_flags & TNS_JSON_FLAG_REL_OFFSET_MODE
-
-        # if value is a scalar value, the header is much smaller
-        if self.primary_flags & TNS_JSON_FLAG_IS_SCALAR:
-            if self.primary_flags & TNS_JSON_FLAG_TREE_SEG_UINT32:
-                self.skip_raw_bytes(4)
-            else:
-                self.skip_raw_bytes(2)
-            return self._decode_node()
-
-        # determine the number of field names
-        if self.primary_flags & TNS_JSON_FLAG_NUM_FNAMES_UINT32:
-            self.read_uint32be(&num_short_field_names)
-            self.field_id_length = 4
-        elif self.primary_flags & TNS_JSON_FLAG_NUM_FNAMES_UINT16:
-            self.read_uint16be(&temp16)
-            num_short_field_names = temp16
-            self.field_id_length = 2
-        else:
-            self.read_ub1(&temp8)
-            num_short_field_names = temp8
-            self.field_id_length = 1
-
-        # determine the size of the field names segment
-        if self.primary_flags & TNS_JSON_FLAG_FNAMES_SEG_UINT32:
-            short_field_name_offsets_size = 4
-            self.read_uint32be(&short_field_names_seg_size)
-        else:
-            short_field_name_offsets_size = 2
-            self.read_uint16be(&temp16)
-            short_field_names_seg_size = temp16
-
-        # if the version indicates that field names > 255 bytes exist, parse
-        # the information about that segment
-        if self.version == TNS_JSON_VERSION_MAX_FNAME_65535:
-            self.read_uint16be(&self.secondary_flags)
-            if self.secondary_flags & TNS_JSON_FLAG_SEC_FNAMES_SEG_UINT16:
-                long_field_name_offsets_size = 2
-            else:
-                long_field_name_offsets_size = 4
-            self.read_uint32be(&num_long_field_names)
-            self.read_uint32be(&long_field_names_seg_size)
-
-        # determine the size of the tree segment
-        if self.primary_flags & TNS_JSON_FLAG_TREE_SEG_UINT32:
-            self.read_uint32be(&tree_seg_size)
-        else:
-            self.read_uint16be(&temp16)
-            tree_seg_size = temp16
-
-        # determine the number of "tiny" nodes
-        self.read_uint16be(&num_tiny_nodes)
-
-        # if there are any short names, read them now
-        self.field_names = []
-        if num_short_field_names > 0:
-            self.field_names.extend(
-                self._get_short_field_names(
-                    num_short_field_names,
-                    short_field_name_offsets_size,
-                    short_field_names_seg_size
-                )
-            )
-
-        # if there are any long names, read them now
-        if num_long_field_names > 0:
-            self.field_names.extend(
-                self._get_long_field_names(
-                    num_long_field_names,
-                    long_field_name_offsets_size,
-                    long_field_names_seg_size
-                )
-            )
-
-        # get tree segment
-        self.tree_seg_pos = self._pos
-
-        # return root node
-        return self._decode_node()
-
-
-@cython.final
-cdef class OsonFieldName:
-
-    cdef int _calc_hash_id(self) except -1:
-        """
-        Calculates the hash id to use for the field name. This is based on
-        Bernstein's hash function.
-        """
-        cdef:
-            const char_type *ptr = self.name_bytes
-            ssize_t i
-        self.hash_id = 0x811C9DC5
-        for i in range(self.name_bytes_len):
-            self.hash_id = (self.hash_id ^ ptr[i]) * 16777619
-
-    @staticmethod
-    cdef OsonFieldName create(str name, ssize_t max_fname_size):
-        """
-        Creates and initializes the field name.
-        """
-        cdef OsonFieldName field_name
-        field_name = OsonFieldName.__new__(OsonFieldName)
-        field_name.name = name
-        field_name.name_bytes = name.encode()
-        field_name.name_bytes_len = len(field_name.name_bytes)
-        if field_name.name_bytes_len > max_fname_size:
-            errors._raise_err(errors.ERR_OSON_FIELD_NAME_LIMITATION,
-                              max_fname_size=max_fname_size)
-        field_name._calc_hash_id()
-        return field_name
-
-    def sort_key(self):
-        """
-        Returns the sort key to use when sorting field names.
-        """
-        return ((self.hash_id & 0xff), self.name_bytes_len, self.name_bytes)
-
-
-@cython.final
-cdef class OsonFieldNamesSegment(GrowableBuffer):
-
-    cdef int add_name(self, OsonFieldName field_name) except -1:
-        """
-        Adds a name to the field names segment.
-        """
-        field_name.offset = self._pos
-        if field_name.name_bytes_len <= 255:
-            self.write_uint8(field_name.name_bytes_len)
-        else:
-            self.write_uint16be(field_name.name_bytes_len)
-        self.write_bytes(field_name.name_bytes)
-        self.field_names.append(field_name)
-
-    @staticmethod
-    cdef OsonFieldNamesSegment create():
-        """
-        Creates and initializes the segment. The value (and all of its
-        children) are examined for dictionaries and the keys retained as
-        required by OSON.
-        """
-        cdef OsonFieldNamesSegment seg
-        seg = OsonFieldNamesSegment.__new__(OsonFieldNamesSegment)
-        seg._initialize(TNS_CHUNK_SIZE)
-        seg.field_names = []
-        return seg
-
-    cdef int process_field_names(self, ssize_t field_id_offset) except -1:
-        """
-        Processes the field names in preparation for encoding within OSON.
-        """
-        cdef:
-            OsonFieldName field_name
-            ssize_t i
-        self.field_names.sort(key=OsonFieldName.sort_key)
-        for i, field_name in enumerate(self.field_names):
-            field_name.field_id = field_id_offset + i + 1
-        self.num_field_names = <uint32_t> len(self.field_names)
-
-
-@cython.final
-cdef class OsonTreeSegment(GrowableBuffer):
-
-    cdef int _encode_container(self, uint8_t node_type,
-                               ssize_t num_children) except -1:
-        """
-        Encodes the first part of a container.
-        """
-        node_type |= 0x20                   # use uint32_t for offsets
-        if num_children > 65535:
-            node_type |= 0x10               # num children is uint32_t
-        elif num_children > 255:
-            node_type |= 0x08               # num children is uint16_t
-        self.write_uint8(node_type)
-        if num_children < 256:
-            self.write_uint8(<uint8_t> num_children)
-        elif num_children < 65536:
-            self.write_uint16be(<uint16_t> num_children)
-        else:
-            self.write_uint32be(<uint32_t> num_children)
-
-    cdef int encode_array(self, object value, OsonEncoder encoder) except -1:
-        """
-        Encode an array in the OSON tree segment.
-        """
-        cdef:
-            ssize_t num_children
-            uint8_t node_type
-            uint32_t offset
-        num_children = len(value)
-        self._encode_container(TNS_JSON_TYPE_ARRAY, num_children)
-        offset = self._pos
-        self._reserve_space(num_children * sizeof(uint32_t))
-        for element in value:
-            encode_uint32be(&self._data[offset], self._pos)
-            offset += sizeof(uint32_t)
-            self.encode_node(element, encoder)
-
-    cdef int encode_object(self, dict value, OsonEncoder encoder) except -1:
-        """
-        Encode an object in the OSON tree segment.
-        """
-        cdef:
-            uint32_t field_id_offset, value_offset, final_offset
-            OsonFieldName field_name
-            ssize_t num_children
-            object child_value
-            uint8_t node_type
-            str key
-        num_children = len(value)
-        self._encode_container(TNS_JSON_TYPE_OBJECT, num_children)
-        field_id_offset = self._pos
-        value_offset = self._pos + num_children * encoder.field_id_size
-        final_offset = value_offset + num_children * sizeof(uint32_t)
-        self._reserve_space(final_offset - self._pos)
-        for key, child_value in value.items():
-            field_name = encoder.field_names_dict[key]
-            if encoder.field_id_size == 1:
-                self._data[field_id_offset] = <uint8_t> field_name.field_id
-            elif encoder.field_id_size == 2:
-                encode_uint16be(&self._data[field_id_offset],
-                            <uint16_t> field_name.field_id)
-            else:
-                encode_uint32be(&self._data[field_id_offset],
-                              field_name.field_id)
-            encode_uint32be(&self._data[value_offset], self._pos)
-            field_id_offset += encoder.field_id_size
-            value_offset += sizeof(uint32_t)
-            self.encode_node(child_value, encoder)
-
-    cdef int encode_node(self, object value, OsonEncoder encoder) except -1:
-        """
-        Encode a value (node) in the OSON tree segment.
-        """
-        cdef:
-            char_type buf[ORA_TYPE_SIZE_MAX]
-            VectorEncoder vector_encoder
-            uint32_t value_len
-            bytes value_bytes
-
-        # handle null
-        if value is None:
-            self.write_uint8(TNS_JSON_TYPE_NULL)
-
-        # handle booleans
-        elif isinstance(value, bool):
-            if value is True:
-                self.write_uint8(TNS_JSON_TYPE_TRUE)
-            else:
-                self.write_uint8(TNS_JSON_TYPE_FALSE)
-
-        # handle numeric types
-        elif isinstance(value, (int, float, PY_TYPE_DECIMAL)):
-            value_bytes = (<str> cpython.PyObject_Str(value)).encode()
-            self.write_uint8(TNS_JSON_TYPE_NUMBER_LENGTH_UINT8)
-            self.write_oracle_number(value_bytes)
-
-        # handle bytes
-        elif isinstance(value, bytes):
-            value_len = len(<bytes> value)
-            if isinstance(value, PY_TYPE_JSON_ID):
-                self.write_uint8(TNS_JSON_TYPE_ID)
-                self.write_uint8(<uint8_t> value_len)
-            elif value_len < 65536:
-                self.write_uint8(TNS_JSON_TYPE_BINARY_LENGTH_UINT16)
-                self.write_uint16be(<uint16_t> value_len)
-            else:
-                self.write_uint8(TNS_JSON_TYPE_BINARY_LENGTH_UINT32)
-                self.write_uint32be(value_len)
-            self.write_bytes(<bytes> value)
-
-        # handle timestamps
-        elif isinstance(value, PY_TYPE_DATETIME):
-            if cydatetime.PyDateTime_DATE_GET_MICROSECOND(value) == 0:
-                self.write_uint8(TNS_JSON_TYPE_TIMESTAMP7)
-                encode_date(buf, value)
-                self.write_raw(buf, ORA_TYPE_SIZE_DATE)
-            else:
-                self.write_uint8(TNS_JSON_TYPE_TIMESTAMP)
-                encode_timestamp(buf, value)
-                self.write_raw(buf, ORA_TYPE_SIZE_TIMESTAMP)
-
-        # handle dates
-        elif isinstance(value, PY_TYPE_DATE):
-            self.write_uint8(TNS_JSON_TYPE_DATE)
-            encode_date(buf, value)
-            self.write_raw(buf, ORA_TYPE_SIZE_DATE)
-
-        # handle timedeltas
-        elif isinstance(value, PY_TYPE_TIMEDELTA):
-            self.write_uint8(TNS_JSON_TYPE_INTERVAL_DS)
-            encode_interval_ds(buf, value)
-            self.write_raw(buf, ORA_TYPE_SIZE_INTERVAL_DS)
-
-        # handle strings
-        elif isinstance(value, str):
-            value_bytes = (<str> value).encode()
-            value_len = len(value_bytes)
-            if value_len < 256:
-                self.write_uint8(TNS_JSON_TYPE_STRING_LENGTH_UINT8)
-                self.write_uint8(<uint8_t> value_len)
-            elif value_len < 65536:
-                self.write_uint8(TNS_JSON_TYPE_STRING_LENGTH_UINT16)
-                self.write_uint16be(<uint16_t> value_len)
-            else:
-                self.write_uint8(TNS_JSON_TYPE_STRING_LENGTH_UINT32)
-                self.write_uint32be(value_len)
-            if value_len > 0:
-                self.write_bytes(value_bytes)
-
-        # handle lists/tuples
-        elif isinstance(value, (list, tuple)):
-            self.encode_array(value, encoder)
-
-        # handle dictionaries
-        elif isinstance(value, dict):
-            self.encode_object(value, encoder)
-
-        # handle arrays (vectors)
-        elif isinstance(value, array.array):
-            self.write_uint8(TNS_JSON_TYPE_EXTENDED)
-            self.write_uint8(TNS_JSON_TYPE_VECTOR)
-            vector_encoder = VectorEncoder.__new__(VectorEncoder)
-            vector_encoder.encode(value)
-            self.write_uint32be(vector_encoder._pos)
-            self.write_raw(vector_encoder._data, vector_encoder._pos)
-
-        # other types are not supported
-        else:
-            errors._raise_err(errors.ERR_PYTHON_TYPE_NOT_SUPPORTED,
-                              typ=type(value).__name__)
-
-
-@cython.final
-cdef class OsonEncoder(GrowableBuffer):
-
-    cdef int _add_field_name(self, str name) except -1:
-        """
-        Add a field with the given name.
-        """
-        cdef OsonFieldName field_name
-        field_name = OsonFieldName.create(name, self.max_fname_size)
-        self.field_names_dict[name] = field_name
-        if field_name.name_bytes_len <= 255:
-            self.short_fnames_seg.add_name(field_name)
-        else:
-            if self.long_fnames_seg is None:
-                self.long_fnames_seg = OsonFieldNamesSegment.create()
-            self.long_fnames_seg.add_name(field_name)
-
-    cdef int _determine_flags(self, object value, uint16_t *flags) except -1:
-        """
-        Determine the flags to use for the OSON image.
-        """
-
-        # if value is a simple scalar, nothing more needs to be done
-        flags[0] = TNS_JSON_FLAG_INLINE_LEAF
-        if not isinstance(value, (list, tuple, dict)):
-            flags[0] |= TNS_JSON_FLAG_IS_SCALAR
-            return 0
-
-        # examine all values recursively to determine the unique set of field
-        # names and whether they need to be added to the long field names
-        # segment (> 255 bytes) or short field names segment (<= 255 bytes)
-        self.field_names_dict = {}
-        self.short_fnames_seg = OsonFieldNamesSegment.create()
-        self._examine_node(value)
-
-        # perform processing of field names segments and determine the total
-        # number of unique field names in the value
-        if self.short_fnames_seg is not None:
-            self.short_fnames_seg.process_field_names(0)
-            self.num_field_names += self.short_fnames_seg.num_field_names
-        if self.long_fnames_seg is not None:
-            self.long_fnames_seg.process_field_names(self.num_field_names)
-            self.num_field_names += self.long_fnames_seg.num_field_names
-
-        # determine remaining flags and field id size
-        flags[0] |= TNS_JSON_FLAG_HASH_ID_UINT8 | \
-                TNS_JSON_FLAG_TINY_NODES_STAT
-        if self.num_field_names > 65535:
-            flags[0] |= TNS_JSON_FLAG_NUM_FNAMES_UINT32
-            self.field_id_size = 4
-        elif self.num_field_names > 255:
-            flags[0] |= TNS_JSON_FLAG_NUM_FNAMES_UINT16
-            self.field_id_size = 2
-        else:
-            self.field_id_size = 1
-        if self.short_fnames_seg._pos > 65535:
-            flags[0] |= TNS_JSON_FLAG_FNAMES_SEG_UINT32
-
-    cdef int _examine_node(self, object value) except -1:
-        """
-        Examines the value. If it is a dictionary, all keys are extracted and
-        unique names retained. Elements in lists and tuples and values in
-        dictionaries are then examined to determine if they contain
-        dictionaries as well.
-        """
-        cdef str key
-        if isinstance(value, (list, tuple)):
-            for child_value in value:
-                self._examine_node(child_value)
-        elif isinstance(value, dict):
-            for key, child_value in (<dict> value).items():
-                if key not in self.field_names_dict:
-                    self._add_field_name(key)
-                self._examine_node(child_value)
-
-    cdef int _write_extended_header(self) except -1:
-        """
-        Write the extended header containing information about the short and
-        long field name segments.
-        """
-        cdef uint16_t secondary_flags = 0
-
-        # write number of short field names
-        if self.field_id_size == 1:
-            self.write_uint8(<uint8_t> self.short_fnames_seg.num_field_names)
-        elif self.field_id_size == 2:
-            self.write_uint16be(
-                <uint16_t> self.short_fnames_seg.num_field_names
-            )
-        else:
-            self.write_uint32be(self.short_fnames_seg.num_field_names)
-
-        # write size of short field names segment
-        if self.short_fnames_seg._pos < 65536:
-            self.write_uint16be(<uint16_t> self.short_fnames_seg._pos)
-        else:
-            self.write_uint32be(self.short_fnames_seg._pos)
-
-        # write fields for long field names segment, if applicable
-        if self.long_fnames_seg is not None:
-            if self.long_fnames_seg._pos < 65536:
-                secondary_flags = TNS_JSON_FLAG_SEC_FNAMES_SEG_UINT16
-            self.write_uint16be(secondary_flags)
-            self.write_uint32be(self.long_fnames_seg.num_field_names)
-            self.write_uint32be(self.long_fnames_seg._pos)
-
-    cdef int _write_fnames_seg(self, OsonFieldNamesSegment seg) except -1:
-        """
-        Write the contents of the field names segment to the buffer.
-        """
-        cdef OsonFieldName field_name
-
-        # write array of hash ids
-        for field_name in seg.field_names:
-            if field_name.name_bytes_len <= 255:
-                self.write_uint8(field_name.hash_id & 0xff)
-            else:
-                self.write_uint16be(field_name.hash_id & 0xffff)
-
-        # write array of field name offsets for the short field names
-        for field_name in seg.field_names:
-            if seg._pos < 65536:
-                self.write_uint16be(<uint16_t> field_name.offset)
-            else:
-                self.write_uint32be(field_name.offset)
-
-        # write field names
-        if seg._pos > 0:
-            self.write_raw(seg._data, seg._pos)
-
-    cdef int encode(self, object value, ssize_t max_fname_size) except -1:
-        """
-        Encodes the given value to OSON.
-        """
-        cdef:
-            OsonFieldName field_name
-            OsonTreeSegment tree_seg
-            uint16_t flags
-
-        # determine the flags to use
-        self.max_fname_size = max_fname_size
-        self._determine_flags(value, &flags)
-
-        # encode values into tree segment
-        tree_seg = OsonTreeSegment.__new__(OsonTreeSegment)
-        tree_seg._initialize(TNS_CHUNK_SIZE)
-        tree_seg.encode_node(value, self)
-        if tree_seg._pos > 65535:
-            flags |= TNS_JSON_FLAG_TREE_SEG_UINT32
-
-        # write initial header
-        self.write_uint8(TNS_JSON_MAGIC_BYTE_1)
-        self.write_uint8(TNS_JSON_MAGIC_BYTE_2)
-        self.write_uint8(TNS_JSON_MAGIC_BYTE_3)
-        if self.long_fnames_seg is not None:
-            self.write_uint8(TNS_JSON_VERSION_MAX_FNAME_65535)
-        else:
-            self.write_uint8(TNS_JSON_VERSION_MAX_FNAME_255)
-        self.write_uint16be(flags)
-
-        # write extended header (when value is not scalar)
-        if self.short_fnames_seg is not None:
-            self._write_extended_header()
-
-        # write size of tree segment
-        if tree_seg._pos < 65536:
-            self.write_uint16be(<uint16_t> tree_seg._pos)
-        else:
-            self.write_uint32be(tree_seg._pos)
-
-        # write remainder of header and any data (when value is not scalar)
-        if self.short_fnames_seg is not None:
-
-            # write number of "tiny" nodes (always zero)
-            self.write_uint16be(0)
-
-            # write field name segments
-            self._write_fnames_seg(self.short_fnames_seg)
-            if self.long_fnames_seg is not None:
-                self._write_fnames_seg(self.long_fnames_seg)
-
-        # write tree segment data
-        self.write_raw(tree_seg._data, tree_seg._pos)
diff --git a/src/oracledb/impl/base/parsers.pyx b/src/oracledb/impl/base/parsers.pyx
deleted file mode 100644
index a894595e..00000000
--- a/src/oracledb/impl/base/parsers.pyx
+++ /dev/null
@@ -1,965 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# parsers.pyx
-#
-# Cython file defining the classes used for parsing connect strings and
-# statements (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-# a set of alternative parameter names that are used in connect descriptors
-# the key is the parameter name used in connect descriptors and the value is
-# the key used in argument dictionaries (and stored in the parameter objects)
-ALTERNATIVE_PARAM_NAMES = {
-    "pool_connection_class": "cclass",
-    "pool_purity": "purity",
-    "server": "server_type",
-    "transport_connect_timeout": "tcp_connect_timeout",
-    "my_wallet_directory": "wallet_location"
-}
-
-# a set of parameter names used as containers for storing additional parameters
-CONTAINER_PARAM_NAMES = set([
-    "address",
-    "address_list",
-    "connect_data",
-    "description",
-    "description_list",
-    "security",
-])
-
-# DESCRIPTION parameter names that are supported by the driver; all other
-# key/value pairs are passed unchanged to the database
-DESCRIPTION_PARAM_NAMES = set([
-    "address",
-    "address_list",
-    "connect_data",
-    "expire_time",
-    "failover",
-    "load_balance",
-    "source_route",
-    "retry_count",
-    "retry_delay",
-    "sdu",
-    "tcp_connect_timeout",
-    "use_sni",
-    "security",
-])
-
-# extra DESCRIPTION parameter names that are passed through when detected in an
-# easy connect string
-EXTRA_DESCRIPTION_PARAM_NAMES = set([
-    "enable",
-    "recv_buf_size",
-    "send_buf_size"
-])
-
-# CONNECT_DATA parameter names that are supported by the driver; all other
-# key/value pairs are passed unchanged to the database
-CONNECT_DATA_PARAM_NAMES = set([
-    "cclass",
-    "connection_id_prefix",
-    "instance_name",
-    "pool_boundary",
-    "pool_name",
-    "purity",
-    "server_type",
-    "service_name",
-    "sid",
-    "use_tcp_fast_open",
-])
-
-# SECURITY parameter names that are supported by the driver; all other
-# key/value pairs are passed unchanged to the database
-SECURITY_PARAM_NAMES = set([
-    "ssl_server_cert_dn",
-    "ssl_server_dn_match",
-    "ssl_version",
-    "wallet_location",
-])
-
-# a set of parameter names supported by the driver in EasyConnect strings that
-# are common to all drivers
-COMMON_PARAM_NAMES = set([
-    "expire_time",
-    "failover",
-    "https_proxy",
-    "https_proxy_port",
-    "load_balance",
-    "pool_boundary",
-    "pool_name",
-    "pool_connection_class",
-    "pool_purity",
-    "retry_count",
-    "retry_delay",
-    "sdu",
-    "source_route",
-    "ssl_server_cert_dn",
-    "ssl_server_dn_match",
-    "transport_connect_timeout",
-    "use_sni",
-    "wallet_location",
-])
-
-# extended parameter prefix
-EXTENDED_PARAM_PREFIX = "pyo."
-
-# a set of parameter names that can be specified in EasyConnect strings using
-# the extended parameter prefix; these are specific to python-oracledb
-EXTENDED_PARAM_NAMES = set([
-
-    # ConnectParams
-    "connection_id_prefix",
-    "disable_oob",
-    "driver_name",
-    "edition",
-    "events",
-    "externalauth",
-    "machine",
-    "mode",
-    "osuser",
-    "program",
-    "stmtcachesize",
-    "terminal",
-    "use_tcp_fast_open",
-
-    # PoolParams
-    "getmode",
-    "homogeneous",
-    "increment",
-    "max",
-    "max_lifetime_session",
-    "max_sessions_per_shard",
-    "min",
-    "ping_interval",
-    "ping_timeout",
-    "soda_metadata_cache",
-    "timeout",
-    "wait_timeout",
-
-])
-
-# this cache stores the configurations acquired from one of the configuration
-# stores
-cdef dict cached_configs = {}
-
-# add all of the common parameters to the extended parameters using the
-# python-oracledb specific name
-for name in COMMON_PARAM_NAMES:
-    EXTENDED_PARAM_NAMES.add(ALTERNATIVE_PARAM_NAMES.get(name, name))
-
-
-cdef class BaseParser:
-
-    cdef Py_UCS4 get_current_char(self):
-        """
-        Returns the current character in the data being parsed. This method
-        assumes that the end of the stream has not been encountered.
-        """
-        return cpython.PyUnicode_READ(self.data_kind, self.data, self.temp_pos)
-
-    cdef int initialize(self, str data_to_parse) except -1:
-        """
-        Initializes the parser with the data to parse.
-        """
-        self.pos = 0
-        self.temp_pos = 0
-        self.data_as_str = data_to_parse
-        self.num_chars = cpython.PyUnicode_GET_LENGTH(data_to_parse)
-        self.data = cpython.PyUnicode_DATA(data_to_parse)
-        self.data_kind = cpython.PyUnicode_KIND(data_to_parse)
-
-    cdef int parse_keyword(self) except -1:
-        """
-        Parse a keyword from the data to parse.
-        """
-        cdef Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not cpython.Py_UNICODE_ISALPHA(ch) \
-                    and not cpython.Py_UNICODE_ISDIGIT(ch) \
-                    and ch != '_' and ch != '.':
-                break
-            self.temp_pos += 1
-
-    cdef int parse_quoted_string(self, Py_UCS4 quote_type) except -1:
-        """
-        Parses a quoted string with the given quote type. All characters until
-        the quote type is detected are discarded.
-        """
-        cdef Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            self.temp_pos += 1
-            if ch == quote_type:
-                self.pos = self.temp_pos
-                return 0
-        if quote_type == "'":
-            errors._raise_err(errors.ERR_MISSING_ENDING_SINGLE_QUOTE)
-        else:
-            errors._raise_err(errors.ERR_MISSING_ENDING_DOUBLE_QUOTE)
-
-    cdef int skip_spaces(self) except -1:
-        """
-        Skip any spaces that are present in the string.
-        """
-        cdef Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not cpython.Py_UNICODE_ISSPACE(ch):
-                break
-            self.temp_pos += 1
-
-
-cdef int update_config_cache(str config_cache_key, dict config) except -1:
-    """
-    Updates the cache with the specified configuration.
-    """
-    cdef:
-        double current_time, soft_expiry_time, hard_expiry_time
-        uint32_t time_to_live, time_to_live_grace_period
-        object setting
-
-    # the config can include config_time_to_live; the default value is 86400
-    # (24 hours); an explicit value of 0 disables caching
-    setting = config.get("config_time_to_live")
-    if setting is None:
-        time_to_live = 86400
-    else:
-        time_to_live = int(setting)
-    if time_to_live == 0:
-        return 0
-
-    # the config settings can also include config_time_to_live_grace_period;
-    # the default value is 1800 (30 minutes)
-    setting = config.get("config_time_to_live_grace_period")
-    if setting is None:
-        time_to_live_grace_period = 1800
-    else:
-        time_to_live_grace_period = int(setting)
-
-    # calculate soft and hard expiry times and keep them with the config
-    current_time = time.monotonic()
-    soft_expiry_time = current_time + time_to_live
-    hard_expiry_time = soft_expiry_time + time_to_live_grace_period
-    config = copy.deepcopy(config)
-    config["config_cache_soft_expiry_time"] = soft_expiry_time
-    config["config_cache_hard_expiry_time"] = hard_expiry_time
-    cached_configs[config_cache_key] = config
-
-
-cdef class ConnectStringParser(BaseParser):
-
-    cdef:
-        DescriptionList description_list
-        Description template_description
-        ConnectParamsImpl params_impl
-        Address template_address
-        Description description
-        dict parameters
-
-    cdef int _call_protocol_hook(self, str protocol, str arg,
-                                 object fn) except -1:
-        """
-        Check if the config cache has an entry; if an extry exists and it has
-        not expired, use it; otherwise, call the protocol hook function.
-        """
-        cdef:
-            double current_time = 0, expiry_time = 0
-            dict config
-
-        # check to see if the cache has a value and that it has not reached the
-        # soft expiry time
-        config = cached_configs.get(self.data_as_str)
-        if config is not None:
-            current_time = time.monotonic()
-            expiry_time = config["config_cache_soft_expiry_time"]
-            if current_time <= expiry_time:
-                self.params_impl.set_from_config(config, update_cache=False)
-                return 0
-
-        # call the protocol hook function; the cache key is set on the
-        # parameters instance so that calls by the hook function to
-        # set_from_config() will update the cache
-        params = self.params_impl._get_public_instance()
-        self.params_impl._config_cache_key = self.data_as_str
-        try:
-            fn(protocol, arg, params)
-        except Exception as e:
-
-            # if the hook fails but a config exists in the cache and the hard
-            # expiry time has not been reached the existing config is used
-            if config is not None:
-                expiry_time = config["config_cache_hard_expiry_time"]
-                if current_time <= expiry_time:
-                    self.params_impl.set_from_config(config, update_cache=False)
-                    return 0
-                del cached_configs[self.params_impl._config_cache_key]
-            errors._raise_err(errors.ERR_PROTOCOL_HANDLER_FAILED,
-                              protocol=protocol, arg=arg, cause=e)
-        finally:
-            self.params_impl._config_cache_key = None
-
-    cdef bint _is_host_or_service_name_char(self, Py_UCS4 ch):
-        """
-        Returns whether or not the given character is allowed to be used inside
-        a host name or service name.
-        """
-        return cpython.Py_UNICODE_ISALPHA(ch) \
-                or cpython.Py_UNICODE_ISDIGIT(ch) \
-                or ch in ('-', '_', '.')
-
-    cdef int _parse_descriptor(self) except -1:
-        """
-        Parses a connect descriptor.
-        """
-        cdef:
-            AddressList address_list
-            Description description
-            Address address
-            dict args = {}
-        self._parse_descriptor_key_value_pair(args)
-        self.description_list = DescriptionList()
-        list_args = args.get("description_list")
-        if list_args is not None:
-            self.description_list.set_from_args(list_args)
-        else:
-            list_args = args
-        descriptions = list_args.get("description", list_args)
-        if not isinstance(descriptions, list):
-            descriptions = [descriptions]
-        for desc_args in descriptions:
-            description = self.template_description.copy()
-            description.set_from_description_args(desc_args)
-            self.description_list.children.append(description)
-            sub_args = desc_args.get("connect_data")
-            if sub_args is not None:
-                description.set_from_connect_data_args(sub_args)
-            sub_args = desc_args.get("security")
-            if sub_args is not None:
-                description.set_from_security_args(sub_args)
-            address_lists = desc_args.get("address_list", desc_args)
-            if not isinstance(address_lists, list):
-                description.source_route = False
-                address_lists = [address_lists]
-            for list_args in address_lists:
-                address_list = AddressList()
-                address_list.set_from_args(list_args)
-                description.children.append(address_list)
-                addresses = list_args.get("address", [])
-                if not isinstance(addresses, list):
-                    addresses = [addresses]
-                for addr_args in addresses:
-                    address = self.template_address.copy()
-                    address.set_from_args(addr_args)
-                    address_list.children.append(address)
-        if not self.description_list.get_addresses():
-            errors._raise_err(errors.ERR_MISSING_ADDRESS,
-                              connect_string=self.data_as_str)
-
-    cdef int _parse_descriptor_key_value_pair(self, dict args) except -1:
-        """
-        Parses a key-value pair from the connect string. At this point it is
-        assumed that the character previously read was an opening parenthesis.
-        """
-        cdef:
-            bint is_simple_value = False
-            object value = None
-            ssize_t start_pos
-            Py_UCS4 ch = 0
-            str name
-
-        # parse keyword
-        self.skip_spaces()
-        start_pos = self.temp_pos
-        self.parse_keyword()
-        if self.temp_pos == start_pos:
-            errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                              data=self.data_as_str)
-        name = self.data_as_str[start_pos:self.temp_pos].lower()
-        name = ALTERNATIVE_PARAM_NAMES.get(name, name)
-
-        # look for equals sign
-        self.skip_spaces()
-        if self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-        if ch != '=':
-            errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                              data=self.data_as_str)
-        self.temp_pos += 1
-        self.skip_spaces()
-
-        # parse value
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch == '"':
-                if is_simple_value:
-                    errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                                      data=self.data_as_str)
-                self.temp_pos += 1
-                start_pos = self.temp_pos
-                self.parse_quoted_string(ch)
-                if self.temp_pos > start_pos + 1:
-                    value = self.data_as_str[start_pos:self.temp_pos - 1]
-                break
-            elif ch == '(':
-                if is_simple_value:
-                    errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                                      data=self.data_as_str)
-                self.temp_pos += 1
-                if value is None:
-                    value = {}
-                self._parse_descriptor_key_value_pair(value)
-                continue
-            elif ch == ')':
-                break
-            elif not is_simple_value and not cpython.Py_UNICODE_ISSPACE(ch):
-                if value is not None or name in CONTAINER_PARAM_NAMES:
-                    errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                                      data=self.data_as_str)
-                start_pos = self.temp_pos
-                is_simple_value = True
-            self.temp_pos += 1
-        if is_simple_value:
-            value = self.data_as_str[start_pos:self.temp_pos].strip()
-        self.skip_spaces()
-        if self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch != ')':
-                errors._raise_err(errors.ERR_INVALID_CONNECT_DESCRIPTOR,
-                                  data=self.data_as_str)
-            self.temp_pos += 1
-        self.skip_spaces()
-        self.pos = self.temp_pos
-
-        # store value in dictionary
-        if value is not None:
-            self._set_descriptor_arg(args, name, value)
-
-    cdef int _parse_easy_connect(self) except -1:
-        """
-        Parses an easy connect string.
-        """
-        cdef:
-            object fn
-            str protocol, arg
-        protocol = self._parse_easy_connect_protocol()
-        if protocol is not None:
-            fn = REGISTERED_PROTOCOLS.get(protocol)
-            if fn is not None:
-                arg = self.data_as_str[self.temp_pos:]
-                self._call_protocol_hook(protocol, arg, fn)
-                self.description_list = self.params_impl.description_list
-                self.pos = self.num_chars
-                return 0
-            elif protocol != self.template_address.protocol:
-                self.template_address = self.template_address.copy()
-                self.template_address.set_protocol(protocol)
-        self._parse_easy_connect_hosts()
-        self._parse_easy_connect_service_name()
-        self._parse_easy_connect_instance_name()
-        if self.description_list is not None:
-            self._parse_easy_connect_parameters()
-
-    cdef int _parse_easy_connect_host(self, Address address) except -1:
-        """
-        Parses a host name from the easy connect string.
-        """
-        cdef:
-            bint found_bracket = False, found_host = False
-            ssize_t start_pos = self.temp_pos
-            Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not found_bracket and not found_host and ch == '[':
-                found_bracket = True
-                start_pos = self.temp_pos + 1
-            elif found_bracket and ch == ']':
-                address.host = self.data_as_str[start_pos:self.temp_pos]
-                self.temp_pos = self.temp_pos + 1
-                self.pos = self.temp_pos
-                break
-            elif found_bracket or self._is_host_or_service_name_char(ch):
-                self.temp_pos += 1
-                found_host = True
-            else:
-                if found_host:
-                    address.host = self.data_as_str[start_pos:self.temp_pos]
-                    self.pos = self.temp_pos
-                break
-
-    cdef int _parse_easy_connect_hosts(self) except -1:
-        """
-        Parses the list of hosts from an easy connect string. This should be a
-        series of host names separated by commas or semicolons.
-        """
-        cdef:
-            Address temp_address, address = None
-            ssize_t i, port_index = 0
-            AddressList address_list
-            Py_UCS4 ch
-        self.description = self.template_description.copy()
-        address_list = AddressList()
-        self.description.children.append(address_list)
-        self.temp_pos = self.pos
-        while True:
-            address = self.template_address.copy()
-            self._parse_easy_connect_host(address)
-            if self.temp_pos != self.pos or self.pos >= self.num_chars:
-                break
-            self.pos = self.temp_pos
-            address_list.children.append(address)
-            ch = self.get_current_char()
-            if ch == ':':
-                self.temp_pos += 1
-                self._parse_easy_connect_port(address)
-                self.pos = self.temp_pos
-                if self.pos >= self.num_chars:
-                    break
-                for i in range(port_index, len(address_list.children) - 1):
-                    temp_address = address_list.children[i]
-                    temp_address.port = address.port
-                port_index = len(address_list.children)
-                ch = self.get_current_char()
-            if ch == ';':
-                address_list = AddressList()
-                self.description.children.append(address_list)
-                port_index = 0
-            elif ch != ',':
-                break
-            self.temp_pos += 1
-
-    cdef int _parse_easy_connect_parameter(self) except -1:
-        """
-        Parses a single parameter from the easy connect string. This is
-        expected to be a keyword followed by a value seprated by an equals
-        sign.
-        """
-        cdef:
-            ssize_t start_pos, end_pos = 0
-            str name, value
-            Py_UCS4 ch = 0
-            bint keep
-
-        # get parameter name
-        self.skip_spaces()
-        start_pos = self.temp_pos
-        self.parse_keyword()
-        if self.temp_pos == start_pos or self.temp_pos >= self.num_chars:
-            return 0
-        name = self.data_as_str[start_pos:self.temp_pos].lower()
-        if name.startswith(EXTENDED_PARAM_PREFIX):
-            name = name[len(EXTENDED_PARAM_PREFIX):]
-            keep = name in EXTENDED_PARAM_NAMES
-        else:
-            keep = name in COMMON_PARAM_NAMES \
-                    or name in EXTRA_DESCRIPTION_PARAM_NAMES
-            name = ALTERNATIVE_PARAM_NAMES.get(name, name)
-
-        # look for the equals sign
-        self.skip_spaces()
-        if self.temp_pos >= self.num_chars:
-            return 0
-        ch = self.get_current_char()
-        if ch != '=':
-            return 0
-        self.temp_pos += 1
-
-        # get the parameter value
-        found_value = False
-        self.skip_spaces()
-        start_pos = self.temp_pos
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch == '"':
-                # if the quote is not the first character in the value, this is
-                # not a valid easy connect parameter
-                if self.temp_pos > start_pos:
-                    return 0
-                self.temp_pos += 1
-                start_pos = self.temp_pos
-                self.parse_quoted_string(ch)
-                end_pos = self.temp_pos - 1
-                break
-            elif ch == '&':
-                end_pos = self.temp_pos
-                break
-            self.temp_pos += 1
-            end_pos = self.temp_pos
-        if end_pos > start_pos and keep:
-            if self.parameters is None:
-                self.parameters = {}
-            value = self.data_as_str[start_pos:end_pos]
-            if name in EXTRA_DESCRIPTION_PARAM_NAMES:
-                self.parameters.setdefault("extra_args", {})[name] = value
-            else:
-                self.parameters[name] = value
-        self.skip_spaces()
-        self.pos = self.temp_pos
-
-    cdef int _parse_easy_connect_parameters(self) except -1:
-        """
-        Parses the parameters from the easy connect string. This is expected to
-        be a question mark followed by a series of key-value pairs separated by
-        ampersands.
-        """
-        cdef:
-            Py_UCS4 ch, expected_sep
-            Address address
-        expected_sep = '?'
-        self.temp_pos = self.pos
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch != expected_sep:
-                break
-            expected_sep = '&'
-            self.temp_pos += 1
-            self._parse_easy_connect_parameter()
-
-    cdef int _parse_easy_connect_port(self, Address address) except -1:
-        """
-        Parses a port number from the easy connect string. This consists of one
-        or more digits.
-        """
-        cdef:
-            ssize_t pos = self.temp_pos
-            bint found_port = False
-            Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not cpython.Py_UNICODE_ISDIGIT(ch):
-                break
-            found_port = True
-            self.temp_pos += 1
-        if found_port:
-            address.port = int(self.data_as_str[pos:self.temp_pos])
-
-    cdef str _parse_easy_connect_protocol(self):
-        """
-        Parses the protocol from an easy connect string. This should be a
-        series of alphabetic characters or dashes, followed by a colon and two
-        slashes. If such a string is found, it is saved on the template address
-        associated with the parser; otherwise, the default protocol of "tcp" is
-        saved on the template address associated with the parser. If no
-        protocol is found, the separator (two slashes) may still be found and
-        will be disarded.
-        """
-        cdef:
-            ssize_t start_sep_pos = self.pos
-            int num_sep_chars = 0
-            str protocol = None
-            Py_UCS4 ch
-        self.temp_pos = self.pos
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch == ':':
-                protocol = self.data_as_str[self.pos:self.temp_pos].lower()
-                start_sep_pos = self.temp_pos + 1
-            elif ch == '/' and self.temp_pos - start_sep_pos == num_sep_chars:
-                num_sep_chars += 1
-                if num_sep_chars == 2:
-                    self.temp_pos += 1
-                    self.pos = self.temp_pos
-                    break
-            elif not cpython.Py_UNICODE_ISALPHA(ch) and ch not in ('-', '_'):
-                break
-            self.temp_pos += 1
-        if protocol is not None and num_sep_chars == 2:
-            return protocol
-
-    cdef str _parse_easy_connect_service_name(self):
-        """
-        Parses the service name from an easy connect string. This is expected
-        to be a slash followed by a series of alphanumeric characters. If such
-        a string is found, it is returned.
-        """
-        cdef:
-            bint found_service_name = False, found_server_type = False
-            bint found_slash = False, found_colon = False
-            ssize_t service_name_end_pos = 0
-            Py_UCS4 ch
-            str value
-        self.temp_pos = self.pos
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not found_slash and ch == '/':
-                found_slash = True
-            elif found_service_name and not found_colon and ch == ':':
-                found_colon = True
-            elif found_slash and not found_colon \
-                    and self._is_host_or_service_name_char(ch):
-                found_service_name = True
-                service_name_end_pos = self.temp_pos + 1
-            elif found_colon and cpython.Py_UNICODE_ISALPHA(ch):
-                found_server_type = True
-            else:
-                break
-            self.temp_pos += 1
-        if found_service_name:
-            self.description.service_name = \
-                    self.data_as_str[self.pos + 1:service_name_end_pos]
-        if found_slash:
-            self.pos = self.temp_pos
-            self.description_list = DescriptionList()
-            self.description_list.children.append(self.description)
-        if found_server_type:
-            value = self.data_as_str[service_name_end_pos + 1:self.temp_pos]
-            self.description.set_server_type(value)
-
-    cdef str _parse_easy_connect_instance_name(self):
-        """
-        Parses the instance name from an easy connect string. This is expected
-        to be a slash followed by a series of alphanumeric characters. If such
-        a string is found, it is returned.
-        """
-        cdef:
-            ssize_t instance_name_end_pos = 0
-            bint found_instance_name = False
-            bint found_slash = False
-            Py_UCS4 ch
-            str value
-        self.temp_pos = self.pos
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not found_slash and ch == '/':
-                found_slash = True
-            elif found_slash and self._is_host_or_service_name_char(ch):
-                found_instance_name = True
-                instance_name_end_pos = self.temp_pos + 1
-            else:
-                break
-            self.temp_pos += 1
-        if found_instance_name:
-            self.description.instance_name = \
-                    self.data_as_str[self.pos + 1:instance_name_end_pos]
-            self.pos = self.temp_pos
-
-    cdef dict _process_args_with_extras(self, dict args, set allowed_names,
-                                        str extras_name):
-        """
-        Processes arguments which contain a set of known attributes and any
-        number of unknown attributes. The known attributes are left untouched
-        whereas the unknown ones are put in a separate dictionary with the
-        given name.
-        """
-        cdef:
-            dict extras, result = {}
-            object value
-            str key
-        for key, value in args.items():
-            if key in allowed_names:
-                result[key] = value
-            else:
-                extras = result.setdefault(extras_name, {})
-                extras[key] = value
-        return result
-
-    cdef int _set_descriptor_arg(
-        self, dict args, str name, object value
-    ) except -1:
-        """
-        Sets the arg in the dictionary. If the value is already present,
-        however, a list is created and both values stored. In addition, if an
-        address is being added but an address list already exists, it is simply
-        added to that address list instead. Similarly, if an address list is
-        being added and addresses already exist, those addresses are first
-        added to the address list before the new value is added.
-        """
-        # process unrecognized parameters, if applicable
-        if name == "description":
-            value = self._process_args_with_extras(
-                value, DESCRIPTION_PARAM_NAMES, "extra_args"
-            )
-        elif name == "connect_data":
-            value = self._process_args_with_extras(
-                value, CONNECT_DATA_PARAM_NAMES, "extra_connect_data_args"
-            )
-        elif name == "security":
-            value = self._process_args_with_extras(
-                value, SECURITY_PARAM_NAMES, "extra_security_args"
-            )
-
-        # add value to arguments, creating a list if encountered multiple times
-        orig_value = args.get(name)
-        if orig_value is None:
-            if name == "address" and "address_list" in args:
-                return self._set_descriptor_arg(args, "address_list",
-                                                dict(address=value))
-            elif name == "address_list" and "address" in args:
-                addresses = args.pop("address")
-                if not isinstance(addresses, list):
-                    addresses = [addresses]
-                value = [dict(address=a) for a in addresses] + [value]
-            args[name] = value
-        elif isinstance(orig_value, list):
-            args[name].append(value)
-        else:
-            args[name] = [orig_value, value]
-
-    cdef int parse(self, str connect_string) except -1:
-        """
-        Parses a connect string. If the first character is an opening
-        parenthesis, the connect string is assumed to be a connect descriptor
-        and any failures to parse the string as a connect descriptor will
-        result in an exception. If the connect string contains key elements
-        identifying it as an easy connect string, any failures to parse the
-        connect string as an easy connect string will result in an exception.
-        If the connect string doesn't seem to be either option, the value None
-        is returned.
-        """
-        cdef Py_UCS4 ch
-        self.initialize(connect_string)
-        ch = self.get_current_char()
-        if ch == '(':
-            self.temp_pos += 1
-            self._parse_descriptor()
-        else:
-            self._parse_easy_connect()
-        if self.description_list is not None and self.pos != self.num_chars:
-            if self.pos > 0:
-                errors._raise_err(errors.ERR_CANNOT_PARSE_CONNECT_STRING,
-                                  data=connect_string)
-            self.description_list = None
-
-
-cdef class TnsnamesFileParser(BaseParser):
-
-    cdef int _skip_to_end_of_line(self) except -1:
-        """
-        Skips all characters until the next line break is found and then
-        discards all whitespace after that.
-        """
-        cdef Py_UCS4 ch
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            self.temp_pos += 1
-            if cpython.Py_UNICODE_ISLINEBREAK(ch):
-                break
-        self.pos = self.temp_pos
-        self.skip_spaces()
-
-    cdef str _parse_key(self):
-        """
-        Parses a key from the file and returns it. This consists of any number
-        of non-whitespace characters until an equals sign is found. Any
-        comments are discarded. If no characters are found before the equals
-        sign, the line is discarded. Similarly, if an opening or closing
-        parenthesis is discovered, the line is discarded.
-        """
-        cdef:
-            bint found_key = False
-            ssize_t start_pos = 0
-            Py_UCS4 ch
-        self.skip_spaces()
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch in ('(', ')', '#'):
-                self._skip_to_end_of_line()
-                found_key = False
-                continue
-            elif ch == '=':
-                if not found_key:
-                    self._skip_to_end_of_line()
-                    continue
-                self.temp_pos += 1
-                self.pos = self.temp_pos
-                return self.data_as_str[start_pos:self.temp_pos - 1].strip()
-            elif not found_key:
-                found_key = True
-                start_pos = self.temp_pos
-            self.temp_pos += 1
-
-    cdef str _parse_value_part(self, ssize_t* num_parens):
-        """
-        Parses part of a value. This consists of all characters from the first
-        non-whitespace character to the end of the value or the first comment.
-        The number of parentheses are updated.
-        """
-        cdef:
-            ssize_t start_pos = 0, end_pos = 0
-            bint found_part = False
-            Py_UCS4 ch
-        self.skip_spaces()
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if ch == '#':
-                end_pos = self.temp_pos
-                self._skip_to_end_of_line()
-                if found_part:
-                    break
-                continue
-            if found_part and num_parens[0] == 0:
-                if cpython.Py_UNICODE_ISLINEBREAK(ch):
-                    end_pos = self.temp_pos
-                    break
-            elif ch == '(':
-                num_parens[0] += 1
-            elif ch == ')' and num_parens[0] > 0:
-                num_parens[0] -= 1
-            if not found_part:
-                found_part = True
-                start_pos = self.temp_pos
-            self.temp_pos += 1
-            end_pos = self.temp_pos
-        if found_part:
-            return self.data_as_str[start_pos:end_pos].strip()
-
-    cdef str _parse_value(self):
-        """
-        Parses a value from the file and returns it. This consists of all data
-        after the first non-whitespace character until the end of the line on
-        which it is found, or if the first non-whitespace character is an
-        opening parenthesis, then all data until the number of opening and
-        closing parentheses are equal.
-        """
-        cdef:
-            ssize_t num_parens = 0
-            list parts = []
-            str part
-        while self.temp_pos < self.num_chars:
-            part = self._parse_value_part(&num_parens)
-            if part is not None:
-                parts.append(part)
-            if num_parens == 0:
-                break
-        if parts:
-            return "\n".join(parts)
-
-    cdef int parse(self, str file_contents, object on_add_entry) except -1:
-        """
-        Parses the contents of a tnsnames.ora file. This consists of a series
-        of key-value pairs where the keys can consist of comma-separated alias
-        names and the values can be descriptors or easy connect strings. The
-        method "on_add_entry" is called for each key-value pair that is
-        discovered. No errors are thrown for improperly formatted files in
-        order to be consistent with other drivers.
-        """
-        cdef str key, value
-        self.initialize(file_contents)
-        while self.temp_pos < self.num_chars:
-            key = self._parse_key()
-            value = self._parse_value()
-            if key and value:
-                on_add_entry(key.upper(), value.strip())
diff --git a/src/oracledb/impl/base/pipeline.pyx b/src/oracledb/impl/base/pipeline.pyx
deleted file mode 100644
index 35244e03..00000000
--- a/src/oracledb/impl/base/pipeline.pyx
+++ /dev/null
@@ -1,89 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# pipeline.pyx
-#
-# Cython file defining the PipelineImpl, PipelineOpImpl and
-# PipelineOpResultImpl classes (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class PipelineImpl:
-
-    def __init__(self):
-        self.operations = []
-
-
-cdef class PipelineOpImpl:
-
-    def __init__(
-        self,
-        uint8_t op_type,
-        str statement = None,
-        str name = None,
-        object parameters = None,
-        object keyword_parameters = None,
-        object return_type = None,
-        object rowfactory = None,
-        uint32_t arraysize = 0,
-        uint32_t num_rows = 0,
-        object fetch_lobs = None,
-        object fetch_decimals = None,
-    ):
-        self.op_type = op_type
-        self.statement = statement
-        self.name = name
-        self.parameters = parameters
-        self.keyword_parameters = keyword_parameters
-        self.return_type = return_type
-        self.rowfactory = rowfactory
-        self.arraysize = arraysize
-        self.num_rows = num_rows
-        if fetch_lobs is None:
-            self.fetch_lobs = C_DEFAULTS.fetch_lobs
-        else:
-            self.fetch_lobs = fetch_lobs
-        if fetch_decimals is None:
-            self.fetch_decimals = C_DEFAULTS.fetch_decimals
-        else:
-            self.fetch_decimals = fetch_decimals
-
-
-cdef class PipelineOpResultImpl:
-
-    def __init__(self, PipelineOpImpl op):
-        self.operation = op
-
-    cdef int _capture_err(self, Exception exc) except -1:
-        """
-        Captures the error in the result. If the error is not an error
-        generated by the driver itself, wrap it so that the value in the error
-        attribute is always an instance of the _Error class.
-        """
-        if isinstance(exc, exceptions.Error):
-            self.error = exc.args[0]
-        else:
-            self.error = errors._create_err(
-                errors.ERR_UNEXPECTED_PIPELINE_FAILURE, cause=exc
-            )
diff --git a/src/oracledb/impl/base/pool.pyx b/src/oracledb/impl/base/pool.pyx
deleted file mode 100644
index 702d01b1..00000000
--- a/src/oracledb/impl/base/pool.pyx
+++ /dev/null
@@ -1,125 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# pool.pyx
-#
-# Cython file defining the base Pool implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BasePoolImpl:
-
-    def acquire(self, str user, str password, str cclass, uint32_t purity,
-                str tag, bint matchanytag, list shardingkey,
-                list supershardingkey):
-        errors._raise_not_supported("acquiring a connection from a pool")
-
-    def close(self, bint force):
-        errors._raise_not_supported("closing a pool")
-
-    def drop(self, conn_impl):
-        errors._raise_not_supported("dropping a connection from a pool")
-
-    def get_busy_count(self):
-        errors._raise_not_supported(
-            "getting the number of busy connections in a pool"
-        )
-
-    def get_getmode(self):
-        errors._raise_not_supported("getting the 'get' mode of a pool")
-
-    def get_max_lifetime_session(self):
-        errors._raise_not_supported(
-            "getting the maximum lifetime of a connection in a pool"
-        )
-
-    def get_max_sessions_per_shard(self):
-        errors._raise_not_supported(
-            "getting the maximum sessions per shard in a pool"
-        )
-
-    def get_open_count(self):
-        errors._raise_not_supported(
-            "getting the number of connections open in a pool"
-        )
-
-    def get_ping_interval(self):
-        errors._raise_not_supported("getting the ping interval of a pool")
-
-    def get_soda_metadata_cache(self):
-        errors._raise_not_supported(
-            "getting whether the SODA metadata cache is enabled"
-        )
-
-    def get_stmt_cache_size(self):
-        errors._raise_not_supported(
-            "getting the size of the statement cache in a pool"
-        )
-
-    def get_timeout(self):
-        errors._raise_not_supported(
-            "getting the timeout for idle connections in a pool"
-        )
-
-    def get_wait_timeout(self):
-        errors._raise_not_supported("getting the wait timeout for a pool")
-
-    def reconfigure(self, uint32_t min, uint32_t max, uint32_t increment):
-        errors._raise_not_supported("reconfiguring a pool")
-
-    def return_connection(self, BaseConnImpl conn_impl, in_del=False):
-        errors._raise_not_supported("returning a connection to a pool")
-
-    def set_getmode(self, uint8_t value):
-        errors._raise_not_supported("setting the 'get' mode of a pool")
-
-    def set_max_lifetime_session(self, uint32_t value):
-        errors._raise_not_supported(
-            "setting the maximum lifetime of a connection a pool"
-        )
-
-    def set_max_sessions_per_shard(self, uint32_t value):
-        errors._raise_not_supported("setting the maximum sessions per shard")
-
-    def set_ping_interval(self, int value):
-        errors._raise_not_supported("setting the ping interval")
-
-    def set_soda_metadata_cache(self, bint value):
-        errors._raise_not_supported(
-            "setting whether the SODA metadata cache is enabled"
-        )
-
-    def set_stmt_cache_size(self, uint32_t value):
-        errors._raise_not_supported(
-            "setting the size of the statement cache in a pool"
-        )
-
-    def set_timeout(self, uint32_t value):
-        errors._raise_not_supported(
-            "setting the timeout for idle connections in a pool"
-        )
-
-    def set_wait_timeout(self, uint32_t value):
-        errors._raise_not_supported("setting the wait timeout for a pool")
diff --git a/src/oracledb/impl/base/pool_params.pyx b/src/oracledb/impl/base/pool_params.pyx
deleted file mode 100644
index 8bc45bc0..00000000
--- a/src/oracledb/impl/base/pool_params.pyx
+++ /dev/null
@@ -1,104 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# pool_params.pyx
-#
-# Cython file defining the base PoolParams implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class PoolParamsImpl(ConnectParamsImpl):
-
-    def __init__(self):
-        ConnectParamsImpl.__init__(self)
-        self.min = 1
-        self.max = 2
-        self.increment = 1
-        self.getmode = POOL_GETMODE_WAIT
-        self.homogeneous = True
-        self.ping_interval = 60
-        self.ping_timeout = 5000
-
-    cdef int _copy(self, ConnectParamsImpl other_params) except -1:
-        """
-        Internal method for copying attributes from another set of parameters.
-        """
-        cdef PoolParamsImpl pool_params = <PoolParamsImpl> other_params
-        ConnectParamsImpl._copy(self, other_params)
-        self.min = pool_params.min
-        self.max = pool_params.max
-        self.increment = pool_params.increment
-        self.connectiontype = pool_params.connectiontype
-        self.getmode = pool_params.getmode
-        self.homogeneous = pool_params.homogeneous
-        self.timeout = pool_params.timeout
-        self.wait_timeout = pool_params.wait_timeout
-        self.max_lifetime_session = pool_params.max_lifetime_session
-        self.session_callback = pool_params.session_callback
-        self.max_sessions_per_shard = pool_params.max_sessions_per_shard
-        self.soda_metadata_cache = pool_params.soda_metadata_cache
-        self.ping_interval = pool_params.ping_interval
-        self.ping_timeout = pool_params.ping_timeout
-
-    def copy(self):
-        """
-        Creates a copy of the connection parameters and returns it.
-        """
-        cdef PoolParamsImpl new_params
-        new_params = PoolParamsImpl.__new__(PoolParamsImpl)
-        new_params._copy(self)
-        return new_params
-
-    def set(self, dict args):
-        """
-        Sets the property values based on the supplied arguments. All values
-        not supplied will be left unchanged.
-        """
-        ConnectParamsImpl.set(self, args)
-        _set_uint_param(args, "min", &self.min)
-        _set_uint_param(args, "max", &self.max)
-        _set_uint_param(args, "increment", &self.increment)
-        _set_obj_param(args, "connectiontype", self)
-        _set_enum_param(args, "getmode", ENUM_POOL_GET_MODE, &self.getmode)
-        _set_bool_param(args, "homogeneous", &self.homogeneous)
-        _set_uint_param(args, "timeout", &self.timeout)
-        _set_uint_param(args, "wait_timeout", &self.wait_timeout)
-        _set_uint_param(args, "max_lifetime_session",
-                        &self.max_lifetime_session)
-        _set_obj_param(args, "session_callback", self)
-        _set_uint_param(args, "max_sessions_per_shard",
-                        &self.max_sessions_per_shard)
-        _set_bool_param(args, "soda_metadata_cache", &self.soda_metadata_cache)
-        _set_int_param(args, "ping_interval", &self.ping_interval)
-        _set_uint_param(args, "ping_timeout", &self.ping_timeout)
-
-        # verify that max >= min
-        if self.max < self.min:
-            errors._raise_err(errors.ERR_POOL_MAX_LESS_THAN_MIN)
-
-        # if the pool is dynamically sized (min != max) then ensure that the
-        # increment value is non-zero (as otherwise the pool would never grow!)
-        if self.max != self.min and self.increment == 0:
-            self.increment = 1
diff --git a/src/oracledb/impl/base/queue.pyx b/src/oracledb/impl/base/queue.pyx
deleted file mode 100644
index 2509fcc9..00000000
--- a/src/oracledb/impl/base/queue.pyx
+++ /dev/null
@@ -1,193 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# queue.pyx
-#
-# Cython file defining the base Queue implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseQueueImpl:
-
-    def _supports_deq_many(self, BaseConnImpl conn_impl):
-        """
-        Returns a boolean indicating if array dequeue is supported or
-        not. JSON payloads are not supported by array dequeue until Oracle
-        Database version 23.
-        """
-        return not self.is_json or conn_impl.server_version[0] >= 23
-
-    def deq_many(self, uint32_t max_num_messages):
-        errors._raise_not_supported("dequeuing multiple messages")
-
-    def deq_one(self):
-        errors._raise_not_supported("dequeuing a single message")
-
-    def enq_many(self, list props_impls):
-        errors._raise_not_supported("enqueueing multiple messages")
-
-    def enq_one(self, BaseMsgPropsImpl props_impl):
-        errors._raise_not_supported("enqueuing a single message")
-
-    def initialize(self, BaseConnImpl conn_impl, str name,
-                   BaseDbObjectImpl payload_type, bint is_json):
-        errors._raise_not_supported("initializing a queue")
-
-
-cdef class BaseDeqOptionsImpl:
-
-    def get_condition(self):
-        errors._raise_not_supported("getting the condition")
-
-    def get_consumer_name(self):
-        errors._raise_not_supported("getting the consumer name")
-
-    def get_correlation(self):
-        errors._raise_not_supported("getting the correlation")
-
-    def get_message_id(self):
-        errors._raise_not_supported("getting the message id")
-
-    def get_mode(self):
-        errors._raise_not_supported("getting the mode")
-
-    def get_navigation(self):
-        errors._raise_not_supported("getting the navigation")
-
-    def get_transformation(self):
-        errors._raise_not_supported("getting the transformation")
-
-    def get_visibility(self):
-        errors._raise_not_supported("getting the visibility")
-
-    def get_wait(self):
-        errors._raise_not_supported("getting the wait time")
-
-    def set_condition(self, str value):
-        errors._raise_not_supported("setting the condition")
-
-    def set_consumer_name(self, str value):
-        errors._raise_not_supported("setting the consumer name")
-
-    def set_correlation(self, str value):
-        errors._raise_not_supported("setting the correlation")
-
-    def set_delivery_mode(self, uint16_t value):
-        errors._raise_not_supported("setting the delivery mode")
-
-    def set_mode(self, uint32_t value):
-        errors._raise_not_supported("setting the mode")
-
-    def set_message_id(self, bytes value):
-        errors._raise_not_supported("setting the message id")
-
-    def set_navigation(self, uint32_t value):
-        errors._raise_not_supported("setting the navigation")
-
-    def set_transformation(self, str value):
-        errors._raise_not_supported("setting the transformation")
-
-    def set_visibility(self, uint32_t value):
-        errors._raise_not_supported("setting the visibility")
-
-    def set_wait(self, uint32_t value):
-        errors._raise_not_supported("setting the wait time")
-
-
-cdef class BaseEnqOptionsImpl:
-
-    def get_transformation(self):
-        errors._raise_not_supported("getting the transformation")
-
-    def get_visibility(self):
-        errors._raise_not_supported("getting the visibility")
-
-    def set_delivery_mode(self, uint16_t value):
-        errors._raise_not_supported("setting the delivery mode")
-
-    def set_transformation(self, str value):
-        errors._raise_not_supported("setting the transformation")
-
-    def set_visibility(self, uint32_t value):
-        errors._raise_not_supported("setting the visibility")
-
-
-cdef class BaseMsgPropsImpl:
-
-    def get_num_attempts(self):
-        errors._raise_not_supported("getting the number of attempts")
-
-    def get_correlation(self):
-        errors._raise_not_supported("getting the correlation")
-
-    def get_delay(self):
-        errors._raise_not_supported("getting the delay")
-
-    def get_delivery_mode(self):
-        errors._raise_not_supported("getting the delivery mode")
-
-    def get_enq_time(self):
-        errors._raise_not_supported("getting the enqueue time")
-
-    def get_exception_queue(self):
-        errors._raise_not_supported("getting the name of the exception queue")
-
-    def get_expiration(self):
-        errors._raise_not_supported("getting the expiration")
-
-    def get_message_id(self):
-        errors._raise_not_supported("getting the message id")
-
-    def get_priority(self):
-        errors._raise_not_supported("getting the priority")
-
-    def get_state(self):
-        errors._raise_not_supported("getting the message state")
-
-    def set_correlation(self, str value):
-        errors._raise_not_supported("setting the correlation")
-
-    def set_delay(self, int32_t value):
-        errors._raise_not_supported("setting the delay")
-
-    def set_exception_queue(self, str value):
-        errors._raise_not_supported("setting the name of the exception queue")
-
-    def set_expiration(self, int32_t value):
-        errors._raise_not_supported("setting the expiration")
-
-    def set_payload_bytes(self, bytes value):
-        errors._raise_not_supported("setting the payload from bytes")
-
-    def set_payload_object(self, BaseDbObjectImpl value):
-        errors._raise_not_supported(
-            "setting the payload from a database object"
-        )
-
-    def set_priority(self, int32_t value):
-        errors._raise_not_supported("setting the priority")
-
-    def set_recipients(self, list value):
-        errors._raise_not_supported("setting recipients list")
diff --git a/src/oracledb/impl/base/soda.pyx b/src/oracledb/impl/base/soda.pyx
deleted file mode 100644
index d2f68d4a..00000000
--- a/src/oracledb/impl/base/soda.pyx
+++ /dev/null
@@ -1,148 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# soda.pyx
-#
-# Cython file defining the base SODA implementation classes (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseSodaDbImpl:
-
-    def create_collection(self, str name, str metadata, bint map_mode):
-        errors._raise_not_supported("creating a SODA collection")
-
-    def create_document(self, bytes content, str key, str media_type):
-        errors._raise_not_supported("creating a SODA binary/text document")
-
-    def create_json_document(self, object content, str key):
-        errors._raise_not_supported("creating a SODA JSON document")
-
-    def get_collection_names(self, str start_name, uint32_t limit):
-        errors._raise_not_supported("getting a list of SODA collection names")
-
-    def open_collection(self, str name):
-        errors._raise_not_supported("opening a SODA collection")
-
-
-cdef class BaseSodaCollImpl:
-
-    def create_index(self, str spec):
-        errors._raise_not_supported("creating an index on a SODA collection")
-
-    def drop(self):
-        errors._raise_not_supported("dropping a SODA collection")
-
-    def drop_index(self, str name, bint force):
-        errors._raise_not_supported("dropping an index on a SODA collection")
-
-    def get_count(self, object op):
-        errors._raise_not_supported(
-            "getting the count of documents in a SODA collection"
-        )
-
-    def get_cursor(self, object op):
-        errors._raise_not_supported(
-            "getting a cursor for documents in a SODA collection"
-        )
-
-    def get_data_guide(self):
-        errors._raise_not_supported(
-            "getting the data guide for a SODA collection"
-        )
-
-    def get_metadata(self):
-        errors._raise_not_supported(
-            "getting the metadata of a SODA collection"
-        )
-
-    def get_one(self, object op):
-        errors._raise_not_supported(
-            "getting a document from a SODA collection"
-        )
-
-    def insert_many(self, list documents, str hint, bint return_docs):
-        errors._raise_not_supported(
-            "inserting multiple documents into a SODA collection"
-        )
-
-    def insert_one(self, BaseSodaDocImpl doc, str hint, bint return_doc):
-        errors._raise_not_supported(
-            "inserting a single document into a SODA collection"
-        )
-
-    def remove(self, object op):
-        errors._raise_not_supported(
-            "removing documents from a SODA collection"
-        )
-
-    def replace_one(self, BaseSodaDocImpl doc_impl, bint return_doc):
-        errors._raise_not_supported(
-            "replacing a document in a SODA collection"
-        )
-
-    def save(self, BaseSodaDocImpl doc, str hint, bint return_doc):
-        errors._raise_not_supported("saving a document in a SODA collection")
-
-    def truncate(self):
-        errors._raise_not_supported("truncating a SODA collection")
-
-
-cdef class BaseSodaDocImpl:
-
-    def get_content(self):
-        errors._raise_not_supported("getting the content of a SODA document")
-
-    def get_created_on(self):
-        errors._raise_not_supported(
-            "getting the created on date of a SODA document"
-        )
-
-    def get_key(self):
-        errors._raise_not_supported("getting the key of a SODA document")
-
-    def get_last_modified(self):
-        errors._raise_not_supported(
-            "getting the last modified date of a SODA document"
-        )
-
-    def get_media_type(self):
-        errors._raise_not_supported(
-            "getting the media type of a SODA document"
-        )
-
-    def get_version(self):
-        errors._raise_not_supported("getting the version of a SODA document")
-
-
-cdef class BaseSodaDocCursorImpl:
-
-    def close(self):
-        errors._raise_not_supported("closing a SODA document cursor")
-
-    def get_next_doc(self):
-        errors._raise_not_supported(
-            "getting the next document from a SODA document cursor"
-        )
diff --git a/src/oracledb/impl/base/subscr.pyx b/src/oracledb/impl/base/subscr.pyx
deleted file mode 100644
index 584eb390..00000000
--- a/src/oracledb/impl/base/subscr.pyx
+++ /dev/null
@@ -1,57 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# subscr.pyx
-#
-# Cython file defining the base Subscription implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseSubscrImpl:
-
-    def register_query(self, str sql, object args):
-        errors._raise_not_supported("registering a query on a subscription")
-
-    def subscribe(self, object subscr, BaseConnImpl conn_impl):
-        errors._raise_not_supported("creating a subscription")
-
-    def unsubscribe(self, BaseConnImpl conn_impl):
-        errors._raise_not_supported("destroying a subscription")
-
-
-cdef class Message:
-    pass
-
-
-cdef class MessageQuery:
-    pass
-
-
-cdef class MessageRow:
-    pass
-
-
-cdef class MessageTable:
-    pass
diff --git a/src/oracledb/impl/base/types.pyx b/src/oracledb/impl/base/types.pyx
deleted file mode 100644
index 33619d57..00000000
--- a/src/oracledb/impl/base/types.pyx
+++ /dev/null
@@ -1,465 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# types.pyx
-#
-# Cython file defining the API types mandated by the Python Database API as
-# well as the database types specific to Oracle (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ApiType:
-
-    def __init__(self, name, *dbtypes):
-        self.name = name
-        self.dbtypes = dbtypes
-
-    def __eq__(self, other):
-        if isinstance(other, DbType):
-            return other in self.dbtypes
-        return NotImplemented
-
-    def __hash__(self):
-        return hash(self.name)
-
-    def __reduce__(self):
-        return self.name
-
-    def __repr__(self):
-        return f"<ApiType {self.name}>"
-
-
-cdef list db_type_by_num = [None] * (DB_TYPE_NUM_MAX - DB_TYPE_NUM_MIN + 1)
-cdef dict db_type_by_ora_name = {}
-cdef dict db_type_by_ora_type_num = {}
-
-cdef class DbType:
-
-    def __init__(self, num, name, ora_name, native_num=0, ora_type_num=0,
-                 default_py_type_num=0, default_size=0, csfrm=0,
-                 buffer_size_factor=0, is_fast=True):
-        cdef uint16_t ora_type_key = csfrm * 256 + ora_type_num
-        self.num = num
-        self.name = name
-        self.default_size = default_size
-        self._native_num = native_num
-        self._ora_name = ora_name
-        self._ora_type_num = ora_type_num
-        self._default_py_type_num = default_py_type_num
-        self._csfrm = csfrm
-        self._buffer_size_factor = buffer_size_factor
-        self._is_fast = is_fast
-        if num != 0:
-            num -= DB_TYPE_NUM_MIN
-        db_type_by_num[num] = self
-        db_type_by_ora_name[ora_name] = self
-        db_type_by_ora_type_num[ora_type_key] = self
-
-        # add a second key for LONG metadata which doesn't always contain the
-        # character set form value in metadata received by the database
-        if ora_type_num == ORA_TYPE_NUM_LONG and csfrm == CS_FORM_IMPLICIT:
-            db_type_by_ora_type_num[ora_type_num] = self
-
-    def __reduce__(self):
-        return self.name
-
-    def __repr__(self):
-        return f"<DbType {self.name}>"
-
-    @staticmethod
-    cdef DbType _from_num(uint32_t num):
-        try:
-            if num != 0:
-                num -= DB_TYPE_NUM_MIN
-            return db_type_by_num[num]
-        except KeyError:
-            pass
-        errors._raise_err(errors.ERR_ORACLE_TYPE_NOT_SUPPORTED, num=num)
-
-    @staticmethod
-    cdef DbType _from_ora_name(str name):
-        try:
-            return db_type_by_ora_name[name]
-        except KeyError:
-            pass
-        errors._raise_err(errors.ERR_ORACLE_TYPE_NAME_NOT_SUPPORTED, name=name)
-
-    @staticmethod
-    cdef DbType _from_ora_type_and_csfrm(uint8_t ora_type_num, uint8_t csfrm):
-        cdef uint16_t ora_type_key = csfrm * 256 + ora_type_num
-        try:
-            return db_type_by_ora_type_num[ora_type_key]
-        except KeyError:
-            pass
-        errors._raise_err(errors.ERR_ORACLE_TYPE_NOT_SUPPORTED,
-                          num=ora_type_num)
-
-
-# database types
-DB_TYPE_BFILE = DbType(
-    DB_TYPE_NUM_BFILE,
-    "DB_TYPE_BFILE",
-    "BFILE",
-    NATIVE_TYPE_NUM_LOB,
-    ORA_TYPE_NUM_BFILE,
-    PY_TYPE_NUM_ORACLE_LOB,
-    buffer_size_factor=4000,
-    is_fast=False
-)
-
-DB_TYPE_BINARY_DOUBLE = DbType(
-    DB_TYPE_NUM_BINARY_DOUBLE,
-    "DB_TYPE_BINARY_DOUBLE",
-    "BINARY_DOUBLE",
-    NATIVE_TYPE_NUM_DOUBLE,
-    ORA_TYPE_NUM_BINARY_DOUBLE,
-    PY_TYPE_NUM_FLOAT,
-    buffer_size_factor=ORA_TYPE_SIZE_BINARY_DOUBLE
-)
-
-DB_TYPE_BINARY_FLOAT = DbType(
-    DB_TYPE_NUM_BINARY_FLOAT,
-    "DB_TYPE_BINARY_FLOAT",
-    "BINARY_FLOAT",
-    NATIVE_TYPE_NUM_FLOAT,
-    ORA_TYPE_NUM_BINARY_FLOAT,
-    PY_TYPE_NUM_FLOAT,
-    buffer_size_factor=ORA_TYPE_SIZE_BINARY_FLOAT
-)
-
-DB_TYPE_BINARY_INTEGER = DbType(
-    DB_TYPE_NUM_BINARY_INTEGER,
-    "DB_TYPE_BINARY_INTEGER",
-    "BINARY_INTEGER",
-    NATIVE_TYPE_NUM_INT64,
-    ORA_TYPE_NUM_BINARY_INTEGER,
-    PY_TYPE_NUM_INT,
-    buffer_size_factor=ORA_TYPE_SIZE_NUMBER
-)
-
-DB_TYPE_BLOB = DbType(
-    DB_TYPE_NUM_BLOB,
-    "DB_TYPE_BLOB",
-    "BLOB",
-    NATIVE_TYPE_NUM_LOB,
-    ORA_TYPE_NUM_BLOB,
-    PY_TYPE_NUM_ORACLE_LOB,
-    buffer_size_factor=112,
-    is_fast=False
-)
-
-DB_TYPE_BOOLEAN = DbType(
-    DB_TYPE_NUM_BOOLEAN,
-    "DB_TYPE_BOOLEAN",
-    "BOOLEAN",
-    NATIVE_TYPE_NUM_BOOLEAN,
-    ORA_TYPE_NUM_BOOLEAN,
-    PY_TYPE_NUM_BOOL,
-    buffer_size_factor=ORA_TYPE_SIZE_BOOLEAN
-)
-
-DB_TYPE_CHAR = DbType(
-    DB_TYPE_NUM_CHAR,
-    "DB_TYPE_CHAR",
-    "CHAR",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_CHAR,
-    PY_TYPE_NUM_STR,
-    default_size=2000,
-    csfrm=CS_FORM_IMPLICIT,
-    buffer_size_factor=4
-)
-
-DB_TYPE_CLOB = DbType(
-    DB_TYPE_NUM_CLOB,
-    "DB_TYPE_CLOB",
-    "CLOB",
-    NATIVE_TYPE_NUM_LOB,
-    ORA_TYPE_NUM_CLOB,
-    PY_TYPE_NUM_ORACLE_LOB,
-    csfrm=CS_FORM_IMPLICIT,
-    buffer_size_factor=112,
-    is_fast=False
-)
-
-DB_TYPE_CURSOR = DbType(
-    DB_TYPE_NUM_CURSOR,
-    "DB_TYPE_CURSOR",
-    "CURSOR",
-    NATIVE_TYPE_NUM_STMT,
-    ORA_TYPE_NUM_CURSOR,
-    PY_TYPE_NUM_ORACLE_CURSOR,
-    buffer_size_factor=4,
-    is_fast=False
-)
-
-DB_TYPE_DATE = DbType(
-    DB_TYPE_NUM_DATE,
-    "DB_TYPE_DATE",
-    "DATE",
-    NATIVE_TYPE_NUM_TIMESTAMP,
-    ORA_TYPE_NUM_DATE,
-    PY_TYPE_NUM_DATETIME,
-    buffer_size_factor=ORA_TYPE_SIZE_DATE
-)
-
-DB_TYPE_INTERVAL_DS = DbType(
-    DB_TYPE_NUM_INTERVAL_DS,
-    "DB_TYPE_INTERVAL_DS",
-    "INTERVAL DAY TO SECOND",
-    NATIVE_TYPE_NUM_INTERVAL_DS,
-    ORA_TYPE_NUM_INTERVAL_DS,
-    PY_TYPE_NUM_TIMEDELTA,
-    buffer_size_factor=ORA_TYPE_SIZE_INTERVAL_DS
-)
-
-DB_TYPE_INTERVAL_YM = DbType(
-    DB_TYPE_NUM_INTERVAL_YM,
-    "DB_TYPE_INTERVAL_YM",
-    "INTERVAL YEAR TO MONTH",
-    NATIVE_TYPE_NUM_INTERVAL_YM,
-    ORA_TYPE_NUM_INTERVAL_YM,
-    PY_TYPE_NUM_ORACLE_INTERVAL_YM,
-    buffer_size_factor=ORA_TYPE_SIZE_INTERVAL_YM
-)
-
-DB_TYPE_JSON = DbType(
-    DB_TYPE_NUM_JSON,
-    "DB_TYPE_JSON",
-    "JSON",
-    NATIVE_TYPE_NUM_JSON,
-    ORA_TYPE_NUM_JSON,
-    PY_TYPE_NUM_OBJECT,
-    is_fast=False
-)
-
-DB_TYPE_LONG = DbType(
-    DB_TYPE_NUM_LONG_VARCHAR,
-    "DB_TYPE_LONG",
-    "LONG",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_LONG,
-    PY_TYPE_NUM_STR,
-    csfrm=CS_FORM_IMPLICIT,
-    buffer_size_factor=2147483647,
-    is_fast=False
-)
-
-DB_TYPE_LONG_NVARCHAR = DbType(
-    DB_TYPE_NUM_LONG_NVARCHAR,
-    "DB_TYPE_LONG_NVARCHAR",
-    "LONG NVARCHAR",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_LONG,
-    PY_TYPE_NUM_STR,
-    csfrm=CS_FORM_NCHAR,
-    buffer_size_factor=2147483647,
-    is_fast=False
-)
-
-DB_TYPE_LONG_RAW = DbType(
-    DB_TYPE_NUM_LONG_RAW,
-    "DB_TYPE_LONG_RAW",
-    "LONG RAW",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_LONG_RAW,
-    PY_TYPE_NUM_BYTES,
-    buffer_size_factor=2147483647,
-    is_fast=False
-)
-
-DB_TYPE_NCHAR = DbType(
-    DB_TYPE_NUM_NCHAR,
-    "DB_TYPE_NCHAR",
-    "NCHAR",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_CHAR,
-    PY_TYPE_NUM_STR,
-    default_size=2000,
-    csfrm=CS_FORM_NCHAR,
-    buffer_size_factor=4
-)
-
-DB_TYPE_NCLOB = DbType(
-    DB_TYPE_NUM_NCLOB,
-    "DB_TYPE_NCLOB",
-    "NCLOB",
-    NATIVE_TYPE_NUM_LOB,
-    ORA_TYPE_NUM_CLOB,
-    PY_TYPE_NUM_ORACLE_LOB,
-    csfrm=CS_FORM_NCHAR,
-    buffer_size_factor=112,
-    is_fast=False
-)
-
-DB_TYPE_NUMBER = DbType(
-    DB_TYPE_NUM_NUMBER,
-    "DB_TYPE_NUMBER",
-    "NUMBER",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_NUMBER,
-    PY_TYPE_NUM_FLOAT,
-    buffer_size_factor=ORA_TYPE_SIZE_NUMBER
-)
-
-DB_TYPE_NVARCHAR = DbType(
-    DB_TYPE_NUM_NVARCHAR,
-    "DB_TYPE_NVARCHAR",
-    "NVARCHAR2",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_VARCHAR,
-    PY_TYPE_NUM_STR,
-    default_size=4000,
-    csfrm=CS_FORM_NCHAR,
-    buffer_size_factor=4
-)
-
-DB_TYPE_OBJECT = DbType(
-    DB_TYPE_NUM_OBJECT,
-    "DB_TYPE_OBJECT",
-    "OBJECT",
-    NATIVE_TYPE_NUM_OBJECT,
-    ORA_TYPE_NUM_OBJECT,
-    PY_TYPE_NUM_ORACLE_OBJECT
-)
-
-DB_TYPE_RAW = DbType(
-    DB_TYPE_NUM_RAW,
-    "DB_TYPE_RAW",
-    "RAW",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_RAW,
-    PY_TYPE_NUM_BYTES,
-    default_size=4000,
-    buffer_size_factor=1
-)
-
-DB_TYPE_ROWID = DbType(
-    DB_TYPE_NUM_ROWID,
-    "DB_TYPE_ROWID",
-    "ROWID",
-    NATIVE_TYPE_NUM_ROWID,
-    ORA_TYPE_NUM_ROWID,
-    PY_TYPE_NUM_STR,
-    buffer_size_factor=ORA_TYPE_SIZE_ROWID,
-    is_fast=False
-)
-
-DB_TYPE_TIMESTAMP = DbType(
-    DB_TYPE_NUM_TIMESTAMP,
-    "DB_TYPE_TIMESTAMP",
-    "TIMESTAMP",
-    NATIVE_TYPE_NUM_TIMESTAMP,
-    ORA_TYPE_NUM_TIMESTAMP,
-    PY_TYPE_NUM_DATETIME,
-    buffer_size_factor=ORA_TYPE_SIZE_TIMESTAMP
-)
-
-DB_TYPE_TIMESTAMP_LTZ = DbType(
-    DB_TYPE_NUM_TIMESTAMP_LTZ,
-    "DB_TYPE_TIMESTAMP_LTZ",
-    "TIMESTAMP WITH LOCAL TIME ZONE",
-    NATIVE_TYPE_NUM_TIMESTAMP,
-    ORA_TYPE_NUM_TIMESTAMP_LTZ,
-    PY_TYPE_NUM_DATETIME,
-    buffer_size_factor=ORA_TYPE_SIZE_TIMESTAMP
-)
-
-DB_TYPE_TIMESTAMP_TZ = DbType(
-    DB_TYPE_NUM_TIMESTAMP_TZ,
-    "DB_TYPE_TIMESTAMP_TZ",
-    "TIMESTAMP WITH TIME ZONE",
-    NATIVE_TYPE_NUM_TIMESTAMP,
-    ORA_TYPE_NUM_TIMESTAMP_TZ,
-    PY_TYPE_NUM_DATETIME,
-    buffer_size_factor=ORA_TYPE_SIZE_TIMESTAMP_TZ
-)
-
-DB_TYPE_UNKNOWN = DbType(
-    DB_TYPE_NUM_UNKNOWN,
-    "DB_TYPE_UNKNOWN",
-    "UNKNOWN",
-    is_fast=False
-)
-
-DB_TYPE_UROWID = DbType(
-    DB_TYPE_NUM_UROWID,
-    "DB_TYPE_UROWID",
-    "UROWID",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_UROWID,
-    PY_TYPE_NUM_STR,
-    is_fast=False
-)
-
-DB_TYPE_VARCHAR = DbType(
-    DB_TYPE_NUM_VARCHAR,
-    "DB_TYPE_VARCHAR",
-    "VARCHAR2",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_VARCHAR,
-    PY_TYPE_NUM_STR,
-    default_size=4000,
-    csfrm=CS_FORM_IMPLICIT,
-    buffer_size_factor=4
-)
-
-DB_TYPE_VECTOR = DbType(
-    DB_TYPE_NUM_VECTOR,
-    "DB_TYPE_VECTOR",
-    "VECTOR",
-    NATIVE_TYPE_NUM_VECTOR,
-    ORA_TYPE_NUM_VECTOR,
-    PY_TYPE_NUM_ARRAY,
-    is_fast=False
-)
-
-DB_TYPE_XMLTYPE = DbType(
-    DB_TYPE_NUM_XMLTYPE,
-    "DB_TYPE_XMLTYPE",
-    "XMLTYPE",
-    NATIVE_TYPE_NUM_BYTES,
-    ORA_TYPE_NUM_OBJECT,
-    PY_TYPE_NUM_STR,
-    csfrm=CS_FORM_IMPLICIT,
-    buffer_size_factor=2147483647,
-    is_fast=False
-)
-
-# additional aliases
-db_type_by_ora_name["PL/SQL BOOLEAN"] = DB_TYPE_BOOLEAN
-db_type_by_ora_name["PL/SQL BINARY INTEGER"] = DB_TYPE_BINARY_INTEGER
-db_type_by_ora_name["PL/SQL PLS INTEGER"] = DB_TYPE_BINARY_INTEGER
-db_type_by_ora_name["TIMESTAMP WITH TZ"] = DB_TYPE_TIMESTAMP_TZ
-db_type_by_ora_name["TIMESTAMP WITH LOCAL TZ"] = DB_TYPE_TIMESTAMP_LTZ
-
-# DB API types
-BINARY = ApiType("BINARY", DB_TYPE_RAW, DB_TYPE_LONG_RAW)
-DATETIME = ApiType("DATETIME", DB_TYPE_DATE, DB_TYPE_TIMESTAMP,
-                   DB_TYPE_TIMESTAMP_LTZ, DB_TYPE_TIMESTAMP_TZ)
-NUMBER = ApiType("NUMBER", DB_TYPE_NUMBER, DB_TYPE_BINARY_DOUBLE,
-                 DB_TYPE_BINARY_FLOAT, DB_TYPE_BINARY_INTEGER)
-ROWID = ApiType("ROWID", DB_TYPE_ROWID, DB_TYPE_UROWID)
-STRING = ApiType("STRING", DB_TYPE_VARCHAR, DB_TYPE_NVARCHAR, DB_TYPE_CHAR,
-                 DB_TYPE_NCHAR, DB_TYPE_LONG)
diff --git a/src/oracledb/impl/base/utils.pyx b/src/oracledb/impl/base/utils.pyx
deleted file mode 100644
index bedb4c62..00000000
--- a/src/oracledb/impl/base/utils.pyx
+++ /dev/null
@@ -1,293 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# utils.pyx
-#
-# Cython file defining utility methods (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef int _set_app_context_param(dict args, str name, object target) except -1:
-    """
-    Sets an application context parameter to the value provided in the
-    dictionary, if a value is provided. This value is then set directly on the
-    target.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        message = (
-            "appcontext should be a list of 3-tuples and each 3-tuple should "
-            "contain three strings"
-        )
-        if not isinstance(in_val, list):
-            raise TypeError(message)
-        for entry in in_val:
-            if not isinstance(entry, tuple) or len(entry) != 3:
-                raise TypeError(message)
-            for value in entry:
-                if not isinstance(value, str):
-                    raise TypeError(message)
-        setattr(target, name, in_val)
-
-
-cdef int _set_bool_param(dict args, str name, bint *out_val) except -1:
-    """
-    Sets a boolean parameter to the value provided in the dictionary. This can
-    be a case-insenstive string matching on/off, yes/no or true/false (such as
-    when parsed from a connect string). It can also be a directly passed
-    argument which will be explicitly converted to a boolean value.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        if isinstance(in_val, str):
-            out_val[0] = (in_val.strip().lower() in ("on", "yes", "true"))
-        else:
-            out_val[0] = bool(in_val)
-
-
-cdef int _set_duration_param(dict args, str name, double *out_val) except -1:
-    """
-    Sets a duration parameter to the value provided in the dictionary. This can
-    be a string (such as when parsed from a connect string) containing a
-    floating point value followed by an otional unit: ms (milliseconds), sec
-    (seconds) or min (minutes). It can also be a directly passed argument which
-    will be explicitly converted to a floating point value.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        if isinstance(in_val, str):
-            in_val = in_val.strip().lower()
-            if in_val.endswith("sec"):
-                out_val[0] = float(in_val[:-3].strip())
-            elif in_val.endswith("ms"):
-                out_val[0] = float(in_val[:-2].strip()) / 1000
-            elif in_val.endswith("min"):
-                out_val[0] = float(in_val[:-3].strip()) * 60
-            else:
-                out_val[0] = float(in_val.strip())
-        else:
-            out_val[0] = float(in_val)
-
-
-cdef int _set_enum_param(dict args, str name, object enum_obj,
-                         uint32_t* out_val) except -1:
-    """
-    Sets an unsigned integer parameter to the value provided in the dictionary.
-    If digits are not provided, the value is looked up in the provided
-    enumeration.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        if not isinstance(in_val, str) or in_val.isdigit():
-            out_val[0] = int(in_val)
-            if isinstance(in_val, enum_obj):
-                return 0
-            try:
-                enum_obj(out_val[0])
-                return 0
-            except ValueError:
-                pass
-        else:
-            enum_val = getattr(enum_obj, in_val.upper(), None)
-            if enum_val is not None:
-                out_val[0] = enum_val.value
-                return 0
-        errors._raise_err(errors.ERR_INVALID_ENUM_VALUE,
-                          name=enum_obj.__name__, value=in_val)
-
-
-cdef int _set_int_param(dict args, str name, int* out_val) except -1:
-    """
-    Sets an integer parameter to the value provided in the dictionary. This
-    can be a string (such as when parsed from a connect string). It can also be
-    a directly passed argument which will be explicitly converted to an integer
-    value.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        out_val[0] = int(in_val)
-
-
-cdef int _set_uint_param(dict args, str name, uint32_t* out_val) except -1:
-    """
-    Sets an unsigned integer parameter to the value provided in the dictionary.
-    This can be a string (such as when parsed from a connect string). It can
-    also be a directly passed argument which will be explicitly converted to an
-    integer value.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        out_val[0] = int(in_val)
-
-
-cdef int _set_obj_param(dict args, str name, object target) except -1:
-    """
-    Sets an object parameter to the value provided in the dictionary, if a
-    value is provided. This value is then set directly on the target.
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        setattr(target, name, in_val)
-
-
-cdef int _set_ssl_version_param(dict args, str name, object target) except -1:
-    """
-    Sets a SSL version parameter to the value specified. This must be one of
-    the values "tlsv1.2" or "tlsv1.3". If it is not one of these values
-    an error is raised. If a value is specified and meets the criteria it is
-    set directly on the target (since strings are treated as Python objects).
-    """
-    in_val = args.get(name)
-    if in_val is not None:
-        if isinstance(in_val, str):
-            in_val = in_val.lower()
-            if in_val == "tlsv1.2":
-                in_val = ssl.TLSVersion.TLSv1_2
-            elif in_val == "tlsv1.3":
-                in_val = ssl.TLSVersion.TLSv1_3
-        if in_val is not ssl.TLSVersion.TLSv1_2 \
-                and in_val is not ssl.TLSVersion.TLSv1_3:
-            errors._raise_err(errors.ERR_INVALID_SSL_VERSION,
-                              ssl_version=in_val)
-        setattr(target, name, in_val)
-
-
-cdef int _set_str_param(dict args, str name, object target, bint check_network_character_set = False) except -1:
-    """
-    Sets a string parameter to the value provided in the dictionary. If a value
-    is specified it is set directly on the target (since strings are treated as
-    Python objects). Note that if check_network_character_set is True, an
-    exception is thrown if the sanitized value does not match the input value.
-    """
-    in_val = args.get(name)
-    if in_val:
-        in_val = str(in_val)
-        if check_network_character_set:
-            if sanitize(in_val) != in_val:
-                errors._raise_err(errors.ERR_INVALID_NETWORK_NAME, name=name)
-        setattr(target, name, in_val)
-
-
-def get_array_type_code_uint32():
-    """
-    Returns the type code to use for array.array that will store uint32_t.
-    """
-    cdef:
-        array.array temp_array
-        str type_code
-    global ARRAY_TYPE_CODE_UINT32
-    if ARRAY_TYPE_CODE_UINT32 is None:
-        for type_code in ("I", "L"):
-            temp_array = array.array(type_code)
-            if temp_array.itemsize == 4:
-                ARRAY_TYPE_CODE_UINT32 = type_code
-                break
-    return ARRAY_TYPE_CODE_UINT32
-
-
-def init_base_impl(package):
-    """
-    Initializes globals after the package has been completely initialized. This
-    is to avoid circular imports and eliminate the need for global lookups.
-    """
-    global \
-        errors, \
-        exceptions, \
-        utils, \
-        DRIVER_VERSION, \
-        ENUM_AUTH_MODE, \
-        ENUM_POOL_GET_MODE, \
-        ENUM_PURITY, \
-        PY_TYPE_ARROW_ARRAY, \
-        PY_TYPE_ASYNC_CURSOR, \
-        PY_TYPE_ASYNC_LOB, \
-        PY_TYPE_CONNECT_PARAMS, \
-        PY_TYPE_CURSOR, \
-        PY_TYPE_DATAFRAME, \
-        PY_TYPE_DB_OBJECT, \
-        PY_TYPE_DB_OBJECT_TYPE, \
-        PY_TYPE_FETCHINFO, \
-        PY_TYPE_INTERVAL_YM, \
-        PY_TYPE_JSON_ID, \
-        PY_TYPE_LOB, \
-        PY_TYPE_MESSAGE, \
-        PY_TYPE_MESSAGE_QUERY, \
-        PY_TYPE_MESSAGE_ROW, \
-        PY_TYPE_MESSAGE_TABLE, \
-        PY_TYPE_POOL_PARAMS, \
-        PY_TYPE_SPARSE_VECTOR, \
-        PY_TYPE_VAR
-
-    errors = package.errors
-    exceptions = package.exceptions
-    utils = package.utils
-    DRIVER_VERSION = package.__version__
-    ENUM_AUTH_MODE = package.AuthMode
-    ENUM_PURITY = package.Purity
-    ENUM_POOL_GET_MODE = package.PoolGetMode
-    PY_TYPE_ARROW_ARRAY = <type> package.ArrowArray
-    PY_TYPE_ASYNC_CURSOR = <type> package.AsyncCursor
-    PY_TYPE_ASYNC_LOB = <type> package.AsyncLOB
-    PY_TYPE_CONNECT_PARAMS = <type> package.ConnectParams
-    PY_TYPE_CURSOR = <type> package.Cursor
-    PY_TYPE_DATAFRAME = <type> package.DataFrame
-    PY_TYPE_DB_OBJECT = <type> package.DbObject
-    PY_TYPE_DB_OBJECT_TYPE = <type> package.DbObjectType
-    PY_TYPE_FETCHINFO = <type> package.FetchInfo
-    PY_TYPE_INTERVAL_YM = <type> package.IntervalYM
-    PY_TYPE_JSON_ID = <type> package.JsonId
-    PY_TYPE_LOB = <type> package.LOB
-    PY_TYPE_MESSAGE = <type> package.Message
-    PY_TYPE_MESSAGE_QUERY = <type> package.MessageQuery
-    PY_TYPE_MESSAGE_ROW = <type> package.MessageRow
-    PY_TYPE_MESSAGE_TABLE = <type> package.MessageTable
-    PY_TYPE_POOL_PARAMS = <type> package.PoolParams
-    PY_TYPE_SPARSE_VECTOR = <type> package.SparseVector
-    PY_TYPE_VAR = <type> package.Var
-
-
-def sanitize(str value):
-    """
-    Replaces invalid characters in a string with characters guaranteed to be in
-    the network character set.
-    """
-    cdef str sanitized_value = value
-
-    # strip single or double quotes from the start and end
-    if sanitized_value.startswith(("'", '"')):
-        sanitized_value = sanitized_value[1:]
-    if sanitized_value.endswith(("'", '"')):
-        sanitized_value = sanitized_value[:-1]
-
-    # replace invalid characters with '?'
-    sanitized_value = "".join(
-        char if char in VALID_NETWORK_NAME_CHARS else "?"
-        for char in sanitized_value
-    )
-
-    # if the last character is a backslash, replace it with '?'
-    if sanitized_value.endswith("\\"):
-        sanitized_value = sanitized_value[:-1] + "?"
-
-    return sanitized_value
diff --git a/src/oracledb/impl/base/var.pyx b/src/oracledb/impl/base/var.pyx
deleted file mode 100644
index ec2d704b..00000000
--- a/src/oracledb/impl/base/var.pyx
+++ /dev/null
@@ -1,399 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# var.pyx
-#
-# Cython file defining the base Variable implementation class (embedded in
-# base_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.freelist(20)
-cdef class BaseVarImpl:
-
-    cdef int _bind(self, object conn, BaseCursorImpl cursor,
-                   uint32_t num_execs, object name, uint32_t pos) except -1:
-        """
-        Binds a variable to the cursor.
-        """
-        raise NotImplementedError()
-
-
-    cdef int _check_and_set_scalar_value(self, uint32_t pos, object value,
-                                         bint* was_set) except -1:
-        """
-        Sets a scalar value in the variable at the given position, but first
-        checks the type of Python value to see if it is acceptable. The value
-        may be modified by the in converter (if one has been set) or adjusted
-        to be acceptable (for some cases). If the was_set pointer is NULL, an
-        exception is raised when the Python value is found to be unacceptable;
-        otherwise, the flag is cleared if the Python value is unacceptable.
-        """
-        cdef uint32_t size
-
-        # call in converter, if applicable
-        if self.inconverter is not None:
-            value = self.inconverter(value)
-
-        # check the value and verify it is acceptable
-        value = self._conn_impl._check_value(self.metadata, value, was_set)
-        if was_set != NULL and not was_set[0]:
-            return 0
-
-        # resize variable, if applicable
-        if value is not None and self.metadata.dbtype.default_size != 0:
-            size = <uint32_t> len(value)
-            if size > self.metadata.max_size:
-                self._resize(size)
-
-        # set value
-        self._set_scalar_value(pos, value)
-        self._is_value_set = True
-
-    cdef int _check_and_set_value(self, uint32_t pos, object value,
-                                  bint* was_set) except -1:
-        """
-        Sets the value in the variable at the given position, but first checks
-        the type of Python value to see if it is acceptable.
-        """
-        cdef:
-            uint32_t i, num_elements_in_array
-            object element_value
-
-        # scalar variables can be checked directly
-        if not self.is_array:
-            return self._check_and_set_scalar_value(pos, value, was_set)
-
-        # array variables must have a list supplied to them
-        if not isinstance(value, list):
-            if was_set != NULL:
-                was_set[0] = False
-                return 0
-            errors._raise_err(errors.ERR_EXPECTING_LIST_FOR_ARRAY_VAR)
-
-        # the size of the array must be sufficient to hold all of the
-        # elements
-        num_elements_in_array = len(<list> value)
-        if num_elements_in_array > self.num_elements:
-            if was_set != NULL:
-                was_set[0] = False
-                return 0
-            errors._raise_err(errors.ERR_INCORRECT_VAR_ARRAYSIZE,
-                              var_arraysize=self.num_elements,
-                              required_arraysize=num_elements_in_array)
-
-        # check and set each of the element's values
-        for i, element_value in enumerate(<list> value):
-            self._check_and_set_scalar_value(i, element_value, was_set)
-            if was_set != NULL and not was_set[0]:
-                return 0
-        self._set_num_elements_in_array(num_elements_in_array)
-
-    cdef DbType _check_fetch_conversion(self):
-        """
-        Checks to see if the fetch type can be transformed into the requested
-        type. This is only called during fetch when an output type handler is
-        specified and the supplied variable has a type other than the fetch
-        type. All matches are done using the underlying Oracle type and the
-        character set form of the variable metadata is adjusted to
-        use the character set form of the fetch metadata where applicable. The
-        type to use for the metadata is returned.
-        """
-        cdef uint8_t from_ora_type_num, to_ora_type_num
-        from_ora_type_num = self._fetch_metadata.dbtype._ora_type_num
-        to_ora_type_num = self.metadata.dbtype._ora_type_num
-
-        # Oracle BINARY_DOUBLE, BINARY_FLOAT
-        if from_ora_type_num in (ORA_TYPE_NUM_BINARY_DOUBLE,
-                                 ORA_TYPE_NUM_BINARY_FLOAT):
-            if to_ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-                self.metadata._py_type_num = PY_TYPE_NUM_INT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_BINARY_DOUBLE,
-                                     ORA_TYPE_NUM_BINARY_FLOAT,
-                                     ORA_TYPE_NUM_NUMBER):
-                self.metadata._py_type_num = PY_TYPE_NUM_FLOAT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                     ORA_TYPE_NUM_LONG,
-                                     ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle BINARY_INTEGER
-        elif from_ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-            if to_ora_type_num == ORA_TYPE_NUM_NUMBER:
-                self.metadata._py_type_num = PY_TYPE_NUM_FLOAT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                     ORA_TYPE_NUM_LONG,
-                                     ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle BLOB
-        elif from_ora_type_num == ORA_TYPE_NUM_BLOB:
-            if to_ora_type_num in (ORA_TYPE_NUM_RAW, ORA_TYPE_NUM_LONG_RAW):
-                self._fetch_metadata.dbtype = DB_TYPE_LONG_RAW
-                return self._fetch_metadata.dbtype
-
-        # Oracle CHAR, LONG or VARCHAR
-        elif from_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_LONG,
-                                   ORA_TYPE_NUM_VARCHAR):
-            if to_ora_type_num in (ORA_TYPE_NUM_BINARY_DOUBLE,
-                                   ORA_TYPE_NUM_BINARY_FLOAT,
-                                   ORA_TYPE_NUM_NUMBER):
-                self.metadata._py_type_num = PY_TYPE_NUM_FLOAT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-                self.metadata._py_type_num = PY_TYPE_NUM_INT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                     ORA_TYPE_NUM_LONG,
-                                     ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle CLOB
-        elif from_ora_type_num == ORA_TYPE_NUM_CLOB:
-            if to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_LONG,
-                                   ORA_TYPE_NUM_VARCHAR):
-                self._fetch_metadata.dbtype = \
-                        self._get_adjusted_type(ORA_TYPE_NUM_LONG)
-                return self._fetch_metadata.dbtype
-
-        # Oracle DATE, TIMESTAMP (WITH (LOCAL) TIME ZONE)
-        elif from_ora_type_num in (ORA_TYPE_NUM_DATE,
-                                   ORA_TYPE_NUM_TIMESTAMP,
-                                   ORA_TYPE_NUM_TIMESTAMP_LTZ,
-                                   ORA_TYPE_NUM_TIMESTAMP_TZ):
-            if to_ora_type_num in (ORA_TYPE_NUM_DATE,
-                                   ORA_TYPE_NUM_TIMESTAMP,
-                                   ORA_TYPE_NUM_TIMESTAMP_LTZ,
-                                   ORA_TYPE_NUM_TIMESTAMP_TZ,
-                                   ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_LONG,
-                                   ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle INTERVAL DAY TO SECOND, INTERVAL YEAR TO MONTH, ROWID
-        elif from_ora_type_num in (ORA_TYPE_NUM_INTERVAL_DS,
-                                   ORA_TYPE_NUM_INTERVAL_YM,
-                                   ORA_TYPE_NUM_ROWID):
-            if to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_LONG,
-                                   ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle JSON
-        elif from_ora_type_num == ORA_TYPE_NUM_JSON:
-            if to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_VARCHAR):
-                # the server won't accept LONG being defined but even so it
-                # still sends back LONG data!
-                self._fetch_metadata.dbtype = DB_TYPE_LONG
-                return DB_TYPE_VARCHAR
-            elif to_ora_type_num == ORA_TYPE_NUM_RAW:
-                self._fetch_metadata.dbtype = DB_TYPE_RAW
-                return self._fetch_metadata.dbtype
-
-        # Oracle NUMBER
-        elif from_ora_type_num == ORA_TYPE_NUM_NUMBER:
-            if to_ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-                self.metadata._py_type_num = PY_TYPE_NUM_INT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_BINARY_DOUBLE,
-                                     ORA_TYPE_NUM_BINARY_FLOAT):
-                self.metadata._py_type_num = PY_TYPE_NUM_FLOAT
-                return self._get_adjusted_type(to_ora_type_num)
-            elif to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                     ORA_TYPE_NUM_LONG,
-                                     ORA_TYPE_NUM_VARCHAR):
-                return self._get_adjusted_type(to_ora_type_num)
-
-        # Oracle VECTOR
-        elif from_ora_type_num == ORA_TYPE_NUM_VECTOR:
-            if to_ora_type_num in (ORA_TYPE_NUM_CHAR,
-                                   ORA_TYPE_NUM_LONG,
-                                   ORA_TYPE_NUM_VARCHAR):
-                self._fetch_metadata.dbtype = DB_TYPE_LONG
-                return self._fetch_metadata.dbtype
-            elif to_ora_type_num == ORA_TYPE_NUM_CLOB:
-                self._fetch_metadata.dbtype = DB_TYPE_CLOB
-                return self._fetch_metadata.dbtype
-
-        # conversion not supported
-        errors._raise_err(errors.ERR_INCONSISTENT_DATATYPES,
-                          input_type=self._fetch_metadata.dbtype.name,
-                          output_type=self.metadata.dbtype.name)
-
-    cdef int _create_arrow_array(self) except -1:
-        """
-        Creates an Arrow array based on the type information selected by the
-        user.
-        """
-        if self.metadata._schema_impl is None:
-            self.metadata._create_arrow_schema()
-        self._arrow_array = ArrowArrayImpl.__new__(ArrowArrayImpl)
-        self._arrow_array.populate_from_schema(self.metadata._schema_impl)
-
-    cdef int _finalize_init(self) except -1:
-        """
-        Internal method that finalizes initialization of the variable.
-        """
-        self.metadata._finalize_init()
-        if self.num_elements == 0:
-            self.num_elements = 1
-        self._has_returned_data = False
-
-    cdef ArrowArrayImpl _finish_building_arrow_array(self):
-        """
-        Finish building the Arrow array associated with the variable and then
-        return that array (after clearing it in the variable so that a new
-        array will be built if more rows are fetched).
-        """
-        cdef ArrowArrayImpl array = self._arrow_array
-        array.finish_building()
-        self._arrow_array = None
-        return array
-
-    cdef DbType _get_adjusted_type(self, uint8_t ora_type_num):
-        """
-        Returns an adjusted type based on the desired Oracle type and the
-        character set form from the fetch metadata. The intent of this function
-        is to ensure that the character set form is not changed. For example,
-        if the user requests the use of NVARCHAR but the data being fetched is
-        of type CLOB, the type will be adjusted to VARCHAR. For those types
-        which do not require a character set form, CS_FORM_IMPLICIT is always
-        used.
-        """
-        cdef uint8_t csfrm
-        if self.metadata.dbtype._csfrm == 0:
-            csfrm = 0
-        elif self._fetch_metadata.dbtype._csfrm == 0:
-            csfrm = CS_FORM_IMPLICIT
-        else:
-            csfrm = self._fetch_metadata.dbtype._csfrm
-        return DbType._from_ora_type_and_csfrm(ora_type_num, csfrm)
-
-    cdef list _get_array_value(self):
-        """
-        Internal method to return the value of the array.
-        """
-        raise NotImplementedError()
-
-    cdef object _get_scalar_value(self, uint32_t pos):
-        """
-        Internal method to return the value of the variable at the given
-        position.
-        """
-        raise NotImplementedError()
-
-    cdef int _on_reset_bind(self, uint64_t array_offset,
-                            uint32_t num_rows) except -1:
-        """
-        Called when the bind variable is being reset, just prior to performing
-        a bind operation.
-        """
-        if self.num_elements < num_rows:
-            self.num_elements = num_rows
-            self._finalize_init()
-
-    cdef int _resize(self, uint32_t new_size) except -1:
-        """
-        Resize the variable to the new size provided.
-        """
-        self.metadata.max_size = new_size
-        self.metadata.buffer_size = 0
-        self.metadata._finalize_init()
-
-    cdef int _set_metadata_from_type(self, object typ) except -1:
-        """
-        Sets the type and size of the variable given a Python type.
-        """
-        self.metadata = OracleMetadata.from_type(typ)
-
-    cdef int _set_metadata_from_value(self, object value,
-                                      bint is_plsql) except -1:
-        """
-        Sets the type and size of the variable given a Python value. This
-        method is called once for scalars and once per element in a list for
-        array values. If a different type is detected an error is raised.
-        """
-        cdef OracleMetadata metadata
-        metadata = OracleMetadata.from_value(value)
-        if metadata.dbtype is DB_TYPE_BOOLEAN \
-                and not self._conn_impl.supports_bool and not is_plsql:
-            metadata.dbtype = DB_TYPE_BINARY_INTEGER
-        if self.metadata is None:
-            self.metadata = metadata
-        elif metadata.dbtype is not self.metadata.dbtype \
-                or metadata.objtype is not self.metadata.objtype:
-            errors._raise_err(errors.ERR_MIXED_ELEMENT_TYPES, element=value)
-        elif metadata.max_size > self.metadata.max_size:
-            self.metadata.max_size = metadata.max_size
-
-    cdef int _set_num_elements_in_array(self, uint32_t num_elements) except -1:
-        """
-        Sets the number of elements in the array.
-        """
-        self.num_elements_in_array = num_elements
-
-    cdef int _set_scalar_value(self, uint32_t pos, object value) except -1:
-        """
-        Set the value of the variable at the given position. At this point it
-        is assumed that all checks have been performed!
-        """
-        raise NotImplementedError()
-
-    def get_all_values(self):
-        """
-        Internal method for returning an array of all of the values stored in
-        the variable.
-        """
-        cdef uint32_t i
-        if self.is_array:
-            return self._get_array_value()
-        return [self._get_scalar_value(i) for i in range(self.num_elements)]
-
-    def get_value(self, uint32_t pos):
-        """
-        Internal method for getting the value of a variable.
-        """
-        if self.is_array:
-            return self._get_array_value()
-        if pos >= self.num_elements:
-            raise IndexError("position out of range")
-        return self._get_scalar_value(pos)
-
-    def set_value(self, uint32_t pos, object value):
-        """
-        Internal method for setting a variable's value at the specified
-        position.
-        """
-        if self.is_array:
-            if pos > 0:
-                errors._raise_err(errors.ERR_ARRAYS_OF_ARRAYS)
-        elif pos >= self.num_elements:
-            raise IndexError("position out of range")
-        self._check_and_set_value(pos, value, NULL)
diff --git a/src/oracledb/impl/base/vector.pyx b/src/oracledb/impl/base/vector.pyx
deleted file mode 100644
index 48fbf88a..00000000
--- a/src/oracledb/impl/base/vector.pyx
+++ /dev/null
@@ -1,241 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# vector.pyx
-#
-# Cython file defining the classes and methods used for encoding and decoding
-# VECTOR data (embedded in base_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef array.array float_template = array.array('f')
-cdef array.array double_template = array.array('d')
-cdef array.array int8_template = array.array('b')
-cdef array.array uint8_template = array.array('B')
-
-@cython.final
-cdef class SparseVectorImpl:
-
-    @classmethod
-    def from_values(cls, num_dimensions, indices, values):
-        """
-        Creates an implementation from its component values.
-        """
-        cdef SparseVectorImpl impl = cls.__new__(cls)
-        impl.num_dimensions = num_dimensions
-        impl.indices = indices
-        impl.values = values
-        return impl
-
-
-@cython.final
-cdef class VectorDecoder(Buffer):
-
-    cdef array.array _decode_values(self, uint32_t num_elements,
-                                    uint8_t vector_format):
-        """
-        Returns an array containing the decoded values.
-        """
-        cdef:
-            uint8_t *uint8_buf = NULL
-            double *double_buf = NULL
-            uint8_t element_size = 0
-            int8_t *int8_buf = NULL
-            float *float_buf = NULL
-            OracleDataBuffer buffer
-            array.array result
-            uint32_t i
-
-        # set up buffers based on vector storage format
-        if vector_format == VECTOR_FORMAT_FLOAT32:
-            result = array.clone(float_template, num_elements, False)
-            float_buf = result.data.as_floats
-        elif vector_format == VECTOR_FORMAT_FLOAT64:
-            result = array.clone(double_template, num_elements, False)
-            double_buf = result.data.as_doubles
-        elif vector_format == VECTOR_FORMAT_INT8:
-            result = array.clone(int8_template, num_elements, False)
-            int8_buf = result.data.as_schars
-        elif vector_format == VECTOR_FORMAT_BINARY:
-            num_elements = num_elements // 8
-            result = array.clone(uint8_template, num_elements, False)
-            uint8_buf = result.data.as_uchars
-        else:
-            errors._raise_err(errors.ERR_VECTOR_FORMAT_NOT_SUPPORTED,
-                              vector_format=vector_format)
-
-        # parse data
-        for i in range(num_elements):
-            if vector_format == VECTOR_FORMAT_FLOAT32:
-                decode_binary_float(self._get_raw(4), 4, &buffer)
-                float_buf[i] = buffer.as_float
-            elif vector_format == VECTOR_FORMAT_FLOAT64:
-                decode_binary_double(self._get_raw(8), 8, &buffer)
-                double_buf[i] = buffer.as_double
-            elif vector_format == VECTOR_FORMAT_INT8:
-                self.read_sb1(&int8_buf[i])
-            else:
-                self.read_ub1(&uint8_buf[i])
-
-        return result
-
-    cdef object decode(self, bytes data):
-        """
-        Returns a Python object corresponding to the encoded VECTOR bytes.
-        """
-        cdef:
-            uint8_t magic_byte, version, vector_format
-            uint16_t flags, num_sparse_elements
-            SparseVectorImpl sparse_impl
-            array.array uint32_template
-            uint32_t* sparse_indices
-            uint32_t num_elements, i
-
-        # populate the buffer with the data
-        self._populate_from_bytes(data)
-
-        # parse header
-        self.read_ub1(&magic_byte)
-        if magic_byte != TNS_VECTOR_MAGIC_BYTE:
-            errors._raise_err(errors.ERR_UNEXPECTED_DATA,
-                              data=bytes([magic_byte]))
-        self.read_ub1(&version)
-        if version > TNS_VECTOR_VERSION_WITH_SPARSE:
-            errors._raise_err(errors.ERR_VECTOR_VERSION_NOT_SUPPORTED,
-                              version=version)
-        self.read_uint16be(&flags)
-        self.read_ub1(&vector_format)
-        self.read_uint32be(&num_elements)
-        if flags & TNS_VECTOR_FLAG_NORM_RESERVED \
-                or flags & TNS_VECTOR_FLAG_NORM:
-            self.skip_raw_bytes(8)
-
-        # for sparse vectors, only non-zero elements are found in the image
-        if flags & TNS_VECTOR_FLAG_SPARSE:
-            sparse_impl = SparseVectorImpl.__new__(SparseVectorImpl)
-            sparse_impl.num_dimensions = num_elements
-            self.read_uint16be(&num_sparse_elements)
-            num_elements = num_sparse_elements
-            uint32_template = array.array(ARRAY_TYPE_CODE_UINT32)
-            sparse_impl.indices = array.clone(uint32_template,
-                                              num_sparse_elements, False)
-            sparse_indices = <uint32_t*> sparse_impl.indices.data.as_voidptr
-            for i in range(num_sparse_elements):
-                self.read_uint32be(&sparse_indices[i])
-            sparse_impl.values = self._decode_values(num_sparse_elements,
-                                                     vector_format)
-            return PY_TYPE_SPARSE_VECTOR._from_impl(sparse_impl)
-
-        # all other vectors have just the values
-        return self._decode_values(num_elements, vector_format)
-
-
-@cython.final
-cdef class VectorEncoder(GrowableBuffer):
-
-    cdef int _encode_values(self, array.array value, uint32_t num_elements,
-                            uint8_t vector_format) except -1:
-        """
-        Encode the values into the image using the given vector storage format.
-        """
-        cdef:
-            double *double_ptr = value.data.as_doubles
-            uint8_t *uint8_ptr = value.data.as_uchars
-            float *float_ptr = value.data.as_floats
-            int8_t *int8_ptr = value.data.as_schars
-            char_type buf[8]
-            uint32_t i
-        if vector_format == VECTOR_FORMAT_INT8:
-            self.write_raw(<char_type*> int8_ptr, num_elements)
-        elif vector_format == VECTOR_FORMAT_BINARY:
-            self.write_raw(<char_type*> uint8_ptr, num_elements // 8)
-        else:
-            for i in range(num_elements):
-                if vector_format == VECTOR_FORMAT_FLOAT32:
-                    encode_binary_float(buf, float_ptr[i])
-                    self.write_raw(buf, 4)
-                elif vector_format == VECTOR_FORMAT_FLOAT64:
-                    encode_binary_double(buf, double_ptr[i])
-                    self.write_raw(buf, 8)
-
-    cdef uint8_t _get_vector_format(self, array.array value):
-        """
-        Returns the vector storage format used by the array.
-        """
-        if value.typecode == 'd':
-            return VECTOR_FORMAT_FLOAT64
-        elif value.typecode == 'f':
-            return VECTOR_FORMAT_FLOAT32
-        elif value.typecode == 'b':
-            return VECTOR_FORMAT_INT8
-        return VECTOR_FORMAT_BINARY
-
-    cdef int encode(self, object value) except -1:
-        """
-        Encodes the given value to the internal VECTOR format.
-        """
-        cdef:
-            uint16_t flags = TNS_VECTOR_FLAG_NORM_RESERVED
-            uint8_t vector_format, vector_version
-            SparseVectorImpl sparse_impl = None
-            uint16_t num_sparse_elements, i
-            uint32_t* sparse_indices
-            uint32_t num_elements
-
-        # determine metadatda about the vector to write
-        if isinstance(value, PY_TYPE_SPARSE_VECTOR):
-            sparse_impl = value._impl
-            num_elements = sparse_impl.num_dimensions
-            vector_format = self._get_vector_format(sparse_impl.values)
-            vector_version = TNS_VECTOR_VERSION_WITH_SPARSE
-            flags |= TNS_VECTOR_FLAG_SPARSE | TNS_VECTOR_FLAG_NORM
-        else:
-            vector_format = self._get_vector_format(value)
-            if vector_format == VECTOR_FORMAT_BINARY:
-                num_elements = (<uint32_t> len(value)) * 8
-                vector_version = TNS_VECTOR_VERSION_WITH_BINARY
-            else:
-                num_elements = <uint32_t> len(value)
-                vector_version = TNS_VECTOR_VERSION_BASE
-                flags |= TNS_VECTOR_FLAG_NORM
-
-        # write header
-        self.write_uint8(TNS_VECTOR_MAGIC_BYTE)
-        self.write_uint8(vector_version)
-        self.write_uint16be(flags)
-        self.write_uint8(vector_format)
-        self.write_uint32be(num_elements)
-        self._reserve_space(8)              # reserve space for norm
-
-        # write data
-        if sparse_impl is None:
-            self._encode_values(value, num_elements, vector_format)
-        else:
-            sparse_indices = <uint32_t*> sparse_impl.indices.data.as_voidptr
-            num_sparse_elements = len(sparse_impl.indices)
-            self.write_uint16be(num_sparse_elements)
-            for i in range(num_sparse_elements):
-                self.write_uint32be(sparse_indices[i])
-            self._encode_values(sparse_impl.values, num_sparse_elements,
-                                vector_format)
diff --git a/src/oracledb/impl/thick/buffer.pyx b/src/oracledb/impl/thick/buffer.pyx
deleted file mode 100644
index 3a9291f1..00000000
--- a/src/oracledb/impl/thick/buffer.pyx
+++ /dev/null
@@ -1,56 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# buffer.pyx
-#
-# Cython file defining the StringBuffer class, used for transforming Python
-# "str" and "bytes" objects into the C buffer representation required by ODPI-C
-# (embedded in thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.freelist(20)
-cdef class StringBuffer:
-    cdef:
-        bytes obj
-        char *ptr
-        uint32_t length
-        uint32_t size_in_chars
-
-    cdef int set_value(self, value) except -1:
-        if value is None:
-            self.obj = None
-            self.ptr = NULL
-            self.length = self.size_in_chars = 0
-            return 0
-        elif isinstance(value, str):
-            self.obj = (<str> value).encode()
-            self.size_in_chars = <uint32_t> len(<str> value)
-        elif isinstance(value, bytes):
-            self.obj = <bytes> value
-            self.size_in_chars = <uint32_t> len(<bytes> value)
-        else:
-            raise TypeError("expecting string or bytes")
-        self.ptr = self.obj
-        self.length = <uint32_t> len(self.obj)
diff --git a/src/oracledb/impl/thick/connection.pyx b/src/oracledb/impl/thick/connection.pyx
deleted file mode 100644
index 5bf887c9..00000000
--- a/src/oracledb/impl/thick/connection.pyx
+++ /dev/null
@@ -1,907 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# connection.pyx
-#
-# Cython file defining the thick Connection implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-ctypedef int (*dpiConnSetTextAttrFunc)(dpiConn*, const char*, uint32_t) nogil
-
-cdef class ConnectionParams:
-    cdef:
-        bytes connect_string
-        bytes username
-        bytes password
-        bytes cclass
-        bytes new_password
-        bytes edition
-        bytes tag
-        bytes token
-        bytes private_key
-        bytes driver_name
-
-        const char *connect_string_ptr
-        const char *username_ptr
-        const char *password_ptr
-        const char *cclass_ptr
-        const char *new_password_ptr
-        const char *edition_ptr
-        const char *tag_ptr
-        const char *token_ptr
-        const char *private_key_ptr
-        const char *driver_name_ptr
-
-        uint32_t connect_string_len
-        uint32_t username_len
-        uint32_t password_len
-        uint32_t cclass_len
-        uint32_t new_password_len
-        uint32_t edition_len
-        uint32_t tag_len
-        uint32_t token_len
-        uint32_t private_key_len
-        uint32_t driver_name_len
-
-        uint32_t num_app_context
-        list bytes_references
-        dpiAppContext *app_context
-
-        uint32_t num_sharding_key_columns
-        dpiShardingKeyColumn *sharding_key_columns
-        uint32_t num_super_sharding_key_columns
-        dpiShardingKeyColumn *super_sharding_key_columns
-
-    def __dealloc__(self):
-        if self.app_context is not NULL:
-            cpython.PyMem_Free(self.app_context)
-        if self.sharding_key_columns is not NULL:
-            cpython.PyMem_Free(self.sharding_key_columns)
-        if self.super_sharding_key_columns is not NULL:
-            cpython.PyMem_Free(self.super_sharding_key_columns)
-
-    cdef int _process_context_str(self, str value, const char **ptr,
-                                  uint32_t *length) except -1:
-        cdef bytes temp
-        temp = value.encode()
-        self.bytes_references.append(temp)
-        ptr[0] = temp
-        length[0] = <uint32_t> len(temp)
-
-    cdef int _process_sharding_value(self, object value,
-                                     dpiShardingKeyColumn *column) except -1:
-        """
-        Process a sharding column value and place it in the format required by
-        ODPI-C.
-        """
-        cdef:
-            dpiTimestamp* timestamp
-            bytes temp
-        if isinstance(value, str):
-            temp = value.encode()
-            self.bytes_references.append(temp)
-            column.oracleTypeNum = DPI_ORACLE_TYPE_VARCHAR
-            column.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            column.value.asBytes.ptr = temp
-            column.value.asBytes.length = <uint32_t> len(temp)
-        elif isinstance(value, (int, float, PY_TYPE_DECIMAL)):
-            temp = str(value).encode()
-            self.bytes_references.append(temp)
-            column.oracleTypeNum = DPI_ORACLE_TYPE_NUMBER
-            column.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            column.value.asBytes.ptr = temp
-            column.value.asBytes.length = <uint32_t> len(temp)
-        elif isinstance(value, bytes):
-            self.bytes_references.append(value)
-            column.oracleTypeNum = DPI_ORACLE_TYPE_RAW
-            column.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            column.value.asBytes.ptr = <bytes> value
-            column.value.asBytes.length = <uint32_t> len(value)
-        elif isinstance(value, PY_TYPE_DATETIME):
-            column.oracleTypeNum = DPI_ORACLE_TYPE_DATE
-            column.nativeTypeNum = DPI_NATIVE_TYPE_TIMESTAMP
-            timestamp = &column.value.asTimestamp
-            memset(timestamp, 0, sizeof(dpiTimestamp))
-            timestamp.year = cydatetime.datetime_year(value)
-            timestamp.month = cydatetime.datetime_month(value)
-            timestamp.day = cydatetime.datetime_day(value)
-            timestamp.hour = cydatetime.datetime_hour(value)
-            timestamp.minute = cydatetime.datetime_minute(value)
-            timestamp.second = cydatetime.datetime_second(value)
-            timestamp.fsecond = cydatetime.datetime_microsecond(value) * 1000
-        elif isinstance(value, PY_TYPE_DATE):
-            column.oracleTypeNum = DPI_ORACLE_TYPE_DATE
-            column.nativeTypeNum = DPI_NATIVE_TYPE_TIMESTAMP
-            timestamp = &column.value.asTimestamp
-            memset(timestamp, 0, sizeof(dpiTimestamp))
-            timestamp.year = cydatetime.date_year(value)
-            timestamp.month = cydatetime.date_month(value)
-            timestamp.day = cydatetime.date_day(value)
-        else:
-            errors._raise_err(errors.ERR_PYTHON_VALUE_NOT_SUPPORTED,
-                              type_name=type(value).__name__)
-
-    cdef process_appcontext(self, list entries):
-        cdef:
-            object namespace, name, value
-            dpiAppContext *entry
-            ssize_t num_bytes
-            bytes temp
-            uint32_t i
-        if self.bytes_references is None:
-            self.bytes_references = []
-        self.num_app_context = <uint32_t> len(entries)
-        num_bytes = self.num_app_context * sizeof(dpiAppContext)
-        self.app_context = <dpiAppContext*> cpython.PyMem_Malloc(num_bytes)
-        for i in range(self.num_app_context):
-            namespace, name, value = entries[i]
-            entry = &self.app_context[i]
-            self._process_context_str(namespace, &entry.namespaceName,
-                                      &entry.namespaceNameLength)
-            self._process_context_str(name, &entry.name, &entry.nameLength)
-            self._process_context_str(value, &entry.value, &entry.valueLength)
-
-    cdef int process_sharding_key(self, list entries, bint is_super) except -1:
-        """
-        Process the (super) sharding key and place it in the format required by
-        ODPI-C.
-        """
-        cdef:
-            dpiShardingKeyColumn *columns
-            uint32_t num_columns
-            ssize_t num_bytes, i
-        if self.bytes_references is None:
-            self.bytes_references = []
-        num_columns = <uint32_t> len(entries)
-        num_bytes = num_columns * sizeof(dpiShardingKeyColumn)
-        columns = <dpiShardingKeyColumn*> cpython.PyMem_Malloc(num_bytes)
-        if is_super:
-            self.super_sharding_key_columns = columns
-            self.num_super_sharding_key_columns = num_columns
-        else:
-            self.sharding_key_columns = columns
-            self.num_sharding_key_columns = num_columns
-        for i, entry in enumerate(entries):
-            self._process_sharding_value(entry, &columns[i])
-
-
-@cython.freelist(8)
-cdef class ThickXid:
-    cdef:
-        StringBuffer global_transaction_id_buf
-        StringBuffer branch_qualifier_buf
-        dpiXid* xid_ptr
-        dpiXid xid_buf
-
-    def __init__(self, xid):
-        if xid is not None:
-            self.global_transaction_id_buf = StringBuffer()
-            self.global_transaction_id_buf.set_value(xid.global_transaction_id)
-            self.branch_qualifier_buf = StringBuffer()
-            self.branch_qualifier_buf.set_value(xid.branch_qualifier)
-            self.xid_buf.formatId = xid.format_id
-            self.xid_buf.globalTransactionId = \
-                    self.global_transaction_id_buf.ptr
-            self.xid_buf.globalTransactionIdLength = \
-                    self.global_transaction_id_buf.length
-            self.xid_buf.branchQualifier = \
-                    self.branch_qualifier_buf.ptr
-            self.xid_buf.branchQualifierLength = \
-                    self.branch_qualifier_buf.length
-            self.xid_ptr = &self.xid_buf
-
-
-cdef class ThickConnImpl(BaseConnImpl):
-    cdef:
-        dpiConn *_handle
-        bint _is_external
-        public str tag
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiConn_release(self._handle)
-
-    cdef BaseCursorImpl _create_cursor_impl(self):
-        """
-        Internal method for creating an empty cursor implementation object.
-        """
-        return ThickCursorImpl.__new__(ThickCursorImpl, self)
-
-    def _get_oci_attr(self, uint32_t handle_type, uint32_t attr_num,
-                      uint32_t attr_type):
-        """
-        Internal method for getting the value of an OCI attribute on the
-        connection.
-        """
-        cdef:
-            dpiDataBuffer value
-            uint32_t value_len
-        if dpiConn_getOciAttr(self._handle, handle_type, attr_num, &value,
-                              &value_len) < 0:
-            _raise_from_odpi()
-        return _convert_oci_attr_to_python(attr_type, &value, value_len)
-
-    def _set_oci_attr(self, uint32_t handle_type, uint32_t attr_num,
-                      uint32_t attr_type, object value):
-        """
-        Internal method for setting the value of an OCI attribute on the
-        connection.
-        """
-        cdef:
-            StringBuffer str_buf = StringBuffer()
-            void *oci_value = NULL
-            dpiDataBuffer oci_buf
-            uint32_t oci_len = 0
-        _convert_python_to_oci_attr(value, attr_type, str_buf, &oci_buf,
-                                    &oci_value, &oci_len)
-        if dpiConn_setOciAttr(self._handle, handle_type, attr_num, oci_value,
-                              oci_len) < 0:
-            _raise_from_odpi()
-
-    cdef int _set_text_attr(self, dpiConnSetTextAttrFunc func,
-                            str value) except -1:
-        cdef:
-            uint32_t value_length
-            const char *value_ptr
-            bytes value_bytes
-        if value is not None:
-            value_bytes = value.encode()
-            value_ptr = value_bytes
-            value_length = len(value_bytes)
-        else:
-            value_ptr = NULL
-            value_length = 0
-        if func(self._handle, value_ptr, value_length) < 0:
-            _raise_from_odpi()
-
-    def begin_sessionless_transaction(self, bytes transaction_id,
-                                      uint32_t timeout, bint defer_round_trip):
-        """
-        Begin a new sessionless transaction.
-        """
-        cdef:
-            dpiSessionlessTransactionId txn_id
-            int status
-        txn_id.length = len(transaction_id)
-        memcpy(txn_id.value, <const char*> transaction_id, txn_id.length)
-        with nogil:
-            status = dpiConn_beginSessionlessTransaction(
-                self._handle, &txn_id, timeout, defer_round_trip
-            )
-        if status < 0:
-            _raise_from_odpi()
-
-    def cancel(self):
-        cdef int status
-        with nogil:
-            status = dpiConn_breakExecution(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def change_password(self, str old_password, str new_password):
-        cdef:
-            bytes username_bytes, old_password_bytes, new_password_bytes
-            uint32_t username_len = 0, old_password_len = 0
-            const char *old_password_ptr = NULL
-            const char *new_password_ptr = NULL
-            const char *username_ptr = NULL
-            uint32_t new_password_len = 0
-            int status
-        if self.username is not None:
-            username_bytes = self.username.encode()
-            username_ptr = username_bytes
-            username_len = <uint32_t> len(username_bytes)
-        old_password_bytes = old_password.encode()
-        old_password_ptr = old_password_bytes
-        old_password_len = <uint32_t> len(old_password_bytes)
-        new_password_bytes = new_password.encode()
-        new_password_ptr = new_password_bytes
-        new_password_len = <uint32_t> len(new_password_bytes)
-        with nogil:
-            status = dpiConn_changePassword(self._handle, username_ptr,
-                                            username_len, old_password_ptr,
-                                            old_password_len, new_password_ptr,
-                                            new_password_len)
-        if status < 0:
-            _raise_from_odpi()
-
-    def get_is_healthy(self):
-        cdef bint is_healthy
-        if dpiConn_getIsHealthy(self._handle, &is_healthy) < 0:
-            _raise_from_odpi()
-        return is_healthy
-
-    def close(self, bint in_del=False):
-        cdef:
-            uint32_t mode = DPI_MODE_CONN_CLOSE_DEFAULT
-            const char *tag_ptr = NULL
-            uint32_t tag_length = 0
-            bytes tag_bytes
-            int status
-        if in_del and self._is_external:
-            return 0
-        if self.tag is not None:
-            mode = DPI_MODE_CONN_CLOSE_RETAG
-            tag_bytes = self.tag.encode()
-            tag_ptr = tag_bytes
-            tag_length = <uint32_t> len(tag_bytes)
-        with nogil:
-            status = dpiConn_close(self._handle, mode, tag_ptr, tag_length)
-            if status == DPI_SUCCESS:
-                dpiConn_release(self._handle)
-                self._handle = NULL
-        if status < 0 and not in_del:
-            _raise_from_odpi()
-
-    def commit(self):
-        cdef int status
-        with nogil:
-            status = dpiConn_commit(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def connect(self, ConnectParamsImpl user_params, ThickPoolImpl pool_impl):
-        cdef:
-            str full_user, cclass, token, private_key, connect_string
-            bytes password_bytes, new_password_bytes
-            dpiCommonCreateParams common_params
-            dpiConnCreateParams conn_params
-            ConnectParamsImpl pool_params
-            dpiAccessToken access_token
-            dpiVersionInfo version_info
-            dpiErrorInfo error_info
-            ConnectionParams params
-            int status
-
-        # specify that binding a string to a LOB value is possible in thick
-        # mode (will be removed in a future release)
-        self._allow_bind_str_to_lob = True
-
-        # if the connection is part of the pool, get the pool creation params
-        if pool_impl is not None:
-            pool_params = pool_impl.connect_params
-            self.username = pool_impl.username
-            self.dsn = pool_impl.dsn
-
-        # set up connection parameters
-        params = ConnectionParams()
-        password_bytes = user_params._get_password()
-        new_password_bytes = user_params._get_new_password()
-        full_user = user_params.get_full_user()
-        if full_user is not None:
-            params.username = full_user.encode()
-            params.username_ptr = params.username
-            params.username_len = <uint32_t> len(params.username)
-        if password_bytes is not None:
-            params.password = password_bytes
-            params.password_ptr = params.password
-            params.password_len = <uint32_t> len(params.password)
-        if pool_impl is None:
-            if user_params.thick_mode_dsn_passthrough:
-                connect_string = self.dsn
-            else:
-                connect_string = user_params._get_connect_string()
-            if connect_string is not None:
-                params.connect_string = connect_string.encode()
-                params.connect_string_ptr = params.connect_string
-                params.connect_string_len = \
-                        <uint32_t> len(params.connect_string)
-        if pool_impl is None \
-                or user_params._default_description.cclass is not None:
-            cclass = user_params._default_description.cclass
-        else:
-            cclass = pool_params._default_description.cclass
-        if cclass is not None:
-            params.cclass = cclass.encode()
-            params.cclass_ptr = params.cclass
-            params.cclass_len = <uint32_t> len(params.cclass)
-        if new_password_bytes is not None:
-            params.new_password = new_password_bytes
-            params.new_password_ptr = params.new_password
-            params.new_password_len = <uint32_t> len(params.new_password)
-        if user_params.edition is not None:
-            params.edition = user_params.edition.encode()
-            params.edition_ptr = params.edition
-            params.edition_len = <uint32_t> len(params.edition)
-        if user_params.tag is not None:
-            params.tag = user_params.tag.encode()
-            params.tag_ptr = params.tag
-            params.tag_len = <uint32_t> len(params.tag)
-        if user_params.appcontext:
-            params.process_appcontext(user_params.appcontext)
-        if user_params.shardingkey:
-            params.process_sharding_key(user_params.shardingkey, False)
-        if user_params.supershardingkey:
-            params.process_sharding_key(user_params.supershardingkey, True)
-        if user_params._token is not None \
-                or user_params.access_token_callback is not None:
-            token = user_params._get_token()
-            private_key = user_params._get_private_key()
-            params.token = token.encode()
-            params.token_ptr = params.token
-            params.token_len = <uint32_t> len(params.token)
-            if private_key is not None:
-                params.private_key = private_key.encode()
-                params.private_key_ptr = params.private_key
-                params.private_key_len = <uint32_t> len(params.private_key)
-        if user_params.driver_name is not None:
-            params.driver_name = user_params.driver_name.encode()[:30]
-            params.driver_name_ptr = params.driver_name
-            params.driver_name_len = <uint32_t> len(params.driver_name)
-
-        # set up common creation parameters
-        if dpiContext_initCommonCreateParams(driver_info.context,
-                                             &common_params) < 0:
-            _raise_from_odpi()
-        common_params.createMode |= DPI_MODE_CREATE_THREADED
-        if user_params.events:
-            common_params.createMode |= DPI_MODE_CREATE_EVENTS
-        if user_params.edition is not None:
-            common_params.edition = params.edition_ptr
-            common_params.editionLength = params.edition_len
-        if params.token is not None:
-            access_token.token = params.token_ptr
-            access_token.tokenLength = params.token_len
-            access_token.privateKey = params.private_key_ptr
-            access_token.privateKeyLength = params.private_key_len
-            common_params.accessToken = &access_token
-        if user_params.driver_name is not None:
-            common_params.driverName = params.driver_name_ptr
-            common_params.driverNameLength = params.driver_name_len
-
-        # set up connection specific creation parameters
-        if dpiContext_initConnCreateParams(driver_info.context,
-                                           &conn_params) < 0:
-            _raise_from_odpi()
-        if params.username_len == 0 and params.password_len == 0:
-            conn_params.externalAuth = 1
-        else:
-            conn_params.externalAuth = user_params.externalauth
-        if params.cclass is not None:
-            conn_params.connectionClass = params.cclass_ptr
-            conn_params.connectionClassLength = params.cclass_len
-        if new_password_bytes is not None:
-            conn_params.newPassword = params.new_password_ptr
-            conn_params.newPasswordLength = params.new_password_len
-        if user_params.appcontext:
-            conn_params.appContext = params.app_context
-            conn_params.numAppContext = params.num_app_context
-        if user_params.shardingkey:
-            conn_params.shardingKeyColumns = params.sharding_key_columns
-            conn_params.numShardingKeyColumns = params.num_sharding_key_columns
-        if user_params.supershardingkey:
-            conn_params.superShardingKeyColumns = \
-                    params.super_sharding_key_columns
-            conn_params.numSuperShardingKeyColumns = \
-                    params.num_super_sharding_key_columns
-        if user_params.tag is not None:
-            conn_params.tag = params.tag_ptr
-            conn_params.tagLength = params.tag_len
-        if user_params._external_handle != 0:
-            conn_params.externalHandle = <void*> user_params._external_handle
-            self._is_external = True
-        if pool_impl is not None:
-            conn_params.pool = pool_impl._handle
-        common_params.stmtCacheSize = user_params.stmtcachesize
-        conn_params.authMode = user_params.mode
-        conn_params.matchAnyTag = user_params.matchanytag
-        if user_params._default_description.purity != PURITY_DEFAULT:
-            conn_params.purity = user_params._default_description.purity
-        elif pool_impl is not None:
-            conn_params.purity = pool_params._default_description.purity
-
-        # perform connection
-        with nogil:
-            status = dpiConn_create(driver_info.context, params.username_ptr,
-                                    params.username_len, params.password_ptr,
-                                    params.password_len,
-                                    params.connect_string_ptr,
-                                    params.connect_string_len,
-                                    &common_params, &conn_params,
-                                    &self._handle)
-            dpiContext_getError(driver_info.context, &error_info)
-        if status < 0:
-            _raise_from_info(&error_info)
-        elif error_info.isWarning:
-            self.warning = _create_new_from_info(&error_info)
-        if conn_params.outNewSession and pool_impl is not None \
-                and self.warning is None:
-            self.warning = pool_impl.warning
-        if dpiConn_getServerVersion(self._handle, NULL, NULL,
-                                    &version_info) < 0:
-            _raise_from_odpi()
-        self.server_version = (
-            version_info.versionNum,
-            version_info.releaseNum,
-            version_info.updateNum,
-            version_info.portReleaseNum,
-            version_info.portUpdateNum
-        )
-        if driver_info.client_version_info.versionNum >= 23 \
-                and version_info.versionNum >= 23:
-            self.supports_bool = True
-            self._oson_max_fname_size = 65535
-
-        # determine if session callback should be invoked; this takes place if
-        # the connection is newly created by the pool or if the requested tag
-        # does not match the actual tag
-        if (conn_params.outNewSession \
-                or conn_params.outTagLength != params.tag_len \
-                or (params.tag_len > 0 \
-                and conn_params.outTag[:conn_params.outTagLength] !=  \
-                params.tag_ptr[:conn_params.outTagLength])):
-            self.invoke_session_callback = True
-
-        # set tag property, if applicable
-        if conn_params.outTagLength > 0:
-            self.tag = conn_params.outTag[:conn_params.outTagLength].decode()
-
-    def create_msg_props_impl(self):
-        cdef ThickMsgPropsImpl impl
-        impl = ThickMsgPropsImpl.__new__(ThickMsgPropsImpl)
-        impl._conn_impl = self
-        if dpiConn_newMsgProps(self._handle, &impl._handle) < 0:
-            _raise_from_odpi()
-        return impl
-
-    def create_queue_impl(self):
-        return ThickQueueImpl.__new__(ThickQueueImpl)
-
-    def create_soda_database_impl(self, conn):
-        cdef ThickSodaDbImpl impl = ThickSodaDbImpl.__new__(ThickSodaDbImpl)
-        impl.supports_json = driver_info.soda_use_json_desc
-        impl._conn = conn
-        if dpiConn_getSodaDb(self._handle, &impl._handle) < 0:
-            _raise_from_odpi()
-        return impl
-
-    def create_subscr_impl(self, object conn, object callback,
-                           uint32_t namespace, str name, uint32_t protocol,
-                           str ip_address, uint32_t port, uint32_t timeout,
-                           uint32_t operations, uint32_t qos,
-                           uint8_t grouping_class, uint32_t grouping_value,
-                           uint8_t grouping_type, bint client_initiated):
-        cdef ThickSubscrImpl impl = ThickSubscrImpl.__new__(ThickSubscrImpl)
-        impl.connection = conn
-        impl.callback = callback
-        impl.namespace = namespace
-        impl.name = name
-        impl.protocol = protocol
-        impl.ip_address = ip_address
-        impl.port = port
-        impl.timeout = timeout
-        impl.operations = operations
-        impl.qos = qos
-        impl.grouping_class = grouping_class
-        impl.grouping_value = grouping_value
-        impl.grouping_type = grouping_type
-        impl.client_initiated = client_initiated
-        return impl
-
-    def create_temp_lob_impl(self, DbType dbtype):
-        return ThickLobImpl._create(self, dbtype, NULL)
-
-    def get_call_timeout(self):
-        cdef uint32_t value
-        if dpiConn_getCallTimeout(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_current_schema(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getCurrentSchema(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_db_domain(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getDbDomain(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_db_name(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getDbName(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_edition(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getEdition(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_external_name(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getExternalName(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_handle(self):
-        cdef void* handle
-        if dpiConn_getHandle(self._handle, &handle) < 0:
-            _raise_from_odpi()
-        return <uint64_t> handle
-
-    def get_instance_name(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getInstanceName(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_internal_name(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getInternalName(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_ltxid(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getLTXID(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        return value[:value_length]
-
-    def get_max_identifier_length(self):
-        cdef dpiConnInfo info
-        if dpiConn_getInfo(self._handle, &info) < 0:
-            _raise_from_odpi()
-        if info.maxIdentifierLength != 0:
-            return info.maxIdentifierLength
-
-    def get_max_open_cursors(self):
-        cdef uint32_t value
-        if dpiConn_getMaxOpenCursors(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_service_name(self):
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiConn_getServiceName(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value is not NULL:
-            return value[:value_length].decode()
-
-    def get_stmt_cache_size(self):
-        cdef uint32_t value
-        if dpiConn_getStmtCacheSize(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_transaction_in_progress(self):
-        cdef bint value
-        if dpiConn_getTransactionInProgress(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_type(self, object conn, str name):
-        cdef:
-            dpiObjectType *handle
-            const char *name_ptr
-            uint32_t name_len
-            bytes name_bytes
-            int status
-        name_bytes = name.encode()
-        name_ptr = name_bytes
-        name_len = <uint32_t> len(name_bytes)
-        with nogil:
-            status = dpiConn_getObjectType(self._handle, name_ptr, name_len,
-                                           &handle)
-        if status < 0:
-            _raise_from_odpi()
-        try:
-            return ThickDbObjectTypeImpl._from_handle(self, handle)
-        finally:
-            dpiObjectType_release(handle)
-
-    def set_action(self, str value):
-        self._set_text_attr(dpiConn_setAction, value)
-
-    def set_call_timeout(self, uint32_t value):
-        if dpiConn_setCallTimeout(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_client_identifier(self, str value):
-        self._set_text_attr(dpiConn_setClientIdentifier, value)
-
-    def set_client_info(self, str value):
-        self._set_text_attr(dpiConn_setClientInfo, value)
-
-    def set_current_schema(self, str value):
-        self._set_text_attr(dpiConn_setCurrentSchema, value)
-
-    def set_dbop(self, str value):
-        self._set_text_attr(dpiConn_setDbOp, value)
-
-    def ping(self):
-        cdef int status
-        with nogil:
-            status = dpiConn_ping(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def resume_sessionless_transaction(self, bytes transaction_id,
-                                       uint32_t timeout,
-                                       bint defer_round_trip):
-        """
-        Resume a sessionless transaction.
-        """
-        cdef:
-            dpiSessionlessTransactionId txn_id
-            int status
-        txn_id.length = len(transaction_id)
-        memcpy(txn_id.value, <const char*> transaction_id, txn_id.length)
-        with nogil:
-            status = dpiConn_resumeSessionlessTransaction(
-                self._handle, &txn_id, timeout, defer_round_trip
-            )
-        if status < 0:
-            _raise_from_odpi()
-
-    def rollback(self):
-        cdef int status
-        with nogil:
-            status = dpiConn_rollback(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def set_econtext_id(self, value):
-        self._set_text_attr(dpiConn_setEcontextId, value)
-
-    def set_external_name(self, str value):
-        self._set_text_attr(dpiConn_setExternalName, value)
-
-    def set_internal_name(self, str value):
-        self._set_text_attr(dpiConn_setInternalName, value)
-
-    def set_module(self, str value):
-        self._set_text_attr(dpiConn_setModule, value)
-
-    def set_stmt_cache_size(self, uint32_t value):
-        if dpiConn_setStmtCacheSize(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def shutdown(self, uint32_t mode):
-        cdef int status
-        with nogil:
-            status = dpiConn_shutdownDatabase(self._handle, mode)
-        if status < 0:
-            _raise_from_odpi()
-
-    def startup(self, bint force, bint restrict, str pfile):
-        cdef:
-            uint32_t mode, pfile_length = 0
-            const char *pfile_ptr = NULL
-            bytes temp
-            int status
-
-        mode = DPI_MODE_STARTUP_DEFAULT
-        if force:
-            mode |= DPI_MODE_STARTUP_FORCE
-        if restrict:
-            mode |= DPI_MODE_STARTUP_RESTRICT
-        if pfile is not None:
-            temp = pfile.encode()
-            pfile_ptr = temp
-            pfile_length = len(pfile_ptr)
-        with nogil:
-            status = dpiConn_startupDatabaseWithPfile(self._handle, pfile_ptr,
-                                                      pfile_length, mode)
-        if status < 0:
-            _raise_from_odpi()
-
-    def suspend_sessionless_transaction(self):
-        """
-        Suspend the currently active sessionless transaction.
-        """
-        cdef int status
-        with nogil:
-            status = dpiConn_suspendSessionlessTransaction(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def tpc_begin(self, xid, uint32_t flags, uint32_t timeout):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            int status
-        with nogil:
-            status = dpiConn_tpcBegin(self._handle, thick_xid.xid_ptr,
-                                      timeout, flags)
-        if status < 0:
-            _raise_from_odpi()
-
-    def tpc_commit(self, xid, bint one_phase):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            int status
-        with nogil:
-            status = dpiConn_tpcCommit(self._handle, thick_xid.xid_ptr,
-                                       one_phase)
-        if status < 0:
-            _raise_from_odpi()
-
-    def tpc_end(self, xid, uint32_t flags):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            int status
-        with nogil:
-            status = dpiConn_tpcEnd(self._handle, thick_xid.xid_ptr, flags)
-        if status < 0:
-            _raise_from_odpi()
-
-    def tpc_forget(self, xid):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            int status
-        with nogil:
-            status = dpiConn_tpcForget(self._handle, thick_xid.xid_ptr)
-        if status < 0:
-            _raise_from_odpi()
-
-    def tpc_prepare(self, xid):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            bint commit_needed
-            int status
-        with nogil:
-            status = dpiConn_tpcPrepare(self._handle, thick_xid.xid_ptr,
-                                        &commit_needed)
-        if status < 0:
-            _raise_from_odpi()
-        return commit_needed
-
-    def tpc_rollback(self, xid):
-        cdef:
-            ThickXid thick_xid = ThickXid(xid)
-            int status
-        with nogil:
-            status = dpiConn_tpcRollback(self._handle, thick_xid.xid_ptr)
-        if status < 0:
-            _raise_from_odpi()
diff --git a/src/oracledb/impl/thick/cursor.pyx b/src/oracledb/impl/thick/cursor.pyx
deleted file mode 100644
index 7a049ceb..00000000
--- a/src/oracledb/impl/thick/cursor.pyx
+++ /dev/null
@@ -1,550 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# cursor.pyx
-#
-# Cython file defining the thick Cursor implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-
-cdef class ThickCursorImpl(BaseCursorImpl):
-    cdef:
-        ThickConnImpl _conn_impl
-        bint _is_implicit_cursor
-        bint _fixup_ref_cursor
-        dpiStmtInfo _stmt_info
-        dpiStmt *_handle
-        str _tag
-
-    def __cinit__(self, conn_impl):
-        self._conn_impl = conn_impl
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiStmt_release(self._handle)
-
-    cdef int _close(self, bint in_del) except -1:
-        """
-        Internal method for closing the cursor.
-        """
-        if self._handle != NULL:
-            if not in_del and self._conn_impl._handle != NULL \
-                    and not self._is_implicit_cursor:
-                if dpiStmt_close(self._handle, NULL, 0) < 0:
-                    _raise_from_odpi()
-            dpiStmt_release(self._handle)
-            self._handle = NULL
-
-    cdef BaseVarImpl _create_var_impl(self, object conn):
-        """
-        Internal method for creating a variable.
-        """
-        cdef ThickVarImpl var_impl = ThickVarImpl.__new__(ThickVarImpl)
-        var_impl._conn = conn
-        var_impl._conn_impl = self._conn_impl
-        return var_impl
-
-    cdef int _define_var(self, object conn, object cursor, object type_handler,
-                         bint uses_metadata, ssize_t pos) except -1:
-        """
-        Internal method that creates the variable using the query info (unless
-        an output type handler has been specified) and then performs the define
-        in ODPI-C.
-        """
-        cdef:
-            ThickDbObjectTypeImpl typ_impl
-            OracleMetadata metadata
-            ThickConnImpl conn_impl
-            dpiQueryInfo query_info
-            dpiDataTypeInfo *info
-            ThickVarImpl var_impl
-            uint32_t i, temp_len
-            str key, value
-
-        # build metadata based on query info provided by ODPI-C
-        if dpiStmt_getQueryInfo(self._handle, pos + 1, &query_info) < 0:
-            _raise_from_odpi()
-        info = &query_info.typeInfo
-        metadata = OracleMetadata.__new__(OracleMetadata)
-        metadata.dbtype = DbType._from_num(info.oracleTypeNum)
-        if info.sizeInChars > 0:
-            metadata.max_size = info.sizeInChars
-        else:
-            metadata.max_size = info.clientSizeInBytes
-        metadata.buffer_size = info.clientSizeInBytes
-        metadata.name = query_info.name[:query_info.nameLength].decode()
-        metadata.scale = <int8_t> info.scale + info.fsPrecision
-        metadata.precision = <int8_t> info.precision
-        metadata.nulls_allowed = query_info.nullOk
-        metadata.is_json = info.isJson
-        metadata.is_oson = info.isOson
-        if info.domainSchema:
-            temp_len = info.domainSchemaLength
-            metadata.domain_schema = info.domainSchema[:temp_len].decode()
-        if info.domainName:
-            metadata.domain_name = \
-                    info.domainName[:info.domainNameLength].decode()
-        if info.numAnnotations > 0:
-            metadata.annotations = {}
-            for i in range(info.numAnnotations):
-                temp_len = info.annotations[i].keyLength
-                key = info.annotations[i].key[:temp_len].decode()
-                temp_len = info.annotations[i].valueLength
-                value = info.annotations[i].value[:temp_len].decode()
-                metadata.annotations[key] = value
-        if info.objectType != NULL:
-            typ_impl = ThickDbObjectTypeImpl._from_handle(self._conn_impl,
-                                                          info.objectType)
-            metadata.objtype = typ_impl
-        if metadata.dbtype.num == DPI_ORACLE_TYPE_VECTOR:
-            metadata.vector_dimensions = info.vectorDimensions
-            metadata.vector_format = info.vectorFormat
-            metadata.vector_flags = info.vectorFlags
-
-        # create variable and call define in ODPI-C
-        var_impl = <ThickVarImpl> self._create_fetch_var(
-            conn, cursor, type_handler, uses_metadata, pos, metadata
-        )
-        if dpiStmt_define(self._handle, pos + 1, var_impl._handle) < 0:
-            _raise_from_odpi()
-
-    cdef int _fetch_rows(self, object cursor) except -1:
-        """
-        Internal method for fetching rows from a cursor.
-        """
-        cdef:
-            uint32_t temp_buffer_row_index, num_rows_in_buffer
-            bint more_rows_to_fetch
-            ThickVarImpl var_impl
-            int status
-        with nogil:
-            status = dpiStmt_fetchRows(self._handle,
-                                       self._fetch_array_size,
-                                       &temp_buffer_row_index,
-                                       &num_rows_in_buffer,
-                                       &more_rows_to_fetch)
-        if status < 0:
-            _raise_from_odpi()
-        self._buffer_index = 0
-        self._buffer_rowcount = num_rows_in_buffer
-        self._more_rows_to_fetch = more_rows_to_fetch
-        if self.fetching_arrow:
-            self._populate_arrow_arrays()
-
-    cdef BaseConnImpl _get_conn_impl(self):
-        """
-        Internal method used to return the connection implementation associated
-        with the cursor implementation.
-        """
-        return self._conn_impl
-
-    cdef bint _is_plsql(self):
-        return <bint> self._stmt_info.isPLSQL
-
-    def _get_oci_attr(self, uint32_t attr_num, uint32_t attr_type):
-        """
-        Internal method for getting the value of an OCI attribute on the
-        cursor.
-        """
-        cdef:
-            dpiDataBuffer value
-            uint32_t value_len
-        if dpiStmt_getOciAttr(self._handle, attr_num, &value, &value_len) < 0:
-            _raise_from_odpi()
-        return _convert_oci_attr_to_python(attr_type, &value, value_len)
-
-    cdef int _perform_define(self, object cursor,
-                             uint32_t num_query_cols) except -1:
-        """
-        Internal method for performing defines. At this point it is assumed
-        that the statement executed was in fact a query.
-        """
-        cdef:
-            ThickCursorImpl cursor_impl = <ThickCursorImpl> cursor._impl
-            object var, type_handler, conn
-            ThickVarImpl var_impl
-            bint uses_metadata
-            ssize_t i
-
-        # initialize fetching variables; these are used to reduce the number of
-        # times that the GIL is released/acquired -- as there is a significant
-        # amount of overhead in doing so
-        self._buffer_rowcount = 0
-        self._more_rows_to_fetch = True
-
-        # if fetch variables already exist, nothing to do (the same statement
-        # is being executed and therefore all defines have already been
-        # performed
-        if self.fetch_vars is not None:
-            return 0
-
-        # populate list to contain fetch variables that are created
-        self._fetch_array_size = self.arraysize
-        self._init_fetch_vars(num_query_cols)
-        type_handler = self._get_output_type_handler(&uses_metadata)
-        conn = cursor.connection
-        for i in range(num_query_cols):
-            self._define_var(conn, cursor, type_handler, uses_metadata, i)
-
-    cdef int _prepare(self, str statement, str tag,
-                      bint cache_statement) except -1:
-        """
-        Internal method used for preparing statements for execution.
-        """
-        cdef:
-            uint32_t statement_bytes_length, tag_bytes_length = 0
-            ThickConnImpl conn_impl = self._conn_impl
-            bytes statement_bytes, tag_bytes
-            const char *tag_ptr = NULL
-            const char *statement_ptr
-            int status
-        BaseCursorImpl._prepare(self, statement, tag, cache_statement)
-        statement_bytes = statement.encode()
-        statement_ptr = <const char*> statement_bytes
-        statement_bytes_length = <uint32_t> len(statement_bytes)
-        if tag is not None:
-            self._tag = tag
-            tag_bytes = tag.encode()
-            tag_bytes_length = <uint32_t> len(tag_bytes)
-            tag_ptr = <const char*> tag_bytes
-        with nogil:
-            if self._handle != NULL:
-                dpiStmt_release(self._handle)
-                self._handle = NULL
-            status = dpiConn_prepareStmt(conn_impl._handle, self.scrollable,
-                                         statement_ptr, statement_bytes_length,
-                                         tag_ptr, tag_bytes_length,
-                                         &self._handle)
-            if status == DPI_SUCCESS and not cache_statement:
-                status = dpiStmt_deleteFromCache(self._handle)
-            if status == DPI_SUCCESS:
-                status = dpiStmt_getInfo(self._handle, &self._stmt_info)
-            if status == DPI_SUCCESS and self._stmt_info.isQuery:
-                status = dpiStmt_setFetchArraySize(self._handle,
-                                                   self.arraysize)
-                if status == DPI_SUCCESS \
-                        and self.prefetchrows != DPI_DEFAULT_PREFETCH_ROWS:
-                    status = dpiStmt_setPrefetchRows(self._handle,
-                                                     self.prefetchrows)
-        if status < 0:
-            _raise_from_odpi()
-
-    cdef int _populate_arrow_arrays(self) except -1:
-        """
-        Populate Arrow arrays with fetched data.
-        """
-        cdef:
-            ThickVarImpl var_impl
-            uint32_t i
-        for var_impl in self.fetch_var_impls:
-            for i in range(self._buffer_rowcount):
-                var_impl._transform_element_to_arrow(i)
-
-    def _set_oci_attr(self, uint32_t attr_num, uint32_t attr_type,
-                      object value):
-        """
-        Internal method for setting the value of an OCI attribute on the
-        cursor.
-        """
-        cdef:
-            StringBuffer str_buf = StringBuffer()
-            void *oci_value = NULL
-            dpiDataBuffer oci_buf
-            uint32_t oci_len = 0
-        _convert_python_to_oci_attr(value, attr_type, str_buf, &oci_buf,
-                                    &oci_value, &oci_len)
-        if dpiStmt_setOciAttr(self._handle, attr_num, oci_value, oci_len) < 0:
-            _raise_from_odpi()
-
-    cdef int _transform_binds(self) except -1:
-        cdef:
-            ThickVarImpl var_impl
-            uint32_t num_elements
-            BindVar bind_var
-        if self.bind_vars is not None:
-            for bind_var in self.bind_vars:
-                var_impl = <ThickVarImpl> bind_var.var_impl
-                if var_impl.is_array:
-                    if dpiVar_getNumElementsInArray(var_impl._handle,
-                                                    &num_elements) < 0:
-                        _raise_from_odpi()
-                    var_impl.num_elements_in_array = num_elements
-
-    def execute(self, cursor):
-        """
-        Internal method for executing a statement.
-        """
-        cdef:
-            uint32_t mode, num_query_cols
-            dpiErrorInfo error_info
-            uint64_t rowcount = 0
-            int status
-        if self.bind_vars is not None:
-            self._perform_binds(cursor.connection, 1)
-        if self._conn_impl.autocommit:
-            mode = DPI_MODE_EXEC_COMMIT_ON_SUCCESS
-        else:
-            mode = DPI_MODE_EXEC_DEFAULT
-        if self.suspend_on_success:
-            mode |= DPI_MODE_EXEC_SUSPEND_ON_SUCCESS
-        with nogil:
-            status = dpiStmt_execute(self._handle, mode, &num_query_cols)
-            if status == DPI_SUCCESS:
-                dpiContext_getError(driver_info.context, &error_info)
-                if not self._stmt_info.isPLSQL:
-                    status = dpiStmt_getRowCount(self._handle, &rowcount)
-        if status < 0:
-            _raise_from_odpi()
-        elif error_info.isWarning:
-            self.warning = _create_new_from_info(&error_info)
-        self.rowcount = rowcount
-        if num_query_cols > 0:
-            self._perform_define(cursor, num_query_cols)
-        elif self._stmt_info.isReturning or self._stmt_info.isPLSQL:
-            self._transform_binds()
-
-    def executemany(self, object cursor, uint32_t num_execs, bint batcherrors,
-                    bint arraydmlrowcounts, uint32_t offset=0):
-        """
-        Internal method for executing a statement multiple times.
-        """
-        cdef:
-            uint32_t mode, num_execs_int = num_execs
-            dpiErrorInfo error_info
-            uint64_t rowcount = 0
-            int status
-
-        if self._conn_impl.autocommit:
-            mode = DPI_MODE_EXEC_COMMIT_ON_SUCCESS
-        else:
-            mode = DPI_MODE_EXEC_DEFAULT
-        if arraydmlrowcounts:
-            mode |= DPI_MODE_EXEC_ARRAY_DML_ROWCOUNTS
-        if batcherrors:
-            mode |= DPI_MODE_EXEC_BATCH_ERRORS
-        if self.suspend_on_success:
-            mode |= DPI_MODE_EXEC_SUSPEND_ON_SUCCESS
-
-        if self.bind_vars is not None:
-            self._perform_binds(cursor.connection, num_execs_int)
-
-        with nogil:
-            status = dpiStmt_executeMany(self._handle, mode, num_execs_int)
-            dpiContext_getError(driver_info.context, &error_info)
-            dpiStmt_getRowCount(self._handle, &rowcount)
-        if not self._stmt_info.isPLSQL:
-            self.rowcount = rowcount
-        if status < 0:
-            error = _create_new_from_info(&error_info)
-            if self._stmt_info.isPLSQL and error_info.offset == 0:
-                error.offset = rowcount
-            raise error.exc_type(error)
-        elif error_info.isWarning:
-            self.warning = _create_new_from_info(&error_info)
-        if self._stmt_info.isReturning or self._stmt_info.isPLSQL:
-            self._transform_binds()
-
-    def get_array_dml_row_counts(self):
-        """
-        Internal method for returning a list of array DML row counts for the
-        last operation executed.
-        """
-        cdef:
-            uint32_t num_row_count, i
-            uint64_t *rowcount
-            int status
-
-        status = dpiStmt_getRowCounts(self._handle, &num_row_count, &rowcount)
-        if status < 0:
-            _raise_from_odpi()
-
-        result = []
-        for i in range(num_row_count):
-            result.append(rowcount[i])
-        return result
-
-    def get_batch_errors(self):
-        """
-        Internal method for returning a list of batch errors.
-        """
-        cdef:
-            uint32_t num_errors, i
-            dpiErrorInfo *errors
-
-        if dpiStmt_getBatchErrorCount(self._handle, &num_errors) < 0:
-            _raise_from_odpi()
-        if num_errors == 0:
-            return []
-
-        errors = <dpiErrorInfo*> \
-                cpython.PyMem_Malloc(num_errors * sizeof(dpiErrorInfo))
-
-        try:
-            if dpiStmt_getBatchErrors(self._handle, num_errors, errors) < 0:
-                _raise_from_odpi()
-            result = cpython.PyList_New(num_errors)
-            for i in range(num_errors):
-                error = _create_new_from_info(&errors[i])
-                cpython.Py_INCREF(error)
-                cpython.PyList_SET_ITEM(result, i, error)
-        finally:
-            cpython.PyMem_Free(errors)
-
-        return result
-
-    def get_bind_names(self):
-        cdef:
-            uint32_t *name_lengths = NULL
-            const char **names = NULL
-            uint32_t num_binds, i
-            ssize_t num_bytes
-            list result
-        if dpiStmt_getBindCount(self._handle, &num_binds) < 0:
-            _raise_from_odpi()
-        if num_binds == 0:
-            return []
-        try:
-            num_bytes = num_binds * sizeof(char*)
-            names = <const char**> cpython.PyMem_Malloc(num_bytes)
-            num_bytes = num_binds * sizeof(uint32_t)
-            name_lengths = <uint32_t*> cpython.PyMem_Malloc(num_bytes)
-            if dpiStmt_getBindNames(self._handle, &num_binds, names,
-                                    name_lengths) < 0:
-                _raise_from_odpi()
-            result = [None] * num_binds
-            for i in range(num_binds):
-                result[i] = names[i][:name_lengths[i]].decode()
-            return result
-        finally:
-            if names:
-                cpython.PyMem_Free(names)
-            if name_lengths:
-                cpython.PyMem_Free(name_lengths)
-
-    def get_implicit_results(self, connection):
-        cdef:
-            ThickCursorImpl child_cursor_impl
-            object child_cursor
-            dpiStmt *child_stmt
-            list result = []
-        if self._handle == NULL:
-            errors._raise_err(errors.ERR_NO_STATEMENT_EXECUTED)
-        while True:
-            if dpiStmt_getImplicitResult(self._handle, &child_stmt) < 0:
-                _raise_from_odpi()
-            if child_stmt == NULL:
-                break
-            child_cursor = connection.cursor()
-            child_cursor_impl = child_cursor._impl
-            child_cursor_impl._handle = child_stmt
-            child_cursor_impl._fixup_ref_cursor = True
-            child_cursor_impl._is_implicit_cursor = True
-            result.append(child_cursor)
-        return result
-
-    def get_lastrowid(self):
-        """
-        Internal method for returning the rowid of the row that was last
-        modified by an operation.
-        """
-        cdef:
-            uint32_t rowid_length
-            const char *rowid_ptr
-            dpiRowid *rowid
-        if self._handle is not NULL:
-            if dpiStmt_getLastRowid(self._handle, &rowid) < 0:
-                _raise_from_odpi()
-            if rowid:
-                if dpiRowid_getStringValue(rowid, &rowid_ptr,
-                                           &rowid_length) < 0:
-                    _raise_from_odpi()
-                return rowid_ptr[:rowid_length].decode()
-
-    def is_query(self, cursor):
-        cdef uint32_t num_query_cols
-        if self._fixup_ref_cursor:
-            self._fetch_array_size = self.arraysize
-            if dpiStmt_setFetchArraySize(self._handle,
-                                         self._fetch_array_size) < 0:
-                _raise_from_odpi()
-            if dpiStmt_getNumQueryColumns(self._handle, &num_query_cols) < 0:
-                _raise_from_odpi()
-            self._perform_define(cursor, num_query_cols)
-            self._fixup_ref_cursor = False
-        return self.fetch_vars is not None
-
-    def parse(self, cursor):
-        """
-        Internal method for parsing a statement.
-        """
-        cdef:
-            uint32_t mode, num_query_cols
-            int status
-        if self._stmt_info.isQuery:
-            mode = DPI_MODE_EXEC_DESCRIBE_ONLY
-        else:
-            mode = DPI_MODE_EXEC_PARSE_ONLY
-        with nogil:
-            status = dpiStmt_execute(self._handle, mode, &num_query_cols)
-        if status < 0:
-            _raise_from_odpi()
-        if num_query_cols > 0:
-            self._perform_define(cursor, num_query_cols)
-
-    def scroll(self, object cursor, int32_t offset, object mode):
-        cdef:
-            uint32_t temp_buffer_row_index = 0, num_rows_in_buffer = 0
-            bint more_rows_to_fetch = False
-            ThickVarImpl var_impl
-            uint32_t int_mode = 0
-            int status
-        if mode == "relative":
-            int_mode = DPI_MODE_FETCH_RELATIVE
-        elif mode == "absolute":
-            int_mode = DPI_MODE_FETCH_ABSOLUTE
-        elif mode == "first":
-            int_mode = DPI_MODE_FETCH_FIRST
-        elif mode == "last":
-            int_mode = DPI_MODE_FETCH_LAST
-        else:
-            errors._raise_err(errors.ERR_WRONG_SCROLL_MODE)
-        with nogil:
-            status = dpiStmt_scroll(self._handle, int_mode, offset,
-                                    0 - self._buffer_rowcount)
-            if status == 0:
-                status = dpiStmt_fetchRows(self._handle,
-                                           self._fetch_array_size,
-                                           &temp_buffer_row_index,
-                                           &num_rows_in_buffer,
-                                           &more_rows_to_fetch)
-            if status == 0:
-                status = dpiStmt_getRowCount(self._handle, &self.rowcount)
-        if status < 0:
-            _raise_from_odpi()
-        self._buffer_index = temp_buffer_row_index
-        self._buffer_rowcount = num_rows_in_buffer
-        self._more_rows_to_fetch = more_rows_to_fetch
-        self.rowcount -= num_rows_in_buffer
diff --git a/src/oracledb/impl/thick/dbobject.pyx b/src/oracledb/impl/thick/dbobject.pyx
deleted file mode 100644
index fe752a54..00000000
--- a/src/oracledb/impl/thick/dbobject.pyx
+++ /dev/null
@@ -1,369 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# dbobject.pyx
-#
-# Cython file defining the thick DbObjectType, DbObjectAttr and DbObject
-# implementation classes (embedded in thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThickDbObjectImpl(BaseDbObjectImpl):
-    cdef:
-        dpiObject *_handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiObject_release(self._handle)
-
-    cdef int _convert_from_python(self, object value, OracleMetadata metadata,
-                                  dpiData *data, StringBuffer buf):
-        """
-        Internal method for converting a value from Python to the value
-        required by ODPI-C.
-        """
-        if value is None:
-            data.isNull = 1
-        else:
-            data.isNull = 0
-            _convert_from_python(value, metadata, &data.value, buf)
-
-    def append_checked(self, object value):
-        """
-        Internal method for appending a value to a collection object.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            ThickDbObjectTypeImpl objtype
-            dpiData data
-        objtype = <ThickDbObjectTypeImpl> self.type
-        self._convert_from_python(value, objtype.element_metadata, &data, buf)
-        if dpiObject_appendElement(self._handle,
-                                   objtype.element_metadata.dbtype._native_num,
-                                   &data) < 0:
-            _raise_from_odpi()
-
-    def copy(self):
-        """
-        Internal method for creating a copy of an object.
-        """
-        cdef ThickDbObjectImpl copied_impl
-        copied_impl = ThickDbObjectImpl.__new__(ThickDbObjectImpl)
-        if dpiObject_copy(self._handle, &copied_impl._handle) < 0:
-            _raise_from_odpi()
-        copied_impl.type = self.type
-        return copied_impl
-
-    def delete_by_index(self, int32_t index):
-        """
-        Internal method for deleting an entry from a collection that is indexed
-        by integers.
-        """
-        if dpiObject_deleteElementByIndex(self._handle, index) < 0:
-            _raise_from_odpi()
-
-    def exists_by_index(self, int32_t index):
-        """
-        Internal method for determining if an entry exists in a collection that
-        is indexed by integers.
-        """
-        cdef bint exists
-        if dpiObject_getElementExistsByIndex(self._handle, index, &exists) < 0:
-            _raise_from_odpi()
-        return exists
-
-    def get_attr_value(self, ThickDbObjectAttrImpl attr):
-        """
-        Internal method for getting an attribute value.
-        """
-        cdef:
-            char number_as_string_buffer[200]
-            ThickDbObjectTypeImpl type_impl
-            dpiData data
-        if attr.dbtype._native_num == DPI_NATIVE_TYPE_BYTES \
-                and attr.dbtype.num == DPI_ORACLE_TYPE_NUMBER:
-            data.value.asBytes.ptr = number_as_string_buffer
-            data.value.asBytes.length = sizeof(number_as_string_buffer)
-            data.value.asBytes.encoding = NULL
-        if dpiObject_getAttributeValue(self._handle, attr._handle,
-                                       attr.dbtype._native_num, &data) < 0:
-            _raise_from_odpi()
-        if data.isNull:
-            return None
-        type_impl = self.type
-        try:
-            return _convert_to_python(type_impl._conn_impl, attr, &data.value)
-        finally:
-            if attr.objtype is not None:
-                dpiObject_release(data.value.asObject)
-
-    def get_element_by_index(self, int32_t index):
-        """
-        Internal method for getting an entry from a collection that is indexed
-        by integers.
-        """
-        cdef:
-            char number_as_string_buffer[200]
-            ThickDbObjectTypeImpl objtype
-            DbType dbtype
-            dpiData data
-        objtype = self.type
-        dbtype = objtype.element_metadata.dbtype
-        if dbtype._native_num == DPI_NATIVE_TYPE_BYTES \
-                and dbtype.num == DPI_ORACLE_TYPE_NUMBER:
-            data.value.asBytes.ptr = number_as_string_buffer
-            data.value.asBytes.length = sizeof(number_as_string_buffer)
-            data.value.asBytes.encoding = NULL
-        if dpiObject_getElementValueByIndex(self._handle, index,
-                                            dbtype._native_num, &data) < 0:
-            _raise_from_odpi()
-        if data.isNull:
-            return None
-        try:
-            return _convert_to_python(objtype._conn_impl,
-                                      objtype.element_metadata, &data.value)
-        finally:
-            if objtype.element_metadata.objtype is not None:
-                dpiObject_release(data.value.asObject)
-
-    def get_first_index(self):
-        """
-        Internal method for getting the first index from a collection that is
-        indexed by integers.
-        """
-        cdef:
-            int32_t index
-            bint exists
-        if dpiObject_getFirstIndex(self._handle, &index, &exists) < 0:
-            _raise_from_odpi()
-        if exists:
-            return index
-
-    def get_last_index(self):
-        """
-        Internal method for getting the last index from a collection that is
-        indexed by integers.
-        """
-        cdef:
-            int32_t index
-            bint exists
-        if dpiObject_getLastIndex(self._handle, &index, &exists) < 0:
-            _raise_from_odpi()
-        if exists:
-            return index
-
-    def get_next_index(self, int32_t index):
-        """
-        Internal method for getting the next index from a collection that is
-        indexed by integers.
-        """
-        cdef:
-            int32_t next_index
-            bint exists
-        if dpiObject_getNextIndex(self._handle, index, &next_index,
-                                  &exists) < 0:
-            _raise_from_odpi()
-        if exists:
-            return next_index
-
-    def get_prev_index(self, int32_t index):
-        """
-        Internal method for getting the next index from a collection that is
-        indexed by integers.
-        """
-        cdef:
-            int32_t prev_index
-            bint exists
-        if dpiObject_getPrevIndex(self._handle, index, &prev_index,
-                                  &exists) < 0:
-            _raise_from_odpi()
-        if exists:
-            return prev_index
-
-    def get_size(self):
-        """
-        Internal method for getting the size of a collection.
-        """
-        cdef int32_t size
-        if dpiObject_getSize(self._handle, &size) < 0:
-            _raise_from_odpi()
-        return size
-
-    def set_attr_value_checked(self, ThickDbObjectAttrImpl attr, object value):
-        """
-        Internal method for setting an attribute value.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            uint32_t native_type_num
-            dpiData data
-        self._convert_from_python(value, attr, &data, buf)
-        native_type_num = attr.dbtype._native_num
-        if native_type_num == DPI_NATIVE_TYPE_LOB \
-                and not isinstance(value, PY_TYPE_LOB):
-            native_type_num = DPI_NATIVE_TYPE_BYTES
-        if dpiObject_setAttributeValue(self._handle, attr._handle,
-                                       native_type_num, &data) < 0:
-            _raise_from_odpi()
-
-    def set_element_by_index_checked(self, int32_t index, object value):
-        """
-        Internal method for setting an entry in a collection that is indexed by
-        integers.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            ThickDbObjectTypeImpl objtype
-            uint32_t native_type_num
-            dpiData data
-        objtype = self.type
-        self._convert_from_python(value, objtype.element_metadata, &data, buf)
-        native_type_num = objtype.element_metadata.dbtype._native_num
-        if native_type_num == DPI_NATIVE_TYPE_LOB \
-                and not isinstance(value, PY_TYPE_LOB):
-            native_typeNum = DPI_NATIVE_TYPE_BYTES
-        if dpiObject_setElementValueByIndex(self._handle, index,
-                                            native_type_num, &data) < 0:
-            _raise_from_odpi()
-
-    def trim(self, int32_t num_to_trim):
-        """
-        Internal method for trimming a number of entries from a collection.
-        """
-        if dpiObject_trim(self._handle, num_to_trim) < 0:
-            _raise_from_odpi()
-
-
-cdef class ThickDbObjectAttrImpl(BaseDbObjectAttrImpl):
-    cdef:
-        dpiObjectAttr *_handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiObjectAttr_release(self._handle)
-
-    @staticmethod
-    cdef ThickDbObjectAttrImpl _from_handle(ThickConnImpl conn_impl,
-                                            dpiObjectAttr *handle):
-        """
-        Create a new DbObjectAttr implementation object given an ODPI-C handle.
-        """
-        cdef:
-            ThickDbObjectAttrImpl impl
-            dpiObjectType *typ_handle
-            dpiObjectAttrInfo info
-        impl = ThickDbObjectAttrImpl.__new__(ThickDbObjectAttrImpl)
-        impl._handle = handle
-        if dpiObjectAttr_getInfo(handle, &info) < 0:
-            _raise_from_odpi()
-        impl.name = info.name[:info.nameLength].decode()
-        impl.dbtype = DbType._from_num(info.typeInfo.oracleTypeNum)
-        impl.precision = <int8_t> info.typeInfo.precision
-        impl.scale = <int8_t> info.typeInfo.scale
-        impl.max_size = info.typeInfo.dbSizeInBytes
-        if info.typeInfo.objectType:
-            typ_handle = info.typeInfo.objectType
-            impl.objtype = ThickDbObjectTypeImpl._from_handle(conn_impl,
-                                                              typ_handle)
-        impl._finalize_init()
-        return impl
-
-
-cdef class ThickDbObjectTypeImpl(BaseDbObjectTypeImpl):
-    cdef:
-        dpiObjectType *_handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiObjectType_release(self._handle)
-
-    @staticmethod
-    cdef ThickDbObjectTypeImpl _from_handle(ThickConnImpl conn_impl,
-                                            dpiObjectType *handle):
-        """
-        Create a new DbObjectType implementation object given an ODPI-C handle.
-        """
-        cdef:
-            dpiObjectAttr **attributes = NULL
-            ThickDbObjectAttrImpl attr_impl
-            ThickDbObjectTypeImpl impl
-            OracleMetadata metadata
-            dpiObjectTypeInfo info
-            ssize_t num_bytes
-            uint16_t i
-            object typ
-        impl = ThickDbObjectTypeImpl.__new__(ThickDbObjectTypeImpl)
-        if dpiObjectType_addRef(handle) < 0:
-            _raise_from_odpi()
-        impl._conn_impl = conn_impl
-        impl._handle = handle
-        if dpiObjectType_getInfo(impl._handle, &info) < 0:
-            _raise_from_odpi()
-        impl.schema = info.schema[:info.schemaLength].decode()
-        impl.name = info.name[:info.nameLength].decode()
-        if info.packageNameLength > 0:
-            impl.package_name = \
-                    info.packageName[:info.packageNameLength].decode()
-        impl.is_collection = info.isCollection
-        if impl.is_collection:
-            metadata = OracleMetadata.__new__(OracleMetadata)
-            impl.element_metadata = metadata
-            metadata.dbtype = \
-                    DbType._from_num(info.elementTypeInfo.oracleTypeNum)
-            metadata.precision = <int8_t> info.elementTypeInfo.precision
-            metadata.scale = <int8_t> info.elementTypeInfo.scale
-            metadata.max_size = info.elementTypeInfo.dbSizeInBytes
-            if info.elementTypeInfo.objectType != NULL:
-                handle = info.elementTypeInfo.objectType
-                metadata.objtype = \
-                        ThickDbObjectTypeImpl._from_handle(conn_impl, handle)
-            metadata._finalize_init()
-        impl.attrs_by_name = {}
-        impl.attrs = [None] * info.numAttributes
-        try:
-            num_bytes = info.numAttributes * sizeof(dpiObjectAttr*)
-            attributes = <dpiObjectAttr**> cpython.PyMem_Malloc(num_bytes)
-            if dpiObjectType_getAttributes(impl._handle, info.numAttributes,
-                                           attributes) < 0:
-                _raise_from_odpi()
-            for i in range(info.numAttributes):
-                attr_impl = ThickDbObjectAttrImpl._from_handle(conn_impl,
-                                                               attributes[i])
-                impl.attrs[i] = attr_impl
-                impl.attrs_by_name[attr_impl.name] = attr_impl
-        finally:
-            if attributes != NULL:
-                cpython.PyMem_Free(attributes)
-        return impl
-
-    def create_new_object(self):
-        """
-        Internal method for creating a new object.
-        """
-        cdef ThickDbObjectImpl obj_impl
-        obj_impl = ThickDbObjectImpl.__new__(ThickDbObjectImpl)
-        obj_impl.type = self
-        if dpiObjectType_createObject(self._handle, &obj_impl._handle) < 0:
-            _raise_from_odpi()
-        return obj_impl
diff --git a/src/oracledb/impl/thick/json.pyx b/src/oracledb/impl/thick/json.pyx
deleted file mode 100644
index b89582b7..00000000
--- a/src/oracledb/impl/thick/json.pyx
+++ /dev/null
@@ -1,218 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# json.pyx
-#
-# Cython file defining methods and classes used for processing JSON data
-# (embedded in thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class JsonBuffer:
-    cdef:
-        dpiJsonNode _top_node
-        dpiDataBuffer _top_node_buf
-        list _buffers
-
-    def __dealloc__(self):
-        _free_node(&self._top_node)
-
-    cdef int _add_buf(self, object value, char **ptr,
-                      uint32_t *length) except -1:
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value)
-        if self._buffers is None:
-            self._buffers = []
-        self._buffers.append(buf)
-        ptr[0] = buf.ptr
-        length[0] = buf.length
-
-    cdef int _populate_array_node(self, dpiJsonNode *node,
-                                  list value) except -1:
-        cdef:
-            dpiJsonArray *array
-            object child_value
-            uint32_t i
-        node.oracleTypeNum = DPI_ORACLE_TYPE_JSON_ARRAY
-        node.nativeTypeNum = DPI_NATIVE_TYPE_JSON_ARRAY
-        array = &node.value.asJsonArray
-        array.numElements = <uint32_t> len(value)
-        array.elements = <dpiJsonNode*> _calloc(array.numElements,
-                                                sizeof(dpiJsonNode))
-        array.elementValues = <dpiDataBuffer*> _calloc(array.numElements,
-                                                       sizeof(dpiDataBuffer))
-        for i, child_value in enumerate(value):
-            array.elements[i].value = &array.elementValues[i]
-            self._populate_node(&array.elements[i], child_value)
-
-    cdef int _populate_obj_node(self, dpiJsonNode *node, dict value) except -1:
-        cdef:
-            object child_key, child_value
-            dpiJsonObject *obj
-            uint32_t i
-        node.oracleTypeNum = DPI_ORACLE_TYPE_JSON_OBJECT
-        node.nativeTypeNum = DPI_NATIVE_TYPE_JSON_OBJECT
-        obj = &node.value.asJsonObject
-        obj.numFields = <uint32_t> len(value)
-        obj.fieldNames = <char**> _calloc(obj.numFields, sizeof(char*))
-        obj.fieldNameLengths = <uint32_t*> _calloc(obj.numFields,
-                                                   sizeof(uint32_t))
-        obj.fields = <dpiJsonNode*> _calloc(obj.numFields, sizeof(dpiJsonNode))
-        obj.fieldValues = <dpiDataBuffer*> _calloc(obj.numFields,
-                                                   sizeof(dpiDataBuffer))
-        i = 0
-        for child_key, child_value in value.items():
-            obj.fields[i].value = &obj.fieldValues[i]
-            self._add_buf(child_key, &obj.fieldNames[i],
-                          &obj.fieldNameLengths[i])
-            self._populate_node(&obj.fields[i], child_value)
-            i += 1
-
-    cdef int _populate_node(self, dpiJsonNode *node, object value) except -1:
-        cdef:
-            VectorEncoder vector_encoder
-            dpiTimestamp *timestamp
-            dpiIntervalDS *interval
-            int seconds
-        if value is None:
-            node.oracleTypeNum = DPI_ORACLE_TYPE_NONE
-            node.nativeTypeNum = DPI_NATIVE_TYPE_NULL
-        elif isinstance(value, list):
-            self._populate_array_node(node, value)
-        elif isinstance(value, dict):
-            self._populate_obj_node(node, value)
-        elif isinstance(value, str):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_VARCHAR
-            node.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            self._add_buf(value, &node.value.asBytes.ptr,
-                          &node.value.asBytes.length)
-        elif isinstance(value, bytes):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_JSON_ID \
-                    if isinstance(value, PY_TYPE_JSON_ID) \
-                    else DPI_ORACLE_TYPE_RAW
-            node.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            self._add_buf(value, &node.value.asBytes.ptr,
-                          &node.value.asBytes.length)
-        elif isinstance(value, bool):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_BOOLEAN
-            node.nativeTypeNum = DPI_NATIVE_TYPE_BOOLEAN
-            node.value.asBoolean = <bint> value
-        elif isinstance(value, (int, PY_TYPE_DECIMAL)):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_NUMBER
-            node.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            self._add_buf(str(value), &node.value.asBytes.ptr,
-                          &node.value.asBytes.length)
-        elif isinstance(value, float):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_NUMBER
-            node.nativeTypeNum = DPI_NATIVE_TYPE_DOUBLE
-            node.value.asDouble = <double> value
-        elif isinstance(value, PY_TYPE_DATETIME):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_TIMESTAMP
-            node.nativeTypeNum = DPI_NATIVE_TYPE_TIMESTAMP
-            memset(&node.value.asTimestamp, 0, sizeof(node.value.asTimestamp))
-            timestamp = &node.value.asTimestamp
-            timestamp.year = cydatetime.datetime_year(value)
-            timestamp.month = cydatetime.datetime_month(value)
-            timestamp.day = cydatetime.datetime_day(value)
-            timestamp.hour = cydatetime.datetime_hour(value)
-            timestamp.minute = cydatetime.datetime_minute(value)
-            timestamp.second = cydatetime.datetime_second(value)
-            timestamp.fsecond = cydatetime.datetime_microsecond(value) * 1000
-        elif isinstance(value, PY_TYPE_DATE):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_DATE
-            node.nativeTypeNum = DPI_NATIVE_TYPE_TIMESTAMP
-            memset(&node.value.asTimestamp, 0, sizeof(node.value.asTimestamp))
-            timestamp = &node.value.asTimestamp
-            timestamp = &node.value.asTimestamp
-            timestamp.year = cydatetime.date_year(value)
-            timestamp.month = cydatetime.date_month(value)
-            timestamp.day = cydatetime.date_day(value)
-        elif isinstance(value, datetime.timedelta):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_INTERVAL_DS
-            node.nativeTypeNum = DPI_NATIVE_TYPE_INTERVAL_DS
-            interval = &node.value.asIntervalDS
-            seconds = cydatetime.timedelta_seconds(value)
-            interval.days = cydatetime.timedelta_days(value)
-            interval.hours = seconds // 3600
-            seconds = seconds % 3600
-            interval.minutes = seconds // 60
-            interval.seconds = seconds % 60
-            interval.fseconds = cydatetime.timedelta_microseconds(value) * 1000
-        elif isinstance(value, array.array):
-            node.oracleTypeNum = DPI_ORACLE_TYPE_VECTOR
-            node.nativeTypeNum = DPI_NATIVE_TYPE_BYTES
-            vector_encoder = VectorEncoder.__new__(VectorEncoder)
-            vector_encoder.encode(value)
-            self._add_buf(vector_encoder._data[:vector_encoder._pos],
-                          &node.value.asBytes.ptr, &node.value.asBytes.length)
-        else:
-            errors._raise_err(errors.ERR_PYTHON_TYPE_NOT_SUPPORTED,
-                              typ=type(value))
-
-    cdef int from_object(self, object value) except -1:
-        self._top_node.value = &self._top_node_buf
-        self._populate_node(&self._top_node, value)
-
-
-cdef void* _calloc(size_t num_elements, size_t size) except NULL:
-    cdef:
-        size_t num_bytes = num_elements * size
-        void *ptr
-    ptr = cpython.PyMem_Malloc(num_bytes)
-    memset(ptr, 0, num_bytes)
-    return ptr
-
-cdef void _free_node(dpiJsonNode *node):
-    cdef:
-        dpiJsonArray *array
-        dpiJsonObject *obj
-        uint32_t i
-    if node.nativeTypeNum == DPI_NATIVE_TYPE_JSON_ARRAY:
-        array = &node.value.asJsonArray
-        if array.elements != NULL:
-            for i in range(array.numElements):
-                if array.elements[i].value != NULL:
-                    _free_node(&array.elements[i])
-            cpython.PyMem_Free(array.elements)
-            array.elements = NULL
-        if array.elementValues != NULL:
-            cpython.PyMem_Free(array.elementValues)
-            array.elementValues = NULL
-    elif node.nativeTypeNum == DPI_NATIVE_TYPE_JSON_OBJECT:
-        obj = &node.value.asJsonObject
-        if obj.fields != NULL:
-            for i in range(obj.numFields):
-                if obj.fields[i].value != NULL:
-                    _free_node(&obj.fields[i])
-            cpython.PyMem_Free(obj.fields)
-            obj.fields = NULL
-        if obj.fieldNames != NULL:
-            cpython.PyMem_Free(obj.fieldNames)
-            obj.fieldNames = NULL
-        if obj.fieldNameLengths != NULL:
-            cpython.PyMem_Free(obj.fieldNameLengths)
-            obj.fieldNameLengths = NULL
-        if obj.fieldValues != NULL:
-            cpython.PyMem_Free(obj.fieldValues)
-            obj.fieldValues = NULL
diff --git a/src/oracledb/impl/thick/lob.pyx b/src/oracledb/impl/thick/lob.pyx
deleted file mode 100644
index 9b6145f1..00000000
--- a/src/oracledb/impl/thick/lob.pyx
+++ /dev/null
@@ -1,224 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# lob.pyx
-#
-# Cython file defining the thick Lob implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThickLobImpl(BaseLobImpl):
-    cdef:
-        dpiLob *_handle
-
-    @staticmethod
-    cdef ThickLobImpl _create(ThickConnImpl conn_impl, DbType dbtype,
-                             dpiLob *handle):
-        cdef:
-            ThickLobImpl impl = ThickLobImpl.__new__(ThickLobImpl)
-            int status
-        impl.dbtype = dbtype
-        if handle == NULL:
-            with nogil:
-                status = dpiConn_newTempLob(conn_impl._handle, dbtype.num,
-                                            &handle)
-            if status < 0:
-                _raise_from_odpi()
-        elif dpiLob_addRef(handle) < 0:
-            _raise_from_odpi()
-        impl._handle = handle
-        return impl
-
-    def close(self):
-        """
-        Internal method for closing a LOB that was opened earlier.
-        """
-        cdef int status
-        with nogil:
-            status = dpiLob_closeResource(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def file_exists(self):
-        """
-        Internal method for returning whether the file referenced by a BFILE
-        exists.
-        """
-        cdef:
-            bint exists
-            int status
-        with nogil:
-            status = dpiLob_getFileExists(self._handle, &exists)
-        if status < 0:
-            _raise_from_odpi()
-        return exists
-
-    def free_lob(self):
-        """
-        Internal method for releasing the handle
-        """
-        if self._handle != NULL:
-            dpiLob_release(self._handle)
-
-    def get_chunk_size(self):
-        """
-        Internal method for returning the chunk size of the LOB.
-        """
-        cdef uint32_t chunk_size
-        if dpiLob_getChunkSize(self._handle, &chunk_size) < 0:
-            _raise_from_odpi()
-        return chunk_size
-
-    def get_file_name(self):
-        """
-        Internal method for returning a 2-tuple constaining the directory alias
-        and file name of a BFILE type LOB.
-        """
-        cdef:
-            uint32_t dir_alias_len, file_name_len
-            const char *dir_alias
-            const char *file_name
-            int status
-        with nogil:
-            status = dpiLob_getDirectoryAndFileName(self._handle, &dir_alias,
-                                                    &dir_alias_len,
-                                                    &file_name, &file_name_len)
-        if status < 0:
-            _raise_from_odpi()
-        return (dir_alias[:dir_alias_len].decode(),
-                file_name[:file_name_len].decode())
-
-    def get_is_open(self):
-        """
-        Internal method for returning whether the LOB is open or not.
-        """
-        cdef:
-            bint is_open
-            int status
-        with nogil:
-            status = dpiLob_getIsResourceOpen(self._handle, &is_open)
-        if status < 0:
-            _raise_from_odpi()
-        return is_open
-
-    def get_max_amount(self):
-        """
-        Internal method for returning the maximum amount that can be read.
-        """
-        return self.get_size()
-
-    def get_size(self):
-        """
-        Internal method for returning the size of a LOB.
-        """
-        cdef uint64_t size
-        if dpiLob_getSize(self._handle, &size) < 0:
-            _raise_from_odpi()
-        return size
-
-    def open(self):
-        """
-        Internal method for opening a LOB.
-        """
-        cdef int status
-        with nogil:
-            status = dpiLob_openResource(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def read(self, uint64_t offset, uint64_t amount):
-        """
-        Internal method for reading a portion (or all) of the data in the LOB.
-        """
-        cdef:
-            uint64_t buf_size
-            object result
-            char *buf
-            int status
-        if dpiLob_getBufferSize(self._handle, amount, &buf_size) < 0:
-            _raise_from_odpi()
-        buf = <char*> cpython.PyMem_Malloc(buf_size)
-        with nogil:
-            status = dpiLob_readBytes(self._handle, offset, amount, buf,
-                                      &buf_size)
-        try:
-            if status < 0:
-                _raise_from_odpi()
-            result = buf[:buf_size]
-            if self.dbtype.num == DPI_ORACLE_TYPE_CLOB \
-                    or self.dbtype.num == DPI_ORACLE_TYPE_NCLOB:
-                result = result.decode()
-            return result
-        finally:
-            cpython.PyMem_Free(buf)
-
-    def set_file_name(self, str dir_alias, str name):
-        """
-        Internal method for setting the directory alias and file name
-        associated with a BFILE LOB.
-        """
-        cdef:
-            bytes dir_alias_bytes, name_bytes
-            uint32_t dir_alias_len, name_len
-            const char *dir_alias_ptr
-            const char *name_ptr
-            int status
-        dir_alias_bytes = dir_alias.encode()
-        dir_alias_ptr = dir_alias_bytes
-        dir_alias_len = <uint32_t> len(dir_alias_bytes)
-        name_bytes = name.encode()
-        name_ptr = name_bytes
-        name_len = <uint32_t> len(name_bytes)
-        with nogil:
-            status = dpiLob_setDirectoryAndFileName(self._handle,
-                                                    dir_alias_ptr,
-                                                    dir_alias_len,
-                                                    name_ptr, name_len)
-        if status < 0:
-            _raise_from_odpi()
-
-    def trim(self, uint64_t new_size):
-        """
-        Internal method for trimming the data in the LOB to the new size
-        """
-        cdef int status
-        with nogil:
-            status = dpiLob_trim(self._handle, new_size)
-        if status < 0:
-            _raise_from_odpi()
-
-    def write(self, object value, uint64_t offset):
-        """
-        Internal method for writing data to the LOB object.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            int status
-        buf.set_value(value)
-        with nogil:
-            status = dpiLob_writeBytes(self._handle, offset, buf.ptr,
-                                       buf.length)
-        if status < 0:
-            _raise_from_odpi()
diff --git a/src/oracledb/impl/thick/odpi b/src/oracledb/impl/thick/odpi
deleted file mode 160000
index 27928bc2..00000000
--- a/src/oracledb/impl/thick/odpi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27928bc299c7d132008406fa86c0982e1481f4ff
diff --git a/src/oracledb/impl/thick/odpi.pxd b/src/oracledb/impl/thick/odpi.pxd
deleted file mode 100644
index 0f23a9e7..00000000
--- a/src/oracledb/impl/thick/odpi.pxd
+++ /dev/null
@@ -1,1324 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# odpi.pxd
-#
-# Cython definition file for the constants, functions and structures found in
-# ODPI-C used by the thick implementation classes (embedded in thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
-
-cdef enum:
-    PYO_OCI_ATTR_TYPE_STRING = 1
-    PYO_OCI_ATTR_TYPE_BOOLEAN = 2
-    PYO_OCI_ATTR_TYPE_UINT8 = 8
-    PYO_OCI_ATTR_TYPE_UINT16 = 16
-    PYO_OCI_ATTR_TYPE_UINT32 = 32
-    PYO_OCI_ATTR_TYPE_UINT64 = 64
-
-cdef extern from "impl/thick/odpi/embed/dpi.c":
-
-    # version constants
-    unsigned int DPI_MAJOR_VERSION
-    unsigned int DPI_MINOR_VERSION
-
-    # success/failure constants
-    int DPI_SUCCESS
-    int DPI_FAILURE
-
-    # defaults
-    enum:
-        DPI_DEFAULT_PREFETCH_ROWS
-
-    # execution modes
-    enum:
-        DPI_MODE_EXEC_ARRAY_DML_ROWCOUNTS
-        DPI_MODE_EXEC_BATCH_ERRORS
-        DPI_MODE_EXEC_COMMIT_ON_SUCCESS
-        DPI_MODE_EXEC_DEFAULT
-        DPI_MODE_EXEC_DESCRIBE_ONLY
-        DPI_MODE_EXEC_PARSE_ONLY
-        DPI_MODE_EXEC_SUSPEND_ON_SUCCESS
-
-    # connection/pool creation modes
-    enum:
-        DPI_MODE_CREATE_DEFAULT
-        DPI_MODE_CREATE_THREADED
-        DPI_MODE_CREATE_EVENTS
-
-    # connection close modes
-    enum:
-        DPI_MODE_CONN_CLOSE_DEFAULT
-        DPI_MODE_CONN_CLOSE_DROP
-        DPI_MODE_CONN_CLOSE_RETAG
-
-    # pool close modes
-    enum:
-        DPI_MODE_POOL_CLOSE_DEFAULT
-        DPI_MODE_POOL_CLOSE_FORCE
-
-    # native types
-    enum:
-        DPI_NATIVE_TYPE_BOOLEAN
-        DPI_NATIVE_TYPE_BYTES
-        DPI_NATIVE_TYPE_DOUBLE
-        DPI_NATIVE_TYPE_FLOAT
-        DPI_NATIVE_TYPE_INT64
-        DPI_NATIVE_TYPE_INTERVAL_DS
-        DPI_NATIVE_TYPE_INTERVAL_YM
-        DPI_NATIVE_TYPE_JSON
-        DPI_NATIVE_TYPE_JSON_ARRAY
-        DPI_NATIVE_TYPE_JSON_OBJECT
-        DPI_NATIVE_TYPE_LOB
-        DPI_NATIVE_TYPE_NULL
-        DPI_NATIVE_TYPE_OBJECT
-        DPI_NATIVE_TYPE_ROWID
-        DPI_NATIVE_TYPE_STMT
-        DPI_NATIVE_TYPE_TIMESTAMP
-        DPI_NATIVE_TYPE_VECTOR
-
-    # Oracle types
-    enum:
-        DPI_ORACLE_TYPE_BFILE
-        DPI_ORACLE_TYPE_BLOB
-        DPI_ORACLE_TYPE_BOOLEAN
-        DPI_ORACLE_TYPE_CHAR
-        DPI_ORACLE_TYPE_CLOB
-        DPI_ORACLE_TYPE_DATE
-        DPI_ORACLE_TYPE_INTERVAL_DS
-        DPI_ORACLE_TYPE_INTERVAL_YM
-        DPI_ORACLE_TYPE_JSON
-        DPI_ORACLE_TYPE_JSON_ARRAY
-        DPI_ORACLE_TYPE_JSON_ID
-        DPI_ORACLE_TYPE_JSON_OBJECT
-        DPI_ORACLE_TYPE_LONG_NVARCHAR
-        DPI_ORACLE_TYPE_LONG_RAW
-        DPI_ORACLE_TYPE_LONG_VARCHAR
-        DPI_ORACLE_TYPE_NATIVE_DOUBLE
-        DPI_ORACLE_TYPE_NATIVE_FLOAT
-        DPI_ORACLE_TYPE_NATIVE_INT
-        DPI_ORACLE_TYPE_NCHAR
-        DPI_ORACLE_TYPE_NCLOB
-        DPI_ORACLE_TYPE_NONE
-        DPI_ORACLE_TYPE_NUMBER
-        DPI_ORACLE_TYPE_NVARCHAR
-        DPI_ORACLE_TYPE_OBJECT
-        DPI_ORACLE_TYPE_RAW
-        DPI_ORACLE_TYPE_ROWID
-        DPI_ORACLE_TYPE_STMT
-        DPI_ORACLE_TYPE_TIMESTAMP
-        DPI_ORACLE_TYPE_TIMESTAMP_LTZ
-        DPI_ORACLE_TYPE_TIMESTAMP_TZ
-        DPI_ORACLE_TYPE_VARCHAR
-        DPI_ORACLE_TYPE_VECTOR
-        DPI_ORACLE_TYPE_XMLTYPE
-
-    # SODA flags
-    enum:
-        DPI_SODA_FLAGS_DEFAULT
-        DPI_SODA_FLAGS_ATOMIC_COMMIT
-        DPI_SODA_FLAGS_CREATE_COLL_MAP
-        DPI_SODA_FLAGS_INDEX_DROP_FORCE
-
-    # database startup modes
-    enum:
-        DPI_MODE_STARTUP_DEFAULT
-        DPI_MODE_STARTUP_FORCE
-        DPI_MODE_STARTUP_RESTRICT
-
-    # fetch modes (for scrolling cursors)
-    enum:
-        DPI_MODE_FETCH_FIRST
-        DPI_MODE_FETCH_LAST
-        DPI_MODE_FETCH_ABSOLUTE
-        DPI_MODE_FETCH_RELATIVE
-
-    # vector formats
-    enum:
-        DPI_VECTOR_FORMAT_BINARY
-        DPI_VECTOR_FORMAT_FLOAT32
-        DPI_VECTOR_FORMAT_FLOAT64
-        DPI_VECTOR_FORMAT_INT8
-
-    # subscription constants
-    uint32_t DPI_SUBSCR_QOS_QUERY
-    uint32_t DPI_EVENT_OBJCHANGE
-    uint32_t DPI_EVENT_QUERYCHANGE
-
-    # JSON flags
-    uint32_t DPI_JSON_OPT_NUMBER_AS_STRING
-
-    # opaque handles
-    ctypedef struct dpiConn:
-        pass
-
-    ctypedef struct dpiContext:
-        pass
-
-    ctypedef struct dpiDeqOptions:
-        pass
-
-    ctypedef struct dpiEnqOptions:
-        pass
-
-    ctypedef struct dpiJson:
-        pass
-
-    ctypedef struct dpiLob:
-        pass
-
-    ctypedef struct dpiMsgProps:
-        pass
-
-    ctypedef struct dpiObject:
-        pass
-
-    ctypedef struct dpiObjectAttr:
-        pass
-
-    ctypedef struct dpiObjectType:
-        pass
-
-    ctypedef struct dpiPool:
-        pass
-
-    ctypedef struct dpiQueue:
-        pass
-
-    ctypedef struct dpiRowid:
-        pass
-
-    ctypedef struct dpiSodaColl:
-        pass
-
-    ctypedef struct dpiSodaDb:
-        pass
-
-    ctypedef struct dpiSodaDoc:
-        pass
-
-    ctypedef struct dpiSodaDocCursor:
-        pass
-
-    ctypedef struct dpiStmt:
-        pass
-
-    ctypedef struct dpiSubscr:
-        pass
-
-    ctypedef struct dpiVar:
-        pass
-
-    ctypedef struct dpiVector:
-        pass
-
-    # function pointer types
-    ctypedef void (*dpiSubscrCallback)(void* context,
-            dpiSubscrMessage *message) except * nogil
-
-    ctypedef int (*dpiAccessTokenCallback)(void *context,
-            dpiAccessToken *accessToken) except * nogil
-
-    # complex native data types
-    ctypedef struct dpiBytes:
-        char *ptr
-        uint32_t length
-        const char *encoding
-
-    ctypedef struct dpiIntervalDS:
-        int32_t days
-        int32_t hours
-        int32_t minutes
-        int32_t seconds
-        int32_t fseconds
-
-    ctypedef struct dpiIntervalYM:
-        int32_t years
-        int32_t months
-
-    ctypedef struct dpiJsonNode:
-        uint32_t oracleTypeNum
-        uint32_t nativeTypeNum
-        dpiDataBuffer *value
-
-    ctypedef struct dpiJsonArray:
-        uint32_t numElements
-        dpiJsonNode *elements
-        dpiDataBuffer *elementValues
-
-    ctypedef struct dpiJsonObject:
-        uint32_t numFields
-        char **fieldNames
-        uint32_t *fieldNameLengths
-        dpiJsonNode *fields
-        dpiDataBuffer *fieldValues
-
-    ctypedef struct dpiTimestamp:
-        int16_t year
-        uint8_t month
-        uint8_t day
-        uint8_t hour
-        uint8_t minute
-        uint8_t second
-        uint32_t fsecond
-        int8_t tzHourOffset
-        int8_t tzMinuteOffset
-
-    # public structures
-    ctypedef struct dpiAnnotation:
-        const char *key
-        uint32_t keyLength
-        const char *value
-        uint32_t valueLength
-
-    ctypedef struct dpiAppContext:
-        const char *namespaceName
-        uint32_t namespaceNameLength
-        const char *name
-        uint32_t nameLength
-        const char *value
-        uint32_t valueLength
-
-    ctypedef struct dpiCommonCreateParams:
-        uint32_t createMode
-        const char *encoding
-        const char *nencoding
-        const char *edition
-        uint32_t editionLength
-        const char *driverName
-        uint32_t driverNameLength
-        bint sodaMetadataCache
-        uint32_t stmtCacheSize
-        dpiAccessToken *accessToken
-
-    ctypedef struct dpiConnCreateParams:
-        uint32_t authMode
-        const char *connectionClass
-        uint32_t connectionClassLength
-        uint32_t purity
-        const char *newPassword
-        uint32_t newPasswordLength
-        dpiAppContext *appContext
-        uint32_t numAppContext
-        bint externalAuth
-        void *externalHandle
-        dpiPool *pool
-        const char *tag
-        uint32_t tagLength
-        bint matchAnyTag
-        const char *outTag
-        uint32_t outTagLength
-        bint outTagFound
-        dpiShardingKeyColumn *shardingKeyColumns
-        uint8_t numShardingKeyColumns
-        dpiShardingKeyColumn *superShardingKeyColumns
-        uint8_t numSuperShardingKeyColumns
-        bint outNewSession
-
-    ctypedef struct dpiConnInfo:
-        const char *dbDomain
-        uint32_t dbDomainLength
-        const char *dbName
-        uint32_t dbNameLength
-        const char *instanceName
-        uint32_t instanceNameLength
-        const char *serviceName
-        uint32_t serviceNameLength
-        uint32_t maxIdentifierLength
-        uint32_t maxOpenCursors
-        uint8_t serverType
-
-    ctypedef struct dpiContextCreateParams:
-        const char *defaultDriverName
-        const char *defaultEncoding
-        const char *loadErrorUrl
-        const char *oracleClientLibDir
-        const char *oracleClientConfigDir
-        bint sodaUseJsonDesc
-        bint useJsonId
-
-    ctypedef union dpiDataBuffer:
-        bint asBoolean
-        uint8_t asUint8
-        uint16_t asUint16
-        uint32_t asUint32
-        int64_t asInt64
-        uint64_t asUint64
-        float asFloat
-        double asDouble
-        char *asString
-        void *asRaw
-        dpiBytes asBytes
-        dpiTimestamp asTimestamp
-        dpiIntervalDS asIntervalDS
-        dpiIntervalYM asIntervalYM
-        dpiJson *asJson
-        dpiJsonObject asJsonObject
-        dpiJsonArray asJsonArray
-        dpiLob *asLOB
-        dpiObject *asObject
-        dpiStmt *asStmt
-        dpiRowid *asRowid
-        dpiVector *asVector
-
-    ctypedef struct dpiData:
-        bint isNull
-        dpiDataBuffer value
-
-    ctypedef struct dpiDataTypeInfo:
-        uint32_t oracleTypeNum
-        uint32_t defaultNativeTypeNum
-        uint16_t ociTypeCode
-        uint32_t dbSizeInBytes
-        uint32_t clientSizeInBytes
-        uint32_t sizeInChars
-        int16_t precision
-        int8_t scale
-        uint8_t fsPrecision
-        dpiObjectType *objectType
-        bint isJson
-        const char *domainSchema
-        uint32_t domainSchemaLength
-        const char *domainName
-        uint32_t domainNameLength
-        uint32_t numAnnotations
-        dpiAnnotation *annotations
-        bint isOson
-        uint32_t vectorDimensions
-        uint8_t vectorFormat
-        uint8_t vectorFlags
-
-    ctypedef struct dpiAccessToken:
-        const char *token
-        uint32_t tokenLength
-        const char *privateKey
-        uint32_t privateKeyLength
-
-    ctypedef struct dpiErrorInfo:
-        int32_t code
-        uint16_t offset16
-        const char *message
-        uint32_t messageLength
-        const char *encoding
-        const char *fnName
-        const char *action
-        const char *sqlState
-        bint isRecoverable
-        bint isWarning
-        uint32_t offset
-
-    ctypedef struct dpiObjectAttrInfo:
-        const char *name
-        uint32_t nameLength
-        dpiDataTypeInfo typeInfo
-
-    ctypedef struct dpiObjectTypeInfo:
-        const char *schema
-        uint32_t schemaLength
-        const char *name
-        uint32_t nameLength
-        bint isCollection
-        dpiDataTypeInfo elementTypeInfo
-        uint16_t numAttributes
-        const char *packageName
-        uint32_t packageNameLength
-
-    ctypedef struct dpiPoolCreateParams:
-        uint32_t minSessions
-        uint32_t maxSessions
-        uint32_t sessionIncrement
-        int pingInterval
-        int pingTimeout
-        bint homogeneous
-        bint externalAuth
-        uint32_t getMode
-        const char *outPoolName
-        uint32_t outPoolNameLength
-        uint32_t timeout
-        uint32_t waitTimeout
-        uint32_t maxLifetimeSession
-        const char *plsqlFixupCallback
-        uint32_t plsqlFixupCallbackLength
-        uint32_t maxSessionsPerShard
-        dpiAccessTokenCallback accessTokenCallback
-        void *accessTokenCallbackContext
-
-    ctypedef struct dpiQueryInfo:
-        const char *name
-        uint32_t nameLength
-        dpiDataTypeInfo typeInfo
-        bint nullOk
-
-    ctypedef struct dpiShardingKeyColumn:
-        uint32_t oracleTypeNum
-        uint32_t nativeTypeNum
-        dpiDataBuffer value
-
-    ctypedef struct dpiSodaOperOptions:
-        uint32_t numKeys
-        const char **keys
-        uint32_t *keyLengths
-        const char *key
-        uint32_t keyLength
-        const char *version
-        uint32_t versionLength
-        const char *filter
-        uint32_t filterLength
-        const char *hint;
-        uint32_t hintLength;
-        uint32_t skip
-        uint32_t limit
-        uint32_t fetchArraySize
-        bint lock
-
-    ctypedef struct dpiStmtInfo:
-        bint isQuery
-        bint isPLSQL
-        bint isDDL
-        bint isDML
-        uint16_t statementType
-        bint isReturning
-
-    ctypedef struct dpiStringList:
-        uint32_t numStrings
-        const char **strings
-        uint32_t *stringLengths
-
-    ctypedef struct dpiSubscrCreateParams:
-        uint32_t subscrNamespace
-        uint32_t protocol
-        uint32_t qos
-        uint32_t operations
-        uint32_t portNumber
-        uint32_t timeout
-        const char *name
-        uint32_t nameLength
-        dpiSubscrCallback callback
-        void *callbackContext
-        const char *recipientName
-        uint32_t recipientNameLength
-        const char *ipAddress
-        uint32_t ipAddressLength
-        uint8_t groupingClass
-        uint32_t groupingValue
-        uint8_t groupingType
-        uint64_t outRegId
-        bint clientInitiated
-
-    ctypedef struct dpiSubscrMessage:
-        uint32_t eventType
-        const char *dbName
-        uint32_t dbNameLength
-        dpiSubscrMessageTable *tables
-        uint32_t numTables
-        dpiSubscrMessageQuery *queries
-        uint32_t numQueries
-        dpiErrorInfo *errorInfo
-        const void *txId
-        uint32_t txIdLength
-        bint registered
-        const char *queueName
-        uint32_t queueNameLength
-        const char *consumerName
-        uint32_t consumerNameLength
-        const void *aqMsgId
-        uint32_t aqMsgIdLength
-
-    ctypedef struct dpiSubscrMessageQuery:
-        uint64_t id
-        uint32_t operation
-        dpiSubscrMessageTable *tables
-        uint32_t numTables
-
-    ctypedef struct dpiSubscrMessageRow:
-        uint32_t operation
-        const char *rowid
-        uint32_t rowidLength
-
-    ctypedef struct dpiSubscrMessageTable:
-        uint32_t operation
-        const char *name
-        uint32_t nameLength
-        dpiSubscrMessageRow *rows
-        uint32_t numRows
-
-    ctypedef union dpiVectorDimensionBuffer:
-        void* asPtr
-        int8_t* asInt8
-        float* asFloat
-        double* asDouble
-
-    ctypedef struct dpiVectorInfo:
-        uint8_t format
-        uint32_t numDimensions
-        uint8_t dimensionSize
-        dpiVectorDimensionBuffer dimensions
-        uint32_t numSparseValues;
-        uint32_t *sparseIndices;
-
-
-    ctypedef struct dpiVersionInfo:
-        int versionNum
-        int releaseNum
-        int updateNum
-        int portReleaseNum
-        int portUpdateNum
-        uint32_t fullVersionNum
-
-    ctypedef struct dpiXid:
-        long formatId
-        const char *globalTransactionId
-        uint32_t globalTransactionIdLength
-        const char *branchQualifier
-        uint32_t branchQualifierLength
-
-    ctypedef struct dpiMsgRecipient:
-        const char *name
-        uint32_t nameLength
-
-    ctypedef struct dpiSessionlessTransactionId:
-        char[64] value
-        uint32_t length
-
-    # functions
-    int dpiConn_beginSessionlessTransaction(dpiConn *conn,
-            dpiSessionlessTransactionId* transactionId, uint32_t timeout,
-            bint deferRoundTrip) nogil
-
-    int dpiConn_breakExecution(dpiConn *conn) nogil
-
-    int dpiConn_changePassword(dpiConn *conn, const char *userName,
-            uint32_t userNameLength, const char *oldPassword,
-            uint32_t oldPasswordLength, const char *newPassword,
-            uint32_t newPasswordLength) nogil
-
-    int dpiConn_close(dpiConn *conn, uint32_t mode, const char *tag,
-            uint32_t tagLength) nogil
-
-    int dpiConn_commit(dpiConn *conn) nogil
-
-    int dpiConn_create(const dpiContext *context, const char *userName,
-            uint32_t userNameLength, const char *password,
-            uint32_t passwordLength, const char *connectString,
-            uint32_t connectStringLength,
-            const dpiCommonCreateParams *commonParams,
-            dpiConnCreateParams *createParams, dpiConn **conn) nogil
-
-    int dpiConn_getCurrentSchema(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getDbDomain(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getDbName(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getEdition(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getExternalName(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getHandle(dpiConn *conn, void **handle) nogil
-
-    int dpiConn_getInfo(dpiConn *conn, dpiConnInfo *info) nogil
-
-    int dpiConn_getInstanceName(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getInternalName(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getIsHealthy(dpiConn *conn, bint *isHealthy) nogil
-
-    int dpiConn_getLTXID(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getMaxOpenCursors(dpiConn *conn,
-            uint32_t *maxOpenCursors) nogil
-
-    int dpiConn_getOciAttr(dpiConn *conn, uint32_t handleType,
-            uint32_t attribute, dpiDataBuffer *value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getObjectType(dpiConn *conn, const char *name,
-            uint32_t nameLength, dpiObjectType **objType) nogil
-
-    int dpiConn_getServerVersion(dpiConn *conn, const char **releaseString,
-            uint32_t *releaseStringLength, dpiVersionInfo *versionInfo) nogil
-
-    int dpiConn_getServiceName(dpiConn *conn, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiConn_getSodaDb(dpiConn *conn, dpiSodaDb **db) nogil
-
-    int dpiConn_getStmtCacheSize(dpiConn *conn, uint32_t *cacheSize) nogil
-
-    int dpiConn_getTransactionInProgress(dpiConn *conn,
-            bint *txnInProgress) nogil
-
-    int dpiConn_getCallTimeout(dpiConn *conn, uint32_t *value) nogil
-
-    int dpiConn_newMsgProps(dpiConn *conn, dpiMsgProps **props) nogil
-
-    int dpiConn_newQueue(dpiConn *conn, const char *name,
-            uint32_t nameLength, dpiObjectType *payloadType,
-            dpiQueue **queue) nogil
-
-    int dpiConn_newJson(dpiConn *conn, dpiJson **json) nogil
-
-    int dpiConn_newJsonQueue(dpiConn *conn, const char *name,
-            uint32_t nameLength, dpiQueue **queue) nogil
-
-    int dpiConn_newTempLob(dpiConn *conn, uint32_t lobType, dpiLob **lob) nogil
-
-    int dpiConn_newVar(dpiConn *conn, uint32_t oracleTypeNum,
-            uint32_t nativeTypeNum, uint32_t maxArraySize, uint32_t size,
-            int sizeIsBytes, bint isArray, dpiObjectType *objType, dpiVar **var,
-            dpiData **data) nogil
-
-    int dpiConn_newVector(dpiConn *conn, dpiVectorInfo *info,
-            dpiVector **vector) nogil
-
-    int dpiConn_ping(dpiConn *conn) nogil
-
-    int dpiConn_prepareStmt(dpiConn *conn, bint scrollable, const char *sql,
-            uint32_t sqlLength, const char *tag, uint32_t tagLength,
-            dpiStmt **stmt) nogil
-
-    int dpiConn_release(dpiConn *conn) nogil
-
-    int dpiConn_resumeSessionlessTransaction(dpiConn *conn,
-            dpiSessionlessTransactionId* transactionId, uint32_t timeout,
-            bint deferRoundTrip) nogil
-
-    int dpiConn_rollback(dpiConn *conn) nogil
-
-    int dpiConn_setAction(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setCallTimeout(dpiConn *conn, uint32_t value) nogil
-
-    int dpiConn_setClientIdentifier(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setClientInfo(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setCurrentSchema(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setDbOp(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setEcontextId(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setExternalName(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setInternalName(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setModule(dpiConn *conn, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiConn_setOciAttr(dpiConn *conn, uint32_t handleType,
-            uint32_t attribute, void *value, uint32_t valueLength) nogil
-
-    int dpiConn_setStmtCacheSize(dpiConn *conn, uint32_t cacheSize) nogil
-
-    int dpiConn_shutdownDatabase(dpiConn *conn, uint32_t mode) nogil
-
-    int dpiConn_startupDatabaseWithPfile(dpiConn *conn, const char *pfile,
-            uint32_t pfileLength, uint32_t mode) nogil
-
-    int dpiConn_subscribe(dpiConn *conn, dpiSubscrCreateParams *params,
-            dpiSubscr **subscr) nogil
-
-    int dpiConn_suspendSessionlessTransaction(dpiConn *conn) nogil
-
-    int dpiConn_tpcBegin(dpiConn *conn, dpiXid *xid,
-            uint32_t transactionTimeout, uint32_t flags) nogil
-
-    int dpiConn_tpcCommit(dpiConn *conn, dpiXid *xid, bint onePhase) nogil
-
-    int dpiConn_tpcEnd(dpiConn *conn, dpiXid *xid, uint32_t flags) nogil
-
-    int dpiConn_tpcForget(dpiConn *conn, dpiXid *xid) nogil
-
-    int dpiConn_tpcPrepare(dpiConn *conn, dpiXid *xid,
-            bint *commitNeeded) nogil
-
-    int dpiConn_tpcRollback(dpiConn *conn, dpiXid *xid) nogil
-
-    int dpiConn_unsubscribe(dpiConn *conn, dpiSubscr *subscr) nogil
-
-    int dpiContext_createWithParams(unsigned int majorVersion,
-            unsigned int minorVersion, dpiContextCreateParams *params,
-            dpiContext **context, dpiErrorInfo *errorInfo) nogil
-
-    int dpiContext_freeStringList(dpiContext *context,
-            dpiStringList *stringList) nogil
-
-    int dpiContext_getClientVersion(const dpiContext *context,
-            dpiVersionInfo *versionInfo) nogil
-
-    void dpiContext_getError(const dpiContext *context,
-            dpiErrorInfo *errorInfo) nogil
-
-    int dpiContext_initCommonCreateParams(const dpiContext *context,
-            dpiCommonCreateParams *params) nogil
-
-    int dpiContext_initConnCreateParams(const dpiContext *context,
-            dpiConnCreateParams *params) nogil
-
-    int dpiContext_initPoolCreateParams(const dpiContext *context,
-            dpiPoolCreateParams *params) nogil
-
-    int dpiContext_initSodaOperOptions(const dpiContext *context,
-            dpiSodaOperOptions *options) nogil
-
-    int dpiContext_initSubscrCreateParams(const dpiContext *context,
-            dpiSubscrCreateParams *params) nogil
-
-    int dpiDeqOptions_getCondition(dpiDeqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiDeqOptions_getConsumerName(dpiDeqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiDeqOptions_getCorrelation(dpiDeqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiDeqOptions_getMode(dpiDeqOptions *options, uint32_t *value) nogil
-
-    int dpiDeqOptions_getMsgId(dpiDeqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiDeqOptions_getNavigation(dpiDeqOptions *options,
-            uint32_t *value) nogil
-
-    int dpiDeqOptions_getTransformation(dpiDeqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiDeqOptions_getVisibility(dpiDeqOptions *options,
-            uint32_t *value) nogil
-
-    int dpiDeqOptions_getWait(dpiDeqOptions *options, uint32_t *value) nogil
-
-    int dpiDeqOptions_release(dpiDeqOptions *options) nogil
-
-    int dpiDeqOptions_setCondition(dpiDeqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiDeqOptions_setConsumerName(dpiDeqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiDeqOptions_setCorrelation(dpiDeqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiDeqOptions_setDeliveryMode(dpiDeqOptions *options,
-            uint16_t value) nogil
-
-    int dpiDeqOptions_setMode(dpiDeqOptions *options, uint32_t value) nogil
-
-    int dpiDeqOptions_setMsgId(dpiDeqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiDeqOptions_setNavigation(dpiDeqOptions *options,
-            uint32_t value) nogil
-
-    int dpiDeqOptions_setTransformation(dpiDeqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiDeqOptions_setVisibility(dpiDeqOptions *options,
-            uint32_t value) nogil
-
-    int dpiDeqOptions_setWait(dpiDeqOptions *options, uint32_t value) nogil
-
-    int dpiEnqOptions_getTransformation(dpiEnqOptions *options,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiEnqOptions_getVisibility(dpiEnqOptions *options,
-            uint32_t *value) nogil
-
-    int dpiEnqOptions_release(dpiEnqOptions *options) nogil
-
-    int dpiEnqOptions_setDeliveryMode(dpiEnqOptions *options,
-            uint16_t value) nogil
-
-    int dpiEnqOptions_setTransformation(dpiEnqOptions *options,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiEnqOptions_setVisibility(dpiEnqOptions *options,
-            uint32_t value) nogil
-
-    int dpiJson_getValue(dpiJson *json, uint32_t options,
-            dpiJsonNode **topNode) nogil
-
-    int dpiJson_release(dpiJson *json) nogil
-
-    int dpiJson_setValue(dpiJson *json, dpiJsonNode *topNode)
-
-    int dpiLob_addRef(dpiLob *lob) nogil
-
-    int dpiLob_closeResource(dpiLob *lob) nogil
-
-    int dpiLob_getBufferSize(dpiLob *lob, uint64_t sizeInChars,
-            uint64_t *sizeInBytes) nogil
-
-    int dpiLob_getChunkSize(dpiLob *lob, uint32_t *size) nogil
-
-    int dpiLob_getDirectoryAndFileName(dpiLob *lob,
-            const char **directoryAlias, uint32_t *directoryAliasLength,
-            const char **fileName, uint32_t *fileNameLength) nogil
-
-    int dpiLob_getFileExists(dpiLob *lob, bint *exists) nogil
-
-    int dpiLob_getIsResourceOpen(dpiLob *lob, bint *isOpen) nogil
-
-    int dpiLob_getSize(dpiLob *lob, uint64_t *size) nogil
-
-    int dpiLob_openResource(dpiLob *lob) nogil
-
-    int dpiLob_readBytes(dpiLob *lob, uint64_t offset, uint64_t amount,
-            char *value, uint64_t *valueLength) nogil
-
-    int dpiLob_release(dpiLob *lob) nogil
-
-    int dpiLob_setDirectoryAndFileName(dpiLob *lob,
-            const char *directoryAlias, uint32_t directoryAliasLength,
-            const char *fileName, uint32_t fileNameLength) nogil
-
-    int dpiLob_setFromBytes(dpiLob *lob, const char *value,
-            uint64_t valueLength) nogil
-
-    int dpiLob_trim(dpiLob *lob, uint64_t newSize) nogil
-
-    int dpiLob_writeBytes(dpiLob *lob, uint64_t offset,
-            const char *value, uint64_t valueLength) nogil
-
-    int dpiMsgProps_getNumAttempts(dpiMsgProps *props, int32_t *value) nogil
-
-    int dpiMsgProps_getCorrelation(dpiMsgProps *props,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiMsgProps_getDelay(dpiMsgProps *props, int32_t *value) nogil
-
-    int dpiMsgProps_getDeliveryMode(dpiMsgProps *props, uint16_t *value) nogil
-
-    int dpiMsgProps_getEnqTime(dpiMsgProps *props, dpiTimestamp *value) nogil
-
-    int dpiMsgProps_getExceptionQ(dpiMsgProps *props,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiMsgProps_getExpiration(dpiMsgProps *props, int32_t *value) nogil
-
-    int dpiMsgProps_getMsgId(dpiMsgProps *props, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiMsgProps_getOriginalMsgId(dpiMsgProps *props,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiMsgProps_getPayload(dpiMsgProps *props, dpiObject **obj,
-            const char **value, uint32_t *valueLength) nogil
-
-    int dpiMsgProps_getPayloadJson(dpiMsgProps *props,
-        dpiJson **json) nogil
-
-    int dpiMsgProps_getPriority(dpiMsgProps *props, int32_t *value) nogil
-
-    int dpiMsgProps_getState(dpiMsgProps *props, uint32_t *value) nogil
-
-    int dpiMsgProps_release(dpiMsgProps *props) nogil
-
-    int dpiMsgProps_setCorrelation(dpiMsgProps *props,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiMsgProps_setDelay(dpiMsgProps *props, int32_t value) nogil
-
-    int dpiMsgProps_setExceptionQ(dpiMsgProps *props, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiMsgProps_setExpiration(dpiMsgProps *props, int32_t value) nogil
-
-    int dpiMsgProps_setOriginalMsgId(dpiMsgProps *props,
-        const char *value, uint32_t valueLength) nogil
-
-    int dpiMsgProps_setPayloadBytes(dpiMsgProps *props,
-            const char *value, uint32_t valueLength) nogil
-
-    int dpiMsgProps_setPayloadObject(dpiMsgProps *props, dpiObject *obj) nogil
-
-    int dpiMsgProps_setPayloadJson(dpiMsgProps *props, dpiJson *json) nogil
-
-    int dpiMsgProps_setPriority(dpiMsgProps *props, int32_t value) nogil
-
-    int dpiMsgProps_setRecipients(dpiMsgProps *props,
-            dpiMsgRecipient *recipients, uint32_t numRecipients) nogil
-
-    int dpiObject_addRef(dpiObject *obj) nogil
-
-    int dpiObject_appendElement(dpiObject *obj, uint32_t nativeTypeNum,
-            dpiData *value) nogil
-
-    int dpiObject_copy(dpiObject *obj, dpiObject **copiedObj) nogil
-
-    int dpiObject_deleteElementByIndex(dpiObject *obj, int32_t index) nogil
-
-    int dpiObject_getAttributeValue(dpiObject *obj, dpiObjectAttr *attr,
-            uint32_t nativeTypeNum, dpiData *value) nogil
-
-    int dpiObject_getElementExistsByIndex(dpiObject *obj, int32_t index,
-            bint *exists) nogil
-
-    int dpiObject_getElementValueByIndex(dpiObject *obj, int32_t index,
-            uint32_t nativeTypeNum, dpiData *value) nogil
-
-    int dpiObject_getFirstIndex(dpiObject *obj, int32_t *index,
-            bint *exists) nogil
-
-    int dpiObject_getLastIndex(dpiObject *obj, int32_t *index,
-            bint *exists) nogil
-
-    int dpiObject_getNextIndex(dpiObject *obj, int32_t index,
-            int32_t *nextIndex, bint *exists) nogil
-
-    int dpiObject_getPrevIndex(dpiObject *obj, int32_t index,
-            int32_t *prevIndex, bint *exists) nogil
-
-    int dpiObject_getSize(dpiObject *obj, int32_t *size) nogil
-
-    int dpiObject_release(dpiObject *obj) nogil
-
-    int dpiObject_setAttributeValue(dpiObject *obj, dpiObjectAttr *attr,
-            uint32_t nativeTypeNum, dpiData *value) nogil
-
-    int dpiObject_setElementValueByIndex(dpiObject *obj, int32_t index,
-            uint32_t nativeTypeNum, dpiData *value) nogil
-
-    int dpiObject_trim(dpiObject *obj, uint32_t numToTrim) nogil
-
-    int dpiObjectAttr_getInfo(dpiObjectAttr *attr,
-            dpiObjectAttrInfo *info) nogil
-
-    int dpiObjectAttr_release(dpiObjectAttr *attr) nogil
-
-    int dpiObjectType_addRef(dpiObjectType *objType) nogil
-
-    int dpiObjectType_createObject(dpiObjectType *objType,
-            dpiObject **obj) nogil
-
-    int dpiObjectType_getAttributes(dpiObjectType *objType,
-            uint16_t numAttributes, dpiObjectAttr **attributes) nogil
-
-    int dpiObjectType_getInfo(dpiObjectType *objType,
-            dpiObjectTypeInfo *info) nogil
-
-    int dpiObjectType_release(dpiObjectType *objType) nogil
-
-    int dpiPool_close(dpiPool *pool, uint32_t closeMode) nogil
-
-    int dpiPool_create(const dpiContext *context, const char *userName,
-            uint32_t userNameLength, const char *password,
-            uint32_t passwordLength, const char *connectString,
-            uint32_t connectStringLength,
-            const dpiCommonCreateParams *commonParams,
-            dpiPoolCreateParams *createParams, dpiPool **pool) nogil
-
-    int dpiPool_getBusyCount(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_getGetMode(dpiPool *pool, uint8_t *value) nogil
-
-    int dpiPool_getMaxLifetimeSession(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_getMaxSessionsPerShard(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_getOpenCount(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_getPingInterval(dpiPool *pool, int *value) nogil
-
-    int dpiPool_getSodaMetadataCache(dpiPool *pool, bint *enabled) nogil
-
-    int dpiPool_getStmtCacheSize(dpiPool *pool, uint32_t *cacheSize) nogil
-
-    int dpiPool_getTimeout(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_getWaitTimeout(dpiPool *pool, uint32_t *value) nogil
-
-    int dpiPool_release(dpiPool *pool) nogil
-
-    int dpiPool_reconfigure(dpiPool *pool, uint32_t minSessions,
-            uint32_t maxSessions, uint32_t sessionIncrement) nogil
-
-    int dpiPool_setAccessToken(dpiPool *pool, dpiAccessToken *params) nogil
-
-    int dpiPool_setGetMode(dpiPool *pool, uint8_t value) nogil
-
-    int dpiPool_setMaxLifetimeSession(dpiPool *pool, uint32_t value) nogil
-
-    int dpiPool_setMaxSessionsPerShard(dpiPool *pool, uint32_t value) nogil
-
-    int dpiPool_setPingInterval(dpiPool *pool, int value) nogil
-
-    int dpiPool_setSodaMetadataCache(dpiPool *pool, bint enabled) nogil
-
-    int dpiPool_setStmtCacheSize(dpiPool *pool, uint32_t cacheSize) nogil
-
-    int dpiPool_setTimeout(dpiPool *pool, uint32_t value) nogil
-
-    int dpiPool_setWaitTimeout(dpiPool *pool, uint32_t value) nogil
-
-    int dpiQueue_deqMany(dpiQueue *queue, uint32_t *numProps,
-            dpiMsgProps **props) nogil
-
-    int dpiQueue_deqOne(dpiQueue *queue, dpiMsgProps **props) nogil
-
-    int dpiQueue_enqMany(dpiQueue *queue, uint32_t numProps,
-            dpiMsgProps **props) nogil
-
-    int dpiQueue_enqOne(dpiQueue *queue, dpiMsgProps *props) nogil
-
-    int dpiQueue_getDeqOptions(dpiQueue *queue,
-            dpiDeqOptions **options) nogil
-
-    int dpiQueue_getEnqOptions(dpiQueue *queue,
-            dpiEnqOptions **options) nogil
-
-    int dpiQueue_release(dpiQueue *queue) nogil
-
-    int dpiRowid_getStringValue(dpiRowid *rowid, const char **value,
-            uint32_t *valueLength)
-
-    int dpiSodaColl_createIndex(dpiSodaColl *coll,
-            const char *indexSpec, uint32_t indexSpecLength,
-            uint32_t flags) nogil
-
-    int dpiSodaColl_drop(dpiSodaColl *coll, uint32_t flags,
-            bint *isDropped) nogil
-
-    int dpiSodaColl_dropIndex(dpiSodaColl *coll, const char *name,
-            uint32_t nameLength, uint32_t flags, bint *isDropped) nogil
-
-    int dpiSodaColl_find(dpiSodaColl *coll,
-            const dpiSodaOperOptions *options, uint32_t flags,
-            dpiSodaDocCursor **cursor) nogil
-
-    int dpiSodaColl_findOne(dpiSodaColl *coll,
-            const dpiSodaOperOptions *options, uint32_t flags,
-            dpiSodaDoc **doc) nogil
-
-    int dpiSodaColl_getDataGuide(dpiSodaColl *coll, uint32_t flags,
-            dpiSodaDoc **doc) nogil
-
-    int dpiSodaColl_getDocCount(dpiSodaColl *coll,
-            const dpiSodaOperOptions *options, uint32_t flags,
-            uint64_t *count) nogil
-
-    int dpiSodaColl_getMetadata(dpiSodaColl *coll, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaColl_getName(dpiSodaColl *coll, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaColl_insertManyWithOptions(dpiSodaColl *coll, uint32_t numDocs,
-            dpiSodaDoc **docs, dpiSodaOperOptions *options, uint32_t flags,
-            dpiSodaDoc **insertedDocs) nogil
-
-    int dpiSodaColl_insertOneWithOptions(dpiSodaColl *coll, dpiSodaDoc *doc,
-            dpiSodaOperOptions *options, uint32_t flags,
-            dpiSodaDoc **insertedDoc) nogil
-
-    int dpiSodaColl_listIndexes(dpiSodaColl *coll, uint32_t flags,
-            dpiStringList *lst) nogil
-
-    int dpiSodaColl_release(dpiSodaColl *coll) nogil
-
-    int dpiSodaColl_remove(dpiSodaColl *coll,
-            const dpiSodaOperOptions *options, uint32_t flags,
-            uint64_t *count) nogil
-
-    int dpiSodaColl_replaceOne(dpiSodaColl *coll,
-            const dpiSodaOperOptions *options, dpiSodaDoc *doc, uint32_t flags,
-            bint *replaced, dpiSodaDoc **replacedDoc) nogil
-
-    int dpiSodaColl_saveWithOptions(dpiSodaColl *coll, dpiSodaDoc *doc,
-            dpiSodaOperOptions *options, uint32_t flags,
-            dpiSodaDoc **savedDoc) nogil
-
-    int dpiSodaColl_truncate(dpiSodaColl *coll) nogil
-
-    int dpiSodaDb_createCollection(dpiSodaDb *db, const char *name,
-            uint32_t nameLength, const char *metadata, uint32_t metadataLength,
-            uint32_t flags, dpiSodaColl **coll) nogil
-
-    int dpiSodaDb_createDocument(dpiSodaDb *db, const char *key,
-            uint32_t keyLength, const char *content, uint32_t contentLength,
-            const char *mediaType, uint32_t mediaTypeLength, uint32_t flags,
-            dpiSodaDoc **doc) nogil
-
-    int dpiSodaDb_createJsonDocument(dpiSodaDb *db, const char *key,
-            uint32_t keyLength, const dpiJsonNode *content, uint32_t flags,
-            dpiSodaDoc **doc) nogil
-
-    int dpiSodaDb_getCollectionNames(dpiSodaDb *db,
-            const char *startName, uint32_t startNameLength, uint32_t limit,
-            uint32_t flags, dpiStringList *names) nogil
-
-    int dpiSodaDb_openCollection(dpiSodaDb *db, const char *name,
-            uint32_t nameLength, uint32_t flags, dpiSodaColl **coll) nogil
-
-    int dpiSodaDb_release(dpiSodaDb *db) nogil
-
-    int dpiSodaDoc_getContent(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength, const char **encoding) nogil
-
-    int dpiSodaDoc_getCreatedOn(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaDoc_getIsJson(dpiSodaDoc *doc, bint *isJson) nogil
-
-    int dpiSodaDoc_getJsonContent(dpiSodaDoc *doc, dpiJson **value) nogil
-
-    int dpiSodaDoc_getKey(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaDoc_getLastModified(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaDoc_getMediaType(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaDoc_getVersion(dpiSodaDoc *doc, const char **value,
-            uint32_t *valueLength) nogil
-
-    int dpiSodaDoc_release(dpiSodaDoc *doc) nogil
-
-    int dpiSodaDocCursor_close(dpiSodaDocCursor *cursor) nogil
-
-    int dpiSodaDocCursor_getNext(dpiSodaDocCursor *cursor,
-            uint32_t flags, dpiSodaDoc **doc) nogil
-
-    int dpiSodaDocCursor_release(dpiSodaDocCursor *cursor) nogil
-
-    int dpiStmt_addRef(dpiStmt *stmt) nogil
-
-    int dpiStmt_bindByName(dpiStmt *stmt, const char *name,
-            uint32_t nameLength, dpiVar *var) nogil
-
-    int dpiStmt_bindByPos(dpiStmt *stmt, uint32_t pos, dpiVar *var) nogil
-
-    int dpiStmt_close(dpiStmt *stmt, const char *tag, uint32_t tagLength)
-
-    int dpiStmt_define(dpiStmt *stmt, uint32_t pos, dpiVar *var) nogil
-
-    int dpiStmt_deleteFromCache(dpiStmt *stmt) nogil
-
-    int dpiStmt_execute(dpiStmt *stmt, uint32_t mode,
-            uint32_t *numQueryColumns) nogil
-
-    int dpiStmt_executeMany(dpiStmt *stmt, uint32_t mode,
-            uint32_t numIters) nogil
-
-    int dpiStmt_fetchRows(dpiStmt *stmt, uint32_t maxRows,
-            uint32_t *bufferRowIndex, uint32_t *numRowsFetched,
-            bint *moreRows) nogil
-
-    int dpiStmt_getBatchErrorCount(dpiStmt *stmt, uint32_t *count) nogil
-
-    int dpiStmt_getBatchErrors(dpiStmt *stmt, uint32_t numErrors,
-            dpiErrorInfo *errors) nogil
-
-    int dpiStmt_getBindCount(dpiStmt *stmt, uint32_t *count) nogil
-
-    int dpiStmt_getBindNames(dpiStmt *stmt, uint32_t *numBindNames,
-            const char **bindNames, uint32_t *bindNameLengths) nogil
-
-    int dpiStmt_getImplicitResult(dpiStmt *stmt,
-            dpiStmt **implicitResult) nogil
-
-    int dpiStmt_getNumQueryColumns(dpiStmt *stmt,
-            uint32_t *numQueryColumns) nogil
-
-    int dpiStmt_getInfo(dpiStmt *stmt, dpiStmtInfo *info) nogil
-
-    int dpiStmt_getLastRowid(dpiStmt *stmt, dpiRowid **rowid) nogil
-
-    int dpiStmt_getOciAttr(dpiStmt *stmt, uint32_t attribute,
-            dpiDataBuffer *value, uint32_t *valueLength) nogil
-
-    int dpiStmt_getQueryInfo(dpiStmt *stmt, uint32_t pos,
-            dpiQueryInfo *info) nogil
-
-    int dpiStmt_getRowCount(dpiStmt *stmt, uint64_t *count) nogil
-
-    int dpiStmt_getRowCounts(dpiStmt *stmt, uint32_t *numRowCounts,
-            uint64_t **rowCounts) nogil
-
-    int dpiStmt_getSubscrQueryId(dpiStmt *stmt, uint64_t *queryId) nogil
-
-    int dpiStmt_release(dpiStmt *stmt) nogil
-
-    int dpiStmt_scroll(dpiStmt *stmt, uint32_t mode, int32_t offset,
-            int32_t rowCountOffset) nogil
-
-    int dpiStmt_setFetchArraySize(dpiStmt *stmt, uint32_t arraySize) nogil
-
-    int dpiStmt_setOciAttr(dpiStmt *stmt, uint32_t attribute, void *value,
-            uint32_t valueLength) nogil
-
-    int dpiStmt_setPrefetchRows(dpiStmt *stmt, uint32_t numRows) nogil
-
-    int dpiSubscr_prepareStmt(dpiSubscr *subscr, const char *sql,
-            uint32_t sqlLength, dpiStmt **stmt) nogil
-
-    int dpiSubscr_release(dpiSubscr *subscr) nogil
-
-    int dpiVar_getNumElementsInArray(dpiVar *var, uint32_t *numElements) nogil
-
-    int dpiVar_getReturnedData(dpiVar *var, uint32_t pos,
-            uint32_t *numElements, dpiData **data) nogil
-
-    int dpiVar_getSizeInBytes(dpiVar *var, uint32_t *sizeInBytes) nogil
-
-    int dpiVar_release(dpiVar *var) nogil
-
-    int dpiVar_setNumElementsInArray(dpiVar *var, uint32_t numElements) nogil
-
-    int dpiVar_setFromBytes(dpiVar *var, uint32_t pos, const char *value,
-            uint32_t valueLength) nogil
-
-    int dpiVar_setFromLob(dpiVar *var, uint32_t pos, dpiLob *lob) nogil
-
-    int dpiVar_setFromObject(dpiVar *var, uint32_t pos, dpiObject *obj) nogil
-
-    int dpiVar_setFromStmt(dpiVar *var, uint32_t pos, dpiStmt *stmt) nogil
-
-    int dpiVector_getValue(dpiVector *vector, dpiVectorInfo *info) nogil
-
-    int dpiVector_setValue(dpiVector *vector, dpiVectorInfo *info) nogil
diff --git a/src/oracledb/impl/thick/pool.pyx b/src/oracledb/impl/thick/pool.pyx
deleted file mode 100644
index b068b180..00000000
--- a/src/oracledb/impl/thick/pool.pyx
+++ /dev/null
@@ -1,384 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# pool.pyx
-#
-# Cython file defining the thick Pool implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef int _token_callback_handler(void *context,
-                                 dpiAccessToken *refresh_token) with gil:
-    cdef:
-        ThickPoolImpl pool_impl = <object> context
-    pool_impl._token_handler(refresh_token, pool_impl.connect_params)
-
-
-cdef class ThickPoolImpl(BasePoolImpl):
-    cdef:
-        dpiPool *_handle
-        object warning
-
-    def __init__(self, str dsn, PoolParamsImpl params):
-        cdef:
-            uint32_t password_len = 0, user_len = 0, connect_string_len = 0
-            bytes token_bytes, private_key_bytes, connect_string_bytes
-            bytes session_callback_bytes, name_bytes, driver_name_bytes
-            bytes edition_bytes, user_bytes, password_bytes
-            const char *connect_string_ptr = NULL
-            str token, private_key, connect_string
-            dpiCommonCreateParams common_params
-            dpiPoolCreateParams create_params
-            const char *password_ptr = NULL
-            const char *user_ptr = NULL
-            uint32_t token_len = 0, private_key_len = 0
-            const char *token_ptr = NULL
-            const char *private_key_ptr = NULL
-            dpiAccessToken access_token
-            dpiErrorInfo error_info
-            int status
-
-        # save parameters
-        self.connect_params = params
-        self.username = params.user
-        self.dsn = dsn
-        self.min = params.min
-        self.max = params.max
-        self.increment = params.increment
-        self.homogeneous = params.homogeneous
-
-        # set up token parameters if provided
-        if params._token is not None \
-                or params.access_token_callback is not None:
-            token = params._get_token()
-            token_bytes = token.encode()
-            token_ptr = token_bytes
-            token_len = <uint32_t> len(token_bytes)
-            private_key = params._get_private_key()
-            if private_key is not None:
-                private_key_bytes = private_key.encode()
-                private_key_ptr = private_key_bytes
-                private_key_len = <uint32_t> len(private_key_bytes)
-
-        # set up common creation parameters
-        if dpiContext_initCommonCreateParams(driver_info.context,
-                                             &common_params) < 0:
-            _raise_from_odpi()
-        common_params.createMode |= DPI_MODE_CREATE_THREADED
-        if params.events:
-            common_params.createMode |= DPI_MODE_CREATE_EVENTS
-        if params.edition is not None:
-            edition_bytes = params.edition.encode()
-            common_params.edition = edition_bytes
-            common_params.editionLength = <uint32_t> len(edition_bytes)
-        if params._token is not None:
-            access_token.token = token_ptr
-            access_token.tokenLength = token_len
-            access_token.privateKey = private_key_ptr
-            access_token.privateKeyLength = private_key_len
-            common_params.accessToken = &access_token
-        if params.driver_name is not None:
-            driver_name_bytes = params.driver_name.encode()[:30]
-            common_params.driverName = driver_name_bytes
-            common_params.driverNameLength = <uint32_t> len(driver_name_bytes)
-
-        # set up pool creation parameters
-        if dpiContext_initPoolCreateParams(driver_info.context,
-                                           &create_params) < 0:
-            _raise_from_odpi()
-        create_params.minSessions = self.min
-        create_params.maxSessions = self.max
-        create_params.sessionIncrement = self.increment
-        create_params.homogeneous = self.homogeneous
-        create_params.getMode = params.getmode
-        if params.session_callback is not None \
-                and not callable(params.session_callback):
-            session_callback_bytes = params.session_callback.encode()
-            create_params.plsqlFixupCallback = session_callback_bytes
-            create_params.plsqlFixupCallbackLength = \
-                    <uint32_t> len(session_callback_bytes)
-        if params.access_token_callback is not None:
-            create_params.accessTokenCallback = _token_callback_handler
-            create_params.accessTokenCallbackContext = <void*> self
-        create_params.timeout = params.timeout
-        create_params.waitTimeout = params.wait_timeout
-        create_params.maxSessionsPerShard = params.max_sessions_per_shard
-        create_params.maxLifetimeSession = params.max_lifetime_session
-        create_params.pingInterval = params.ping_interval
-        create_params.pingTimeout = params.ping_timeout
-        common_params.stmtCacheSize = params.stmtcachesize
-        common_params.sodaMetadataCache = params.soda_metadata_cache
-        create_params.externalAuth = params.externalauth
-
-        # prepare user, password and connect string for use
-        if self.username is not None:
-            user_bytes = params.get_full_user().encode()
-            user_ptr = user_bytes
-            user_len = <uint32_t> len(user_bytes)
-        password_bytes = params._get_password()
-        if password_bytes is not None:
-            password_ptr = password_bytes
-            password_len = <uint32_t> len(password_bytes)
-        if params.thick_mode_dsn_passthrough:
-            connect_string = self.dsn
-        else:
-            connect_string = params._get_connect_string()
-        if connect_string is not None:
-            connect_string_bytes = connect_string.encode()
-            connect_string_ptr = connect_string_bytes
-            connect_string_len = <uint32_t> len(connect_string_bytes)
-
-        # create pool
-        with nogil:
-            status = dpiPool_create(driver_info.context, user_ptr, user_len,
-                                    password_ptr, password_len,
-                                    connect_string_ptr, connect_string_len,
-                                    &common_params, &create_params,
-                                    &self._handle)
-            dpiContext_getError(driver_info.context, &error_info)
-        if status < 0:
-            _raise_from_info(&error_info)
-        elif error_info.isWarning:
-            self.warning = _create_new_from_info(&error_info)
-
-        name_bytes = create_params.outPoolName[:create_params.outPoolNameLength]
-        self.name = name_bytes.decode()
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiPool_release(self._handle)
-
-    cdef object _token_handler(self, dpiAccessToken *access_token,
-                               ConnectParamsImpl params):
-        cdef:
-            str token, private_key
-            bytes token_bytes, private_key_bytes
-            uint32_t token_len = 0, private_key_len = 0
-            const char *token_ptr = NULL
-            const char *private_key_ptr = NULL
-        token = params._get_token()
-        token_bytes = token.encode()
-        token_ptr = token_bytes
-        token_len = <uint32_t> len(token_bytes)
-        private_key = params._get_private_key()
-        if private_key is not None:
-            private_key_bytes = private_key.encode()
-            private_key_ptr = private_key_bytes
-            private_key_len = <uint32_t> len(private_key_bytes)
-        access_token.token = token_ptr
-        access_token.tokenLength = token_len
-        access_token.privateKey = private_key_ptr
-        access_token.privateKeyLength = private_key_len
-
-    def close(self, bint force):
-        """
-        Internal method for closing the pool.
-        """
-        cdef:
-            uint32_t close_mode
-            int status
-        close_mode = DPI_MODE_POOL_CLOSE_FORCE if force \
-                     else DPI_MODE_POOL_CLOSE_DEFAULT
-        with nogil:
-            status = dpiPool_close(self._handle, close_mode);
-        if status < 0:
-            _raise_from_odpi()
-
-    def drop(self, ThickConnImpl conn_impl):
-        """
-        Internal method for dropping a connection from the pool.
-        """
-        cdef int status
-        with nogil:
-            status = dpiConn_close(conn_impl._handle, DPI_MODE_CONN_CLOSE_DROP,
-                                   NULL, 0)
-        if status < 0:
-            _raise_from_odpi()
-        dpiConn_release(conn_impl._handle)
-        conn_impl._handle = NULL
-
-    def get_busy_count(self):
-        """
-        Internal method for getting the number of busy connections in the pool.
-        """
-        cdef uint32_t value
-        if dpiPool_getBusyCount(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_getmode(self):
-        """
-        Internal method for getting the method by which connections are
-        acquired from the pool.
-        """
-        cdef uint8_t value
-        if dpiPool_getGetMode(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_max_lifetime_session(self):
-        """
-        Internal method for getting the maximum lifetime of each session.
-        """
-        cdef uint32_t value
-        if dpiPool_getMaxLifetimeSession(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_max_sessions_per_shard(self):
-        """
-        Internal method for getting the maximum sessions per shard in the pool.
-        """
-        cdef uint32_t value
-        if dpiPool_getMaxSessionsPerShard(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_open_count(self):
-        """
-        Internal method for getting the number of connections in the pool.
-        """
-        cdef uint32_t value
-        if dpiPool_getOpenCount(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_ping_interval(self):
-        """
-        Internal method for getting the value of the pool-ping-interval.
-        """
-        cdef int value
-        if dpiPool_getPingInterval(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_soda_metadata_cache(self):
-        """
-        Internal method for getting the value of soda metadata cache.
-        """
-        cdef bint value
-        if dpiPool_getSodaMetadataCache(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_stmt_cache_size(self):
-        """
-        Internal method for getting the size of the statement cache.
-        """
-        cdef uint32_t value
-        if dpiPool_getStmtCacheSize(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_timeout(self):
-        """
-        Internal method for getting the timeout for idle sessions.
-        """
-        cdef uint32_t value
-        if dpiPool_getTimeout(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_wait_timeout(self):
-        """
-        Internal method for getting the wait timeout for acquiring sessions.
-        """
-        cdef uint32_t value
-        if dpiPool_getWaitTimeout(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def reconfigure(self, uint32_t min, uint32_t max, uint32_t increment):
-        """
-        Internal method for reconfiguring the size of the pool.
-        """
-        if dpiPool_reconfigure(self._handle, min, max, increment) < 0:
-            _raise_from_odpi()
-        self.min = min
-        self.max = max
-        self.increment = increment
-
-    def return_connection(self, ThickConnImpl conn_impl, bint in_del=False):
-        """
-        Internal method for returning a connection to the pool.
-        """
-        conn_impl.close(in_del)
-
-    def set_getmode(self, uint8_t value):
-        """
-        Internal method for setting the method by which connections are
-        acquired from the pool.
-        """
-        if dpiPool_setGetMode(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_max_lifetime_session(self, uint32_t value):
-        """
-        Internal method for setting the maximum lifetime of each session.
-        """
-        if dpiPool_setMaxLifetimeSession(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_max_sessions_per_shard(self, uint32_t value):
-        """
-        Internal method for setting the maximum sessions per shard in the pool.
-        """
-        if dpiPool_setMaxSessionsPerShard(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_ping_interval(self, int value):
-        """
-        Internal method for setting the value of the pool-ping-interval.
-        """
-        if dpiPool_setPingInterval(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_soda_metadata_cache(self, bint value):
-        """
-        Internal method for enabling or disabling the soda metadata cache.
-        """
-        if dpiPool_setSodaMetadataCache(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_stmt_cache_size(self, uint32_t value):
-        """
-        Internal method for setting the size of the statement cache.
-        """
-        if dpiPool_setStmtCacheSize(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_timeout(self, uint32_t value):
-        """
-        Internal method for setting the timeout for idle sessions.
-        """
-        if dpiPool_setTimeout(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_wait_timeout(self, uint32_t value):
-        """
-        Internal method for setting the wait timeout for acquiring sessions.
-        """
-        if dpiPool_setWaitTimeout(self._handle, value) < 0:
-            _raise_from_odpi()
diff --git a/src/oracledb/impl/thick/queue.pyx b/src/oracledb/impl/thick/queue.pyx
deleted file mode 100644
index 77694a0d..00000000
--- a/src/oracledb/impl/thick/queue.pyx
+++ /dev/null
@@ -1,643 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# queue.pyx
-#
-# Cython file defining the thick Queue implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThickQueueImpl(BaseQueueImpl):
-    cdef:
-        dpiQueue* _handle
-        ThickConnImpl _conn_impl
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiQueue_release(self._handle)
-
-    def deq_many(self, uint32_t max_num_messages):
-        """
-        Internal method for dequeuing multiple message from a queue.
-        """
-        cdef:
-            uint32_t num_props = max_num_messages, processed_props = 0, i
-            dpiMsgProps** handles
-            ThickMsgPropsImpl props
-            ssize_t num_bytes
-            list result
-            int status
-        result = []
-        num_bytes = num_props * sizeof(dpiMsgProps*)
-        handles = <dpiMsgProps**> cpython.PyMem_Malloc(num_bytes)
-        try:
-            with nogil:
-                status = dpiQueue_deqMany(self._handle, &num_props, handles)
-            if status < 0:
-                _raise_from_odpi()
-            for i in range(num_props):
-                props = ThickMsgPropsImpl.__new__(ThickMsgPropsImpl)
-                props._handle = handles[i]
-                processed_props += 1
-                props._initialize(self)
-                result.append(props)
-        finally:
-            for i in range(processed_props, num_props):
-                dpiMsgProps_release(handles[i])
-            cpython.PyMem_Free(handles)
-        return result
-
-    def deq_one(self):
-        """
-        Internal method for dequeuing a single message from a queue.
-        """
-        cdef:
-            ThickMsgPropsImpl props
-            int status
-        props = ThickMsgPropsImpl.__new__(ThickMsgPropsImpl)
-        with nogil:
-            status = dpiQueue_deqOne(self._handle, &props._handle)
-        if status < 0:
-            _raise_from_odpi()
-        if props._handle != NULL:
-            props._initialize(self)
-            return props
-
-    def enq_many(self, list props_impls):
-        """
-        Internal method for enqueuing many messages into a queue.
-        """
-        cdef:
-            uint32_t i, num_props = 0
-            ThickMsgPropsImpl props
-            dpiMsgProps **handles
-            ssize_t num_bytes
-            int status
-        num_props = <uint32_t> len(props_impls)
-        num_bytes = num_props * sizeof(dpiMsgProps*)
-        handles = <dpiMsgProps**> cpython.PyMem_Malloc(num_bytes)
-        for i, props in enumerate(props_impls):
-            handles[i] = props._handle
-        with nogil:
-            status = dpiQueue_enqMany(self._handle, num_props, handles)
-        cpython.PyMem_Free(handles)
-        if status < 0:
-            _raise_from_odpi()
-
-    def enq_one(self, ThickMsgPropsImpl props_impl):
-        """
-        Internal method for enqueuing a single message into a queue.
-        """
-        cdef int status
-        with nogil:
-            status = dpiQueue_enqOne(self._handle, props_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def initialize(self, ThickConnImpl conn_impl, str name,
-                   ThickDbObjectTypeImpl payload_type, bint is_json):
-        """
-        Internal method for initializing the queue.
-        """
-        cdef:
-            ThickDeqOptionsImpl deq_options_impl
-            ThickEnqOptionsImpl enq_options_impl
-            dpiObjectType* type_handle = NULL
-            StringBuffer buf = StringBuffer()
-        self._conn_impl = conn_impl
-        self.is_json = is_json
-        buf.set_value(name)
-        if is_json:
-            if dpiConn_newJsonQueue(conn_impl._handle, buf.ptr, buf.length,
-                                    &self._handle) < 0:
-                _raise_from_odpi()
-        else:
-            if payload_type is not None:
-                type_handle = payload_type._handle
-            if dpiConn_newQueue(conn_impl._handle, buf.ptr, buf.length,
-                                type_handle, &self._handle) < 0:
-                _raise_from_odpi()
-        deq_options_impl = ThickDeqOptionsImpl.__new__(ThickDeqOptionsImpl)
-        if dpiQueue_getDeqOptions(self._handle, &deq_options_impl._handle) < 0:
-            _raise_from_odpi()
-        self.deq_options_impl = deq_options_impl
-        enq_options_impl = ThickEnqOptionsImpl.__new__(ThickEnqOptionsImpl)
-        if dpiQueue_getEnqOptions(self._handle, &enq_options_impl._handle) < 0:
-            _raise_from_odpi()
-        self.enq_options_impl = enq_options_impl
-        self.payload_type = payload_type
-        self.name = name
-
-
-cdef class ThickDeqOptionsImpl(BaseDeqOptionsImpl):
-    cdef:
-        dpiDeqOptions* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiDeqOptions_release(self._handle)
-
-    def get_condition(self):
-        """
-        Internal method for getting the condition.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiDeqOptions_getCondition(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_consumer_name(self):
-        """
-        Internal method for getting the consumer name.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiDeqOptions_getConsumerName(self._handle, &value,
-                                         &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_correlation(self):
-        """
-        Internal method for getting the correlation.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiDeqOptions_getCorrelation(self._handle, &value,
-                                        &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_message_id(self):
-        """
-        Internal method for getting the message id.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiDeqOptions_getMsgId(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length]
-
-    def get_mode(self):
-        """
-        Internal method for getting the mode.
-        """
-        cdef uint32_t value
-        if dpiDeqOptions_getMode(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_navigation(self):
-        """
-        Internal method for getting the navigation.
-        """
-        cdef uint32_t value
-        if dpiDeqOptions_getNavigation(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_transformation(self):
-        """
-        Internal method for getting the transformation.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiDeqOptions_getTransformation(self._handle, &value,
-                                           &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_visibility(self):
-        """
-        Internal method for getting the visibility.
-        """
-        cdef uint32_t value
-        if dpiDeqOptions_getVisibility(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_wait(self):
-        """
-        Internal method for getting the wait.
-        """
-        cdef uint32_t value
-        if dpiDeqOptions_getWait(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def set_condition(self, str value):
-        """
-        Internal method for setting the condition.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiDeqOptions_setCondition(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_consumer_name(self, str value):
-        """
-        Internal method for setting the consumer name.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiDeqOptions_setConsumerName(self._handle, buf.ptr,
-                                         buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_correlation(self, str value):
-        """
-        Internal method for setting the correlation.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiDeqOptions_setCorrelation(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_delivery_mode(self, uint16_t value):
-        """
-        Internal method for setting the delivery mode.
-        """
-        if dpiDeqOptions_setDeliveryMode(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_mode(self, uint32_t value):
-        """
-        Internal method for setting the mode.
-        """
-        if dpiDeqOptions_setMode(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_message_id(self, bytes value):
-        """
-        Internal method for setting the message id.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiDeqOptions_setMsgId(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_navigation(self, uint32_t value):
-        """
-        Internal method for setting the navigation.
-        """
-        if dpiDeqOptions_setNavigation(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_transformation(self, str value):
-        """
-        Internal method for setting the transformation.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiDeqOptions_setTransformation(self._handle, buf.ptr,
-                                           buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_visibility(self, uint32_t value):
-        """
-        Internal method for setting the visibility.
-        """
-        if dpiDeqOptions_setVisibility(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_wait(self, uint32_t value):
-        """
-        Internal method for setting the wait.
-        """
-        if dpiDeqOptions_setWait(self._handle, value) < 0:
-            _raise_from_odpi()
-
-
-cdef class ThickEnqOptionsImpl(BaseEnqOptionsImpl):
-    cdef:
-        dpiEnqOptions* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiEnqOptions_release(self._handle)
-
-    def get_transformation(self):
-        """
-        Internal method for getting the transformation.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiEnqOptions_getTransformation(self._handle, &value,
-                                           &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_visibility(self):
-        """
-        Internal method for getting the visibility.
-        """
-        cdef uint32_t value
-        if dpiEnqOptions_getVisibility(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def set_delivery_mode(self, uint16_t value):
-        """
-        Internal method for setting the delivery mode.
-        """
-        if dpiEnqOptions_setDeliveryMode(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_transformation(self, str value):
-        """
-        Internal method for setting the transformation.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiEnqOptions_setTransformation(self._handle, buf.ptr,
-                                           buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_visibility(self, uint32_t value):
-        """
-        Internal method for setting the visibility.
-        """
-        if dpiEnqOptions_setVisibility(self._handle, value) < 0:
-            _raise_from_odpi()
-
-
-cdef class ThickMsgPropsImpl(BaseMsgPropsImpl):
-    cdef:
-        dpiMsgProps* _handle
-        ThickConnImpl _conn_impl
-        bint _has_been_dequeued
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiMsgProps_release(self._handle)
-
-    cdef int _initialize(self, ThickQueueImpl queue_impl) except -1:
-        cdef:
-            dpiObject *payload_obj_handle
-            ThickDbObjectImpl obj_impl
-            const char *payload_ptr
-            uint32_t payload_len
-            dpiJsonNode *node
-            dpiJson *json
-
-        self._has_been_dequeued = True
-        self._conn_impl = queue_impl._conn_impl
-        if queue_impl.is_json:
-            if dpiMsgProps_getPayloadJson(self._handle, &json) < 0:
-                _raise_from_odpi()
-            if dpiJson_getValue(json, DPI_JSON_OPT_NUMBER_AS_STRING,
-                                &node) < 0:
-                _raise_from_odpi()
-            self.payload = _convert_from_json_node(node)
-        else:
-            if dpiMsgProps_getPayload(self._handle, &payload_obj_handle,
-                                      &payload_ptr, &payload_len) < 0:
-                _raise_from_odpi()
-            if payload_obj_handle != NULL:
-                obj_impl = ThickDbObjectImpl.__new__(ThickDbObjectImpl)
-                obj_impl.type = queue_impl.payload_type
-                if dpiObject_addRef(payload_obj_handle) < 0:
-                    _raise_from_odpi()
-                obj_impl._handle = payload_obj_handle
-                self.payload = PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-            else:
-                self.payload = payload_ptr[:payload_len]
-
-    def get_num_attempts(self):
-        """
-        Internal method for getting the number of attempts made.
-        """
-        cdef int32_t value
-        if dpiMsgProps_getNumAttempts(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_correlation(self):
-        """
-        Internal method for getting the correlation.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiMsgProps_getCorrelation(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_delay(self):
-        """
-        Internal method for getting the delay.
-        """
-        cdef int32_t value
-        if dpiMsgProps_getDelay(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_delivery_mode(self):
-        """
-        Internal method for getting the delivery mode.
-        """
-        cdef uint16_t value
-        if dpiMsgProps_getDeliveryMode(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_enq_time(self):
-        """
-        Internal method for getting the enqueue time.
-        """
-        cdef dpiTimestamp timestamp
-        if self._has_been_dequeued:
-            if dpiMsgProps_getEnqTime(self._handle, &timestamp) < 0:
-                _raise_from_odpi()
-            return cydatetime.datetime_new(timestamp.year, timestamp.month,
-                                           timestamp.day, timestamp.hour,
-                                           timestamp.minute, timestamp.second,
-                                           timestamp.fsecond // 1000, None)
-
-    def get_exception_queue(self):
-        """
-        Internal method for getting the exception queue.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiMsgProps_getExceptionQ(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length].decode()
-
-    def get_expiration(self):
-        """
-        Internal method for getting the message expiration.
-        """
-        cdef int32_t value
-        if dpiMsgProps_getExpiration(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_message_id(self):
-        """
-        Internal method for getting the message id.
-        """
-        cdef:
-            uint32_t value_length
-            const char *value
-        if dpiMsgProps_getMsgId(self._handle, &value, &value_length) < 0:
-            _raise_from_odpi()
-        if value != NULL:
-            return value[:value_length]
-
-    def get_priority(self):
-        """
-        Internal method for getting the priority.
-        """
-        cdef int32_t value
-        if dpiMsgProps_getPriority(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def get_state(self):
-        """
-        Internal method for getting the message state.
-        """
-        cdef uint32_t value
-        if dpiMsgProps_getState(self._handle, &value) < 0:
-            _raise_from_odpi()
-        return value
-
-    def set_correlation(self, str value):
-        """
-        Internal method for setting the correlation.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiMsgProps_setCorrelation(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_delay(self, int32_t value):
-        """
-        Internal method for setting the correlation.
-        """
-        if dpiMsgProps_setDelay(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_exception_queue(self, str value):
-        """
-        Internal method for setting the exception queue.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value or "")
-        if dpiMsgProps_setExceptionQ(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_expiration(self, int32_t value):
-        """
-        Internal method for setting the message expiration.
-        """
-        if dpiMsgProps_setExpiration(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_payload_bytes(self, bytes value):
-        """
-        Internal method for setting the payload from bytes.
-        """
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value)
-        if dpiMsgProps_setPayloadBytes(self._handle, buf.ptr, buf.length) < 0:
-            _raise_from_odpi()
-
-    def set_payload_object(self, ThickDbObjectImpl obj_impl):
-        """
-        Internal method for setting the payload from an object.
-        """
-        if dpiMsgProps_setPayloadObject(self._handle, obj_impl._handle) < 0:
-            _raise_from_odpi()
-
-    def set_payload_json(self, object json_val):
-        """
-        Internal method for setting the payload from a JSON object
-        """
-        cdef:
-            JsonBuffer json_buf = JsonBuffer()
-            dpiJson *json
-
-        json_buf.from_object(json_val)
-        if dpiConn_newJson(self._conn_impl._handle, &json) < 0:
-            _raise_from_odpi()
-        try:
-            if dpiJson_setValue(json, &json_buf._top_node) < 0:
-                _raise_from_odpi()
-            if dpiMsgProps_setPayloadJson(self._handle, json) < 0:
-                _raise_from_odpi()
-        finally:
-            dpiJson_release(json)
-
-    def set_priority(self, int32_t value):
-        """
-        Internal method for setting the priority.
-        """
-        if dpiMsgProps_setPriority(self._handle, value) < 0:
-            _raise_from_odpi()
-
-    def set_recipients(self, list value):
-        """
-        Internal method for setting the recipients list.
-        """
-        cdef:
-            dpiMsgRecipient *recipients
-            uint32_t num_recipients
-            ssize_t num_bytes
-            list buffers = []
-            StringBuffer buf
-
-        num_recipients = <uint32_t> len(value)
-        num_bytes = num_recipients * sizeof(dpiMsgRecipient)
-        recipients = <dpiMsgRecipient*> cpython.PyMem_Malloc(num_bytes)
-        try:
-            for i in range(num_recipients):
-                buf = StringBuffer()
-                buf.set_value(value[i])
-                buffers.append(buf)
-                recipients[i].name = buf.ptr
-                recipients[i].nameLength = buf.length
-            if dpiMsgProps_setRecipients(self._handle, recipients,
-                                         num_recipients) < 0:
-                _raise_from_odpi()
-        finally:
-            cpython.PyMem_Free(recipients)
diff --git a/src/oracledb/impl/thick/soda.pyx b/src/oracledb/impl/thick/soda.pyx
deleted file mode 100644
index 90d1bf98..00000000
--- a/src/oracledb/impl/thick/soda.pyx
+++ /dev/null
@@ -1,698 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# soda.pyx
-#
-# Cython file defining the thick implementation SODA classes (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThickSodaDbImpl(BaseSodaDbImpl):
-    cdef:
-        dpiSodaDb* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiSodaDb_release(self._handle)
-
-    cdef int _get_flags(self, uint32_t* flags) except -1:
-        self._conn._verify_connected()
-        if self._conn.autocommit:
-            flags[0] = DPI_SODA_FLAGS_ATOMIC_COMMIT
-        else:
-            flags[0] = DPI_SODA_FLAGS_DEFAULT
-
-    def create_collection(self, str name, str metadata, bint map_mode):
-        """
-        Internal method for creating a collection.
-        """
-        cdef:
-            StringBuffer metadata_buf = StringBuffer()
-            StringBuffer name_buf = StringBuffer()
-            ThickSodaCollImpl coll_impl
-            uint32_t flags
-            int status
-        name_buf.set_value(name)
-        metadata_buf.set_value(metadata)
-        self._get_flags(&flags)
-        if map_mode:
-            flags |= DPI_SODA_FLAGS_CREATE_COLL_MAP
-        coll_impl = ThickSodaCollImpl.__new__(ThickSodaCollImpl)
-        coll_impl._db_impl = self
-        with nogil:
-            status = dpiSodaDb_createCollection(self._handle, name_buf.ptr,
-                                                name_buf.length,
-                                                metadata_buf.ptr,
-                                                metadata_buf.length, flags,
-                                                &coll_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        coll_impl._get_name()
-        return coll_impl
-
-    def create_document(self, bytes content, str key, str media_type):
-        """
-        Internal method for creating a document containing binary or encoded
-        text data.
-        """
-        cdef:
-            StringBuffer media_type_buf = StringBuffer()
-            StringBuffer content_buf = StringBuffer()
-            StringBuffer key_buf = StringBuffer()
-            ThickSodaDocImpl doc_impl
-        content_buf.set_value(content)
-        key_buf.set_value(key)
-        media_type_buf.set_value(media_type)
-        doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-        if dpiSodaDb_createDocument(self._handle, key_buf.ptr, key_buf.length,
-                                    content_buf.ptr, content_buf.length,
-                                    media_type_buf.ptr, media_type_buf.length,
-                                    DPI_SODA_FLAGS_DEFAULT,
-                                    &doc_impl._handle) < 0:
-            _raise_from_odpi()
-        return doc_impl
-
-    def create_json_document(self, object content, str key):
-        """
-        Internal method for creating a document containing JSON.
-        """
-        cdef:
-            StringBuffer key_buf = StringBuffer()
-            JsonBuffer json_buf = JsonBuffer()
-            ThickSodaDocImpl doc_impl
-        key_buf.set_value(key)
-        json_buf.from_object(content)
-        doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-        if dpiSodaDb_createJsonDocument(self._handle, key_buf.ptr,
-                                        key_buf.length, &json_buf._top_node,
-                                        DPI_SODA_FLAGS_DEFAULT,
-                                        &doc_impl._handle) < 0:
-            _raise_from_odpi()
-        return doc_impl
-
-    def get_collection_names(self, str start_name, uint32_t limit):
-        """
-        Internal method for getting the list of collection names.
-        """
-        cdef:
-            StringBuffer start_name_buf = StringBuffer()
-            dpiStringList names
-            uint32_t flags
-            int status
-        start_name_buf.set_value(start_name)
-        self._get_flags(&flags)
-        with nogil:
-            status = dpiSodaDb_getCollectionNames(self._handle,
-                                                  start_name_buf.ptr,
-                                                  start_name_buf.length,
-                                                  limit, flags, &names)
-        if status < 0:
-            _raise_from_odpi()
-        return _string_list_to_python(&names)
-
-    def open_collection(self, str name):
-        """
-        Internal method for opening a collection.
-        """
-        cdef:
-            StringBuffer name_buf = StringBuffer()
-            ThickSodaCollImpl coll_impl
-            uint32_t flags
-            int status
-        name_buf.set_value(name)
-        self._get_flags(&flags)
-        coll_impl = ThickSodaCollImpl.__new__(ThickSodaCollImpl)
-        coll_impl._db_impl = self
-        with nogil:
-            status = dpiSodaDb_openCollection(self._handle, name_buf.ptr,
-                                              name_buf.length, flags,
-                                              &coll_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        if coll_impl._handle != NULL:
-            coll_impl._get_name()
-            return coll_impl
-
-
-cdef class ThickSodaCollImpl(BaseSodaCollImpl):
-    cdef:
-        ThickSodaDbImpl _db_impl
-        dpiSodaColl* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiSodaColl_release(self._handle)
-
-    cdef int _get_name(self) except -1:
-        """
-        Internal method for getting the name of the collection.
-        """
-        cdef:
-            uint32_t name_len
-            const char *name
-        if dpiSodaColl_getName(self._handle, &name, &name_len) < 0:
-            _raise_from_odpi()
-        self.name = name[:name_len].decode()
-
-    cdef int _process_options(self, dpiSodaOperOptions *options,
-                              const char *ptr, uint32_t length) except -1:
-        """
-        Internal method for populating the SODA operations structure with the
-        information provided by the user.
-        """
-        if dpiContext_initSodaOperOptions(driver_info.context, options) < 0:
-            _raise_from_odpi()
-        options.hint = ptr
-        options.hintLength = length
-
-    def create_index(self, str spec):
-        """
-        Internal method for creating an index on a collection.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            uint32_t flags
-            int status
-        buf.set_value(spec)
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_createIndex(self._handle, buf.ptr, buf.length,
-                                             flags)
-        if status < 0:
-            _raise_from_odpi()
-
-    def drop(self):
-        """
-        Internal method for dropping a collection.
-        """
-        cdef:
-            bint is_dropped
-            uint32_t flags
-        self._db_impl._get_flags(&flags)
-        if dpiSodaColl_drop(self._handle, flags, &is_dropped) < 0:
-            _raise_from_odpi()
-        return is_dropped
-
-    def drop_index(self, str name, bint force):
-        """
-        Internal method for dropping an index on a collection.
-        """
-        cdef:
-            StringBuffer buf = StringBuffer()
-            bint is_dropped
-            uint32_t flags
-            int status
-        buf.set_value(name)
-        self._db_impl._get_flags(&flags)
-        if force:
-            flags |= DPI_SODA_FLAGS_INDEX_DROP_FORCE
-        with nogil:
-            status = dpiSodaColl_dropIndex(self._handle, buf.ptr, buf.length,
-                                           flags, &is_dropped)
-        if status < 0:
-            _raise_from_odpi()
-        return is_dropped
-
-    def get_count(self, object op):
-        """
-        Internal method for getting the count of documents matching the
-        criteria.
-        """
-        cdef:
-            ThickSodaOpImpl options = ThickSodaOpImpl._from_op(op)
-            uint64_t count
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_getDocCount(self._handle, &options._options,
-                                             flags, &count)
-        if status < 0:
-            _raise_from_odpi()
-        return count
-
-    def get_cursor(self, object op):
-        """
-        Internal method for getting a cursor which will return the documents
-        matching the criteria.
-        """
-        cdef:
-            ThickSodaOpImpl options = ThickSodaOpImpl._from_op(op)
-            ThickSodaDocCursorImpl cursor_impl
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        cursor_impl = ThickSodaDocCursorImpl.__new__(ThickSodaDocCursorImpl)
-        cursor_impl._db_impl = self._db_impl
-        with nogil:
-            status = dpiSodaColl_find(self._handle, &options._options, flags,
-                                      &cursor_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        return cursor_impl
-
-    def get_data_guide(self):
-        """
-        Internal method for getting the data guide for a collection.
-        """
-        cdef:
-            ThickSodaDocImpl doc_impl
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-        with nogil:
-            status = dpiSodaColl_getDataGuide(self._handle, flags,
-                                              &doc_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        if doc_impl._handle != NULL:
-            return doc_impl
-
-    def get_metadata(self):
-        """
-        Internal method for getting the metadata for a collection.
-        """
-        cdef:
-            uint32_t value_len
-            const char* value
-        if dpiSodaColl_getMetadata(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        return value[:value_len].decode()
-
-    def get_one(self, object op):
-        """
-        Internal method for getting a document matching the criteria.
-        """
-        cdef:
-            ThickSodaOpImpl options = ThickSodaOpImpl._from_op(op)
-            ThickSodaDocImpl doc_impl
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-        with nogil:
-            status = dpiSodaColl_findOne(self._handle, &options._options,
-                                         flags, &doc_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        if doc_impl._handle != NULL:
-            return doc_impl
-
-    def insert_many(self, list doc_impls, str hint, bint return_docs):
-        """
-        Internal method for inserting many documents into a collection at once.
-        """
-        cdef:
-            dpiSodaDoc **output_handles = NULL
-            uint32_t i, num_docs, flags
-            ThickSodaDocImpl doc_impl
-            list output_doc_impls
-            dpiSodaDoc **handles
-            ssize_t num_bytes
-            dpiSodaOperOptions options
-            dpiSodaOperOptions *options_ptr = NULL
-            StringBuffer hint_buf = StringBuffer()
-            int status
-        num_docs = <uint32_t> len(doc_impls)
-        num_bytes = num_docs * sizeof(dpiSodaDoc *)
-        handles = <dpiSodaDoc**> cpython.PyMem_Malloc(num_bytes)
-        if return_docs:
-            output_handles = <dpiSodaDoc**> _calloc(num_docs,
-                                                    sizeof(dpiSodaDoc*))
-            if hint is not None:
-                hint_buf.set_value(hint)
-                options_ptr = &options
-                self._process_options(&options, hint_buf.ptr, hint_buf.length)
-        for i, doc_impl in enumerate(doc_impls):
-            handles[i] = doc_impl._handle
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_insertManyWithOptions(self._handle, num_docs,
-                                                       handles, options_ptr,
-                                                       flags, output_handles)
-        if status < 0:
-            _raise_from_odpi()
-        if return_docs:
-            output_doc_impls = []
-            for i in range(num_docs):
-                doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-                doc_impl._handle = output_handles[i]
-                output_doc_impls.append(doc_impl)
-            return output_doc_impls
-
-    def insert_one(self, ThickSodaDocImpl doc_impl, str hint, bint return_doc):
-        """
-        Internal method for inserting a single document into a collection.
-        """
-        cdef:
-            dpiSodaDoc **output_handle = NULL
-            ThickSodaDocImpl output_doc_impl
-            uint32_t flags
-            dpiSodaOperOptions options
-            dpiSodaOperOptions *options_ptr = NULL
-            StringBuffer hint_buf = StringBuffer()
-            int status
-        if return_doc:
-            output_doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-            output_handle = &output_doc_impl._handle
-            if hint is not None:
-               hint_buf.set_value(hint)
-               options_ptr = &options
-               self._process_options(&options, hint_buf.ptr, hint_buf.length)
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_insertOneWithOptions(self._handle,
-                                                      doc_impl._handle,
-                                                      options_ptr, flags,
-                                                      output_handle)
-        if status < 0:
-            _raise_from_odpi()
-        if return_doc:
-            return output_doc_impl
-
-    def list_indexes(self):
-        """
-        Internal method for getting the list of indexes on a collection.
-        """
-        cdef:
-            dpiStringList indexes
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_listIndexes(self._handle, flags, &indexes)
-        if status < 0:
-            _raise_from_odpi()
-        return _string_list_to_python(&indexes)
-
-    def remove(self, object op):
-        """
-        Internal method for removing all of the documents matching the
-        criteria.
-        """
-        cdef:
-            ThickSodaOpImpl options = ThickSodaOpImpl._from_op(op)
-            uint64_t count
-            uint32_t flags
-            int status
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_remove(self._handle, &options._options, flags,
-                                        &count)
-        if status < 0:
-            _raise_from_odpi()
-        return count
-
-    def replace_one(self, object op, ThickSodaDocImpl doc_impl,
-                    bint return_doc):
-        """
-        Internal method for replacing the document matching the criteria with
-        the supplied coument.
-        """
-        cdef:
-            ThickSodaOpImpl options = ThickSodaOpImpl._from_op(op)
-            dpiSodaDoc **output_handle = NULL
-            ThickSodaDocImpl output_doc_impl
-            uint32_t flags
-            bint replaced
-            int status
-        if return_doc:
-            output_doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-            output_handle = &output_doc_impl._handle
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_replaceOne(self._handle, &options._options,
-                                            doc_impl._handle, flags, &replaced,
-                                            output_handle)
-        if status < 0:
-            _raise_from_odpi()
-        if return_doc:
-            return output_doc_impl
-        return replaced
-
-    def save(self, ThickSodaDocImpl doc_impl, str hint, bint return_doc):
-        """
-        Internal method for saving a document into the collection.
-        """
-        cdef:
-            dpiSodaDoc **output_handle = NULL
-            ThickSodaDocImpl output_doc_impl
-            uint32_t flags
-            dpiSodaOperOptions options
-            dpiSodaOperOptions *options_ptr = NULL
-            StringBuffer hint_buf = StringBuffer()
-            int status
-        if return_doc:
-            output_doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-            output_handle = &output_doc_impl._handle
-            if hint is not None:
-               hint_buf.set_value(hint)
-               options_ptr = &options
-               self._process_options(&options, hint_buf.ptr, hint_buf.length)
-        self._db_impl._get_flags(&flags)
-        with nogil:
-            status = dpiSodaColl_saveWithOptions(self._handle,
-                                                 doc_impl._handle,
-                                                 options_ptr, flags,
-                                                 output_handle)
-        if status < 0:
-            _raise_from_odpi()
-        if return_doc:
-            return output_doc_impl
-
-    def truncate(self):
-        """
-        Internal method for truncating the collection (removing all documents
-        from it).
-        """
-        cdef int status
-        with nogil:
-            status = dpiSodaColl_truncate(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-
-cdef class ThickSodaDocImpl(BaseSodaDocImpl):
-    cdef:
-        dpiSodaDoc* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiSodaDoc_release(self._handle)
-
-    def get_content(self):
-        """
-        Internal method for returning the content of the document.
-        """
-        cdef:
-            object out_content = None
-            str out_encoding = None
-            const char *encoding
-            uint32_t content_len
-            const char *content
-            dpiJson *json
-            bint is_json
-        if dpiSodaDoc_getIsJson(self._handle, &is_json) < 0:
-            _raise_from_odpi()
-        if is_json:
-            if dpiSodaDoc_getJsonContent(self._handle, &json) < 0:
-                _raise_from_odpi()
-            out_content = _convert_json_to_python(json)
-        else:
-            if dpiSodaDoc_getContent(self._handle, &content, &content_len,
-                                    &encoding) < 0:
-                _raise_from_odpi()
-            if content != NULL:
-                out_content = content[:content_len]
-            if encoding != NULL:
-                out_encoding = encoding.decode()
-            else:
-                out_encoding = "UTF-8"
-        return (out_content, out_encoding)
-
-    def get_created_on(self):
-        """
-        Internal method for getting the date the document was created.
-        """
-        cdef:
-            uint32_t value_len
-            const char *value
-        if dpiSodaDoc_getCreatedOn(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        if value_len > 0:
-            return value[:value_len].decode()
-
-    def get_key(self):
-        """
-        Internal method for getting the key of the document.
-        """
-        cdef:
-            uint32_t value_len
-            const char *value
-        if dpiSodaDoc_getKey(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        if value_len > 0:
-            return value[:value_len].decode()
-
-    def get_last_modified(self):
-        """
-        Internal method for getting the date the document was last modified.
-        """
-        cdef:
-            uint32_t value_len
-            const char *value
-        if dpiSodaDoc_getLastModified(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        if value_len > 0:
-            return value[:value_len].decode()
-
-    def get_media_type(self):
-        """
-        Internal method for getting the media type of the document.
-        """
-        cdef:
-            uint32_t value_len
-            const char *value
-        if dpiSodaDoc_getMediaType(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        if value_len > 0:
-            return value[:value_len].decode()
-
-    def get_version(self):
-        """
-        Internal method for getting the version of the document.
-        """
-        cdef:
-            uint32_t value_len
-            const char *value
-        if dpiSodaDoc_getVersion(self._handle, &value, &value_len) < 0:
-            _raise_from_odpi()
-        if value_len > 0:
-            return value[:value_len].decode()
-
-
-cdef class ThickSodaDocCursorImpl(BaseSodaDocCursorImpl):
-    cdef:
-        dpiSodaDocCursor* _handle
-        ThickSodaDbImpl _db_impl
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiSodaDocCursor_release(self._handle)
-
-    def close(self):
-        """
-        Internal method for closing the cursor.
-        """
-        cdef int status
-        with nogil:
-            status = dpiSodaDocCursor_close(self._handle)
-        if status < 0:
-            _raise_from_odpi()
-
-    def get_next_doc(self):
-        """
-        Internal method for getting the next document from the cursor.
-        """
-        cdef:
-            ThickSodaDocImpl doc_impl
-            int status
-        doc_impl = ThickSodaDocImpl.__new__(ThickSodaDocImpl)
-        with nogil:
-            status = dpiSodaDocCursor_getNext(self._handle,
-                                              DPI_SODA_FLAGS_DEFAULT,
-                                              &doc_impl._handle)
-        if status < 0:
-            _raise_from_odpi()
-        if doc_impl._handle != NULL:
-            return doc_impl
-
-
-cdef class ThickSodaOpImpl:
-    cdef:
-        dpiSodaOperOptions _options
-        const char** _key_values
-        uint32_t* _key_lengths
-        list _buffers
-
-    def __dealloc__(self):
-        if self._key_values != NULL:
-            cpython.PyMem_Free(self._key_values)
-        if self._key_lengths != NULL:
-            cpython.PyMem_Free(self._key_lengths)
-
-    cdef int _add_buf(self, object value, const char **ptr,
-                      uint32_t *length) except -1:
-        cdef StringBuffer buf = StringBuffer()
-        buf.set_value(value)
-        self._buffers.append(buf)
-        ptr[0] = buf.ptr
-        length[0] = buf.length
-
-    @staticmethod
-    cdef ThickSodaOpImpl _from_op(object op):
-        """
-        Internal method for creating a SODA operations implementation object
-        given the object supplied by the user.
-        """
-        cdef:
-            ThickSodaOpImpl impl = ThickSodaOpImpl.__new__(ThickSodaOpImpl)
-            dpiSodaOperOptions *options
-            ssize_t num_bytes
-            uint32_t i
-        impl._buffers = []
-        options = &impl._options
-        if dpiContext_initSodaOperOptions(driver_info.context, options) < 0:
-            _raise_from_odpi()
-        if op._keys:
-            options.numKeys = <uint32_t> len(op._keys)
-            num_bytes = options.numKeys * sizeof(char*)
-            impl._key_values = <const char**> cpython.PyMem_Malloc(num_bytes)
-            num_bytes = options.numKeys * sizeof(uint32_t)
-            impl._key_lengths = <uint32_t*> cpython.PyMem_Malloc(num_bytes)
-            options.keys = impl._key_values
-            options.keyLengths = impl._key_lengths
-            for i in range(options.numKeys):
-                impl._add_buf(op._keys[i], &impl._key_values[i],
-                              &impl._key_lengths[i])
-        if op._key is not None:
-            impl._add_buf(op._key, &options.key, &options.keyLength)
-        if op._version is not None:
-            impl._add_buf(op._version, &options.version,
-                          &options.versionLength)
-        if op._filter is not None:
-            impl._add_buf(op._filter, &options.filter, &options.filterLength)
-        if op._hint is not None:
-            impl._add_buf(op._hint, &options.hint, &options.hintLength)
-        if op._skip is not None:
-            options.skip = op._skip
-        if op._limit is not None:
-            options.limit = op._limit
-        if op._fetch_array_size is not None:
-            options.fetchArraySize = op._fetch_array_size
-        if op._lock:
-            options.lock = True
-        return impl
diff --git a/src/oracledb/impl/thick/subscr.pyx b/src/oracledb/impl/thick/subscr.pyx
deleted file mode 100644
index 0b7d93ab..00000000
--- a/src/oracledb/impl/thick/subscr.pyx
+++ /dev/null
@@ -1,183 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# subscr.pyx
-#
-# Cython file defining the thick Subscription implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef int _callback_handler(void* context,
-                           dpiSubscrMessage* message) except -1 with gil:
-    cdef:
-        object subscr = <object> context
-        ThickSubscrImpl subscr_impl
-        object py_message
-    if message.errorInfo:
-        _raise_from_info(message.errorInfo)
-    else:
-        subscr_impl = subscr._impl
-        py_message = PY_TYPE_MESSAGE(subscr)
-        subscr_impl._populate_message(message, py_message)
-        subscr.callback(py_message)
-
-
-cdef class ThickSubscrImpl(BaseSubscrImpl):
-    cdef:
-        dpiSubscr* _handle
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiSubscr_release(self._handle)
-
-    cdef object _create_message_query(self, dpiSubscrMessageQuery* query):
-        cdef:
-            object py_query = PY_TYPE_MESSAGE_QUERY()
-            uint32_t i
-            list temp
-        py_query._id = query.id
-        py_query._operation = query.operation
-        temp = py_query._tables
-        for i in range(query.numTables):
-            temp.append(self._create_message_table(&query.tables[i]))
-        return py_query
-
-    cdef object _create_message_row(self, dpiSubscrMessageRow* row):
-        cdef object py_row = PY_TYPE_MESSAGE_ROW()
-        py_row._operation = row.operation
-        py_row._rowid = row.rowid[:row.rowidLength].decode()
-        return py_row
-
-    cdef object _create_message_table(self, dpiSubscrMessageTable* table):
-        cdef:
-            object py_table = PY_TYPE_MESSAGE_TABLE()
-            uint32_t i
-            list temp
-        py_table._operation = table.operation
-        py_table._name = table.name[:table.nameLength].decode()
-        temp = py_table._rows
-        for i in range(table.numRows):
-            temp.append(self._create_message_row(&table.rows[i]))
-        return py_table
-
-    cdef object _populate_message(self, dpiSubscrMessage* message,
-                                  object py_message):
-        cdef:
-            const char* txid
-            list temp
-            uint32_t i
-        py_message._type = message.eventType
-        py_message._registered = message.registered
-        py_message._dbname = message.dbName[:message.dbNameLength].decode()
-        if message.txId != NULL:
-            txid = <const char*> message.txId
-            py_message._txid = txid[:message.txIdLength]
-        if message.queueName != NULL:
-            py_message._queue_name = \
-                    message.queueName[:message.queueNameLength].decode()
-        if message.consumerName != NULL:
-            py_message._consumer_name = \
-                    message.consumerName[:message.consumerNameLength].decode()
-        if message.aqMsgId != NULL:
-            msgid = <const char*> message.aqMsgId
-            py_message._msgid = msgid[:message.aqMsgIdLength]
-        if message.eventType == DPI_EVENT_OBJCHANGE:
-            temp = py_message._tables
-            for i in range(message.numTables):
-                temp.append(self._create_message_table(&message.tables[i]))
-        elif message.eventType == DPI_EVENT_QUERYCHANGE:
-            temp = py_message._queries
-            for i in range(message.numQueries):
-                temp.append(self._create_message_query(&message.queries[i]))
-
-    def register_query(self, str sql, object args):
-        """
-        Internal method for registering a query.
-        """
-        cdef:
-            StringBuffer sql_buf = StringBuffer()
-            ThickCursorImpl cursor_impl
-            uint64_t query_id
-            object cursor
-        sql_buf.set_value(sql)
-        cursor = self.connection.cursor()
-        cursor_impl = <ThickCursorImpl> cursor._impl
-        if dpiSubscr_prepareStmt(self._handle, sql_buf.ptr, sql_buf.length,
-                                 &cursor_impl._handle) < 0:
-            _raise_from_odpi()
-        if args is not None:
-            cursor_impl.bind_one(cursor, args)
-        cursor_impl.execute(cursor)
-        if self.qos & DPI_SUBSCR_QOS_QUERY:
-            if dpiStmt_getSubscrQueryId(cursor_impl._handle, &query_id) < 0:
-                _raise_from_odpi()
-            return query_id
-
-    def subscribe(self, object subscr, ThickConnImpl conn_impl):
-        """
-        Internal method for creating the subscription.
-        """
-        cdef:
-            StringBuffer ip_address_buf = StringBuffer()
-            StringBuffer name_buf = StringBuffer()
-            dpiSubscrCreateParams params
-            int status
-        name_buf.set_value(self.name)
-        ip_address_buf.set_value(self.ip_address)
-        if dpiContext_initSubscrCreateParams(driver_info.context, &params) < 0:
-            _raise_from_odpi()
-        params.subscrNamespace = self.namespace
-        params.protocol = self.protocol
-        params.qos = self.qos
-        params.operations = self.operations
-        params.portNumber = self.port
-        params.timeout = self.timeout
-        params.name = name_buf.ptr
-        params.nameLength = name_buf.length
-        if self.callback is not None:
-            params.callback = <dpiSubscrCallback> _callback_handler
-            params.callbackContext = <void*> subscr
-        params.ipAddress = ip_address_buf.ptr
-        params.ipAddressLength = ip_address_buf.length
-        params.groupingClass = self.grouping_class
-        params.groupingType = self.grouping_type
-        params.groupingValue = self.grouping_value
-        params.clientInitiated = self.client_initiated
-        with nogil:
-            status = dpiConn_subscribe(conn_impl._handle, &params,
-                                       &self._handle)
-        if status < 0:
-            _raise_from_odpi()
-        self.id = params.outRegId
-
-    def unsubscribe(self, ThickConnImpl conn_impl):
-        """
-        Internal method for destroying the subscription.
-        """
-        cdef int status
-        with nogil:
-            status = dpiConn_unsubscribe(conn_impl._handle, self._handle)
-        if status < 0:
-            _raise_from_odpi()
diff --git a/src/oracledb/impl/thick/utils.pyx b/src/oracledb/impl/thick/utils.pyx
deleted file mode 100644
index 639a4887..00000000
--- a/src/oracledb/impl/thick/utils.pyx
+++ /dev/null
@@ -1,580 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# utils.pyx
-#
-# Cython file for utility functions (embedded in thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef array.array float_template = array.array('f')
-cdef array.array double_template = array.array('d')
-cdef array.array int8_template = array.array('b')
-cdef array.array uint8_template = array.array('B')
-
-cdef object _convert_from_json_node(dpiJsonNode *node):
-    cdef:
-        VectorDecoder vector_decoder
-        dpiTimestamp *as_timestamp
-        dpiIntervalDS *as_interval
-        dpiJsonArray *array
-        dpiBytes *as_bytes
-        dpiJsonObject *obj
-        dict dict_value
-        list list_value
-        int32_t seconds
-        DbType dbtype
-        uint32_t i
-        bytes temp
-        str key
-    if node.nativeTypeNum == DPI_NATIVE_TYPE_NULL:
-        return None
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_NUMBER:
-        if node.nativeTypeNum == DPI_NATIVE_TYPE_DOUBLE:
-            return node.value.asDouble
-        elif node.nativeTypeNum == DPI_NATIVE_TYPE_FLOAT:
-            return node.value.asFloat
-        as_bytes = &node.value.asBytes
-        return PY_TYPE_DECIMAL(as_bytes.ptr[:as_bytes.length].decode())
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_VARCHAR:
-        as_bytes = &node.value.asBytes
-        return as_bytes.ptr[:as_bytes.length].decode()
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_RAW:
-        return node.value.asBytes.ptr[:node.value.asBytes.length]
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_DATE \
-            or node.oracleTypeNum == DPI_ORACLE_TYPE_TIMESTAMP:
-        as_timestamp = &node.value.asTimestamp
-        return cydatetime.datetime_new(as_timestamp.year, as_timestamp.month,
-                                       as_timestamp.day, as_timestamp.hour,
-                                       as_timestamp.minute,
-                                       as_timestamp.second,
-                                       as_timestamp.fsecond // 1000, None)
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_BOOLEAN:
-        return node.value.asBoolean
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_INTERVAL_DS:
-        as_interval = &node.value.asIntervalDS
-        seconds = as_interval.hours * 60 * 60 + as_interval.minutes * 60 + \
-                as_interval.seconds
-        return cydatetime.timedelta_new(as_interval.days, seconds,
-                                        as_interval.fseconds // 1000)
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_JSON_OBJECT:
-        obj = &node.value.asJsonObject
-        dict_value = {}
-        for i in range(obj.numFields):
-            key = obj.fieldNames[i][:obj.fieldNameLengths[i]].decode()
-            dict_value[key] = _convert_from_json_node(&obj.fields[i])
-        return dict_value
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_JSON_ARRAY:
-        array = &node.value.asJsonArray
-        list_value = [None] * array.numElements
-        for i in range(array.numElements):
-            list_value[i] = _convert_from_json_node(&array.elements[i])
-        return list_value
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_VECTOR:
-        as_bytes = &node.value.asBytes
-        vector_decoder = VectorDecoder.__new__(VectorDecoder)
-        return vector_decoder.decode(as_bytes.ptr[:as_bytes.length])
-    elif node.oracleTypeNum == DPI_ORACLE_TYPE_JSON_ID:
-        temp = node.value.asBytes.ptr[:node.value.asBytes.length]
-        return PY_TYPE_JSON_ID(temp)
-    dbtype = DbType._from_num(node.oracleTypeNum)
-    errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED, name=dbtype.name)
-
-
-cdef int _convert_from_python(object value, OracleMetadata metadata,
-                              dpiDataBuffer *dbvalue,
-                              StringBuffer buf) except -1:
-    cdef:
-        uint32_t oracle_type = metadata.dbtype.num
-        SparseVectorImpl sparse_impl
-        ThickDbObjectImpl obj_impl
-        dpiVectorInfo vector_info
-        dpiTimestamp *timestamp
-        ThickLobImpl lob_impl
-        int seconds, status
-        JsonBuffer json_buf
-        dpiVector *vector
-    if oracle_type == DPI_ORACLE_TYPE_NUMBER:
-        if isinstance(value, bool):
-            if value:
-                buf.set_value("1")
-            else:
-                buf.set_value("0")
-        elif isinstance(value, (int, float, PY_TYPE_DECIMAL)):
-            buf.set_value((<str> cpython.PyObject_Str(value)).encode())
-        else:
-            message = f"expecting number, got {type(value)}"
-            raise TypeError(message)
-        dbvalue.asBytes.ptr = buf.ptr
-        dbvalue.asBytes.length = buf.length
-    elif oracle_type == DPI_ORACLE_TYPE_NATIVE_DOUBLE \
-            or oracle_type == DPI_ORACLE_TYPE_NATIVE_FLOAT:
-        if oracle_type == DPI_ORACLE_TYPE_NATIVE_DOUBLE:
-            dbvalue.asDouble = <double> value
-        else:
-            dbvalue.asFloat = <float> value
-    elif oracle_type == DPI_ORACLE_TYPE_VARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_NVARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_CHAR \
-            or oracle_type == DPI_ORACLE_TYPE_NCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_LONG_VARCHAR:
-        buf.set_value(value)
-        dbvalue.asBytes.ptr = buf.ptr
-        dbvalue.asBytes.length = buf.length
-    elif oracle_type == DPI_ORACLE_TYPE_RAW \
-            or oracle_type == DPI_ORACLE_TYPE_LONG_RAW:
-        buf.set_value(value)
-        dbvalue.asBytes.ptr = buf.ptr
-        dbvalue.asBytes.length = buf.length
-    elif oracle_type == DPI_ORACLE_TYPE_DATE \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP_LTZ \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP_TZ:
-        memset(&dbvalue.asTimestamp, 0, sizeof(dbvalue.asTimestamp))
-        timestamp = &dbvalue.asTimestamp
-        timestamp.year = cydatetime.PyDateTime_GET_YEAR(value)
-        timestamp.month = cydatetime.PyDateTime_GET_MONTH(value)
-        timestamp.day = cydatetime.PyDateTime_GET_DAY(value)
-        if cydatetime.PyDateTime_Check(value):
-            timestamp.hour = cydatetime.PyDateTime_DATE_GET_HOUR(value)
-            timestamp.minute = cydatetime.PyDateTime_DATE_GET_MINUTE(value)
-            timestamp.second = cydatetime.PyDateTime_DATE_GET_SECOND(value)
-            timestamp.fsecond = \
-                    cydatetime.PyDateTime_DATE_GET_MICROSECOND(value) * 1000
-    elif oracle_type == DPI_ORACLE_TYPE_BOOLEAN:
-        dbvalue.asBoolean = <bint> value
-    elif oracle_type == DPI_ORACLE_TYPE_NATIVE_INT:
-        if isinstance(value, bool):
-            dbvalue.asInt64 = 1 if value else 0
-        else:
-            dbvalue.asInt64 = <int64_t> value
-    elif oracle_type == DPI_ORACLE_TYPE_INTERVAL_DS:
-        seconds = cydatetime.timedelta_seconds(value)
-        dbvalue.asIntervalDS.days = cydatetime.timedelta_days(value)
-        dbvalue.asIntervalDS.hours = seconds // 3600
-        seconds = seconds % 3600
-        dbvalue.asIntervalDS.minutes = seconds // 60
-        dbvalue.asIntervalDS.seconds = seconds % 60
-        dbvalue.asIntervalDS.fseconds = \
-                cydatetime.timedelta_microseconds(value) * 1000
-    elif oracle_type == DPI_ORACLE_TYPE_OBJECT:
-        if not isinstance(value, PY_TYPE_DB_OBJECT):
-            raise TypeError("expecting DbObject")
-        obj_impl = <ThickDbObjectImpl> value._impl
-        dbvalue.asObject = obj_impl._handle
-    elif oracle_type == DPI_ORACLE_TYPE_CLOB \
-            or oracle_type == DPI_ORACLE_TYPE_BLOB \
-            or oracle_type == DPI_ORACLE_TYPE_NCLOB \
-            or oracle_type == DPI_ORACLE_TYPE_BFILE:
-        if isinstance(value, PY_TYPE_LOB):
-            lob_impl = value._impl
-            dbvalue.asLOB = lob_impl._handle
-        else:
-            buf.set_value(value)
-            dbvalue.asBytes.ptr = buf.ptr
-            dbvalue.asBytes.length = buf.length
-    elif oracle_type == DPI_ORACLE_TYPE_JSON:
-        json_buf = JsonBuffer()
-        json_buf.from_object(value)
-        if dpiJson_setValue(dbvalue.asJson, &json_buf._top_node) < 0:
-            _raise_from_odpi()
-    elif oracle_type == DPI_ORACLE_TYPE_VECTOR:
-        if isinstance(value, PY_TYPE_SPARSE_VECTOR):
-            sparse_impl = <SparseVectorImpl> value._impl
-            vector_info.numDimensions = <uint32_t> sparse_impl.num_dimensions
-            vector_info.numSparseValues = <uint32_t> len(sparse_impl.indices)
-            vector_info.sparseIndices = \
-                    <uint32_t*> sparse_impl.indices.data.as_voidptr
-            value = sparse_impl.values
-        else:
-            vector_info.numDimensions = <uint32_t> len(value)
-            vector_info.numSparseValues = 0
-            vector_info.sparseIndices = NULL
-        if value.typecode == 'd':
-            vector_info.format = DPI_VECTOR_FORMAT_FLOAT64
-        elif value.typecode == 'f':
-            vector_info.format = DPI_VECTOR_FORMAT_FLOAT32
-        elif value.typecode == 'B':
-            vector_info.format = DPI_VECTOR_FORMAT_BINARY
-            vector_info.numDimensions *= 8
-        else:
-            vector_info.format = DPI_VECTOR_FORMAT_INT8
-        vector_info.dimensions.asPtr = (<array.array> value).data.as_voidptr
-        if dpiVector_setValue(dbvalue.asVector, &vector_info) < 0:
-            _raise_from_odpi()
-    elif oracle_type == DPI_ORACLE_TYPE_INTERVAL_YM:
-        dbvalue.asIntervalYM.years = (<tuple> value)[0]
-        dbvalue.asIntervalYM.months = (<tuple> value)[1]
-    else:
-        errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                          name=metadata.dbtype.name)
-
-
-cdef object _convert_json_to_python(dpiJson *json):
-    """
-    Converts a dpiJson value to its Python equivalent.
-    """
-    cdef dpiJsonNode *json_node
-    if dpiJson_getValue(json, DPI_JSON_OPT_NUMBER_AS_STRING, &json_node) < 0:
-        _raise_from_odpi()
-    return _convert_from_json_node(json_node)
-
-
-cdef object _convert_oci_attr_to_python(uint32_t attr_type,
-                                        dpiDataBuffer *value,
-                                        uint32_t value_len):
-    """
-    Convert an OCI attribute value to a Python value.
-    """
-    if attr_type == PYO_OCI_ATTR_TYPE_STRING:
-        if value.asString == NULL:
-            return None
-        return value.asString[:value_len].decode()
-    elif attr_type == PYO_OCI_ATTR_TYPE_BOOLEAN:
-        return value.asBoolean
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT8:
-        return value.asUint8
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT16:
-        return value.asUint16
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT32:
-        return value.asUint32
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT64:
-        return value.asUint64
-    errors._raise_err(errors.ERR_INVALID_OCI_ATTR_TYPE, attr_type=attr_type)
-
-
-cdef int _convert_python_to_oci_attr(object value, uint32_t attr_type,
-                                     StringBuffer str_buf,
-                                     dpiDataBuffer *oci_buf,
-                                     void **oci_value,
-                                     uint32_t *oci_len) except -1:
-    """
-    Convert a Python value to the format required by an OCI attribute.
-    """
-    if attr_type == PYO_OCI_ATTR_TYPE_STRING:
-        str_buf.set_value(value)
-        oci_value[0] = str_buf.ptr
-        oci_len[0] = str_buf.length
-    elif attr_type == PYO_OCI_ATTR_TYPE_BOOLEAN:
-        oci_buf.asBoolean = value
-        oci_value[0] = &oci_buf.asBoolean
-        oci_len[0] = sizeof(oci_buf.asBoolean)
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT8:
-        oci_buf.asUint8 = value
-        oci_value[0] = &oci_buf.asUint8
-        oci_len[0] = sizeof(oci_buf.asUint8)
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT16:
-        oci_buf.asUint16 = value
-        oci_value[0] = &oci_buf.asUint16
-        oci_len[0] = sizeof(oci_buf.asUint16)
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT32:
-        oci_buf.asUint32 = value
-        oci_value[0] = &oci_buf.asUint32
-        oci_len[0] = sizeof(oci_buf.asUint32)
-    elif attr_type == PYO_OCI_ATTR_TYPE_UINT64:
-        oci_buf.asUint64 = value
-        oci_value[0] = &oci_buf.asUint64
-        oci_len[0] = sizeof(oci_buf.asUint64)
-    else:
-        errors._raise_err(errors.ERR_INVALID_OCI_ATTR_TYPE,
-                          attr_type=attr_type)
-
-
-cdef object _convert_to_python(ThickConnImpl conn_impl,
-                               OracleMetadata metadata,
-                               dpiDataBuffer *dbvalue,
-                               bint bypass_decode=False,
-                               const char* encoding_errors=NULL):
-    cdef:
-        uint32_t oracle_type = metadata.dbtype.num
-        ThickDbObjectImpl obj_impl
-        dpiTimestamp *as_timestamp
-        ThickLobImpl lob_impl
-        uint32_t rowid_length
-        dpiBytes *as_bytes
-        const char *rowid
-        int32_t seconds
-    if bypass_decode:
-        oracle_type = DPI_ORACLE_TYPE_RAW
-    if oracle_type == DPI_ORACLE_TYPE_CHAR \
-            or oracle_type == DPI_ORACLE_TYPE_NCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_VARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_NVARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_LONG_VARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_LONG_NVARCHAR \
-            or oracle_type == DPI_ORACLE_TYPE_XMLTYPE:
-        as_bytes = &dbvalue.asBytes
-        return as_bytes.ptr[:as_bytes.length].decode("utf-8", encoding_errors)
-    elif oracle_type == DPI_ORACLE_TYPE_NUMBER:
-        as_bytes = &dbvalue.asBytes
-        if metadata._py_type_num == PY_TYPE_NUM_INT \
-                and memchr(as_bytes.ptr, b'.', as_bytes.length) == NULL:
-            return int(as_bytes.ptr[:as_bytes.length])
-        elif metadata._py_type_num == PY_TYPE_NUM_DECIMAL:
-            return PY_TYPE_DECIMAL(as_bytes.ptr[:as_bytes.length].decode())
-        return float(as_bytes.ptr[:as_bytes.length])
-    elif oracle_type == DPI_ORACLE_TYPE_RAW \
-            or oracle_type == DPI_ORACLE_TYPE_LONG_RAW:
-        as_bytes = &dbvalue.asBytes
-        return as_bytes.ptr[:as_bytes.length]
-    elif oracle_type == DPI_ORACLE_TYPE_DATE \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP_LTZ \
-            or oracle_type == DPI_ORACLE_TYPE_TIMESTAMP_TZ:
-        as_timestamp = &dbvalue.asTimestamp
-        return cydatetime.datetime_new(as_timestamp.year, as_timestamp.month,
-                                       as_timestamp.day, as_timestamp.hour,
-                                       as_timestamp.minute,
-                                       as_timestamp.second,
-                                       as_timestamp.fsecond // 1000, None)
-    elif oracle_type == DPI_ORACLE_TYPE_BOOLEAN:
-        return dbvalue.asBoolean == 1
-    elif oracle_type == DPI_ORACLE_TYPE_NATIVE_DOUBLE:
-        return dbvalue.asDouble
-    elif oracle_type == DPI_ORACLE_TYPE_NATIVE_FLOAT:
-        return dbvalue.asFloat
-    elif oracle_type == DPI_ORACLE_TYPE_NATIVE_INT:
-        return dbvalue.asInt64
-    elif oracle_type == DPI_ORACLE_TYPE_ROWID:
-        if dpiRowid_getStringValue(dbvalue.asRowid, &rowid, &rowid_length) < 0:
-            _raise_from_odpi()
-        return rowid[:rowid_length].decode()
-    elif oracle_type == DPI_ORACLE_TYPE_CLOB \
-            or oracle_type == DPI_ORACLE_TYPE_BLOB \
-            or oracle_type == DPI_ORACLE_TYPE_NCLOB \
-            or oracle_type == DPI_ORACLE_TYPE_BFILE:
-        lob_impl = ThickLobImpl._create(conn_impl, metadata.dbtype,
-                                        dbvalue.asLOB)
-        return PY_TYPE_LOB._from_impl(lob_impl)
-    elif oracle_type == DPI_ORACLE_TYPE_OBJECT:
-        obj_impl = ThickDbObjectImpl.__new__(ThickDbObjectImpl)
-        obj_impl.type = metadata.objtype
-        if dpiObject_addRef(dbvalue.asObject) < 0:
-            _raise_from_odpi()
-        obj_impl._handle = dbvalue.asObject
-        return PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-    elif oracle_type == DPI_ORACLE_TYPE_INTERVAL_DS:
-        seconds = dbvalue.asIntervalDS.hours * 60 * 60 + \
-                dbvalue.asIntervalDS.minutes * 60 + \
-                dbvalue.asIntervalDS.seconds
-        return cydatetime.timedelta_new(dbvalue.asIntervalDS.days, seconds,
-                                        dbvalue.asIntervalDS.fseconds // 1000)
-    elif oracle_type == DPI_ORACLE_TYPE_JSON:
-        return _convert_json_to_python(dbvalue.asJson)
-    elif oracle_type == DPI_ORACLE_TYPE_VECTOR:
-        return _convert_vector_to_python(dbvalue.asVector)
-    elif oracle_type == DPI_ORACLE_TYPE_INTERVAL_YM:
-        return PY_TYPE_INTERVAL_YM(dbvalue.asIntervalYM.years,
-                                   dbvalue.asIntervalYM.months)
-    errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                      name=metadata.dbtype.name)
-
-
-cdef object _convert_vector_to_python(dpiVector *vector):
-    """
-    Converts a vector to a Python array.
-    """
-    cdef:
-        array.array result, indices_template, sparse_indices
-        uint32_t num_elements, num_bytes
-        SparseVectorImpl sparse_impl
-        dpiVectorInfo vector_info
-    if dpiVector_getValue(vector, &vector_info) < 0:
-        _raise_from_odpi()
-    if vector_info.numSparseValues > 0:
-        num_elements = vector_info.numSparseValues
-    else:
-        num_elements = vector_info.numDimensions
-    if vector_info.format == DPI_VECTOR_FORMAT_FLOAT32:
-        result = array.clone(float_template, num_elements, False)
-        num_bytes = num_elements * vector_info.dimensionSize
-    elif vector_info.format == DPI_VECTOR_FORMAT_FLOAT64:
-        result = array.clone(double_template, num_elements, False)
-        num_bytes = num_elements * vector_info.dimensionSize
-    elif vector_info.format == DPI_VECTOR_FORMAT_INT8:
-        result = array.clone(int8_template, num_elements, False)
-        num_bytes = num_elements
-    elif vector_info.format == DPI_VECTOR_FORMAT_BINARY:
-        num_bytes = num_elements // 8
-        result = array.clone(uint8_template, num_bytes, False)
-    memcpy(result.data.as_voidptr, vector_info.dimensions.asPtr, num_bytes)
-    if vector_info.numSparseValues > 0:
-        sparse_impl = SparseVectorImpl.__new__(SparseVectorImpl)
-        sparse_impl.num_dimensions = vector_info.numDimensions
-        indices_template = array.array(ARRAY_TYPE_CODE_UINT32)
-        sparse_indices = array.clone(indices_template,
-                                     vector_info.numSparseValues, False)
-        memcpy(sparse_indices.data.as_voidptr, vector_info.sparseIndices,
-               vector_info.numSparseValues * sizeof(uint32_t))
-        sparse_impl.indices = sparse_indices
-        sparse_impl.values = result
-        return PY_TYPE_SPARSE_VECTOR._from_impl(sparse_impl)
-    return result
-
-
-cdef list _string_list_to_python(dpiStringList *str_list):
-    """
-    Converts the contents of dpiStringList to a Python list of strings.
-    """
-    cdef:
-        list result
-        uint32_t i
-        str temp
-    try:
-        result = cpython.PyList_New(str_list.numStrings)
-        for i in range(str_list.numStrings):
-            temp = str_list.strings[i][:str_list.stringLengths[i]].decode()
-            cpython.Py_INCREF(temp)
-            cpython.PyList_SET_ITEM(result, i, temp)
-        return result
-    finally:
-        if dpiContext_freeStringList(driver_info.context, str_list) < 0:
-            _raise_from_odpi()
-
-cdef object _create_new_from_info(dpiErrorInfo *error_info):
-    """
-    Creates a new error object given a dpiErrorInfo structure
-    that is already populated with error information.
-    """
-    cdef bytes msg_bytes = error_info.message[:error_info.messageLength]
-    context = "%s: %s" % (error_info.fnName, error_info.action)
-    return errors._Error(msg_bytes.decode("utf-8", "replace"), context,
-                         code=error_info.code, offset=error_info.offset,
-                         isrecoverable=error_info.isRecoverable,
-                         iswarning=error_info.isWarning)
-
-
-cdef int _raise_from_info(dpiErrorInfo *error_info) except -1:
-    """
-    Raises an exception given a dpiErrorInfo structure that is already
-    populated with error information.
-    """
-    error = _create_new_from_info(error_info)
-    raise error.exc_type(error)
-
-
-cdef int _raise_from_odpi() except -1:
-    """
-    Raises an exception from ODPI-C, given that an error has been raised by
-    ODPI-C (a return code of -1 has been received).
-    """
-    cdef dpiErrorInfo error_info
-    dpiContext_getError(driver_info.context, &error_info)
-    _raise_from_info(&error_info)
-
-
-def clientversion():
-    """
-    Returns the version of the Oracle Client library being used as a 5-tuple.
-    The five values are the major version, minor version, update number, patch
-    number and port update number.
-    """
-    if driver_info.context == NULL:
-        errors._raise_err(errors.ERR_INIT_ORACLE_CLIENT_NOT_CALLED)
-    return (
-        driver_info.client_version_info.versionNum,
-        driver_info.client_version_info.releaseNum,
-        driver_info.client_version_info.updateNum,
-        driver_info.client_version_info.portReleaseNum,
-        driver_info.client_version_info.portUpdateNum
-    )
-
-
-def init_oracle_client(lib_dir=None, config_dir=None, error_url=None,
-                       driver_name=None):
-    """
-    Initialize the Oracle Client library. This method is available externally
-    in order to be called with parameters that control how the Oracle Client
-    library is initialized. If not called earlier, the first usage of the
-    Oracle Client library will cause this method to be called internally.
-    """
-    cdef:
-        bytes lib_dir_bytes, config_dir_bytes, driver_name_bytes
-        dpiContextCreateParams params
-        dpiErrorInfo error_info
-        str encoding
-    global driver_context_params
-    params_tuple = (lib_dir, config_dir, error_url, driver_name)
-    if driver_info.context != NULL:
-        if params_tuple != driver_context_params:
-            errors._raise_err(errors.ERR_LIBRARY_ALREADY_INITIALIZED)
-        return
-    if sys.version_info[:2] < (3, 11):
-        encoding = "utf-8"
-    else:
-        encoding = locale.getencoding()
-    with driver_mode.get_manager(requested_thin_mode=False) as mode_mgr:
-        memset(&params, 0, sizeof(dpiContextCreateParams))
-        params.defaultEncoding = ENCODING_UTF8
-        params.sodaUseJsonDesc = driver_info.soda_use_json_desc
-        params.useJsonId = True
-        if config_dir is None:
-            config_dir = C_DEFAULTS.config_dir
-        else:
-            C_DEFAULTS.config_dir = config_dir
-        if lib_dir is not None:
-            if isinstance(lib_dir, bytes):
-                lib_dir_bytes = lib_dir
-            else:
-                lib_dir_bytes = lib_dir.encode(encoding)
-            params.oracleClientLibDir = lib_dir_bytes
-        if config_dir is not None:
-            if isinstance(config_dir, bytes):
-                config_dir_bytes = config_dir
-            else:
-                config_dir_bytes = config_dir.encode(encoding)
-            params.oracleClientConfigDir = config_dir_bytes
-        if driver_name is None:
-            driver_name = C_DEFAULTS.driver_name
-        if driver_name is None:
-            driver_name = f"{DRIVER_NAME} thk : {DRIVER_VERSION}"
-        driver_name_bytes = driver_name.encode()[:30]
-        params.defaultDriverName = driver_name_bytes
-        if error_url is not None:
-            error_url_bytes = error_url.encode()
-        else:
-            error_url_bytes = DRIVER_INSTALLATION_URL.encode()
-        params.loadErrorUrl = error_url_bytes
-        if dpiContext_createWithParams(DPI_MAJOR_VERSION, DPI_MINOR_VERSION,
-                                       &params, &driver_info.context,
-                                       &error_info) < 0:
-            _raise_from_info(&error_info)
-        if config_dir is None and params.oracleClientConfigDir != NULL:
-            C_DEFAULTS.config_dir = params.oracleClientConfigDir.decode()
-        if dpiContext_getClientVersion(driver_info.context,
-                                       &driver_info.client_version_info) < 0:
-            _raise_from_odpi()
-        driver_context_params = params_tuple
-        driver_info.soda_use_json_desc = params.sodaUseJsonDesc
-
-
-def init_thick_impl(package):
-    """
-    Initializes globals after the package has been completely initialized. This
-    is to avoid circular imports and eliminate the need for global lookups.
-    """
-    global driver_mode, errors, exceptions
-    driver_mode = package.driver_mode
-    errors = package.errors
-    exceptions = package.exceptions
diff --git a/src/oracledb/impl/thick/var.pyx b/src/oracledb/impl/thick/var.pyx
deleted file mode 100644
index db69138f..00000000
--- a/src/oracledb/impl/thick/var.pyx
+++ /dev/null
@@ -1,521 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# var.pyx
-#
-# Cython file defining the thick Variable implementation class (embedded in
-# thick_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThickVarImpl(BaseVarImpl):
-    cdef:
-        dpiVar *_handle
-        dpiData *_data
-        StringBuffer _buf
-        object _conn
-
-    def __dealloc__(self):
-        if self._handle != NULL:
-            dpiVar_release(self._handle)
-
-    cdef int _bind(self, object conn, BaseCursorImpl cursor_impl,
-                   uint32_t num_execs, object name, uint32_t pos) except -1:
-        cdef:
-            ThickCursorImpl thick_cursor_impl = <ThickCursorImpl> cursor_impl
-            uint32_t name_length, i
-            dpiDataBuffer *dbvalue
-            const char *name_ptr
-            bytes name_bytes
-            object cursor
-        if self.metadata.dbtype.num == DB_TYPE_NUM_CURSOR:
-            for i, cursor in enumerate(self._values):
-                if cursor is not None and cursor._impl is None:
-                    errors._raise_err(errors.ERR_CURSOR_NOT_OPEN)
-                if self._data[i].isNull:
-                    continue
-                dbvalue = &self._data[i].value
-                if dbvalue.asStmt == thick_cursor_impl._handle:
-                    errors._raise_err(errors.ERR_SELF_BIND_NOT_SUPPORTED)
-        if name is not None:
-            name_bytes = name.encode()
-            name_ptr = name_bytes
-            name_length = <uint32_t> len(name_bytes)
-            if dpiStmt_bindByName(thick_cursor_impl._handle, name_ptr,
-                                  name_length, self._handle) < 0:
-                _raise_from_odpi()
-        else:
-            if dpiStmt_bindByPos(thick_cursor_impl._handle, pos,
-                                 self._handle) < 0:
-                _raise_from_odpi()
-        if thick_cursor_impl._stmt_info.isReturning and not self._is_value_set:
-            self._has_returned_data = True
-        self._is_value_set = False
-
-    cdef int _create_handle(self) except -1:
-        cdef:
-             ThickConnImpl conn_impl = self._conn_impl
-             dpiObjectType *obj_type_handle = NULL
-             ThickDbObjectTypeImpl obj_type_impl
-        if self._handle != NULL:
-             dpiVar_release(self._handle)
-             self._handle = NULL
-        if self.metadata.objtype is not None:
-             obj_type_impl = <ThickDbObjectTypeImpl> self.metadata.objtype
-             obj_type_handle = obj_type_impl._handle
-        if dpiConn_newVar(conn_impl._handle, self.metadata.dbtype.num,
-                          self.metadata.dbtype._native_num, self.num_elements,
-                          self.metadata.max_size, 0, self.is_array,
-                          obj_type_handle, &self._handle, &self._data) < 0:
-             _raise_from_odpi()
-
-    cdef int _finalize_init(self) except -1:
-        """
-        Internal method that finalizes initialization of the variable.
-        """
-        cdef uint32_t i
-        BaseVarImpl._finalize_init(self)
-        if self.metadata.dbtype._native_num in (
-            DPI_NATIVE_TYPE_LOB,
-            DPI_NATIVE_TYPE_OBJECT,
-            DPI_NATIVE_TYPE_STMT,
-        ):
-            self._values = [None] * self.num_elements
-        self._create_handle()
-
-    cdef list _get_array_value(self):
-        """
-        Internal method to return the value of the array.
-        """
-        cdef uint32_t i
-        return [self._get_scalar_value(i) \
-                for i in range(self.num_elements_in_array)]
-
-    cdef object _get_cursor_value(self, dpiDataBuffer *dbvalue, uint32_t pos):
-        """
-        Returns the cursor stored in the variable at the given position. If a
-        cursor was previously available, use it instead of creating a new one.
-        """
-        cdef:
-            ThickCursorImpl cursor_impl
-            object cursor
-        cursor = self._values[pos]
-        if cursor is not None:
-            cursor_impl = <ThickCursorImpl> cursor._impl
-            if cursor_impl._handle == dbvalue.asStmt:
-                cursor_impl._fixup_ref_cursor = True
-                return cursor
-        cursor = self._conn.cursor()
-        cursor_impl = <ThickCursorImpl> cursor._impl
-        if dpiStmt_addRef(dbvalue.asStmt) < 0:
-            _raise_from_odpi()
-        cursor_impl._handle = dbvalue.asStmt
-        cursor_impl._fixup_ref_cursor = True
-        return cursor
-
-    cdef object _get_dbobject_value(self, dpiDataBuffer *dbvalue,
-                                    uint32_t pos):
-        """
-        Returns the DbObject stored in the variable at the given position. If a
-        DbObject was previously available, use it instead of creating a new
-        one, unless the handle has changed.
-        """
-        cdef:
-            ThickDbObjectImpl obj_impl
-            object obj = None
-        if not self._has_returned_data:
-            obj = self._values[pos]
-        if obj is not None:
-            obj_impl = <ThickDbObjectImpl> obj._impl
-            if obj_impl._handle == dbvalue.asObject:
-                return obj
-        obj_impl = ThickDbObjectImpl.__new__(ThickDbObjectImpl)
-        obj_impl.type = self.metadata.objtype
-        if dpiObject_addRef(dbvalue.asObject) < 0:
-            _raise_from_odpi()
-        obj_impl._handle = dbvalue.asObject
-        return PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-
-    cdef object _get_lob_value(self, dpiDataBuffer *dbvalue, uint32_t pos):
-        """
-        Returns the LOB stored in the variable at the given position. If a LOB
-        was previously created, use it instead of creating a new one, unless
-        the handle has changed.
-        """
-        cdef:
-            ThickLobImpl lob_impl
-            object lob = None
-        if not self._has_returned_data:
-            lob = self._values[pos]
-        if lob is not None:
-            lob_impl = <ThickLobImpl> lob._impl
-            if lob_impl._handle == dbvalue.asLOB:
-                return lob
-        lob_impl = ThickLobImpl._create(self._conn_impl, self.metadata.dbtype,
-                                        dbvalue.asLOB)
-        return PY_TYPE_LOB._from_impl(lob_impl)
-
-    cdef object _get_scalar_value(self, uint32_t pos):
-        """
-        Internal method to return the value of the variable at the given
-        position.
-        """
-        cdef:
-            uint32_t num_returned_rows
-            dpiData *returned_data
-            object value
-        if self._has_returned_data:
-            if dpiVar_getReturnedData(self._handle, pos, &num_returned_rows,
-                                      &returned_data) < 0:
-                _raise_from_odpi()
-            return self._transform_array_to_python(num_returned_rows,
-                                                   returned_data)
-        value = self._transform_element_to_python(pos, self._data)
-        if self.metadata.dbtype._native_num in (
-            DPI_NATIVE_TYPE_LOB,
-            DPI_NATIVE_TYPE_OBJECT,
-            DPI_NATIVE_TYPE_STMT,
-        ):
-            self._values[pos] = value
-        return value
-
-    cdef int _on_reset_bind(self, uint64_t array_offset,
-                            uint32_t num_rows) except -1:
-        """
-        Called when the bind variable is being reset, just prior to performing
-        a bind operation.
-        """
-        cdef:
-            dpiStmtInfo stmt_info
-            uint32_t i
-        BaseVarImpl._on_reset_bind(self, array_offset, num_rows)
-        if self._arrow_array is not None:
-            for i in range(num_rows):
-                self._transform_element_from_arrow(array_offset, i)
-        if self.metadata.dbtype.num == DB_TYPE_NUM_CURSOR:
-            for i in range(self.num_elements):
-                if self._data[i].isNull:
-                    continue
-                if dpiStmt_getInfo(self._data[i].value.asStmt, &stmt_info) < 0:
-                    self._create_handle()
-                    break
-
-    cdef int _resize(self, uint32_t new_size) except -1:
-        """
-        Resize the variable to the new size provided.
-        """
-        cdef:
-            dpiVar *orig_handle = NULL
-            uint32_t num_elements, i
-            dpiData *source_data
-            dpiData *orig_data
-        BaseVarImpl._resize(self, new_size)
-        orig_data = self._data
-        orig_handle = self._handle
-        self._handle = NULL
-        try:
-            self._create_handle()
-            if self.is_array:
-                if dpiVar_getNumElementsInArray(orig_handle,
-                                                &num_elements) < 0:
-                    _raise_from_odpi()
-                if dpiVar_setNumElementsInArray(self._handle,
-                                                num_elements) < 0:
-                    _raise_from_odpi()
-            for i in range(self.num_elements):
-                source_data = &orig_data[i]
-                if source_data.isNull:
-                    continue
-                if dpiVar_setFromBytes(self._handle, i,
-                        source_data.value.asBytes.ptr,
-                        source_data.value.asBytes.length) < 0:
-                    _raise_from_odpi()
-        finally:
-            dpiVar_release(orig_handle)
-
-    cdef int _set_cursor_value(self, object cursor, uint32_t pos) except -1:
-        """
-        Sets a cursor value in the variable. If the cursor does not have a
-        statement handle already, associate the one created by the variable.
-        """
-        cdef:
-            ThickCursorImpl cursor_impl = cursor._impl
-            dpiData *data
-
-        # if the cursor already has a handle, use it directly
-        if cursor_impl._handle != NULL:
-            if dpiVar_setFromStmt(self._handle, pos, cursor_impl._handle) < 0:
-                _raise_from_odpi()
-
-        # otherwise, make use of the statement handle allocated by the variable
-        else:
-            data = &self._data[pos]
-            if dpiStmt_addRef(data.value.asStmt) < 0:
-                _raise_from_odpi()
-            cursor_impl._handle = data.value.asStmt
-        self._values[pos] = cursor
-        cursor_impl._fixup_ref_cursor = True
-        cursor_impl.statement = None
-
-    cdef int _set_dbobject_value(self, object obj, uint32_t pos) except -1:
-        """
-        Sets an object value in the variable. The object is retained so that
-        multiple calls to getvalue() return the same instance.
-        """
-        cdef ThickDbObjectImpl obj_impl = <ThickDbObjectImpl> obj._impl
-        if dpiVar_setFromObject(self._handle, pos, obj_impl._handle) < 0:
-            _raise_from_odpi()
-        self._values[pos] = obj
-
-    cdef int _set_lob_value(self, object lob, uint32_t pos) except -1:
-        """
-        Sets a LOB value in the variable. The LOB is retained so that multiple
-        calls to getvalue() return the same instance.
-        """
-        cdef ThickLobImpl lob_impl = <ThickLobImpl> lob._impl
-        if dpiVar_setFromLob(self._handle, pos, lob_impl._handle) < 0:
-            _raise_from_odpi()
-        self._values[pos] = lob
-
-    cdef int _set_num_elements_in_array(self, uint32_t num_elements) except -1:
-        """
-        Sets the number of elements in the array.
-        """
-        BaseVarImpl._set_num_elements_in_array(self, num_elements)
-        if dpiVar_setNumElementsInArray(self._handle, num_elements) < 0:
-            _raise_from_odpi()
-
-    cdef int _set_scalar_value(self, uint32_t pos, object value) except -1:
-        """
-        Set the value of the variable at the given position. At this point it
-        is assumed that all checks have been performed!
-        """
-        cdef:
-            dpiDataBuffer temp_dbvalue
-            dpiDataBuffer *dbvalue
-            uint32_t native_num
-            dpiBytes *as_bytes
-            dpiData *data
-        data = &self._data[pos]
-        data.isNull = (value is None)
-        if not data.isNull:
-            native_num = self.metadata.dbtype._native_num
-            if native_num == DPI_NATIVE_TYPE_STMT:
-                self._set_cursor_value(value, pos)
-            elif native_num == DPI_NATIVE_TYPE_LOB:
-                self._set_lob_value(value, pos)
-            elif native_num == DPI_NATIVE_TYPE_OBJECT:
-                self._set_dbobject_value(value, pos)
-            else:
-                if native_num == DPI_NATIVE_TYPE_BYTES:
-                    dbvalue = &temp_dbvalue
-                else:
-                    dbvalue = &data.value
-                if self._buf is None:
-                    self._buf = StringBuffer.__new__(StringBuffer)
-                _convert_from_python(value, self.metadata, dbvalue, self._buf)
-                if native_num == DPI_NATIVE_TYPE_BYTES:
-                    as_bytes = &dbvalue.asBytes
-                    if dpiVar_setFromBytes(self._handle, pos, as_bytes.ptr,
-                                           as_bytes.length) < 0:
-                        _raise_from_odpi()
-
-    cdef object _transform_array_to_python(self, uint32_t num_elements,
-                                           dpiData *data):
-        """
-        Transforms an array from ODPI-C to a Python list.
-        """
-        cdef:
-            object element_value
-            list return_value
-            uint32_t i
-        return_value = cpython.PyList_New(num_elements)
-        for i in range(num_elements):
-            element_value = self._transform_element_to_python(i, data)
-            cpython.Py_INCREF(element_value)
-            cpython.PyList_SET_ITEM(return_value, i, element_value)
-        return return_value
-
-    cdef int _transform_element_from_arrow(self, uint64_t offset,
-                                           uint32_t pos):
-        """
-        Transforms a single element from an Arrow array to the value required
-        by ODPI-C.
-        """
-        cdef:
-            dpiData *data = &self._data[pos]
-            dpiTimestamp *timestamp
-            uint32_t ora_type_num
-            OracleData ora_data
-            object value
-        value = convert_arrow_to_oracle_data(self.metadata, &ora_data,
-                                             self._arrow_array,
-                                             <int64_t> (offset + pos))
-        data.isNull = ora_data.is_null
-        if not ora_data.is_null:
-            ora_type_num = self.metadata.dbtype.num
-            if ora_type_num == DPI_ORACLE_TYPE_NATIVE_DOUBLE:
-                data.value.asDouble = ora_data.buffer.as_double
-            elif ora_type_num == DPI_ORACLE_TYPE_NATIVE_FLOAT:
-                data.value.asFloat = ora_data.buffer.as_float
-            elif ora_type_num == DPI_ORACLE_TYPE_BOOLEAN:
-                data.value.asBoolean = ora_data.buffer.as_bool
-            elif ora_type_num in (
-                DPI_ORACLE_TYPE_CHAR,
-                DPI_ORACLE_TYPE_LONG_NVARCHAR,
-                DPI_ORACLE_TYPE_LONG_VARCHAR,
-                DPI_ORACLE_TYPE_LONG_RAW,
-                DPI_ORACLE_TYPE_NCHAR,
-                DPI_ORACLE_TYPE_NUMBER,
-                DPI_ORACLE_TYPE_NVARCHAR,
-                DPI_ORACLE_TYPE_RAW,
-                DPI_ORACLE_TYPE_VARCHAR,
-            ):
-                if dpiVar_setFromBytes(
-                    self._handle,
-                    pos,
-                    <const char*> ora_data.buffer.as_raw_bytes.ptr,
-                    ora_data.buffer.as_raw_bytes.num_bytes
-                ) < 0:
-                    _raise_from_odpi()
-            elif ora_type_num in (
-                DPI_ORACLE_TYPE_DATE,
-                DPI_ORACLE_TYPE_TIMESTAMP,
-                DPI_ORACLE_TYPE_TIMESTAMP_LTZ,
-                DPI_ORACLE_TYPE_TIMESTAMP_TZ,
-            ):
-                timestamp = &data.value.asTimestamp
-                memset(timestamp, 0, sizeof(data.value.asTimestamp))
-                timestamp.year = cydatetime.PyDateTime_GET_YEAR(value)
-                timestamp.month = cydatetime.PyDateTime_GET_MONTH(value)
-                timestamp.day = cydatetime.PyDateTime_GET_DAY(value)
-                timestamp.hour = cydatetime.PyDateTime_DATE_GET_HOUR(value)
-                timestamp.minute = cydatetime.PyDateTime_DATE_GET_MINUTE(value)
-                timestamp.second = cydatetime.PyDateTime_DATE_GET_SECOND(value)
-                timestamp.fsecond = \
-                        cydatetime.PyDateTime_DATE_GET_MICROSECOND(value) * 1000
-            elif ora_type_num == DPI_ORACLE_TYPE_VECTOR:
-                _convert_from_python(value, self.metadata, &data.value,
-                                     None)
-
-    cdef int _transform_element_to_arrow(self, uint32_t pos):
-        """
-        Transforms a single element from the value supplied by ODPI-C to its
-        equivalent Arrow format.
-        """
-        cdef:
-            dpiData *data = &self._data[pos]
-            uint32_t native_type_num
-            OracleNumber *as_number
-            OracleData ora_data
-            dpiBytes *as_bytes
-            object vector
-        ora_data.is_null = data.isNull
-        if not data.isNull:
-            native_type_num = self.metadata.dbtype._native_num
-            if native_type_num == DPI_NATIVE_TYPE_FLOAT:
-                ora_data.buffer.as_float = data.value.asFloat
-            elif native_type_num == DPI_NATIVE_TYPE_DOUBLE:
-                ora_data.buffer.as_double = data.value.asDouble
-            elif native_type_num == DPI_NATIVE_TYPE_BOOLEAN:
-                ora_data.buffer.as_bool = data.value.asBoolean
-            elif native_type_num == DPI_NATIVE_TYPE_BYTES:
-                as_bytes = &data.value.asBytes;
-                if self._fetch_metadata.dbtype.num == DPI_ORACLE_TYPE_NUMBER:
-                    as_number = &ora_data.buffer.as_number
-                    as_number.is_max_negative_value = 0;
-                    as_number.is_integer = \
-                            memchr(as_bytes.ptr, b'.', as_bytes.length) == NULL;
-                    memcpy(as_number.chars, as_bytes.ptr, as_bytes.length)
-                    as_number.chars[as_bytes.length] = 0
-                    as_number.num_chars = as_bytes.length
-                else:
-                    ora_data.buffer.as_raw_bytes.ptr = \
-                            <const char_type *> as_bytes.ptr;
-                    ora_data.buffer.as_raw_bytes.num_bytes = as_bytes.length;
-            elif native_type_num == DPI_NATIVE_TYPE_TIMESTAMP:
-                ora_data.buffer.as_date.year = data.value.asTimestamp.year;
-                ora_data.buffer.as_date.month = data.value.asTimestamp.month;
-                ora_data.buffer.as_date.day = data.value.asTimestamp.day;
-                ora_data.buffer.as_date.hour = data.value.asTimestamp.hour;
-                ora_data.buffer.as_date.minute = data.value.asTimestamp.minute;
-                ora_data.buffer.as_date.second = data.value.asTimestamp.second;
-                ora_data.buffer.as_date.fsecond = \
-                        data.value.asTimestamp.fsecond // 1000;
-                ora_data.buffer.as_date.tz_hour_offset = \
-                        data.value.asTimestamp.tzHourOffset;
-                ora_data.buffer.as_date.tz_minute_offset = \
-                        data.value.asTimestamp.tzMinuteOffset;
-            elif native_type_num == DPI_NATIVE_TYPE_INTERVAL_DS:
-                ora_data.buffer.as_interval_ds.days = \
-                        data.value.asIntervalDS.days;
-                ora_data.buffer.as_interval_ds.hours = \
-                        data.value.asIntervalDS.hours;
-                ora_data.buffer.as_interval_ds.minutes = \
-                        data.value.asIntervalDS.minutes;
-                ora_data.buffer.as_interval_ds.seconds = \
-                        data.value.asIntervalDS.seconds;
-                ora_data.buffer.as_interval_ds.fseconds = \
-                        data.value.asIntervalDS.fseconds;
-            elif native_type_num == DPI_NATIVE_TYPE_INTERVAL_YM:
-                ora_data.buffer.as_interval_ym.years = \
-                        data.value.asIntervalYM.years;
-                ora_data.buffer.as_interval_ym.months = \
-                        data.value.asIntervalYM.months;
-            elif native_type_num == DPI_NATIVE_TYPE_VECTOR:
-                vector = _convert_vector_to_python(data.value.asVector)
-                return convert_vector_to_arrow(self._arrow_array, vector)
-            else:
-                errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                                  name=self._fetch_metadata.dbtype.name)
-        convert_oracle_data_to_arrow(self._fetch_metadata, self.metadata,
-                                     &ora_data, self._arrow_array)
-
-    cdef object _transform_element_to_python(self, uint32_t pos,
-                                             dpiData *data):
-        """
-        Transforms a single element from the value supplied by ODPI-C to its
-        equivalent Python value.
-        """
-        cdef:
-            uint32_t native_num
-            object value
-        data = &data[pos]
-        if not data.isNull:
-            native_num = self.metadata.dbtype._native_num
-            if native_num == DPI_NATIVE_TYPE_STMT:
-                value = self._get_cursor_value(&data.value, pos)
-            elif native_num == DPI_NATIVE_TYPE_LOB:
-                value = self._get_lob_value(&data.value, pos)
-            elif native_num == DPI_NATIVE_TYPE_OBJECT:
-                value = self._get_dbobject_value(&data.value, pos)
-            else:
-                value = _convert_to_python(self._conn_impl, self.metadata,
-                                           &data.value, self.bypass_decode,
-                                           self._encoding_errors)
-            if self.outconverter is not None:
-                value = self.outconverter(value)
-            return value
-        elif self.convert_nulls:
-            return self.outconverter(None)
diff --git a/src/oracledb/impl/thin/capabilities.pyx b/src/oracledb/impl/thin/capabilities.pyx
deleted file mode 100644
index 59380bc2..00000000
--- a/src/oracledb/impl/thin/capabilities.pyx
+++ /dev/null
@@ -1,153 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# capabilities.pyx
-#
-# Cython file defining the capabilities (neogiated at connect time) that both
-# the database server and the client are capable of (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class Capabilities:
-    cdef:
-        uint16_t protocol_version
-        uint8_t ttc_field_version
-        uint16_t charset_id
-        uint16_t ncharset_id
-        bytearray compile_caps
-        bytearray runtime_caps
-        uint32_t max_string_size
-        bint supports_fast_auth
-        bint supports_oob
-        bint supports_oob_check
-        bint supports_end_of_response
-        bint supports_pipelining
-        bint supports_request_boundaries
-        uint32_t sdu
-
-    def __init__(self):
-        self._init_compile_caps()
-        self._init_runtime_caps()
-        self.sdu = 8192                 # initial value to use
-
-    cdef void _adjust_for_protocol(self, uint16_t protocol_version,
-                                   uint16_t protocol_options, uint32_t flags):
-        """
-        Adjust the capabilities of the protocol based on the server's response
-        to the initial connection request.
-        """
-        self.protocol_version = protocol_version
-        self.supports_oob = protocol_options & TNS_GSO_CAN_RECV_ATTENTION
-        if flags & TNS_ACCEPT_FLAG_FAST_AUTH:
-            self.supports_fast_auth = True
-        if flags & TNS_ACCEPT_FLAG_CHECK_OOB:
-            self.supports_oob_check = True
-        if protocol_version >= TNS_VERSION_MIN_END_OF_RESPONSE:
-            if flags & TNS_ACCEPT_FLAG_HAS_END_OF_RESPONSE:
-                self.compile_caps[TNS_CCAP_TTC4] |= TNS_CCAP_END_OF_RESPONSE
-                self.supports_end_of_response = True
-                self.supports_pipelining = True
-
-    @cython.boundscheck(False)
-    cdef void _adjust_for_server_compile_caps(self, bytearray server_caps):
-        if server_caps[TNS_CCAP_FIELD_VERSION] < self.ttc_field_version:
-            self.ttc_field_version = server_caps[TNS_CCAP_FIELD_VERSION]
-            self.compile_caps[TNS_CCAP_FIELD_VERSION] = self.ttc_field_version
-        if server_caps[TNS_CCAP_TTC4] & TNS_CCAP_EXPLICIT_BOUNDARY:
-            self.supports_request_boundaries = True
-
-    @cython.boundscheck(False)
-    cdef void _adjust_for_server_runtime_caps(self, bytearray server_caps):
-        if server_caps[TNS_RCAP_TTC] & TNS_RCAP_TTC_32K:
-            self.max_string_size = 32767
-        else:
-            self.max_string_size = 4000
-        if not (server_caps[TNS_RCAP_TTC] & TNS_RCAP_TTC_SESSION_STATE_OPS):
-            self.supports_request_boundaries = False
-
-    cdef int _check_ncharset_id(self) except -1:
-        """
-        Checks that the national character set id is AL16UTF16, which is the
-        only id that is currently supported.
-        """
-        if self.ncharset_id != TNS_CHARSET_UTF16:
-            errors._raise_err(errors.ERR_NCHAR_CS_NOT_SUPPORTED,
-                              charset_id=self.ncharset_id)
-
-    @cython.boundscheck(False)
-    cdef void _init_compile_caps(self):
-        self.ttc_field_version = TNS_CCAP_FIELD_VERSION_MAX
-        self.compile_caps = bytearray(TNS_CCAP_MAX)
-        self.compile_caps[TNS_CCAP_SQL_VERSION] = TNS_CCAP_SQL_VERSION_MAX
-        self.compile_caps[TNS_CCAP_LOGON_TYPES] = \
-                TNS_CCAP_O5LOGON | TNS_CCAP_O5LOGON_NP | \
-                TNS_CCAP_O7LOGON | TNS_CCAP_O8LOGON_LONG_IDENTIFIER | \
-                TNS_CCAP_O9LOGON_LONG_PASSWORD
-        self.compile_caps[TNS_CCAP_FEATURE_BACKPORT] = \
-                TNS_CCAP_CTB_IMPLICIT_POOL | \
-                TNS_CCAP_CTB_OAUTH_MSG_ON_ERR
-        self.compile_caps[TNS_CCAP_FIELD_VERSION] = self.ttc_field_version
-        self.compile_caps[TNS_CCAP_SERVER_DEFINE_CONV] = 1
-        self.compile_caps[TNS_CCAP_DEQUEUE_WITH_SELECTOR] = 1
-        self.compile_caps[TNS_CCAP_TTC1] = \
-                TNS_CCAP_FAST_BVEC | TNS_CCAP_END_OF_CALL_STATUS | \
-                TNS_CCAP_IND_RCD
-        self.compile_caps[TNS_CCAP_OCI1] = \
-                TNS_CCAP_FAST_SESSION_PROPAGATE | TNS_CCAP_APP_CTX_PIGGYBACK
-        self.compile_caps[TNS_CCAP_TDS_VERSION] = TNS_CCAP_TDS_VERSION_MAX
-        self.compile_caps[TNS_CCAP_RPC_VERSION] = TNS_CCAP_RPC_VERSION_MAX
-        self.compile_caps[TNS_CCAP_RPC_SIG] = TNS_CCAP_RPC_SIG_VALUE
-        self.compile_caps[TNS_CCAP_DBF_VERSION] = TNS_CCAP_DBF_VERSION_MAX
-        self.compile_caps[TNS_CCAP_LOB] = TNS_CCAP_LOB_UB8_SIZE | \
-                TNS_CCAP_LOB_ENCS | TNS_CCAP_LOB_PREFETCH_LENGTH | \
-                TNS_CCAP_LOB_TEMP_SIZE | TNS_CCAP_LOB_12C | \
-                TNS_CCAP_LOB_PREFETCH_DATA
-        self.compile_caps[TNS_CCAP_UB2_DTY] = 1
-        self.compile_caps[TNS_CCAP_LOB2] = TNS_CCAP_LOB2_QUASI | \
-                TNS_CCAP_LOB2_2GB_PREFETCH
-        self.compile_caps[TNS_CCAP_TTC3] = TNS_CCAP_IMPLICIT_RESULTS | \
-                TNS_CCAP_BIG_CHUNK_CLR | TNS_CCAP_KEEP_OUT_ORDER | \
-                TNS_CCAP_LTXID
-        self.compile_caps[TNS_CCAP_TTC2] = TNS_CCAP_ZLNP
-        self.compile_caps[TNS_CCAP_OCI2] = TNS_CCAP_DRCP
-        self.compile_caps[TNS_CCAP_CLIENT_FN] = TNS_CCAP_CLIENT_FN_MAX
-        self.compile_caps[TNS_CCAP_SESS_SIGNATURE_VERSION] = \
-                TNS_CCAP_FIELD_VERSION_12_2
-        self.compile_caps[TNS_CCAP_TTC4] = TNS_CCAP_INBAND_NOTIFICATION | \
-                TNS_CCAP_EXPLICIT_BOUNDARY
-        self.compile_caps[TNS_CCAP_TTC5] = TNS_CCAP_VECTOR_SUPPORT | \
-                TNS_CCAP_TOKEN_SUPPORTED | TNS_CCAP_PIPELINING_SUPPORT | \
-                TNS_CCAP_PIPELINING_BREAK | TNS_CCAP_TTC5_SESSIONLESS_TXNS
-        self.compile_caps[TNS_CCAP_VECTOR_FEATURES] = \
-                TNS_CCAP_VECTOR_FEATURE_BINARY | \
-                TNS_CCAP_VECTOR_FEATURE_SPARSE
-        self.compile_caps[TNS_CCAP_OCI3] = TNS_CCAP_OCI3_OCSSYNC
-
-    @cython.boundscheck(False)
-    cdef void _init_runtime_caps(self):
-        self.runtime_caps = bytearray(TNS_RCAP_MAX)
-        self.runtime_caps[TNS_RCAP_COMPAT] = TNS_RCAP_COMPAT_81
-        self.runtime_caps[TNS_RCAP_TTC] = TNS_RCAP_TTC_ZERO_COPY | \
-                TNS_RCAP_TTC_32K
diff --git a/src/oracledb/impl/thin/connection.pyx b/src/oracledb/impl/thin/connection.pyx
deleted file mode 100644
index 442c98b7..00000000
--- a/src/oracledb/impl/thin/connection.pyx
+++ /dev/null
@@ -1,1318 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# connection.pyx
-#
-# Cython file defining the thin Connection implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class _SessionlessData:
-
-    cdef:
-        bytes transaction_id
-        uint32_t operation
-        uint32_t flags
-        uint32_t timeout
-        bint piggyback_pending
-        bint started_on_server
-
-    cdef TransactionSwitchMessage create_message(self,
-                                                 BaseThinConnImpl conn_impl):
-        """
-        Returns the message used for sending the request to the database.
-        """
-        cdef:
-            uint32_t sessionless_format_id = 0x4e5c3e
-            TransactionSwitchMessage message
-        message = conn_impl._create_message(TransactionSwitchMessage)
-        if self.operation & TNS_TPC_TXN_START:
-            message.xid = (sessionless_format_id, self.transaction_id, b"")
-        message.timeout = self.timeout
-        message.operation = self.operation
-        message.flags = self.flags | TPC_TXN_FLAGS_SESSIONLESS
-        return message
-
-
-cdef class BaseThinConnImpl(BaseConnImpl):
-
-    cdef:
-        StatementCache _statement_cache
-        BaseProtocol _protocol
-        uint32_t _session_id
-        uint16_t _serial_num
-        str _action
-        bint _action_modified
-        str _dbop
-        bint _dbop_modified
-        str _client_info
-        bint _client_info_modified
-        str _client_identifier
-        bint _client_identifier_modified
-        str _module
-        bint _module_modified
-        bytes _ltxid
-        str _current_schema
-        bint _current_schema_modified
-        uint8_t _max_identifier_length
-        uint32_t _max_open_cursors
-        str _db_domain
-        str _db_name
-        str _edition
-        str _instance_name
-        str _internal_name
-        str _external_name
-        str _service_name
-        bint _drcp_enabled
-        bint _drcp_establish_session
-        double _time_created
-        double _time_returned
-        list _temp_lobs_to_close
-        uint32_t _temp_lobs_total_size
-        uint32_t _call_timeout
-        str _cclass
-        int _dbobject_type_cache_num
-        bytes _combo_key
-        str _connection_id
-        bint _is_pooled
-        bint _is_pool_extra
-        bytes _transaction_context
-        uint8_t pipeline_mode
-        uint8_t _session_state_desired
-        _SessionlessData _sessionless_data
-
-    def __init__(self, str dsn, ConnectParamsImpl params):
-        _check_cryptography()
-        BaseConnImpl.__init__(self, dsn, params)
-        self.thin = True
-
-    cdef int _check_tpc_commit_state(self, uint32_t state,
-                                     bint one_phase) except -1:
-        """
-        Check the state returned by the tpc_commit() call.
-        """
-        if one_phase and state not in (TNS_TPC_TXN_STATE_READ_ONLY,
-                                       TNS_TPC_TXN_STATE_COMMITTED) \
-                or not one_phase and state != TNS_TPC_TXN_STATE_FORGOTTEN:
-            errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_STATE,
-                              state=state)
-        self._transaction_context = None
-
-    cdef int _clear_dbobject_type_cache(self) except -1:
-        """
-        """
-        cdef int cache_num
-        if self._dbobject_type_cache_num > 0:
-            cache_num = self._dbobject_type_cache_num
-            self._dbobject_type_cache_num = 0
-            remove_dbobject_type_cache(cache_num)
-
-    cdef BaseThinLobImpl _create_lob_impl(self, DbType dbtype,
-                                          bytes locator=None):
-        """
-        Create and return a LOB implementation object.
-        """
-        cdef BaseThinLobImpl lob_impl
-        if self._protocol._transport._is_async:
-            lob_impl = AsyncThinLobImpl.__new__(AsyncThinLobImpl)
-        else:
-            lob_impl = ThinLobImpl.__new__(ThinLobImpl)
-        lob_impl._conn_impl = self
-        lob_impl.dbtype = dbtype
-        lob_impl._locator = locator
-        return lob_impl
-
-    cdef Message _create_message(self, type typ):
-        """
-        Creates a message object that is used to send a request to the database
-        and receive back its response.
-        """
-        cdef Message message
-        message = typ.__new__(typ)
-        message._initialize(self)
-        return message
-
-    cdef AuthMessage _create_change_password_message(self, str old_password,
-                                                     str new_password):
-        """
-        Creates a change password message which is an authentication message
-        with different attributes set.
-        """
-        cdef AuthMessage message
-        message = self._create_message(AuthMessage)
-        message.change_password = True
-        message.function_code = TNS_FUNC_AUTH_PHASE_TWO
-        message.user_bytes = self.username.encode()
-        message.user_bytes_len = len(message.user_bytes)
-        message.auth_mode = TNS_AUTH_MODE_WITH_PASSWORD | \
-                TNS_AUTH_MODE_CHANGE_PASSWORD
-        message.password = old_password.encode()
-        message.newpassword = new_password.encode()
-        message.resend = False
-        return message
-
-    cdef TransactionChangeStateMessage _create_tpc_commit_message(
-            self, object xid, bint one_phase
-    ):
-        """
-        Creates a two-phase commit message suitable for committing a
-        transaction.
-        """
-        cdef TransactionChangeStateMessage message
-        message = self._create_message(TransactionChangeStateMessage)
-        message.operation = TNS_TPC_TXN_COMMIT
-        message.state = TNS_TPC_TXN_STATE_READ_ONLY if one_phase \
-                else TNS_TPC_TXN_STATE_COMMITTED
-        message.xid = xid
-        message.context = self._transaction_context
-        return message
-
-    cdef Message _create_tpc_rollback_message(self, object xid=None):
-        """
-        Creates a two-phase commit rollback message suitable for use in both
-        the close() method and explicitly by the user.
-        """
-        cdef TransactionChangeStateMessage message
-        message = self._create_message(TransactionChangeStateMessage)
-        message.operation = TNS_TPC_TXN_ABORT
-        message.state = TNS_TPC_TXN_STATE_ABORTED
-        message.xid = xid
-        message.context = self._transaction_context
-        return message
-
-    cdef Statement _get_statement(self, str sql = None,
-                                  bint cache_statement = False):
-        """
-        Get a statement from the statement cache, or prepare a new statement
-        for use.
-        """
-        return self._statement_cache.get_statement(
-            sql, cache_statement, self._drcp_establish_session
-        )
-
-    cdef int _post_connect_phase_one(self, Description description,
-                                     ConnectParamsImpl params) except -1:
-        """
-        Called after the connection has been partially established to perform
-        common tasks.
-        """
-        self._drcp_enabled = description.server_type == "pooled"
-        if self._cclass is None:
-            self._cclass = description.cclass
-        if self._cclass is None:
-            self._cclass = params._default_description.cclass
-
-    cdef int _post_connect_phase_two(self, ConnectParamsImpl params) except -1:
-        """
-        Called after the connection has been fully established to perform
-        common tasks.
-        """
-        self._statement_cache = StatementCache.__new__(StatementCache)
-        self._statement_cache.initialize(params.stmtcachesize,
-                                         self._max_open_cursors)
-        self._dbobject_type_cache_num = create_new_dbobject_type_cache(self)
-        self.invoke_session_callback = True
-
-    cdef int _pre_connect(self, ConnectParamsImpl params) except -1:
-        """
-        Called before the connection is established to perform common tasks.
-        """
-        params._check_credentials()
-        self._connection_id = base64.b64encode(secrets.token_bytes(16)).decode()
-
-    cdef int _return_statement(self, Statement statement) except -1:
-        """
-        Return the statement to the statement cache, if applicable.
-        """
-        self._statement_cache.return_statement(statement)
-
-    cdef TransactionSwitchMessage _start_sessionless_transaction(
-        self,
-        bytes transaction_id,
-        uint32_t timeout,
-        uint32_t flags,
-        bint defer_round_trip
-    ):
-        """
-        Starts (either begins or resumes) a sessionless transaction. A message
-        is returned if the request is not going to be deferred.
-        """
-        if self._sessionless_data is not None:
-            errors._raise_err(errors.ERR_SESSIONLESS_ALREADY_ACTIVE)
-        self._sessionless_data = _SessionlessData.__new__(_SessionlessData)
-        self._sessionless_data.transaction_id = transaction_id
-        self._sessionless_data.timeout = timeout
-        self._sessionless_data.operation = TNS_TPC_TXN_START
-        self._sessionless_data.flags = flags
-        if defer_round_trip:
-            self._sessionless_data.piggyback_pending = True
-        if not defer_round_trip:
-            return self._sessionless_data.create_message(self)
-
-    def cancel(self):
-        self._protocol._break_external()
-
-    def create_msg_props_impl(self):
-        cdef ThinMsgPropsImpl impl
-        impl = ThinMsgPropsImpl()
-        impl._conn_impl = self
-        return impl
-
-    def get_call_timeout(self):
-        return self._call_timeout
-
-    def get_current_schema(self):
-        return self._current_schema
-
-    def get_db_domain(self):
-        if self._db_domain:
-            return self._db_domain
-
-    def get_db_name(self):
-        return self._db_name
-
-    def get_session_id(self):
-        return self._session_id
-
-    def get_serial_num(self):
-        return self._serial_num
-
-    def get_edition(self):
-        return self._edition
-
-    def get_external_name(self):
-        return self._external_name
-
-    def get_instance_name(self):
-        return self._instance_name
-
-    def get_internal_name(self):
-        return self._internal_name
-
-    def get_is_healthy(self):
-        return self._protocol._get_is_healthy()
-
-    def get_ltxid(self):
-        return self._ltxid or b''
-
-    def get_max_identifier_length(self):
-        return self._max_identifier_length
-
-    def get_max_open_cursors(self):
-        return self._max_open_cursors
-
-    def get_sdu(self):
-        return self._protocol._caps.sdu
-
-    def get_service_name(self):
-        return self._service_name
-
-    def get_stmt_cache_size(self):
-        return self._statement_cache._max_size
-
-    def get_transaction_in_progress(self):
-        return self._protocol._txn_in_progress
-
-    def get_type(self, object conn, str name):
-        cdef ThinDbObjectTypeCache cache = \
-                get_dbobject_type_cache(self._dbobject_type_cache_num)
-        return cache.get_type(conn, name)
-
-    def set_action(self, str value):
-        self._action = value
-        self._action_modified = True
-
-    def set_client_identifier(self, str value):
-        self._client_identifier = value
-        self._client_identifier_modified = True
-
-    def set_client_info(self, str value):
-        self._client_info = value
-        self._client_info_modified = True
-
-    def set_current_schema(self, value):
-        self._current_schema = value
-        self._current_schema_modified = True
-
-    def set_dbop(self, str value):
-        self._dbop = value
-        self._dbop_modified = True
-
-    def set_external_name(self, value):
-        self._external_name = value
-
-    def set_internal_name(self, value):
-        self._internal_name = value
-
-    def set_module(self, str value):
-        self._module = value
-        self._module_modified = True
-        # setting the module by itself results in an error so always force the
-        # action to be set as well (which eliminates this error)
-        self._action_modified = True
-
-    def set_stmt_cache_size(self, uint32_t value):
-        self._statement_cache.resize(value)
-
-
-cdef class ThinConnImpl(BaseThinConnImpl):
-
-    def __init__(self, str dsn, ConnectParamsImpl params):
-        BaseThinConnImpl.__init__(self, dsn, params)
-        self._protocol = Protocol()
-
-    cdef int _close(self):
-        """
-        Internal method for closing the connection.
-        """
-        cdef Protocol protocol = <Protocol> self._protocol
-        protocol._close(self)
-
-    cdef int _connect_with_address(self, Address address,
-                                   Description description,
-                                   ConnectParamsImpl params,
-                                   str connect_string,
-                                   bint raise_exception) except -1:
-        """
-        Internal method used for connecting with the given description and
-        address.
-        """
-        cdef Protocol protocol = <Protocol> self._protocol
-        try:
-            protocol._connect_phase_one(self, params, description,
-                                        address, connect_string)
-        except (exceptions.DatabaseError, socket.gaierror, OSError) as e:
-            if raise_exception:
-                errors._raise_err(errors.ERR_CONNECTION_FAILED, cause=e,
-                                  connection_id=description.connection_id)
-            return 0
-        except Exception as e:
-            errors._raise_err(errors.ERR_CONNECTION_FAILED, cause=e,
-                              connection_id=description.connection_id)
-        self._post_connect_phase_one(description, params)
-        protocol._connect_phase_two(self, description, params)
-
-    cdef int _connect_with_description(self, Description description,
-                                       ConnectParamsImpl params,
-                                       bint final_desc) except -1:
-        """
-        Internal method used for connecting with the given description. Retry
-        connecting to the socket if an attempt fails and retry_count is
-        specified in the connect string.
-        """
-        cdef:
-            uint32_t i, j, k, num_attempts, num_lists, num_addresses
-            AddressList address_list
-            bint raise_exc = False
-            str connect_string
-            Address address
-        num_lists = len(description.active_children)
-        num_attempts = description.retry_count + 1
-        connect_string = _get_connect_data(description, self._connection_id,
-                                           params)
-        if connect_string is None:
-            errors._raise_err(errors.ERR_FEATURE_NOT_SUPPORTED,
-                              feature="bequeath", driver_type="thick")
-        for i in range(num_attempts):
-            for j, address_list in enumerate(description.active_children):
-                num_addresses = len(address_list.active_children)
-                for k, address in enumerate(address_list.active_children):
-                    if final_desc:
-                        raise_exc = i == num_attempts - 1 \
-                                and j == num_lists - 1 \
-                                and k == num_addresses - 1
-                    self._connect_with_address(address, description, params,
-                                               connect_string, raise_exc)
-                    if not self._protocol._in_connect:
-                        return 0
-            time.sleep(description.retry_delay)
-
-    cdef int _connect_with_params(self, ConnectParamsImpl params) except -1:
-        """
-        Internal method used for connecting with the given parameters.
-        """
-        cdef:
-            DescriptionList description_list = params.description_list
-            ssize_t i, num_descriptions
-            Description description
-            bint final_desc
-        description_list.set_active_children()
-        num_descriptions = len(description_list.active_children)
-        for i, description in enumerate(description_list.active_children):
-            final_desc = (i == num_descriptions - 1)
-            self._connect_with_description(description, params, final_desc)
-            if not self._protocol._in_connect:
-                break
-
-    cdef BaseCursorImpl _create_cursor_impl(self):
-        """
-        Internal method for creating an empty cursor implementation object.
-        """
-        return ThinCursorImpl.__new__(ThinCursorImpl, self)
-
-    def begin_sessionless_transaction(
-        self,
-        bytes transaction_id,
-        int timeout,
-        bint defer_round_trip
-    ):
-        """
-        Internal method for beginning a sessionless transaction.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._start_sessionless_transaction(
-            transaction_id, timeout, TPC_TXN_FLAGS_NEW, defer_round_trip
-        )
-        if message is not None:
-            protocol._process_single_message(message)
-
-    def change_password(self, str old_password, str new_password):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            Message message
-        message = self._create_change_password_message(old_password,
-                                                       new_password)
-        protocol._process_single_message(message)
-
-    def close(self, bint in_del=False):
-        """
-        Internal method for closing the connection to the database.
-        """
-        cdef Protocol protocol = <Protocol> self._protocol
-        try:
-            protocol.close(self, in_del)
-        except (ssl.SSLError, exceptions.DatabaseError):
-            pass
-
-    def commit(self):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            Message message
-        message = self._create_message(CommitMessage)
-        protocol._process_single_message(message)
-
-    def connect(self, ConnectParamsImpl params):
-        cdef Protocol protocol = <Protocol> self._protocol
-        try:
-            self._pre_connect(params)
-            self._connect_with_params(params)
-            self._post_connect_phase_two(params)
-        except:
-            protocol._disconnect()
-            raise
-        # specify that binding a string to a LOB value is possible in thin
-        # mode without the use of asyncio (will be removed in a future release)
-        self._allow_bind_str_to_lob = True
-
-    def create_queue_impl(self):
-        return ThinQueueImpl.__new__(ThinQueueImpl)
-
-    def create_temp_lob_impl(self, DbType dbtype):
-        cdef ThinLobImpl lob_impl = self._create_lob_impl(dbtype)
-        lob_impl.create_temp()
-        return lob_impl
-
-    def direct_path_load(self, str schema_name, str table_name,
-                         list column_names, object data,
-                         uint32_t batch_size):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            DirectPathPrepareMessage prepare_message
-            DirectPathLoadStreamMessage load_message
-            DirectPathOpMessage op_message
-            BatchLoadManager manager
-
-        # prepare message
-        prepare_message = self._create_message(DirectPathPrepareMessage)
-        prepare_message.schema_name = schema_name
-        prepare_message.table_name = table_name
-        prepare_message.column_names = column_names
-        protocol._process_single_message(prepare_message)
-
-        # setup op message
-        op_message = self._create_message(DirectPathOpMessage)
-        op_message.prepare(prepare_message.cursor_id, TNS_DP_OP_ABORT)
-
-        # load message
-        load_message = self._create_message(DirectPathLoadStreamMessage)
-        try:
-            manager = BatchLoadManager.create_for_direct_path_load(
-                data, prepare_message.column_metadata, batch_size
-            )
-            while manager.num_rows > 0:
-                load_message.prepare(
-                    prepare_message.cursor_id,
-                    manager,
-                    prepare_message.column_metadata
-                )
-                protocol._process_single_message(load_message)
-                manager.next_batch()
-            op_message.op_code = TNS_DP_OP_FINISH
-        finally:
-            protocol._process_single_message(op_message)
-
-    def get_type(self, object conn, str name):
-        cdef ThinDbObjectTypeCache cache = \
-                get_dbobject_type_cache(self._dbobject_type_cache_num)
-        return cache.get_type(conn, name)
-
-    def ping(self):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            Message message
-        message = self._create_message(PingMessage)
-        protocol._process_single_message(message)
-
-    def resume_sessionless_transaction(
-        self,
-        bytes transaction_id,
-        int timeout,
-        bint defer_round_trip
-    ):
-        """
-        Internal method for resuming a sessionless transaction.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._start_sessionless_transaction(
-            transaction_id, timeout, TPC_TXN_FLAGS_RESUME, defer_round_trip
-        )
-        if message is not None:
-            protocol._process_single_message(message)
-
-    def rollback(self):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            Message message
-        message = self._create_message(RollbackMessage)
-        protocol._process_single_message(message)
-
-    def set_call_timeout(self, uint32_t value):
-        self._protocol._transport.set_timeout(value / 1000)
-        self._call_timeout = value
-
-    def suspend_sessionless_transaction(self):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionSwitchMessage message
-        if self._sessionless_data is None:
-            errors._raise_err(errors.ERR_SESSIONLESS_INACTIVE)
-        elif self._sessionless_data.started_on_server:
-            errors._raise_err(errors.ERR_SESSIONLESS_DIFFERING_METHODS)
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_DETACH
-        message.flags = TPC_TXN_FLAGS_SESSIONLESS
-        protocol._process_single_message(message)
-
-    def tpc_begin(self, xid, uint32_t flags, uint32_t timeout):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_START
-        message.xid = xid
-        message.flags = flags
-        message.timeout = timeout
-        protocol._process_single_message(message)
-        self._transaction_context = message.context
-
-    def tpc_commit(self, xid, bint one_phase):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_tpc_commit_message(xid, one_phase)
-        protocol._process_single_message(message)
-        self._check_tpc_commit_state(message.state, one_phase)
-
-    def tpc_end(self, xid, uint32_t flags):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_DETACH
-        message.xid = xid
-        message.context = self._transaction_context
-        message.flags = flags
-        protocol._process_single_message(message)
-        self._transaction_context = None
-
-    def tpc_prepare(self, xid):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_message(TransactionChangeStateMessage)
-        message.operation = TNS_TPC_TXN_PREPARE
-        message.xid = xid
-        message.context = self._transaction_context
-        protocol._process_single_message(message)
-        if message.state == TNS_TPC_TXN_STATE_REQUIRES_COMMIT:
-            return True
-        elif message.state == TNS_TPC_TXN_STATE_READ_ONLY:
-            return False
-        errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_STATE,
-                          state=message.state)
-
-    def tpc_rollback(self, xid):
-        cdef:
-            Protocol protocol = <Protocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_tpc_rollback_message(xid)
-        protocol._process_single_message(message)
-        if message.state != TNS_TPC_TXN_STATE_ABORTED:
-            errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_STATE,
-                              state=message.state)
-
-
-cdef class AsyncThinConnImpl(BaseThinConnImpl):
-
-    def __init__(self, str dsn, ConnectParamsImpl params):
-        BaseThinConnImpl.__init__(self, dsn, params)
-        self._protocol = AsyncProtocol()
-
-    cdef BaseCursorImpl _create_cursor_impl(self):
-        """
-        Internal method for creating an empty cursor implementation object.
-        """
-        return AsyncThinCursorImpl.__new__(AsyncThinCursorImpl, self)
-
-    async def _complete_pipeline_op(self, Message message):
-        """
-        Completes a particular pipeline operation.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            PipelineOpResultImpl result_impl = message.pipeline_result_impl
-            MessageWithData fetch_message, message_with_data
-            PipelineOpImpl op_impl = result_impl.operation
-            uint8_t op_type = op_impl.op_type
-            AsyncThinCursorImpl cursor_impl
-            BindVar bind_var
-
-        # all operations other than commit make use of a cursor
-        if op_type == PIPELINE_OP_TYPE_COMMIT:
-            return 0
-
-        # keep warning, if applicable
-        message_with_data = <MessageWithData> message
-        result_impl.warning = message_with_data.warning
-
-        # resend the message if that is required (for operations that fetch
-        # LOBS, for example)
-        cursor_impl = <AsyncThinCursorImpl> message_with_data.cursor_impl
-        if message.resend:
-            await protocol._process_message(message)
-        await message.postprocess_async()
-        if op_impl.op_type == PIPELINE_OP_TYPE_CALL_FUNC:
-            bind_var = <BindVar> cursor_impl.bind_vars[0]
-            result_impl.return_value = bind_var.var_impl.get_value(0)
-        elif op_type in (
-            PIPELINE_OP_TYPE_FETCH_ONE,
-            PIPELINE_OP_TYPE_FETCH_MANY,
-            PIPELINE_OP_TYPE_FETCH_ALL,
-        ):
-            result_impl.rows = []
-            while cursor_impl._buffer_rowcount > 0:
-                result_impl.rows.append(cursor_impl._create_row())
-        result_impl.fetch_metadata = cursor_impl.fetch_metadata
-
-        # for fetchall(), perform as many round trips as are required to
-        # complete the fetch
-        if op_type == PIPELINE_OP_TYPE_FETCH_ALL \
-                and cursor_impl._more_rows_to_fetch:
-            fetch_message = cursor_impl._create_message(
-                FetchMessage, message_with_data.cursor
-            )
-            while cursor_impl._more_rows_to_fetch:
-                await protocol._process_single_message(fetch_message)
-                while cursor_impl._buffer_rowcount > 0:
-                    result_impl.rows.append(cursor_impl._create_row())
-                if op_type != PIPELINE_OP_TYPE_FETCH_ALL:
-                    break
-
-        # for PL/SQL blocks that required a single execute, perform any
-        # remaining executes now
-        if op_type == PIPELINE_OP_TYPE_EXECUTE_MANY \
-                and message_with_data.num_execs < op_impl.num_execs:
-            while op_impl.num_execs > 0:
-                op_impl.num_execs -= 1
-                message_with_data.offset += 1
-                if not cursor_impl._statement.requires_single_execute():
-                    break
-                await protocol._process_message(message)
-            if op_impl.num_execs > 0:
-                message_with_data.num_execs = op_impl.num_execs
-                await protocol._process_message(message)
-
-        # populate the metadata for any partial types observed during the
-        # execution of the pipeline
-        if message_with_data.type_cache is not None:
-            conn = message_with_data.cursor.connection
-            await message_with_data.type_cache.populate_partial_types(conn)
-
-    async def _complete_pipeline_ops(
-        self, list messages, bint continue_on_error
-    ):
-        """
-        Completes any pipeline operations that have not actually completed.
-        This could be due to the fact that LOBs were fetched or a fetch all
-        operation has more rows to fetch.
-        """
-        cdef:
-            PipelineOpResultImpl result_impl
-            Message message
-        for message in messages:
-            result_impl = message.pipeline_result_impl
-            if result_impl.error is not None:
-                continue
-            try:
-                await self._complete_pipeline_op(message)
-            except Exception as e:
-                if not continue_on_error:
-                    raise
-                result_impl._capture_err(e)
-
-    async def _connect_with_address(self, Address address,
-                                    Description description,
-                                    ConnectParamsImpl params,
-                                    str connect_string,
-                                    bint raise_exception):
-        """
-        Internal method used for connecting with the given description and
-        address.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-        try:
-            await protocol._connect_phase_one(self, params, description,
-                                              address, connect_string)
-        except (exceptions.DatabaseError, socket.gaierror,
-                ConnectionRefusedError) as e:
-            if raise_exception:
-                errors._raise_err(errors.ERR_CONNECTION_FAILED, cause=e,
-                                  connection_id=description.connection_id)
-            return 0
-        except Exception as e:
-            errors._raise_err(errors.ERR_CONNECTION_FAILED, cause=e,
-                              connection_id=description.connection_id)
-        self._post_connect_phase_one(description, params)
-        await self._protocol._connect_phase_two(self, description, params)
-
-    async def _connect_with_description(self, Description description,
-                                        ConnectParamsImpl params,
-                                        bint final_desc):
-        """
-        Internal method used for connecting with the given description. Retry
-        connecting to the socket if an attempt fails and retry_count is
-        specified in the connect string.
-        """
-        cdef:
-            uint32_t i, j, k, num_attempts, num_lists, num_addresses
-            AddressList address_list
-            bint raise_exc = False
-            str connect_string
-            Address address
-        num_lists = len(description.active_children)
-        num_attempts = description.retry_count + 1
-        connect_string = _get_connect_data(description, self._connection_id, params)
-        for i in range(num_attempts):
-            for j, address_list in enumerate(description.active_children):
-                num_addresses = len(address_list.active_children)
-                for k, address in enumerate(address_list.active_children):
-                    if final_desc:
-                        raise_exc = i == num_attempts - 1 \
-                                and j == num_lists - 1 \
-                                and k == num_addresses - 1
-                    await self._connect_with_address(address, description,
-                                                     params, connect_string,
-                                                     raise_exc)
-                    if not self._protocol._in_connect:
-                        return 0
-            await asyncio.sleep(description.retry_delay)
-
-    async def _connect_with_params(self, ConnectParamsImpl params):
-        """
-        Internal method used for connecting with the given parameters.
-        """
-        cdef:
-            DescriptionList description_list = params.description_list
-            ssize_t i, num_descriptions
-            Description description
-            bint final_desc
-        description_list.set_active_children()
-        num_descriptions = len(description_list.active_children)
-        for i, description in enumerate(description_list.active_children):
-            final_desc = (i == num_descriptions - 1)
-            await self._connect_with_description(description, params,
-                                                 final_desc)
-            if not self._protocol._in_connect:
-                break
-
-    cdef Message _create_message_for_pipeline_op(
-        self, object conn, PipelineOpImpl op_impl
-    ):
-        """
-        Creates a single message for a pipeline operation.
-        """
-        cdef:
-            AsyncThinCursorImpl cursor_impl
-            MessageWithData message
-            uint32_t num_execs = 1
-            object cursor
-        if op_impl.op_type == PIPELINE_OP_TYPE_COMMIT:
-            return self._create_message(CommitMessage)
-        cursor = conn.cursor()
-        cursor_impl = <AsyncThinCursorImpl> cursor._impl
-        if op_impl.op_type == PIPELINE_OP_TYPE_CALL_FUNC:
-            execute_args = cursor._call_get_execute_args(
-                op_impl.name,
-                op_impl.parameters,
-                op_impl.keyword_parameters,
-                cursor.var(op_impl.return_type)
-            )
-            cursor._prepare_for_execute(*execute_args)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_CALL_PROC:
-            execute_args = cursor._call_get_execute_args(
-                op_impl.name,
-                op_impl.parameters,
-                op_impl.keyword_parameters
-            )
-            cursor._prepare_for_execute(*execute_args)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_EXECUTE:
-            cursor._prepare_for_execute(op_impl.statement, op_impl.parameters)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_EXECUTE_MANY:
-            op_impl.batch_load_manager = cursor_impl._prepare_for_executemany(
-                cursor,
-                op_impl.statement,
-                op_impl.parameters,
-                2 ** 32 - 1
-            )
-            op_impl.num_execs = op_impl.batch_load_manager.num_rows
-            if not cursor_impl._statement.requires_single_execute():
-                num_execs = op_impl.num_execs
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_ONE:
-            cursor._prepare_for_execute(op_impl.statement, op_impl.parameters)
-            cursor_impl.prefetchrows = 1
-            cursor_impl.arraysize = 1
-            cursor_impl.rowfactory = op_impl.rowfactory
-            cursor_impl.fetch_lobs = op_impl.fetch_lobs
-            cursor_impl.fetch_decimals = op_impl.fetch_decimals
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_MANY:
-            cursor._prepare_for_execute(op_impl.statement, op_impl.parameters)
-            cursor_impl.prefetchrows = op_impl.num_rows
-            cursor_impl.arraysize = op_impl.num_rows
-            cursor_impl.rowfactory = op_impl.rowfactory
-            cursor_impl.fetch_lobs = op_impl.fetch_lobs
-            cursor_impl.fetch_decimals = op_impl.fetch_decimals
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_ALL:
-            cursor._prepare_for_execute(op_impl.statement, op_impl.parameters)
-            cursor_impl.prefetchrows = op_impl.arraysize
-            cursor_impl.arraysize = op_impl.arraysize
-            cursor_impl.rowfactory = op_impl.rowfactory
-            cursor_impl.fetch_lobs = op_impl.fetch_lobs
-            cursor_impl.fetch_decimals = op_impl.fetch_decimals
-        else:
-            errors._raise_err(errors.ERR_UNSUPPORTED_PIPELINE_OPERATION,
-                              op_type=op_impl.op_type)
-        cursor_impl._preprocess_execute(conn)
-        message = cursor_impl._create_message(ExecuteMessage, cursor)
-        message.num_execs = num_execs
-        return message
-
-    cdef list _create_messages_for_pipeline(
-        self, object conn, list results, bint continue_on_error
-    ):
-        """
-        Creates a list of messages for the pipeline and returns them after they
-        have been submitted to the database for processing.
-        """
-        cdef:
-            PipelineOpResultImpl result_impl
-            PipelineOpImpl op_impl
-            uint64_t token_num
-            Message message
-            object result
-            list messages
-        messages = []
-        token_num = 1
-        for result in results:
-            result_impl = result._impl
-            op_impl = result_impl.operation
-            try:
-                message = self._create_message_for_pipeline_op(conn, op_impl)
-            except Exception as e:
-                if not continue_on_error:
-                    raise
-                result_impl._capture_err(e)
-                continue
-            message.pipeline_result_impl = result_impl
-            message.token_num = token_num
-            token_num += 1
-            messages.append(message)
-        return messages
-
-    async def _run_pipeline_op_without_pipelining(
-        self, object conn, PipelineOpResultImpl result_impl
-    ):
-        """
-        Runs a pipeline operation without the use of pipelining.
-        """
-        cdef:
-            PipelineOpImpl op_impl = result_impl.operation
-            object cursor
-        if op_impl.op_type == PIPELINE_OP_TYPE_COMMIT:
-            await conn.commit()
-            return
-        cursor = conn.cursor()
-        if op_impl.op_type == PIPELINE_OP_TYPE_CALL_FUNC:
-            result_impl.return_value = await cursor.callfunc(
-                op_impl.name,
-                op_impl.return_type,
-                op_impl.parameters,
-                op_impl.keyword_parameters,
-            )
-        elif op_impl.op_type == PIPELINE_OP_TYPE_CALL_PROC:
-            await cursor.callproc(
-                op_impl.name, op_impl.parameters, op_impl.keyword_parameters
-            )
-        elif op_impl.op_type == PIPELINE_OP_TYPE_EXECUTE:
-            await cursor.execute(op_impl.statement, op_impl.parameters)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_EXECUTE_MANY:
-            await cursor.executemany(op_impl.statement, op_impl.parameters)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_ALL:
-            await cursor.execute(op_impl.statement, op_impl.parameters)
-            cursor.rowfactory = op_impl.rowfactory
-            result_impl.rows = await cursor.fetchall()
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_MANY:
-            await cursor.execute(op_impl.statement, op_impl.parameters)
-            cursor.rowfactory = op_impl.rowfactory
-            result_impl.rows = await cursor.fetchmany(op_impl.num_rows)
-        elif op_impl.op_type == PIPELINE_OP_TYPE_FETCH_ONE:
-            await cursor.execute(op_impl.statement, op_impl.parameters)
-            cursor.rowfactory = op_impl.rowfactory
-            result_impl.rows = await cursor.fetchmany(1)
-        else:
-            errors._raise_err(errors.ERR_UNSUPPORTED_PIPELINE_OPERATION,
-                              op_type=op_impl.op_type)
-        result_impl.warning = cursor.warning
-        result_impl.fetch_metadata = cursor._impl.fetch_metadata
-
-    cdef int _send_messages_for_pipeline(
-        self, list messages, bint continue_on_error
-    ) except -1:
-        """
-        Sends the messages for the pipeline to the database for processing.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            Message message
-        for message in messages:
-            try:
-                message.send(protocol._write_buf)
-            except Exception as e:
-                if not continue_on_error:
-                    raise
-                message.pipeline_result_impl._capture_err(e)
-
-    async def begin_sessionless_transaction(
-        self,
-        bytes transaction_id,
-        int timeout,
-        bint defer_round_trip
-    ):
-        """
-        Internal method for beginning a sessionless transaction.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._start_sessionless_transaction(
-            transaction_id, timeout, TPC_TXN_FLAGS_NEW, defer_round_trip
-        )
-        if message is not None:
-            await protocol._process_single_message(message)
-
-    async def change_password(self, str old_password, str new_password):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            Message message
-        message = self._create_change_password_message(old_password,
-                                                       new_password)
-        await protocol._process_single_message(message)
-
-    async def close(self, bint in_del=False):
-        """
-        Sends the messages needed to disconnect from the database.
-        """
-        cdef BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-        try:
-            await protocol.close(self, in_del)
-        except (ssl.SSLError, exceptions.DatabaseError):
-            pass
-
-    async def commit(self):
-        """
-        Sends the message to commit any pending transaction.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            Message message
-        message = self._create_message(CommitMessage)
-        await protocol._process_single_message(message)
-
-    async def connect(self, ConnectParamsImpl params):
-        """
-        Sends the messages needed to connect to the database.
-        """
-        cdef BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-        protocol._read_buf._loop = asyncio.get_running_loop()
-        try:
-            self._pre_connect(params)
-            await self._connect_with_params(params)
-            self._post_connect_phase_two(params)
-        except:
-            protocol._disconnect()
-            raise
-
-    def create_queue_impl(self):
-        """
-        Create and return the implementation object to use for AQ queuing.
-        """
-        return AsyncThinQueueImpl.__new__(AsyncThinQueueImpl)
-
-    async def create_temp_lob_impl(self, DbType dbtype):
-        cdef AsyncThinLobImpl lob_impl = self._create_lob_impl(dbtype)
-        await lob_impl.create_temp()
-        return lob_impl
-
-    async def direct_path_load(self, str schema_name, str table_name,
-                               list column_names, object data,
-                               uint32_t batch_size):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            DirectPathPrepareMessage prepare_message
-            DirectPathLoadStreamMessage load_message
-            DirectPathOpMessage op_message
-            BatchLoadManager manager
-
-        # prepare message
-        prepare_message = self._create_message(DirectPathPrepareMessage)
-        prepare_message.schema_name = schema_name
-        prepare_message.table_name = table_name
-        prepare_message.column_names = column_names
-        await protocol._process_single_message(prepare_message)
-
-        # setup op message
-        op_message = self._create_message(DirectPathOpMessage)
-        op_message.prepare(prepare_message.cursor_id, TNS_DP_OP_ABORT)
-
-        # load message
-        load_message = self._create_message(DirectPathLoadStreamMessage)
-        try:
-            manager = BatchLoadManager.create_for_direct_path_load(
-                data, prepare_message.column_metadata, batch_size
-            )
-            while manager.num_rows > 0:
-                load_message.prepare(
-                    prepare_message.cursor_id,
-                    manager,
-                    prepare_message.column_metadata
-                )
-                await protocol._process_single_message(load_message)
-                manager.next_batch()
-            op_message.op_code = TNS_DP_OP_FINISH
-        finally:
-            await protocol._process_single_message(op_message)
-
-    async def get_type(self, object conn, str name):
-        cdef AsyncThinDbObjectTypeCache cache = \
-                get_dbobject_type_cache(self._dbobject_type_cache_num)
-        return await cache.get_type(conn, name)
-
-    async def ping(self):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            Message message
-        message = self._create_message(PingMessage)
-        await protocol._process_single_message(message)
-
-    async def resume_sessionless_transaction(
-        self,
-        bytes transaction_id,
-        int timeout,
-        bint defer_round_trip
-    ):
-        """
-        Internal method for resuming a sessionless transaction.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._start_sessionless_transaction(
-            transaction_id, timeout, TPC_TXN_FLAGS_RESUME, defer_round_trip
-        )
-        if message is not None:
-            await protocol._process_single_message(message)
-
-    async def rollback(self):
-        """
-        Sends the message to roll back any pending transaction.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            Message message
-        message = self._create_message(RollbackMessage)
-        await protocol._process_single_message(message)
-
-    async def run_pipeline_with_pipelining(
-        self, object conn, list results, bint continue_on_error
-    ):
-        """
-        Run the pipeline with pipelining when the database supports it.
-        """
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            list messages
-        messages = self._create_messages_for_pipeline(
-            conn, results, continue_on_error
-        )
-        if messages:
-            protocol._read_buf.reset_packets()
-            if continue_on_error:
-                self.pipeline_mode = TNS_PIPELINE_MODE_CONTINUE_ON_ERROR
-            else:
-                self.pipeline_mode = TNS_PIPELINE_MODE_ABORT_ON_ERROR
-            self._send_messages_for_pipeline(messages, continue_on_error)
-            await protocol.end_pipeline(self, messages, continue_on_error)
-            await self._complete_pipeline_ops(messages, continue_on_error)
-
-    async def run_pipeline_without_pipelining(
-        self, object conn, list results, bint continue_on_error
-    ):
-        """
-        Run the pipeline without pipelining when the database doesn't support
-        pipelining. Call timeouts are disabled for consistency with when
-        run with pipelining.
-        """
-        cdef:
-            uint32_t call_timeout = self._call_timeout
-            PipelineOpResultImpl result_impl
-            object result
-        try:
-            for result in results:
-                result_impl = result._impl
-                try:
-                    await self._run_pipeline_op_without_pipelining(
-                        conn, result_impl
-                    )
-                except Exception as e:
-                    if not continue_on_error:
-                        raise
-                    result_impl._capture_err(e)
-        finally:
-            self._call_timeout = call_timeout
-
-    def set_call_timeout(self, uint32_t value):
-        self._call_timeout = value
-
-    def supports_pipelining(self):
-        """
-        Returns whether the connection supports pipelining. Currently this is
-        only supported with asyncio and Oracle Database version 23, and later.
-        """
-        return self._protocol._caps.supports_pipelining
-
-    async def suspend_sessionless_transaction(self):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionSwitchMessage message
-        if self._sessionless_data is None:
-            errors._raise_err(errors.ERR_SESSIONLESS_INACTIVE)
-        elif self._sessionless_data.started_on_server:
-            errors._raise_err(errors.ERR_SESSIONLESS_DIFFERING_METHODS)
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_DETACH
-        message.flags = TPC_TXN_FLAGS_SESSIONLESS
-        await protocol._process_single_message(message)
-
-    async def tpc_begin(self, xid, uint32_t flags, uint32_t timeout):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_START
-        message.xid = xid
-        message.flags = flags
-        message.timeout = timeout
-        await protocol._process_single_message(message)
-        self._transaction_context = message.context
-
-    async def tpc_commit(self, xid, bint one_phase):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_tpc_commit_message(xid, one_phase)
-        await protocol._process_single_message(message)
-        self._check_tpc_commit_state(message.state, one_phase)
-
-    async def tpc_end(self, xid, uint32_t flags):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionSwitchMessage message
-        message = self._create_message(TransactionSwitchMessage)
-        message.operation = TNS_TPC_TXN_DETACH
-        message.xid = xid
-        message.context = self._transaction_context
-        message.flags = flags
-        await protocol._process_single_message(message)
-        self._transaction_context = None
-
-    async def tpc_prepare(self, xid):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_message(TransactionChangeStateMessage)
-        message.operation = TNS_TPC_TXN_PREPARE
-        message.xid = xid
-        message.context = self._transaction_context
-        await protocol._process_single_message(message)
-        if message.state == TNS_TPC_TXN_STATE_REQUIRES_COMMIT:
-            return True
-        elif message.state == TNS_TPC_TXN_STATE_READ_ONLY:
-            return False
-        errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_STATE,
-                          state=message.state)
-
-    async def tpc_rollback(self, xid):
-        cdef:
-            BaseAsyncProtocol protocol = <BaseAsyncProtocol> self._protocol
-            TransactionChangeStateMessage message
-        message = self._create_tpc_rollback_message(xid)
-        await protocol._process_single_message(message)
-        if message.state != TNS_TPC_TXN_STATE_ABORTED:
-            errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_STATE,
-                              state=message.state)
diff --git a/src/oracledb/impl/thin/constants.pxi b/src/oracledb/impl/thin/constants.pxi
deleted file mode 100644
index 252e7d6e..00000000
--- a/src/oracledb/impl/thin/constants.pxi
+++ /dev/null
@@ -1,663 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# constants.pxi
-#
-# Cython file defining constants used by the thin implementation classes
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-# packet types
-cdef enum:
-    TNS_PACKET_TYPE_CONNECT = 1
-    TNS_PACKET_TYPE_ACCEPT = 2
-    TNS_PACKET_TYPE_REFUSE = 4
-    TNS_PACKET_TYPE_DATA = 6
-    TNS_PACKET_TYPE_RESEND = 11
-    TNS_PACKET_TYPE_MARKER = 12
-    TNS_PACKET_TYPE_CONTROL = 14
-    TNS_PACKET_TYPE_REDIRECT = 5
-
-# packet flags
-cdef enum:
-    TNS_PACKET_FLAG_REDIRECT = 0x04
-    TNS_PACKET_FLAG_TLS_RENEG = 0x08
-
-# data flags
-cdef enum:
-    TNS_DATA_FLAGS_BEGIN_PIPELINE = 0x1000
-    TNS_DATA_FLAGS_END_OF_REQUEST = 0x800
-    TNS_DATA_FLAGS_END_OF_RESPONSE = 0x2000
-    TNS_DATA_FLAGS_EOF = 0x0040
-
-# marker types
-cdef enum:
-    TNS_MARKER_TYPE_BREAK = 1
-    TNS_MARKER_TYPE_RESET = 2
-    TNS_MARKER_TYPE_INTERRUPT = 3
-
-# AQ delivery modes
-cdef enum:
-    TNS_AQ_MSG_BUFFERED = 2
-    TNS_AQ_MSG_PERSISTENT = 1
-    TNS_AQ_MSG_PERSISTENT_OR_BUFFERED = 3
-
-# AQ dequeue modes
-cdef enum:
-    TNS_AQ_DEQ_BROWSE = 1
-    TNS_AQ_DEQ_LOCKED = 2
-    TNS_AQ_DEQ_REMOVE = 3
-    TNS_AQ_DEQ_REMOVE_NODATA = 4
-
-# AQ dequeue navigation modes
-cdef enum:
-    TNS_AQ_DEQ_FIRST_MSG = 1
-    TNS_AQ_DEQ_NEXT_MSG = 3
-    TNS_AQ_DEQ_NEXT_TRANSACTION = 2
-
-# AQ dequeue visibility modes
-cdef enum:
-    TNS_AQ_DEQ_IMMEDIATE = 1
-    TNS_AQ_DEQ_ON_COMMIT = 2
-
-# AQ dequeue wait modes
-cdef enum:
-    TNS_AQ_DEQ_NO_WAIT = 0
-    TNS_AQ_DEQ_WAIT_FOREVER = <uint32_t>-1
-
-# AQ enqueue visibility modes
-cdef enum:
-    TNS_AQ_ENQ_IMMEDIATE = 1
-    TNS_AQ_ENQ_ON_COMMIT = 2
-
-# AQ message states
-cdef enum:
-    TNS_AQ_MSG_EXPIRED = 3
-    TNS_AQ_MSG_PROCESSED = 2
-    TNS_AQ_MSG_READY = 0
-    TNS_AQ_MSG_WAITING = 1
-
-# AQ other constants
-cdef enum:
-    TNS_AQ_MSG_NO_DELAY = 0
-    TNS_AQ_MSG_NO_EXPIRATION = -1
-    TNS_AQ_ARRAY_ENQ = 0x01
-    TNS_AQ_ARRAY_DEQ = 0x02
-    TNS_AQ_ARRAY_FLAGS_RETURN_MESSAGE_ID = 0x01
-    TNS_TTC_ENQ_STREAMING_ENABLED = 0x00000001
-    TNS_TTC_ENQ_STREAMING_DISABLED = 0x00000000
-
-# AQ flags
-cdef enum:
-    TNS_KPD_AQ_BUFMSG = 0x02
-    TNS_KPD_AQ_EITHER = 0x10
-
-# errors
-cdef enum:
-    TNS_ERR_INCONSISTENT_DATA_TYPES = 932
-    TNS_ERR_VAR_NOT_IN_SELECT_LIST = 1007
-    TNS_ERR_INBAND_MESSAGE = 12573
-    TNS_ERR_INVALID_SERVICE_NAME = 12514
-    TNS_ERR_INVALID_SID = 12505
-    TNS_ERR_NO_DATA_FOUND = 1403
-    TNS_ERR_SESSION_SHUTDOWN = 12572
-    TNS_ERR_ARRAY_DML_ERRORS = 24381
-    TNS_ERR_EXCEEDED_IDLE_TIME = 2396
-    TNS_ERR_NO_MESSAGES_FOUND = 25228
-
-# message types
-cdef enum:
-    TNS_MSG_TYPE_PROTOCOL = 1
-    TNS_MSG_TYPE_DATA_TYPES = 2
-    TNS_MSG_TYPE_FUNCTION = 3
-    TNS_MSG_TYPE_ERROR = 4
-    TNS_MSG_TYPE_ROW_HEADER = 6
-    TNS_MSG_TYPE_ROW_DATA = 7
-    TNS_MSG_TYPE_PARAMETER = 8
-    TNS_MSG_TYPE_STATUS = 9
-    TNS_MSG_TYPE_IO_VECTOR = 11
-    TNS_MSG_TYPE_LOB_DATA = 14
-    TNS_MSG_TYPE_WARNING = 15
-    TNS_MSG_TYPE_DESCRIBE_INFO = 16
-    TNS_MSG_TYPE_PIGGYBACK = 17
-    TNS_MSG_TYPE_FLUSH_OUT_BINDS = 19
-    TNS_MSG_TYPE_BIT_VECTOR = 21
-    TNS_MSG_TYPE_SERVER_SIDE_PIGGYBACK = 23
-    TNS_MSG_TYPE_ONEWAY_FN = 26
-    TNS_MSG_TYPE_IMPLICIT_RESULTSET = 27
-    TNS_MSG_TYPE_RENEGOTIATE = 28
-    TNS_MSG_TYPE_END_OF_RESPONSE = 29
-    TNS_MSG_TYPE_TOKEN = 33
-    TNS_MSG_TYPE_FAST_AUTH = 34
-
-# parameter keyword numbers
-cdef enum:
-    TNS_KEYWORD_NUM_CURRENT_SCHEMA = 168
-    TNS_KEYWORD_NUM_EDITION = 172
-    TNS_KEYWORD_NUM_TRANSACTION_ID = 201
-
-# bind flags
-cdef enum:
-    TNS_BIND_USE_INDICATORS = 0x0001
-    TNS_BIND_ARRAY = 0x0040
-
-# bind directions
-cdef enum:
-    TNS_BIND_DIR_OUTPUT = 16
-    TNS_BIND_DIR_INPUT = 32
-    TNS_BIND_DIR_INPUT_OUTPUT = 48
-
-# database object image flags
-cdef enum:
-    TNS_OBJ_IS_VERSION_81 = 0x80
-    TNS_OBJ_IS_DEGENERATE = 0x10
-    TNS_OBJ_IS_COLLECTION = 0x08
-    TNS_OBJ_NO_PREFIX_SEG = 0x04
-    TNS_OBJ_IMAGE_VERSION = 1
-
-# database object flags
-cdef enum:
-    TNS_OBJ_MAX_SHORT_LENGTH = 245
-    TNS_OBJ_ATOMIC_NULL = 253
-    TNS_OBJ_NON_NULL_OID = 0x02
-    TNS_OBJ_HAS_EXTENT_OID = 0x08
-    TNS_OBJ_TOP_LEVEL = 0x01
-    TNS_OBJ_HAS_INDEXES = 0x10
-
-# database object collection types
-cdef enum:
-    TNS_OBJ_PLSQL_INDEX_TABLE = 1
-    TNS_OBJ_NESTED_TABLE = 2
-    TNS_OBJ_VARRAY = 3
-
-# database object TDS type codes
-cdef enum:
-    TNS_OBJ_TDS_TYPE_CHAR = 1
-    TNS_OBJ_TDS_TYPE_DATE = 2
-    TNS_OBJ_TDS_TYPE_FLOAT = 5
-    TNS_OBJ_TDS_TYPE_NUMBER = 6
-    TNS_OBJ_TDS_TYPE_VARCHAR = 7
-    TNS_OBJ_TDS_TYPE_BOOLEAN = 8
-    TNS_OBJ_TDS_TYPE_RAW = 19
-    TNS_OBJ_TDS_TYPE_TIMESTAMP = 21
-    TNS_OBJ_TDS_TYPE_TIMESTAMP_TZ = 23
-    TNS_OBJ_TDS_TYPE_OBJ = 27
-    TNS_OBJ_TDS_TYPE_COLL = 28
-    TNS_OBJ_TDS_TYPE_CLOB = 29
-    TNS_OBJ_TDS_TYPE_BLOB = 30
-    TNS_OBJ_TDS_TYPE_TIMESTAMP_LTZ = 33
-    TNS_OBJ_TDS_TYPE_BINARY_FLOAT = 37
-    TNS_OBJ_TDS_TYPE_START_EMBED_ADT = 39
-    TNS_OBJ_TDS_TYPE_END_EMBED_ADT = 40
-    TNS_OBJ_TDS_TYPE_SUBTYPE_MARKER = 43
-    TNS_OBJ_TDS_TYPE_EMBED_ADT_INFO = 44
-    TNS_OBJ_TDS_TYPE_BINARY_DOUBLE = 45
-
-# xml type constants
-cdef enum:
-    TNS_XML_TYPE_LOB = 0x0001
-    TNS_XML_TYPE_STRING = 0x0004
-    TNS_XML_TYPE_FLAG_SKIP_NEXT_4 = 0x100000
-
-# execute options
-cdef enum:
-    TNS_EXEC_OPTION_PARSE = 0x01
-    TNS_EXEC_OPTION_BIND = 0x08
-    TNS_EXEC_OPTION_DEFINE = 0x10
-    TNS_EXEC_OPTION_EXECUTE = 0x20
-    TNS_EXEC_OPTION_FETCH = 0x40
-    TNS_EXEC_OPTION_COMMIT = 0x100
-    TNS_EXEC_OPTION_COMMIT_REEXECUTE = 0x1
-    TNS_EXEC_OPTION_PLSQL_BIND = 0x400
-    TNS_EXEC_OPTION_NOT_PLSQL = 0x8000
-    TNS_EXEC_OPTION_DESCRIBE = 0x20000
-    TNS_EXEC_OPTION_NO_COMPRESSED_FETCH = 0x40000
-    TNS_EXEC_OPTION_BATCH_ERRORS = 0x80000
-
-# execute flags
-cdef enum:
-    TNS_EXEC_FLAGS_DML_ROWCOUNTS = 0x4000
-    TNS_EXEC_FLAGS_IMPLICIT_RESULTSET = 0x8000
-    TNS_EXEC_FLAGS_NO_CANCEL_ON_EOF = 0x80
-    TNS_EXEC_FLAGS_SCROLLABLE = 0x02
-
-# fetch orientations
-cdef enum:
-    TNS_FETCH_ORIENTATION_ABSOLUTE = 0x20
-    TNS_FETCH_ORIENTATION_CURRENT = 0x01
-    TNS_FETCH_ORIENTATION_FIRST = 0x04
-    TNS_FETCH_ORIENTATION_LAST = 0x08
-    TNS_FETCH_ORIENTATION_NEXT = 0x02
-    TNS_FETCH_ORIENTATION_PRIOR = 0x10
-    TNS_FETCH_ORIENTATION_RELATIVE = 0x40
-
-# server side piggyback op codes
-cdef enum:
-    TNS_SERVER_PIGGYBACK_QUERY_CACHE_INVALIDATION = 1
-    TNS_SERVER_PIGGYBACK_OS_PID_MTS = 2
-    TNS_SERVER_PIGGYBACK_TRACE_EVENT = 3
-    TNS_SERVER_PIGGYBACK_SESS_RET = 4
-    TNS_SERVER_PIGGYBACK_SYNC = 5
-    TNS_SERVER_PIGGYBACK_LTXID = 7
-    TNS_SERVER_PIGGYBACK_AC_REPLAY_CONTEXT = 8
-    TNS_SERVER_PIGGYBACK_EXT_SYNC = 9
-    TNS_SERVER_PIGGYBACK_SESS_SIGNATURE = 10
-
-# session return constants
-cdef enum:
-    TNS_SESSGET_SESSION_CHANGED = 4
-
-# LOB operations
-cdef enum:
-    TNS_LOB_OP_GET_LENGTH = 0x0001
-    TNS_LOB_OP_READ = 0x0002
-    TNS_LOB_OP_TRIM = 0x0020
-    TNS_LOB_OP_WRITE = 0x0040
-    TNS_LOB_OP_GET_CHUNK_SIZE = 0x4000
-    TNS_LOB_OP_CREATE_TEMP = 0x0110
-    TNS_LOB_OP_FREE_TEMP = 0x0111
-    TNS_LOB_OP_OPEN = 0x8000
-    TNS_LOB_OP_CLOSE = 0x10000
-    TNS_LOB_OP_IS_OPEN = 0x11000
-    TNS_LOB_OP_ARRAY = 0x80000
-    TNS_LOB_OP_FILE_EXISTS = 0x0800
-    TNS_LOB_OP_FILE_OPEN = 0x0100
-    TNS_LOB_OP_FILE_CLOSE = 0x0200
-    TNS_LOB_OP_FILE_ISOPEN = 0x0400
-
-# LOB locator constants
-cdef enum:
-    TNS_LOB_LOC_OFFSET_FLAG_1 = 4
-    TNS_LOB_LOC_OFFSET_FLAG_3 = 6
-    TNS_LOB_LOC_OFFSET_FLAG_4 = 7
-    TNS_LOB_QLOCATOR_VERSION = 4
-    TNS_LOB_LOC_FIXED_OFFSET = 16
-
-# LOB locator flags (byte 1)
-cdef enum:
-    TNS_LOB_LOC_FLAGS_BLOB = 0x01
-    TNS_LOB_LOC_FLAGS_VALUE_BASED = 0x20
-    TNS_LOB_LOC_FLAGS_ABSTRACT = 0x40
-
-# LOB locator flags (byte 2)
-cdef enum:
-    TNS_LOB_LOC_FLAGS_INIT = 0x08
-
-# LOB locator flags (byte 4)
-cdef enum:
-    TNS_LOB_LOC_FLAGS_TEMP = 0x01
-    TNS_LOB_LOC_FLAGS_VAR_LENGTH_CHARSET = 0x80
-
-# other LOB constants
-cdef enum:
-    TNS_LOB_OPEN_READ_WRITE = 2
-    TNS_LOB_OPEN_READ_ONLY = 11
-    TNS_LOB_PREFETCH_FLAG = 0x2000000
-
-# end-to-end metrics
-cdef enum:
-    TNS_END_TO_END_ACTION = 0x0010
-    TNS_END_TO_END_CLIENT_IDENTIFIER = 0x0001
-    TNS_END_TO_END_CLIENT_INFO = 0x0100
-    TNS_END_TO_END_DBOP = 0x0200
-    TNS_END_TO_END_MODULE = 0x0008
-
-# versions
-cdef enum:
-    TNS_VERSION_DESIRED = 319
-    TNS_VERSION_MINIMUM = 300
-    TNS_VERSION_MIN_ACCEPTED = 315      # 12.1
-    TNS_VERSION_MIN_LARGE_SDU = 315
-    TNS_VERSION_MIN_OOB_CHECK = 318
-    TNS_VERSION_MIN_END_OF_RESPONSE = 319
-
-# control packet types
-cdef enum:
-    TNS_CONTROL_TYPE_INBAND_NOTIFICATION = 8
-    TNS_CONTROL_TYPE_RESET_OOB = 9
-
-# connect flags
-cdef enum:
-    TNS_GSO_DONT_CARE = 0x0001
-    TNS_GSO_CAN_RECV_ATTENTION = 0x0400
-    TNS_NSI_NA_REQUIRED = 0x10
-    TNS_NSI_DISABLE_NA = 0x04
-    TNS_NSI_SUPPORT_SECURITY_RENEG = 0x80
-
-# other connection constants
-cdef enum:
-    TNS_PROTOCOL_CHARACTERISTICS = 0x4f98
-    TNS_CHECK_OOB = 0x01
-
-# TTC functions
-cdef enum:
-    TNS_FUNC_AUTH_PHASE_ONE = 118
-    TNS_FUNC_AUTH_PHASE_TWO = 115
-    TNS_FUNC_CLOSE_CURSORS = 105
-    TNS_FUNC_COMMIT = 14
-    TNS_FUNC_DIRECT_PATH_LOAD_STREAM = 129
-    TNS_FUNC_DIRECT_PATH_OP = 130
-    TNS_FUNC_DIRECT_PATH_PREPARE = 128
-    TNS_FUNC_EXECUTE = 94
-    TNS_FUNC_FETCH = 5
-    TNS_FUNC_LOB_OP = 96
-    TNS_FUNC_AQ_ENQ = 121
-    TNS_FUNC_AQ_DEQ = 122
-    TNS_FUNC_ARRAY_AQ = 145
-    TNS_FUNC_LOGOFF = 9
-    TNS_FUNC_PING = 147
-    TNS_FUNC_PIPELINE_BEGIN = 199
-    TNS_FUNC_PIPELINE_END = 200
-    TNS_FUNC_ROLLBACK = 15
-    TNS_FUNC_SET_END_TO_END_ATTR = 135
-    TNS_FUNC_REEXECUTE = 4
-    TNS_FUNC_REEXECUTE_AND_FETCH = 78
-    TNS_FUNC_SESSION_GET = 162
-    TNS_FUNC_SESSION_RELEASE = 163
-    TNS_FUNC_SESSION_STATE = 176
-    TNS_FUNC_SET_SCHEMA = 152
-    TNS_FUNC_TPC_TXN_SWITCH = 103
-    TNS_FUNC_TPC_TXN_CHANGE_STATE = 104
-
-# TTC authentication modes
-cdef enum:
-    TNS_AUTH_MODE_LOGON = 0x00000001
-    TNS_AUTH_MODE_CHANGE_PASSWORD = 0x00000002
-    TNS_AUTH_MODE_SYSDBA = 0x00000020
-    TNS_AUTH_MODE_SYSOPER = 0x00000040
-    TNS_AUTH_MODE_WITH_PASSWORD = 0x00000100
-    TNS_AUTH_MODE_SYSASM = 0x00400000
-    TNS_AUTH_MODE_SYSBKP = 0x01000000
-    TNS_AUTH_MODE_SYSDGD = 0x02000000
-    TNS_AUTH_MODE_SYSKMT = 0x04000000
-    TNS_AUTH_MODE_SYSRAC = 0x08000000
-    TNS_AUTH_MODE_IAM_TOKEN = 0x20000000
-
-# character sets and encodings
-cdef enum:
-    TNS_CHARSET_UTF8 = 873
-    TNS_CHARSET_UTF16 = 2000
-    TNS_ENCODING_MULTI_BYTE = 0x01
-    TNS_ENCODING_CONV_LENGTH = 0x02
-
-# compile time capability indices
-cdef enum:
-    TNS_CCAP_SQL_VERSION = 0
-    TNS_CCAP_LOGON_TYPES = 4
-    TNS_CCAP_FEATURE_BACKPORT = 5
-    TNS_CCAP_FIELD_VERSION = 7
-    TNS_CCAP_SERVER_DEFINE_CONV = 8
-    TNS_CCAP_DEQUEUE_WITH_SELECTOR = 9
-    TNS_CCAP_TTC1 = 15
-    TNS_CCAP_OCI1 = 16
-    TNS_CCAP_TDS_VERSION = 17
-    TNS_CCAP_RPC_VERSION = 18
-    TNS_CCAP_RPC_SIG = 19
-    TNS_CCAP_DBF_VERSION = 21
-    TNS_CCAP_LOB = 23
-    TNS_CCAP_TTC2 = 26
-    TNS_CCAP_UB2_DTY = 27
-    TNS_CCAP_OCI2 = 31
-    TNS_CCAP_CLIENT_FN = 34
-    TNS_CCAP_OCI3 = 35
-    TNS_CCAP_TTC3 = 37
-    TNS_CCAP_SESS_SIGNATURE_VERSION = 39
-    TNS_CCAP_TTC4 = 40
-    TNS_CCAP_LOB2 = 42
-    TNS_CCAP_TTC5 = 44
-    TNS_CCAP_VECTOR_FEATURES = 52
-    TNS_CCAP_MAX = 53
-
-# compile time capability values
-cdef enum:
-    TNS_CCAP_SQL_VERSION_MAX = 6
-    TNS_CCAP_FIELD_VERSION_11_2 = 6
-    TNS_CCAP_FIELD_VERSION_12_1 = 7
-    TNS_CCAP_FIELD_VERSION_12_2 = 8
-    TNS_CCAP_FIELD_VERSION_12_2_EXT1 = 9
-    TNS_CCAP_FIELD_VERSION_18_1 = 10
-    TNS_CCAP_FIELD_VERSION_18_1_EXT_1 = 11
-    TNS_CCAP_FIELD_VERSION_19_1 = 12
-    TNS_CCAP_FIELD_VERSION_19_1_EXT_1 = 13
-    TNS_CCAP_FIELD_VERSION_20_1 = 14
-    TNS_CCAP_FIELD_VERSION_20_1_EXT_1 = 15
-    TNS_CCAP_FIELD_VERSION_21_1 = 16
-    TNS_CCAP_FIELD_VERSION_23_1 = 17
-    TNS_CCAP_FIELD_VERSION_23_1_EXT_1 = 18
-    TNS_CCAP_FIELD_VERSION_23_1_EXT_2 = 19
-    TNS_CCAP_FIELD_VERSION_23_1_EXT_3 = 20
-    TNS_CCAP_FIELD_VERSION_23_1_EXT_4 = 21
-    TNS_CCAP_FIELD_VERSION_23_1_EXT_5 = 22
-    TNS_CCAP_FIELD_VERSION_23_3_EXT_6 = 23
-    TNS_CCAP_FIELD_VERSION_23_4 = 24
-    TNS_CCAP_FIELD_VERSION_MAX = 24
-    TNS_CCAP_O5LOGON = 8
-    TNS_CCAP_O5LOGON_NP = 2
-    TNS_CCAP_O7LOGON = 32
-    TNS_CCAP_O8LOGON_LONG_IDENTIFIER = 64
-    TNS_CCAP_O9LOGON_LONG_PASSWORD = 0x80
-    TNS_CCAP_CTB_IMPLICIT_POOL = 0x08
-    TNS_CCAP_CTB_OAUTH_MSG_ON_ERR = 0x10
-    TNS_CCAP_END_OF_CALL_STATUS = 0x01
-    TNS_CCAP_IND_RCD = 0x08
-    TNS_CCAP_FAST_BVEC = 0x20
-    TNS_CCAP_FAST_SESSION_PROPAGATE = 0x10
-    TNS_CCAP_APP_CTX_PIGGYBACK = 0x80
-    TNS_CCAP_TDS_VERSION_MAX = 3
-    TNS_CCAP_RPC_VERSION_MAX = 7
-    TNS_CCAP_RPC_SIG_VALUE = 3
-    TNS_CCAP_DBF_VERSION_MAX = 1
-    TNS_CCAP_LTXID = 0x08
-    TNS_CCAP_IMPLICIT_RESULTS = 0x10
-    TNS_CCAP_BIG_CHUNK_CLR = 0x20
-    TNS_CCAP_KEEP_OUT_ORDER = 0x80
-    TNS_CCAP_LOB_UB8_SIZE = 0x01
-    TNS_CCAP_LOB_ENCS = 0x02
-    TNS_CCAP_LOB_PREFETCH_DATA = 0x04
-    TNS_CCAP_LOB_TEMP_SIZE = 0x08
-    TNS_CCAP_LOB_PREFETCH_LENGTH = 0x40
-    TNS_CCAP_LOB_12C = 0x80
-    TNS_CCAP_LOB2_QUASI = 0x01
-    TNS_CCAP_LOB2_2GB_PREFETCH = 0x04
-    TNS_CCAP_DRCP = 0x10
-    TNS_CCAP_ZLNP = 0x04
-    TNS_CCAP_INBAND_NOTIFICATION = 0x04
-    TNS_CCAP_EXPLICIT_BOUNDARY = 0x40
-    TNS_CCAP_END_OF_RESPONSE = 0x20
-    TNS_CCAP_CLIENT_FN_MAX = 12
-    TNS_CCAP_VECTOR_SUPPORT = 0x08
-    TNS_CCAP_TOKEN_SUPPORTED = 0x02
-    TNS_CCAP_PIPELINING_SUPPORT = 0x04
-    TNS_CCAP_PIPELINING_BREAK = 0x10
-    TNS_CCAP_VECTOR_FEATURE_BINARY = 0x01
-    TNS_CCAP_VECTOR_FEATURE_SPARSE = 0x02
-    TNS_CCAP_TTC5_SESSIONLESS_TXNS = 0x20
-    TNS_CCAP_OCI3_OCSSYNC = 0x20
-
-# runtime capability indices
-cdef enum:
-    TNS_RCAP_COMPAT = 0
-    TNS_RCAP_TTC = 6
-    TNS_RCAP_MAX = 11
-
-# runtime capability values
-cdef enum:
-    TNS_RCAP_COMPAT_81 = 2
-    TNS_RCAP_TTC_ZERO_COPY = 0x01
-    TNS_RCAP_TTC_32K = 0x04
-    TNS_RCAP_TTC_SESSION_STATE_OPS = 0x10
-
-# verifier types
-cdef enum:
-    TNS_VERIFIER_TYPE_11G_1 = 0xb152
-    TNS_VERIFIER_TYPE_11G_2 = 0x1b25
-    TNS_VERIFIER_TYPE_12C = 0x4815
-
-# UDS flags
-cdef enum:
-    TNS_UDS_FLAGS_IS_JSON = 0x00000100
-    TNS_UDS_FLAGS_IS_OSON = 0x00000800
-
-# end of call status flags
-cdef enum:
-    TNS_EOCS_FLAGS_TXN_IN_PROGRESS = 0x00000002
-    TNS_EOCS_FLAGS_SESS_RELEASE = 0x00008000
-
-# accept flags
-cdef enum:
-    TNS_ACCEPT_FLAG_CHECK_OOB = 0x00000001
-    TNS_ACCEPT_FLAG_FAST_AUTH = 0x10000000
-    TNS_ACCEPT_FLAG_HAS_END_OF_RESPONSE = 0x02000000
-
-# transaction switching op codes
-cdef enum:
-    TNS_TPC_TXN_START = 0x01
-    TNS_TPC_TXN_DETACH = 0x02
-    TNS_TPC_TXN_POST_DETACH = 0x04
-
-# transaction change state op codes
-cdef enum:
-    TNS_TPC_TXN_COMMIT = 0x01
-    TNS_TPC_TXN_ABORT = 0x02
-    TNS_TPC_TXN_PREPARE = 0x03
-    TNS_TPC_TXN_FORGET = 0x04
-
-# sessionless server states
-cdef enum:
-    TNS_TPC_TXNID_SYNC_SET = 0x40
-    TNS_TPC_TXNID_SYNC_UNSET = 0x80
-
-# sessionless state reason
-cdef enum:
-    TNS_TPC_TXNID_SYNC_SERVER = 0x01
-    TNS_TPC_TXNID_SYNC_CLIENT = 0x02
-
-# transaction states
-cdef enum:
-    TNS_TPC_TXN_STATE_PREPARE = 0
-    TNS_TPC_TXN_STATE_REQUIRES_COMMIT = 1
-    TNS_TPC_TXN_STATE_COMMITTED = 2
-    TNS_TPC_TXN_STATE_ABORTED = 3
-    TNS_TPC_TXN_STATE_READ_ONLY = 4
-    TNS_TPC_TXN_STATE_FORGOTTEN = 5
-
-# pipeline modes
-cdef enum:
-    TNS_PIPELINE_MODE_CONTINUE_ON_ERROR = 1
-    TNS_PIPELINE_MODE_ABORT_ON_ERROR = 2
-
-# AQ extension keywords
-cdef enum:
-    TNS_AQ_EXT_KEYWORD_AGENT_NAME = 64
-    TNS_AQ_EXT_KEYWORD_AGENT_ADDRESS = 65
-    TNS_AQ_EXT_KEYWORD_AGENT_PROTOCOL = 66
-    TNS_AQ_EXT_KEYWORD_ORIGINAL_MSGID = 69
-
-# session state flags
-cdef enum:
-    TNS_SESSION_STATE_REQUEST_BEGIN = 0x04
-    TNS_SESSION_STATE_REQUEST_END = 0x08
-    TNS_SESSION_STATE_EXPLICIT_BOUNDARY = 0x40
-
-# direct path constants
-cdef enum:
-    TNS_DP_INTERFACE_VERSION = 400
-    TNS_DP_STREAM_VERSION = 400
-
-# direct path op codes
-cdef enum:
-    TNS_DPP_OP_CODE_LOAD = 1
-    TNS_DPP_OP_CODE_UNLOAD = 2
-    TNS_DPP_OP_CODE_CONVERT = 3
-
-# direct path prepare input indexes
-cdef enum:
-    TNS_DPP_IN_INDEX_INTERFACE_VERSION = 0
-    TNS_DPP_IN_INDEX_STREAM_VERSION = 1
-    TNS_DPP_IN_INDEX_LOCK_WAIT = 14
-    TNS_DPP_IN_MAX_PARAMS = 36
-
-# direct path prepare keyword indexes
-cdef enum:
-    TNS_DPP_KW_INDEX_OBJECT_NAME = 1
-    TNS_DPP_KW_INDEX_SUBOBJECT_NAME = 2
-    TNS_DPP_KW_INDEX_SCHEMA_NAME = 3
-    TNS_DPP_KW_INDEX_COLUMN_NAME = 4
-    TNS_DPP_KW_INDEX_VARRAY_TABLE = 15
-    TNS_DPP_KW_INDEX_NFOBJ_OID_POS = 11
-    TNS_DPP_KW_INDEX_NFOBJ_SID_POS = 16
-    TNS_DPP_KW_INDEX_NFOBJ_VARRAY_INDEX = 17
-
-# direct path prepare output indexes
-cdef enum:
-    TNS_DPP_OUT_INDEX_CURSOR = 3
-    TNS_DPP_OUT_MAX_PARAMS = 14
-
-# direct path row header flags
-cdef enum:
-    TNS_DPLS_ROW_HEADER_FAST_PIECE = 0x10
-    TNS_DPLS_ROW_HEADER_FAST_ROW = 0x20
-    TNS_DPLS_ROW_HEADER_FIRST = 0x08
-    TNS_DPLS_ROW_HEADER_LAST = 0x04
-    TNS_DPLS_ROW_HEADER_SPLIT_WITH_PREV = 0x02
-    TNS_DPLS_ROW_HEADER_SPLIT_WITH_NEXT = 0x01
-
-# other direct path load stream constants
-cdef enum:
-    TNS_DPLS_MAX_MESSAGE_SIZE = 1_073_728_895
-    TNS_DPLS_MAX_SHORT_LENGTH = 0xfa
-    TNS_DPLS_MAX_PIECE_SIZE = 0xfff0
-    TNS_DPLS_FAST_HEADER_SIZE = 4
-    TNS_DPLS_SLOW_HEADER_SIZE = 2
-
-# direct path operation codes
-cdef enum:
-    TNS_DP_OP_ABORT = 1
-    TNS_DP_OP_FINISH = 2
-
-# other constants
-cdef enum:
-    TNS_ESCAPE_CHAR = 253
-    TNS_MAX_ROWID_LENGTH = 18
-    TNS_DURATION_SESSION = 10
-    TNS_MAX_LONG_LENGTH = 0x7fffffff
-    TNS_MAX_CONNECT_DATA = 230
-    TNS_MAX_UROWID_LENGTH = 5267
-    TNS_SERVER_CONVERTS_CHARS = 0x01
-    TNS_JSON_MAX_LENGTH = 32 * 1024 * 1024
-    TNS_VECTOR_MAX_LENGTH = 1 * 1024 * 1024
-    TNS_AQ_MESSAGE_ID_LENGTH = 16
-    TNS_AQ_MESSAGE_VERSION = 1
-
-# base 64 encoding alphabet
-cdef bytes TNS_BASE64_ALPHABET = \
-        b'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
-cdef bytearray TNS_BASE64_ALPHABET_ARRAY = \
-        bytearray(TNS_BASE64_ALPHABET)
-cdef bytes TNS_EXTENT_OID = bytes.fromhex('00000000000000000000000000010001')
-
-# drcp release mode
-cdef enum:
-    DRCP_DEAUTHENTICATE = 0x00000002
diff --git a/src/oracledb/impl/thin/crypto.pyx b/src/oracledb/impl/thin/crypto.pyx
deleted file mode 100644
index 8275dc02..00000000
--- a/src/oracledb/impl/thin/crypto.pyx
+++ /dev/null
@@ -1,165 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# crypto.pyx
-#
-# Cython file defining the cryptographic methods used by the thin client
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-try:
-    from cryptography import x509
-    from cryptography.hazmat.primitives import hashes, serialization
-    from cryptography.hazmat.primitives.ciphers import algorithms, modes, Cipher
-    from cryptography.hazmat.primitives.asymmetric import padding
-    from cryptography.hazmat.primitives.kdf import pbkdf2
-except Exception as e:
-    CRYPTOGRAPHY_IMPORT_ERROR = e
-
-
-DN_REGEX = '(?:^|,\s?)(?:(?P<name>[A-Z]+)=(?P<val>"(?:[^"]|"")+"|[^,]+))+'
-PEM_WALLET_FILE_NAME = "ewallet.pem"
-
-def _name_matches(name_to_check, cert_name):
-    """
-    Returns a boolean indicating if the name to check matches with the
-    certificate name. The certificate name may contain a wildcard (*)
-    character.
-    """
-
-    # check for a full match (case insensitive)
-    cert_name = cert_name.lower()
-    name_to_check = name_to_check.lower()
-    if name_to_check == cert_name:
-        return True
-
-    # ensure that more than one label exists in both the name to check and the
-    # certificate name
-    check_pos = name_to_check.find(".")
-    cert_pos = cert_name.find(".")
-    if check_pos <= 0 or cert_pos <= 0:
-        return False
-
-    # ensure that the right hand labels all match
-    if name_to_check[check_pos:] != cert_name[cert_pos:]:
-        return False
-
-    # match wildcards, if applicable
-    cert_label = cert_name[:cert_pos]
-    check_label = name_to_check[:check_pos]
-    if cert_label == "*":
-        return True
-    elif cert_label.startswith("*"):
-        return check_label.endswith(cert_label[1:])
-    elif cert_label.endswith("*"):
-        return check_label.startswith(cert_label[:-1])
-    wildcard_pos = cert_name.find("*")
-    if wildcard_pos < 0:
-        return False
-    return check_label.startswith(cert_label[:wildcard_pos]) \
-            and check_label.endswith(cert_label[wildcard_pos + 1:])
-
-
-def check_server_dn(sock, expected_dn, expected_name):
-    """
-    Validates the server distinguished name (if one is specified) or the
-    simple name (if a distinguished name is not present).
-    """
-    cert_data = sock.getpeercert(binary_form=True)
-    cert = x509.load_der_x509_certificate(cert_data)
-    if expected_dn is not None:
-        server_dn = cert.subject.rfc4514_string()
-        expected_dn_dict = dict(re.findall(DN_REGEX, expected_dn))
-        server_dn_dict = dict(re.findall(DN_REGEX, server_dn))
-        if server_dn_dict != expected_dn_dict:
-            errors._raise_err(errors.ERR_INVALID_SERVER_CERT_DN,
-                              expected_dn=expected_dn)
-    else:
-        try:
-            ext = cert.extensions.get_extension_for_oid(
-                x509.oid.ExtensionOID.SUBJECT_ALTERNATIVE_NAME
-            )
-            for name in ext.value.get_values_for_type(x509.DNSName):
-                if _name_matches(expected_name, name):
-                    return
-        except x509.ExtensionNotFound:
-            pass
-        for name in cert.subject.get_attributes_for_oid(
-            x509.oid.NameOID.COMMON_NAME
-        ):
-            if _name_matches(expected_name, name.value):
-                return
-        errors._raise_err(errors.ERR_INVALID_SERVER_NAME,
-                          expected_name=expected_name)
-
-
-def decrypt_cbc(key, encrypted_text):
-    """
-    Decrypt the given text using the given key.
-    """
-    iv = bytes(16)
-    algo = algorithms.AES(key)
-    cipher = Cipher(algo, modes.CBC(iv))
-    decryptor = cipher.decryptor()
-    return decryptor.update(encrypted_text)
-
-
-def encrypt_cbc(key, plain_text, zeros=False):
-    """
-    Encrypt the given text using the given key. If the zeros flag is set, use
-    zero padding if required. Otherwise, use number padding.
-    """
-    block_size = 16
-    iv = bytes(block_size)
-    algo = algorithms.AES(key)
-    cipher = Cipher(algo, modes.CBC(iv))
-    encryptor = cipher.encryptor()
-    n = block_size - len(plain_text) % block_size
-    if n:
-        if zeros:
-            plain_text += bytes(n)
-        else:
-            plain_text += (bytes([n]) * n)
-    return encryptor.update(plain_text) + encryptor.finalize()
-
-
-def get_derived_key(key, salt, length, iterations):
-    """
-    Return a derived key using PBKDF2.
-    """
-    kdf = pbkdf2.PBKDF2HMAC(algorithm=hashes.SHA512(), salt=salt,
-                            length=length, iterations=iterations)
-    return kdf.derive(key)
-
-
-def get_signature(private_key_str, text):
-    """
-    Returns a signed version of the given text (used for IAM token
-    authentication) in base64 encoding.
-    """
-    private_key = serialization.load_pem_private_key(private_key_str.encode(),
-                                                     password=None)
-    sig = private_key.sign(text.encode(), padding.PKCS1v15(), hashes.SHA256())
-    return base64.b64encode(sig).decode()
diff --git a/src/oracledb/impl/thin/cursor.pyx b/src/oracledb/impl/thin/cursor.pyx
deleted file mode 100644
index 525ff47b..00000000
--- a/src/oracledb/impl/thin/cursor.pyx
+++ /dev/null
@@ -1,486 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# cursor.pyx
-#
-# Cython file defining the thin Cursor implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseThinCursorImpl(BaseCursorImpl):
-
-    cdef:
-        BaseThinConnImpl _conn_impl
-        Statement _statement
-        list _batcherrors
-        list _dmlrowcounts
-        list _implicit_resultsets
-        uint64_t _buffer_min_row
-        uint64_t _buffer_max_row
-        uint32_t _num_columns
-        uint32_t _last_row_index
-        Rowid _lastrowid
-
-    def __cinit__(self, conn_impl):
-        self._conn_impl = conn_impl
-
-    cdef int _close(self, bint in_del) except -1:
-        if self._statement is not None:
-            self._conn_impl._return_statement(self._statement)
-            self._statement = None
-
-    cdef MessageWithData _create_message(self, type typ, object cursor):
-        """
-        Creates a message object that is used to send a request to the database
-        and receive back its response.
-        """
-        cdef MessageWithData message
-        message = typ.__new__(typ, cursor, self)
-        message._initialize(self._conn_impl)
-        message.cursor = cursor
-        message.cursor_impl = self
-        return message
-
-    cdef ExecuteMessage _create_execute_message(self, object cursor):
-        """
-        Creates and returns the message used to execute a statement once.
-        """
-        cdef ExecuteMessage message
-        message = self._create_message(ExecuteMessage, cursor)
-        message.num_execs = 1
-        if self.scrollable:
-            message.fetch_orientation = TNS_FETCH_ORIENTATION_CURRENT
-            message.fetch_pos = self.rowcount + 1
-        return message
-
-    cdef ExecuteMessage _create_scroll_message(self, object cursor,
-                                               object mode, int32_t offset):
-        """
-        Creates a message object that is used to send a scroll request to the
-        database and receive back its response.
-        """
-        cdef:
-            uint64_t desired_row = 0
-            uint32_t orientation = 0
-            ExecuteMessage message
-
-        # check mode and calculate desired row
-        if mode == "relative":
-            if <int64_t> (self.rowcount + offset) < 1:
-                errors._raise_err(errors.ERR_SCROLL_OUT_OF_RESULT_SET)
-            orientation = TNS_FETCH_ORIENTATION_RELATIVE
-            desired_row = self.rowcount + offset
-        elif mode == "absolute":
-            orientation = TNS_FETCH_ORIENTATION_ABSOLUTE
-            desired_row = <uint64_t> offset
-        elif mode == "first":
-            orientation = TNS_FETCH_ORIENTATION_FIRST
-            desired_row = 1
-        elif mode == "last":
-            orientation = TNS_FETCH_ORIENTATION_LAST
-        else:
-            errors._raise_err(errors.ERR_WRONG_SCROLL_MODE)
-
-        # determine if the server needs to be contacted at all
-        # for "last", the server is always contacted
-        if orientation != TNS_FETCH_ORIENTATION_LAST \
-                and desired_row >= self._buffer_min_row \
-                and desired_row < self._buffer_max_row:
-            self._buffer_index = \
-                    <uint32_t> (desired_row - self._buffer_min_row)
-            self._buffer_rowcount = self._buffer_max_row - desired_row
-            self.rowcount = desired_row - 1
-            return None
-
-        # build message
-        message = self._create_message(ExecuteMessage, cursor)
-        message.scroll_operation = True
-        message.fetch_orientation = orientation
-        message.fetch_pos = <uint32_t> desired_row
-        return message
-
-    cdef BaseVarImpl _create_var_impl(self, object conn):
-        cdef ThinVarImpl var_impl
-        var_impl = ThinVarImpl.__new__(ThinVarImpl)
-        var_impl._conn_impl = self._conn_impl
-        return var_impl
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef BaseVarImpl _create_fetch_var(self, object conn, object cursor,
-                                       object type_handler,
-                                       bint uses_metadata, ssize_t pos,
-                                       OracleMetadata metadata):
-        """
-        Internal method that creates a fetch variable. A check is made after
-        the variable is created to determine if a conversion is required and
-        therefore a define must be performed.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            ThinVarImpl var_impl
-        var_impl = <ThinVarImpl> BaseCursorImpl._create_fetch_var(
-            self, conn, cursor, type_handler, uses_metadata, pos, metadata
-        )
-        if metadata.objtype is not None:
-            typ_impl = metadata.objtype
-            if typ_impl.is_xml_type:
-                var_impl.outconverter = \
-                        lambda v: v if isinstance(v, str) else v.read()
-
-    cdef BaseConnImpl _get_conn_impl(self):
-        """
-        Internal method used to return the connection implementation associated
-        with the cursor implementation.
-        """
-        return self._conn_impl
-
-    cdef bint _is_plsql(self):
-        return self._statement._is_plsql
-
-    cdef int _prepare(self, str statement, str tag,
-                      bint cache_statement) except -1:
-        """
-        Internal method for preparing a statement for execution.
-        """
-        BaseCursorImpl._prepare(self, statement, tag, cache_statement)
-        if self._statement is not None:
-            self._conn_impl._return_statement(self._statement)
-            self._statement = None
-        self._statement = self._conn_impl._get_statement(statement,
-                                                         cache_statement)
-        self.fetch_metadata = self._statement._fetch_metadata
-        self.fetch_vars = self._statement._fetch_vars
-        self.fetch_var_impls = self._statement._fetch_var_impls
-        self._num_columns = self._statement._num_columns
-
-    cdef int _preprocess_execute(self, object conn) except -1:
-        cdef BindInfo bind_info
-        if self.bind_vars is not None:
-            self._perform_binds(conn, 0)
-        for bind_info in self._statement._bind_info_list:
-            if bind_info._bind_var_impl is None:
-                errors._raise_err(errors.ERR_MISSING_BIND_VALUE,
-                                  name=bind_info._bind_name)
-
-    cdef int _post_process_scroll(self, ExecuteMessage message) except -1:
-        """
-        Called after a scroll operation has completed successfully. The row
-        count and buffer row counts and indices are updated as required.
-        """
-        if self._buffer_rowcount == 0:
-            if message.fetch_orientation not in (
-                TNS_FETCH_ORIENTATION_FIRST,
-                TNS_FETCH_ORIENTATION_LAST
-            ):
-                errors._raise_err(errors.ERR_SCROLL_OUT_OF_RESULT_SET)
-            self.rowcount = 0
-            self._more_rows_to_fetch = False
-            self._buffer_index = 0
-            self._buffer_min_row = 0
-            self._buffer_max_row = 0
-        else:
-            self.rowcount = message.error_info.rowcount - self._buffer_rowcount
-            self._buffer_min_row = self.rowcount + 1
-            self._buffer_max_row = self._buffer_min_row + self._buffer_rowcount
-            self._buffer_index = 0
-
-    cdef int _set_fetch_array_size(self, uint32_t value):
-        """
-        Internal method for setting the fetch array size. This also ensures
-        that any fetch variables have enough space to store the fetched rows
-        that are returned.
-        """
-        cdef:
-            ThinVarImpl var_impl
-            uint32_t num_vals
-        self._fetch_array_size = value
-        if self.fetch_var_impls is not None:
-            for var_impl in self.fetch_var_impls:
-                if var_impl.num_elements >= self._fetch_array_size:
-                    continue
-                num_vals = (self._fetch_array_size - var_impl.num_elements)
-                var_impl.num_elements = self._fetch_array_size
-                var_impl._values.extend([None] * num_vals)
-
-    def get_array_dml_row_counts(self):
-        if self._dmlrowcounts is None:
-            errors._raise_err(errors.ERR_ARRAY_DML_ROW_COUNTS_NOT_ENABLED)
-        return self._dmlrowcounts
-
-    def get_batch_errors(self):
-        return self._batcherrors
-
-    def get_bind_names(self):
-        return list(self._statement._bind_info_dict.keys())
-
-    def get_implicit_results(self, connection):
-        if self._implicit_resultsets is None:
-            errors._raise_err(errors.ERR_NO_STATEMENT_EXECUTED)
-        return self._implicit_resultsets
-
-    def get_lastrowid(self):
-        if self.rowcount > 0:
-            return _encode_rowid(&self._lastrowid)
-
-    def is_query(self, connection):
-        return self.fetch_vars is not None
-
-
-
-cdef class ThinCursorImpl(BaseThinCursorImpl):
-
-    cdef int _fetch_rows(self, object cursor) except -1:
-        """
-        Internal method used for fetching rows from the database.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            MessageWithData message
-        if self._statement._sql is None or self.scrollable:
-            message = self._create_execute_message(cursor)
-        else:
-            message = self._create_message(FetchMessage, cursor)
-        protocol._process_single_message(message)
-        self._buffer_min_row = self.rowcount + 1
-        self._buffer_max_row = self._buffer_min_row + self._buffer_rowcount
-
-    def execute(self, cursor):
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            object conn = cursor.connection
-            MessageWithData message
-        self._preprocess_execute(conn)
-        message = self._create_execute_message(cursor)
-        protocol._process_single_message(message)
-        self.warning = message.warning
-        if self._statement._is_query:
-            if message.type_cache is not None:
-                message.type_cache.populate_partial_types(conn)
-
-    def executemany(self, object cursor, uint32_t num_execs, bint batcherrors,
-                    bint arraydmlrowcounts, uint32_t offset=0):
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            MessageWithData messsage
-            Statement stmt
-            uint32_t i
-
-        # set up message to send
-        self._preprocess_execute(cursor.connection)
-        message = self._create_message(ExecuteMessage, cursor)
-        message.num_execs = num_execs
-        message.batcherrors = batcherrors
-        message.arraydmlrowcounts = arraydmlrowcounts
-        message.offset = offset
-        stmt = self._statement
-
-        # only DML statements may use the batch errors or array DML row counts
-        # flags
-        if not stmt._is_dml and (batcherrors or arraydmlrowcounts):
-            errors._raise_err(errors.ERR_EXECUTE_MODE_ONLY_FOR_DML)
-
-        # if a PL/SQL statement requires a full execute, perform only a single
-        # iteration in order to allow the determination of input/output binds
-        # to be completed; after that, an execution of the remaining iterations
-        # can be performed (but only if the cursor remains intact)
-        if stmt.requires_single_execute():
-            message.num_execs = 1
-            while num_execs > 0:
-                num_execs -= 1
-                protocol._process_single_message(message)
-                message.offset += 1
-                if stmt._cursor_id != 0:
-                    break
-        if num_execs > 0:
-            message.num_execs = num_execs
-            protocol._process_single_message(message)
-        self.warning = message.warning
-
-    def parse(self, cursor):
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            MessageWithData message
-        message = self._create_message(ExecuteMessage, cursor)
-        message.parse_only = True
-        protocol._process_single_message(message)
-
-    def scroll(self, object cursor, int32_t offset, object mode):
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            ExecuteMessage message
-        message = self._create_scroll_message(cursor, mode, offset)
-        if message is not None:
-            protocol._process_single_message(message)
-            self._post_process_scroll(message)
-
-
-cdef class AsyncThinCursorImpl(BaseThinCursorImpl):
-
-    def _build_json_converter_fn(self):
-        """
-        Internal method for building a JSON converter function with asyncio.
-        """
-        async def converter(value):
-            if isinstance(value, PY_TYPE_ASYNC_LOB):
-                value = await value.read()
-            if isinstance(value, bytes):
-                value = value.decode()
-            if value:
-                return json.loads(value)
-        return converter
-
-    async def _fetch_rows_async(self, object cursor):
-        """
-        Internal method used for fetching rows from the database.
-        """
-        cdef MessageWithData message
-        if self._statement._sql is None or self.scrollable:
-            message = self._create_execute_message(cursor)
-        else:
-            message = self._create_message(FetchMessage, cursor)
-        await self._conn_impl._protocol._process_single_message(message)
-        self._buffer_min_row = self.rowcount + 1
-
-    async def _preprocess_execute_async(self, object conn):
-        """
-        Performs the necessary steps required before actually executing the
-        statement associated with the cursor.
-        """
-        cdef:
-            ThinVarImpl var_impl
-            BindInfo bind_info
-            ssize_t idx
-        self._preprocess_execute(conn)
-        for bind_info in self._statement._bind_info_list:
-            var_impl = bind_info._bind_var_impl
-            if var_impl._coroutine_indexes is not None:
-                for idx in var_impl._coroutine_indexes:
-                    var_impl._values[idx] = await var_impl._values[idx]
-                var_impl._coroutine_indexes = None
-
-    async def execute(self, cursor):
-        cdef:
-            object conn = cursor.connection
-            BaseAsyncProtocol protocol
-            MessageWithData message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        await self._preprocess_execute_async(conn)
-        message = self._create_execute_message(cursor)
-        await protocol._process_single_message(message)
-        self.warning = message.warning
-        if self._statement._is_query:
-            if message.type_cache is not None:
-                await message.type_cache.populate_partial_types(conn)
-
-    async def executemany(self, object cursor, uint32_t num_execs,
-                          bint batcherrors, bint arraydmlrowcounts,
-                          uint32_t offset):
-        cdef:
-            BaseAsyncProtocol protocol
-            MessageWithData messsage
-            Statement stmt
-            uint32_t i
-
-        # set up message to send
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        await self._preprocess_execute_async(cursor.connection)
-        message = self._create_message(ExecuteMessage, cursor)
-        message.num_execs = num_execs
-        message.batcherrors = batcherrors
-        message.arraydmlrowcounts = arraydmlrowcounts
-        message.offset = offset
-        stmt = self._statement
-
-        # only DML statements may use the batch errors or array DML row counts
-        # flags
-        if not stmt._is_dml and (batcherrors or arraydmlrowcounts):
-            errors._raise_err(errors.ERR_EXECUTE_MODE_ONLY_FOR_DML)
-
-        # if a PL/SQL statement requires a full execute, perform only a single
-        # iteration in order to allow the determination of input/output binds
-        # to be completed; after that, an execution of the remaining iterations
-        # can be performed (but only if the cursor remains intact)
-        if stmt.requires_single_execute():
-            message.num_execs = 1
-            while num_execs > 0:
-                num_execs -= 1
-                await protocol._process_single_message(message)
-                message.offset += 1
-                if stmt._cursor_id != 0:
-                    break
-        if num_execs > 0:
-            message.num_execs = num_execs
-            await protocol._process_single_message(message)
-        self.warning = message.warning
-
-    async def fetch_df_all(self, cursor):
-        """
-        Internal method used for fetching all data as DataFrame
-        """
-        while self._more_rows_to_fetch:
-            await self._fetch_rows_async(cursor)
-        return self._finish_building_arrow_arrays()
-
-    async def fetch_df_batches(self, cursor, int batch_size):
-        """
-        Internal method used for fetching next batch as DataFrame.
-        """
-        # Return the prefetched batch
-        yield self._finish_building_arrow_arrays()
-
-        while self._more_rows_to_fetch:
-            self._create_arrow_arrays()
-            await self._fetch_rows_async(cursor)
-            if self._buffer_rowcount > 0:
-                yield self._finish_building_arrow_arrays()
-
-    async def fetch_next_row(self, cursor):
-        """
-        Internal method used for fetching the next row from a cursor.
-        """
-        if self._buffer_rowcount == 0 and self._more_rows_to_fetch:
-            await self._fetch_rows_async(cursor)
-        if self._buffer_rowcount > 0:
-            return self._create_row()
-
-    async def parse(self, cursor):
-        cdef:
-            BaseAsyncProtocol protocol
-            MessageWithData message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_message(ExecuteMessage, cursor)
-        message.parse_only = True
-        await protocol._process_single_message(message)
-
-    async def scroll(self, object cursor, int32_t offset, object mode):
-        cdef:
-            BaseAsyncProtocol protocol
-            MessageWithData message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_scroll_message(cursor, mode, offset)
-        if message is not None:
-            await protocol._process_single_message(message)
-            self._post_process_scroll(message)
diff --git a/src/oracledb/impl/thin/dbobject.pyx b/src/oracledb/impl/thin/dbobject.pyx
deleted file mode 100644
index 078eafdd..00000000
--- a/src/oracledb/impl/thin/dbobject.pyx
+++ /dev/null
@@ -1,627 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# dbobject.pyx
-#
-# Cython file defining the thin DbObjectType, DbObjectAttr and DbObject
-# implementation classes (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class DbObjectPickleBuffer(GrowableBuffer):
-
-    cdef int _read_raw_bytes_and_length(self, const char_type **ptr,
-                                        ssize_t *num_bytes) except -1:
-        """
-        Helper function that processes the length (if needed) and then acquires
-        the specified number of bytes from the buffer.
-        """
-        cdef uint32_t extended_num_bytes
-        if num_bytes[0] == TNS_LONG_LENGTH_INDICATOR:
-            self.read_uint32be(&extended_num_bytes)
-            num_bytes[0] = <ssize_t> extended_num_bytes
-        ptr[0] = self._get_raw(num_bytes[0])
-
-    cdef int _write_raw_bytes_and_length(self, const char_type *ptr,
-                                         ssize_t num_bytes) except -1:
-        """
-        Helper function that writes the length in the format required before
-        writing the bytes.
-        """
-        self.write_length(num_bytes)
-        self.write_raw(ptr, <uint32_t> num_bytes)
-
-    cdef int get_is_atomic_null(self, bint is_collection,
-                                bint* is_null) except -1:
-        """
-        Reads the next byte and checks to see if the value is atomically null.
-        If not, the byte is returned to the buffer for further processing.
-        """
-        cdef uint8_t value
-        self.read_ub1(&value)
-        if value == TNS_OBJ_ATOMIC_NULL \
-                or (is_collection and value == TNS_NULL_LENGTH_INDICATOR):
-            is_null[0] = True
-        else:
-            is_null[0] = False
-            self._pos -= 1
-
-    cdef int read_header(self, uint8_t* flags, uint8_t *version) except -1:
-        """
-        Reads the header of the pickled data.
-        """
-        cdef:
-            uint32_t prefix_seg_length
-            uint8_t tmp
-        self.read_ub1(flags)
-        self.read_ub1(version)
-        self.skip_length()
-        if flags[0] & TNS_OBJ_IS_DEGENERATE:
-            errors._raise_not_supported("DbObject stored in a LOB")
-        if flags[0] & TNS_OBJ_NO_PREFIX_SEG:
-            return 0
-        self.read_length(&prefix_seg_length)
-        self.skip_raw_bytes(prefix_seg_length)
-
-    cdef int read_length(self, uint32_t *length) except -1:
-        """
-        Read the length from the buffer. This will be a single byte, unless the
-        value meets or exceeds TNS_LONG_LENGTH_INDICATOR. In that case, the
-        value is stored as a 4-byte integer.
-        """
-        cdef uint8_t short_length
-        self.read_ub1(&short_length)
-        if short_length == TNS_LONG_LENGTH_INDICATOR:
-            self.read_uint32be(length)
-        else:
-            length[0] = short_length
-
-    cdef object read_xmltype(self, BaseThinConnImpl conn_impl):
-        """
-        Reads an XML type from the buffer. This is similar to reading a
-        database object but with specialized processing.
-        """
-        cdef:
-            uint8_t image_flags, image_version
-            BaseThinLobImpl lob_impl
-            const char_type *ptr
-            ssize_t bytes_left
-            uint32_t xml_flag
-            type cls
-        self.read_header(&image_flags, &image_version)
-        self.skip_raw_bytes(1)              # XML version
-        self.read_uint32be(&xml_flag)
-        if xml_flag & TNS_XML_TYPE_FLAG_SKIP_NEXT_4:
-            self.skip_raw_bytes(4)
-        bytes_left = self.bytes_left()
-        ptr = self.read_raw_bytes(bytes_left)
-        if xml_flag & TNS_XML_TYPE_STRING:
-            return ptr[:bytes_left].decode()
-        elif xml_flag & TNS_XML_TYPE_LOB:
-            lob_impl = conn_impl._create_lob_impl(DB_TYPE_CLOB,
-                                                  ptr[:bytes_left])
-            cls = PY_TYPE_ASYNC_LOB \
-                if conn_impl._protocol._transport._is_async \
-                else PY_TYPE_LOB
-            return cls._from_impl(lob_impl)
-        errors._raise_err(errors.ERR_UNEXPECTED_XML_TYPE, flag=xml_flag)
-
-    cdef int skip_length(self) except -1:
-        """
-        Skips the length instead of reading it from the buffer.
-        """
-        cdef uint8_t short_length
-        self.read_ub1(&short_length)
-        if short_length == TNS_LONG_LENGTH_INDICATOR:
-            self.skip_raw_bytes(4)
-
-    cdef int write_header(self, ThinDbObjectImpl obj_impl) except -1:
-        """
-        Writes the header of the pickled data. Since the size is unknown at
-        this point, zero is written initially and the actual size is written
-        later.
-        """
-        cdef ThinDbObjectTypeImpl typ_impl = obj_impl.type
-        self.write_uint8(obj_impl.image_flags)
-        self.write_uint8(obj_impl.image_version)
-        self.write_uint8(TNS_LONG_LENGTH_INDICATOR)
-        self.write_uint32be(0)
-        if typ_impl.is_collection:
-            self.write_uint8(1)             # length of prefix segment
-            self.write_uint8(1)             # prefix segment contents
-
-    cdef int write_length(self, ssize_t length) except -1:
-        """
-        Writes the length to the buffer.
-        """
-        if length <= TNS_OBJ_MAX_SHORT_LENGTH:
-            self.write_uint8(<uint8_t> length)
-        else:
-            self.write_uint8(TNS_LONG_LENGTH_INDICATOR)
-            self.write_uint32be(<uint32_t> length)
-
-
-@cython.final
-cdef class TDSBuffer(Buffer):
-    pass
-
-
-cdef class ThinDbObjectImpl(BaseDbObjectImpl):
-    cdef:
-        uint8_t image_flags, image_version
-        bytes toid, oid, packed_data
-        uint32_t num_elements
-        dict unpacked_assoc_array
-        list unpacked_assoc_keys
-        dict unpacked_attrs
-        list unpacked_array
-        uint16_t flags
-
-    cdef inline int _ensure_assoc_keys(self) except -1:
-        """
-        Ensure that the keys for the associative array have been calculated.
-        PL/SQL associative arrays keep their keys in sorted order so this must
-        be calculated when indices are required.
-        """
-        if self.unpacked_assoc_keys is None:
-            self.unpacked_assoc_keys = list(sorted(self.unpacked_assoc_array))
-
-    cdef inline int _ensure_unpacked(self) except -1:
-        """
-        Ensure that the data has been unpacked.
-        """
-        if self.packed_data is not None:
-            self._unpack_data()
-
-    cdef bytes _get_packed_data(self):
-        """
-        Returns the packed data for the object. This will either be the value
-        retrieved from the database or generated packed data (for new objects
-        and those that have had their data unpacked already).
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl = self.type
-            DbObjectPickleBuffer buf
-            ssize_t size
-        if self.packed_data is not None:
-            return self.packed_data
-        buf = DbObjectPickleBuffer.__new__(DbObjectPickleBuffer)
-        buf._initialize()
-        buf.write_header(self)
-        self._pack_data(buf)
-        size = buf._pos
-        buf.skip_to(3)
-        buf.write_uint32be(size)
-        return buf._data[:size]
-
-    cdef int _pack_data(self, DbObjectPickleBuffer buf) except -1:
-        """
-        Packs the data from the object into the buffer.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl = self.type
-            ThinDbObjectAttrImpl attr
-            int32_t index
-            object value
-        if typ_impl.is_collection:
-            buf.write_uint8(typ_impl.collection_flags)
-            if typ_impl.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                self._ensure_assoc_keys()
-                buf.write_length(len(self.unpacked_assoc_keys))
-                for index in self.unpacked_assoc_keys:
-                    buf.write_uint32be(<uint32_t> index)
-                    self._pack_value(buf, typ_impl.element_metadata,
-                                     self.unpacked_assoc_array[index])
-            else:
-                buf.write_length(len(self.unpacked_array))
-                for value in self.unpacked_array:
-                    self._pack_value(buf, typ_impl.element_metadata, value)
-        else:
-            for attr in typ_impl.attrs:
-                self._pack_value(buf, attr, self.unpacked_attrs[attr.name])
-
-    cdef int _pack_value(self, DbObjectPickleBuffer buf,
-                         OracleMetadata metadata, object value) except -1:
-        """
-        Packs a value into the buffer. At this point it is assumed that the
-        value matches the correct type.
-        """
-        cdef:
-            uint8_t ora_type_num = metadata.dbtype._ora_type_num
-            ThinDbObjectImpl obj_impl
-            BaseThinLobImpl lob_impl
-            bytes temp_bytes
-        if value is None:
-            if metadata.objtype is not None \
-                    and not metadata.objtype.is_collection:
-                buf.write_uint8(TNS_OBJ_ATOMIC_NULL)
-            else:
-                buf.write_uint8(TNS_NULL_LENGTH_INDICATOR)
-        elif ora_type_num in (ORA_TYPE_NUM_CHAR, ORA_TYPE_NUM_VARCHAR):
-            if metadata.dbtype._csfrm == CS_FORM_IMPLICIT:
-                temp_bytes = (<str> value).encode()
-            else:
-                temp_bytes = (<str> value).encode(ENCODING_UTF16)
-            buf.write_bytes_with_length(temp_bytes)
-        elif ora_type_num == ORA_TYPE_NUM_NUMBER:
-            temp_bytes = (<str> cpython.PyObject_Str(value)).encode()
-            buf.write_oracle_number(temp_bytes)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-            buf.write_uint8(4)
-            buf.write_uint32be(<uint32_t> value)
-        elif ora_type_num == ORA_TYPE_NUM_RAW:
-            buf.write_bytes_with_length(value)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            buf.write_binary_double(value)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            buf.write_binary_float(value)
-        elif ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-            buf.write_uint8(4)
-            buf.write_uint32be(value)
-        elif ora_type_num in (ORA_TYPE_NUM_DATE,
-                              ORA_TYPE_NUM_TIMESTAMP,
-                              ORA_TYPE_NUM_TIMESTAMP_TZ,
-                              ORA_TYPE_NUM_TIMESTAMP_LTZ):
-            buf.write_oracle_date(value, metadata.dbtype._buffer_size_factor)
-        elif ora_type_num in (ORA_TYPE_NUM_CLOB, ORA_TYPE_NUM_BLOB):
-            lob_impl = <BaseThinLobImpl> value._impl
-            buf.write_bytes_with_length(lob_impl._locator)
-        elif ora_type_num == ORA_TYPE_NUM_OBJECT:
-            obj_impl = value._impl
-            if self.type.is_collection or obj_impl.type.is_collection:
-                temp_bytes = obj_impl._get_packed_data()
-                buf.write_bytes_with_length(temp_bytes)
-            else:
-                obj_impl._pack_data(buf)
-        else:
-            errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                              name=metadata.dbtype.name)
-
-    cdef int _unpack_data(self) except -1:
-        """
-        Unpacks the packed data into a dictionary of Python values.
-        """
-        cdef DbObjectPickleBuffer buf
-        buf = DbObjectPickleBuffer.__new__(DbObjectPickleBuffer)
-        buf._populate_from_bytes(self.packed_data)
-        buf.read_header(&self.image_flags, &self.image_version)
-        self._unpack_data_from_buf(buf)
-        self.packed_data = None
-
-    cdef int _unpack_data_from_buf(self, DbObjectPickleBuffer buf) except -1:
-        """
-        Unpacks the data from the buffer into Python values.
-        """
-        cdef:
-            dict unpacked_attrs = {}, unpacked_assoc_array = None
-            ThinDbObjectTypeImpl typ_impl = self.type
-            list unpacked_array = None
-            ThinDbObjectAttrImpl attr
-            uint32_t num_elements, i
-            int32_t assoc_index
-            object value
-        if typ_impl.is_collection:
-            if typ_impl.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                unpacked_assoc_array = {}
-            else:
-                unpacked_array = []
-            buf.skip_raw_bytes(1)           # collection flags
-            buf.read_length(&num_elements)
-            for i in range(num_elements):
-                if typ_impl.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                    buf.read_int32be(&assoc_index)
-                value = self._unpack_value(buf, typ_impl.element_metadata)
-                if typ_impl.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                    unpacked_assoc_array[assoc_index] = value
-                else:
-                    unpacked_array.append(value)
-        else:
-            unpacked_attrs = {}
-            for attr in typ_impl.attrs:
-                value = self._unpack_value(buf, attr)
-                unpacked_attrs[attr.name] = value
-        self.unpacked_attrs = unpacked_attrs
-        self.unpacked_array = unpacked_array
-        self.unpacked_assoc_array = unpacked_assoc_array
-
-    cdef object _unpack_value(self, DbObjectPickleBuffer buf,
-                              OracleMetadata metadata):
-        """
-        Unpacks a single value and returns it.
-        """
-        cdef:
-            uint8_t ora_type_num = metadata.dbtype._ora_type_num
-            uint8_t csfrm = metadata.dbtype._csfrm
-            DbObjectPickleBuffer xml_buf
-            bint is_null, is_collection
-            BaseThinConnImpl conn_impl
-            ThinDbObjectImpl obj_impl
-            BaseThinLobImpl lob_impl
-            OracleData data
-            bytes locator
-            type cls
-        if ora_type_num in (ORA_TYPE_NUM_CLOB,
-                              ORA_TYPE_NUM_BLOB,
-                              ORA_TYPE_NUM_BFILE):
-            conn_impl = self.type._conn_impl
-            locator = buf.read_bytes()
-            if locator is None:
-                return None
-            lob_impl = conn_impl._create_lob_impl(metadata.dbtype, locator)
-            cls = PY_TYPE_ASYNC_LOB \
-                    if conn_impl._protocol._transport._is_async \
-                    else PY_TYPE_LOB
-            return cls._from_impl(lob_impl)
-        elif ora_type_num == ORA_TYPE_NUM_OBJECT:
-            is_collection = \
-                    metadata.objtype.is_collection or self.type.is_collection
-            buf.get_is_atomic_null(is_collection, &is_null)
-            if is_null:
-                return None
-            if metadata.objtype is None:
-                xml_buf = DbObjectPickleBuffer.__new__(DbObjectPickleBuffer)
-                xml_buf._populate_from_bytes(buf.read_bytes())
-                return xml_buf.read_xmltype(self.type._conn_impl)
-            obj_impl = ThinDbObjectImpl.__new__(ThinDbObjectImpl)
-            obj_impl.type = metadata.objtype
-            if is_collection:
-                obj_impl.packed_data = buf.read_bytes()
-            else:
-                obj_impl._unpack_data_from_buf(buf)
-            return PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-        buf.read_oracle_data(metadata, &data, from_dbobject=True,
-                             decode_str=False)
-        if metadata.dbtype._csfrm == CS_FORM_NCHAR:
-            conn_impl = self.type._conn_impl
-            conn_impl._protocol._caps._check_ncharset_id()
-        return convert_oracle_data_to_python(metadata, metadata, &data,
-                                             encoding_errors=NULL,
-                                             from_dbobject=True)
-
-    def append_checked(self, object value):
-        """
-        Internal method for appending a value to a collection object.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            int32_t new_index
-        self._ensure_unpacked()
-        if self.unpacked_array is not None:
-            typ_impl = self.type
-            if typ_impl.max_num_elements > 0 \
-                    and len(self.unpacked_array) >= typ_impl.max_num_elements:
-                errors._raise_err(errors.ERR_INVALID_COLL_INDEX_SET,
-                                  index=len(self.unpacked_array),
-                                  min_index=0,
-                                  max_index=typ_impl.max_num_elements - 1)
-            self.unpacked_array.append(value)
-        else:
-            self._ensure_assoc_keys()
-            new_index = self.unpacked_assoc_keys[-1] + 1 \
-                    if self.unpacked_assoc_keys else 0
-            self.unpacked_assoc_array[new_index] = value
-            self.unpacked_assoc_keys.append(new_index)
-
-    def copy(self):
-        """
-        Internal method for creating a copy of an object.
-        """
-        cdef ThinDbObjectImpl copied_impl
-        copied_impl = ThinDbObjectImpl.__new__(ThinDbObjectImpl)
-        copied_impl.type = self.type
-        copied_impl.flags = self.flags
-        copied_impl.image_flags = self.image_flags
-        copied_impl.image_version = self.image_version
-        copied_impl.toid = self.toid
-        copied_impl.packed_data = self.packed_data
-        copied_impl.num_elements = self.num_elements
-        if self.unpacked_attrs is not None:
-            copied_impl.unpacked_attrs = self.unpacked_attrs.copy()
-        if self.unpacked_array is not None:
-            copied_impl.unpacked_array = list(self.unpacked_array)
-        return copied_impl
-
-    def delete_by_index(self, int32_t index):
-        """
-        Internal method for deleting an entry from a collection that is indexed
-        by integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array is not None:
-            del self.unpacked_array[index]
-        else:
-            self.unpacked_assoc_keys = None
-            del self.unpacked_assoc_array[index]
-
-    def exists_by_index(self, int32_t index):
-        """
-        Internal method for determining if an entry exists in a collection that
-        is indexed by integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array is not None:
-            return index >= 0 and index < len(self.unpacked_array)
-        else:
-            return index in self.unpacked_assoc_array
-
-    def get_attr_value(self, ThinDbObjectAttrImpl attr):
-        """
-        Internal method for getting an attribute value.
-        """
-        self._ensure_unpacked()
-        return self.unpacked_attrs[attr.name]
-
-    def get_element_by_index(self, int32_t index):
-        """
-        Internal method for getting an entry from a collection that is indexed
-        by integers.
-        """
-        self._ensure_unpacked()
-        try:
-            if self.unpacked_array is not None:
-                return self.unpacked_array[index]
-            else:
-                return self.unpacked_assoc_array[index]
-        except (KeyError, IndexError):
-            errors._raise_err(errors.ERR_INVALID_COLL_INDEX_GET, index=index)
-
-    def get_first_index(self):
-        """
-        Internal method for getting the first index from a collection that is
-        indexed by integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array:
-            return 0
-        elif self.unpacked_assoc_array:
-            self._ensure_assoc_keys()
-            return self.unpacked_assoc_keys[0]
-
-    def get_last_index(self):
-        """
-        Internal method for getting the last index from a collection that is
-        indexed by integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array:
-            return len(self.unpacked_array) - 1
-        elif self.unpacked_assoc_array:
-            self._ensure_assoc_keys()
-            return self.unpacked_assoc_keys[-1]
-
-    def get_next_index(self, int32_t index):
-        """
-        Internal method for getting the next index from a collection that is
-        indexed by integers.
-        """
-        cdef int32_t i
-        self._ensure_unpacked()
-        if self.unpacked_array:
-            if index + 1 < len(self.unpacked_array):
-                return index + 1
-        elif self.unpacked_assoc_array:
-            self._ensure_assoc_keys()
-            for i in self.unpacked_assoc_keys:
-                if i > index:
-                    return i
-
-    def get_prev_index(self, int32_t index):
-        """
-        Internal method for getting the next index from a collection that is
-        indexed by integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array:
-            if index > 0:
-                return index - 1
-        elif self.unpacked_assoc_array:
-            self._ensure_assoc_keys()
-            for i in reversed(self.unpacked_assoc_keys):
-                if i < index:
-                    return i
-
-    def get_size(self):
-        """
-        Internal method for getting the size of a collection.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array is not None:
-            return len(self.unpacked_array)
-        else:
-            return len(self.unpacked_assoc_array)
-
-    def set_attr_value_checked(self, ThinDbObjectAttrImpl attr, object value):
-        """
-        Internal method for setting an attribute value.
-        """
-        self._ensure_unpacked()
-        self.unpacked_attrs[attr.name] = value
-
-    def set_element_by_index_checked(self, int32_t index, object value):
-        """
-        Internal method for setting an entry in a collection that is indexed by
-        integers.
-        """
-        self._ensure_unpacked()
-        if self.unpacked_array is not None:
-            try:
-                self.unpacked_array[index] = value
-            except IndexError:
-                max_index = max(len(self.unpacked_array) - 1, 0)
-                errors._raise_err(errors.ERR_INVALID_COLL_INDEX_SET,
-                                  index=index, min_index=0,
-                                  max_index=max_index)
-        else:
-            if index not in self.unpacked_assoc_array:
-                self.unpacked_assoc_keys = None
-            self.unpacked_assoc_array[index] = value
-
-    def trim(self, int32_t num_to_trim):
-        """
-        Internal method for trimming a number of entries from a collection.
-        """
-        self._ensure_unpacked()
-        if num_to_trim > 0:
-            self.unpacked_array = self.unpacked_array[:-num_to_trim]
-
-
-cdef class ThinDbObjectAttrImpl(BaseDbObjectAttrImpl):
-    cdef:
-        bytes oid
-
-
-cdef class ThinDbObjectTypeImpl(BaseDbObjectTypeImpl):
-    cdef:
-        uint8_t collection_type, collection_flags, version
-        uint32_t max_num_elements
-        bint is_row_type
-        bint is_xml_type
-        bytes oid
-
-    def create_new_object(self):
-        """
-        Internal method for creating a new object.
-        """
-        cdef ThinDbObjectImpl obj_impl
-        obj_impl = ThinDbObjectImpl.__new__(ThinDbObjectImpl)
-        obj_impl.type = self
-        obj_impl.toid = b'\x00\x22' + \
-                bytes([TNS_OBJ_NON_NULL_OID, TNS_OBJ_HAS_EXTENT_OID]) + \
-                self.oid + TNS_EXTENT_OID
-        obj_impl.flags = TNS_OBJ_TOP_LEVEL
-        obj_impl.image_flags = TNS_OBJ_IS_VERSION_81
-        obj_impl.image_version = TNS_OBJ_IMAGE_VERSION
-        obj_impl.unpacked_attrs = {}
-        if self.is_collection:
-            obj_impl.image_flags |= TNS_OBJ_IS_COLLECTION
-            if self.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                obj_impl.unpacked_assoc_array = {}
-            else:
-                obj_impl.unpacked_array = []
-        else:
-            obj_impl.image_flags |= TNS_OBJ_NO_PREFIX_SEG
-            for attr in self.attrs:
-                obj_impl.unpacked_attrs[attr.name] = None
-        return obj_impl
diff --git a/src/oracledb/impl/thin/dbobject_cache.pyx b/src/oracledb/impl/thin/dbobject_cache.pyx
deleted file mode 100644
index e963cbc2..00000000
--- a/src/oracledb/impl/thin/dbobject_cache.pyx
+++ /dev/null
@@ -1,767 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# dbobject_cache.pyx
-#
-# Cython file defining the DbObject cache implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-# SQL statements used within the DbObject type cache
-cdef str DBO_CACHE_SQL_GET_METADATA_FOR_NAME = """
-        declare
-            t_Instantiable              varchar2(3);
-            t_SuperTypeOwner            varchar2(128);
-            t_SuperTypeName             varchar2(128);
-            t_SubTypeRefCursor          sys_refcursor;
-            t_Pos                       pls_integer;
-        begin
-            :ret_val := dbms_pickler.get_type_shape(:full_name, :oid,
-                :version, :tds, t_Instantiable, t_SuperTypeOwner,
-                t_SuperTypeName, :attrs_rc, t_SubTypeRefCursor);
-            :package_name := null;
-            if substr(:full_name, length(:full_name) - 7) = '%ROWTYPE' then
-                t_Pos := instr(:full_name, '.');
-                :schema := substr(:full_name, 1, t_Pos - 1);
-                :name := substr(:full_name, t_Pos + 1);
-            else
-                begin
-                    select owner, type_name
-                    into :schema, :name
-                    from all_types
-                    where type_oid = :oid;
-                exception
-                when no_data_found then
-                    begin
-                        select owner, package_name, type_name
-                        into :schema, :package_name, :name
-                        from all_plsql_types
-                        where type_oid = :oid;
-                    exception
-                    when no_data_found then
-                        null;
-                    end;
-                end;
-            end if;
-        end;"""
-
-cdef str DBO_CACHE_SQL_GET_COLUMNS = """
-        select
-            column_name,
-            data_type,
-            data_type_owner,
-            case
-                when data_type in
-                        ('CHAR', 'NCHAR', 'VARCHAR2', 'NVARCHAR2', 'RAW')
-                    then data_length
-                else 0
-            end,
-            case
-                when data_precision is null and data_scale is null
-                    then 0
-                when data_precision is null
-                    then 38
-                else data_precision
-            end,
-            case
-                when data_precision is null and data_scale is null
-                        and data_type = 'NUMBER'
-                    then -127
-                when data_scale is null
-                    then 0
-                else data_scale
-            end
-        from all_tab_cols
-        where owner = :owner
-          and table_name = substr(:name, 1, length(:name) - 8)
-          and hidden_column != 'YES'
-        order by column_id"""
-
-cdef str DBO_CACHE_SQL_GET_ELEM_TYPE_WITH_PACKAGE = """
-        select elem_type_name
-        from all_plsql_coll_types
-        where owner = :owner
-          and package_name = :package_name
-          and type_name = :name"""
-
-cdef str DBO_CACHE_SQL_GET_ELEM_TYPE_NO_PACKAGE = """
-        select elem_type_name
-        from all_coll_types
-        where owner = :owner
-          and type_name = :name"""
-
-cdef str DBO_CACHE_SQL_GET_ELEM_OBJTYPE_WITH_PACKAGE = """
-        select
-            elem_type_owner,
-            elem_type_package,
-            elem_type_name
-        from all_plsql_coll_types
-        where owner = :owner
-          and package_name = :package_name
-          and type_name = :name"""
-
-cdef str DBO_CACHE_SQL_GET_ELEM_OBJTYPE_NO_PACKAGE = """
-        select
-            elem_type_owner,
-            elem_type_name
-        from all_coll_types
-        where owner = :owner
-          and type_name = :name"""
-
-cdef class ThinDbObjectTypeSuperCache:
-    cdef:
-        dict caches
-        object lock
-        int cache_num
-
-    def __init__(self):
-        self.caches = {}
-        self.cache_num = 0
-        self.lock = threading.Lock()
-
-
-cdef class BaseThinDbObjectTypeCache:
-
-    cdef:
-        object meta_cursor, columns_cursor, attrs_ref_cursor_var, version_var
-        object return_value_var, full_name_var, oid_var, tds_var
-        object schema_var, package_name_var, name_var
-        BaseThinConnImpl conn_impl
-        dict types_by_oid
-        dict types_by_name
-        list partial_types
-
-    cdef int _clear_cursors(self) except -1:
-        """
-        Clears the cursors used for searching metadata. This is needed when
-        returning a connection to the pool since user-level objects are
-        retained.
-        """
-        if self.meta_cursor is not None:
-            self.meta_cursor.close()
-            self.meta_cursor = None
-            self.return_value_var = None
-            self.full_name_var = None
-            self.oid_var = None
-            self.tds_var = None
-            self.attrs_ref_cursor_var = None
-            self.version_var = None
-            self.schema_var = None
-            self.package_name_var = None
-            self.name_var = None
-        if self.columns_cursor is not None:
-            self.columns_cursor.close()
-            self.columns_cursor = None
-
-    cdef str _get_full_name(self, ThinDbObjectTypeImpl typ_impl):
-        """
-        Gets the full name of the type which is used for searching the database
-        for the type information.
-        """
-        cdef str name, suffix = "%ROWTYPE"
-        if typ_impl.name.endswith(suffix):
-            name = typ_impl.name[:-len(suffix)]
-        else:
-            name = typ_impl.name
-            suffix = ""
-        if typ_impl.package_name is None:
-            return f'"{typ_impl.schema}"."{name}"{suffix}'
-        return f'"{typ_impl.schema}".' + \
-               f'"{typ_impl.package_name}".' + \
-               f'"{name}"{suffix}'
-
-    cdef int _initialize(self, BaseThinConnImpl conn_impl) except -1:
-        self.types_by_oid = {}
-        self.types_by_name = {}
-        self.partial_types = []
-        self.conn_impl = conn_impl
-
-    cdef int _init_columns_cursor(self, object conn) except -1:
-        """
-        Initializes the cursor that fetches the columns for a table or view.
-        The input values come from the meta cursor that has been initialized
-        and executed earlier.
-        """
-        cursor = conn.cursor()
-        cursor.setinputsizes(owner=self.schema_var, name=self.name_var)
-        cursor.prepare(DBO_CACHE_SQL_GET_COLUMNS)
-        self.columns_cursor = cursor
-
-    cdef int _init_meta_cursor(self, object conn) except -1:
-        """
-        Initializes the cursor that fetches the type metadata.
-        """
-        cursor = conn.cursor()
-        self.return_value_var = cursor.var(DB_TYPE_BINARY_INTEGER)
-        self.tds_var = cursor.var(bytes)
-        self.full_name_var = cursor.var(str)
-        self.schema_var = cursor.var(str)
-        self.package_name_var = cursor.var(str)
-        self.name_var = cursor.var(str)
-        self.oid_var = cursor.var(bytes)
-        self.version_var = cursor.var(DB_TYPE_BINARY_INTEGER)
-        self.attrs_ref_cursor_var = cursor.var(DB_TYPE_CURSOR)
-        cursor.setinputsizes(ret_val=self.return_value_var,
-                             tds=self.tds_var,
-                             full_name=self.full_name_var,
-                             oid=self.oid_var,
-                             schema=self.schema_var,
-                             package_name=self.package_name_var,
-                             name=self.name_var,
-                             version=self.version_var,
-                             attrs_rc=self.attrs_ref_cursor_var)
-        cursor.prepare(DBO_CACHE_SQL_GET_METADATA_FOR_NAME)
-        self.meta_cursor = cursor
-
-    cdef object _parse_tds(self, ThinDbObjectTypeImpl typ_impl, bytes tds):
-        """
-        Parses the TDS for the type. This is only needed for collection types,
-        so if the TDS is determined to be for an object type, the remaining
-        information is skipped.
-        """
-        cdef:
-            ThinDbObjectAttrImpl attr_impl
-            OracleMetadata metadata
-            uint16_t num_attrs, i
-            uint8_t attr_type
-            TDSBuffer buf
-            uint32_t pos
-
-        # parse initial TDS bytes
-        buf = TDSBuffer.__new__(TDSBuffer)
-        buf._populate_from_bytes(tds)
-        buf.skip_raw_bytes(4)               # end offset
-        buf.skip_raw_bytes(2)               # version op code and version
-        buf.skip_raw_bytes(2)               # unknown
-        buf.read_uint16be(&num_attrs)       # number of attributes
-        buf.skip_raw_bytes(1)               # TDS attributes?
-        buf.skip_raw_bytes(1)               # start ADT op code
-        buf.skip_raw_bytes(2)               # ADT number (always zero)
-        buf.skip_raw_bytes(4)               # offset to index table
-
-        # check to see if type refers to a collection (only one attribute is
-        # present in that case)
-        if num_attrs == 1:
-            pos = buf._pos
-            buf.read_ub1(&attr_type)
-            if attr_type == TNS_OBJ_TDS_TYPE_COLL:
-                typ_impl.is_collection = True
-            else:
-                buf.skip_to(pos)
-
-        # handle collections
-        if typ_impl.is_collection:
-            buf.read_uint32be(&pos)
-            buf.read_uint32be(&typ_impl.max_num_elements)
-            buf.read_ub1(&typ_impl.collection_type)
-            if typ_impl.collection_type == TNS_OBJ_PLSQL_INDEX_TABLE:
-                typ_impl.collection_flags = TNS_OBJ_HAS_INDEXES
-            buf.skip_to(pos)
-            typ_impl.element_metadata = self._parse_tds_attr(buf)
-            typ_impl.element_metadata._finalize_init()
-            if typ_impl.element_metadata.dbtype is DB_TYPE_CLOB:
-                return self._get_element_type_clob(typ_impl)
-            elif typ_impl.element_metadata.dbtype is DB_TYPE_OBJECT:
-                return self._get_element_type_obj(typ_impl)
-
-        # handle objects with attributes
-        else:
-            for i, attr_impl in enumerate(typ_impl.attrs):
-                metadata = self._parse_tds_attr(buf)
-                if metadata.precision != 0 or metadata.scale != 0:
-                    attr_impl.precision = metadata.precision
-                    attr_impl.scale = metadata.scale
-                attr_impl.max_size = metadata.max_size
-                metadata._finalize_init()
-
-    cdef OracleMetadata _parse_tds_attr(self, TDSBuffer buf):
-        """
-        Parses a TDS attribute from the buffer.
-        """
-        cdef:
-            uint8_t attr_type, ora_type_num = 0, csfrm = 0
-            int8_t temp_precision, temp_scale
-            OracleMetadata metadata
-            uint16_t temp16
-
-        # skip until a type code that is of interest
-        while True:
-            buf.read_ub1(&attr_type)
-            if attr_type == TNS_OBJ_TDS_TYPE_EMBED_ADT_INFO:
-                buf.skip_raw_bytes(1)       # flags
-            elif attr_type != TNS_OBJ_TDS_TYPE_SUBTYPE_MARKER:
-                break
-
-        # process the type code
-        metadata = OracleMetadata.__new__(OracleMetadata)
-        if attr_type == TNS_OBJ_TDS_TYPE_NUMBER:
-            ora_type_num = ORA_TYPE_NUM_NUMBER
-            buf.read_sb1(&temp_precision)
-            buf.read_sb1(&temp_scale)
-            if temp_precision != 0 or temp_scale != 0:
-                metadata.precision = temp_precision
-                metadata.scale = temp_scale
-        elif attr_type == TNS_OBJ_TDS_TYPE_FLOAT:
-            ora_type_num = ORA_TYPE_NUM_NUMBER
-            buf.skip_raw_bytes(1)           # precision
-        elif attr_type in (TNS_OBJ_TDS_TYPE_VARCHAR, TNS_OBJ_TDS_TYPE_CHAR):
-            buf.read_uint16be(&temp16)      # maximum length
-            metadata.max_size = temp16
-            buf.read_ub1(&csfrm)
-            csfrm = csfrm & 0x7f
-            buf.skip_raw_bytes(2)           # character set
-            if attr_type == TNS_OBJ_TDS_TYPE_VARCHAR:
-                ora_type_num = ORA_TYPE_NUM_VARCHAR
-            else:
-                ora_type_num = ORA_TYPE_NUM_CHAR
-        elif attr_type == TNS_OBJ_TDS_TYPE_RAW:
-            ora_type_num = ORA_TYPE_NUM_RAW
-            buf.read_uint16be(&temp16)      # maximum length
-            metadata.max_size = temp16
-        elif attr_type == TNS_OBJ_TDS_TYPE_BINARY_FLOAT:
-            ora_type_num = ORA_TYPE_NUM_BINARY_FLOAT
-        elif attr_type == TNS_OBJ_TDS_TYPE_BINARY_DOUBLE:
-            ora_type_num = ORA_TYPE_NUM_BINARY_DOUBLE
-        elif attr_type == TNS_OBJ_TDS_TYPE_DATE:
-            ora_type_num = ORA_TYPE_NUM_DATE
-        elif attr_type == TNS_OBJ_TDS_TYPE_TIMESTAMP:
-            buf.skip_raw_bytes(1)           # precision
-            ora_type_num = ORA_TYPE_NUM_TIMESTAMP
-        elif attr_type == TNS_OBJ_TDS_TYPE_TIMESTAMP_LTZ:
-            buf.skip_raw_bytes(1)           # precision
-            ora_type_num = ORA_TYPE_NUM_TIMESTAMP_LTZ
-        elif attr_type == TNS_OBJ_TDS_TYPE_TIMESTAMP_TZ:
-            buf.skip_raw_bytes(1)           # precision
-            ora_type_num = ORA_TYPE_NUM_TIMESTAMP_TZ
-        elif attr_type == TNS_OBJ_TDS_TYPE_BOOLEAN:
-            ora_type_num = ORA_TYPE_NUM_BOOLEAN
-        elif attr_type == TNS_OBJ_TDS_TYPE_CLOB:
-            ora_type_num = ORA_TYPE_NUM_CLOB
-            csfrm = CS_FORM_IMPLICIT
-        elif attr_type == TNS_OBJ_TDS_TYPE_BLOB:
-            ora_type_num = ORA_TYPE_NUM_BLOB
-        elif attr_type == TNS_OBJ_TDS_TYPE_OBJ:
-            ora_type_num = ORA_TYPE_NUM_OBJECT
-            buf.skip_raw_bytes(5)           # offset and code
-        elif attr_type == TNS_OBJ_TDS_TYPE_START_EMBED_ADT:
-            ora_type_num = ORA_TYPE_NUM_OBJECT
-            while self._parse_tds_attr(buf):
-                pass
-        elif attr_type == TNS_OBJ_TDS_TYPE_END_EMBED_ADT:
-            return None
-        else:
-            errors._raise_err(errors.ERR_TDS_TYPE_NOT_SUPPORTED, num=attr_type)
-        metadata.dbtype = DbType._from_ora_type_and_csfrm(ora_type_num, csfrm)
-        return metadata
-
-    cdef int _create_attr(self, ThinDbObjectTypeImpl typ_impl, str name,
-                          str type_name, str type_owner,
-                          str type_package_name=None, bytes oid=None,
-                          int8_t precision=0, int8_t scale=0,
-                          uint32_t max_size=0) except -1:
-        """
-        Creates an attribute from the supplied information and adds it to the
-        list of attributes for the type.
-        """
-        cdef:
-            ThinDbObjectTypeImpl attr_typ_impl
-            ThinDbObjectAttrImpl attr_impl
-        attr_impl = ThinDbObjectAttrImpl.__new__(ThinDbObjectAttrImpl)
-        attr_impl.name = name
-        if type_owner is not None:
-            attr_typ_impl = self.get_type_for_info(oid, type_owner,
-                                                   type_package_name,
-                                                   type_name)
-            if attr_typ_impl.is_xml_type:
-                attr_impl.dbtype = DB_TYPE_XMLTYPE
-            else:
-                attr_impl.dbtype = DB_TYPE_OBJECT
-                attr_impl.objtype = attr_typ_impl
-        else:
-            if type_name in ("INTEGER", "SMALLINT"):
-                attr_impl.dbtype = DB_TYPE_NUMBER
-                attr_impl.precision = 38
-                attr_impl.scale = 0
-            elif type_name == "REAL":
-                attr_impl.dbtype = DB_TYPE_NUMBER
-                attr_impl.precision = 63
-                attr_impl.scale = -127
-            elif type_name in ("DOUBLE PRECISION", "FLOAT"):
-                attr_impl.dbtype = DB_TYPE_NUMBER
-                # the database sends type name "FLOAT" instead of type name
-                # "REAL" when looking at table metadata but not when examining
-                # database object attribute metadata so account for that here
-                if precision != 0:
-                    attr_impl.precision = precision
-                else:
-                    attr_impl.precision = 126
-                attr_impl.scale = -127
-            else:
-                attr_impl.dbtype = DbType._from_ora_name(type_name)
-                attr_impl.max_size = max_size
-                if attr_impl.dbtype._ora_type_num == ORA_TYPE_NUM_NUMBER:
-                    attr_impl.precision = precision
-                    attr_impl.scale = scale
-        attr_impl._finalize_init()
-        typ_impl.attrs.append(attr_impl)
-        typ_impl.attrs_by_name[name] = attr_impl
-
-    cdef object _populate_type_info(self, str name, object attrs,
-                                    ThinDbObjectTypeImpl typ_impl):
-        """
-        Populate the type information given the name of the type.
-        """
-        cdef:
-            ssize_t start_pos, end_pos, name_length
-            ThinDbObjectAttrImpl attr_impl
-            str data_type
-        typ_impl.version = self.version_var.getvalue()
-        if typ_impl.oid is None:
-            typ_impl.oid = self.oid_var.getvalue()
-            self.types_by_oid[typ_impl.oid] = typ_impl
-        if typ_impl.schema is None:
-            typ_impl.schema = self.schema_var.getvalue()
-            typ_impl.package_name = self.package_name_var.getvalue()
-            typ_impl.name = self.name_var.getvalue()
-            if typ_impl.name is None:
-                errors._raise_err(errors.ERR_INVALID_OBJECT_TYPE_NAME,
-                                  name=name)
-            typ_impl.is_xml_type = \
-                    (typ_impl.schema == "SYS" and typ_impl.name == "XMLTYPE")
-        typ_impl.attrs = []
-        typ_impl.attrs_by_name = {}
-        if typ_impl.is_row_type:
-            for name, data_type, data_type_owner, max_size, precision, \
-                    scale in attrs:
-                if data_type_owner is None:
-                    start_pos = data_type.find("(")
-                    if start_pos > 0:
-                        end_pos = data_type.find(")")
-                        if end_pos > start_pos:
-                            data_type = data_type[:start_pos] + \
-                                    data_type[end_pos + 1:]
-                self._create_attr(typ_impl, name, data_type, data_type_owner,
-                                  None, None, precision, scale, max_size)
-        else:
-            for cursor_version, attr_name, attr_num, attr_type_name, \
-                    attr_type_owner, attr_type_package, attr_type_oid, \
-                    attr_instantiable, attr_super_type_owner, \
-                    attr_super_type_name in attrs:
-                if attr_name is None:
-                    continue
-                self._create_attr(typ_impl, attr_name, attr_type_name,
-                                  attr_type_owner, attr_type_package,
-                                  attr_type_oid)
-            return self._parse_tds(typ_impl, self.tds_var.getvalue())
-
-    cdef ThinDbObjectTypeImpl get_type_for_info(self, bytes oid, str schema,
-                                                str package_name, str name):
-        """
-        Returns a type for the specified fetch info, if one has already been
-        cached. If not, a new type object is created and cached. It is also
-        added to the partial_types list which will be fully populated once the
-        current execute has completed.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            str full_name
-        if package_name is not None:
-            full_name = f"{schema}.{package_name}.{name}"
-        else:
-            full_name = f"{schema}.{name}"
-        if oid is not None:
-            typ_impl = self.types_by_oid.get(oid)
-        else:
-            typ_impl = self.types_by_name.get(full_name)
-        if typ_impl is None:
-            typ_impl = ThinDbObjectTypeImpl.__new__(ThinDbObjectTypeImpl)
-            typ_impl._conn_impl = self.conn_impl
-            typ_impl.oid = oid
-            typ_impl.schema = schema
-            typ_impl.package_name = package_name
-            typ_impl.name = name
-            typ_impl.is_xml_type = (schema == "SYS" and name == "XMLTYPE")
-            if oid is not None:
-                self.types_by_oid[oid] = typ_impl
-            self.types_by_name[full_name] = typ_impl
-            self.partial_types.append(typ_impl)
-        return typ_impl
-
-
-cdef class ThinDbObjectTypeCache(BaseThinDbObjectTypeCache):
-
-    def _get_element_type_clob(self, ThinDbObjectTypeImpl typ_impl):
-        """
-        Determine if the element type refers to an NCLOB or CLOB value. This
-        must be fetched from the data dictionary since it is not included in
-        the TDS.
-        """
-        cursor = self.meta_cursor.connection.cursor()
-        if typ_impl.package_name is not None:
-            cursor.execute(DBO_CACHE_SQL_GET_ELEM_TYPE_WITH_PACKAGE,
-                    owner=typ_impl.schema,
-                    package_name=typ_impl.package_name,
-                    name=typ_impl.name)
-        else:
-            cursor.execute(DBO_CACHE_SQL_GET_ELEM_TYPE_NO_PACKAGE,
-                    owner=typ_impl.schema,
-                    name=typ_impl.name)
-        type_name, = cursor.fetchone()
-        if type_name == "NCLOB":
-            typ_impl.element_metadata.dbtype = DB_TYPE_NCLOB
-
-    def _get_element_type_obj(self, ThinDbObjectTypeImpl typ_impl):
-        """
-        Determine the element type's object type. This is needed when
-        processing collections with object as the element type since this
-        information is not available in the TDS.
-        """
-        cdef:
-            str schema, name, package_name = None
-            object cursor
-        cursor = self.meta_cursor.connection.cursor()
-        if typ_impl.package_name is not None:
-            cursor.execute(DBO_CACHE_SQL_GET_ELEM_OBJTYPE_WITH_PACKAGE,
-                    owner=typ_impl.schema,
-                    package_name=typ_impl.package_name,
-                    name=typ_impl.name)
-            schema, package_name, name = cursor.fetchone()
-        else:
-            cursor.execute(DBO_CACHE_SQL_GET_ELEM_OBJTYPE_NO_PACKAGE,
-                    owner=typ_impl.schema,
-                    name=typ_impl.name)
-            schema, name = cursor.fetchone()
-        typ_impl.element_metadata.objtype = \
-                self.get_type_for_info(None, schema, package_name, name)
-
-    cdef list _lookup_type(self, object conn, str name,
-                           ThinDbObjectTypeImpl typ_impl):
-        """
-        Lookup the type given its name and return the list of attributes for
-        further processing. The metadata cursor execution will populate the
-        variables.
-        """
-        if self.meta_cursor is None:
-            self._init_meta_cursor(conn)
-        self.full_name_var.setvalue(0, name)
-        self.meta_cursor.execute(None)
-        if self.return_value_var.getvalue() != 0:
-            errors._raise_err(errors.ERR_INVALID_OBJECT_TYPE_NAME, name=name)
-        if name.endswith("%ROWTYPE"):
-            typ_impl.is_row_type = True
-            if self.columns_cursor is None:
-                self._init_columns_cursor(conn)
-            self.columns_cursor.execute(None)
-            return self.columns_cursor.fetchall()
-        else:
-            attrs_rc = self.attrs_ref_cursor_var.getvalue()
-            return attrs_rc.fetchall()
-
-    cdef ThinDbObjectTypeImpl get_type(self, object conn, str name):
-        """
-        Returns the database object type given its name. The cache is first
-        searched and if it is not found, the database is searched and the
-        result stored in the cache.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            bint is_rowtype
-        typ_impl = self.types_by_name.get(name)
-        if typ_impl is None:
-            typ_impl = ThinDbObjectTypeImpl.__new__(ThinDbObjectTypeImpl)
-            typ_impl._conn_impl = self.conn_impl
-            attrs = self._lookup_type(conn, name, typ_impl)
-            self._populate_type_info(name, attrs, typ_impl)
-            self.types_by_oid[typ_impl.oid] = typ_impl
-            self.types_by_name[name] = typ_impl
-            self.populate_partial_types(conn)
-        return typ_impl
-
-    def populate_partial_types(self, object conn):
-        """
-        Populate any partial types that were discovered earlier. Since
-        populating an object type might result in additional object types being
-        discovered, object types are popped from the partial types list until
-        the list is empty.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            str full_name
-            list attrs
-        while self.partial_types:
-            typ_impl = self.partial_types.pop()
-            full_name = self._get_full_name(typ_impl)
-            attrs = self._lookup_type(conn, full_name, typ_impl)
-            self._populate_type_info(full_name, attrs, typ_impl)
-
-
-cdef class AsyncThinDbObjectTypeCache(BaseThinDbObjectTypeCache):
-
-    async def _get_element_type_clob(self, ThinDbObjectTypeImpl typ_impl):
-        """
-        Determine if the element type refers to an NCLOB or CLOB value. This
-        must be fetched from the data dictionary since it is not included in
-        the TDS.
-        """
-        cursor = self.meta_cursor.connection.cursor()
-        if typ_impl.package_name is not None:
-            await cursor.execute(DBO_CACHE_SQL_GET_ELEM_TYPE_WITH_PACKAGE,
-                    owner=typ_impl.schema,
-                    package_name=typ_impl.package_name,
-                    name=typ_impl.name)
-        else:
-            await cursor.execute(DBO_CACHE_SQL_GET_ELEM_TYPE_NO_PACKAGE,
-                    owner=typ_impl.schema,
-                    name=typ_impl.name)
-        type_name, = await cursor.fetchone()
-        if type_name == "NCLOB":
-            typ_impl.element_metadata.dbtype = DB_TYPE_NCLOB
-
-    async def _get_element_type_obj(self, ThinDbObjectTypeImpl typ_impl):
-        """
-        Determine the element type's object type. This is needed when
-        processing collections with object as the element type since this
-        information is not available in the TDS.
-        """
-        cdef:
-            str schema, name, package_name = None
-            object cursor
-        cursor = self.meta_cursor.connection.cursor()
-        if typ_impl.package_name is not None:
-            await cursor.execute(DBO_CACHE_SQL_GET_ELEM_OBJTYPE_WITH_PACKAGE,
-                    owner=typ_impl.schema,
-                    package_name=typ_impl.package_name,
-                    name=typ_impl.name)
-            schema, package_name, name = await cursor.fetchone()
-        else:
-            await cursor.execute(DBO_CACHE_SQL_GET_ELEM_OBJTYPE_NO_PACKAGE,
-                    owner=typ_impl.schema,
-                    name=typ_impl.name)
-            schema, name = await cursor.fetchone()
-        typ_impl.element_metadata.objtype = \
-                self.get_type_for_info(None, schema, package_name, name)
-
-    async def _lookup_type(self, object conn, str name,
-                           ThinDbObjectTypeImpl typ_impl):
-        """
-        Lookup the type given its name and return the list of attributes for
-        further processing. The metadata cursor execution will populate the
-        variables.
-        """
-        if self.meta_cursor is None:
-            self._init_meta_cursor(conn)
-        self.full_name_var.setvalue(0, name)
-        await self.meta_cursor.execute(None)
-        if self.return_value_var.getvalue() != 0:
-            errors._raise_err(errors.ERR_INVALID_OBJECT_TYPE_NAME, name=name)
-        if name.endswith("%ROWTYPE"):
-            typ_impl.is_row_type = True
-            if self.columns_cursor is None:
-                self._init_columns_cursor(conn)
-            await self.columns_cursor.execute(None)
-            return await self.columns_cursor.fetchall()
-        else:
-            attrs_rc = self.attrs_ref_cursor_var.getvalue()
-            return await attrs_rc.fetchall()
-
-    async def get_type(self, object conn, str name):
-        """
-        Returns the database object type given its name. The cache is first
-        searched and if it is not found, the database is searched and the
-        result stored in the cache.
-        """
-        cdef ThinDbObjectTypeImpl typ_impl
-        typ_impl = self.types_by_name.get(name)
-        if typ_impl is None:
-            typ_impl = ThinDbObjectTypeImpl.__new__(ThinDbObjectTypeImpl)
-            typ_impl._conn_impl = self.conn_impl
-            attrs = await self._lookup_type(conn, name, typ_impl)
-            coroutine = self._populate_type_info(name, attrs, typ_impl)
-            if coroutine is not None:
-                await coroutine
-            self.types_by_oid[typ_impl.oid] = typ_impl
-            self.types_by_name[name] = typ_impl
-            await self.populate_partial_types(conn)
-        return typ_impl
-
-    async def populate_partial_types(self, object conn):
-        """
-        Populate any partial types that were discovered earlier. Since
-        populating an object type might result in additional object types being
-        discovered, object types are popped from the partial types list until
-        the list is empty.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            str full_name
-            list attrs
-        while self.partial_types:
-            typ_impl = self.partial_types.pop()
-            full_name = self._get_full_name(typ_impl)
-            attrs = await self._lookup_type(conn, full_name, typ_impl)
-            coroutine = self._populate_type_info(full_name, attrs, typ_impl)
-            if coroutine is not None:
-                await coroutine
-
-
-# global cache of database object types
-# since the database object types require a reference to the connection (in
-# order to be able to manage LOBs), storing the cache on the connection would
-# involve creating a circular reference
-cdef ThinDbObjectTypeSuperCache DB_OBJECT_TYPE_SUPER_CACHE = \
-        ThinDbObjectTypeSuperCache()
-
-
-cdef int create_new_dbobject_type_cache(BaseThinConnImpl conn_impl) except -1:
-    """
-    Creates a new database object type cache and returns its identifier.
-    """
-    cdef:
-        BaseThinDbObjectTypeCache cache
-        bint is_async
-        int cache_num
-    with DB_OBJECT_TYPE_SUPER_CACHE.lock:
-        DB_OBJECT_TYPE_SUPER_CACHE.cache_num += 1
-        cache_num = DB_OBJECT_TYPE_SUPER_CACHE.cache_num
-    is_async = conn_impl._protocol._transport._is_async
-    cls = AsyncThinDbObjectTypeCache if is_async else ThinDbObjectTypeCache
-    cache = cls.__new__(cls)
-    cache._initialize(conn_impl)
-    DB_OBJECT_TYPE_SUPER_CACHE.caches[cache_num] = cache
-    return cache_num
-
-
-cdef BaseThinDbObjectTypeCache get_dbobject_type_cache(int cache_num):
-    """
-    Returns the database object type cache given its identifier.
-    """
-    return DB_OBJECT_TYPE_SUPER_CACHE.caches[cache_num]
-
-
-cdef int remove_dbobject_type_cache(int cache_num) except -1:
-    """
-    Removes the sub cache given its identifier.
-    """
-    del DB_OBJECT_TYPE_SUPER_CACHE.caches[cache_num]
diff --git a/src/oracledb/impl/thin/lob.pyx b/src/oracledb/impl/thin/lob.pyx
deleted file mode 100644
index 14323e69..00000000
--- a/src/oracledb/impl/thin/lob.pyx
+++ /dev/null
@@ -1,487 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# lob.pyx
-#
-# Cython file defining the thin Lob implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseThinLobImpl(BaseLobImpl):
-
-    cdef:
-        BaseThinConnImpl _conn_impl
-        bytes _locator
-        bint _has_metadata
-        uint64_t _size
-        uint32_t _chunk_size
-
-    cdef LobOpMessage _create_close_message(self):
-        """
-        Create the message needed to close a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_CLOSE
-        message.source_lob_impl = self
-        return message
-
-    cdef LobOpMessage _create_create_temp_message(self):
-        """
-        Create the message needed to create a temp LOB.
-        """
-        cdef LobOpMessage message
-        self._locator = bytes(40)
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_CREATE_TEMP
-        message.dest_length = TNS_DURATION_SESSION
-        message.source_lob_impl = self
-        message.source_offset = self.dbtype._csfrm
-        message.dest_offset = self.dbtype._ora_type_num
-        return message
-
-    cdef LobOpMessage _create_get_chunk_size_message(self):
-        """
-        Create the message needed to return the chunk size for a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_GET_CHUNK_SIZE
-        message.source_lob_impl = self
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_get_is_open_message(self):
-        """
-        Create the message needed to return if a LOB is open.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_IS_OPEN
-        message.source_lob_impl = self
-        return message
-
-    cdef LobOpMessage _create_get_size_message(self):
-        """
-        Create the message needed to return the size of a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_GET_LENGTH
-        message.source_lob_impl = self
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_open_message(self):
-        """
-        Create the message needed to open a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_OPEN
-        message.source_lob_impl = self
-        message.amount = TNS_LOB_OPEN_READ_WRITE
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_read_message(self, uint64_t offset,
-                                           uint64_t amount):
-        """
-        Create the message needed to read data from a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_READ
-        message.source_lob_impl = self
-        message.source_offset = offset
-        message.amount = amount
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_trim_message(self, uint64_t new_size):
-        """
-        Create the message needed to trim a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_TRIM
-        message.source_lob_impl = self
-        message.amount = new_size
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_write_message(self, object value,
-                                            uint64_t offset):
-        """
-        Create the message needed to write data to a LOB.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_WRITE
-        message.source_lob_impl = self
-        message.source_offset = offset
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BLOB:
-            if not isinstance(value, bytes):
-                raise TypeError("only bytes can be written to BLOBs")
-            message.data = value
-        else:
-            if not isinstance(value, str):
-                raise TypeError(
-                    "only strings can be written to CLOBs and NCLOBS"
-                )
-            message.data = (<str> value).encode(self._get_encoding())
-        return message
-
-    cdef LobOpMessage _create_file_exists_message(self):
-        """
-        Create a message needed to return if BFILE exists.
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_FILE_EXISTS
-        message.source_lob_impl = self
-        return message
-
-    cdef LobOpMessage _create_file_close_message(self):
-        """
-        Create a message needed to close a file
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_FILE_CLOSE
-        message.source_lob_impl = self
-        return message
-
-    cdef LobOpMessage _create_file_open_message(self):
-        """
-        Create a message needed to open a file
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_FILE_OPEN
-        message.source_lob_impl = self
-        message.amount = TNS_LOB_OPEN_READ_ONLY
-        message.send_amount = True
-        return message
-
-    cdef LobOpMessage _create_get_file_is_open_message(self):
-        """
-        Create a message needed to return if a file is open
-        """
-        cdef LobOpMessage message
-        message = self._conn_impl._create_message(LobOpMessage)
-        message.operation = TNS_LOB_OP_FILE_ISOPEN
-        message.source_lob_impl = self
-        return message
-
-    cdef const char* _get_encoding(self):
-        """
-        Return the encoding used by the LOB.
-        """
-        if self.dbtype._csfrm == CS_FORM_NCHAR \
-                or self._locator[TNS_LOB_LOC_OFFSET_FLAG_3] & \
-                TNS_LOB_LOC_FLAGS_VAR_LENGTH_CHARSET:
-            return ENCODING_UTF16
-        return ENCODING_UTF8
-
-    def free_lob(self):
-        """
-        Internal method for closing a temp LOB during the next piggyback.
-        """
-        cdef:
-            uint8_t flags1 = self._locator[TNS_LOB_LOC_OFFSET_FLAG_1]
-            uint8_t flags4 = self._locator[TNS_LOB_LOC_OFFSET_FLAG_4]
-        if flags1 & TNS_LOB_LOC_FLAGS_ABSTRACT \
-                or flags4 & TNS_LOB_LOC_FLAGS_TEMP:
-            if self._conn_impl._temp_lobs_to_close is None:
-                self._conn_impl._temp_lobs_to_close = []
-            self._conn_impl._temp_lobs_to_close.append(self._locator)
-            self._conn_impl._temp_lobs_total_size += len(self._locator)
-            self._conn_impl = None
-
-    def get_max_amount(self):
-        """
-        Internal method for returning the maximum amount that can be read.
-        """
-        return 2**32 - 1
-
-    def get_file_name(self):
-        """
-        Internal method for returning a 2-tuple constaining the directory.
-        """
-        cdef:
-            const char_type *ptr = self._locator
-            uint16_t dir_name_offset, file_name_offset
-            uint16_t dir_name_len, file_name_len
-        dir_name_offset = TNS_LOB_LOC_FIXED_OFFSET + 2
-        dir_name_len = decode_uint16be(&ptr[TNS_LOB_LOC_FIXED_OFFSET])
-        file_name_offset = dir_name_offset + dir_name_len + 2
-        file_name_len = decode_uint16be(&ptr[dir_name_offset + dir_name_len])
-        return (
-            ptr[dir_name_offset:dir_name_offset + dir_name_len].decode(),
-            ptr[file_name_offset:file_name_offset + file_name_len].decode()
-        )
-
-    def set_file_name(self, str dir_alias, str name):
-        """
-        Internal method for setting the directory alias and file name
-        associated with a BFILE LOB.
-        """
-        cdef char_type dir_length[2]
-        cdef char_type name_length[2]
-        encode_uint16be(dir_length, len(dir_alias))
-        encode_uint16be(name_length, len(name))
-        self._locator = self._locator[:TNS_LOB_LOC_FIXED_OFFSET] + \
-                dir_length[:2] + dir_alias.encode() + name_length[:2] + \
-                name.encode()
-
-
-cdef class ThinLobImpl(BaseThinLobImpl):
-
-    cdef inline int _process_message(self, LobOpMessage message) except -1:
-        """
-        Process the message.
-        """
-        cdef Protocol protocol = <Protocol> self._conn_impl._protocol
-        protocol._process_single_message(message)
-
-    def close(self):
-        """
-        Internal method for closing a LOB that was opened earlier.
-        """
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            self._process_message(self._create_file_close_message())
-        else:
-            self._process_message(self._create_close_message())
-
-    def create_temp(self):
-        """
-        Internal method for creating a temporary LOB.
-        """
-        self._process_message(self._create_create_temp_message())
-
-    def file_exists(self):
-        """
-        Internal method for returning whether the file referenced by a BFILE
-        exists.
-        """
-        cdef LobOpMessage message
-        message = self._create_file_exists_message()
-        self._process_message(message)
-        return message.bool_flag
-
-    def get_chunk_size(self):
-        """
-        Internal method for returning the chunk size of the LOB.
-        """
-        cdef LobOpMessage message
-        if self._has_metadata:
-            return self._chunk_size
-        message = self._create_get_chunk_size_message()
-        self._process_message(message)
-        return message.amount
-
-    def get_is_open(self):
-        """
-        Internal method for returning whether the LOB is open or not.
-        """
-        cdef LobOpMessage message
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            message = self._create_get_file_is_open_message()
-        else:
-            message = self._create_get_is_open_message()
-        self._process_message(message)
-        return message.bool_flag
-
-    def get_size(self):
-        """
-        Internal method for returning the size of a LOB.
-        """
-        cdef LobOpMessage message
-        if self._has_metadata:
-            return self._size
-        message = self._create_get_size_message()
-        self._process_message(message)
-        return message.amount
-
-    def open(self):
-        """
-        Internal method for opening a LOB.
-        """
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            self._process_message(self._create_file_open_message())
-        else:
-            self._process_message(self._create_open_message())
-
-    def read(self, uint64_t offset, uint64_t amount):
-        """
-        Internal method for reading a portion (or all) of the data in the LOB.
-        """
-        cdef:
-            bint should_close = False
-            LobOpMessage message
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            if not self.get_is_open():
-                should_close = True
-                self.open()
-        message = self._create_read_message(offset, amount)
-        self._process_message(message)
-        if should_close:
-            self.close()
-        if message.data is None:
-            if self.dbtype._ora_type_num in (ORA_TYPE_NUM_BLOB,
-                                             ORA_TYPE_NUM_BFILE):
-                return b""
-            return ""
-        return message.data
-
-    def trim(self, uint64_t new_size):
-        """
-        Internal method for trimming the data in the LOB to the new size.
-        """
-        self._process_message(self._create_trim_message(new_size))
-        self._has_metadata = False
-
-    def write(self, object value, uint64_t offset):
-        """
-        Internal method for writing data to the LOB object.
-        """
-        self._process_message(self._create_write_message(value, offset))
-        self._has_metadata = False
-
-
-cdef class AsyncThinLobImpl(BaseThinLobImpl):
-
-    async def _process_message(self, LobOpMessage message):
-        """
-        Process the message.
-        """
-        cdef BaseAsyncProtocol protocol
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        await protocol._process_single_message(message)
-
-    async def close(self):
-        """
-        Internal method for closing a LOB that was opened earlier.
-        """
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            await self._process_message(self._create_file_close_message())
-        else:
-            await self._process_message(self._create_close_message())
-
-    async def create_temp(self):
-        """
-        Internal method for creating a temporary LOB.
-        """
-        await self._process_message(self._create_create_temp_message())
-
-    async def get_chunk_size(self):
-        """
-        Internal method for returning the chunk size of the LOB.
-        """
-        cdef LobOpMessage message
-        if self._has_metadata:
-            return self._chunk_size
-        message = self._create_get_chunk_size_message()
-        await self._process_message(message)
-        return message.amount
-
-    async def file_exists(self):
-        """
-        Internal method returning a boolean indicating if file referenced by a
-        BFILE exists.
-        """
-        cdef LobOpMessage message
-        message = self._create_file_exists_message()
-        await self._process_message(message)
-        return message.bool_flag
-
-    async def get_is_open(self):
-        """
-        Internal method for returning whether the LOB is open or not.
-        """
-        cdef LobOpMessage message
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            message = self._create_get_file_is_open_message()
-        else:
-            message = self._create_get_is_open_message()
-        await self._process_message(message)
-        return message.bool_flag
-
-    async def get_size(self):
-        """
-        Internal method for returning the size of a LOB.
-        """
-        cdef LobOpMessage message
-        if self._has_metadata:
-            return self._size
-        message = self._create_get_size_message()
-        await self._process_message(message)
-        return message.amount
-
-    async def open(self):
-        """
-        Internal method for opening a LOB.
-        """
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            await self._process_message(self._create_file_open_message())
-        else:
-            await self._process_message(self._create_open_message())
-
-    async def read(self, uint64_t offset, uint64_t amount):
-        """
-        Internal method for reading a portion (or all) of the data in the LOB.
-        """
-        cdef:
-            bint should_close = False
-            LobOpMessage message
-        if self.dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-            if not await self.get_is_open():
-                should_close = True
-                await self.open()
-        message = self._create_read_message(offset, amount)
-        await self._process_message(message)
-        if should_close:
-            await self.close()
-        if message.data is None:
-            if self.dbtype._ora_type_num in (ORA_TYPE_NUM_BLOB,
-                                             ORA_TYPE_NUM_BFILE):
-                return b""
-            return ""
-        return message.data
-
-    async def trim(self, uint64_t new_size):
-        """
-        Internal method for trimming the data in the LOB to the new size
-        """
-        await self._process_message(self._create_trim_message(new_size))
-        self._has_metadata = False
-
-    async def write(self, object value, uint64_t offset):
-        """
-        Internal method for writing data to the LOB object.
-        """
-        await self._process_message(self._create_write_message(value, offset))
-        self._has_metadata = False
diff --git a/src/oracledb/impl/thin/messages/aq_array.pyx b/src/oracledb/impl/thin/messages/aq_array.pyx
deleted file mode 100644
index ebad7f69..00000000
--- a/src/oracledb/impl/thin/messages/aq_array.pyx
+++ /dev/null
@@ -1,206 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# aq_array.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for enqueuing and dequeuing
-# an array of AQ messages (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class AqArrayMessage(AqBaseMessage):
-    cdef:
-        list props_impls
-        int operation
-        uint32_t num_iters
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization
-        """
-        self.function_code = TNS_FUNC_ARRAY_AQ
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters of the AQ array enqueue/dequeue request.
-        """
-        cdef:
-            uint32_t i, j, num_iters, temp32
-            ThinMsgPropsImpl props_impl
-            uint16_t temp16
-            bytes msgid
-        buf.read_ub4(&num_iters)
-        for i in range(num_iters):
-            props_impl = self.props_impls[i]
-            buf.read_ub2(&temp16)
-            if temp16 > 0:
-                buf.skip_ub1()
-                self._process_msg_props(buf, props_impl)
-            self._process_recipients(buf)
-            buf.read_ub2(&temp16)
-            if temp16 > 0:
-                props_impl.payload = self._process_payload(buf)
-            msgid = buf.read_bytes_with_length()
-            if self.operation == TNS_AQ_ARRAY_ENQ:
-                for j, props_impl in enumerate(self.props_impls):
-                    props_impl.msgid = msgid[j * 16:(j + 1) * 16]
-            else:
-                props_impl.msgid = msgid
-            buf.read_ub2(&temp16)               # extensions len
-            if temp16 > 0:
-                errors._raise_err(errors.ERR_NOT_IMPLEMENTED)
-            buf.skip_ub2()                      # output ack
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            buf.read_ub4(&self.num_iters)
-        else:
-            self.num_iters = num_iters
-
-    cdef int _write_array_deq(self, WriteBuffer buf) except -1:
-        """
-        Writes to the buffer the fields specific to the array dqeueue of AQ
-        messages.
-        """
-        cdef:
-            bytes consumer_name_bytes = None
-            bytes correlation_bytes = None
-            bytes condition_bytes = None
-            ThinMsgPropsImpl props_impl
-            bytes queue_name_bytes
-            uint16_t delivery_mode
-            uint32_t flags = 0
-
-        # setup
-        queue_name_bytes = self.queue_impl.name.encode()
-        delivery_mode = self.deq_options_impl.delivery_mode
-        if delivery_mode == TNS_AQ_MSG_BUFFERED:
-            flags |= TNS_KPD_AQ_BUFMSG
-        elif delivery_mode == TNS_AQ_MSG_PERSISTENT_OR_BUFFERED:
-            flags |= TNS_KPD_AQ_EITHER
-        if self.deq_options_impl.consumer_name:
-            consumer_name_bytes = self.deq_options_impl.consumer_name.encode()
-        if self.deq_options_impl.condition:
-            condition_bytes = self.deq_options_impl.condition.encode()
-        if self.deq_options_impl.correlation:
-            correlation_bytes = self.deq_options_impl.correlation.encode()
-
-        # write message
-        for props_impl in self.props_impls:
-            buf.write_ub4(len(queue_name_bytes))
-            buf.write_bytes_with_length(queue_name_bytes)
-            self._write_msg_props(buf, props_impl)
-            buf.write_ub4(0)                        # num recipients
-            self._write_value_with_length(buf, consumer_name_bytes)
-            buf.write_sb4(self.deq_options_impl.mode)
-            buf.write_sb4(self.deq_options_impl.navigation)
-            buf.write_sb4(self.deq_options_impl.visibility)
-            buf.write_sb4(self.deq_options_impl.wait)
-            self._write_value_with_length(buf, self.deq_options_impl.msgid)
-            self._write_value_with_length(buf, correlation_bytes)
-            self._write_value_with_length(buf, condition_bytes)
-            buf.write_ub4(0)                        # extensions
-            buf.write_ub4(0)                        # rel msg id
-            buf.write_sb4(0)                        # seq deviation
-            buf.write_ub4(16)                       # toid length
-            buf.write_bytes_with_length(self.queue_impl.payload_toid)
-            buf.write_ub2(TNS_AQ_MESSAGE_VERSION)
-            buf.write_ub4(0)                        # payload length
-            buf.write_ub4(0)                        # raw pay length
-            buf.write_ub4(0)
-            buf.write_ub4(flags)
-            buf.write_ub4(0)                        # extensions len
-            buf.write_ub4(0)                        # source seq len
-
-    cdef int _write_array_enq(self, WriteBuffer buf) except -1:
-        """
-        Writing input parameters incase of array enqueue
-        """
-        cdef:
-            ThinMsgPropsImpl props_impl
-            bytes queue_name_bytes
-            uint32_t flags = 0
-
-        # setup
-        queue_name_bytes = self.queue_impl.name.encode()
-        if self.enq_options_impl.delivery_mode == TNS_AQ_MSG_BUFFERED:
-            flags |= TNS_KPD_AQ_BUFMSG
-
-        # write message
-        buf.write_ub4(0)                            # rel msgid len
-        buf.write_uint8(TNS_MSG_TYPE_ROW_HEADER)
-        buf.write_ub4(len(queue_name_bytes))
-        buf.write_bytes_with_length(queue_name_bytes)
-        buf.write_bytes(self.queue_impl.payload_toid)
-        buf.write_ub2(TNS_AQ_MESSAGE_VERSION)
-        buf.write_ub4(flags)
-        for props_impl in self.props_impls:
-            buf.write_uint8(TNS_MSG_TYPE_ROW_DATA)
-            buf.write_ub4(flags)                    # aqi flags
-            self._write_msg_props(buf, props_impl)
-            if props_impl.recipients is None:
-                buf.write_ub4(0)                    # num recipients
-            else:
-                buf.write_ub4(3 * len(props_impl.recipients))
-                self._write_recipients(buf, props_impl)
-            buf.write_sb4(self.enq_options_impl.visibility)
-            buf.write_ub4(0)                        # relative msg id
-            buf.write_sb4(0)                        # seq deviation
-            if self.queue_impl.payload_type is None \
-                    and not self.queue_impl.is_json:
-                buf.write_ub4(len(props_impl.payload_obj))
-            self._write_payload(buf, props_impl)
-        buf.write_uint8(TNS_MSG_TYPE_STATUS)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write message to the network buffers.
-        """
-        self._write_function_code(buf)
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            buf.write_uint8(0)                      # input params
-            buf.write_ub4(0)                        # length
-        else:
-            buf.write_uint8(1)
-            buf.write_ub4(self.num_iters)
-        buf.write_ub4(TNS_AQ_ARRAY_FLAGS_RETURN_MESSAGE_ID)
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            buf.write_uint8(1)                      # output params
-            buf.write_uint8(0)                      # length
-        else:
-            buf.write_uint8(1)
-            buf.write_uint8(1)
-        buf.write_sb4(self.operation)
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            buf.write_uint8(1)                      # num iters (pointer)
-        else:
-            buf.write_uint8(0)
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_21_1:
-            buf.write_ub4(0xffff)                   # shard id
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            buf.write_ub4(self.num_iters)
-        if self.operation == TNS_AQ_ARRAY_ENQ:
-            self._write_array_enq(buf)
-        else:
-            self._write_array_deq(buf)
diff --git a/src/oracledb/impl/thin/messages/aq_base.pyx b/src/oracledb/impl/thin/messages/aq_base.pyx
deleted file mode 100644
index dd5ff2b5..00000000
--- a/src/oracledb/impl/thin/messages/aq_base.pyx
+++ /dev/null
@@ -1,243 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# aq_base.pyx
-#
-# Cython file defining the base class for messages that are sent to the
-# database and the responses that are received by the client for enqueing and
-# dequeuing AQ messages (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class AqBaseMessage(Message):
-    cdef:
-        BaseThinQueueImpl queue_impl
-        ThinDeqOptionsImpl deq_options_impl
-        ThinEnqOptionsImpl enq_options_impl
-        bint no_msg_found
-
-    cdef object _process_date(self, ReadBuffer buf):
-        """
-        Processes a date found in the buffer.
-        """
-        cdef:
-            const char_type *ptr
-            uint32_t num_bytes
-            OracleData data
-            ssize_t length
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            buf.read_raw_bytes_and_length(&ptr, &length)
-            decode_date(ptr, length, &data.buffer)
-            return convert_date_to_python(&data.buffer)
-
-    cdef int _process_error_info(self, ReadBuffer buf) except -1:
-        """
-        Process error information from the buffer. If the error that indicates
-        that no messages were received is detected, the error is cleared and
-        the flag set so that the dequeue can handle that case.
-        """
-        Message._process_error_info(self, buf)
-        if self.error_info.num == TNS_ERR_NO_MESSAGES_FOUND:
-            self.error_info.num = 0
-            self.error_occurred = False
-            self.no_msg_found = True
-
-    cdef int _process_extensions(self, ReadBuffer buf,
-                                 ThinMsgPropsImpl props_impl) except -1:
-        """
-        Processes extensions to the message property object returned by the
-        database.
-        """
-        cdef:
-            bytes text_value, binary_value, value
-            uint32_t i, num_extensions
-            uint16_t keyword
-        buf.read_ub4(&num_extensions)
-        if num_extensions > 0:
-            buf.skip_ub1()
-            for i in range(num_extensions):
-                text_value = buf.read_bytes_with_length()
-                binary_value = buf.read_bytes_with_length()
-                value = text_value or binary_value
-                buf.read_ub2(&keyword)
-                if value is not None:
-                    if keyword == TNS_AQ_EXT_KEYWORD_AGENT_NAME:
-                        props_impl.sender_agent_name = value
-                    elif keyword == TNS_AQ_EXT_KEYWORD_AGENT_ADDRESS:
-                        props_impl.sender_agent_address = value
-                    elif keyword == TNS_AQ_EXT_KEYWORD_AGENT_PROTOCOL:
-                        props_impl.sender_agent_protocol = value[0]
-                    elif keyword == TNS_AQ_EXT_KEYWORD_ORIGINAL_MSGID:
-                        props_impl.original_msg_id = value
-
-    cdef bytes _process_msg_id(self, ReadBuffer buf):
-        """
-        Reads a message id from the buffer and returns it.
-        """
-        cdef const char_type *ptr
-        ptr = buf.read_raw_bytes(TNS_AQ_MESSAGE_ID_LENGTH)
-        return ptr[:TNS_AQ_MESSAGE_ID_LENGTH]
-
-    cdef int _process_msg_props(self, ReadBuffer buf,
-                                ThinMsgPropsImpl props_impl) except -1:
-        """
-        Processes a message property object returned by the database.
-        """
-        cdef uint32_t temp32
-        buf.read_sb4(&props_impl.priority)
-        buf.read_sb4(&props_impl.delay)
-        buf.read_sb4(&props_impl.expiration)
-        props_impl.correlation = buf.read_str_with_length()
-        buf.read_sb4(&props_impl.num_attempts)
-        props_impl.exceptionq = buf.read_str_with_length()
-        buf.read_sb4(&props_impl.state)
-        props_impl.enq_time = self._process_date(buf)
-        props_impl.enq_txn_id = buf.read_bytes_with_length()
-        self._process_extensions(buf, props_impl)
-        buf.read_ub4(&temp32)                       # user properties
-        if temp32 > 0:
-            errors._raise_err(errors.ERR_NOT_IMPLEMENTED)
-        buf.skip_ub4()                              # csn
-        buf.skip_ub4()                              # dsn
-        buf.read_ub4(&temp32)                       # flags
-        if temp32 == TNS_KPD_AQ_BUFMSG:
-            props_impl.delivery_mode = TNS_AQ_MSG_BUFFERED
-        else:
-            props_impl.delivery_mode = TNS_AQ_MSG_PERSISTENT
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_21_1:
-            buf.skip_ub4()                          # shard number
-
-    cdef object _process_payload(self, ReadBuffer buf):
-        """
-        Processes the payload for an enqueued message returned by the database.
-        """
-        cdef:
-            ThinDbObjectImpl obj_impl
-            uint32_t image_length
-            bytes payload
-        if self.queue_impl.payload_type is not None:
-            obj_impl = buf.read_dbobject(self.queue_impl.payload_type)
-            if obj_impl is None:
-                obj_impl = self.queue_impl.payload_type.create_new_object()
-            return PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-        else:
-            buf.read_bytes_with_length()            # TOID
-            buf.read_bytes_with_length()            # OID
-            buf.read_bytes_with_length()            # snapshot
-            buf.skip_ub2()                          # version no
-            buf.read_ub4(&image_length)             # image length
-            buf.skip_ub2()                          # flags
-            if image_length > 0:
-                payload = buf.read_bytes()[4:image_length]
-                if self.queue_impl.is_json:
-                    return self.conn_impl.decode_oson(payload)
-                return payload
-            elif not self.queue_impl.is_json:
-                return b''
-
-    cdef object _process_recipients(self, ReadBuffer buf):
-        """
-        Process recipients for a message. Currently this is unsupported.
-        """
-        cdef uint32_t temp32
-        buf.read_ub4(&temp32)
-        if temp32 > 0:
-            errors._raise_err(errors.ERR_NOT_IMPLEMENTED)
-        return []
-
-    cdef int _write_msg_props(self, WriteBuffer buf,
-                              ThinMsgPropsImpl props_impl) except -1:
-        """
-        Write a message property object to the buffer.
-        """
-        buf.write_ub4(props_impl.priority)
-        buf.write_ub4(props_impl.delay)
-        buf.write_sb4(props_impl.expiration)
-        self._write_value_with_length(buf, props_impl.correlation)
-        buf.write_ub4(0)                            # number of attempts
-        self._write_value_with_length(buf, props_impl.exceptionq)
-        buf.write_ub4(props_impl.state)
-        buf.write_ub4(0)                            # enqueue time length
-        self._write_value_with_length(buf, props_impl.enq_txn_id)
-        buf.write_ub4(4)                            # number of extensions
-        buf.write_uint8(0x0e)                       # unknown extra byte
-        buf.write_keyword_value_pair(None, None, TNS_AQ_EXT_KEYWORD_AGENT_NAME)
-        buf.write_keyword_value_pair(None, None,
-                                     TNS_AQ_EXT_KEYWORD_AGENT_ADDRESS)
-        buf.write_keyword_value_pair(None, b'\x00',
-                                     TNS_AQ_EXT_KEYWORD_AGENT_PROTOCOL)
-        buf.write_keyword_value_pair(None, None,
-                                     TNS_AQ_EXT_KEYWORD_ORIGINAL_MSGID)
-        buf.write_ub4(0)                            # user property
-        buf.write_ub4(0)                            # cscn
-        buf.write_ub4(0)                            # dscn
-        buf.write_ub4(0)                            # flags
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_21_1:
-            buf.write_ub4(0xffffffffl)              # shard id
-
-    cdef int _write_payload(self, WriteBuffer buf,
-                            ThinMsgPropsImpl props_impl) except -1:
-        """
-        Writes the payload of the message property object to the buffer.
-        """
-        if self.queue_impl.is_json:
-            buf.write_oson(props_impl.payload_obj,
-                           self.conn_impl._oson_max_fname_size, False)
-        elif self.queue_impl.payload_type is not None:
-            buf.write_dbobject(props_impl.payload_obj)
-        else:
-            buf.write_bytes(props_impl.payload_obj)
-
-
-    cdef int _write_recipients(self, WriteBuffer buf,
-                               ThinMsgPropsImpl props_impl) except -1:
-        """
-        Write the recipient list of the message property object to the
-        buffer.
-        """
-        cdef:
-            uint16_t index = 0
-            str recipient
-        for recipient in props_impl.recipients:
-            buf.write_keyword_value_pair(recipient, None, index)
-            buf.write_keyword_value_pair(None, None, index + 1)
-            buf.write_keyword_value_pair(None, b'\x00', index + 2)
-            index += 3
-
-    cdef int _write_value_with_length(self, WriteBuffer buf,
-                                      object value) except -1:
-        """
-        Write a string to the buffer, prefixed by a length.
-        """
-        cdef bytes value_bytes
-        if value is None:
-            buf.write_ub4(0)
-        else:
-            if isinstance(value, str):
-                value_bytes = value.encode()
-            else:
-                value_bytes = value
-            buf.write_ub4(len(value_bytes))
-            buf.write_bytes_with_length(value_bytes)
diff --git a/src/oracledb/impl/thin/messages/aq_deq.pyx b/src/oracledb/impl/thin/messages/aq_deq.pyx
deleted file mode 100644
index 36ade017..00000000
--- a/src/oracledb/impl/thin/messages/aq_deq.pyx
+++ /dev/null
@@ -1,147 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# aq_deq.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for dequeuing an AQ message
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class AqDeqMessage(AqBaseMessage):
-    cdef:
-        ThinMsgPropsImpl props_impl
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization
-        """
-        self.function_code = TNS_FUNC_AQ_DEQ
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters of the AQ Dequeue request.
-        """
-        cdef:
-            uint32_t num_bytes
-            uint16_t keyword
-            uint32_t imageLength
-            ThinDbObjectImpl obj_impl
-            ThinDbObjectTypeImpl type_impl
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            self._process_msg_props(buf, self.props_impl)
-            self.props_impl.recipients = self._process_recipients(buf)
-            self.props_impl.payload = self._process_payload(buf)
-            self.props_impl.msgid = self._process_msg_id(buf)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write message to the network buffers.
-        """
-        cdef:
-             bytes queue_name_bytes
-             bytes consumer_name_bytes
-             bytes correlation_bytes
-             bytes condition_bytes
-             bytes msgid_bytes
-             uint16_t delivery_mode
-             int deq_flags
-        self._write_function_code(buf)
-        queue_name_bytes = self.queue_impl.name.encode()
-        buf.write_uint8(1)                      # queue name (pointer)
-        buf.write_ub4(len(queue_name_bytes))    # queue name length
-        buf.write_uint8(1)                      # message properties
-        buf.write_uint8(1)                      # msg props length
-        buf.write_uint8(1)                      # recipient list
-        buf.write_uint8(1)                      # recipient list length
-        if self.deq_options_impl.consumer_name:
-            consumer_name_bytes = self.deq_options_impl.consumer_name.encode()
-            buf.write_uint8(1)                  # consumer name
-            buf.write_ub4(len(consumer_name_bytes))
-        else:
-            consumer_name_bytes = None
-            buf.write_uint8(0)                  # consumer name
-            buf.write_ub4(0)                    # consumer name length
-        buf.write_sb4(self.deq_options_impl.mode) # dequeue mode
-        buf.write_sb4(self.deq_options_impl.navigation) # navigation
-        buf.write_sb4(self.deq_options_impl.visibility) # visibility
-        buf.write_sb4(self.deq_options_impl.wait) # wait
-        if self.deq_options_impl.msgid:
-            buf.write_uint8(1)                  # select mesg id
-            buf.write_ub4(TNS_AQ_MESSAGE_ID_LENGTH) # mesg id len
-        else:
-            buf.write_uint8(0)                  # select mesg id
-            buf.write_ub4(0)                    # select mesg id length
-        if self.deq_options_impl.correlation:
-            correlation_bytes = self.deq_options_impl.correlation.encode()
-            buf.write_uint8(1)                  # correlation id
-            buf.write_ub4(len(correlation_bytes)) # correlation id len
-        else:
-            correlation_bytes = None
-            buf.write_uint8(0)                  # correlation id
-            buf.write_ub4(0)                    # correlation id len
-        buf.write_uint8(1)                      # toid of payload
-        buf.write_ub4(16)                       # toid length
-        buf.write_ub2(TNS_AQ_MESSAGE_VERSION)
-        buf.write_uint8(1)                      # payload
-        buf.write_uint8(1)                      # return msg id
-        buf.write_ub4(TNS_AQ_MESSAGE_ID_LENGTH)
-        deq_flags = 0
-        delivery_mode = self.deq_options_impl.delivery_mode
-        if (delivery_mode == TNS_AQ_MSG_BUFFERED):
-            deq_flags |= TNS_KPD_AQ_BUFMSG
-        elif (delivery_mode == TNS_AQ_MSG_PERSISTENT_OR_BUFFERED):
-            deq_flags |= TNS_KPD_AQ_EITHER
-        buf.write_ub4(deq_flags)                # dequeue flags
-        if self.deq_options_impl.condition:
-            condition_bytes = self.deq_options_impl.condition.encode()
-            buf.write_uint8(1)                  # condition (pointer)
-            buf.write_ub4(len(condition_bytes)) # condition length
-        else:
-            condition_bytes = None
-            buf.write_uint8(0)                  # condition
-            buf.write_ub4(0)                    # condition length
-        buf.write_uint8(0)                      # extensions
-        buf.write_ub4(0)                        # number of extensions
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_20_1:
-            buf.write_uint8(0)                  # JSON payload
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_21_1:
-            buf.write_ub4(-1)                   # shard id
-
-        buf.write_bytes_with_length(queue_name_bytes)
-        if consumer_name_bytes is not None:
-            buf.write_bytes_with_length(consumer_name_bytes)
-        if self.deq_options_impl.msgid:
-            msgid_bytes = self.deq_options_impl.msgid[:16]
-            if len(msgid_bytes) < 16:
-                msgid_bytes += bytes(16 - len(msgid_bytes))
-            buf.write_bytes(msgid_bytes)
-        if correlation_bytes is not None:
-            buf.write_bytes_with_length(correlation_bytes)
-        buf.write_bytes(self.queue_impl.payload_toid)
-        if condition_bytes is not None:
-            buf.write_bytes_with_length(condition_bytes)
diff --git a/src/oracledb/impl/thin/messages/aq_enq.pyx b/src/oracledb/impl/thin/messages/aq_enq.pyx
deleted file mode 100644
index 0f0b5163..00000000
--- a/src/oracledb/impl/thin/messages/aq_enq.pyx
+++ /dev/null
@@ -1,125 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# aq_enq.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for enqueuing an AQ message
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class AqEnqMessage(AqBaseMessage):
-    cdef:
-        ThinMsgPropsImpl props_impl
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        perform initialization
-        """
-        self.function_code = TNS_FUNC_AQ_ENQ
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters for the AQ enqueue request.
-        """
-        cdef const char_type *ptr = buf._get_raw(TNS_AQ_MESSAGE_ID_LENGTH)
-        self.props_impl.msgid = ptr[:TNS_AQ_MESSAGE_ID_LENGTH]
-        buf.skip_ub2()                          # extensions length
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write message to the network buffers.
-        """
-        cdef:
-            bytes queue_name_bytes
-            bytes correlation_bytes
-            bytes exceptionq_bytes
-            int enq_flags
-
-        self._write_function_code(buf)
-        queue_name_bytes = self.queue_impl.name.encode()
-        buf.write_uint8(1)                      # queue name (pointer)
-        buf.write_ub4(len(queue_name_bytes))    # queue name length
-        self._write_msg_props(buf, self.props_impl)
-        if self.props_impl.recipients is None:
-            buf.write_uint8(0)                  # recipients (pointer)
-            buf.write_ub4(0)                    # number of key/value pairs
-        else:
-            buf.write_uint8(1)                  # recipients (pointer)
-            buf.write_ub4(3 * len(self.props_impl.recipients))
-        buf.write_ub4(self.enq_options_impl.visibility)
-        buf.write_uint8(0)                      # relative message id
-        buf.write_ub4(0)                        # relative message length
-        buf.write_ub4(0)                        # sequence deviation
-        buf.write_uint8(1)                      # TOID of payload (pointer)
-        buf.write_ub4(16)                       # TOID of payload length
-        buf.write_ub2(TNS_AQ_MESSAGE_VERSION)
-        if self.queue_impl.is_json:
-            buf.write_uint8(0)                  # payload (pointer)
-            buf.write_uint8(0)                  # RAW payload (pointer)
-            buf.write_ub4(0)                    # RAW payload length
-        elif self.queue_impl.payload_type is not None:
-            buf.write_uint8(1)                  # payload (pointer)
-            buf.write_uint8(0)                  # RAW payload (pointer)
-            buf.write_ub4(0)                    # RAW payload (length)
-        else:
-            buf.write_uint8(0)                  # payload (pointer)
-            buf.write_uint8(1)                  # RAW payload (pointer)
-            buf.write_ub4(len(self.props_impl.payload_obj))
-        buf.write_uint8(1)                      # return message id (pointer)
-        buf.write_ub4(TNS_AQ_MESSAGE_ID_LENGTH) # return message id length
-        enq_flags = 0
-        if self.enq_options_impl.delivery_mode == TNS_AQ_MSG_BUFFERED:
-            enq_flags |= TNS_KPD_AQ_BUFMSG
-        buf.write_ub4(enq_flags)                # enqueue flags
-        buf.write_uint8(0)                      # extensions 1 (pointer)
-        buf.write_ub4(0)                        # number of extensions 1
-        buf.write_uint8(0)                      # extensions 2 (pointer)
-        buf.write_ub4(0)                        # number of extensions 2
-        buf.write_uint8(0)                      # source sequence number
-        buf.write_ub4(0)                        # source sequence length
-        buf.write_uint8(0)                      # max sequence number
-        buf.write_ub4(0)                        # max sequence length
-        buf.write_uint8(0)                      # output ack length
-        buf.write_uint8(0)                      # correlation (pointer)
-        buf.write_ub4(0)                        # correlation length
-        buf.write_uint8(0)                      # sender name (pointer)
-        buf.write_ub4(0)                        # sender name length
-        buf.write_uint8(0)                      # sender address (pointer)
-        buf.write_ub4(0)                        # sender address length
-        buf.write_uint8(0)                      # sender charset id (pointer)
-        buf.write_uint8(0)                      # sender ncharset id (pointer)
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_20_1:
-            if self.queue_impl.is_json:
-                buf.write_uint8(1)              # JSON payload (pointer)
-            else:
-                buf.write_uint8(0)              # JSON payload (pointer)
-
-        buf.write_bytes_with_length(queue_name_bytes)
-        if self.props_impl.recipients is not None:
-            self._write_recipients(buf, self.props_impl)
-        buf.write_bytes(self.queue_impl.payload_toid)
-        self._write_payload(buf, self.props_impl)
diff --git a/src/oracledb/impl/thin/messages/auth.pyx b/src/oracledb/impl/thin/messages/auth.pyx
deleted file mode 100644
index 01509dd0..00000000
--- a/src/oracledb/impl/thin/messages/auth.pyx
+++ /dev/null
@@ -1,441 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# auth.pyx
-#
-# Cython file defining the messages sent to the database and the responses that
-# are received by the client for authentication (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class AuthMessage(Message):
-    cdef:
-        str encoded_password
-        bytes password
-        bytes newpassword
-        str encoded_newpassword
-        str encoded_jdwp_data
-        str debug_jdwp
-        str session_key
-        str speedy_key
-        str proxy_user
-        str token
-        str private_key
-        str service_name
-        uint8_t purity
-        ssize_t user_bytes_len
-        bytes user_bytes
-        dict session_data
-        uint32_t auth_mode
-        uint32_t verifier_type
-        bint change_password
-        str program
-        str terminal
-        str machine
-        str osuser
-        str driver_name
-        str edition
-        list appcontext
-        str connect_string
-
-    cdef int _encrypt_passwords(self) except -1:
-        """
-        Encrypts the passwords using the session key.
-        """
-
-        # encrypt password
-        salt = secrets.token_bytes(16)
-        password_with_salt = salt + self.password
-        encrypted_password = encrypt_cbc(self.conn_impl._combo_key,
-                                         password_with_salt)
-        self.encoded_password = encrypted_password.hex().upper()
-
-        # encrypt new password
-        if self.newpassword is not None:
-            newpassword_with_salt = salt + self.newpassword
-            encrypted_newpassword = encrypt_cbc(self.conn_impl._combo_key,
-                                                newpassword_with_salt)
-            self.encoded_newpassword = encrypted_newpassword.hex().upper()
-
-    cdef int _generate_verifier(self) except -1:
-        """
-        Generate the multi-round verifier.
-        """
-        cdef:
-            bytes jdwp_data
-            bytearray b
-            ssize_t i
-
-        # create password hash
-        verifier_data = bytes.fromhex(self.session_data['AUTH_VFR_DATA'])
-        if self.verifier_type == TNS_VERIFIER_TYPE_12C:
-            keylen = 32
-            iterations = int(self.session_data['AUTH_PBKDF2_VGEN_COUNT'])
-            salt = verifier_data + b'AUTH_PBKDF2_SPEEDY_KEY'
-            password_key = get_derived_key(self.password, salt, 64,
-                                           iterations)
-            h = hashlib.new("sha512")
-            h.update(password_key)
-            h.update(verifier_data)
-            password_hash = h.digest()[:32]
-        else:
-            keylen = 24
-            h = hashlib.sha1(self.password)
-            h.update(verifier_data)
-            password_hash = h.digest() + bytes(4)
-
-        # decrypt first half of session key
-        encoded_server_key = bytes.fromhex(self.session_data['AUTH_SESSKEY'])
-        session_key_part_a = decrypt_cbc(password_hash, encoded_server_key)
-
-        # generate second half of session key
-        session_key_part_b = secrets.token_bytes(len(session_key_part_a))
-        encoded_client_key = encrypt_cbc(password_hash, session_key_part_b)
-
-        # create session key and combo key
-        if len(session_key_part_a) == 48:
-            self.session_key = encoded_client_key.hex().upper()[:96]
-            b = bytearray(24)
-            for i in range(16, 40):
-                b[i - 16] = session_key_part_a[i] ^ session_key_part_b[i]
-            part1 = hashlib.md5(b[:16]).digest()
-            part2 = hashlib.md5(b[16:]).digest()
-            combo_key = (part1 + part2)[:keylen]
-        else:
-            self.session_key = encoded_client_key.hex().upper()[:64]
-            salt = bytes.fromhex(self.session_data['AUTH_PBKDF2_CSK_SALT'])
-            iterations = int(self.session_data['AUTH_PBKDF2_SDER_COUNT'])
-            temp_key = session_key_part_b[:keylen] + session_key_part_a[:keylen]
-            combo_key = get_derived_key(temp_key.hex().upper().encode(), salt,
-                                        keylen, iterations)
-
-        # retain session key for use by the change password API
-        self.conn_impl._combo_key = combo_key
-
-        # generate speedy key for 12c verifiers
-        if self.verifier_type == TNS_VERIFIER_TYPE_12C:
-            salt = secrets.token_bytes(16)
-            speedy_key = encrypt_cbc(combo_key, salt + password_key)
-            self.speedy_key = speedy_key[:80].hex().upper()
-
-        # encrypts the passwords
-        self._encrypt_passwords()
-
-        # check if debug_jdwp is set. if set, encode the data using the
-        # combo session key with zeros padding
-        if self.debug_jdwp is not None:
-            jdwp_data = self.debug_jdwp.encode()
-            encrypted_jdwp_data = encrypt_cbc(combo_key, jdwp_data, zeros=True)
-            # Add a "01" at the end of the hex encrypted data to indicate the
-            # use of AES encryption
-            self.encoded_jdwp_data = encrypted_jdwp_data.hex().upper() + "01"
-
-    cdef str _get_alter_timezone_statement(self):
-        """
-        Returns the statement required to change the session time zone to match
-        the time zone in use by the Python interpreter.
-        """
-        cdef:
-            int tz_hour, tz_minute, timezone
-            str sign, tz_repr
-        tz_repr = os.environ.get("ORA_SDTZ")
-        if tz_repr is None:
-            timezone = time.localtime().tm_gmtoff
-            tz_hour = timezone // 3600
-            tz_minute = (timezone - (tz_hour * 3600)) // 60
-            if tz_hour < 0:
-                sign = "-"
-                tz_hour = -tz_hour
-            else:
-                sign = "+"
-            tz_repr = f"{sign}{tz_hour:02}:{tz_minute:02}"
-        return f"ALTER SESSION SET TIME_ZONE='{tz_repr}'\x00"
-
-    cdef tuple _get_version_tuple(self, ReadBuffer buf):
-        """
-        Return the 5-tuple for the database version. Note that the format
-        changed with Oracle Database 18.
-        """
-        cdef uint32_t full_version_num
-        full_version_num = int(self.session_data["AUTH_VERSION_NO"])
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_18_1_EXT_1:
-            return ((full_version_num >> 24) & 0xFF,
-                    (full_version_num >> 16) & 0xFF,
-                    (full_version_num >> 12) & 0x0F,
-                    (full_version_num >> 4) & 0xFF,
-                    (full_version_num & 0x0F))
-        else:
-            return ((full_version_num >> 24) & 0xFF,
-                    (full_version_num >> 20) & 0x0F,
-                    (full_version_num >> 12) & 0x0F,
-                    (full_version_num >> 8) & 0x0F,
-                    (full_version_num & 0x0F))
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_AUTH_PHASE_ONE
-        self.session_data = {}
-        if self.conn_impl.username is not None:
-            self.user_bytes = self.conn_impl.username.encode()
-            self.user_bytes_len = len(self.user_bytes)
-        self.resend = True
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        cdef:
-            bytes encoded_response, response
-            uint16_t num_params, i
-            str key, value
-        buf.read_ub2(&num_params)
-        for i in range(num_params):
-            key = buf.read_str_with_length()
-            value = buf.read_str_with_length()
-            if value is None:
-                value = ""
-            if key == "AUTH_VFR_DATA":
-                buf.read_ub4(&self.verifier_type)
-            else:
-                buf.skip_ub4()                  # skip flags
-            self.session_data[key] = value
-        if self.function_code == TNS_FUNC_AUTH_PHASE_ONE:
-            self.function_code = TNS_FUNC_AUTH_PHASE_TWO
-        elif not self.change_password \
-                and self.conn_impl._combo_key is not None:
-            response = None
-            value = self.session_data.get("AUTH_SVR_RESPONSE")
-            if value is not None:
-                encoded_response = bytes.fromhex(value)
-                response = decrypt_cbc(
-                    self.conn_impl._combo_key, encoded_response
-                )
-            if response is None or response[16:32] != b"SERVER_TO_CLIENT":
-                errors._raise_err(errors.ERR_INVALID_SERVER_RESPONSE)
-
-    cdef int _set_params(self, ConnectParamsImpl params,
-                         Description description) except -1:
-        """
-        Sets the parameters to use for the AuthMessage. The user and auth mode
-        are retained in order to avoid duplicating this effort for both trips
-        to the server.
-        """
-        self.password = params._get_password()
-        self.newpassword = params._get_new_password()
-        self.service_name = description.service_name
-        self.proxy_user = params.proxy_user
-        self.debug_jdwp = params.debug_jdwp
-        self.program = params.program
-        self.terminal = params.terminal
-        self.machine = params.machine
-        self.osuser = params.osuser
-        self.driver_name = params.driver_name
-        if self.driver_name is None:
-            self.driver_name = f"{DRIVER_NAME} thn : {DRIVER_VERSION}"
-        self.edition = params.edition
-        self.appcontext = params.appcontext
-        self.connect_string = params._get_connect_string()
-
-        # if drcp is used, use purity = NEW as the default purity for
-        # standalone connections and purity = SELF for connections that belong
-        # to a pool
-        if description.purity == PURITY_DEFAULT \
-                and self.conn_impl._drcp_enabled:
-            if self.conn_impl._is_pooled:
-                self.purity = PURITY_SELF
-            else:
-                self.purity = PURITY_NEW
-        else:
-            self.purity = description.purity
-
-        # set token parameters; adjust processing so that only phase two is
-        # sent
-        if params._token is not None \
-                or params.access_token_callback is not None:
-            self.token = params._get_token()
-            if params._private_key is not None:
-                self.private_key = params._get_private_key()
-            self.function_code = TNS_FUNC_AUTH_PHASE_TWO
-            self.resend = False
-
-        # set authentication mode
-        if params._new_password is None:
-            self.auth_mode = TNS_AUTH_MODE_LOGON
-        if params.mode & AUTH_MODE_SYSDBA:
-            self.auth_mode |= TNS_AUTH_MODE_SYSDBA
-        if params.mode & AUTH_MODE_SYSOPER:
-            self.auth_mode |= TNS_AUTH_MODE_SYSOPER
-        if params.mode & AUTH_MODE_SYSASM:
-            self.auth_mode |= TNS_AUTH_MODE_SYSASM
-        if params.mode & AUTH_MODE_SYSBKP:
-            self.auth_mode |= TNS_AUTH_MODE_SYSBKP
-        if params.mode & AUTH_MODE_SYSDGD:
-            self.auth_mode |= TNS_AUTH_MODE_SYSDGD
-        if params.mode & AUTH_MODE_SYSKMT:
-            self.auth_mode |= TNS_AUTH_MODE_SYSKMT
-        if params.mode & AUTH_MODE_SYSRAC:
-            self.auth_mode |= TNS_AUTH_MODE_SYSRAC
-        if self.private_key is not None:
-            self.auth_mode |= TNS_AUTH_MODE_IAM_TOKEN
-
-    cdef int _write_key_value(self, WriteBuffer buf, str key, str value,
-                              uint32_t flags=0) except -1:
-        cdef:
-            bytes key_bytes = key.encode()
-            bytes value_bytes = value.encode()
-            uint32_t key_len = <uint32_t> len(key_bytes)
-            uint32_t value_len = <uint32_t> len(value_bytes)
-        buf.write_ub4(key_len)
-        buf.write_bytes_with_length(key_bytes)
-        buf.write_ub4(value_len)
-        if value_len > 0:
-            buf.write_bytes_with_length(value_bytes)
-        buf.write_ub4(flags)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        cdef:
-            uint8_t has_user = 1 if self.user_bytes_len > 0 else 0
-            uint32_t num_pairs
-
-        # perform final determination of data to write
-        if self.function_code == TNS_FUNC_AUTH_PHASE_ONE:
-            num_pairs = 5
-        elif self.change_password:
-            self._encrypt_passwords()
-            num_pairs = 2
-        else:
-            num_pairs = 4
-
-            # token authentication
-            if self.token is not None:
-                num_pairs += 1
-
-            # normal user/password authentication
-            else:
-                num_pairs += 2
-                self.auth_mode |= TNS_AUTH_MODE_WITH_PASSWORD
-                if self.verifier_type == TNS_VERIFIER_TYPE_12C:
-                    num_pairs += 1
-                elif self.verifier_type not in (TNS_VERIFIER_TYPE_11G_1,
-                                                TNS_VERIFIER_TYPE_11G_2):
-                    errors._raise_err(errors.ERR_UNSUPPORTED_VERIFIER_TYPE,
-                                      verifier_type=self.verifier_type)
-                self._generate_verifier()
-
-            # determine which other key/value pairs to write
-            if self.newpassword is not None:
-                num_pairs += 1
-                self.auth_mode |= TNS_AUTH_MODE_CHANGE_PASSWORD
-            if self.proxy_user is not None:
-                num_pairs += 1
-            if self.conn_impl._cclass is not None:
-                num_pairs += 1
-            if self.purity != 0:
-                num_pairs += 1
-            if self.private_key is not None:
-                num_pairs += 2
-            if self.encoded_jdwp_data is not None:
-                num_pairs += 1
-            if self.edition is not None:
-                num_pairs += 1
-            if self.appcontext is not None:
-                num_pairs += len(self.appcontext) * 3
-            if self.connect_string is not None:
-                num_pairs += 1
-
-        # write basic data to packet
-        self._write_function_code(buf)
-        buf.write_uint8(has_user)           # pointer (authusr)
-        buf.write_ub4(self.user_bytes_len)
-        buf.write_ub4(self.auth_mode)       # authentication mode
-        buf.write_uint8(1)                  # pointer (authivl)
-        buf.write_ub4(num_pairs)            # number of key/value pairs
-        buf.write_uint8(1)                  # pointer (authovl)
-        buf.write_uint8(1)                  # pointer (authovln)
-        if has_user:
-            buf.write_bytes_with_length(self.user_bytes)
-
-        # write key/value pairs
-        if self.function_code == TNS_FUNC_AUTH_PHASE_ONE:
-            self._write_key_value(buf, "AUTH_TERMINAL", self.terminal)
-            self._write_key_value(buf, "AUTH_PROGRAM_NM", self.program)
-            self._write_key_value(buf, "AUTH_MACHINE", self.machine)
-            self._write_key_value(buf, "AUTH_PID", _connect_constants.pid)
-            self._write_key_value(buf, "AUTH_SID", self.osuser)
-        else:
-            if self.proxy_user is not None:
-                self._write_key_value(buf, "PROXY_CLIENT_NAME",
-                                      self.proxy_user)
-            if self.token is not None:
-                self._write_key_value(buf, "AUTH_TOKEN", self.token)
-            elif not self.change_password:
-                self._write_key_value(buf, "AUTH_SESSKEY", self.session_key, 1)
-                if self.verifier_type == TNS_VERIFIER_TYPE_12C:
-                    self._write_key_value(buf, "AUTH_PBKDF2_SPEEDY_KEY",
-                                          self.speedy_key)
-            if self.encoded_password is not None:
-                self._write_key_value(buf, "AUTH_PASSWORD",
-                                      self.encoded_password)
-            if self.encoded_newpassword is not None:
-                self._write_key_value(buf, "AUTH_NEWPASSWORD",
-                                      self.encoded_newpassword)
-            if not self.change_password:
-                self._write_key_value(buf, "SESSION_CLIENT_CHARSET", "873")
-                self._write_key_value(buf, "SESSION_CLIENT_DRIVER_NAME",
-                                      self.driver_name)
-                self._write_key_value(buf, "SESSION_CLIENT_VERSION",
-                                    str(_connect_constants.full_version_num))
-                self._write_key_value(buf, "AUTH_ALTER_SESSION",
-                                      self._get_alter_timezone_statement(), 1)
-            if self.conn_impl._cclass is not None:
-                self._write_key_value(buf, "AUTH_KPPL_CONN_CLASS",
-                                      self.conn_impl._cclass)
-            if self.purity != 0:
-                self._write_key_value(buf, "AUTH_KPPL_PURITY",
-                                      str(self.purity), 1)
-            if self.private_key is not None:
-                date_format = "%a, %d %b %Y %H:%M:%S GMT"
-                now = datetime.datetime.utcnow().strftime(date_format)
-                host_info = "%s:%d" % buf._transport.get_host_info()
-                header = f"date: {now}\n" + \
-                         f"(request-target): {self.service_name}\n" + \
-                         f"host: {host_info}"
-                signature = get_signature(self.private_key, header)
-                self._write_key_value(buf, "AUTH_HEADER", header)
-                self._write_key_value(buf, "AUTH_SIGNATURE", signature)
-            if self.encoded_jdwp_data is not None:
-                self._write_key_value(buf, "AUTH_ORA_DEBUG_JDWP",
-                                      self.encoded_jdwp_data)
-            if self.edition is not None:
-                self._write_key_value(buf, "AUTH_ORA_EDITION", self.edition)
-            if self.appcontext is not None:
-                # NOTE: these keys require a trailing null character as the
-                # server expects it!
-                for entry in self.appcontext:
-                    self._write_key_value(buf, "AUTH_APPCTX_NSPACE\0", entry[0])
-                    self._write_key_value(buf, "AUTH_APPCTX_ATTR\0", entry[1])
-                    self._write_key_value(buf, "AUTH_APPCTX_VALUE\0", entry[2])
-            if self.connect_string is not None:
-                self._write_key_value(buf, "AUTH_CONNECT_STRING",
-                                      self.connect_string)
diff --git a/src/oracledb/impl/thin/messages/base.pyx b/src/oracledb/impl/thin/messages/base.pyx
deleted file mode 100644
index 39d4eae4..00000000
--- a/src/oracledb/impl/thin/messages/base.pyx
+++ /dev/null
@@ -1,1634 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# base.pyx
-#
-# Cython file defining the base classes used for messages sent to the database
-# and the responses that are received by the client (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.freelist(20)
-cdef class _OracleErrorInfo:
-    cdef:
-        uint32_t num
-        uint16_t cursor_id
-        uint64_t pos
-        uint64_t rowcount
-        str message
-        Rowid rowid
-        list batcherrors
-
-
-@cython.freelist(20)
-cdef class _PostProcessFn:
-    cdef:
-        object fn
-        bint convert_nulls
-        bint check_awaitable
-        uint32_t num_elements
-        list values
-
-    @staticmethod
-    cdef _PostProcessFn from_info(object fn, uint32_t num_elements,
-                                  list values, bint convert_nulls=False,
-                                  bint check_awaitable=False):
-        """
-        Create a post process function object and return it.
-        """
-        cdef _PostProcessFn fn_obj
-        fn_obj = _PostProcessFn.__new__(_PostProcessFn)
-        fn_obj.fn = fn
-        fn_obj.convert_nulls = convert_nulls
-        fn_obj.check_awaitable = check_awaitable
-        fn_obj.num_elements = num_elements
-        fn_obj.values = values
-        return fn_obj
-
-
-cdef class Message:
-    cdef:
-        BaseThinConnImpl conn_impl
-        BaseThinDbObjectTypeCache type_cache
-        PipelineOpResultImpl pipeline_result_impl
-        _OracleErrorInfo error_info
-        uint8_t message_type
-        uint8_t function_code
-        uint32_t call_status
-        uint16_t end_to_end_seq_num
-        uint64_t token_num
-        bint end_of_response
-        bint error_occurred
-        bint flush_out_binds
-        bint resend
-        bint retry
-        object warning
-
-    cdef int _check_and_raise_exception(self) except -1:
-        """
-        Checks to see if an error has occurred. If one has, an error object is
-        created and then the appropriate exception raised. Note that if a "dead
-        connection" error is detected, the connection is forced closed
-        immediately.
-        """
-        if self.error_occurred:
-            error = errors._Error(self.error_info.message,
-                                  code=self.error_info.num,
-                                  offset=self.error_info.pos)
-            if error.is_session_dead:
-                self.conn_impl._protocol._disconnect()
-            raise error.exc_type(error)
-
-    cdef int _initialize(self, BaseThinConnImpl conn_impl) except -1:
-        """
-        Initializes the message to contain the connection and a place to store
-        error information. For DRCP, the status of the connection may change
-        after the first round-trip to the database so this information needs to
-        be preserved. Child classes may have their own initialization. In order
-        to avoid overhead using the constructor, a special hook method is used
-        instead.
-        """
-        conn_impl._protocol._read_buf._check_connected()
-        self.conn_impl = conn_impl
-        self.message_type = TNS_MSG_TYPE_FUNCTION
-        self.error_info = _OracleErrorInfo.__new__(_OracleErrorInfo)
-        self._initialize_hook()
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        A hook that is used by subclasses to perform any necessary
-        initialization specific to that class.
-        """
-        pass
-
-    cdef int _update_sessionless_txn_state(self, bytes data) except -1:
-        """
-        Update the sessionless transaction state.
-        """
-        cdef:
-            uint8_t sessionless_state
-            uint8_t sync_version
-            bytes transaction_id
-            const uint8_t* buf
-            ssize_t buf_len
-
-        # extract the parts of the data
-        buf = <uint8_t*> data
-        buf_len = len(data)
-        transaction_id = data[:buf_len - 2]
-        sessionless_state = <uint8_t> buf[buf_len - 2]
-        sync_version = <uint8_t> buf[buf_len - 1]
-
-        # verify the sync version is one understood by the driver
-        if sync_version != 1:
-            errors._raise_err(errors.ERR_UNKNOWN_TRANSACTION_SYNC_VERSION,
-                              version=sync_version)
-
-        # transaction was cleared (ended or suspended)
-        if sessionless_state & TNS_TPC_TXNID_SYNC_UNSET:
-            self.conn_impl._sessionless_data = None
-            self.conn_impl._protocol._txn_in_progress = False
-
-        # transaction was set (started or resumed)
-        elif sessionless_state & TNS_TPC_TXNID_SYNC_SET:
-            self.conn_impl._sessionless_data = \
-                    _SessionlessData.__new__(_SessionlessData)
-            self.conn_impl._sessionless_data.started_on_server = \
-                    sessionless_state & TNS_TPC_TXNID_SYNC_SERVER
-            self.conn_impl._protocol._txn_in_progress = True
-
-    cdef int _process_error_info(self, ReadBuffer buf) except -1:
-        cdef:
-            uint32_t num_bytes, i, offset, num_offsets
-            _OracleErrorInfo info = self.error_info
-            uint16_t temp16, num_errors, error_code
-            uint8_t first_byte, flags
-            int16_t error_pos
-            str error_msg
-        buf.read_ub4(&self.call_status)     # end of call status
-        buf.skip_ub2()                      # end to end seq#
-        buf.skip_ub4()                      # current row number
-        buf.skip_ub2()                      # error number
-        buf.skip_ub2()                      # array elem error
-        buf.skip_ub2()                      # array elem error
-        buf.read_ub2(&info.cursor_id)       # cursor id
-        buf.read_sb2(&error_pos)            # error position
-        buf.skip_ub1()                      # sql type (19c and earlier)
-        buf.skip_ub1()                      # fatal?
-        buf.skip_ub1()                      # flags
-        buf.skip_ub1()                      # user cursor options
-        buf.skip_ub1()                      # UPI parameter
-        buf.read_ub1(&flags)
-        if flags & 0x20:
-            self.warning = errors._create_warning(errors.WRN_COMPILATION_ERROR)
-        buf.read_rowid(&info.rowid)         # rowid
-        buf.skip_ub4()                      # OS error
-        buf.skip_ub1()                      # statement number
-        buf.skip_ub1()                      # call number
-        buf.skip_ub2()                      # padding
-        buf.skip_ub4()                      # success iters
-        buf.read_ub4(&num_bytes)            # oerrdd (logical rowid)
-        if num_bytes > 0:
-            buf.skip_raw_bytes_chunked()
-
-        # batch error codes
-        buf.read_ub2(&num_errors)           # batch error codes array
-        if num_errors > 0:
-            info.batcherrors = []
-            buf.read_ub1(&first_byte)
-            for i in range(num_errors):
-                if first_byte == TNS_LONG_LENGTH_INDICATOR:
-                    buf.skip_ub4()          # chunk length ignored
-                buf.read_ub2(&error_code)
-                info.batcherrors.append(errors._Error(code=error_code))
-            if first_byte == TNS_LONG_LENGTH_INDICATOR:
-                buf.skip_raw_bytes(1)       # ignore end marker
-
-        # batch error offsets
-        buf.read_ub4(&num_offsets)          # batch error row offset array
-        if num_offsets > 0:
-            if num_offsets > 65535:
-                errors._raise_err(errors.ERR_TOO_MANY_BATCH_ERRORS)
-            buf.read_ub1(&first_byte)
-            for i in range(num_offsets):
-                if first_byte == TNS_LONG_LENGTH_INDICATOR:
-                    buf.skip_ub4()          # chunk length ignored
-                buf.read_ub4(&offset)
-                if i < num_errors:
-                    info.batcherrors[i].offset = offset
-            if first_byte == TNS_LONG_LENGTH_INDICATOR:
-                buf.skip_raw_bytes(1)       # ignore end marker
-
-        # batch error messages
-        buf.read_ub2(&temp16)               # batch error messages array
-        if temp16 > 0:
-            buf.skip_raw_bytes(1)           # ignore packed size
-            for i in range(temp16):
-                buf.skip_ub2()              # skip chunk length
-                info.batcherrors[i].message = \
-                        buf.read_str(CS_FORM_IMPLICIT).rstrip()
-                info.batcherrors[i]._make_adjustments()
-                buf.skip_raw_bytes(2)       # ignore end marker
-
-        buf.read_ub4(&info.num)             # error number (extended)
-        buf.read_ub8(&info.rowcount)        # row number (extended)
-
-        # fields added in Oracle Database 20c
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_20_1:
-            buf.skip_ub4()                  # sql type
-            buf.skip_ub4()                  # server checksum
-
-        # error message
-        if info.num != 0:
-            self.error_occurred = True
-            if error_pos > 0:
-                info.pos = error_pos
-            info.message = buf.read_str(CS_FORM_IMPLICIT).rstrip()
-
-        # an error message marks the end of a response if no explicit end of
-        # response is available
-        if not buf._caps.supports_end_of_response:
-            self.end_of_response = True
-
-    cdef int _process_keyword_value_pairs(self, ReadBuffer buf,
-                                          uint16_t num_pairs) except -1:
-        """
-        Processes the keyword/value pairs returned by the server.
-        """
-        cdef:
-            uint16_t i, num_bytes, keyword_num
-            bytes text_value, binary_value
-        for i in range(num_pairs):
-            text_value = binary_value = None
-            buf.read_ub2(&num_bytes)        # text value
-            if num_bytes > 0:
-                text_value = buf.read_bytes()
-            buf.read_ub2(&num_bytes)        # binary value
-            if num_bytes > 0:
-                binary_value = buf.read_bytes()
-            buf.read_ub2(&keyword_num)      # keyword num
-            if keyword_num == TNS_KEYWORD_NUM_CURRENT_SCHEMA:
-                self.conn_impl._current_schema = text_value.decode()
-            elif keyword_num == TNS_KEYWORD_NUM_EDITION:
-                self.conn_impl._edition = text_value.decode()
-            elif keyword_num == TNS_KEYWORD_NUM_TRANSACTION_ID:
-                self._update_sessionless_txn_state(binary_value)
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        cdef uint64_t token_num
-        if message_type == TNS_MSG_TYPE_ERROR:
-            self._process_error_info(buf)
-        elif message_type == TNS_MSG_TYPE_WARNING:
-            self._process_warning_info(buf)
-        elif message_type == TNS_MSG_TYPE_TOKEN:
-            buf.read_ub8(&token_num)
-            if token_num != self.token_num:
-                errors._raise_err(errors.ERR_MISMATCHED_TOKEN,
-                                  token_num=token_num,
-                                  expected_token_num=self.token_num)
-        elif message_type == TNS_MSG_TYPE_STATUS:
-            buf.read_ub4(&self.call_status)
-            buf.read_ub2(&self.end_to_end_seq_num)
-            if not buf._caps.supports_end_of_response:
-                self.end_of_response = True
-        elif message_type == TNS_MSG_TYPE_PARAMETER:
-            self._process_return_parameters(buf)
-        elif message_type == TNS_MSG_TYPE_SERVER_SIDE_PIGGYBACK:
-            self._process_server_side_piggyback(buf)
-        elif message_type == TNS_MSG_TYPE_END_OF_RESPONSE:
-            self.end_of_response = True
-        else:
-            errors._raise_err(errors.ERR_MESSAGE_TYPE_UNKNOWN,
-                              message_type=message_type,
-                              position=buf._pos - 1)
-
-    cdef OracleMetadata _process_metadata(self, ReadBuffer buf):
-        """
-        Process metadata from the buffer and return it.
-        """
-        cdef:
-            uint32_t uds_flags, num_annotations, i
-            ThinDbObjectTypeImpl typ_impl
-            str schema, name, key, value
-            uint8_t ora_type_num, csfrm
-            OracleMetadata metadata
-            uint8_t nulls_allowed
-            int cache_num
-            bytes oid
-        buf.read_ub1(&ora_type_num)
-        metadata = OracleMetadata.__new__(OracleMetadata)
-        buf.skip_ub1()                      # flags
-        buf.read_sb1(&metadata.precision)
-        buf.read_sb1(&metadata.scale)
-        buf.read_ub4(&metadata.buffer_size)
-        buf.skip_ub4()                      # max number of array elements
-        buf.skip_ub8()                      # cont flags
-        oid = buf.read_bytes_with_length()
-        buf.skip_ub2()                      # version
-        buf.skip_ub2()                      # character set id
-        buf.read_ub1(&csfrm)                # character set form
-        # in some cases the metadata returned contains an invalid character
-        # set form for data types that do not actually require it; if the
-        # lookup fails, try again with a zero character set form
-        try:
-            metadata.dbtype = \
-                    DbType._from_ora_type_and_csfrm(ora_type_num, csfrm)
-        except:
-            metadata.dbtype = DbType._from_ora_type_and_csfrm(ora_type_num, 0)
-        buf.read_ub4(&metadata.max_size)
-        if ora_type_num == ORA_TYPE_NUM_RAW:
-            metadata.max_size = metadata.buffer_size
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_12_2:
-            buf.skip_ub4()                  # oaccolid
-        buf.read_ub1(&nulls_allowed)
-        metadata.nulls_allowed = nulls_allowed
-        buf.skip_ub1()                      # v7 length of name
-        metadata.name = buf.read_str_with_length()
-        schema = buf.read_str_with_length()
-        name = buf.read_str_with_length()
-        buf.skip_ub2()                      # column position
-        buf.read_ub4(&uds_flags)
-        metadata.is_json = uds_flags & TNS_UDS_FLAGS_IS_JSON
-        metadata.is_oson = uds_flags & TNS_UDS_FLAGS_IS_OSON
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1:
-            metadata.domain_schema = buf.read_str_with_length()
-            metadata.domain_name = buf.read_str_with_length()
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1_EXT_3:
-            buf.read_ub4(&num_annotations)
-            if num_annotations > 0:
-                buf.skip_ub1()
-                metadata.annotations = {}
-                buf.read_ub4(&num_annotations)
-                buf.skip_ub1()
-                for i in range(num_annotations):
-                    key = buf.read_str_with_length()
-                    value = buf.read_str_with_length()
-                    if value is None:
-                        value = ""
-                    metadata.annotations[key] = value
-                    buf.skip_ub4()          # flags
-                buf.skip_ub4()              # flags
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_4:
-            buf.read_ub4(&metadata.vector_dimensions)
-            buf.read_ub1(&metadata.vector_format)
-            buf.read_ub1(&metadata.vector_flags)
-        if ora_type_num == ORA_TYPE_NUM_OBJECT:
-            if self.type_cache is None:
-                cache_num = self.conn_impl._dbobject_type_cache_num
-                self.type_cache = get_dbobject_type_cache(cache_num)
-            typ_impl = self.type_cache.get_type_for_info(oid, schema, None,
-                                                         name)
-            if typ_impl.is_xml_type:
-                metadata.dbtype = DB_TYPE_XMLTYPE
-            else:
-                metadata.objtype = typ_impl
-        return metadata
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        raise NotImplementedError()
-
-    cdef int _process_server_side_piggyback(self, ReadBuffer buf) except -1:
-        cdef:
-            uint16_t num_elements, i, temp16
-            uint32_t num_bytes, flags
-            uint8_t opcode
-        buf.read_ub1(&opcode)
-        if opcode == TNS_SERVER_PIGGYBACK_LTXID:
-            self.conn_impl._ltxid = buf.read_bytes_with_length()
-        elif opcode == TNS_SERVER_PIGGYBACK_QUERY_CACHE_INVALIDATION \
-                or opcode == TNS_SERVER_PIGGYBACK_TRACE_EVENT:
-            pass
-        elif opcode == TNS_SERVER_PIGGYBACK_OS_PID_MTS:
-            buf.read_ub2(&temp16)
-            buf.skip_raw_bytes_chunked()
-        elif opcode == TNS_SERVER_PIGGYBACK_SYNC:
-            buf.skip_ub2()                  # skip number of DTYs
-            buf.skip_ub1()                  # skip length of DTYs
-            buf.read_ub2(&num_elements)
-            buf.skip_ub1()                  # skip length
-            self._process_keyword_value_pairs(buf, num_elements)
-            buf.skip_ub4()                  # skip overall flags
-        elif opcode == TNS_SERVER_PIGGYBACK_EXT_SYNC:
-            buf.skip_ub2()                  # skip number of DTYs
-            buf.skip_ub1()                  # skip length of DTYs
-        elif opcode == TNS_SERVER_PIGGYBACK_AC_REPLAY_CONTEXT:
-            buf.skip_ub2()                  # skip number of DTYs
-            buf.skip_ub1()                  # skip length of DTYs
-            buf.skip_ub4()                  # skip flags
-            buf.skip_ub4()                  # skip error code
-            buf.skip_ub1()                  # skip queue
-            buf.read_ub4(&num_bytes)        # skip replay context
-            if num_bytes > 0:
-                buf.skip_raw_bytes_chunked()
-        elif opcode == TNS_SERVER_PIGGYBACK_SESS_RET:
-            buf.skip_ub2()
-            buf.skip_ub1()
-            buf.read_ub2(&num_elements)
-            if num_elements > 0:
-                buf.skip_ub1()
-                for i in range(num_elements):
-                    buf.read_ub2(&temp16)
-                    if temp16 > 0:          # skip key
-                        buf.skip_raw_bytes_chunked()
-                    buf.read_ub2(&temp16)
-                    if temp16 > 0:          # skip value
-                        buf.skip_raw_bytes_chunked()
-                    buf.skip_ub2()          # skip flags
-            buf.read_ub4(&flags)            # session flags
-            if flags & TNS_SESSGET_SESSION_CHANGED:
-                if self.conn_impl._drcp_establish_session:
-                    self.conn_impl._statement_cache.clear_open_cursors()
-            self.conn_impl._drcp_establish_session = False
-            buf.read_ub4(&self.conn_impl._session_id)
-            buf.read_ub2(&self.conn_impl._serial_num)
-        elif opcode == TNS_SERVER_PIGGYBACK_SESS_SIGNATURE:
-            buf.skip_ub2()                  # number of dtys
-            buf.skip_ub1()                  # length of dty
-            buf.skip_ub8()                  # signature flags
-            buf.skip_ub8()                  # client signature
-            buf.skip_ub8()                  # server signature
-        else:
-            errors._raise_err(errors.ERR_UNKNOWN_SERVER_PIGGYBACK,
-                              opcode=opcode)
-
-    cdef int _process_warning_info(self, ReadBuffer buf) except -1:
-        cdef:
-            uint16_t num_bytes, error_num
-            str message
-        buf.read_ub2(&error_num)            # error number
-        buf.read_ub2(&num_bytes)            # length of error message
-        buf.skip_ub2()                      # flags
-        if error_num != 0 and num_bytes > 0:
-            message = buf.read_str(CS_FORM_IMPLICIT).rstrip()
-            self.warning = errors._Error(message, code=error_num,
-                                         iswarning=True)
-
-    cdef int _write_begin_pipeline_piggyback(self, WriteBuffer buf) except -1:
-        """
-        Writes the piggyback to the server that informs the server that a
-        pipeline is beginning.
-        """
-        buf._data_flags |= TNS_DATA_FLAGS_BEGIN_PIPELINE
-        self._write_piggyback_code(buf, TNS_FUNC_PIPELINE_BEGIN)
-        buf.write_ub2(0)                    # error set ID
-        buf.write_uint8(0)                  # error set mode
-        buf.write_uint8(self.conn_impl.pipeline_mode)
-
-    cdef int _write_close_cursors_piggyback(self, WriteBuffer buf) except -1:
-        """
-        Writes the piggyback that informs the server of the cursors that can be
-        closed.
-        """
-        self._write_piggyback_code(buf, TNS_FUNC_CLOSE_CURSORS)
-        buf.write_uint8(1)                  # pointer
-        self.conn_impl._statement_cache.write_cursors_to_close(buf)
-
-    cdef int _write_current_schema_piggyback(self, WriteBuffer buf) except -1:
-        """
-        Writes the piggyback that informs the server that a new current schema
-        is desired.
-        """
-        cdef bytes schema_bytes
-        self._write_piggyback_code(buf, TNS_FUNC_SET_SCHEMA)
-        buf.write_uint8(1)                  # pointer
-        schema_bytes = self.conn_impl._current_schema.encode()
-        buf.write_ub4(len(schema_bytes))
-        buf.write_bytes_with_length(schema_bytes)
-
-    cdef int _write_close_temp_lobs_piggyback(self,
-                                              WriteBuffer buf) except -1:
-        """
-        Writes the piggyback that informs the server of the temporary LOBs that
-        can be closed.
-        """
-        cdef:
-            list lobs_to_close = self.conn_impl._temp_lobs_to_close
-            uint64_t total_size = 0
-        self._write_piggyback_code(buf, TNS_FUNC_LOB_OP)
-        op_code = TNS_LOB_OP_FREE_TEMP | TNS_LOB_OP_ARRAY
-
-        # temp lob data
-        buf.write_uint8(1)                  # pointer
-        buf.write_ub4(self.conn_impl._temp_lobs_total_size)
-        buf.write_uint8(0)                  # dest lob locator
-        buf.write_ub4(0)
-        buf.write_ub4(0)                    # source lob locator
-        buf.write_ub4(0)
-        buf.write_uint8(0)                  # source lob offset
-        buf.write_uint8(0)                  # dest lob offset
-        buf.write_uint8(0)                  # charset
-        buf.write_ub4(op_code)
-        buf.write_uint8(0)                  # scn
-        buf.write_ub4(0)                    # losbscn
-        buf.write_ub8(0)                    # lobscnl
-        buf.write_ub8(0)
-        buf.write_uint8(0)
-
-        # array lob fields
-        buf.write_uint8(0)
-        buf.write_ub4(0)
-        buf.write_uint8(0)
-        buf.write_ub4(0)
-        buf.write_uint8(0)
-        buf.write_ub4(0)
-        for i in range(len(lobs_to_close)):
-            buf.write_bytes(lobs_to_close[i])
-
-        # reset values
-        self.conn_impl._temp_lobs_to_close = None
-        self.conn_impl._temp_lobs_total_size = 0
-
-    cdef int _write_end_to_end_piggyback(self, WriteBuffer buf) except -1:
-        """
-        Writes the piggyback that informs the server of end-to-end attributes
-        that are being changed.
-        """
-        cdef:
-            bytes action_bytes, client_identifier_bytes, client_info_bytes
-            BaseThinConnImpl conn_impl = self.conn_impl
-            bytes module_bytes, dbop_bytes
-            uint32_t flags = 0
-
-        # determine which flags to send
-        if conn_impl._action_modified:
-            flags |= TNS_END_TO_END_ACTION
-        if conn_impl._client_identifier_modified:
-            flags |= TNS_END_TO_END_CLIENT_IDENTIFIER
-        if conn_impl._client_info_modified:
-            flags |= TNS_END_TO_END_CLIENT_INFO
-        if conn_impl._module_modified:
-            flags |= TNS_END_TO_END_MODULE
-        if conn_impl._dbop_modified:
-            flags |= TNS_END_TO_END_DBOP
-
-        # write initial packet data
-        self._write_piggyback_code(buf, TNS_FUNC_SET_END_TO_END_ATTR)
-        buf.write_uint8(0)                  # pointer (cidnam)
-        buf.write_uint8(0)                  # pointer (cidser)
-        buf.write_ub4(flags)
-
-        # write client identifier header info
-        if conn_impl._client_identifier_modified:
-            buf.write_uint8(1)              # pointer (client identifier)
-            if conn_impl._client_identifier is None:
-                buf.write_ub4(0)
-            else:
-                client_identifier_bytes = conn_impl._client_identifier.encode()
-                buf.write_ub4(len(client_identifier_bytes))
-        else:
-            buf.write_uint8(0)              # pointer (client identifier)
-            buf.write_ub4(0)                # length of client identifier
-
-        # write module header info
-        if conn_impl._module_modified:
-            buf.write_uint8(1)              # pointer (module)
-            if conn_impl._module is None:
-                buf.write_ub4(0)
-            else:
-                module_bytes = conn_impl._module.encode()
-                buf.write_ub4(len(module_bytes))
-        else:
-            buf.write_uint8(0)              # pointer (module)
-            buf.write_ub4(0)                # length of module
-
-        # write action header info
-        if conn_impl._action_modified:
-            buf.write_uint8(1)              # pointer (action)
-            if conn_impl._action is None:
-                buf.write_ub4(0)
-            else:
-                action_bytes = conn_impl._action.encode()
-                buf.write_ub4(len(action_bytes))
-        else:
-            buf.write_uint8(0)              # pointer (action)
-            buf.write_ub4(0)                # length of action
-
-        # write unsupported bits
-        buf.write_uint8(0)                  # pointer (cideci)
-        buf.write_ub4(0)                    # length (cideci)
-        buf.write_uint8(0)                  # cidcct
-        buf.write_ub4(0)                    # cidecs
-
-        # write client info header info
-        if conn_impl._client_info_modified:
-            buf.write_uint8(1)              # pointer (client info)
-            if conn_impl._client_info is None:
-                buf.write_ub4(0)
-            else:
-                client_info_bytes = conn_impl._client_info.encode()
-                buf.write_ub4(len(client_info_bytes))
-        else:
-            buf.write_uint8(0)              # pointer (client info)
-            buf.write_ub4(0)                # length of client info
-
-        # write more unsupported bits
-        buf.write_uint8(0)                  # pointer (cidkstk)
-        buf.write_ub4(0)                    # length (cidkstk)
-        buf.write_uint8(0)                  # pointer (cidktgt)
-        buf.write_ub4(0)                    # length (cidktgt)
-
-        # write dbop header info
-        if conn_impl._dbop_modified:
-            buf.write_uint8(1)              # pointer (dbop)
-            if conn_impl._dbop is None:
-                buf.write_ub4(0)
-            else:
-                dbop_bytes = conn_impl._dbop.encode()
-                buf.write_ub4(len(dbop_bytes))
-        else:
-            buf.write_uint8(0)              # pointer (dbop)
-            buf.write_ub4(0)                # length of dbop
-
-        # write strings
-        if conn_impl._client_identifier_modified \
-                and conn_impl._client_identifier is not None:
-            buf.write_bytes_with_length(client_identifier_bytes)
-        if conn_impl._module_modified and conn_impl._module is not None:
-            buf.write_bytes_with_length(module_bytes)
-        if conn_impl._action_modified and conn_impl._action is not None:
-            buf.write_bytes_with_length(action_bytes)
-        if conn_impl._client_info_modified \
-                and conn_impl._client_info is not None:
-            buf.write_bytes_with_length(client_info_bytes)
-        if conn_impl._dbop_modified and conn_impl._dbop is not None:
-            buf.write_bytes_with_length(dbop_bytes)
-
-        # reset flags and values
-        conn_impl._action_modified = False
-        conn_impl._action = None
-        conn_impl._client_identifier_modified = False
-        conn_impl._client_identifier = None
-        conn_impl._client_info_modified = False
-        conn_impl._client_info = None
-        conn_impl._dbop_modified = False
-        conn_impl._dbop = None
-        conn_impl._module_modified = False
-        conn_impl._module = None
-
-    cdef int _write_function_code(self, WriteBuffer buf) except -1:
-        self._write_piggybacks(buf)
-        buf.write_uint8(self.message_type)
-        buf.write_uint8(self.function_code)
-        buf.write_seq_num()
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1_EXT_1:
-            buf.write_ub8(self.token_num)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        self._write_function_code(buf)
-
-    cdef int _write_piggyback_code(self, WriteBuffer buf,
-                                   uint8_t code) except -1:
-        """
-        Writes the header for piggybacks for the specified function code.
-        """
-        buf.write_uint8(TNS_MSG_TYPE_PIGGYBACK)
-        buf.write_uint8(code)
-        buf.write_seq_num()
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1_EXT_1:
-            buf.write_ub8(self.token_num)
-
-    cdef int _write_piggybacks(self, WriteBuffer buf) except -1:
-        """
-        Writes all of the piggybacks to the server.
-        """
-        if self.conn_impl.pipeline_mode != 0:
-            self._write_begin_pipeline_piggyback(buf)
-            self.conn_impl.pipeline_mode = 0
-        if self.conn_impl._current_schema_modified:
-            self._write_current_schema_piggyback(buf)
-        if self.conn_impl._statement_cache is not None \
-                and self.conn_impl._statement_cache._num_cursors_to_close > 0 \
-                and not self.conn_impl._drcp_establish_session:
-            self._write_close_cursors_piggyback(buf)
-        if self.conn_impl._action_modified \
-                or self.conn_impl._client_identifier_modified \
-                or self.conn_impl._client_info_modified \
-                or self.conn_impl._dbop_modified \
-                or self.conn_impl._module_modified:
-            self._write_end_to_end_piggyback(buf)
-        if self.conn_impl._temp_lobs_total_size > 0:
-            self._write_close_temp_lobs_piggyback(buf)
-        if self.conn_impl._session_state_desired != 0:
-            self._write_session_state_piggyback(buf)
-        if self.conn_impl._sessionless_data is not None \
-                and self.conn_impl._sessionless_data.piggyback_pending:
-            self._write_sessionless_piggyback(buf)
-
-    cdef int _write_sessionless_piggyback(self, WriteBuffer buf):
-        """
-        Writes the piggyback for starting a sessionless transaction.
-        """
-        cdef:
-            _SessionlessData sessionless_data
-            TransactionSwitchMessage message
-        sessionless_data = self.conn_impl._sessionless_data
-        message = sessionless_data.create_message(self.conn_impl)
-        message.message_type = TNS_MSG_TYPE_PIGGYBACK
-        sessionless_data.piggyback_pending = False
-        message._write_message(buf)
-
-    cdef int _write_session_state_piggyback(self, WriteBuffer buf) except -1:
-        """
-        Write the session state piggyback. This is used to let the database
-        know when the client is beginning and ending a request. The database
-        uses this information to optimise its resources.
-        """
-        cdef uint8_t state = self.conn_impl._session_state_desired
-        self._write_piggyback_code(buf, TNS_FUNC_SESSION_STATE)
-        buf.write_ub8(state | TNS_SESSION_STATE_EXPLICIT_BOUNDARY)
-        self.conn_impl._session_state_desired = 0
-
-    cdef int on_out_of_packets(self) except -1:
-        """
-        Called when an OufOfPackets exception is raised indicating that further
-        packets are required to continue processing of this message.
-        """
-        pass
-
-    cdef int postprocess(self) except -1:
-        pass
-
-    async def postprocess_async(self):
-        pass
-
-    cdef int preprocess(self) except -1:
-        pass
-
-    cdef int process(self, ReadBuffer buf) except -1:
-        cdef uint8_t message_type
-        self.end_of_response = False
-        self.flush_out_binds = False
-        while not self.end_of_response:
-            buf.save_point()
-            buf.read_ub1(&message_type)
-            self._process_message(buf, message_type)
-
-    cdef int send(self, WriteBuffer buf) except -1:
-        buf.start_request(TNS_PACKET_TYPE_DATA)
-        self._write_message(buf)
-        if self.pipeline_result_impl is not None:
-            buf._data_flags |= TNS_DATA_FLAGS_END_OF_REQUEST
-        buf.end_request()
-
-
-cdef class MessageWithData(Message):
-    cdef:
-        BaseThinCursorImpl cursor_impl
-        array.array bit_vector_buf
-        const char_type *bit_vector
-        bint arraydmlrowcounts
-        uint32_t row_index
-        uint32_t num_execs
-        uint16_t num_columns_sent
-        list dmlrowcounts
-        bint batcherrors
-        list out_var_impls
-        bint in_fetch
-        bint parse_only
-        object cursor
-        uint32_t offset
-
-    cdef int _adjust_metadata(self, ThinVarImpl prev_var_impl,
-                              OracleMetadata metadata) except -1:
-        """
-        When a query is re-executed but the data type of a column has changed
-        the server returns the type information of the new type. However, if
-        the data type returned now is a CLOB or BLOB and the data type
-        previously returned was CHAR/VARCHAR/RAW (or the equivalent long
-        types), then the server returns the data as LONG (RAW), similarly to
-        what happens when a define is done to return CLOB/BLOB as string/bytes.
-        Detect these situations and adjust the fetch type appropriately.
-        """
-        cdef uint8_t type_num, prev_type_num, csfrm
-        type_num = metadata.dbtype._ora_type_num
-        prev_type_num = prev_var_impl._fetch_metadata.dbtype._ora_type_num
-        if type_num == ORA_TYPE_NUM_CLOB \
-                and prev_type_num in (ORA_TYPE_NUM_CHAR,
-                                      ORA_TYPE_NUM_LONG,
-                                      ORA_TYPE_NUM_VARCHAR):
-            type_num = ORA_TYPE_NUM_LONG
-            csfrm = prev_var_impl._fetch_metadata.dbtype._csfrm
-            metadata.dbtype = DbType._from_ora_type_and_csfrm(type_num, csfrm)
-        elif type_num == ORA_TYPE_NUM_BLOB \
-                and prev_type_num in (ORA_TYPE_NUM_RAW, ORA_TYPE_NUM_LONG_RAW):
-            type_num = ORA_TYPE_NUM_LONG_RAW
-            metadata.dbtype = DbType._from_ora_type_and_csfrm(type_num, 0)
-
-    cdef object _create_cursor_from_describe(self, ReadBuffer buf,
-                                             object cursor=None):
-        cdef BaseThinCursorImpl cursor_impl
-        if cursor is None:
-            cursor = self.cursor.connection.cursor()
-        cursor_impl = cursor._impl
-        cursor_impl._statement = self.conn_impl._get_statement()
-        cursor_impl._more_rows_to_fetch = True
-        cursor_impl._statement._is_query = True
-        self._process_describe_info(buf, cursor, cursor_impl)
-        return cursor
-
-    cdef int _get_bit_vector(self, ReadBuffer buf,
-                             ssize_t num_bytes) except -1:
-        """
-        Gets the bit vector from the buffer and stores it for later use by the
-        row processing code. Since it is possible that the packet buffer may be
-        overwritten by subsequent packet retrieval, the bit vector must be
-        copied. An array is stored and a pointer to the underlying memory is
-        used for performance reasons.
-        """
-        cdef const char_type *ptr = buf.read_raw_bytes(num_bytes)
-        if self.bit_vector_buf is None:
-            self.bit_vector_buf = array.array('B')
-            array.resize(self.bit_vector_buf, num_bytes)
-        self.bit_vector = <const char_type*> self.bit_vector_buf.data.as_chars
-        memcpy(<void*> self.bit_vector, ptr, num_bytes)
-
-    cdef list _get_post_process_fns(self):
-        """
-        Returns a list of functions that need to be run after the database
-        response has been completely received. These functions can be
-        internally defined (for wrapping implementation objects with user
-        facing objects) or user defined (out converters). This prevents
-        multiple executions of functions (reparsing of database responses for
-        older databases without the end of response indicator) or interference
-        with any ongoing database response. Returning a list allows this
-        process to be determined commonly across sync and async in order to
-        avoid duplicating code.
-        """
-        cdef:
-            OracleMetadata metadata
-            uint32_t num_elements
-            uint8_t ora_type_num
-            ThinVarImpl var_impl
-            _PostProcessFn fn
-            list fns = []
-            bint is_async
-            object cls
-        is_async = self.conn_impl._protocol._transport._is_async
-        if self.out_var_impls is not None:
-            for var_impl in self.out_var_impls:
-                if var_impl is None:
-                    continue
-
-                # retain last raw value when not fetching Arrow (for handling
-                # duplicate rows)
-                if self.in_fetch and not self.cursor_impl.fetching_arrow:
-                    var_impl._last_raw_value = \
-                            var_impl._values[self.cursor_impl._last_row_index]
-
-                # determine the number of elements to process, if needed
-                if var_impl.is_array:
-                    num_elements = var_impl.num_elements_in_array
-                else:
-                    num_elements = self.row_index
-
-                # perform post conversion to user-facing objects, if applicable
-                if self.in_fetch:
-                    metadata = var_impl._fetch_metadata
-                else:
-                    metadata = var_impl.metadata
-                ora_type_num = metadata.dbtype._ora_type_num
-                if ora_type_num in (ORA_TYPE_NUM_CLOB,
-                                    ORA_TYPE_NUM_BLOB,
-                                    ORA_TYPE_NUM_BFILE):
-                    cls = PY_TYPE_ASYNC_LOB if is_async else PY_TYPE_LOB
-                    fn = _PostProcessFn.from_info(cls._from_impl, num_elements,
-                                                  var_impl._values)
-                    fns.append(fn)
-
-                # perform post conversion via user out converter, if applicable
-                if var_impl.outconverter is None:
-                    continue
-                fn = _PostProcessFn.from_info(var_impl.outconverter,
-                                              num_elements, var_impl._values,
-                                              var_impl.convert_nulls,
-                                              check_awaitable=True)
-                fns.append(fn)
-
-        return fns
-
-    cdef bint _is_duplicate_data(self, uint32_t column_num):
-        """
-        Returns a boolean indicating if the given column contains data
-        duplicated from the previous row. When duplicate data exists, the
-        server sends a bit vector. Bits that are set indicate that data is sent
-        with the row data; bits that are not set indicate that data should be
-        duplicated from the previous row.
-        """
-        cdef int byte_num, bit_num
-        if self.bit_vector == NULL:
-            return False
-        byte_num = column_num // 8
-        bit_num = column_num % 8
-        return self.bit_vector[byte_num] & (1 << bit_num) == 0
-
-    cdef int _write_bind_params(self, WriteBuffer buf, list params) except -1:
-        cdef:
-            bint has_data = False
-            list bind_var_impls
-            BindInfo bind_info
-        bind_var_impls = []
-        for bind_info in params:
-            if not bind_info._is_return_bind:
-                has_data = True
-            bind_var_impls.append(bind_info._bind_var_impl)
-        self._write_column_metadata(buf, bind_var_impls)
-
-        # write parameter values unless statement contains only returning binds
-        if has_data:
-            for i in range(self.num_execs):
-                buf.write_uint8(TNS_MSG_TYPE_ROW_DATA)
-                self._write_bind_params_row(buf, params, i)
-
-    cdef int _preprocess_query(self) except -1:
-        """
-        Actions that takes place before query data is processed.
-        """
-        cdef:
-            BaseThinCursorImpl cursor_impl = self.cursor_impl
-            Statement statement = cursor_impl._statement
-            object type_handler, conn
-            ThinVarImpl var_impl
-            ssize_t i, num_vals
-            bint uses_metadata
-
-        # set values to indicate the start of a new fetch operation
-        self.in_fetch = True
-        cursor_impl._more_rows_to_fetch = True
-        cursor_impl._buffer_rowcount = cursor_impl._buffer_index = 0
-        self.row_index = 0
-
-        # if no fetch variables exist, nothing further to do at this point; the
-        # processing that follows will take the metadata returned by the server
-        # and use it to create new fetch variables
-        if statement._fetch_var_impls is None:
-            return 0
-
-        # if the type handler set on the cursor or connection does not match
-        # the one that was used during the last fetch, rebuild the fetch
-        # variables in order to take the new type handler into account
-        conn = self.cursor.connection
-        type_handler = cursor_impl._get_output_type_handler(&uses_metadata)
-        if type_handler is not statement._last_output_type_handler \
-                or cursor_impl.schema_impl is not statement._last_schema_impl:
-            for i, var_impl in enumerate(cursor_impl.fetch_var_impls):
-                cursor_impl._create_fetch_var(conn, self.cursor, type_handler,
-                                              uses_metadata, i,
-                                              var_impl._fetch_metadata)
-            statement._last_output_type_handler = type_handler
-            statement._last_schema_impl = cursor_impl.schema_impl
-
-        # create Arrow arrays if fetching arrow is enabled
-        if cursor_impl.fetching_arrow:
-            cursor_impl._create_arrow_arrays()
-
-        # the list of output variables is equivalent to the fetch variables
-        self.out_var_impls = cursor_impl.fetch_var_impls
-
-    cdef int _process_bit_vector(self, ReadBuffer buf) except -1:
-        cdef ssize_t num_bytes
-        buf.read_ub2(&self.num_columns_sent)
-        num_bytes = self.cursor_impl._num_columns // 8
-        if self.cursor_impl._num_columns % 8 > 0:
-            num_bytes += 1
-        self._get_bit_vector(buf, num_bytes)
-
-    cdef object _process_column_data(self, ReadBuffer buf,
-                                     ThinVarImpl var_impl, uint32_t pos):
-        cdef:
-            uint8_t num_bytes, ora_type_num, csfrm
-            ThinDbObjectTypeImpl typ_impl
-            BaseThinCursorImpl cursor_impl
-            object column_value = None
-            ThinDbObjectImpl obj_impl
-            int32_t actual_num_bytes
-            OracleMetadata metadata
-            OracleData data
-            Rowid rowid
-        if self.in_fetch:
-            metadata = var_impl._fetch_metadata
-        else:
-            metadata = var_impl.metadata
-        ora_type_num = metadata.dbtype._ora_type_num
-        csfrm =  metadata.dbtype._csfrm
-        if var_impl.bypass_decode:
-            ora_type_num = ORA_TYPE_NUM_RAW
-        if metadata.buffer_size == 0 and self.in_fetch \
-                and ora_type_num not in (ORA_TYPE_NUM_LONG,
-                                         ORA_TYPE_NUM_LONG_RAW,
-                                         ORA_TYPE_NUM_UROWID):
-            column_value = None             # column is null by describe
-        elif ora_type_num == ORA_TYPE_NUM_ROWID:
-            if not self.in_fetch:
-                column_value = buf.read_str(CS_FORM_IMPLICIT)
-            else:
-                buf.read_ub1(&num_bytes)
-                if num_bytes == 0 or num_bytes == TNS_NULL_LENGTH_INDICATOR:
-                    column_value = None
-                else:
-                    buf.read_rowid(&rowid)
-                    column_value = _encode_rowid(&rowid)
-        elif ora_type_num == ORA_TYPE_NUM_UROWID:
-            if not self.in_fetch:
-                column_value = buf.read_str(CS_FORM_IMPLICIT)
-            else:
-                column_value = buf.read_urowid()
-        elif ora_type_num == ORA_TYPE_NUM_CURSOR:
-            buf.skip_ub1()                  # length (fixed value)
-            if not self.in_fetch:
-                column_value = var_impl._values[pos]
-            column_value = self._create_cursor_from_describe(buf, column_value)
-            cursor_impl = column_value._impl
-            buf.read_ub2(&cursor_impl._statement._cursor_id)
-            if self.in_fetch:
-                cursor_impl._statement._is_nested = True
-        elif ora_type_num in (ORA_TYPE_NUM_CLOB,
-                              ORA_TYPE_NUM_BLOB,
-                              ORA_TYPE_NUM_BFILE):
-            if self.cursor_impl._statement._is_plsql:
-                column_value = var_impl._values[pos]
-            column_value = buf.read_lob_with_length(self.conn_impl,
-                                                    metadata.dbtype,
-                                                    column_value)
-        elif ora_type_num == ORA_TYPE_NUM_JSON:
-            column_value = buf.read_oson()
-        elif ora_type_num == ORA_TYPE_NUM_VECTOR:
-            column_value = buf.read_vector()
-            if self.cursor_impl.fetching_arrow:
-                convert_vector_to_arrow(
-                    var_impl._arrow_array, column_value
-                )
-        elif ora_type_num == ORA_TYPE_NUM_OBJECT:
-            typ_impl = metadata.objtype
-            if typ_impl is None:
-                column_value = buf.read_xmltype(self.conn_impl)
-            else:
-                obj_impl = buf.read_dbobject(typ_impl)
-                if obj_impl is not None:
-                    if self.cursor_impl._statement._is_plsql:
-                        column_value = var_impl._values[pos]
-                    if column_value is not None:
-                        column_value._impl = obj_impl
-                    else:
-                        column_value = PY_TYPE_DB_OBJECT._from_impl(obj_impl)
-        else:
-            column_value = buf.read_oracle_data(
-                metadata, &data, from_dbobject=False,
-                decode_str=self.cursor_impl.fetching_arrow
-            )
-            if metadata.dbtype._csfrm == CS_FORM_NCHAR:
-                buf._caps._check_ncharset_id()
-            if self.cursor_impl.fetching_arrow:
-                convert_oracle_data_to_arrow(
-                    metadata, var_impl.metadata, &data, var_impl._arrow_array
-                )
-            else:
-                column_value = convert_oracle_data_to_python(
-                    metadata, var_impl.metadata, &data,
-                    var_impl._encoding_errors, from_dbobject=False
-                )
-        if not self.in_fetch:
-            buf.read_sb4(&actual_num_bytes)
-            if actual_num_bytes < 0 and ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-                column_value = None
-            elif actual_num_bytes != 0 and column_value is not None:
-                unit_type = "bytes" if isinstance(column_value, bytes) \
-                            else "characters"
-                errors._raise_err(errors.ERR_COLUMN_TRUNCATED,
-                                  col_value_len=len(column_value),
-                                  unit=unit_type, actual_len=actual_num_bytes)
-        elif ora_type_num == ORA_TYPE_NUM_LONG \
-                or ora_type_num == ORA_TYPE_NUM_LONG_RAW:
-            buf.skip_sb4()                  # null indicator
-            buf.skip_ub4()                  # return code
-        return column_value
-
-    cdef int _process_describe_info(self, ReadBuffer buf,
-                                    object cursor,
-                                    BaseThinCursorImpl cursor_impl) except -1:
-        cdef:
-            Statement stmt = cursor_impl._statement
-            list prev_fetch_var_impls
-            object type_handler, conn
-            OracleMetadata metadata
-            uint32_t num_bytes, i
-            bint uses_metadata
-            str message
-        buf.skip_ub4()                      # max row size
-        buf.read_ub4(&cursor_impl._num_columns)
-        prev_fetch_var_impls = stmt._fetch_var_impls
-        cursor_impl._init_fetch_vars(cursor_impl._num_columns)
-        if cursor_impl._num_columns > 0:
-            buf.skip_ub1()
-        type_handler = cursor_impl._get_output_type_handler(&uses_metadata)
-        conn = self.cursor.connection
-        for i in range(cursor_impl._num_columns):
-            metadata = self._process_metadata(buf)
-            if prev_fetch_var_impls is not None \
-                    and i < len(prev_fetch_var_impls):
-                self._adjust_metadata(prev_fetch_var_impls[i], metadata)
-            if metadata.dbtype._ora_type_num in (ORA_TYPE_NUM_BLOB,
-                                                 ORA_TYPE_NUM_CLOB,
-                                                 ORA_TYPE_NUM_JSON,
-                                                 ORA_TYPE_NUM_VECTOR):
-                stmt._requires_define = True
-                stmt._no_prefetch = True
-            cursor_impl._create_fetch_var(conn, self.cursor, type_handler,
-                                          uses_metadata, i, metadata)
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            buf.skip_raw_bytes_chunked()    # current date
-        buf.skip_ub4()                      # dcbflag
-        buf.skip_ub4()                      # dcbmdbz
-        buf.skip_ub4()                      # dcbmnpr
-        buf.skip_ub4()                      # dcbmxpr
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            buf.skip_raw_bytes_chunked()    # dcbqcky
-        stmt._fetch_metadata = cursor_impl.fetch_metadata
-        stmt._fetch_vars = cursor_impl.fetch_vars
-        stmt._fetch_var_impls = cursor_impl.fetch_var_impls
-        stmt._num_columns = cursor_impl._num_columns
-        stmt._last_output_type_handler = type_handler
-        stmt._last_schema_impl = cursor_impl.schema_impl
-
-    cdef int _process_error_info(self, ReadBuffer buf) except -1:
-        cdef:
-            BaseThinCursorImpl cursor_impl = self.cursor_impl
-            BaseThinConnImpl conn_impl = self.conn_impl
-            object exc_type
-        Message._process_error_info(self, buf)
-        if self.error_info.cursor_id != 0:
-            cursor_impl._statement._cursor_id = self.error_info.cursor_id
-        if not cursor_impl._statement._is_plsql and not self.in_fetch:
-            cursor_impl.rowcount = self.error_info.rowcount
-        elif self.in_fetch and self.row_index > 0:
-            cursor_impl._statement._requires_define = False
-        cursor_impl._lastrowid = self.error_info.rowid
-        cursor_impl._batcherrors = self.error_info.batcherrors
-        if self.batcherrors and cursor_impl._batcherrors is None:
-            cursor_impl._batcherrors = []
-        if self.error_info.num == TNS_ERR_NO_DATA_FOUND and self.in_fetch:
-            self.error_info.num = 0
-            cursor_impl._more_rows_to_fetch = False
-            cursor_impl._last_row_index = 0
-            cursor_impl._statement._requires_define = False
-            self.error_occurred = False
-        elif self.error_info.num == TNS_ERR_ARRAY_DML_ERRORS:
-            self.error_info.num = 0
-            self.error_occurred = False
-        elif self.retry:
-            self.retry = False
-        elif cursor_impl._statement._is_query \
-                and self.error_info.num in (TNS_ERR_VAR_NOT_IN_SELECT_LIST,
-                                            TNS_ERR_INCONSISTENT_DATA_TYPES):
-            self.retry = True
-            conn_impl._statement_cache.clear_cursor(cursor_impl._statement)
-        elif self.error_info.num != 0 and self.error_info.cursor_id != 0:
-            if self.error_info.num not in errors.ERR_INTEGRITY_ERROR_CODES:
-                conn_impl._statement_cache.clear_cursor(cursor_impl._statement)
-
-    cdef int _process_implicit_result(self, ReadBuffer buf) except -1:
-        cdef:
-            BaseThinCursorImpl child_cursor_impl
-            uint32_t i, num_results
-            object child_cursor
-            uint8_t num_bytes
-        self.cursor_impl._implicit_resultsets = []
-        buf.read_ub4(&num_results)
-        for i in range(num_results):
-            buf.read_ub1(&num_bytes)
-            buf.skip_raw_bytes(num_bytes)
-            child_cursor = self._create_cursor_from_describe(buf)
-            child_cursor_impl = child_cursor._impl
-            buf.read_ub2(&child_cursor_impl._statement._cursor_id)
-            self.cursor_impl._implicit_resultsets.append(child_cursor)
-
-    cdef int _process_io_vector(self, ReadBuffer buf) except -1:
-        """
-        An I/O vector is sent by the database in response to a PL/SQL execute.
-        It indicates whether binds are IN only, IN/OUT or OUT only.
-        """
-        cdef:
-            uint16_t i, num_bytes, temp16
-            uint32_t temp32, num_binds
-            BindInfo bind_info
-        buf.skip_ub1()                      # flag
-        buf.read_ub2(&temp16)               # num requests
-        buf.read_ub4(&temp32)               # num iters
-        num_binds = temp32 * 256 + temp16
-        buf.skip_ub4()                      # num iters this time
-        buf.skip_ub2()                      # uac buffer length
-        buf.read_ub2(&num_bytes)            # bit vector for fast fetch
-        if num_bytes > 0:
-            buf.skip_raw_bytes(num_bytes)
-        buf.read_ub2(&num_bytes)            # rowid
-        if num_bytes > 0:
-            buf.skip_raw_bytes(num_bytes)
-        self.out_var_impls = []
-        for i in range(num_binds):          # bind directions
-            bind_info = self.cursor_impl._statement._bind_info_list[i]
-            buf.read_ub1(&bind_info.bind_dir)
-            if bind_info.bind_dir == TNS_BIND_DIR_INPUT:
-                continue
-            self.out_var_impls.append(bind_info._bind_var_impl)
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        if message_type == TNS_MSG_TYPE_ROW_HEADER:
-            self._process_row_header(buf)
-        elif message_type == TNS_MSG_TYPE_ROW_DATA:
-            self._process_row_data(buf)
-        elif message_type == TNS_MSG_TYPE_FLUSH_OUT_BINDS:
-            self.flush_out_binds = True
-            self.end_of_response = True
-        elif message_type == TNS_MSG_TYPE_DESCRIBE_INFO:
-            buf.skip_raw_bytes_chunked()
-            self._process_describe_info(buf, self.cursor, self.cursor_impl)
-            self.out_var_impls = self.cursor_impl.fetch_var_impls
-        elif message_type == TNS_MSG_TYPE_ERROR:
-            self._process_error_info(buf)
-        elif message_type == TNS_MSG_TYPE_BIT_VECTOR:
-            self._process_bit_vector(buf)
-        elif message_type == TNS_MSG_TYPE_IO_VECTOR:
-            self._process_io_vector(buf)
-        elif message_type == TNS_MSG_TYPE_IMPLICIT_RESULTSET:
-            self._process_implicit_result(buf)
-        else:
-            Message._process_message(self, buf, message_type)
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        cdef:
-            uint16_t num_params, num_bytes
-            uint32_t num_rows, i
-            uint64_t rowcount
-            bytes key_value
-            list rowcounts
-        buf.read_ub2(&num_params)           # al8o4l (ignored)
-        for i in range(num_params):
-            buf.skip_ub4()
-        buf.read_ub2(&num_bytes)            # al8txl (ignored)
-        if num_bytes > 0:
-            buf.skip_raw_bytes(num_bytes)
-        buf.read_ub2(&num_params)           # num key/value pairs
-        self._process_keyword_value_pairs(buf, num_params)
-        buf.read_ub2(&num_bytes)            # registration
-        if num_bytes > 0:
-            buf.skip_raw_bytes(num_bytes)
-        if self.arraydmlrowcounts:
-            buf.read_ub4(&num_rows)
-            rowcounts = self.cursor_impl._dmlrowcounts = []
-            for i in range(num_rows):
-                buf.read_ub8(&rowcount)
-                rowcounts.append(rowcount)
-
-    cdef int _process_row_data(self, ReadBuffer buf) except -1:
-        cdef:
-            uint32_t num_rows, pos
-            ThinVarImpl var_impl
-            ssize_t i, j
-            object value
-            list values
-        for i, var_impl in enumerate(self.out_var_impls):
-            if var_impl.is_array:
-                buf.read_ub4(&var_impl.num_elements_in_array)
-                for pos in range(var_impl.num_elements_in_array):
-                    value = self._process_column_data(buf, var_impl, pos)
-                    var_impl._values[pos] = value
-            elif self.cursor_impl._statement._is_returning:
-                buf.read_ub4(&num_rows)
-                values = [None] * num_rows
-                for j in range(num_rows):
-                    values[j] = self._process_column_data(buf, var_impl, j)
-                var_impl._values[self.row_index] = values
-                var_impl._has_returned_data = True
-            elif self.cursor_impl.fetching_arrow:
-                if self._is_duplicate_data(i):
-                    var_impl._arrow_array.append_last_value(
-                        var_impl._last_arrow_array
-                    )
-                else:
-                    self._process_column_data(buf, var_impl, self.row_index)
-                var_impl._last_arrow_array = None
-            elif self._is_duplicate_data(i):
-                if self.row_index == 0 and var_impl.outconverter is not None:
-                    value = var_impl._last_raw_value
-                else:
-                    value = var_impl._values[self.cursor_impl._last_row_index]
-                var_impl._values[self.row_index] = value
-            else:
-                value = self._process_column_data(buf, var_impl,
-                                                  self.row_index)
-                var_impl._values[self.row_index] = value
-        self.row_index += 1
-        if self.in_fetch:
-            self.cursor_impl._last_row_index = self.row_index - 1
-            self.cursor_impl._buffer_rowcount = self.row_index
-            self.bit_vector = NULL
-        self.on_row_completed()
-
-    cdef int _process_row_header(self, ReadBuffer buf) except -1:
-        cdef uint32_t num_bytes
-        buf.skip_ub1()                      # flags
-        buf.skip_ub2()                      # num requests
-        buf.skip_ub4()                      # iteration number
-        buf.skip_ub4()                      # num iters
-        buf.skip_ub2()                      # buffer length
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            buf.skip_ub1()                  # skip repeated length
-            self._get_bit_vector(buf, num_bytes)
-        buf.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            buf.skip_raw_bytes_chunked()    # rxhrid
-
-    cdef int _write_column_metadata(self, WriteBuffer buf,
-                                    list bind_var_impls) except -1:
-        cdef:
-            uint32_t buffer_size, cont_flag, lob_prefetch_length
-            ThinDbObjectTypeImpl typ_impl
-            uint8_t ora_type_num, flag
-            OracleMetadata metadata
-            ThinVarImpl var_impl
-        for var_impl in bind_var_impls:
-            metadata = var_impl.metadata
-            ora_type_num = metadata.dbtype._ora_type_num
-            buffer_size = metadata.buffer_size
-            if ora_type_num in (ORA_TYPE_NUM_ROWID, ORA_TYPE_NUM_UROWID):
-                ora_type_num = ORA_TYPE_NUM_VARCHAR
-                buffer_size = TNS_MAX_UROWID_LENGTH
-            flag = TNS_BIND_USE_INDICATORS
-            if var_impl.is_array:
-                flag |= TNS_BIND_ARRAY
-            cont_flag = 0
-            lob_prefetch_length = 0
-            if ora_type_num in (ORA_TYPE_NUM_BLOB,
-                                ORA_TYPE_NUM_CLOB):
-                cont_flag = TNS_LOB_PREFETCH_FLAG
-            elif ora_type_num == ORA_TYPE_NUM_JSON:
-                cont_flag = TNS_LOB_PREFETCH_FLAG
-                buffer_size = lob_prefetch_length = TNS_JSON_MAX_LENGTH
-            elif ora_type_num == ORA_TYPE_NUM_VECTOR:
-                cont_flag = TNS_LOB_PREFETCH_FLAG
-                buffer_size = lob_prefetch_length = TNS_VECTOR_MAX_LENGTH
-            buf.write_uint8(ora_type_num)
-            buf.write_uint8(flag)
-            # precision and scale are always written as zero as the server
-            # expects that and complains if any other value is sent!
-            buf.write_uint8(0)
-            buf.write_uint8(0)
-            buf.write_ub4(buffer_size)
-            if var_impl.is_array:
-                buf.write_ub4(var_impl.num_elements)
-            else:
-                buf.write_ub4(0)            # max num elements
-            buf.write_ub8(cont_flag)
-            if metadata.objtype is not None:
-                typ_impl = metadata.objtype
-                buf.write_ub4(len(typ_impl.oid))
-                buf.write_bytes_with_length(typ_impl.oid)
-                buf.write_ub4(typ_impl.version)
-            else:
-                buf.write_ub4(0)            # OID
-                buf.write_ub2(0)            # version
-            if metadata.dbtype._csfrm != 0:
-                buf.write_ub2(TNS_CHARSET_UTF8)
-            else:
-                buf.write_ub2(0)
-            buf.write_uint8(metadata.dbtype._csfrm)
-            buf.write_ub4(lob_prefetch_length)  # max chars (LOB prefetch)
-            if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_12_2:
-                buf.write_ub4(0)            # oaccolid
-
-    cdef int _write_bind_params_column(self, WriteBuffer buf,
-                                       ThinVarImpl var_impl,
-                                       uint32_t offset) except -1:
-        cdef:
-            ThinDbObjectTypeImpl typ_impl
-            BaseThinCursorImpl cursor_impl
-            BaseThinLobImpl lob_impl
-            OracleMetadata metadata
-            uint8_t ora_type_num
-            uint32_t num_bytes
-            bytes temp_bytes
-            OracleData data
-            bint is_null
-            object value
-        metadata = var_impl.metadata
-        if var_impl._arrow_array is not None:
-            value = convert_arrow_to_oracle_data(metadata, &data,
-                                                 var_impl._arrow_array, offset)
-        else:
-            value = convert_python_to_oracle_data(metadata, &data,
-                                                  var_impl._values[offset])
-        ora_type_num = metadata.dbtype._ora_type_num
-        if data.is_null:
-            if ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-                buf.write_uint8(TNS_ESCAPE_CHAR)
-                buf.write_uint8(1)
-            elif ora_type_num == ORA_TYPE_NUM_OBJECT:
-                buf.write_ub4(0)                # TOID
-                buf.write_ub4(0)                # OID
-                buf.write_ub4(0)                # snapshot
-                buf.write_ub2(0)                # version
-                buf.write_ub4(0)                # packed data length
-                buf.write_ub4(TNS_OBJ_TOP_LEVEL)    # flags
-            else:
-                buf.write_uint8(0)
-        elif ora_type_num in (ORA_TYPE_NUM_VARCHAR,
-                              ORA_TYPE_NUM_CHAR,
-                              ORA_TYPE_NUM_LONG,
-                              ORA_TYPE_NUM_RAW,
-                              ORA_TYPE_NUM_LONG_RAW):
-            buf._write_raw_bytes_and_length(data.buffer.as_raw_bytes.ptr,
-                                            data.buffer.as_raw_bytes.num_bytes)
-        elif ora_type_num == ORA_TYPE_NUM_NUMBER \
-                or ora_type_num == ORA_TYPE_NUM_BINARY_INTEGER:
-            buf.write_oracle_number(value)
-        elif ora_type_num == ORA_TYPE_NUM_DATE \
-                or ora_type_num == ORA_TYPE_NUM_TIMESTAMP \
-                or ora_type_num == ORA_TYPE_NUM_TIMESTAMP_TZ \
-                or ora_type_num == ORA_TYPE_NUM_TIMESTAMP_LTZ:
-            buf.write_oracle_date(value, metadata.dbtype._buffer_size_factor)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            buf.write_binary_double(data.buffer.as_double)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            buf.write_binary_float(data.buffer.as_float)
-        elif ora_type_num == ORA_TYPE_NUM_CURSOR:
-            cursor_impl = value._impl
-            if cursor_impl is None:
-                errors._raise_err(errors.ERR_CURSOR_NOT_OPEN)
-            if cursor_impl._statement is None:
-                cursor_impl._statement = self.conn_impl._get_statement()
-            if cursor_impl._statement._cursor_id == 0:
-                buf.write_uint8(1)
-                buf.write_uint8(0)
-            else:
-                buf.write_ub4(1)
-                buf.write_ub4(cursor_impl._statement._cursor_id)
-            cursor_impl.statement = None
-        elif ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-            buf.write_bool(data.buffer.as_bool)
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-            buf.write_interval_ds(value)
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_YM:
-            buf.write_interval_ym(value)
-        elif ora_type_num in (
-                ORA_TYPE_NUM_BLOB,
-                ORA_TYPE_NUM_CLOB,
-                ORA_TYPE_NUM_BFILE
-            ):
-            buf.write_lob_with_length(value._impl)
-        elif ora_type_num in (ORA_TYPE_NUM_ROWID, ORA_TYPE_NUM_UROWID):
-            temp_bytes = (<str> value).encode()
-            buf.write_bytes_with_length(temp_bytes)
-        elif ora_type_num == ORA_TYPE_NUM_OBJECT:
-            buf.write_dbobject(value._impl)
-        elif ora_type_num == ORA_TYPE_NUM_JSON:
-            buf.write_oson(value, self.conn_impl._oson_max_fname_size)
-        elif ora_type_num == ORA_TYPE_NUM_VECTOR:
-            buf.write_vector(value)
-        else:
-            errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                              name=metadata.dbtype.name)
-
-    cdef int _write_bind_params_row(self, WriteBuffer buf, list params,
-                                    uint32_t pos) except -1:
-        """
-        Write a row of bind parameters. Note that non-LONG values are written
-        first followed by any LONG values.
-        """
-        cdef:
-            uint32_t i, num_elements, offset = self.offset
-            bint found_long = False
-            OracleMetadata metadata
-            ThinVarImpl var_impl
-            BindInfo bind_info
-        for bind_info in params:
-            if bind_info._is_return_bind:
-                continue
-            var_impl = bind_info._bind_var_impl
-            metadata = var_impl.metadata
-            if var_impl.is_array:
-                num_elements = var_impl.num_elements_in_array
-                buf.write_ub4(num_elements)
-                for i in range(num_elements):
-                    self._write_bind_params_column(buf, var_impl, i)
-            else:
-                if not self.cursor_impl._statement._is_plsql \
-                        and metadata.buffer_size > buf._caps.max_string_size:
-                    found_long = True
-                    continue
-                self._write_bind_params_column(buf, var_impl, pos + offset)
-        if found_long:
-            for bind_info in params:
-                if bind_info._is_return_bind:
-                    continue
-                var_impl = bind_info._bind_var_impl
-                metadata = var_impl.metadata
-                if metadata.buffer_size <= buf._caps.max_string_size:
-                    continue
-                self._write_bind_params_column(buf, var_impl, pos + offset)
-
-    cdef int on_out_of_packets(self) except -1:
-        """
-        Called when an OufOfPackets exception is raised indicating that further
-        packets are required to continue processing of this message.
-        """
-        cdef ThinVarImpl var_impl
-
-        # when fetching Arrow data, if the column has already been processed
-        # and no saved array already exists, the array is saved so that
-        # subsequent processing will not append to the array further; once the
-        # complete row has been processed, the saved arrays are restored and
-        # processing continues
-        if self.cursor_impl.fetching_arrow:
-            for var_impl in self.cursor_impl.fetch_var_impls:
-                if var_impl._saved_arrow_array is not None:
-                    continue
-                elif var_impl._arrow_array.arrow_array.length > self.row_index:
-                    var_impl._saved_arrow_array = var_impl._arrow_array
-                    var_impl._arrow_array = None
-                    var_impl._create_arrow_array()
-
-    cdef int on_row_completed(self) except -1:
-        """
-        Called when a row has been successfully completed. This allows for any
-        saved Arrow arrays to be restored.
-        """
-        cdef ThinVarImpl var_impl
-        if self.cursor_impl.fetching_arrow:
-            for var_impl in self.cursor_impl.fetch_var_impls:
-                if var_impl._saved_arrow_array is not None:
-                    var_impl._arrow_array = var_impl._saved_arrow_array
-                    var_impl._saved_arrow_array = None
-
-    cdef int postprocess(self) except -1:
-        """
-        Run any variable out converter functions on all non-null values that
-        were returned in the current database response. This must be done
-        independently since the out converter function may itself invoke a
-        database round-trip.
-        """
-        cdef:
-            object value, element_value
-            _PostProcessFn fn
-            uint32_t i, j
-        for fn in self._get_post_process_fns():
-            for i in range(fn.num_elements):
-                value = fn.values[i]
-                if value is None and not fn.convert_nulls:
-                    continue
-                if isinstance(value, list):
-                    for j, element_value in enumerate(value):
-                        if element_value is None and not fn.convert_nulls:
-                            continue
-                        value[j] = fn.fn(element_value)
-                else:
-                    fn.values[i] = fn.fn(value)
-
-    async def postprocess_async(self):
-        """
-        Run any variable out converter functions on all non-null values that
-        were returned in the current database response. This must be done
-        independently since the out converter function may itself invoke a
-        database round-trip.
-        """
-        cdef:
-            object value, element_value
-            _PostProcessFn fn
-            uint32_t i, j
-        for fn in self._get_post_process_fns():
-            for i in range(fn.num_elements):
-                value = fn.values[i]
-                if value is None and not fn.convert_nulls:
-                    continue
-                if isinstance(value, list):
-                    for j, element_value in enumerate(value):
-                        if element_value is None and not fn.convert_nulls:
-                            continue
-                        element_value = fn.fn(element_value)
-                        if fn.check_awaitable \
-                                and inspect.isawaitable(element_value):
-                            element_value = await element_value
-                        value[j] = element_value
-                else:
-                    value = fn.fn(value)
-                    if fn.check_awaitable and inspect.isawaitable(value):
-                        value = await value
-                    fn.values[i] = value
-
-    cdef int preprocess(self) except -1:
-        cdef:
-            Statement statement = self.cursor_impl._statement
-            BindInfo bind_info
-        if statement._is_returning and not self.parse_only:
-            self.out_var_impls = []
-            for bind_info in statement._bind_info_list:
-                if not bind_info._is_return_bind:
-                    continue
-                self.out_var_impls.append(bind_info._bind_var_impl)
-        elif statement._is_query:
-            self._preprocess_query()
diff --git a/src/oracledb/impl/thin/messages/commit.pyx b/src/oracledb/impl/thin/messages/commit.pyx
deleted file mode 100644
index 2b2bce78..00000000
--- a/src/oracledb/impl/thin/messages/commit.pyx
+++ /dev/null
@@ -1,40 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# commit.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for committing a transaction
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class CommitMessage(Message):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_COMMIT
diff --git a/src/oracledb/impl/thin/messages/connect.pyx b/src/oracledb/impl/thin/messages/connect.pyx
deleted file mode 100644
index d8715039..00000000
--- a/src/oracledb/impl/thin/messages/connect.pyx
+++ /dev/null
@@ -1,139 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# connect.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for the initial connection request
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class ConnectMessage(Message):
-    cdef:
-        bytes connect_string_bytes
-        uint16_t connect_string_len, redirect_data_len
-        bint read_redirect_data_len
-        Description description
-        uint8_t packet_flags
-        str redirect_data
-        str host
-        int port
-
-    cdef int process(self, ReadBuffer buf) except -1:
-        cdef:
-            uint16_t protocol_version, protocol_options
-            const char_type *redirect_data
-            uint32_t flags2 = 0
-            uint8_t flags1
-        if buf._current_packet.packet_type == TNS_PACKET_TYPE_REDIRECT:
-            if not self.read_redirect_data_len:
-                buf.read_uint16be(&self.redirect_data_len)
-                self.read_redirect_data_len = True
-            buf.wait_for_packets_sync()
-            redirect_data = buf.read_raw_bytes(self.redirect_data_len)
-            if self.redirect_data_len > 0:
-                self.redirect_data = \
-                        redirect_data[:self.redirect_data_len].decode()
-            self.read_redirect_data_len = False
-        elif buf._current_packet.packet_type == TNS_PACKET_TYPE_ACCEPT:
-            buf.read_uint16be(&protocol_version)
-            # check if the protocol version supported by the database is high
-            # enough; if not, reject the connection immediately
-            if protocol_version < TNS_VERSION_MIN_ACCEPTED:
-                errors._raise_err(errors.ERR_SERVER_VERSION_NOT_SUPPORTED)
-            buf.read_uint16be(&protocol_options)
-            buf.skip_raw_bytes(10)
-            buf.read_ub1(&flags1)
-            if flags1 & TNS_NSI_NA_REQUIRED:
-                feature = "Native Network Encryption and Data Integrity"
-                errors._raise_not_supported(feature)
-            buf.skip_raw_bytes(9)
-            buf.read_uint32be(&buf._caps.sdu)
-            if protocol_version >= TNS_VERSION_MIN_OOB_CHECK:
-                buf.skip_raw_bytes(5)
-                buf.read_uint32be(&flags2)
-            buf._caps._adjust_for_protocol(protocol_version, protocol_options,
-                                           flags2)
-            buf._transport._full_packet_size = True
-        elif buf._current_packet.packet_type == TNS_PACKET_TYPE_REFUSE:
-            response = self.error_info.message
-            error_code = "unknown"
-            error_code_int = 0
-            if response is not None:
-                pos = response.find("(ERR=")
-                if pos > 0:
-                    end_pos = response.find(")", pos)
-                    if end_pos > 0:
-                        error_code = response[pos + 5:end_pos]
-                        error_code_int = int(error_code)
-            if error_code_int == 0:
-                errors._raise_err(errors.ERR_UNEXPECTED_REFUSE)
-            if error_code_int == TNS_ERR_INVALID_SERVICE_NAME:
-                errors._raise_err(errors.ERR_INVALID_SERVICE_NAME,
-                                  service_name=self.description.service_name,
-                                  host=self.host, port=self.port)
-            elif error_code_int == TNS_ERR_INVALID_SID:
-                errors._raise_err(errors.ERR_INVALID_SID,
-                                  sid=self.description.sid,
-                                  host=self.host, port=self.port)
-            errors._raise_err(errors.ERR_LISTENER_REFUSED_CONNECTION,
-                              error_code=error_code)
-
-    cdef int send(self, WriteBuffer buf) except -1:
-        cdef:
-            uint16_t service_options = TNS_GSO_DONT_CARE
-            uint32_t connect_flags_1 = 0, connect_flags_2 = 0
-            uint8_t nsi_flags = \
-                    TNS_NSI_SUPPORT_SECURITY_RENEG | TNS_NSI_DISABLE_NA
-        if buf._caps.supports_oob:
-            service_options |= TNS_GSO_CAN_RECV_ATTENTION
-            connect_flags_2 |= TNS_CHECK_OOB
-        buf.start_request(TNS_PACKET_TYPE_CONNECT, self.packet_flags)
-        buf.write_uint16be(TNS_VERSION_DESIRED)
-        buf.write_uint16be(TNS_VERSION_MINIMUM)
-        buf.write_uint16be(service_options)
-        buf.write_uint16be(self.description.sdu)
-        buf.write_uint16be(self.description.sdu)
-        buf.write_uint16be(TNS_PROTOCOL_CHARACTERISTICS)
-        buf.write_uint16be(0)               # line turnaround
-        buf.write_uint16be(1)               # value of 1
-        buf.write_uint16be(self.connect_string_len)
-        buf.write_uint16be(74)              # offset to connect data
-        buf.write_uint32be(0)               # max receivable data
-        buf.write_uint8(nsi_flags)
-        buf.write_uint8(nsi_flags)
-        buf.write_uint64be(0)               # obsolete
-        buf.write_uint64be(0)               # obsolete
-        buf.write_uint64be(0)               # obsolete
-        buf.write_uint32be(self.description.sdu)      # SDU (large)
-        buf.write_uint32be(self.description.sdu)      # TDU (large)
-        buf.write_uint32be(connect_flags_1)
-        buf.write_uint32be(connect_flags_2)
-        if self.connect_string_len > TNS_MAX_CONNECT_DATA:
-            buf.end_request()
-            buf.start_request(TNS_PACKET_TYPE_DATA)
-        buf.write_bytes(self.connect_string_bytes)
-        buf.end_request()
diff --git a/src/oracledb/impl/thin/messages/data_types.pyx b/src/oracledb/impl/thin/messages/data_types.pyx
deleted file mode 100644
index ba764247..00000000
--- a/src/oracledb/impl/thin/messages/data_types.pyx
+++ /dev/null
@@ -1,714 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# data_types.pyx
-#
-# Cython file defining the messages sent to the database and the responses that
-# are received by the client for establishing data type formats (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-ctypedef struct DataType:
-    uint16_t data_type
-    uint16_t conv_data_type
-    uint16_t representation
-
-
-# data types not associated with actual data in the database
-cdef enum:
-    TNS_DATA_TYPE_FLOAT = 4
-    TNS_DATA_TYPE_STR = 5
-    TNS_DATA_TYPE_VNU = 6
-    TNS_DATA_TYPE_PDN = 7
-    TNS_DATA_TYPE_VCS = 9
-    TNS_DATA_TYPE_TIDDEF = 10
-    TNS_DATA_TYPE_VBI = 15
-    TNS_DATA_TYPE_UB2 = 25
-    TNS_DATA_TYPE_UB4 = 26
-    TNS_DATA_TYPE_SB1 = 27
-    TNS_DATA_TYPE_SB2 = 28
-    TNS_DATA_TYPE_SB4 = 29
-    TNS_DATA_TYPE_SWORD = 30
-    TNS_DATA_TYPE_UWORD = 31
-    TNS_DATA_TYPE_PTRB = 32
-    TNS_DATA_TYPE_PTRW = 33
-    TNS_DATA_TYPE_OER8 = 34 + 256
-    TNS_DATA_TYPE_FUN = 35 + 256
-    TNS_DATA_TYPE_AUA = 36 + 256
-    TNS_DATA_TYPE_RXH7 = 37 + 256
-    TNS_DATA_TYPE_NA6 = 38 + 256
-    TNS_DATA_TYPE_OAC9 = 39
-    TNS_DATA_TYPE_AMS = 40
-    TNS_DATA_TYPE_BRN = 41
-    TNS_DATA_TYPE_BRP = 42 + 256
-    TNS_DATA_TYPE_BRV = 43 + 256
-    TNS_DATA_TYPE_KVA = 44 + 256
-    TNS_DATA_TYPE_CLS = 45 + 256
-    TNS_DATA_TYPE_CUI = 46 + 256
-    TNS_DATA_TYPE_DFN = 47 + 256
-    TNS_DATA_TYPE_DQR = 48 + 256
-    TNS_DATA_TYPE_DSC = 49 + 256
-    TNS_DATA_TYPE_EXE = 50 + 256
-    TNS_DATA_TYPE_FCH = 51 + 256
-    TNS_DATA_TYPE_GBV = 52 + 256
-    TNS_DATA_TYPE_GEM = 53 + 256
-    TNS_DATA_TYPE_GIV = 54 + 256
-    TNS_DATA_TYPE_OKG = 55 + 256
-    TNS_DATA_TYPE_HMI = 56 + 256
-    TNS_DATA_TYPE_INO = 57 + 256
-    TNS_DATA_TYPE_LNF = 59 + 256
-    TNS_DATA_TYPE_ONT = 60 + 256
-    TNS_DATA_TYPE_OPE = 61 + 256
-    TNS_DATA_TYPE_OSQ = 62 + 256
-    TNS_DATA_TYPE_SFE = 63 + 256
-    TNS_DATA_TYPE_SPF = 64 + 256
-    TNS_DATA_TYPE_VSN = 65 + 256
-    TNS_DATA_TYPE_UD7 = 66 + 256
-    TNS_DATA_TYPE_DSA = 67 + 256
-    TNS_DATA_TYPE_UIN = 68
-    TNS_DATA_TYPE_PIN = 71 + 256
-    TNS_DATA_TYPE_PFN = 72 + 256
-    TNS_DATA_TYPE_PPT = 73 + 256
-    TNS_DATA_TYPE_STO = 75 + 256
-    TNS_DATA_TYPE_ARC = 77 + 256
-    TNS_DATA_TYPE_MRS = 78 + 256
-    TNS_DATA_TYPE_MRT = 79 + 256
-    TNS_DATA_TYPE_MRG = 80 + 256
-    TNS_DATA_TYPE_MRR = 81 + 256
-    TNS_DATA_TYPE_MRC = 82 + 256
-    TNS_DATA_TYPE_VER = 83 + 256
-    TNS_DATA_TYPE_LON2 = 84 + 256
-    TNS_DATA_TYPE_INO2 = 85 + 256
-    TNS_DATA_TYPE_ALL = 86 + 256
-    TNS_DATA_TYPE_UDB = 87 + 256
-    TNS_DATA_TYPE_AQI = 88 + 256
-    TNS_DATA_TYPE_ULB = 89 + 256
-    TNS_DATA_TYPE_ULD = 90 + 256
-    TNS_DATA_TYPE_SLS = 91
-    TNS_DATA_TYPE_SID = 92 + 256
-    TNS_DATA_TYPE_NA7 = 93 + 256
-    TNS_DATA_TYPE_LVC = 94
-    TNS_DATA_TYPE_LVB = 95
-    TNS_DATA_TYPE_AVC = 97
-    TNS_DATA_TYPE_AL7 = 98 + 256
-    TNS_DATA_TYPE_K2RPC = 99 + 256
-    TNS_DATA_TYPE_RDD = 104
-    TNS_DATA_TYPE_XDP = 103 + 256
-    TNS_DATA_TYPE_OSL = 106
-    TNS_DATA_TYPE_OKO8 = 107 + 256
-    TNS_DATA_TYPE_EXT_NAMED = 108
-    TNS_DATA_TYPE_EXT_REF = 110
-    TNS_DATA_TYPE_INT_REF = 111
-    TNS_DATA_TYPE_CFILE = 115
-    TNS_DATA_TYPE_RSET = 116
-    TNS_DATA_TYPE_CWD = 117
-    TNS_DATA_TYPE_OAC122 = 120
-    TNS_DATA_TYPE_UD12 = 124 + 256
-    TNS_DATA_TYPE_AL8 = 125 + 256
-    TNS_DATA_TYPE_LFOP = 126 + 256
-    TNS_DATA_TYPE_FCRT = 127 + 256
-    TNS_DATA_TYPE_DNY = 128 + 256
-    TNS_DATA_TYPE_OPR = 129 + 256
-    TNS_DATA_TYPE_PLS = 130 + 256
-    TNS_DATA_TYPE_XID = 131 + 256
-    TNS_DATA_TYPE_TXN = 132 + 256
-    TNS_DATA_TYPE_DCB = 133 + 256
-    TNS_DATA_TYPE_CCA = 134 + 256
-    TNS_DATA_TYPE_WRN = 135 + 256
-    TNS_DATA_TYPE_TLH = 137 + 256
-    TNS_DATA_TYPE_TOH = 138 + 256
-    TNS_DATA_TYPE_FOI = 139 + 256
-    TNS_DATA_TYPE_SID2 = 140 + 256
-    TNS_DATA_TYPE_TCH = 141 + 256
-    TNS_DATA_TYPE_PII = 142 + 256
-    TNS_DATA_TYPE_PFI = 143 + 256
-    TNS_DATA_TYPE_PPU = 144 + 256
-    TNS_DATA_TYPE_PTE = 145 + 256
-    TNS_DATA_TYPE_CLV = 146
-    TNS_DATA_TYPE_RXH8 = 148 + 256
-    TNS_DATA_TYPE_N12 = 149 + 256
-    TNS_DATA_TYPE_AUTH = 150 + 256
-    TNS_DATA_TYPE_KVAL = 151 + 256
-    TNS_DATA_TYPE_DTR = 152
-    TNS_DATA_TYPE_DUN = 153
-    TNS_DATA_TYPE_DOP = 154
-    TNS_DATA_TYPE_VST = 155
-    TNS_DATA_TYPE_ODT = 156
-    TNS_DATA_TYPE_FGI = 157 + 256
-    TNS_DATA_TYPE_DSY = 158 + 256
-    TNS_DATA_TYPE_DSYR8 = 159 + 256
-    TNS_DATA_TYPE_DSYH8 = 160 + 256
-    TNS_DATA_TYPE_DSYL = 161 + 256
-    TNS_DATA_TYPE_DSYT8 = 162 + 256
-    TNS_DATA_TYPE_DSYV8 = 163 + 256
-    TNS_DATA_TYPE_DSYP = 164 + 256
-    TNS_DATA_TYPE_DSYF = 165 + 256
-    TNS_DATA_TYPE_DSYK = 166 + 256
-    TNS_DATA_TYPE_DSYY = 167 + 256
-    TNS_DATA_TYPE_DSYQ = 168 + 256
-    TNS_DATA_TYPE_DSYC = 169 + 256
-    TNS_DATA_TYPE_DSYA = 170 + 256
-    TNS_DATA_TYPE_OT8 = 171 + 256
-    TNS_DATA_TYPE_DOL = 172
-    TNS_DATA_TYPE_DSYTY = 173 + 256
-    TNS_DATA_TYPE_AQE = 174 + 256
-    TNS_DATA_TYPE_KV = 175 + 256
-    TNS_DATA_TYPE_AQD = 176 + 256
-    TNS_DATA_TYPE_AQ8 = 177 + 256
-    TNS_DATA_TYPE_TIME = 178
-    TNS_DATA_TYPE_TIME_TZ = 179
-    TNS_DATA_TYPE_EDATE = 184
-    TNS_DATA_TYPE_ETIME = 185
-    TNS_DATA_TYPE_ETTZ = 186
-    TNS_DATA_TYPE_ESTAMP = 187
-    TNS_DATA_TYPE_ESTZ = 188
-    TNS_DATA_TYPE_EIYM = 189
-    TNS_DATA_TYPE_EIDS = 190
-    TNS_DATA_TYPE_RFS = 193 + 256
-    TNS_DATA_TYPE_RXH10 = 194 + 256
-    TNS_DATA_TYPE_DCLOB = 195
-    TNS_DATA_TYPE_DBLOB = 196
-    TNS_DATA_TYPE_DBFILE = 197
-    TNS_DATA_TYPE_DJSON = 198
-    TNS_DATA_TYPE_KPN = 198 + 256
-    TNS_DATA_TYPE_KPDNR = 199 + 256
-    TNS_DATA_TYPE_DSYD = 200 + 256
-    TNS_DATA_TYPE_DSYS = 201 + 256
-    TNS_DATA_TYPE_DSYR = 202 + 256
-    TNS_DATA_TYPE_DSYH = 203 + 256
-    TNS_DATA_TYPE_DSYT = 204 + 256
-    TNS_DATA_TYPE_DSYV = 205 + 256
-    TNS_DATA_TYPE_AQM = 206 + 256
-    TNS_DATA_TYPE_OER11 = 207 + 256
-    TNS_DATA_TYPE_AQL = 210 + 256
-    TNS_DATA_TYPE_OTC = 211 + 256
-    TNS_DATA_TYPE_KFNO = 212 + 256
-    TNS_DATA_TYPE_KFNP = 213 + 256
-    TNS_DATA_TYPE_KGT8 = 214 + 256
-    TNS_DATA_TYPE_RASB4 = 215 + 256
-    TNS_DATA_TYPE_RAUB2 = 216 + 256
-    TNS_DATA_TYPE_RAUB1 = 217 + 256
-    TNS_DATA_TYPE_RATXT = 218 + 256
-    TNS_DATA_TYPE_RSSB4 = 219 + 256
-    TNS_DATA_TYPE_RSUB2 = 220 + 256
-    TNS_DATA_TYPE_RSUB1 = 221 + 256
-    TNS_DATA_TYPE_RSTXT = 222 + 256
-    TNS_DATA_TYPE_RIDL = 223 + 256
-    TNS_DATA_TYPE_GLRDD = 224 + 256
-    TNS_DATA_TYPE_GLRDG = 225 + 256
-    TNS_DATA_TYPE_GLRDC = 226 + 256
-    TNS_DATA_TYPE_OKO = 227 + 256
-    TNS_DATA_TYPE_DPP = 228 + 256
-    TNS_DATA_TYPE_DPLS = 229 + 256
-    TNS_DATA_TYPE_DPMOP = 230 + 256
-    TNS_DATA_TYPE_ESITZ = 232
-    TNS_DATA_TYPE_UB8 = 233
-    TNS_DATA_TYPE_STAT = 234 + 256
-    TNS_DATA_TYPE_RFX = 235 + 256
-    TNS_DATA_TYPE_FAL = 236 + 256
-    TNS_DATA_TYPE_CKV = 237 + 256
-    TNS_DATA_TYPE_DRCX = 238 + 256
-    TNS_DATA_TYPE_KGH = 239 + 256
-    TNS_DATA_TYPE_AQO = 240 + 256
-    TNS_DATA_TYPE_PNTY = 241
-    TNS_DATA_TYPE_OKGT = 242 + 256
-    TNS_DATA_TYPE_KPFC = 243 + 256
-    TNS_DATA_TYPE_FE2 = 244 + 256
-    TNS_DATA_TYPE_SPFP = 245 + 256
-    TNS_DATA_TYPE_DPULS = 246 + 256
-    TNS_DATA_TYPE_AQA = 253 + 256
-    TNS_DATA_TYPE_KPBF = 254 + 256
-    TNS_DATA_TYPE_TSM = 513
-    TNS_DATA_TYPE_MSS = 514
-    TNS_DATA_TYPE_KPC = 516
-    TNS_DATA_TYPE_CRS = 517
-    TNS_DATA_TYPE_KKS = 518
-    TNS_DATA_TYPE_KSP = 519
-    TNS_DATA_TYPE_KSPTOP = 520
-    TNS_DATA_TYPE_KSPVAL = 521
-    TNS_DATA_TYPE_PSS = 522
-    TNS_DATA_TYPE_NLS = 523
-    TNS_DATA_TYPE_ALS = 524
-    TNS_DATA_TYPE_KSDEVTVAL = 525
-    TNS_DATA_TYPE_KSDEVTTOP = 526
-    TNS_DATA_TYPE_KPSPP = 527
-    TNS_DATA_TYPE_KOL = 528
-    TNS_DATA_TYPE_LST = 529
-    TNS_DATA_TYPE_ACX = 530
-    TNS_DATA_TYPE_SCS = 531
-    TNS_DATA_TYPE_RXH = 532
-    TNS_DATA_TYPE_KPDNS = 533
-    TNS_DATA_TYPE_KPDCN = 534
-    TNS_DATA_TYPE_KPNNS = 535
-    TNS_DATA_TYPE_KPNCN = 536
-    TNS_DATA_TYPE_KPS = 537
-    TNS_DATA_TYPE_APINF = 538
-    TNS_DATA_TYPE_TEN = 539
-    TNS_DATA_TYPE_XSSCS = 540
-    TNS_DATA_TYPE_XSSSO = 541
-    TNS_DATA_TYPE_XSSAO = 542
-    TNS_DATA_TYPE_KSRPC = 543
-    TNS_DATA_TYPE_KVL = 560
-    TNS_DATA_TYPE_SESSGET = 563
-    TNS_DATA_TYPE_SESSREL = 564
-    TNS_DATA_TYPE_XSSDEF = 565
-    TNS_DATA_TYPE_PDQCINV = 572
-    TNS_DATA_TYPE_PDQIDC = 573
-    TNS_DATA_TYPE_KPDQCSTA = 574
-    TNS_DATA_TYPE_KPRS = 575
-    TNS_DATA_TYPE_KPDQIDC = 576
-    TNS_DATA_TYPE_RTSTRM = 578
-    TNS_DATA_TYPE_SESSRET = 579
-    TNS_DATA_TYPE_SCN6 = 580
-    TNS_DATA_TYPE_KECPA = 581
-    TNS_DATA_TYPE_KECPP = 582
-    TNS_DATA_TYPE_SXA = 583
-    TNS_DATA_TYPE_KVARR = 584
-    TNS_DATA_TYPE_KPNGN = 585
-    TNS_DATA_TYPE_XSNSOP = 590
-    TNS_DATA_TYPE_XSATTR = 591
-    TNS_DATA_TYPE_XSNS = 592
-    TNS_DATA_TYPE_TXT = 593
-    TNS_DATA_TYPE_XSSESSNS = 594
-    TNS_DATA_TYPE_XSATTOP = 595
-    TNS_DATA_TYPE_XSCREOP = 596
-    TNS_DATA_TYPE_XSDETOP = 597
-    TNS_DATA_TYPE_XSDESOP = 598
-    TNS_DATA_TYPE_XSSETSP = 599
-    TNS_DATA_TYPE_XSSIDP = 600
-    TNS_DATA_TYPE_XSPRIN = 601
-    TNS_DATA_TYPE_XSKVL = 602
-    TNS_DATA_TYPE_XSSSDEF2 = 603
-    TNS_DATA_TYPE_XSNSOP2 = 604
-    TNS_DATA_TYPE_XSNS2 = 605
-    TNS_DATA_TYPE_IMPLRES = 611
-    TNS_DATA_TYPE_OER19 = 612
-    TNS_DATA_TYPE_UB1ARRAY = 613
-    TNS_DATA_TYPE_SESSSTATE = 614
-    TNS_DATA_TYPE_AC_REPLAY = 615
-    TNS_DATA_TYPE_AC_CONT = 616
-    TNS_DATA_TYPE_KPDNREQ = 622
-    TNS_DATA_TYPE_KPDNRNF = 623
-    TNS_DATA_TYPE_KPNGNC = 624
-    TNS_DATA_TYPE_KPNRI = 625
-    TNS_DATA_TYPE_AQENQ = 626
-    TNS_DATA_TYPE_AQDEQ = 627
-    TNS_DATA_TYPE_AQJMS = 628
-    TNS_DATA_TYPE_KPDNRPAY = 629
-    TNS_DATA_TYPE_KPDNRACK = 630
-    TNS_DATA_TYPE_KPDNRMP = 631
-    TNS_DATA_TYPE_KPDNRDQ = 632
-    TNS_DATA_TYPE_CHUNKINFO = 636
-    TNS_DATA_TYPE_SCN = 637
-    TNS_DATA_TYPE_SCN8 = 638
-    TNS_DATA_TYPE_UD21 = 639
-    TNS_DATA_TYPE_TNP = 640
-    TNS_DATA_TYPE_OAC = 646
-    TNS_DATA_TYPE_SESSSIGN = 647
-    TNS_DATA_TYPE_OER = 652
-    TNS_DATA_TYPE_PLEND = 660
-    TNS_DATA_TYPE_PLBGN = 661
-    TNS_DATA_TYPE_UDS = 663
-    TNS_DATA_TYPE_PLOP = 665
-
-
-# data type representations
-cdef enum:
-    TNS_TYPE_REP_NATIVE = 0
-    TNS_TYPE_REP_UNIVERSAL = 1
-    TNS_TYPE_REP_ORACLE = 10
-
-
-cdef DataType[320] DATA_TYPES = [
-    [ORA_TYPE_NUM_VARCHAR, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_NUMBER, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [ORA_TYPE_NUM_LONG, ORA_TYPE_NUM_LONG, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_DATE, ORA_TYPE_NUM_DATE, TNS_TYPE_REP_ORACLE],
-    [ORA_TYPE_NUM_RAW, ORA_TYPE_NUM_RAW, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_LONG_RAW, ORA_TYPE_NUM_LONG_RAW, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UB2, TNS_DATA_TYPE_UB2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UB4, TNS_DATA_TYPE_UB4, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SB1, TNS_DATA_TYPE_SB1, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_SB2, TNS_DATA_TYPE_SB2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SB4, TNS_DATA_TYPE_SB4, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SWORD, TNS_DATA_TYPE_SWORD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UWORD, TNS_DATA_TYPE_UWORD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PTRB, TNS_DATA_TYPE_PTRB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PTRW, TNS_DATA_TYPE_PTRW, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TIDDEF, TNS_DATA_TYPE_TIDDEF, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_ROWID, ORA_TYPE_NUM_ROWID, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AMS, TNS_DATA_TYPE_AMS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_BRN, TNS_DATA_TYPE_BRN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CWD, TNS_DATA_TYPE_CWD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OAC122, TNS_DATA_TYPE_OAC122, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OER8, TNS_DATA_TYPE_OER8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FUN, TNS_DATA_TYPE_FUN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AUA, TNS_DATA_TYPE_AUA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RXH7, TNS_DATA_TYPE_RXH7, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_NA6, TNS_DATA_TYPE_NA6, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_BRP, TNS_DATA_TYPE_BRP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_BRV, TNS_DATA_TYPE_BRV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KVA, TNS_DATA_TYPE_KVA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CLS, TNS_DATA_TYPE_CLS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CUI, TNS_DATA_TYPE_CUI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DFN, TNS_DATA_TYPE_DFN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DQR, TNS_DATA_TYPE_DQR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSC, TNS_DATA_TYPE_DSC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EXE, TNS_DATA_TYPE_EXE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FCH, TNS_DATA_TYPE_FCH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GBV, TNS_DATA_TYPE_GBV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GEM, TNS_DATA_TYPE_GEM, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GIV, TNS_DATA_TYPE_GIV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OKG, TNS_DATA_TYPE_OKG, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_HMI, TNS_DATA_TYPE_HMI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_INO, TNS_DATA_TYPE_INO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_LNF, TNS_DATA_TYPE_LNF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ONT, TNS_DATA_TYPE_ONT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OPE, TNS_DATA_TYPE_OPE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OSQ, TNS_DATA_TYPE_OSQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SFE, TNS_DATA_TYPE_SFE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SPF, TNS_DATA_TYPE_SPF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_VSN, TNS_DATA_TYPE_VSN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UD7, TNS_DATA_TYPE_UD7, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSA, TNS_DATA_TYPE_DSA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PIN, TNS_DATA_TYPE_PIN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PFN, TNS_DATA_TYPE_PFN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PPT, TNS_DATA_TYPE_PPT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_STO, TNS_DATA_TYPE_STO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ARC, TNS_DATA_TYPE_ARC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MRS, TNS_DATA_TYPE_MRS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MRT, TNS_DATA_TYPE_MRT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MRG, TNS_DATA_TYPE_MRG, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MRR, TNS_DATA_TYPE_MRR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MRC, TNS_DATA_TYPE_MRC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_VER, TNS_DATA_TYPE_VER, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_LON2, TNS_DATA_TYPE_LON2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_INO2, TNS_DATA_TYPE_INO2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ALL, TNS_DATA_TYPE_ALL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UDB, TNS_DATA_TYPE_UDB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQI, TNS_DATA_TYPE_AQI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ULB, TNS_DATA_TYPE_ULB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ULD, TNS_DATA_TYPE_ULD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SID, TNS_DATA_TYPE_SID, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_NA7, TNS_DATA_TYPE_NA7, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AL7, TNS_DATA_TYPE_AL7, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_K2RPC, TNS_DATA_TYPE_K2RPC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XDP, TNS_DATA_TYPE_XDP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OKO8, TNS_DATA_TYPE_OKO8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UD12, TNS_DATA_TYPE_UD12, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AL8, TNS_DATA_TYPE_AL8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_LFOP, TNS_DATA_TYPE_LFOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FCRT, TNS_DATA_TYPE_FCRT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DNY, TNS_DATA_TYPE_DNY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OPR, TNS_DATA_TYPE_OPR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PLS, TNS_DATA_TYPE_PLS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XID, TNS_DATA_TYPE_XID, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TXN, TNS_DATA_TYPE_TXN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DCB, TNS_DATA_TYPE_DCB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CCA, TNS_DATA_TYPE_CCA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_WRN, TNS_DATA_TYPE_WRN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TLH, TNS_DATA_TYPE_TLH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TOH, TNS_DATA_TYPE_TOH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FOI, TNS_DATA_TYPE_FOI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SID2, TNS_DATA_TYPE_SID2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TCH, TNS_DATA_TYPE_TCH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PII, TNS_DATA_TYPE_PII, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PFI, TNS_DATA_TYPE_PFI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PPU, TNS_DATA_TYPE_PPU, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PTE, TNS_DATA_TYPE_PTE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RXH8, TNS_DATA_TYPE_RXH8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_N12, TNS_DATA_TYPE_N12, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AUTH, TNS_DATA_TYPE_AUTH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KVAL, TNS_DATA_TYPE_KVAL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FGI, TNS_DATA_TYPE_FGI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSY, TNS_DATA_TYPE_DSY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYR8, TNS_DATA_TYPE_DSYR8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYH8, TNS_DATA_TYPE_DSYH8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYL, TNS_DATA_TYPE_DSYL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYT8, TNS_DATA_TYPE_DSYT8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYV8, TNS_DATA_TYPE_DSYV8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYP, TNS_DATA_TYPE_DSYP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYF, TNS_DATA_TYPE_DSYF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYK, TNS_DATA_TYPE_DSYK, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYY, TNS_DATA_TYPE_DSYY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYQ, TNS_DATA_TYPE_DSYQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYC, TNS_DATA_TYPE_DSYC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYA, TNS_DATA_TYPE_DSYA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OT8, TNS_DATA_TYPE_OT8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYTY, TNS_DATA_TYPE_DSYTY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQE, TNS_DATA_TYPE_AQE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KV, TNS_DATA_TYPE_KV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQD, TNS_DATA_TYPE_AQD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQ8, TNS_DATA_TYPE_AQ8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RFS, TNS_DATA_TYPE_RFS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RXH10, TNS_DATA_TYPE_RXH10, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPN, TNS_DATA_TYPE_KPN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNR, TNS_DATA_TYPE_KPDNR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYD, TNS_DATA_TYPE_DSYD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYS, TNS_DATA_TYPE_DSYS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYR, TNS_DATA_TYPE_DSYR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYH, TNS_DATA_TYPE_DSYH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYT, TNS_DATA_TYPE_DSYT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DSYV, TNS_DATA_TYPE_DSYV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQM, TNS_DATA_TYPE_AQM, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OER11, TNS_DATA_TYPE_OER11, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQL, TNS_DATA_TYPE_AQL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OTC, TNS_DATA_TYPE_OTC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KFNO, TNS_DATA_TYPE_KFNO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KFNP, TNS_DATA_TYPE_KFNP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KGT8, TNS_DATA_TYPE_KGT8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RASB4, TNS_DATA_TYPE_RASB4, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RAUB2, TNS_DATA_TYPE_RAUB2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RAUB1, TNS_DATA_TYPE_RAUB1, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RATXT, TNS_DATA_TYPE_RATXT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RSSB4, TNS_DATA_TYPE_RSSB4, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RSUB2, TNS_DATA_TYPE_RSUB2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RSUB1, TNS_DATA_TYPE_RSUB1, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RSTXT, TNS_DATA_TYPE_RSTXT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RIDL, TNS_DATA_TYPE_RIDL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GLRDD, TNS_DATA_TYPE_GLRDD, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GLRDG, TNS_DATA_TYPE_GLRDG, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_GLRDC, TNS_DATA_TYPE_GLRDC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OKO, TNS_DATA_TYPE_OKO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DPP, TNS_DATA_TYPE_DPP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DPLS, TNS_DATA_TYPE_DPLS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DPMOP, TNS_DATA_TYPE_DPMOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_STAT, TNS_DATA_TYPE_STAT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RFX, TNS_DATA_TYPE_RFX, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FAL, TNS_DATA_TYPE_FAL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CKV, TNS_DATA_TYPE_CKV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DRCX, TNS_DATA_TYPE_DRCX, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KGH, TNS_DATA_TYPE_KGH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQO, TNS_DATA_TYPE_AQO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OKGT, TNS_DATA_TYPE_OKGT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPFC, TNS_DATA_TYPE_KPFC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_FE2, TNS_DATA_TYPE_FE2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SPFP, TNS_DATA_TYPE_SPFP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DPULS, TNS_DATA_TYPE_DPULS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQA, TNS_DATA_TYPE_AQA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPBF, TNS_DATA_TYPE_KPBF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TSM, TNS_DATA_TYPE_TSM, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_MSS, TNS_DATA_TYPE_MSS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPC, TNS_DATA_TYPE_KPC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CRS, TNS_DATA_TYPE_CRS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KKS, TNS_DATA_TYPE_KKS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSP, TNS_DATA_TYPE_KSP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSPTOP, TNS_DATA_TYPE_KSPTOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSPVAL, TNS_DATA_TYPE_KSPVAL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PSS, TNS_DATA_TYPE_PSS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_NLS, TNS_DATA_TYPE_NLS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ALS, TNS_DATA_TYPE_ALS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSDEVTVAL, TNS_DATA_TYPE_KSDEVTVAL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSDEVTTOP, TNS_DATA_TYPE_KSDEVTTOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPSPP, TNS_DATA_TYPE_KPSPP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KOL, TNS_DATA_TYPE_KOL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_LST, TNS_DATA_TYPE_LST, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ACX, TNS_DATA_TYPE_ACX, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SCS, TNS_DATA_TYPE_SCS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RXH, TNS_DATA_TYPE_RXH, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNS, TNS_DATA_TYPE_KPDNS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDCN, TNS_DATA_TYPE_KPDCN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPNNS, TNS_DATA_TYPE_KPNNS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPNCN, TNS_DATA_TYPE_KPNCN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPS, TNS_DATA_TYPE_KPS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_APINF, TNS_DATA_TYPE_APINF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TEN, TNS_DATA_TYPE_TEN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSCS, TNS_DATA_TYPE_XSSCS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSSO, TNS_DATA_TYPE_XSSSO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSAO, TNS_DATA_TYPE_XSSAO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KSRPC, TNS_DATA_TYPE_KSRPC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KVL, TNS_DATA_TYPE_KVL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSDEF, TNS_DATA_TYPE_XSSDEF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PDQCINV, TNS_DATA_TYPE_PDQCINV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PDQIDC, TNS_DATA_TYPE_PDQIDC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDQCSTA, TNS_DATA_TYPE_KPDQCSTA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPRS, TNS_DATA_TYPE_KPRS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDQIDC, TNS_DATA_TYPE_KPDQIDC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RTSTRM, TNS_DATA_TYPE_RTSTRM, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SESSGET, TNS_DATA_TYPE_SESSGET, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SESSREL, TNS_DATA_TYPE_SESSREL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SESSRET, TNS_DATA_TYPE_SESSRET, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SCN6, TNS_DATA_TYPE_SCN6, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KECPA, TNS_DATA_TYPE_KECPA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KECPP, TNS_DATA_TYPE_KECPP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SXA, TNS_DATA_TYPE_SXA, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KVARR, TNS_DATA_TYPE_KVARR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPNGN, TNS_DATA_TYPE_KPNGN, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BINARY_INTEGER, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_FLOAT, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_STR, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_VNU, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_PDN, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_VCS, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_VBI, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OAC9, TNS_DATA_TYPE_OAC9, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UIN, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_SLS, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_LVC, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_LVB, ORA_TYPE_NUM_RAW, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_CHAR, ORA_TYPE_NUM_CHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AVC, ORA_TYPE_NUM_CHAR, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BINARY_FLOAT, ORA_TYPE_NUM_BINARY_FLOAT,
-            TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BINARY_DOUBLE, ORA_TYPE_NUM_BINARY_DOUBLE,
-            TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_CURSOR, ORA_TYPE_NUM_CURSOR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RDD, ORA_TYPE_NUM_ROWID, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OSL, TNS_DATA_TYPE_OSL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EXT_NAMED, ORA_TYPE_NUM_OBJECT, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_OBJECT, ORA_TYPE_NUM_OBJECT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EXT_REF, TNS_DATA_TYPE_INT_REF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_INT_REF, TNS_DATA_TYPE_INT_REF, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_CLOB, ORA_TYPE_NUM_CLOB, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BLOB, ORA_TYPE_NUM_BLOB, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BFILE, ORA_TYPE_NUM_BFILE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CFILE, TNS_DATA_TYPE_CFILE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_RSET, ORA_TYPE_NUM_CURSOR, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_JSON, ORA_TYPE_NUM_JSON, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DJSON, TNS_DATA_TYPE_DJSON, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CLV, TNS_DATA_TYPE_CLV, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DTR, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_DUN, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_DOP, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_VST, ORA_TYPE_NUM_VARCHAR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ODT, ORA_TYPE_NUM_DATE, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_DOL, ORA_TYPE_NUM_NUMBER, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_TIME, TNS_DATA_TYPE_TIME, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TIME_TZ, TNS_DATA_TYPE_TIME_TZ, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_TIMESTAMP, ORA_TYPE_NUM_TIMESTAMP, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_TIMESTAMP_TZ, ORA_TYPE_NUM_TIMESTAMP_TZ,
-            TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_INTERVAL_YM, ORA_TYPE_NUM_INTERVAL_YM,
-            TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_INTERVAL_DS, ORA_TYPE_NUM_INTERVAL_DS,
-            TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EDATE, ORA_TYPE_NUM_DATE, TNS_TYPE_REP_ORACLE],
-    [TNS_DATA_TYPE_ETIME, TNS_DATA_TYPE_ETIME, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ETTZ, TNS_DATA_TYPE_ETTZ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ESTAMP, TNS_DATA_TYPE_ESTAMP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ESTZ, TNS_DATA_TYPE_ESTZ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EIYM, TNS_DATA_TYPE_EIYM, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_EIDS, TNS_DATA_TYPE_EIDS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DCLOB, ORA_TYPE_NUM_CLOB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DBLOB, ORA_TYPE_NUM_BLOB, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_DBFILE, ORA_TYPE_NUM_BFILE, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_UROWID, ORA_TYPE_NUM_UROWID, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_TIMESTAMP_LTZ, ORA_TYPE_NUM_TIMESTAMP_LTZ,
-            TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_ESITZ, ORA_TYPE_NUM_TIMESTAMP_LTZ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UB8, TNS_DATA_TYPE_UB8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PNTY, ORA_TYPE_NUM_OBJECT, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_BOOLEAN, ORA_TYPE_NUM_BOOLEAN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSNSOP, TNS_DATA_TYPE_XSNSOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSATTR, TNS_DATA_TYPE_XSATTR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSNS, TNS_DATA_TYPE_XSNS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UB1ARRAY, TNS_DATA_TYPE_UB1ARRAY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SESSSTATE, TNS_DATA_TYPE_SESSSTATE, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AC_REPLAY, TNS_DATA_TYPE_AC_REPLAY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AC_CONT, TNS_DATA_TYPE_AC_CONT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_IMPLRES, TNS_DATA_TYPE_IMPLRES, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OER19, TNS_DATA_TYPE_OER19, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TXT, TNS_DATA_TYPE_TXT, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSESSNS, TNS_DATA_TYPE_XSSESSNS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSATTOP, TNS_DATA_TYPE_XSATTOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSCREOP, TNS_DATA_TYPE_XSCREOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSDETOP, TNS_DATA_TYPE_XSDETOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSDESOP, TNS_DATA_TYPE_XSDESOP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSETSP, TNS_DATA_TYPE_XSSETSP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSIDP, TNS_DATA_TYPE_XSSIDP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSPRIN, TNS_DATA_TYPE_XSPRIN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSKVL, TNS_DATA_TYPE_XSKVL, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSSSDEF2, TNS_DATA_TYPE_XSSSDEF2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSNSOP2, TNS_DATA_TYPE_XSNSOP2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_XSNS2, TNS_DATA_TYPE_XSNS2, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNREQ, TNS_DATA_TYPE_KPDNREQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNRNF, TNS_DATA_TYPE_KPDNRNF, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPNGNC, TNS_DATA_TYPE_KPNGNC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPNRI, TNS_DATA_TYPE_KPNRI, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQENQ, TNS_DATA_TYPE_AQENQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQDEQ, TNS_DATA_TYPE_AQDEQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_AQJMS, TNS_DATA_TYPE_AQJMS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNRPAY, TNS_DATA_TYPE_KPDNRPAY, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNRACK, TNS_DATA_TYPE_KPDNRACK, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNRMP, TNS_DATA_TYPE_KPDNRMP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_KPDNRDQ, TNS_DATA_TYPE_KPDNRDQ, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SCN, TNS_DATA_TYPE_SCN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SCN8, TNS_DATA_TYPE_SCN8, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_CHUNKINFO, TNS_DATA_TYPE_CHUNKINFO, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UD21, TNS_DATA_TYPE_UD21, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_UDS, TNS_DATA_TYPE_UDS, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_TNP, TNS_DATA_TYPE_TNP, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OER, TNS_DATA_TYPE_OER, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_OAC, TNS_DATA_TYPE_OAC, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_SESSSIGN, TNS_DATA_TYPE_SESSSIGN, TNS_TYPE_REP_UNIVERSAL],
-    [ORA_TYPE_NUM_VECTOR, ORA_TYPE_NUM_VECTOR, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PLEND, TNS_DATA_TYPE_PLEND, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PLBGN, TNS_DATA_TYPE_PLBGN, TNS_TYPE_REP_UNIVERSAL],
-    [TNS_DATA_TYPE_PLOP, TNS_DATA_TYPE_PLOP, TNS_TYPE_REP_UNIVERSAL],
-    [0, 0, 0]
-]
-
-
-@cython.final
-cdef class DataTypesMessage(Message):
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        cdef uint16_t data_type, conv_data_type
-        while True:
-            buf.read_uint16be(&data_type)
-            if data_type == 0:
-                break
-            buf.read_uint16be(&conv_data_type)
-            if conv_data_type != 0:
-                buf.skip_raw_bytes(4)
-        if not buf._caps.supports_end_of_response:
-            self.end_of_response = True
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        cdef:
-            DataType* data_type
-            int i
-
-        # write character set and capabilities
-        buf.write_uint8(TNS_MSG_TYPE_DATA_TYPES)
-        buf.write_uint16le(TNS_CHARSET_UTF8)
-        buf.write_uint16le(TNS_CHARSET_UTF8)
-        buf.write_uint8(TNS_ENCODING_MULTI_BYTE | TNS_ENCODING_CONV_LENGTH)
-        buf.write_bytes_with_length(bytes(buf._caps.compile_caps))
-        buf.write_bytes_with_length(bytes(buf._caps.runtime_caps))
-
-        # write data types
-        i = 0
-        while True:
-            data_type = &DATA_TYPES[i]
-            if data_type.data_type == 0:
-                break
-            i += 1
-            buf.write_uint16be(data_type.data_type)
-            buf.write_uint16be(data_type.conv_data_type)
-            buf.write_uint16be(data_type.representation)
-            buf.write_uint16be(0)
-        buf.write_uint16be(0)
diff --git a/src/oracledb/impl/thin/messages/direct_path_load_stream.pyx b/src/oracledb/impl/thin/messages/direct_path_load_stream.pyx
deleted file mode 100644
index d2a7fb60..00000000
--- a/src/oracledb/impl/thin/messages/direct_path_load_stream.pyx
+++ /dev/null
@@ -1,367 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# direct_path_load_stream.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for sending direct path data to the
-# database (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class DirectPathPiece:
-    cdef:
-        bint is_fast
-        bint is_first
-        bint is_last
-        bint is_split_with_prev
-        bint is_split_with_next
-        uint8_t flags
-        uint8_t num_segments
-        ssize_t length
-        bytes data
-
-    cdef int finalize(self, PieceBuffer buf) except -1:
-        """
-        Finalizes the piece in preparation for writing to the message.
-        """
-        self.length = buf._pos
-        self.data = buf._data[:buf._pos]
-        buf._pos = 0
-        if self.is_first:
-            self.flags |= TNS_DPLS_ROW_HEADER_FIRST
-        elif self.is_split_with_prev:
-            self.flags |= TNS_DPLS_ROW_HEADER_SPLIT_WITH_PREV
-        if self.is_last:
-            self.flags |= TNS_DPLS_ROW_HEADER_LAST
-        elif self.is_split_with_next:
-            self.flags |= TNS_DPLS_ROW_HEADER_SPLIT_WITH_NEXT
-        if self.is_fast_row():
-            self.flags |= TNS_DPLS_ROW_HEADER_FAST_ROW
-            self.flags |= TNS_DPLS_ROW_HEADER_FAST_PIECE
-
-    cdef uint8_t header_length(self):
-        """
-        Returns the length of the piece header.
-        """
-        cdef uint8_t length = 2
-        if self.is_fast_row():
-            length += 2
-        return length
-
-    cdef bint is_fast_row(self):
-        """
-        Returns true if the piece contains all of the data for a row and all of
-        the segments are fast segments.
-        """
-        return self.is_first and self.is_last and self.is_fast
-
-    cdef int write_to_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the piece to the message.
-        """
-        buf.write_uint8(self.flags)
-        if self.is_fast_row():
-            buf.write_uint16be(self.length + self.header_length())
-        buf.write_uint8(self.num_segments)
-        buf.write_raw(self.data, self.length)
-
-
-@cython.final
-cdef class PieceBuffer(Buffer):
-    cdef:
-        DirectPathPiece current_piece
-        uint32_t total_piece_length
-        list pieces
-
-    cdef int _finalize_piece(self) except -1:
-        """
-        Finalizes the piece by adding the data in the buffer and calculating
-        the piece length, then resetting the buffer.
-        """
-        cdef uint64_t new_length
-        self.current_piece.finalize(self)
-        self.pieces.append(self.current_piece)
-        new_length = (<uint64_t> self.total_piece_length) + \
-                self.current_piece.length + self.current_piece.header_length()
-        if new_length > TNS_DPLS_MAX_MESSAGE_SIZE:
-            errors._raise_err(errors.ERR_DPL_TOO_MUCH_DATA)
-        self.total_piece_length = <uint32_t> new_length
-
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1:
-        """
-        Called when the amount of buffer available is less than the amount of
-        data requested. This finalizes the current piece and creates a new one
-        to write to.
-        """
-        self._finalize_piece()
-        self.current_piece = DirectPathPiece.__new__(DirectPathPiece)
-
-    cdef int _write_raw_bytes_and_length(self, const char_type *ptr,
-                                         ssize_t num_bytes) except -1:
-        """
-        Helper function that writes the length in the format required before
-        writing the bytes. It also splits the pieces as needed.
-        """
-        cdef:
-            ssize_t bytes_left = self._max_size - self._pos
-            ssize_t bytes_to_write
-        if num_bytes <= TNS_DPLS_MAX_SHORT_LENGTH:
-            if num_bytes + 1 > bytes_left:
-                self._finalize_piece()
-                self.current_piece = DirectPathPiece.__new__(DirectPathPiece)
-            self.write_uint8(<uint8_t> num_bytes)
-            self.write_raw(ptr, num_bytes)
-            self.current_piece.num_segments += 1
-        else:
-            while num_bytes + 3 > bytes_left:
-                bytes_to_write = bytes_left - 3
-                self.write_uint8(TNS_LONG_LENGTH_INDICATOR)
-                self.write_uint16be(bytes_to_write)
-                self.write_raw(ptr, bytes_to_write)
-                num_bytes -= bytes_to_write
-                bytes_left = self._max_size
-                ptr += bytes_to_write
-                self.current_piece.is_split_with_next = True
-                self.current_piece.num_segments += 1
-                self._finalize_piece()
-                self.current_piece = DirectPathPiece.__new__(DirectPathPiece)
-                self.current_piece.is_split_with_prev = num_bytes > 0
-            if num_bytes > 0:
-                self.current_piece.num_segments += 1
-                self.write_uint8(TNS_LONG_LENGTH_INDICATOR)
-                self.write_uint16be(<uint16_t> num_bytes)
-                self.write_raw(ptr, num_bytes)
-
-    cdef int add_column_value(
-        self,
-        BaseConnImpl conn_impl,
-        OracleMetadata metadata,
-        OracleData *data,
-        object value,
-        uint64_t row_num
-    ):
-        """
-        Adds column data to the piece (or pieces, if the column value cannot
-        fit inside the current piece).
-        """
-        cdef uint8_t ora_type_num
-
-        # check that the number of segments hasn't already reached the maximum
-        # allowable; if it has finalize the current piece and create a new one
-        if self.current_piece.num_segments == 255:
-            self._finalize_piece()
-            self.current_piece = DirectPathPiece.__new__(DirectPathPiece)
-
-        # clear the is_fast flag if the current data type is not one of the
-        # fast types
-        if not metadata.dbtype._is_fast:
-            self.current_piece.is_fast = False
-
-        # write data to the buffer; retain current buffer length in case buffer
-        # needs to be split across pieces
-        ora_type_num = metadata.dbtype._ora_type_num
-        if data.is_null:
-            if not metadata.nulls_allowed:
-                errors._raise_err(errors.ERR_NULLS_NOT_ALLOWED,
-                                  column_name=metadata.name, row_num=row_num)
-            self.write_uint8(TNS_NULL_LENGTH_INDICATOR)
-            self.current_piece.num_segments += 1
-        elif ora_type_num in (ORA_TYPE_NUM_VARCHAR,
-                              ORA_TYPE_NUM_CHAR,
-                              ORA_TYPE_NUM_LONG,
-                              ORA_TYPE_NUM_RAW,
-                              ORA_TYPE_NUM_LONG_RAW):
-            if metadata.max_size > 0 \
-                    and data.buffer.as_raw_bytes.num_bytes > metadata.max_size:
-                errors._raise_err(
-                    errors.ERR_VALUE_TOO_LARGE,
-                    max_size=metadata.max_size,
-                    actual_size=data.buffer.as_raw_bytes.num_bytes,
-                    row_num=row_num,
-                    column_name=metadata.name
-                )
-            self._write_raw_bytes_and_length(
-                data.buffer.as_raw_bytes.ptr,
-                data.buffer.as_raw_bytes.num_bytes
-            )
-        elif ora_type_num == ORA_TYPE_NUM_NUMBER:
-            self.write_oracle_number(value)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_DOUBLE:
-            self.write_binary_double(data.buffer.as_double)
-        elif ora_type_num == ORA_TYPE_NUM_BINARY_FLOAT:
-            self.write_binary_float(data.buffer.as_float)
-        elif ora_type_num in (ORA_TYPE_NUM_DATE,
-                              ORA_TYPE_NUM_TIMESTAMP,
-                              ORA_TYPE_NUM_TIMESTAMP_TZ,
-                              ORA_TYPE_NUM_TIMESTAMP_LTZ):
-            self.write_oracle_date(value, metadata.dbtype._buffer_size_factor)
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_DS:
-            self.write_interval_ds(value)
-        elif ora_type_num == ORA_TYPE_NUM_INTERVAL_YM:
-            self.write_interval_ym(value)
-        elif ora_type_num == ORA_TYPE_NUM_BOOLEAN:
-            self.write_bool(data.buffer.as_bool)
-        elif ora_type_num == ORA_TYPE_NUM_JSON:
-            self.write_oson(value, conn_impl._oson_max_fname_size)
-        elif ora_type_num == ORA_TYPE_NUM_VECTOR:
-            self.write_vector(value)
-        else:
-            errors._raise_err(errors.ERR_DB_TYPE_NOT_SUPPORTED,
-                              name=metadata.dbtype.name)
-
-    cdef int finish_row(self) except -1:
-        """
-        Called when the row is finished. The current piece is finalized.
-        """
-        self.current_piece.is_last = True
-        self._finalize_piece()
-        self.current_piece = None
-
-    cdef int initialize(self) except -1:
-        """
-        Initializes the piece buffer to the maximum size allowed. A list of
-        pieces is maintained and populated as data is written to the buffer.
-        """
-        self._initialize(TNS_DPLS_MAX_PIECE_SIZE)
-        self.pieces = []
-
-    cdef int start_row(self) except -1:
-        """
-        Called when a row is being started. A new piece is created.
-        """
-        self.current_piece = DirectPathPiece.__new__(DirectPathPiece)
-        self.current_piece.is_first = True
-        self.current_piece.is_fast = True
-
-
-@cython.final
-cdef class DirectPathLoadStreamMessage(Message):
-    cdef:
-        uint64_t current_row_num
-        uint32_t total_piece_length
-        uint16_t cursor_id
-        list row_pieces
-
-    cdef int _calculate_pieces(
-        self,
-        BatchLoadManager manager,
-        list column_metadata
-    ) except -1:
-        """
-        Calculates the list of pieces that will be sent to the server. Due to
-        the nature of the protocol, this must be calculated in advance.
-        """
-        cdef:
-            object row = None, col = None
-            ArrowArrayImpl array_impl
-            uint64_t overall_row_num
-            OracleMetadata metadata
-            list all_rows, arrays
-            uint32_t row_num
-            PieceBuffer buf
-            OracleData data
-            ssize_t col_num
-
-        # create buffer used for writing column data
-        buf = PieceBuffer.__new__(PieceBuffer)
-        buf.initialize()
-
-        # acquire information from the manager
-        all_rows = manager._get_all_rows()
-        arrays = manager._get_arrow_arrays()
-
-        # calculate pieces
-        for row_num in range(manager.num_rows):
-            overall_row_num = manager.offset + row_num
-            if all_rows is not None:
-                row = all_rows[overall_row_num]
-            self.current_row_num += 1
-            buf.start_row()
-            for col_num, metadata in enumerate(column_metadata):
-                if all_rows is not None:
-                    col = self.conn_impl._check_value(metadata, row[col_num],
-                                                      NULL)
-                    col = convert_python_to_oracle_data(metadata, &data, col)
-                else:
-                    array_impl = arrays[col_num]
-                    col = convert_arrow_to_oracle_data(
-                        metadata, &data, array_impl, <int64_t> overall_row_num
-                    )
-                buf.add_column_value(self.conn_impl, metadata, &data, col,
-                                     self.current_row_num)
-            buf.finish_row()
-
-        # retain pieces for writing to message
-        self.total_piece_length = buf.total_piece_length
-        self.row_pieces = buf.pieces
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_DIRECT_PATH_LOAD_STREAM
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters sent by the database.
-        """
-        cdef uint16_t num_out_values, i
-        buf.read_ub2(&num_out_values)
-        for i in range(num_out_values):
-            buf.skip_ub4()
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the database.
-        """
-        cdef DirectPathPiece piece
-
-        # write header and initial data
-        self._write_function_code(buf)
-        buf.write_ub2(self.cursor_id)
-        buf.write_uint8(1)                  # pointer (buffer)
-        buf.write_ub4(self.total_piece_length)
-        buf.write_ub4(TNS_DP_STREAM_VERSION)
-        buf.write_uint8(0)                  # pointer (input values)
-        buf.write_ub4(0)                    # number of input values
-        buf.write_uint8(1)                  # pointer (output values)
-        buf.write_uint8(1)                  # pointer (output values length)
-
-        # write all pieces
-        for piece in self.row_pieces:
-            piece.write_to_message(buf)
-
-    cdef int prepare(self,
-        uint16_t cursor_id,
-        BatchLoadManager manager,
-        list column_metadata
-    ):
-        """
-        Prepares the values for writing to the message.
-        """
-        self.cursor_id = cursor_id
-        self._calculate_pieces(manager, column_metadata)
diff --git a/src/oracledb/impl/thin/messages/direct_path_op.pyx b/src/oracledb/impl/thin/messages/direct_path_op.pyx
deleted file mode 100644
index 9f7c7dfa..00000000
--- a/src/oracledb/impl/thin/messages/direct_path_op.pyx
+++ /dev/null
@@ -1,71 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# direct_path_op.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for sending direct path operations
-# to the database (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class DirectPathOpMessage(Message):
-    cdef:
-        uint16_t cursor_id
-        uint32_t op_code
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_DIRECT_PATH_OP
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters sent by the database.
-        """
-        cdef uint16_t num_out_values, i
-        buf.read_ub2(&num_out_values)
-        for i in range(num_out_values):
-            buf.skip_ub4()
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the database.
-        """
-        self._write_function_code(buf)
-        buf.write_ub4(self.op_code)
-        buf.write_ub2(self.cursor_id)
-        buf.write_uint8(0)                  # pointer (input values)
-        buf.write_ub4(0)                    # number of input values
-        buf.write_uint8(1)                  # pointer (output values)
-        buf.write_uint8(1)                  # pointer (output values length)
-
-    cdef int prepare(self, uint16_t cursor_id, uint32_t op_code) except -1:
-        """
-        Prepares the values for writing to the message.
-        """
-        self.cursor_id = cursor_id
-        self.op_code = op_code
diff --git a/src/oracledb/impl/thin/messages/direct_path_prepare.pyx b/src/oracledb/impl/thin/messages/direct_path_prepare.pyx
deleted file mode 100644
index fe5502e4..00000000
--- a/src/oracledb/impl/thin/messages/direct_path_prepare.pyx
+++ /dev/null
@@ -1,153 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# direct_path_prepare.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for preparing a direct path cursor
-# for execution (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class DirectPathPrepareMessage(Message):
-    cdef:
-        str schema_name
-        str table_name
-        list column_names
-        list column_metadata
-        uint32_t in_values[TNS_DPP_IN_MAX_PARAMS]
-        uint16_t in_values_length
-        uint32_t *out_values
-        uint16_t out_values_length
-        uint16_t cursor_id
-
-    def __dealloc__(self):
-        if self.out_values != NULL:
-            cpython.PyMem_Free(self.out_values)
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_DIRECT_PATH_PREPARE
-        memset(self.in_values, 0, sizeof(self.in_values))
-        self.in_values[TNS_DPP_KW_INDEX_NFOBJ_OID_POS] = 0xffff
-        self.in_values[TNS_DPP_KW_INDEX_NFOBJ_SID_POS] = 0xffff
-        self.in_values[TNS_DPP_KW_INDEX_NFOBJ_VARRAY_INDEX] = 0xffff
-
-    cdef OracleMetadata _process_metadata(self, ReadBuffer buf):
-        """
-        Process metadata returned by the database. CLOB and BLOB are always
-        treated as strings and bytes when using direct path.
-        """
-        cdef OracleMetadata metadata
-        metadata = Message._process_metadata(self, buf)
-        if metadata.dbtype._ora_type_num == ORA_TYPE_NUM_CLOB:
-            metadata.dbtype = DbType._from_ora_type_and_csfrm(
-                ORA_TYPE_NUM_LONG, CS_FORM_NCHAR
-            )
-        elif metadata.dbtype._ora_type_num == ORA_TYPE_NUM_BLOB:
-            metadata.dbtype = DbType._from_ora_type_and_csfrm(
-                ORA_TYPE_NUM_LONG_RAW, 0
-            )
-        return metadata
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the return parameters sent by the database.
-        """
-        cdef:
-            uint32_t i, num_columns
-            uint16_t num_params
-            ssize_t num_bytes
-        buf.read_ub4(&num_columns)
-        self.column_metadata = [
-            self._process_metadata(buf) for i in range(num_columns)
-        ]
-        buf.read_ub2(&num_params)
-        if num_params > 0:
-            raise Exception("FIX ME!")
-        buf.read_ub2(&self.out_values_length)
-        num_bytes = sizeof(uint32_t) * self.out_values_length
-        self.out_values = <uint32_t*> cpython.PyMem_Malloc(num_bytes)
-        for i in range(self.out_values_length):
-            buf.read_ub4(&self.out_values[i])
-        self.cursor_id = self.out_values[TNS_DPP_OUT_INDEX_CURSOR]
-
-    cdef void _set_in_value(self, uint32_t key, uint32_t value):
-        """
-        Sets the value in the input array and the maximum value set.
-        """
-        self.in_values[key] = value
-        self.in_values_length = max(self.in_values_length, key + 1)
-
-    cdef int _write_keyword_param(self, WriteBuffer buf, uint32_t index,
-                                  str value) except -1:
-        """
-        Writes a keyword parameter to the buffer.
-        """
-        cdef bytes value_bytes = value.encode()
-        buf.write_ub2(0)                    # text length
-        buf.write_ub2(len(value_bytes))
-        buf.write_bytes_with_length(value_bytes)
-        buf.write_ub2(index)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the database.
-        """
-        cdef:
-            uint32_t i, keyword_parameters_length
-            str name
-
-        # initialize input array
-        self._set_in_value(TNS_DPP_IN_INDEX_INTERFACE_VERSION,
-                           TNS_DP_INTERFACE_VERSION)
-        self._set_in_value(TNS_DPP_IN_INDEX_STREAM_VERSION,
-                           TNS_DP_STREAM_VERSION)
-        self._set_in_value(TNS_DPP_IN_INDEX_LOCK_WAIT, 1)
-
-        # write message
-        self._write_function_code(buf)
-        keyword_parameters_length = len(self.column_names) + 2
-        buf.write_ub4(TNS_DPP_OP_CODE_LOAD)
-        buf.write_uint8(1)                  # keyword parameters (pointer)
-        buf.write_ub4(keyword_parameters_length)
-        buf.write_uint8(1)                  # input array (pointer)
-        buf.write_ub2(self.in_values_length)
-        buf.write_uint8(1)                  # metadata (pointer)
-        buf.write_uint8(1)                  # metadata length (pointer)
-        buf.write_uint8(1)                  # parameters (pointer)
-        buf.write_uint8(1)                  # parameters length (pointer)
-        buf.write_uint8(1)                  # output array (pointer)
-        buf.write_uint8(1)                  # output array length (pointer)
-        self._write_keyword_param(buf, TNS_DPP_KW_INDEX_SCHEMA_NAME,
-                                  self.schema_name)
-        self._write_keyword_param(buf, TNS_DPP_KW_INDEX_OBJECT_NAME,
-                                  self.table_name)
-        for name in self.column_names:
-            self._write_keyword_param(buf, TNS_DPP_KW_INDEX_COLUMN_NAME, name)
-        for i in range(self.in_values_length):
-            buf.write_ub4(self.in_values[i])
diff --git a/src/oracledb/impl/thin/messages/end_pipeline.pyx b/src/oracledb/impl/thin/messages/end_pipeline.pyx
deleted file mode 100644
index f0545fe3..00000000
--- a/src/oracledb/impl/thin/messages/end_pipeline.pyx
+++ /dev/null
@@ -1,46 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# end_pipeline.pyx
-#
-# Cython file defining the messages sent to the database and the responses that
-# are received by the client for ending a pipeline (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class EndPipelineMessage(Message):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_PIPELINE_END
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write the message to the buffer.
-        """
-        self._write_function_code(buf)
-        buf.write_ub4(0)                    # ID (unused)
diff --git a/src/oracledb/impl/thin/messages/execute.pyx b/src/oracledb/impl/thin/messages/execute.pyx
deleted file mode 100644
index c5381c21..00000000
--- a/src/oracledb/impl/thin/messages/execute.pyx
+++ /dev/null
@@ -1,299 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# execute.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for executing a SQL statement
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class ExecuteMessage(MessageWithData):
-    cdef:
-        uint32_t fetch_orientation
-        uint32_t fetch_pos
-        bint scroll_operation
-
-    cdef _handle_sessionless_suspend(self):
-        """
-        Suspend the active sessionless transaction after execution of a
-        statement.
-        """
-        cdef _SessionlessData sdata = self.conn_impl._sessionless_data
-
-        # perform validation
-        if sdata is None:
-            errors._raise_err(errors.ERR_SESSIONLESS_INACTIVE)
-        elif sdata.started_on_server:
-            errors._raise_err(errors.ERR_SESSIONLESS_DIFFERING_METHODS)
-
-        # if a piggyback is pending , ensure that it is suspended when the
-        # operation is completed; otherwise, create a new pending piggyback to
-        # suspend the transaction
-        if sdata.piggyback_pending:
-            sdata.operation |= TNS_TPC_TXN_POST_DETACH
-        else:
-            sdata.operation = TNS_TPC_TXN_POST_DETACH
-            sdata.flags = TPC_TXN_FLAGS_SESSIONLESS
-            sdata.piggyback_pending = True
-
-    cdef int _write_execute_message(self, WriteBuffer buf) except -1:
-        """
-        Write the message for a full execute.
-        """
-        cdef:
-            uint32_t options, exec_flags = 0, num_params = 0, num_iters = 1
-            Statement stmt = self.cursor_impl._statement
-            BaseThinCursorImpl cursor_impl = self.cursor_impl
-            list params = stmt._bind_info_list
-
-        # determine the options to use for the execute
-        options = 0
-        if not stmt._requires_define and not self.parse_only \
-                and params is not None:
-            num_params = <uint32_t> len(params)
-        if stmt._requires_define:
-            options |= TNS_EXEC_OPTION_DEFINE
-        elif not self.parse_only and stmt._sql is not None:
-            exec_flags |= TNS_EXEC_FLAGS_IMPLICIT_RESULTSET
-            if not self.scroll_operation:
-                options |= TNS_EXEC_OPTION_EXECUTE
-        if cursor_impl.scrollable and not self.parse_only:
-            exec_flags |= TNS_EXEC_FLAGS_SCROLLABLE
-            exec_flags |= TNS_EXEC_FLAGS_NO_CANCEL_ON_EOF
-        if stmt._cursor_id == 0 or stmt._is_ddl:
-            options |= TNS_EXEC_OPTION_PARSE
-        if stmt._is_query:
-            if self.parse_only:
-                options |= TNS_EXEC_OPTION_DESCRIBE
-            else:
-                if stmt._cursor_id == 0 or stmt._requires_define:
-                    num_iters = self.cursor_impl.prefetchrows
-                else:
-                    num_iters = self.cursor_impl.arraysize
-                self.cursor_impl._set_fetch_array_size(num_iters)
-                if num_iters > 0 and not stmt._no_prefetch:
-                    options |= TNS_EXEC_OPTION_FETCH
-        if not stmt._is_plsql and not self.parse_only:
-            options |= TNS_EXEC_OPTION_NOT_PLSQL
-        elif stmt._is_plsql and num_params > 0:
-            options |= TNS_EXEC_OPTION_PLSQL_BIND
-        if num_params > 0 and not self.scroll_operation:
-            options |= TNS_EXEC_OPTION_BIND
-        if self.batcherrors:
-            options |= TNS_EXEC_OPTION_BATCH_ERRORS
-        if self.arraydmlrowcounts:
-            exec_flags |= TNS_EXEC_FLAGS_DML_ROWCOUNTS
-        if self.conn_impl.autocommit and not self.parse_only:
-            options |= TNS_EXEC_OPTION_COMMIT
-        if self.cursor_impl.suspend_on_success:
-            self._handle_sessionless_suspend()
-
-        # write body of message
-        self._write_function_code(buf)
-        buf.write_ub4(options)              # execute options
-        buf.write_ub4(stmt._cursor_id)      # cursor id
-        if stmt._cursor_id == 0 or stmt._is_ddl:
-            buf.write_uint8(1)              # pointer (cursor id)
-            buf.write_ub4(stmt._sql_length)
-        else:
-            buf.write_uint8(0)              # pointer (cursor id)
-            buf.write_ub4(0)
-        buf.write_uint8(1)                  # pointer (vector)
-        buf.write_ub4(13)                   # al8i4 array length
-        buf.write_uint8(0)                  # pointer (al8o4)
-        buf.write_uint8(0)                  # pointer (al8o4l)
-        buf.write_ub4(0)                    # prefetch buffer size
-        buf.write_ub4(num_iters)            # prefetch number of rows
-        buf.write_ub4(TNS_MAX_LONG_LENGTH)  # maximum long size
-        if num_params == 0:
-            buf.write_uint8(0)              # pointer (binds)
-            buf.write_ub4(0)                # number of binds
-        else:
-            buf.write_uint8(1)              # pointer (binds)
-            buf.write_ub4(num_params)       # number of binds
-        buf.write_uint8(0)                  # pointer (al8app)
-        buf.write_uint8(0)                  # pointer (al8txn)
-        buf.write_uint8(0)                  # pointer (al8txl)
-        buf.write_uint8(0)                  # pointer (al8kv)
-        buf.write_uint8(0)                  # pointer (al8kvl)
-        if stmt._requires_define:
-            buf.write_uint8(1)              # pointer (al8doac)
-            buf.write_ub4(len(self.cursor_impl.fetch_vars))
-                                            # number of defines
-        else:
-            buf.write_uint8(0)
-            buf.write_ub4(0)
-        buf.write_ub4(0)                    # registration id
-        buf.write_uint8(0)                  # pointer (al8objlist)
-        buf.write_uint8(1)                  # pointer (al8objlen)
-        buf.write_uint8(0)                  # pointer (al8blv)
-        buf.write_ub4(0)                    # al8blvl
-        buf.write_uint8(0)                  # pointer (al8dnam)
-        buf.write_ub4(0)                    # al8dnaml
-        buf.write_ub4(0)                    # al8regid_msb
-        if self.arraydmlrowcounts:
-            buf.write_uint8(1)              # pointer (al8pidmlrc)
-            buf.write_ub4(self.num_execs)   # al8pidmlrcbl
-            buf.write_uint8(1)              # pointer (al8pidmlrcl)
-        else:
-            buf.write_uint8(0)              # pointer (al8pidmlrc)
-            buf.write_ub4(0)                # al8pidmlrcbl
-            buf.write_uint8(0)              # pointer (al8pidmlrcl)
-        if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_12_2:
-            buf.write_uint8(0)                  # pointer (al8sqlsig)
-            buf.write_ub4(0)                    # SQL signature length
-            buf.write_uint8(0)                  # pointer (SQL ID)
-            buf.write_ub4(0)                    # allocated size of SQL ID
-            buf.write_uint8(0)                  # pointer (length of SQL ID)
-            if buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_12_2_EXT1:
-                buf.write_uint8(0)              # pointer (chunk ids)
-                buf.write_ub4(0)                # number of chunk ids
-        if stmt._cursor_id == 0 or stmt._is_ddl:
-            if stmt._sql_bytes is None:
-                errors._raise_err(errors.ERR_INVALID_REF_CURSOR)
-            buf.write_bytes_with_length(stmt._sql_bytes)
-            buf.write_ub4(1)                # al8i4[0] parse
-        else:
-            buf.write_ub4(0)                # al8i4[0] parse
-        if stmt._is_query:
-            if stmt._cursor_id == 0:
-                buf.write_ub4(0)            # al8i4[1] execution count
-            else:
-                buf.write_ub4(num_iters)
-        else:
-            buf.write_ub4(self.num_execs)   # al8i4[1] execution count
-        buf.write_ub4(0)                    # al8i4[2]
-        buf.write_ub4(0)                    # al8i4[3]
-        buf.write_ub4(0)                    # al8i4[4]
-        buf.write_ub4(0)                    # al8i4[5] SCN (part 1)
-        buf.write_ub4(0)                    # al8i4[6] SCN (part 2)
-        buf.write_ub4(stmt._is_query)       # al8i4[7] is query
-        buf.write_ub4(0)                    # al8i4[8]
-        buf.write_ub4(exec_flags)           # al8i4[9] execute flags
-        buf.write_ub4(self.fetch_orientation) # al8i4[10] fetch orientation
-        buf.write_ub4(self.fetch_pos)       # al8i4[11] fetch pos
-        buf.write_ub4(0)                    # al8i4[12]
-        if stmt._requires_define:
-            self._write_column_metadata(buf, self.cursor_impl.fetch_var_impls)
-        elif num_params > 0:
-            self._write_bind_params(buf, params)
-
-    cdef int _write_reexecute_message(self, WriteBuffer buf) except -1:
-        """
-        Write the message for a re-execute.
-        """
-        cdef:
-            uint32_t i, options_1 = 0, options_2 = 0, num_iters
-            Statement stmt = self.cursor_impl._statement
-            list params = stmt._bind_info_list
-            BindInfo info
-
-        if params:
-            if not stmt._is_query and not stmt._is_returning:
-                self.out_var_impls = [info._bind_var_impl \
-                                      for info in params \
-                                      if info.bind_dir != TNS_BIND_DIR_INPUT]
-            params = [info for info in params \
-                      if info.bind_dir != TNS_BIND_DIR_OUTPUT \
-                      and not info._is_return_bind]
-        if self.function_code == TNS_FUNC_REEXECUTE_AND_FETCH:
-            options_1 |= TNS_EXEC_OPTION_EXECUTE
-            num_iters = self.cursor_impl.prefetchrows
-            self.cursor_impl._set_fetch_array_size(num_iters)
-        else:
-            if self.conn_impl.autocommit:
-                options_2 |= TNS_EXEC_OPTION_COMMIT_REEXECUTE
-            num_iters = self.num_execs
-        if self.cursor_impl.suspend_on_success:
-            self._handle_sessionless_suspend()
-
-        self._write_function_code(buf)
-        buf.write_ub4(stmt._cursor_id)
-        buf.write_ub4(num_iters)
-        buf.write_ub4(options_1)
-        buf.write_ub4(options_2)
-        if params:
-            for i in range(self.num_execs):
-                buf.write_uint8(TNS_MSG_TYPE_ROW_DATA)
-                self._write_bind_params_row(buf, params, i)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write the execute message to the buffer. Two types of execute messages
-        are possible: one for a full execute and the second, simpler message,
-        for when an existing cursor is being re-executed. A full execute is
-        required under the following circumstances:
-            - the statement has never been executed
-            - the statement refers to a REF cursor (no sql is defined)
-            - prefetch is not possible (LOB columns fetched)
-            - bind metadata has changed
-            - parse is being performed
-            - define is being performed
-            - DDL is being executed
-            - batch errors mode is enabled
-        """
-        cdef:
-            Statement stmt = self.cursor_impl._statement
-        if stmt._cursor_id == 0 or not stmt._executed \
-                or stmt._sql is None \
-                or stmt._no_prefetch \
-                or stmt._binds_changed \
-                or self.parse_only \
-                or stmt._requires_define \
-                or stmt._is_ddl \
-                or self.batcherrors \
-                or self.cursor_impl.scrollable:
-            self.function_code = TNS_FUNC_EXECUTE
-            self._write_execute_message(buf)
-        elif stmt._is_query and self.cursor_impl.prefetchrows > 0:
-            self.function_code = TNS_FUNC_REEXECUTE_AND_FETCH
-            self._write_reexecute_message(buf)
-        else:
-            self.function_code = TNS_FUNC_REEXECUTE
-            self._write_reexecute_message(buf)
-        stmt._binds_changed = False
-
-    cdef int process(self, ReadBuffer buf) except -1:
-        """
-        Runs after the database response has been processed. If the statement
-        executed requires define and is not a REF cursor (which would already
-        have performed the define during its execute), then mark the message as
-        needing to be resent. If this is after the second time the message has
-        been sent, mark the statement as no longer needing a define (since this
-        only needs to happen once).
-        """
-        cdef Statement stmt = self.cursor_impl._statement
-        MessageWithData.process(self, buf)
-        if self.error_occurred and self.error_info.pos == 0 and stmt._is_plsql:
-            self.error_info.pos = self.error_info.rowcount + self.offset
-        if not self.parse_only:
-            stmt._executed = True
-        if stmt._requires_define and stmt._sql is not None:
-            if self.resend:
-                stmt._requires_define = False
-            else:
-                self.resend = True
diff --git a/src/oracledb/impl/thin/messages/fast_auth.pyx b/src/oracledb/impl/thin/messages/fast_auth.pyx
deleted file mode 100644
index 1d3fa770..00000000
--- a/src/oracledb/impl/thin/messages/fast_auth.pyx
+++ /dev/null
@@ -1,74 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# fast_auth.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for performing fast authentication
-# to the database (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class FastAuthMessage(Message):
-    cdef:
-        DataTypesMessage data_types_message
-        ProtocolMessage protocol_message
-        AuthMessage auth_message
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        """
-        Processes the messages returned from the server response.
-        """
-        if message_type == TNS_MSG_TYPE_PROTOCOL:
-            ProtocolMessage._process_message(self.protocol_message, buf,
-                                             message_type)
-        elif message_type == TNS_MSG_TYPE_DATA_TYPES:
-            DataTypesMessage._process_message(self.data_types_message, buf,
-                                              message_type)
-        else:
-            AuthMessage._process_message(self.auth_message, buf, message_type)
-            self.end_of_response = self.auth_message.end_of_response
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the buffer. This includes not just this message
-        but also the protocol, data types and auth messages. This reduces the
-        number of round-trips to the database and thereby increases
-        performance.
-        """
-        buf.write_uint8(TNS_MSG_TYPE_FAST_AUTH)
-        buf.write_uint8(1)                  # fast auth version
-        buf.write_uint8(TNS_SERVER_CONVERTS_CHARS)  # flag 1
-        buf.write_uint8(0)                  # flag 2
-        ProtocolMessage._write_message(self.protocol_message, buf)
-        buf.write_uint16be(0)               # server charset (unused)
-        buf.write_uint8(0)                  # server charset flag (unused)
-        buf.write_uint16be(0)               # server ncharset (unused)
-        buf._caps.ttc_field_version = TNS_CCAP_FIELD_VERSION_19_1_EXT_1
-        buf.write_uint8(buf._caps.ttc_field_version)
-        DataTypesMessage._write_message(self.data_types_message, buf)
-        AuthMessage._write_message(self.auth_message, buf)
-        buf._caps.ttc_field_version = TNS_CCAP_FIELD_VERSION_MAX
diff --git a/src/oracledb/impl/thin/messages/fetch.pyx b/src/oracledb/impl/thin/messages/fetch.pyx
deleted file mode 100644
index e3630933..00000000
--- a/src/oracledb/impl/thin/messages/fetch.pyx
+++ /dev/null
@@ -1,48 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# fetch.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for fetching data (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class FetchMessage(MessageWithData):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_FETCH
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        self.cursor_impl._set_fetch_array_size(self.cursor_impl.arraysize)
-        self._write_function_code(buf)
-        if self.cursor_impl._statement._cursor_id == 0:
-            errors._raise_err(errors.ERR_CURSOR_HAS_BEEN_CLOSED)
-        buf.write_ub4(self.cursor_impl._statement._cursor_id)
-        buf.write_ub4(self.cursor_impl._fetch_array_size)
diff --git a/src/oracledb/impl/thin/messages/lob_op.pyx b/src/oracledb/impl/thin/messages/lob_op.pyx
deleted file mode 100644
index 4caea324..00000000
--- a/src/oracledb/impl/thin/messages/lob_op.pyx
+++ /dev/null
@@ -1,137 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# lob_op.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for performing LOB operations
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class LobOpMessage(Message):
-    cdef:
-        uint32_t operation
-        BaseThinLobImpl source_lob_impl
-        uint64_t source_offset
-        uint64_t dest_offset
-        uint32_t dest_length
-        int64_t amount
-        bint send_amount
-        bint bool_flag
-        object data
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_LOB_OP
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        cdef:
-            const char* encoding
-            const char_type *ptr
-            ssize_t num_bytes
-        if message_type == TNS_MSG_TYPE_LOB_DATA:
-            buf.read_raw_bytes_and_length(&ptr, &num_bytes)
-            if self.source_lob_impl.dbtype._ora_type_num in \
-                    (ORA_TYPE_NUM_BLOB, ORA_TYPE_NUM_BFILE):
-                self.data = ptr[:num_bytes]
-            else:
-                encoding = self.source_lob_impl._get_encoding()
-                self.data = ptr[:num_bytes].decode(encoding)
-        else:
-            Message._process_message(self, buf, message_type)
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        cdef:
-            cdef const char_type *ptr
-            ssize_t num_bytes
-            uint8_t temp8
-        if self.source_lob_impl is not None:
-            num_bytes = len(self.source_lob_impl._locator)
-            ptr = buf.read_raw_bytes(num_bytes)
-            self.source_lob_impl._locator = ptr[:num_bytes]
-        if self.operation == TNS_LOB_OP_CREATE_TEMP:
-            buf.skip_ub2()                  # skip character set
-            buf.skip_ub1()                  # skip trailing flags
-        elif self.send_amount:
-            buf.read_sb8(&self.amount)
-        if self.operation in (TNS_LOB_OP_IS_OPEN,
-                              TNS_LOB_OP_FILE_EXISTS,
-                              TNS_LOB_OP_FILE_ISOPEN):
-            buf.read_ub1(&temp8)
-            self.bool_flag = temp8 > 0
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        cdef int i
-        self._write_function_code(buf)
-        if self.source_lob_impl is None:
-            buf.write_uint8(0)              # source pointer
-            buf.write_ub4(0)                # source length
-        else:
-            buf.write_uint8(1)              # source pointer
-            buf.write_ub4(len(self.source_lob_impl._locator))
-        buf.write_uint8(0)                  # dest pointer
-        buf.write_ub4(self.dest_length)
-        buf.write_ub4(0)                    # short source offset
-        buf.write_ub4(0)                    # short dest offset
-        if self.operation == TNS_LOB_OP_CREATE_TEMP:
-            buf.write_uint8(1)              # pointer (character set)
-        else:
-            buf.write_uint8(0)              # pointer (character set)
-        buf.write_uint8(0)                  # pointer (short amount)
-        if self.operation in (TNS_LOB_OP_CREATE_TEMP,
-                              TNS_LOB_OP_IS_OPEN,
-                              TNS_LOB_OP_FILE_EXISTS,
-                              TNS_LOB_OP_FILE_ISOPEN):
-            buf.write_uint8(1)              # pointer (NULL LOB)
-        else:
-            buf.write_uint8(0)              # pointer (NULL LOB)
-        buf.write_ub4(self.operation)
-        buf.write_uint8(0)                  # pointer (SCN array)
-        buf.write_uint8(0)                  # SCN array length
-        buf.write_ub8(self.source_offset)
-        buf.write_ub8(self.dest_offset)
-        if self.send_amount:
-            buf.write_uint8(1)              # pointer (amount)
-        else:
-            buf.write_uint8(0)              # pointer (amount)
-        for i in range(3):                  # array LOB (not used)
-            buf.write_uint16be(0)
-        if self.source_lob_impl is not None:
-            buf.write_bytes(self.source_lob_impl._locator)
-        if self.operation == TNS_LOB_OP_CREATE_TEMP:
-            if self.source_lob_impl.dbtype._csfrm == CS_FORM_NCHAR:
-                buf._caps._check_ncharset_id()
-                buf.write_ub4(TNS_CHARSET_UTF16)
-            else:
-                buf.write_ub4(TNS_CHARSET_UTF8)
-        if self.data is not None:
-            buf.write_uint8(TNS_MSG_TYPE_LOB_DATA)
-            buf.write_bytes_with_length(self.data)
-        if self.send_amount:
-            buf.write_ub8(self.amount)      # LOB amount
diff --git a/src/oracledb/impl/thin/messages/logoff.pyx b/src/oracledb/impl/thin/messages/logoff.pyx
deleted file mode 100644
index a5fec38c..00000000
--- a/src/oracledb/impl/thin/messages/logoff.pyx
+++ /dev/null
@@ -1,40 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# logoff.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for logging off from the database
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class LogoffMessage(Message):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_LOGOFF
diff --git a/src/oracledb/impl/thin/messages/ping.pyx b/src/oracledb/impl/thin/messages/ping.pyx
deleted file mode 100644
index f419e57d..00000000
--- a/src/oracledb/impl/thin/messages/ping.pyx
+++ /dev/null
@@ -1,40 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# ping.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for pinging the database
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class PingMessage(Message):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_PING
diff --git a/src/oracledb/impl/thin/messages/protocol.pyx b/src/oracledb/impl/thin/messages/protocol.pyx
deleted file mode 100644
index 3047d305..00000000
--- a/src/oracledb/impl/thin/messages/protocol.pyx
+++ /dev/null
@@ -1,89 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# protocol.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for establishing the protoocl to
-# use during the connection (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class ProtocolMessage(Message):
-    cdef:
-        uint8_t server_version
-        uint8_t server_flags
-        bytes server_compile_caps
-        bytes server_runtime_caps
-        bytes server_banner
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        buf.write_uint8(TNS_MSG_TYPE_PROTOCOL)
-        buf.write_uint8(6)                  # protocol version (8.1 and higher)
-        buf.write_uint8(0)                  # "array" terminator
-        buf.write_str(DRIVER_NAME)
-        buf.write_uint8(0)                  # NULL terminator
-
-    cdef int _process_message(self, ReadBuffer buf,
-                              uint8_t message_type) except -1:
-        if message_type == TNS_MSG_TYPE_PROTOCOL:
-            self._process_protocol_info(buf)
-            if not buf._caps.supports_end_of_response:
-                self.end_of_response = True
-        else:
-            Message._process_message(self, buf, message_type)
-
-    cdef int _process_protocol_info(self, ReadBuffer buf) except -1:
-        """
-        Processes the response to the protocol request.
-        """
-        cdef:
-            uint16_t num_elem, fdo_length
-            Capabilities caps = buf._caps
-            const char_type *fdo
-            bytearray temp_array
-            ssize_t ix
-        buf.read_ub1(&self.server_version)
-        buf.skip_ub1()                      # skip zero byte
-        self.server_banner = buf.read_null_terminated_bytes()
-        buf.read_uint16le(&caps.charset_id)
-        buf.read_ub1(&self.server_flags)
-        buf.read_uint16le(&num_elem)
-        if num_elem > 0:                    # skip elements
-            buf.skip_raw_bytes(num_elem * 5)
-        buf.read_uint16be(&fdo_length)
-        fdo = buf.read_raw_bytes(fdo_length)
-        ix = 6 + fdo[5] + fdo[6]
-        caps.ncharset_id = (fdo[ix + 3] << 8) + fdo[ix + 4]
-        self.server_compile_caps = buf.read_bytes()
-        if self.server_compile_caps is not None:
-            temp_array = bytearray(self.server_compile_caps)
-            caps._adjust_for_server_compile_caps(temp_array)
-            if caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1:
-                self.conn_impl._oson_max_fname_size = 65535
-        self.server_runtime_caps = buf.read_bytes()
-        if self.server_runtime_caps is not None:
-            temp_array = bytearray(self.server_runtime_caps)
-            caps._adjust_for_server_runtime_caps(temp_array)
diff --git a/src/oracledb/impl/thin/messages/rollback.pyx b/src/oracledb/impl/thin/messages/rollback.pyx
deleted file mode 100644
index 8b931779..00000000
--- a/src/oracledb/impl/thin/messages/rollback.pyx
+++ /dev/null
@@ -1,40 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# rollback.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for rolling back a transaction
-# (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class RollbackMessage(Message):
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_ROLLBACK
diff --git a/src/oracledb/impl/thin/messages/session_release.pyx b/src/oracledb/impl/thin/messages/session_release.pyx
deleted file mode 100644
index 21d5c424..00000000
--- a/src/oracledb/impl/thin/messages/session_release.pyx
+++ /dev/null
@@ -1,53 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# session_release.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for releasing a session (embedded
-# in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class SessionReleaseMessage(Message):
-
-    cdef:
-        uint32_t release_mode
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.message_type = TNS_MSG_TYPE_ONEWAY_FN
-        self.function_code = TNS_FUNC_SESSION_RELEASE
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Write the message for a DRCP session release.
-        """
-        self._write_function_code(buf)
-        buf.write_uint8(0)                  # pointer (tag name)
-        buf.write_uint8(0)                  # tag name length
-        buf.write_ub4(self.release_mode)    # mode
diff --git a/src/oracledb/impl/thin/messages/tpc_change_state.pyx b/src/oracledb/impl/thin/messages/tpc_change_state.pyx
deleted file mode 100644
index adbb5b9a..00000000
--- a/src/oracledb/impl/thin/messages/tpc_change_state.pyx
+++ /dev/null
@@ -1,103 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# tpc_change_state.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for changing the state of a two
-# phase commit (TPC) transaction (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-@cython.final
-cdef class TransactionChangeStateMessage(Message):
-    """
-    Used for two-phase commit (TPC) transaction change state: commit, rollback,
-    forget, etc.
-    """
-    cdef:
-        uint32_t operation, state, flags
-        bytes context
-        object xid
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_TPC_TXN_CHANGE_STATE
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the parameters returned by the database.
-        """
-        buf.read_ub4(&self.state)
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the database.
-        """
-        cdef:
-            bytes global_transaction_id, branch_qualifier, xid_bytes
-            uint32_t format_id = 0
-
-        # acquire data to send to the server
-        if self.xid is not None:
-            format_id = self.xid[0]
-            global_transaction_id = self.xid[1] \
-                    if isinstance(self.xid[1], bytes) \
-                    else self.xid[1].encode()
-            branch_qualifier = self.xid[2] \
-                    if isinstance(self.xid[2], bytes) \
-                    else self.xid[2].encode()
-            xid_bytes = global_transaction_id + branch_qualifier
-            xid_bytes += bytes(128 - len(xid_bytes))
-
-        self._write_function_code(buf)
-        buf.write_ub4(self.operation)
-        if self.context is not None:
-            buf.write_uint8(1)              # pointer (context)
-            buf.write_ub4(len(self.context))
-        else:
-            buf.write_uint8(0)              # pointer (context)
-            buf.write_ub4(0)                # context length
-        if self.xid is not None:
-            buf.write_ub4(format_id)
-            buf.write_ub4(len(global_transaction_id))
-            buf.write_ub4(len(branch_qualifier))
-            buf.write_uint8(1)              # pointer (xid)
-            buf.write_ub4(len(xid_bytes))
-        else:
-            buf.write_ub4(0)                # format id
-            buf.write_ub4(0)                # global transaction id length
-            buf.write_ub4(0)                # branch qualifier length
-            buf.write_uint8(0)              # pointer (xid)
-            buf.write_ub4(0)                # XID length
-        buf.write_ub4(0)                    # timeout
-        buf.write_ub4(self.state)
-        buf.write_uint8(1)                  # pointer (out state)
-        buf.write_ub4(self.flags)
-        if self.context is not None:
-            buf.write_bytes(self.context)
-        if self.xid is not None:
-            buf.write_bytes(xid_bytes)
diff --git a/src/oracledb/impl/thin/messages/tpc_switch.pyx b/src/oracledb/impl/thin/messages/tpc_switch.pyx
deleted file mode 100644
index 7e2c1a01..00000000
--- a/src/oracledb/impl/thin/messages/tpc_switch.pyx
+++ /dev/null
@@ -1,134 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# tpc_switch.pyx
-#
-# Cython file defining the messages that are sent to the database and the
-# responses that are received by the client for switching two phase commit
-# (TPC) transactions (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-
-@cython.final
-cdef class TransactionSwitchMessage(Message):
-    """
-    Used for two-phase commit (TPC) transaction start, attach and detach.
-    """
-    cdef:
-        uint32_t operation, flags, timeout, application_value
-        bytes context
-        object xid
-
-    cdef int _initialize_hook(self) except -1:
-        """
-        Perform initialization.
-        """
-        self.function_code = TNS_FUNC_TPC_TXN_SWITCH
-
-    cdef int _process_return_parameters(self, ReadBuffer buf) except -1:
-        """
-        Process the parameters returned by the database.
-        """
-        cdef:
-            const char_type* ptr
-            uint16_t context_len
-        buf.read_ub4(&self.application_value)
-        buf.read_ub2(&context_len)
-        ptr = buf.read_raw_bytes(context_len)
-        self.context = ptr[:context_len]
-
-    cdef int _write_message(self, WriteBuffer buf) except -1:
-        """
-        Writes the message to the database.
-        """
-        cdef:
-            bytes global_transaction_id, branch_qualifier, xid_bytes
-            bytes internal_name = None, external_name = None
-            uint32_t format_id = 0
-
-        # acquire data to send to the server
-        if self.xid is not None:
-            format_id = self.xid[0]
-            global_transaction_id = self.xid[1] \
-                    if isinstance(self.xid[1], bytes) \
-                    else self.xid[1].encode()
-            branch_qualifier = self.xid[2] \
-                    if isinstance(self.xid[2], bytes) \
-                    else self.xid[2].encode()
-            xid_bytes = global_transaction_id + branch_qualifier
-            xid_bytes += bytes(128 - len(xid_bytes))
-        if self.conn_impl._internal_name is not None:
-            internal_name = self.conn_impl._internal_name.encode()
-        if self.conn_impl._external_name is not None:
-            external_name = self.conn_impl._external_name.encode()
-
-        # write message
-        self._write_function_code(buf)
-        buf.write_ub4(self.operation)
-        if self.context is not None:
-            buf.write_uint8(1)              # pointer (transaction context)
-            buf.write_ub4(len(self.context))
-        else:
-            buf.write_uint8(0)              # pointer (transaction context)
-            buf.write_ub4(0)                # transaction context length
-        if self.xid is not None:
-            buf.write_ub4(format_id)
-            buf.write_ub4(len(global_transaction_id))
-            buf.write_ub4(len(branch_qualifier))
-            buf.write_uint8(1)              # pointer (XID)
-            buf.write_ub4(len(xid_bytes))
-        else:
-            buf.write_ub4(0)                # format id
-            buf.write_ub4(0)                # global transaction id length
-            buf.write_ub4(0)                # branch qualifier length
-            buf.write_uint8(0)              # pointer (XID)
-            buf.write_ub4(0)                # XID length
-        buf.write_ub4(self.flags)
-        buf.write_ub4(self.timeout)
-        buf.write_uint8(1)                  # pointer (application value)
-        buf.write_uint8(1)                  # pointer (return context)
-        buf.write_uint8(1)                  # pointer (return context length)
-        if internal_name is not None:
-            buf.write_uint8(1)              # pointer (internal name)
-            buf.write_ub4(len(internal_name))
-        else:
-            buf.write_uint8(0)              # pointer (internal name)
-            buf.write_ub4(0)                # length of internal name
-        if external_name is not None:
-            external_name = self.conn_impl._external_name.encode()
-            buf.write_uint8(1)              # pointer (external name)
-            buf.write_ub4(len(external_name))
-        else:
-            buf.write_uint8(0)              # pointer (external name)
-            buf.write_ub4(0)                # length of external name
-        if self.context is not None:
-            buf.write_bytes(self.context)
-        if self.xid is not None:
-            buf.write_bytes(xid_bytes)
-        buf.write_ub4(self.application_value)
-        if internal_name is not None:
-            buf.write_bytes(internal_name)
-        if external_name is not None:
-            buf.write_bytes(external_name)
diff --git a/src/oracledb/impl/thin/packet.pyx b/src/oracledb/impl/thin/packet.pyx
deleted file mode 100644
index 31698ab6..00000000
--- a/src/oracledb/impl/thin/packet.pyx
+++ /dev/null
@@ -1,968 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# buffer.pyx
-#
-# Cython file defining the low-level network buffer read and write classes and
-# methods for reading and writing low-level data from those buffers (embedded
-# in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef enum:
-    PACKET_HEADER_SIZE = 8
-    CHUNKED_BYTES_CHUNK_SIZE = 65536
-
-cdef struct BytesChunk:
-    char_type *ptr
-    uint32_t length
-    uint32_t allocated_length
-
-cdef struct Rowid:
-    uint32_t rba
-    uint16_t partition_id
-    uint32_t block_num
-    uint16_t slot_num
-
-@cython.final
-@cython.freelist(20)
-cdef class Packet:
-
-    cdef:
-        uint32_t packet_size
-        uint8_t packet_type
-        uint8_t packet_flags
-        bytes buf
-
-    cdef inline bint has_end_of_response(self):
-        """
-        Returns a boolean indicating if the end of request byte is found at the
-        end of the packet.
-        """
-        cdef:
-            uint16_t flags
-            char *ptr
-        ptr = cpython.PyBytes_AS_STRING(self.buf)
-        flags = decode_uint16be(<const char_type*> &ptr[PACKET_HEADER_SIZE])
-        if flags & TNS_DATA_FLAGS_END_OF_RESPONSE or flags & TNS_DATA_FLAGS_EOF:
-            return True
-        if self.packet_size == PACKET_HEADER_SIZE + 3 \
-                and ptr[PACKET_HEADER_SIZE + 2] == TNS_MSG_TYPE_END_OF_RESPONSE:
-            return True
-        return False
-
-
-@cython.final
-cdef class ChunkedBytesBuffer:
-
-    cdef:
-        uint32_t _num_chunks
-        uint32_t _allocated_chunks
-        BytesChunk *_chunks
-
-    def __dealloc__(self):
-        cdef uint32_t i
-        for i in range(self._allocated_chunks):
-            if self._chunks[i].ptr is not NULL:
-                cpython.PyMem_Free(self._chunks[i].ptr)
-                self._chunks[i].ptr = NULL
-        if self._chunks is not NULL:
-            cpython.PyMem_Free(self._chunks)
-            self._chunks = NULL
-
-    cdef int _allocate_chunks(self) except -1:
-        """
-        Allocates a new set of chunks and copies data from the original set of
-        chunks if needed.
-        """
-        cdef:
-            BytesChunk *chunks
-            uint32_t allocated_chunks
-        allocated_chunks = self._allocated_chunks + 8
-        chunks = <BytesChunk*> \
-                cpython.PyMem_Malloc(sizeof(BytesChunk) * allocated_chunks)
-        memset(chunks, 0, sizeof(BytesChunk) * allocated_chunks)
-        if self._num_chunks > 0:
-            memcpy(chunks, self._chunks, sizeof(BytesChunk) * self._num_chunks)
-            cpython.PyMem_Free(self._chunks)
-        self._chunks = chunks
-        self._allocated_chunks = allocated_chunks
-
-    cdef BytesChunk* _get_chunk(self, uint32_t num_bytes) except NULL:
-        """
-        Return the chunk that can be used to write the number of bytes
-        requested.
-        """
-        cdef:
-            uint32_t num_allocated_bytes
-            BytesChunk *chunk
-        if self._num_chunks > 0:
-            chunk = &self._chunks[self._num_chunks - 1]
-            if chunk.allocated_length >= chunk.length + num_bytes:
-                return chunk
-        if self._num_chunks >= self._allocated_chunks:
-            self._allocate_chunks()
-        self._num_chunks += 1
-        chunk = &self._chunks[self._num_chunks - 1]
-        chunk.length = 0
-        if chunk.allocated_length < num_bytes:
-            num_allocated_bytes = self._get_chunk_size(num_bytes)
-            if chunk.ptr:
-                cpython.PyMem_Free(chunk.ptr)
-            chunk.ptr = <char_type*> cpython.PyMem_Malloc(num_allocated_bytes)
-            chunk.allocated_length = num_allocated_bytes
-        return chunk
-
-    cdef inline uint32_t _get_chunk_size(self, uint32_t size):
-        """
-        Returns the size to allocate aligned on a 64K boundary.
-        """
-        return (size + CHUNKED_BYTES_CHUNK_SIZE - 1) & \
-               ~(CHUNKED_BYTES_CHUNK_SIZE - 1)
-
-    cdef char_type* end_chunked_read(self) except NULL:
-        """
-        Called when a chunked read has ended. Since a chunked read is never
-        started until at least some bytes are being read, it is assumed that at
-        least one chunk is in use. If one chunk is in use, those bytes are
-        returned directly, but if more than one chunk is in use, the first
-        chunk is resized to include all of the bytes in a contiguous section of
-        memory first.
-        """
-        cdef:
-            uint32_t i, num_allocated_bytes, total_num_bytes = 0, pos = 0
-            char_type *ptr
-        if self._num_chunks > 1:
-            for i in range(self._num_chunks):
-                total_num_bytes += self._chunks[i].length
-            num_allocated_bytes = self._get_chunk_size(total_num_bytes)
-            ptr = <char_type*> cpython.PyMem_Malloc(num_allocated_bytes)
-            for i in range(self._num_chunks):
-                memcpy(&ptr[pos], self._chunks[i].ptr, self._chunks[i].length)
-                pos += self._chunks[i].length
-                cpython.PyMem_Free(self._chunks[i].ptr)
-                self._chunks[i].ptr = NULL
-                self._chunks[i].allocated_length = 0
-                self._chunks[i].length = 0
-            self._num_chunks = 1
-            self._chunks[0].ptr = ptr
-            self._chunks[0].length = total_num_bytes
-            self._chunks[0].allocated_length = num_allocated_bytes
-        return self._chunks[0].ptr
-
-    cdef char_type* get_chunk_ptr(self, uint32_t size_required) except NULL:
-        """
-        Called when memory is required for a chunked read.
-        """
-        cdef:
-            BytesChunk *chunk
-            char_type *ptr
-        chunk = self._get_chunk(size_required)
-        ptr = &chunk.ptr[chunk.length]
-        chunk.length += size_required
-        return ptr
-
-    cdef inline void start_chunked_read(self):
-        """
-        Called when a chunked read is started and simply indicates that no
-        chunks are in use. The memory is retained in order to reduce the
-        overhead in freeing and reallocating memory for each chunked read.
-        """
-        self._num_chunks = 0
-
-
-@cython.final
-cdef class ReadBuffer(Buffer):
-
-    cdef:
-        ssize_t _saved_packet_pos, _next_packet_pos, _saved_pos
-        ChunkedBytesBuffer _chunked_bytes_buf
-        const char_type _split_data[255]
-        uint32_t _pending_error_num
-        Packet _current_packet
-        Transport _transport
-        list _saved_packets
-        Capabilities _caps
-        bint _check_request_boundary
-        bint _in_pipeline
-        object _waiter
-        object _loop
-
-    def __cinit__(self, Transport transport, Capabilities caps):
-        self._transport = transport
-        self._caps = caps
-        self._chunked_bytes_buf = ChunkedBytesBuffer()
-
-    cdef int _check_connected(self):
-        """
-        Checks to see if the transport is connected and throws the appropriate
-        exception if not.
-        """
-        if self._pending_error_num not in (
-            0, TNS_ERR_SESSION_SHUTDOWN, TNS_ERR_INBAND_MESSAGE
-        ):
-            if self._transport is not None:
-                self._transport.disconnect()
-                self._transport = None
-            if self._pending_error_num == TNS_ERR_EXCEEDED_IDLE_TIME:
-                errors._raise_err(errors.ERR_EXCEEDED_IDLE_TIME)
-            else:
-                errors._raise_err(errors.ERR_UNSUPPORTED_INBAND_NOTIFICATION,
-                                  err_num=self._pending_error_num)
-        elif self._transport is None or self._transport._transport is None:
-            if self._pending_error_num == TNS_ERR_SESSION_SHUTDOWN:
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED)
-            errors._raise_err(errors.ERR_NOT_CONNECTED)
-
-    cdef int _get_int_length_and_sign(self, uint8_t *length,
-                                      bint *is_negative,
-                                      uint8_t max_length) except -1:
-        """
-        Returns the length of an integer sent on the wire. A check is also made
-        to ensure the integer does not exceed the maximum length. If the
-        is_negative pointer is NULL, negative integers will result in an
-        exception being raised.
-        """
-        cdef const char_type *ptr = self._get_raw(1)
-        if ptr[0] & 0x80:
-            if is_negative == NULL:
-                errors._raise_err(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER)
-            is_negative[0] = True
-            length[0] = ptr[0] & 0x7f
-        else:
-            if is_negative != NULL:
-                is_negative[0] = False
-            length[0] = ptr[0]
-        if length[0] > max_length:
-            errors._raise_err(errors.ERR_INTEGER_TOO_LARGE, length=length[0],
-                              max_length=max_length)
-
-    cdef const char_type* _get_raw(self, ssize_t num_bytes,
-                                   bint in_chunked_read=False) except NULL:
-        """
-        Returns a pointer to a buffer containing the requested number of bytes.
-        This may be split across multiple packets in which case a chunked bytes
-        buffer is used.
-        """
-        cdef:
-            ssize_t num_bytes_left, num_bytes_split, max_split_data
-            const char_type *source_ptr
-            char_type *dest_ptr
-
-        # if no bytes are left in the buffer, a new packet needs to be fetched
-        # before anything else can take place
-        if self._pos == self._size:
-            self.wait_for_packets_sync(check_marker=True)
-
-        # if there is enough room in the buffer to satisfy the number of bytes
-        # requested, return a pointer to the current location and advance the
-        # offset the required number of bytes
-        source_ptr = &self._data[self._pos]
-        num_bytes_left = self._size - self._pos
-        if num_bytes <= num_bytes_left:
-            if in_chunked_read:
-                dest_ptr = self._chunked_bytes_buf.get_chunk_ptr(num_bytes)
-                memcpy(dest_ptr, source_ptr, num_bytes)
-            self._pos += num_bytes
-            return source_ptr
-
-        # the requested bytes are split across multiple packets; if a chunked
-        # read is in progress, a chunk is acquired that will accommodate the
-        # remainder of the bytes in the current packet; otherwise, the split
-        # buffer will be used instead (after first checking to see if there is
-        # sufficient room available within it)
-        if in_chunked_read:
-            dest_ptr = self._chunked_bytes_buf.get_chunk_ptr(num_bytes_left)
-        else:
-            max_split_data = sizeof(self._split_data)
-            if max_split_data < num_bytes:
-                errors._raise_err(errors.ERR_BUFFER_LENGTH_INSUFFICIENT,
-                                  actual_buffer_len=max_split_data,
-                                  required_buffer_len=num_bytes)
-            dest_ptr = <char_type*> self._split_data
-        memcpy(dest_ptr, source_ptr, num_bytes_left)
-
-        # acquire packets until the requested number of bytes is satisfied
-        num_bytes -= num_bytes_left
-        while num_bytes > 0:
-
-            # advance to next packet
-            self.wait_for_packets_sync(check_marker=True)
-
-            # copy data into the chunked buffer or split buffer, as appropriate
-            source_ptr = &self._data[self._pos]
-            num_bytes_split = min(num_bytes, self._size - self._pos)
-            if in_chunked_read:
-                dest_ptr = \
-                        self._chunked_bytes_buf.get_chunk_ptr(num_bytes_split)
-            else:
-                dest_ptr = <char_type*> &self._split_data[num_bytes_left]
-            memcpy(dest_ptr, source_ptr, num_bytes_split)
-            self._pos += num_bytes_split
-            num_bytes -= num_bytes_split
-
-        # return the split buffer unconditionally; if performing a chunked read
-        # the return value is ignored anyway
-        return self._split_data
-
-    cdef int _process_control_packet(self, Packet packet) except -1:
-        """
-        Processes a control packet.
-        """
-        cdef:
-            uint16_t control_type
-            Buffer buf
-        buf = Buffer.__new__(Buffer)
-        buf._populate_from_bytes(packet.buf)
-        buf.skip_raw_bytes(8)               # skip packet header
-        buf.read_uint16be(&control_type)
-        if control_type == TNS_CONTROL_TYPE_RESET_OOB:
-            self._caps.supports_oob = False
-        elif control_type == TNS_CONTROL_TYPE_INBAND_NOTIFICATION:
-            buf.skip_raw_bytes(4)           # skip first integer
-            buf.read_uint32be(&self._pending_error_num)
-
-    cdef int _process_packet(self, Packet packet,
-                             bint *notify_waiter,
-                             bint check_connected) except -1:
-        """
-        Processes a packet. If the packet is a control packet it is processed
-        immediately and discarded; if the packet is a marker packet and a
-        pipeline is being processed, the packet is discarded; otherwise, it is
-        added to the list of saved packets for this response. If the protocol
-        supports sending the end of request notification we wait for that
-        message type to be returned at the end of the packet.
-        """
-        if packet.packet_type == TNS_PACKET_TYPE_CONTROL:
-            self._process_control_packet(packet)
-            notify_waiter[0] = False
-            if check_connected:
-                self._check_connected()
-        elif self._in_pipeline \
-                and packet.packet_type == TNS_PACKET_TYPE_MARKER:
-            notify_waiter[0] = False
-        else:
-            self._saved_packets.append(packet)
-            notify_waiter[0] = \
-                    packet.packet_type != TNS_PACKET_TYPE_DATA \
-                    or not self._check_request_boundary \
-                    or packet.has_end_of_response()
-
-    cdef int _read_raw_bytes_and_length(self, const char_type **ptr,
-                                        ssize_t *num_bytes) except -1:
-        """
-        Helper function that processes the length. If the length is defined as
-        TNS_LONG_LENGTH_INDICATOR, a chunked read is performed.
-        """
-        cdef uint32_t temp_num_bytes
-        if num_bytes[0] != TNS_LONG_LENGTH_INDICATOR:
-            return Buffer._read_raw_bytes_and_length(self, ptr, num_bytes)
-        self._chunked_bytes_buf.start_chunked_read()
-        num_bytes[0] = 0
-        while True:
-            self.read_ub4(&temp_num_bytes)
-            if temp_num_bytes == 0:
-                break
-            num_bytes[0] += temp_num_bytes
-            self._get_raw(temp_num_bytes, in_chunked_read=True)
-        ptr[0] = self._chunked_bytes_buf.end_chunked_read()
-
-    cdef int _start_packet(self) except -1:
-        """
-        Starts a packet. This prepares the current packet for processing.
-        """
-        cdef uint16_t data_flags
-        self._current_packet = self._saved_packets[self._next_packet_pos]
-        self._next_packet_pos += 1
-        self._populate_from_bytes(self._current_packet.buf)
-        self._pos = PACKET_HEADER_SIZE
-        if self._current_packet.packet_type == TNS_PACKET_TYPE_DATA:
-            self.read_uint16be(&data_flags)
-            if data_flags == TNS_DATA_FLAGS_EOF:
-                self._pending_error_num = TNS_ERR_SESSION_SHUTDOWN
-
-    async def discard_pipeline_responses(self, ssize_t num_responses):
-        """
-        Discards the specified number of responses after the pipeline has
-        encountered an exception.
-        """
-        while num_responses > 0:
-            if not self.has_response():
-                await self.wait_for_response_async()
-            while True:
-                self._start_packet()
-                if self._current_packet.has_end_of_response():
-                    break
-            num_responses -= 1
-        self.reset_packets()
-
-    cdef int notify_packet_received(self) except -1:
-        """
-        Notify the registered waiter that a packet has been received. This is
-        only used by the asyncio implementation.
-        """
-        if self._waiter is not None:
-            self._waiter.set_result(None)
-            self._waiter = None
-
-    cdef ThinDbObjectImpl read_dbobject(self, BaseDbObjectTypeImpl typ_impl):
-        """
-        Read a database object from the buffer and return a DbObject object
-        containing it.
-        it.
-        """
-        cdef:
-            bytes oid = None, toid = None
-            ThinDbObjectImpl obj_impl
-            uint32_t num_bytes
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # type OID
-            toid = self.read_bytes()
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # OID
-            oid = self.read_bytes()
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # snapshot
-            self.read_bytes()
-        self.skip_ub2()                     # version
-        self.read_ub4(&num_bytes)           # length of data
-        self.skip_ub2()                     # flags
-        if num_bytes > 0:
-            obj_impl = ThinDbObjectImpl.__new__(ThinDbObjectImpl)
-            obj_impl.type = typ_impl
-            obj_impl.toid = toid
-            obj_impl.oid = oid
-            obj_impl.packed_data = self.read_bytes()
-            return obj_impl
-
-    cdef object read_oson(self):
-        """
-        Read an OSON value from the buffer and return the converted value. OSON
-        is sent as a LOB value with all of the data prefetched. Since the LOB
-        locator is not required it is simply discarded.
-        it.
-        """
-        cdef:
-            OsonDecoder decoder
-            uint32_t num_bytes
-            bytes data
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            self.skip_ub8()             # size (unused)
-            self.skip_ub4()             # chunk size (unused)
-            data = self.read_bytes()
-            self.read_bytes()           # LOB locator (unused)
-            decoder = OsonDecoder.__new__(OsonDecoder)
-            return decoder.decode(data)
-
-    cdef object read_lob_with_length(self, BaseThinConnImpl conn_impl,
-                                     DbType dbtype, object lob):
-        """
-        Read a LOB locator from the buffer and return a LOB object containing
-        it.
-        """
-        cdef:
-            uint32_t chunk_size, num_bytes
-            BaseThinLobImpl lob_impl
-            uint64_t size
-            bytes locator
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            if dbtype._ora_type_num == ORA_TYPE_NUM_BFILE:
-                size = chunk_size = 0
-            else:
-                self.read_ub8(&size)
-                self.read_ub4(&chunk_size)
-            locator = self.read_bytes()
-            if lob is None:
-                lob = lob_impl = conn_impl._create_lob_impl(dbtype, locator)
-            else:
-                lob_impl = lob._impl
-                lob_impl._locator = locator
-            lob_impl._size = size
-            lob_impl._chunk_size = chunk_size
-            lob_impl._has_metadata = dbtype._ora_type_num != ORA_TYPE_NUM_BFILE
-            return lob
-
-    cdef const char_type* read_raw_bytes(self, ssize_t num_bytes) except NULL:
-        """
-        Read the specified number of bytes from the packet and return them.
-        """
-        self._chunked_bytes_buf.start_chunked_read()
-        self._get_raw(num_bytes, in_chunked_read=True)
-        return self._chunked_bytes_buf.end_chunked_read()
-
-    cdef int read_rowid(self, Rowid *rowid) except -1:
-        """
-        Reads a rowid from the buffer and populates the rowid structure.
-        """
-        self.read_ub4(&rowid.rba)
-        self.read_ub2(&rowid.partition_id)
-        self.skip_ub1()
-        self.read_ub4(&rowid.block_num)
-        self.read_ub2(&rowid.slot_num)
-
-    cdef object read_urowid(self):
-        """
-        Read a universal rowid from the buffer and return the Python object
-        representing its value.
-        """
-        cdef:
-            ssize_t output_len, input_len, remainder, pos
-            int input_offset = 1, output_offset = 0
-            const char_type *input_ptr
-            bytearray output_value
-            uint32_t num_bytes
-            uint8_t length
-            Rowid rowid
-
-        # get data (first buffer contains the length, which can be ignored)
-        self.read_raw_bytes_and_length(&input_ptr, &input_len)
-        if input_ptr == NULL:
-            return None
-        self.read_raw_bytes_and_length(&input_ptr, &input_len)
-
-        # handle physical rowid
-        if input_ptr[0] == 1:
-            rowid.rba = decode_uint32be(&input_ptr[1])
-            rowid.partition_id = decode_uint16be(&input_ptr[5])
-            rowid.block_num = decode_uint32be(&input_ptr[7])
-            rowid.slot_num = decode_uint16be(&input_ptr[11])
-            return _encode_rowid(&rowid)
-
-        # handle logical rowid
-        output_len = (input_len // 3) * 4
-        remainder = input_len % 3
-        if remainder == 1:
-            output_len += 1
-        elif remainder == 2:
-            output_len += 3
-        output_value = bytearray(output_len)
-        input_len -= 1
-        output_value[0] = 42            # '*'
-        output_offset += 1
-        while input_len > 0:
-
-            # produce first byte of quadruple
-            pos = input_ptr[input_offset] >> 2
-            output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-            output_offset += 1
-
-            # produce second byte of quadruple, but if only one byte is left,
-            # produce that one byte and exit
-            pos = (input_ptr[input_offset] & 0x3) << 4
-            if input_len == 1:
-                output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-                break
-            input_offset += 1
-            pos |= ((input_ptr[input_offset] & 0xf0) >> 4)
-            output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-            output_offset += 1
-
-            # produce third byte of quadruple, but if only two bytes are left,
-            # produce that one byte and exit
-            pos = (input_ptr[input_offset] & 0xf) << 2
-            if input_len == 2:
-                output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-                break
-            input_offset += 1
-            pos |= ((input_ptr[input_offset] & 0xc0) >> 6)
-            output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-            output_offset += 1
-
-            # produce final byte of quadruple
-            pos = input_ptr[input_offset] & 0x3f
-            output_value[output_offset] = TNS_BASE64_ALPHABET_ARRAY[pos]
-            output_offset += 1
-            input_offset += 1
-            input_len -= 3
-
-        return bytes(output_value).decode()
-
-    cdef object read_vector(self):
-        """
-        Read a VECTOR value from the buffer and return the converted value.
-        VECTOR is sent as a LOB value with all of the data prefetched. Since
-        the LOB locator is not required it is simply discarded.
-        it.
-        """
-        cdef:
-            VectorDecoder decoder
-            uint32_t num_bytes
-            bytes data
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:
-            self.skip_ub8()             # size (unused)
-            self.skip_ub4()             # chunk size (unused)
-            data = self.read_bytes()
-            self.read_bytes()           # LOB locator (unused)
-            if data:
-                decoder = VectorDecoder.__new__(VectorDecoder)
-                return decoder.decode(data)
-
-    cdef object read_xmltype(self, BaseThinConnImpl conn_impl):
-        """
-        Reads an XMLType value from the buffer and returns the string value.
-        The XMLType object is a special DbObjectType and is handled separately
-        since the structure is a bit different.
-        """
-        cdef:
-            DbObjectPickleBuffer buf
-            uint32_t num_bytes
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # type OID
-            self.read_bytes()
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # OID
-            self.read_bytes()
-        self.read_ub4(&num_bytes)
-        if num_bytes > 0:                   # snapshot
-            self.read_bytes()
-        self.skip_ub2()                     # version
-        self.read_ub4(&num_bytes)           # length of data
-        self.skip_ub2()                     # flags
-        if num_bytes > 0:
-            buf = DbObjectPickleBuffer.__new__(DbObjectPickleBuffer)
-            buf._populate_from_bytes(self.read_bytes())
-            return buf.read_xmltype(conn_impl)
-
-    cdef int check_control_packet(self) except -1:
-        """
-        Checks for a control packet or final close packet from the server.
-        """
-        cdef:
-            bint notify_waiter
-            Packet packet
-        packet = self._transport.read_packet(raise_exc=False)
-        if packet is None:
-            self._pending_error_num = TNS_ERR_SESSION_SHUTDOWN
-        else:
-            self._process_packet(packet, &notify_waiter, False)
-            if notify_waiter:
-                self._start_packet()
-
-    cdef bint has_response(self):
-        """
-        Returns a boolean indicating if the list of saved packets contains all
-        of the packets for a response from the database. This method can only
-        be called if support for the end of response bit is present.
-        """
-        cdef:
-            Packet packet
-            ssize_t i, max_pos
-        for i in range(self._next_packet_pos, len(self._saved_packets)):
-            packet = <Packet> self._saved_packets[i]
-            if packet.has_end_of_response():
-                return True
-        return False
-
-    cdef int reset_packets(self) except -1:
-        """
-        Resets the list of saved packets and the saved position (called when a
-        request has been sent to the database and a response is expected).
-        """
-        self._saved_packets = []
-        self._next_packet_pos = 0
-        self._saved_packet_pos = 0
-        self._saved_pos = 0
-
-    cdef int restore_point(self) except -1:
-        """
-        Restores the position in the packets to the last saved point. This is
-        needed by asyncio where an ansychronous wait for more packets is
-        required so the processing of the response must be restarted at a known
-        position.
-        """
-        if self._saved_packet_pos != self._next_packet_pos - 1:
-            self._current_packet = self._saved_packets[self._saved_packet_pos]
-            self._populate_from_bytes(self._current_packet.buf)
-            self._next_packet_pos = self._saved_packet_pos + 1
-        self._pos = self._saved_pos
-
-    cdef int save_point(self) except -1:
-        """
-        Saves the current position in the packets. This is needed by asyncio
-        where an asynchronous wait for more packets is required so the
-        processing of the response must be restarted at a known position.
-        """
-        self._saved_packet_pos = self._next_packet_pos - 1
-        self._saved_pos = self._pos
-
-    cdef int skip_raw_bytes_chunked(self) except -1:
-        """
-        Skip a number of bytes that may or may not be chunked in the buffer.
-        The first byte gives the length. If the length is
-        TNS_LONG_LENGTH_INDICATOR, however, chunks are read and discarded.
-        """
-        cdef:
-            uint32_t temp_num_bytes
-            uint8_t length
-        self.read_ub1(&length)
-        if length != TNS_LONG_LENGTH_INDICATOR:
-            self.skip_raw_bytes(length)
-        else:
-            while True:
-                self.read_ub4(&temp_num_bytes)
-                if temp_num_bytes == 0:
-                    break
-                self.skip_raw_bytes(temp_num_bytes)
-
-    async def wait_for_packets_async(self):
-        """
-        Wait for packets to arrive in response to the request that was sent to
-        the database (using asyncio).
-        """
-        if self._next_packet_pos >= len(self._saved_packets):
-            self._waiter = self._loop.create_future()
-            await self._waiter
-        self._start_packet()
-
-    cdef int wait_for_packets_sync(self, bint check_marker=False) except -1:
-        """
-        Wait for packets to arrive in response to the request that was sent to
-        the database (synchronously). If no packets are available and we are
-        using asyncio, raise an exception so that processing can be restarted
-        once packets have arrived. If the check_marker flag is set and a marker
-        is detected, throw an exception so that the protocol can process it
-        accordingly. This is required because the server can send a marker
-        packet in the middle of the data packets that form the response to the
-        client's request.
-        """
-        cdef:
-            bint notify_waiter
-            Packet packet
-        if self._next_packet_pos >= len(self._saved_packets):
-            if self._transport._is_async:
-                raise OutOfPackets()
-            while True:
-                packet = self._transport.read_packet()
-                self._process_packet(packet, &notify_waiter, True)
-                if notify_waiter:
-                    break
-        self._start_packet()
-        if check_marker \
-                and self._current_packet.packet_type == TNS_PACKET_TYPE_MARKER:
-            raise MarkerDetected()
-
-    async def wait_for_response_async(self):
-        """
-        Wait for packets to arrive in response to the request that was sent
-        to the database (using asyncio). This method will not return until the
-        complete response has been received. This requires the "end of
-        response" capability available in Oracle Database version 23, and
-        later. This method also assumes that the current list of saved packets
-        does not contain a full response.
-        """
-        try:
-            self._check_request_boundary = True
-            self._waiter = self._loop.create_future()
-            await self._waiter
-        finally:
-            self._check_request_boundary = False
-
-
-@cython.final
-cdef class WriteBuffer(Buffer):
-
-    cdef:
-        uint8_t _packet_type
-        uint8_t _packet_flags
-        uint16_t _data_flags
-        Capabilities _caps
-        Transport _transport
-        uint8_t _seq_num
-        bint _packet_sent
-
-    def __cinit__(self, Transport transport, Capabilities caps):
-        self._transport = transport
-        self._caps = caps
-        self._size_for_sdu()
-
-    cdef int _send_packet(self, bint final_packet) except -1:
-        """
-        Write the packet header and then send the packet. Once sent, reset the
-        pointers back to an empty packet.
-        """
-        cdef ssize_t size = self._pos
-        self._pos = 0
-        if self._caps.protocol_version >= TNS_VERSION_MIN_LARGE_SDU:
-            self.write_uint32be(size)
-        else:
-            self.write_uint16be(size)
-            self.write_uint16be(0)
-        self.write_uint8(self._packet_type)
-        self.write_uint8(self._packet_flags)
-        self.write_uint16be(0)
-        if self._packet_type == TNS_PACKET_TYPE_DATA:
-            self.write_uint16be(self._data_flags)
-        self._pos = size
-        self._transport.write_packet(self)
-        self._packet_sent = True
-        self._pos = PACKET_HEADER_SIZE
-        if not final_packet and self._packet_type == TNS_PACKET_TYPE_DATA:
-            self._pos += sizeof(uint16_t)   # allow space for data flags
-
-    cdef int _size_for_sdu(self) except -1:
-        """
-        Resizes the buffer based on the SDU size of the capabilities.
-        """
-        self._initialize(self._caps.sdu)
-
-    cdef int _write_more_data(self, ssize_t num_bytes_available,
-                              ssize_t num_bytes_wanted) except -1:
-        """
-        Called when the amount of buffer available is less than the amount of
-        data requested. This sends the packet to the server and then resets the
-        buffer for further writing.
-        """
-        self._send_packet(final_packet=False)
-
-    cdef int end_request(self) except -1:
-        """
-        Indicates that the request from the client is completing and will send
-        any packet remaining, if necessary.
-        """
-        if self._pos > PACKET_HEADER_SIZE:
-            self._send_packet(final_packet=True)
-
-    cdef inline ssize_t max_payload_bytes(self):
-        """
-        Return the maximum number of bytes that can be sent in a packet. This
-        is the maximum size of the entire packet, less the bytes in the header
-        and 2 bytes for the data flags.
-        """
-        return self._max_size - PACKET_HEADER_SIZE - 2
-
-    cdef void start_request(self, uint8_t packet_type, uint8_t packet_flags=0,
-                            uint16_t data_flags=0):
-        """
-        Indicates that a request from the client is starting. The packet type
-        is retained just in case a request spans multiple packets. The packet
-        header (8 bytes in length) is written when a packet is actually being
-        sent and so is skipped at this point.
-        """
-        self._packet_sent = False
-        self._packet_type = packet_type
-        self._packet_flags = packet_flags
-        self._pos = PACKET_HEADER_SIZE
-        if packet_type == TNS_PACKET_TYPE_DATA:
-            self._data_flags = data_flags
-            self._pos += sizeof(uint16_t)
-
-    cdef object write_dbobject(self, ThinDbObjectImpl obj_impl):
-        """
-        Writes a database object to the buffer.
-        """
-        cdef:
-            ThinDbObjectTypeImpl typ_impl = obj_impl.type
-            uint32_t num_bytes
-            bytes packed_data
-        self.write_ub4(len(obj_impl.toid))
-        self.write_bytes_with_length(obj_impl.toid)
-        if obj_impl.oid is None:
-            self.write_ub4(0)
-        else:
-            self.write_ub4(len(obj_impl.oid))
-            self.write_bytes_with_length(obj_impl.oid)
-        self.write_ub4(0)                   # snapshot
-        self.write_ub4(0)                   # version
-        packed_data = obj_impl._get_packed_data()
-        self.write_ub4(len(packed_data))
-        self.write_ub4(obj_impl.flags)      # flags
-        self.write_bytes_with_length(packed_data)
-
-    cdef int write_keyword_value_pair(self, str text_value, bytes binary_value,
-                                      uint16_t keyword) except -1:
-        """
-        Writes a keyword/value pair (text and binary values) to the buffer.
-        """
-        cdef bytes text_value_bytes
-        if text_value is None:
-            self.write_ub4(0)
-        else:
-            text_value_bytes = text_value.encode()
-            self.write_ub4(len(text_value_bytes))
-            self.write_bytes_with_length(text_value_bytes)
-        if binary_value is None:
-            self.write_ub4(0)
-        else:
-            self.write_ub4(len(binary_value))
-            self.write_bytes_with_length(binary_value)
-        self.write_ub2(keyword)
-
-    cdef int write_lob_with_length(self, BaseThinLobImpl lob_impl) except -1:
-        """
-        Writes a LOB locator to the buffer.
-        """
-        self.write_ub4(len(lob_impl._locator))
-        self.write_bytes_with_length(lob_impl._locator)
-
-    cdef int write_qlocator(self, uint64_t data_length,
-                            bint write_length=True) except -1:
-        """
-        Writes a QLocator. QLocators are always 40 bytes in length.
-        """
-        self.write_ub4(40)                  # QLocator length
-        if write_length:
-            self.write_uint8(40)            # chunk length
-        self.write_uint16be(38)             # QLocator length less 2 bytes
-        self.write_uint16be(TNS_LOB_QLOCATOR_VERSION)
-        self.write_uint8(TNS_LOB_LOC_FLAGS_VALUE_BASED | \
-                         TNS_LOB_LOC_FLAGS_BLOB | \
-                         TNS_LOB_LOC_FLAGS_ABSTRACT)
-        self.write_uint8(TNS_LOB_LOC_FLAGS_INIT)
-        self.write_uint16be(0)              # additional flags
-        self.write_uint16be(1)              # byt1
-        self.write_uint64be(data_length)
-        self.write_uint16be(0)              # unused
-        self.write_uint16be(0)              # csid
-        self.write_uint16be(0)              # unused
-        self.write_uint64be(0)              # unused
-        self.write_uint64be(0)              # unused
-
-    cdef int write_oson(self, value, ssize_t max_fname_size,
-                        bint write_length=True) except -1:
-        """
-        Encodes the given value to OSON and then writes that to the buffer.
-        it.
-        """
-        cdef OsonEncoder encoder = OsonEncoder.__new__(OsonEncoder)
-        encoder.encode(value, max_fname_size)
-        self.write_qlocator(encoder._pos, write_length)
-        self._write_raw_bytes_and_length(encoder._data, encoder._pos)
-
-    cdef int write_seq_num(self) except -1:
-        self._seq_num += 1
-        if self._seq_num == 0:
-            self._seq_num = 1
-        self.write_uint8(self._seq_num)
-
-    cdef int write_vector(self, value) except -1:
-        """
-        Encodes the given value to VECTOR and then writes that to the buffer.
-        """
-        cdef VectorEncoder encoder = VectorEncoder.__new__(VectorEncoder)
-        encoder.encode(value)
-        self.write_qlocator(encoder._pos)
-        self._write_raw_bytes_and_length(encoder._data, encoder._pos)
diff --git a/src/oracledb/impl/thin/pool.pyx b/src/oracledb/impl/thin/pool.pyx
deleted file mode 100644
index c274dbc7..00000000
--- a/src/oracledb/impl/thin/pool.pyx
+++ /dev/null
@@ -1,1077 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# pool.pyx
-#
-# Cython file defining the pool implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseThinPoolImpl(BasePoolImpl):
-
-    cdef:
-        list _free_new_conn_impls
-        list _free_used_conn_impls
-        list _busy_conn_impls
-        list _conn_impls_to_drop
-        list _requests
-        uint32_t _getmode
-        uint32_t _stmt_cache_size
-        uint32_t _timeout
-        uint32_t _max_lifetime_session
-        uint32_t _auth_mode
-        uint32_t _open_count
-        uint32_t _num_to_create
-        int _ping_interval
-        uint32_t _ping_timeout
-        object _wait_timeout
-        object _bg_task
-        object _bg_task_condition
-        object _condition
-        object _timeout_task
-        object _ssl_session
-        bint _force_get
-        bint _open
-
-    def __init__(self, str dsn, PoolParamsImpl params):
-        _check_cryptography()
-        params._check_credentials()
-        self.connect_params = params
-        self.username = params.user
-        self.dsn = dsn
-        self.min = params.min
-        self.max = params.max
-        self.increment = params.increment
-        self.homogeneous = params.homogeneous
-        self.set_getmode(params.getmode)
-        self.set_wait_timeout(params.wait_timeout)
-        self.set_timeout(params.timeout)
-        self._stmt_cache_size = params.stmtcachesize
-        self._max_lifetime_session = params.max_lifetime_session
-        self._ping_interval = params.ping_interval
-        self._ping_timeout = params.ping_timeout
-        self._free_new_conn_impls = []
-        self._free_used_conn_impls = []
-        self._busy_conn_impls = []
-        self._conn_impls_to_drop = []
-        self._requests = []
-        self._num_to_create = self.min
-        self._auth_mode = AUTH_MODE_DEFAULT
-        if params._default_description.cclass is None \
-                and params._get_uses_drcp():
-            params._default_description.cclass = \
-                    f"DPY:{base64.b64encode(uuid.uuid4().bytes).decode()}"
-        self._open = True
-
-    cdef int _add_request(self, PooledConnRequest request) except -1:
-        """
-        Adds a request for the background task to process.
-        """
-        request.bg_processing = True
-        request.completed = False
-        self._requests.append(request)
-        self._notify_bg_task()
-
-    cdef int _check_timeout(self) except -1:
-        """
-        Checks whether a timeout is in effect and that the number of
-        connections exceeds the minimum and if so, starts a timer to check
-        if these connections have expired. Only one task is ever started.
-        The timeout value is increased by a second to allow for small time
-        discrepancies.
-        """
-        if self._open and self._timeout_task is None and self._timeout > 0 \
-                and self._open_count > self.min:
-            self._start_timeout_task()
-
-    cdef int _close_all_connections(self) except -1:
-        """
-        Closes all connections in the pool and marks the pool as closed. The
-        background task is notified to perform the work of closing the
-        connections, if applicable.
-        """
-        cdef BaseThinConnImpl conn_impl
-        self._open = False
-        for lst in (self._free_used_conn_impls,
-                    self._free_new_conn_impls,
-                    self._busy_conn_impls):
-            self._conn_impls_to_drop.extend(lst)
-            for conn_impl in lst:
-                conn_impl._is_pooled = False
-            lst.clear()
-        self._notify_bg_task()
-
-    cdef int _close_helper(self, bint force) except -1:
-        """
-        Helper function that closes all of the connections in the pool.
-        """
-
-        # if force parameter is not True and busy connections exist in the
-        # pool or there are outstanding requests, raise an exception
-        if not force and (self.get_busy_count() > 0 or self._requests):
-            errors._raise_err(errors.ERR_POOL_HAS_BUSY_CONNECTIONS)
-
-        # close all connections in the pool
-        self._close_all_connections()
-
-    cdef PooledConnRequest _create_request(self, ConnectParamsImpl params):
-        """
-        Returns a poooled connection request suitable for establishing a
-        connection to the pool with the given parameters.
-        """
-        cdef:
-            ConnectParamsImpl creation_params = self.connect_params
-            str pool_cclass = creation_params._default_description.cclass
-            PooledConnRequest request
-        request = PooledConnRequest.__new__(PooledConnRequest)
-        request.pool_impl = self
-        request.params = params
-        request.cclass = params._default_description.cclass
-        request.wants_new = (params._default_description.purity == PURITY_NEW)
-        request.cclass_matches = \
-                (request.cclass is None or request.cclass == pool_cclass)
-        request.waiting = True
-        return request
-
-    cdef int _drop_conn_impl(self, BaseThinConnImpl conn_impl) except -1:
-        """
-        Helper method which adds a connection to the list of connections to be
-        closed and notifies the background task.
-        """
-        conn_impl._is_pooled = False
-        if conn_impl._protocol._transport is not None:
-            self._conn_impls_to_drop.append(conn_impl)
-            self._notify_bg_task()
-        self._ensure_min_connections()
-
-    cdef int _ensure_min_connections(self) except -1:
-        """
-        Ensure that the minimum number of connections in the pool is
-        maintained.
-        """
-        if self._open_count < self.min:
-            self._num_to_create = max(self._num_to_create,
-                                      self.min - self._open_count)
-            self._notify_bg_task()
-
-    cdef PooledConnRequest _get_next_request(self):
-        """
-        Get the next request to process.
-        """
-        cdef PooledConnRequest request
-        for request in self._requests:
-            if not request.waiting \
-                    or request.requires_ping \
-                    or request.is_replacing \
-                    or request.is_extra \
-                    or self._open_count < self.max:
-                request.in_progress = request.waiting
-                return request
-            break
-
-    cdef BaseThinConnImpl _post_acquire(self, BaseThinConnImpl conn_impl):
-        """
-        Called after an acquire has succeeded. The connection is added to the
-        list of busy connections and is marked as being in a request.
-        """
-        self._busy_conn_impls.append(conn_impl)
-        if conn_impl._protocol._caps.supports_request_boundaries:
-            conn_impl._session_state_desired = TNS_SESSION_STATE_REQUEST_BEGIN
-            conn_impl._in_request = True
-        return conn_impl
-
-    cdef int _post_create_conn_impl(self,
-                                    BaseThinConnImpl conn_impl) except -1:
-        """
-        Called after a connection has been created without an associated
-        request.
-        """
-        cdef PooledConnRequest request
-        if conn_impl is None:
-            self._num_to_create = 0
-        elif not self._open:
-            conn_impl._protocol._disconnect()
-        else:
-            self._open_count += 1
-            if self._num_to_create > 0:
-                self._num_to_create -= 1
-            for request in self._requests:
-                if request.in_progress or request.conn_impl is not None \
-                        or not request.waiting:
-                    continue
-                if request.cclass is None \
-                        or request.cclass == conn_impl._cclass:
-                    request.conn_impl = conn_impl
-                    request.completed = True
-                    self._requests.remove(request)
-                    self._condition.notify_all()
-                    break
-                elif not request.cclass_matches \
-                        and self._open_count >= self.max:
-                    request.conn_impl = conn_impl
-                    request.is_replacing = True
-                    break
-            else:
-                self._free_new_conn_impls.append(conn_impl)
-            self._check_timeout()
-
-    cdef int _post_process_request(self, PooledConnRequest request) except -1:
-        """
-        Called after the request has been processed. This removes the request
-        from the list of requests and adds the connection to the appropriate
-        list depending on whether the waiter is still waiting for the request
-        to be satisfied!
-        """
-        request.in_progress = False
-        request.bg_processing = False
-        if request.conn_impl is not None:
-            request.completed = True
-            if not request.is_replacing and not request.requires_ping:
-                self._open_count += 1
-                if self._num_to_create > 0:
-                    self._num_to_create -= 1
-            if not request.waiting:
-                request.reject()
-        elif request.requires_ping:
-            self._open_count -= 1
-            if self._num_to_create == 0 and self._open_count < self.min:
-                self._num_to_create = self.min - self._open_count
-        self._requests.remove(request)
-        self._condition.notify_all()
-
-    cdef int _pre_connect(self, BaseThinConnImpl conn_impl,
-                          ConnectParamsImpl params) except -1:
-        """
-        Called before the connection is connected. The connection class and
-        pool attributes are updated and the TLS session is stored on the
-        transport for reuse. The timestamps are also retained for later use.
-        """
-        if params is not None:
-            conn_impl._cclass = params._default_description.cclass
-        else:
-            conn_impl._cclass = self.connect_params._default_description.cclass
-        conn_impl._is_pooled = True
-        conn_impl._time_created = time.monotonic()
-        conn_impl._time_returned = conn_impl._time_created
-
-    def _process_timeout(self):
-        """
-        Processes the timeout after the timer task completes. Drops any free
-        connections that have expired (while maintaining the minimum number of
-        connections in the pool).
-        """
-        self._timeout_task = None
-        self._timeout_helper(self._free_new_conn_impls)
-        self._timeout_helper(self._free_used_conn_impls)
-        self._check_timeout()
-
-    cdef int _return_connection_helper(self,
-                                       BaseThinConnImpl conn_impl) except -1:
-        """
-        Returns the connection to the pool. If the connection was closed for
-        some reason it will be dropped; otherwise, it will be returned to the
-        list of connections available for further use. If an "extra" connection
-        was created (because the pool has a mode of "force" get or because a
-        different connection class than that used by the pool was requested)
-        then it will be added to the pool or will replace an unused new
-        connection or will be discarded depending on the current pool size.
-        """
-        cdef:
-            bint is_open = conn_impl._protocol._transport is not None
-            PooledConnRequest request
-            double tstamp
-        self._busy_conn_impls.remove(conn_impl)
-        if not is_open:
-            self._open_count -= 1
-            self._ensure_min_connections()
-        if conn_impl._is_pool_extra:
-            conn_impl._is_pool_extra = False
-            if is_open and self._open_count >= self.max:
-                if self._free_new_conn_impls and self._open_count == self.max:
-                    self._drop_conn_impl(self._free_new_conn_impls.pop(0))
-                else:
-                    self._open_count -= 1
-                    self._drop_conn_impl(conn_impl)
-                    is_open = False
-        if is_open:
-            conn_impl._time_returned = time.monotonic()
-            if self._max_lifetime_session != 0:
-                tstamp = conn_impl._time_created + self._max_lifetime_session
-                if conn_impl._time_returned > tstamp:
-                    self._open_count -= 1
-                    self._drop_conn_impl(conn_impl)
-                    is_open = False
-        if is_open:
-            for request in self._requests:
-                if request.in_progress or request.wants_new \
-                        or request.conn_impl is not None \
-                        or not request.waiting:
-                    continue
-                if request.cclass is None \
-                        or request.conn_impl._cclass == self.cclass:
-                    request.conn_impl = conn_impl
-                    request.completed = True
-                    self._requests.remove(request)
-                    self._condition.notify_all()
-                    return 0
-            self._free_used_conn_impls.append(conn_impl)
-        self._check_timeout()
-
-    cdef int _shutdown(self) except -1:
-        """
-        Called when the main interpreter has completed and only shutdown code
-        is being executed.
-        """
-        cdef BaseThinConnImpl conn_impl
-        with self._condition:
-            self._requests.clear()
-            self._close_all_connections()
-        self._bg_task.join()
-
-    cdef int _start_timeout_task(self) except -1:
-        """
-        Starts the task for checking timeouts (differs for sync and async).
-        """
-        pass
-
-    cdef int _timeout_helper(self, list conn_impls_to_check) except -1:
-        """
-        Helper method which checks the list of connections to see if any
-        connections have expired (while maintaining the minimum number of
-        connections in the pool).
-        """
-        cdef BaseThinConnImpl conn_impl
-        current_time = time.monotonic()
-        while conn_impls_to_check and self._open_count > self.min:
-            conn_impl = conn_impls_to_check[0]
-            if current_time - conn_impl._time_returned < self._timeout:
-                break
-            conn_impls_to_check.pop(0)
-            self._drop_conn_impl(conn_impl)
-            self._open_count -= 1
-
-    def get_busy_count(self):
-        """
-        Internal method for getting the number of busy connections in the pool.
-        """
-        return len(self._busy_conn_impls)
-
-    def get_getmode(self):
-        """
-        Internal method for getting the method by which connections are
-        acquired from the pool.
-        """
-        return self._getmode
-
-    def get_max_lifetime_session(self):
-        """
-        Internal method for getting the maximum lifetime of each session.
-        """
-        return self._max_lifetime_session
-
-    def get_open_count(self):
-        """
-        Internal method for getting the number of connections in the pool.
-        """
-        return self._open_count
-
-    def get_ping_interval(self):
-        """
-        Internal method for getting the value of the pool-ping-interval.
-        """
-        return self._ping_interval
-
-    def get_stmt_cache_size(self):
-        """
-        Internal method for getting the size of the statement cache.
-        """
-        return self._stmt_cache_size
-
-    def get_timeout(self):
-        """
-        Internal method for getting the timeout for idle sessions.
-        """
-        return self._timeout
-
-    def get_wait_timeout(self):
-        """
-        Internal method for getting the wait timeout for acquiring sessions.
-        """
-        if self._getmode == POOL_GETMODE_TIMEDWAIT:
-            return self._wait_timeout
-        return 0
-
-    def return_connection(self, BaseThinConnImpl conn_impl, bint in_del=False):
-        """
-        Internal method for returning a connection to the pool.
-        """
-        cdef Protocol protocol = <Protocol> conn_impl._protocol
-        with self._condition:
-            if self._open:
-                try:
-                    protocol._end_request(conn_impl)
-                except:
-                    if not in_del:
-                        raise
-                self._return_connection_helper(conn_impl)
-
-    def set_getmode(self, uint32_t value):
-        """
-        Internal method for setting the method by which connections are
-        acquired from the pool.
-        """
-        if self._getmode != value:
-            self._getmode = value
-            self._force_get = (self._getmode == POOL_GETMODE_FORCEGET)
-            if self._getmode == POOL_GETMODE_TIMEDWAIT:
-                self._wait_timeout = 0
-            else:
-                self._wait_timeout = None
-
-    def set_max_lifetime_session(self, uint32_t value):
-        """
-        Internal method for setting the maximum lifetime of each session.
-        """
-        self._max_lifetime_session = value
-
-    def set_ping_interval(self, int value):
-        """
-        Internal method for setting the value of the pool-ping-interval.
-        """
-        self._ping_interval = value
-
-    def set_stmt_cache_size(self, uint32_t value):
-        """
-        Internal method for setting the size of the statement cache.
-        """
-        self._stmt_cache_size = value
-
-    def set_timeout(self, uint32_t value):
-        """
-        Internal method for setting the timeout for idle sessions.
-        """
-        self._timeout = value
-
-    def set_wait_timeout(self, uint32_t value):
-        """
-        Internal method for setting the wait timeout for acquiring sessions.
-        """
-        if self._getmode == POOL_GETMODE_TIMEDWAIT:
-            self._wait_timeout = value / 1000
-        else:
-            self._wait_timeout = None
-
-
-cdef class ThinPoolImpl(BaseThinPoolImpl):
-
-    def __init__(self, str dsn, PoolParamsImpl params):
-        super().__init__(dsn, params)
-        self._condition = threading.Condition()
-        self._bg_task_condition = threading.Condition()
-        self._bg_task = threading.Thread(target=self._bg_task_func)
-        self._bg_task.start()
-
-    def _bg_task_func(self):
-        """
-        Method which runs in a dedicated thread and is used to create
-        connections and close them when needed. When first started, it creates
-        pool.min connections. After that, it creates pool.increment connections
-        up to the value of pool.max when needed and destroys connections when
-        needed. It also pings connections when requested to do so. The thread
-        terminates automatically when the pool is closed.
-        """
-        cdef:
-            PooledConnRequest request = None
-            ThinConnImpl conn_impl
-            uint32_t num_to_create
-
-        # add to the list of pools that require closing
-        pool_closer.add_pool(self)
-
-        # perform task until pool is closed
-        while self._open or self._conn_impls_to_drop:
-
-            # check to see if there a request to process
-            if request is None and self._open:
-                with self._condition:
-                    request = self._get_next_request()
-            if request is not None and self._open:
-                self._process_request(request)
-                with self._condition:
-                    self._post_process_request(request)
-                    request = self._get_next_request()
-                    continue
-
-            # check to see if there is a connection that needs to be built
-            with self._condition:
-                num_to_create = self._num_to_create
-            if num_to_create > 0 and self._open:
-                try:
-                    conn_impl = self._create_conn_impl()
-                except:
-                    conn_impl = None
-                with self._condition:
-                    self._post_create_conn_impl(conn_impl)
-                    continue
-
-            # check to see if there are any connections to drop
-            with self._condition:
-                if self._conn_impls_to_drop:
-                    conn_impl = self._conn_impls_to_drop.pop()
-                    try:
-                        conn_impl._close()
-                    except:
-                        pass
-                    continue
-
-            # otherwise, nothing to do yet, wait for notifications!
-            with self._bg_task_condition:
-                self._bg_task_condition.wait()
-
-        # stop the timeout task, if one is active
-        if self._timeout_task is not None:
-            self._timeout_task.cancel()
-
-        # remove from the list of pools that require closing
-        pool_closer.remove_pool(self)
-
-    cdef ThinConnImpl _create_conn_impl(self, ConnectParamsImpl params=None):
-        """
-        Create a single connection using the pool's information. This
-        connection may be placed in the pool or may be returned directly (such
-        as when the pool is full and POOL_GETMODE_FORCEGET is being used).
-        """
-        cdef ThinConnImpl conn_impl
-        conn_impl = ThinConnImpl(self.dsn, self.connect_params)
-        self._pre_connect(conn_impl, params)
-        conn_impl.connect(self.connect_params)
-        return conn_impl
-
-    def _notify_bg_task(self):
-        """
-        Notify the background task that work needs to be done.
-        """
-        with self._bg_task_condition:
-            self._bg_task_condition.notify()
-
-    cdef int _process_request(self, PooledConnRequest request) except -1:
-        """
-        Processes a request.
-        """
-        cdef BaseThinConnImpl conn_impl
-        try:
-            if request.requires_ping:
-                try:
-                    request.conn_impl.set_call_timeout(self._ping_timeout)
-                    request.conn_impl.ping()
-                    request.conn_impl.set_call_timeout(0)
-                except exceptions.Error:
-                    request.conn_impl._protocol._disconnect()
-                    request.conn_impl = None
-            else:
-                conn_impl = self._create_conn_impl(request.params)
-                if request.conn_impl is not None:
-                    self._drop_conn_impl(request.conn_impl)
-                request.conn_impl = conn_impl
-                request.conn_impl._is_pool_extra = request.is_extra
-        except Exception as e:
-            request.exception = e
-
-    cdef int _start_timeout_task(self) except -1:
-        """
-        Starts the task for checking timeouts. The timeout value is increased
-        by a second to allow for small time discrepancies.
-        """
-        def handler():
-            with self._condition:
-                self._process_timeout()
-        self._timeout_task = threading.Timer(self._timeout + 1, handler)
-        self._timeout_task.start()
-
-    def acquire(self, ConnectParamsImpl params):
-        """
-        Internal method for acquiring a connection from the pool.
-        """
-        cdef PooledConnRequest request
-
-        # if pool is closed, raise an exception
-        if not self._open:
-            errors._raise_err(errors.ERR_POOL_NOT_OPEN)
-
-        # session tagging has not been implemented yet
-        if params.tag is not None:
-            errors._raise_not_supported("session tagging")
-
-        # wait until an acceptable connection is found
-        request = self._create_request(params)
-        with self._condition:
-            try:
-                self._condition.wait_for(request.fulfill, self._wait_timeout)
-            except:
-                if not request.bg_processing:
-                    request.reject()
-                raise
-            finally:
-                request.waiting = False
-            if not request.completed:
-                errors._raise_err(errors.ERR_POOL_NO_CONNECTION_AVAILABLE)
-            return self._post_acquire(request.conn_impl)
-
-    def close(self, bint force):
-        """
-        Internal method for closing the pool. Note that the thread to destroy
-        pools gracefully may have already run, so if the close has already
-        happened, nothing more needs to be done!
-        """
-        if self._open:
-            with self._condition:
-                self._close_helper(force)
-            self._bg_task.join()
-
-    def drop(self, ThinConnImpl conn_impl):
-        """
-        Internal method for dropping a connection from the pool.
-        """
-        with self._condition:
-            self._open_count -= 1
-            self._busy_conn_impls.remove(conn_impl)
-            self._drop_conn_impl(conn_impl)
-            self._condition.notify()
-
-
-cdef class AsyncThinPoolImpl(BaseThinPoolImpl):
-
-    cdef:
-        object _bg_notify_task
-
-    def __init__(self, str dsn, PoolParamsImpl params):
-        super().__init__(dsn, params)
-        self._condition = asyncio.Condition()
-        self._bg_task_condition = asyncio.Condition()
-        self._bg_task = asyncio.create_task(self._bg_task_func())
-
-    async def _acquire_helper(self, PooledConnRequest request):
-        """
-        Helper function for acquiring a connection from the pool.
-        """
-        async with self._condition:
-            try:
-                await self._condition.wait_for(request.fulfill)
-            except:
-                if not request.bg_processing:
-                    request.reject()
-                raise
-            finally:
-                request.waiting = False
-
-    async def _bg_task_func(self):
-        """
-        Method which runs in a dedicated task and is used to create connections
-        and close them when needed. When first started, it creates pool.min
-        connections. After that, it creates pool.increment connections up to
-        the value of pool.max when needed and destroys connections when needed.
-        The task terminates automatically when the pool is closed.
-        """
-        cdef:
-            PooledConnRequest request = None
-            BaseThinConnImpl conn_impl
-            list conn_impls_to_drop
-            uint32_t num_to_create
-
-        # perform task until pool is closed
-        while self._open or self._conn_impls_to_drop:
-
-            # check to see if there a request to process
-            if request is None and self._open:
-                async with self._condition:
-                    request = self._get_next_request()
-            if request is not None and self._open:
-                await self._process_request(request)
-                async with self._condition:
-                    self._post_process_request(request)
-                    request = self._get_next_request()
-                    continue
-
-            # check to see if there is a connection that needs to be built
-            async with self._condition:
-                num_to_create = self._num_to_create
-            if num_to_create > 0 and self._open:
-                try:
-                    conn_impl = await self._create_conn_impl()
-                except asyncio.CancelledError:
-                    raise
-                except:
-                    conn_impl = None
-                async with self._condition:
-                    self._post_create_conn_impl(conn_impl)
-                    continue
-
-            # check to see if there are any connections to drop
-            async with self._condition:
-                if self._conn_impls_to_drop:
-                    conn_impl = self._conn_impls_to_drop.pop()
-                    try:
-                        await conn_impl._protocol._close(conn_impl)
-                    except asyncio.CancelledError:
-                        raise
-                    except:
-                        pass
-                    continue
-
-            # otherwise, nothing to do yet, wait for notifications!
-            async with self._bg_task_condition:
-                await self._bg_task_condition.wait()
-
-        # stop the timeout task, if one is active
-        if self._timeout_task is not None:
-            self._timeout_task.cancel()
-
-    async def _create_conn_impl(self, ConnectParamsImpl params=None):
-        """
-        Create a single connection using the pool's information. This
-        connection may be placed in the pool or may be returned directly (such
-        as when the pool is full and POOL_GETMODE_FORCEGET is being used).
-        """
-        cdef AsyncThinConnImpl conn_impl
-        conn_impl = AsyncThinConnImpl(self.dsn, self.connect_params)
-        self._pre_connect(conn_impl, params)
-        await conn_impl.connect(self.connect_params)
-        return conn_impl
-
-    def _notify_bg_task(self):
-        """
-        Notify the background task that work needs to be done.
-        """
-        if self._bg_notify_task is None or self._bg_notify_task.done():
-            async def helper():
-                async with self._bg_task_condition:
-                    self._bg_task_condition.notify()
-            self._bg_notify_task = asyncio.create_task(helper())
-
-    async def _process_request(self, PooledConnRequest request):
-        """
-        Processes a request.
-        """
-        cdef BaseThinConnImpl conn_impl
-        try:
-            if request.requires_ping:
-                try:
-                    request.conn_impl.set_call_timeout(self._ping_timeout)
-                    await request.conn_impl.ping()
-                    request.conn_impl.set_call_timeout(0)
-                except exceptions.Error:
-                    request.conn_impl._protocol._disconnect()
-                    request.conn_impl = None
-            else:
-                conn_impl = await self._create_conn_impl(request.params)
-                if request.conn_impl is not None:
-                    self._drop_conn_impl(request.conn_impl)
-                request.conn_impl = conn_impl
-                request.conn_impl._is_pool_extra = request.is_extra
-        except Exception as e:
-            request.exception = e
-
-    cdef int _start_timeout_task(self) except -1:
-        """
-        Starts the task for checking timeouts. The timeout value is increased
-        by a second to allow for small time discrepancies.
-        """
-        async def process_timeout():
-            await asyncio.sleep(self._timeout + 1)
-            async with self._condition:
-                self._process_timeout()
-        self._timeout_task = asyncio.create_task(process_timeout())
-
-    async def acquire(self, ConnectParamsImpl params):
-        """
-        Internal method for acquiring a connection from the pool.
-        """
-        cdef PooledConnRequest request
-
-        # if pool is closed, raise an exception
-        if not self._open:
-            errors._raise_err(errors.ERR_POOL_NOT_OPEN)
-
-        # session tagging has not been implemented yet
-        if params.tag is not None:
-            errors._raise_not_supported("session tagging")
-
-        # use the helper function to allow for a timeout since asyncio
-        # condition variables do not have that capability directly
-        request = self._create_request(params)
-        try:
-            await asyncio.wait_for(
-                self._acquire_helper(request), self._wait_timeout
-            )
-        except asyncio.TimeoutError:
-            errors._raise_err(errors.ERR_POOL_NO_CONNECTION_AVAILABLE)
-        return self._post_acquire(request.conn_impl)
-
-    async def close(self, bint force):
-        """
-        Internal method for closing the pool.
-        """
-        async with self._condition:
-            self._close_helper(force)
-        await self._bg_task
-
-    async def drop(self, AsyncThinConnImpl conn_impl):
-        """
-        Internal method for dropping a connection from the pool.
-        """
-        async with self._condition:
-            self._open_count -= 1
-            self._busy_conn_impls.remove(conn_impl)
-            self._drop_conn_impl(conn_impl)
-            self._condition.notify()
-
-    async def return_connection(self, AsyncThinConnImpl conn_impl,
-                                bint in_del=False):
-        """
-        Internal method for returning a connection to the pool.
-        """
-        cdef BaseAsyncProtocol protocol
-        async with self._condition:
-            try:
-                protocol = <BaseAsyncProtocol> conn_impl._protocol
-                await protocol._end_request(conn_impl)
-            except:
-                if not in_del:
-                    raise
-            self._return_connection_helper(conn_impl)
-
-
-@cython.freelist(20)
-cdef class PooledConnRequest:
-    cdef:
-        BaseThinPoolImpl pool_impl
-        BaseThinConnImpl conn_impl
-        ConnectParamsImpl params
-        str cclass
-        object exception
-        bint cclass_matches
-        bint requires_ping
-        bint wants_new
-        bint bg_processing
-        bint is_extra
-        bint is_replacing
-        bint in_progress
-        bint completed
-        bint waiting
-
-    cdef int _check_connection(self, BaseThinConnImpl conn_impl) except -1:
-        """
-        Checks the connection to see if it can be used. First, if any control
-        packets are sent that indicate that the connection should be closed,
-        the connection is indeed closed. After that, a flag is updated to the
-        caller indicating that a ping is required according to the pool
-        configuration.
-        """
-        cdef:
-            ReadBuffer buf = conn_impl._protocol._read_buf
-            double elapsed_time, min_create_time
-            bint has_data_ready
-        if not buf._transport._is_async:
-            while buf._pending_error_num == 0:
-                buf._transport.has_data_ready(&has_data_ready)
-                if not has_data_ready:
-                    break
-                buf.check_control_packet()
-        if buf._pending_error_num != 0:
-            self.pool_impl._open_count -= 1
-            self.pool_impl._drop_conn_impl(conn_impl)
-            return 0
-        elif self.pool_impl._max_lifetime_session > 0:
-            min_create_time = \
-                    time.monotonic() - self.pool_impl._max_lifetime_session
-            if conn_impl._time_created < min_create_time:
-                self.pool_impl._open_count -= 1
-                self.pool_impl._drop_conn_impl(conn_impl)
-                return 0
-        self.conn_impl = conn_impl
-        if self.pool_impl._ping_interval == 0:
-            self.requires_ping = True
-        elif self.pool_impl._ping_interval > 0:
-            elapsed_time = time.monotonic() - conn_impl._time_returned
-            if elapsed_time > self.pool_impl._ping_interval:
-                self.requires_ping = True
-        if self.requires_ping:
-            self.pool_impl._add_request(self)
-        else:
-            self.completed = True
-
-    def fulfill(self):
-        """
-        Fulfills the connection request. If a connection is available and does
-        not require a ping to validate it, it is returned immediately. If a
-        connection needs to be created or requires a ping to validate it, the
-        background function is notified.
-        """
-        cdef:
-            BaseThinPoolImpl pool = self.pool_impl
-            BaseThinConnImpl conn_impl
-            ssize_t ix
-            object exc
-
-        # if an exception was raised in the background thread, raise it now
-        if self.exception is not None:
-            raise self.exception
-
-        # if the request is completed, waiting can end
-        elif self.completed:
-            return True
-
-        # if the background task is still working on this request, go back to
-        # waiting
-        elif self.bg_processing:
-            return False
-
-        # check for an available used connection (only permitted if a new
-        # connection is not required); in addition, ensure that the connection
-        # class matches
-        if not self.wants_new and pool._free_used_conn_impls:
-            ix = len(pool._free_used_conn_impls) - 1
-            for conn_impl in reversed(pool._free_used_conn_impls):
-                if self.cclass is None or conn_impl._cclass == self.cclass:
-                    pool._free_used_conn_impls.pop(ix)
-                    self._check_connection(conn_impl)
-                    if self.completed or self.requires_ping:
-                        return self.completed
-                ix -= 1
-
-        # check for an available new connection (only permitted if the
-        # connection class matches)
-        if self.cclass_matches:
-            while pool._free_new_conn_impls:
-                conn_impl = pool._free_new_conn_impls.pop()
-                self._check_connection(conn_impl)
-                if self.completed or self.requires_ping:
-                    return self.completed
-
-        # no matching connections are available; if the pool is full, see if
-        # any connections are available and if so, ask the background task to
-        # create a new one to replace the non-matching one
-        self.requires_ping = False
-        if pool._open_count + pool._num_to_create >= pool.max:
-            if pool._free_new_conn_impls:
-                self.is_replacing = True
-                conn_impl = pool._free_new_conn_impls.pop()
-                pool._conn_impls_to_drop.append(conn_impl)
-                pool._add_request(self)
-                return False
-            elif pool._free_used_conn_impls:
-                self.is_replacing = True
-                conn_impl = pool._free_used_conn_impls.pop()
-                pool._conn_impls_to_drop.append(conn_impl)
-                pool._add_request(self)
-                return False
-            elif pool._force_get:
-                self.is_extra = True
-                pool._add_request(self)
-                return False
-            elif pool._getmode == POOL_GETMODE_NOWAIT:
-                errors._raise_err(errors.ERR_POOL_NO_CONNECTION_AVAILABLE)
-
-        # the pool has room to grow; ask the background task to create a
-        # specific connection if the connection class does not match;
-        # otherwise, ask the pool to grow (if it is not already growing)
-        elif self.cclass_matches:
-            if pool._num_to_create == 0:
-                pool._num_to_create = min(pool.increment,
-                                          pool.max - pool._open_count)
-
-        # wait for the pool to grow or a connection to be returned to the pool
-        pool._add_request(self)
-        return False
-
-    cdef int reject(self) except -1:
-        """
-        Called when a request has been rejected for any reason (such as when a
-        wait timeout has been exceeded). Any connection that is associated with
-        the request is returned to the pool or destroyed, depending on the
-        request.
-        """
-        cdef:
-            BaseThinPoolImpl pool_impl = self.pool_impl
-            BaseThinConnImpl conn_impl = self.conn_impl
-        if conn_impl is not None:
-            self.conn_impl = None
-            if conn_impl._is_pool_extra:
-                conn_impl._is_pool_extra = False
-                pool_impl._conn_impls_to_drop.append(conn_impl)
-            elif conn_impl.invoke_session_callback:
-                pool_impl._free_new_conn_impls.append(conn_impl)
-            else:
-                pool_impl._free_used_conn_impls.append(conn_impl)
-
-
-cdef class PoolCloser:
-    cdef:
-        bint closing
-        object lock
-        set pools
-
-    def __init__(self):
-        self.lock = threading.Lock()
-        self.closing = False
-
-    cdef int add_pool(self, ThinPoolImpl pool_impl) except -1:
-        """
-        Adds a pool to the list of pools to close. If this is the first pool
-        being added, a thread is started to ensure that all remaining open
-        pools are closed gracefully at shutdown of the interpreter.
-        """
-        with self.lock:
-            if self.pools is None:
-                self.pools = set()
-                threading.Thread(target=self.close_pools_gracefully).start()
-            self.pools.add(pool_impl)
-
-    def close_pools_gracefully(self):
-        """
-        Closes all remaining open pools gracefully. Since pools start a
-        background thread, the interpreter will not shut down until these
-        background threads have completed, nor will registered atexit functions
-        run. Marking the background threads as daemon threads allows the
-        interpreter to kill them but then pools are not closed gracefully. This
-        method of starting a thread to wait until the main thread finishes
-        handles all of these situations.
-        """
-        cdef ThinPoolImpl pool_impl
-        threading.main_thread().join()      # wait for main thread to finish
-        self.closing = True
-        for pool_impl in self.pools:
-            pool_impl._shutdown()
-
-    cdef int remove_pool(self, ThinPoolImpl pool_impl) except -1:
-        """
-        Removes a pool from the list of pools to close.
-        """
-        with self.lock:
-            if not self.closing:
-                self.pools.remove(pool_impl)
-
-
-cdef PoolCloser pool_closer = PoolCloser()
diff --git a/src/oracledb/impl/thin/protocol.pyx b/src/oracledb/impl/thin/protocol.pyx
deleted file mode 100644
index c34bcff6..00000000
--- a/src/oracledb/impl/thin/protocol.pyx
+++ /dev/null
@@ -1,1047 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# protocol.pyx
-#
-# Cython file defining the protocol used by the client when communicating with
-# the database (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseProtocol:
-
-    cdef:
-        uint8_t _seq_num
-        Transport _transport
-        Capabilities _caps
-        ReadBuffer _read_buf
-        WriteBuffer _write_buf
-        bint _in_connect
-        bint _txn_in_progress
-        bint _break_in_progress
-        object _request_lock
-
-    def __init__(self):
-        self._caps = Capabilities()
-        # mark protocol to indicate that connect is in progress; this prevents
-        # the normal break/reset mechanism from firing, which is unnecessary
-        # since the connection is going to be immediately closed anyway!
-        self._in_connect = True
-        self._transport = Transport.__new__(Transport)
-        self._transport._max_packet_size = self._caps.sdu
-        self._read_buf = ReadBuffer(self._transport, self._caps)
-        self._write_buf = WriteBuffer(self._transport, self._caps)
-
-    cdef int _break_external(self) except -1:
-        """
-        Method for sending a break to the server from an external request. A
-        separate write buffer is used in order to avoid a potential conflict
-        with any in progress writes.
-        """
-        cdef WriteBuffer buf
-        if not self._break_in_progress:
-            self._break_in_progress = True
-            if self._caps.supports_oob:
-                self._transport.send_oob_break()
-            else:
-                buf = WriteBuffer(self._transport, self._caps)
-                self._send_marker(buf, TNS_MARKER_TYPE_INTERRUPT)
-
-    cdef int _check_is_healthy(self) except -1:
-        """
-        Checks to see if the connection is healthy. If a read failed on the
-        transport earlier, the transport is marked closed.
-        """
-        if self._read_buf._transport is None \
-                or self._read_buf._transport._transport is None:
-            self._transport = None
-
-    cdef int _disconnect(self) except -1:
-        """
-        Disconnects from the transport.
-        """
-        cdef Transport transport = self._transport
-        if transport is not None:
-            self._transport = None
-            self._read_buf._transport = None
-            self._write_buf._transport = None
-            transport.disconnect()
-
-    cdef bint _get_is_healthy(self):
-        """
-        Returns a boolean indicating if the connection is considered healthy.
-        """
-        self._check_is_healthy()
-        return self._transport is not None \
-                and self._read_buf._pending_error_num == 0
-
-    cdef Message _on_close_phase_one(self, BaseThinConnImpl conn_impl):
-        """
-        Called when the connection to the database is being closed. The
-        database object type cache will be destroyed. If the connection is not
-        a DRCP session and is still open, a logoff message will be returned for
-        processing.
-        """
-        conn_impl._clear_dbobject_type_cache()
-        self._check_is_healthy()
-        if self._transport is not None and not conn_impl._drcp_enabled:
-            return conn_impl._create_message(LogoffMessage)
-
-    cdef int _on_close_phase_two(self, BaseThinConnImpl conn_impl):
-        """
-        Called when the connection to the database is being closed. The final
-        close will be sent if the connection is still open.
-        """
-        cdef WriteBuffer buf = self._write_buf
-        self._check_is_healthy()
-        if self._transport is not None:
-            buf.start_request(TNS_PACKET_TYPE_DATA, 0, TNS_DATA_FLAGS_EOF)
-            buf.end_request()
-
-    cdef Message _on_request_end_phase_one(self, BaseThinConnImpl conn_impl):
-        """
-        Called when a request to the database is ending. A check is made to see
-        if there is an open transaction and, if one exists, a rollback message
-        is returned. If a request is actually in progress, a rollback message
-        will always be returned in order to ensure that the database is aware
-        of the request being ended.
-        """
-        cdef:
-            BaseThinDbObjectTypeCache type_cache
-            int cache_num
-        if conn_impl._dbobject_type_cache_num > 0:
-            cache_num = conn_impl._dbobject_type_cache_num
-            type_cache = get_dbobject_type_cache(cache_num)
-            type_cache._clear_cursors()
-        self._check_is_healthy()
-        if self._transport is not None:
-            if conn_impl._in_request and conn_impl._session_state_desired != 0:
-                conn_impl._in_request = False
-            if self._txn_in_progress or conn_impl._in_request:
-                if conn_impl._in_request:
-                    conn_impl._session_state_desired = \
-                            TNS_SESSION_STATE_REQUEST_END
-                    conn_impl._in_request = False
-                if conn_impl._transaction_context is not None:
-                    conn_impl._transaction_context = None
-                    return conn_impl._create_tpc_rollback_message()
-                else:
-                    return conn_impl._create_message(RollbackMessage)
-
-    cdef int _on_request_end_phase_two(self,
-                                       BaseThinConnImpl conn_impl) except -1:
-        """
-        Called when a request to the database is ending. A check is made to see
-        if DRCP is in use, and if it is, a release takes place. Any warnings
-        that were set are cleared.
-        """
-        cdef SessionReleaseMessage message
-        self._check_is_healthy()
-        if self._transport is not None and conn_impl._drcp_enabled:
-            message = conn_impl._create_message(SessionReleaseMessage)
-            if not conn_impl._is_pooled:
-                message.release_mode = DRCP_DEAUTHENTICATE
-            message.send(self._write_buf)
-            conn_impl._drcp_establish_session = True
-        conn_impl.warning = None
-
-    cdef int _post_connect(self, BaseThinConnImpl conn_impl,
-                           AuthMessage auth_message) except -1:
-        """"
-        Performs activities after the connection has completed. The protocol
-        must be marked to indicate that the connect is no longer in progress,
-        which allows the normal break/reset mechanism to fire. The session must
-        also be marked as not needing to be closed since for listener redirects
-        the packet may indicate EOF for the initial connection that is
-        established.
-        """
-        cdef:
-            dict session_data = auth_message.session_data
-            ReadBuffer buf = self._read_buf
-        conn_impl._session_id = \
-                <uint32_t> int(session_data["AUTH_SESSION_ID"])
-        conn_impl._serial_num = \
-                <uint16_t> int(session_data["AUTH_SERIAL_NUM"])
-        conn_impl._db_domain = session_data.get("AUTH_SC_DB_DOMAIN")
-        conn_impl._db_name = session_data.get("AUTH_SC_DBUNIQUE_NAME")
-        conn_impl._max_open_cursors = \
-                int(session_data.get("AUTH_MAX_OPEN_CURSORS", 0))
-        conn_impl._service_name = session_data.get("AUTH_SC_SERVICE_NAME")
-        conn_impl._instance_name = session_data.get("AUTH_INSTANCENAME")
-        conn_impl._max_identifier_length = \
-                int(session_data.get("AUTH_MAX_IDEN_LENGTH", 30))
-        conn_impl.server_version = auth_message._get_version_tuple(buf)
-        conn_impl.supports_bool = \
-                buf._caps.ttc_field_version >= TNS_CCAP_FIELD_VERSION_23_1
-        conn_impl._edition = auth_message.edition
-        conn_impl.warning = auth_message.warning
-        buf._pending_error_num = 0
-        self._in_connect = False
-
-    cdef int _send_marker(self, WriteBuffer buf, uint8_t marker_type):
-        """
-        Sends a marker of the specified type to the server.
-        Internal method for sending a break to the server.
-        """
-        buf.start_request(TNS_PACKET_TYPE_MARKER)
-        buf.write_uint8(1)
-        buf.write_uint8(0)
-        buf.write_uint8(marker_type)
-        buf.end_request()
-
-    cdef int _process_call_status(self, BaseThinConnImpl conn_impl,
-                                  uint32_t call_status) except -1:
-        """
-        Processes the call status flags returned by the server.
-        """
-        self._txn_in_progress = call_status & TNS_EOCS_FLAGS_TXN_IN_PROGRESS
-        if call_status & TNS_EOCS_FLAGS_SESS_RELEASE:
-            conn_impl._statement_cache.clear_open_cursors()
-
-
-cdef class Protocol(BaseProtocol):
-
-    def __init__(self):
-        BaseProtocol.__init__(self)
-        self._request_lock = threading.Lock()
-
-    cdef int _close(self, BaseThinConnImpl conn_impl) except -1:
-        """
-        Closes the connection to the database.
-        """
-        cdef Message message
-        try:
-            message = self._on_close_phase_one(conn_impl)
-            if message is not None:
-                self._process_message(message)
-            self._on_close_phase_two(conn_impl)
-        finally:
-            self._disconnect()
-
-    cdef int _connect_phase_one(self, ThinConnImpl conn_impl,
-                                ConnectParamsImpl params,
-                                Description description,
-                                Address address,
-                                str connect_string) except -1:
-        """
-        Method for performing the required steps for establishing a connection
-        within the scope of a retry. If the listener refuses the connection, a
-        retry will be performed, if retry_count is set.
-        """
-        cdef:
-            ConnectMessage connect_message = None
-            uint8_t packet_type, packet_flags = 0
-            object ssl_context, connect_info
-            ConnectParamsImpl temp_params
-            str host, redirect_data
-            Address temp_address
-            int port, pos
-
-        # store whether OOB processing is possible or not
-        self._caps.supports_oob = not params.disable_oob \
-                and sys.platform != "win32"
-
-        # establish initial TCP connection and get initial connect string
-        host = address.ip_address
-        port = address.port
-        self._connect_tcp(params, description, address, host, port,
-                          connect_string)
-
-        # send connect message and process response; this may request the
-        # message to be resent multiple times; if a redirect packet is
-        # detected, a new TCP connection is established first
-        while True:
-
-            # create connection message, if needed
-            if connect_message is None:
-                connect_message = conn_impl._create_message(ConnectMessage)
-                connect_message.host = host
-                connect_message.port = port
-                connect_message.description = description
-                connect_message.connect_string_bytes = connect_string.encode()
-                connect_message.connect_string_len = \
-                        <uint16_t> len(connect_message.connect_string_bytes)
-                connect_message.packet_flags = packet_flags
-
-            # process connection message
-            self._process_message(connect_message)
-            packet_type = self._read_buf._current_packet.packet_type
-            if connect_message.redirect_data is not None:
-                redirect_data = connect_message.redirect_data
-                pos = redirect_data.find('\x00')
-                if pos < 0:
-                    errors._raise_err(errors.ERR_INVALID_REDIRECT_DATA,
-                                      data=redirect_data)
-                temp_params = ConnectParamsImpl()
-                temp_params._parse_connect_string(redirect_data[:pos])
-                temp_address = temp_params._get_addresses()[0]
-                host = temp_address.host
-                port = temp_address.port
-                connect_string = redirect_data[pos + 1:]
-                self._connect_tcp(params, description, address, host, port,
-                                  connect_string)
-                connect_message = None
-                packet_flags = TNS_PACKET_FLAG_REDIRECT
-            elif packet_type == TNS_PACKET_TYPE_ACCEPT:
-                self._transport._max_packet_size = self._caps.sdu
-                self._write_buf._size_for_sdu()
-                break
-
-            # for TCPS connections, if the packet flags indicate that TLS
-            # renegotiation is required, this is performed now
-            if address.protocol == "tcps":
-                packet_flags = self._read_buf._current_packet.packet_flags
-                if packet_flags & TNS_PACKET_FLAG_TLS_RENEG:
-                    self._transport.renegotiate_tls(address, description)
-
-    cdef int _connect_phase_two(self, ThinConnImpl conn_impl,
-                                Description description,
-                                ConnectParamsImpl params) except -1:
-        """"
-        Method for perfoming the required steps for establishing a connection
-        oustide the scope of a retry. If any of the steps in this method fail,
-        an exception will be raised.
-        """
-        cdef:
-            DataTypesMessage data_types_message
-            FastAuthMessage fast_auth_message
-            ProtocolMessage protocol_message
-            bint supports_end_of_response
-            AuthMessage auth_message
-
-        # if we can use OOB, send an urgent message now followed by a reset
-        # marker to see if the server understands it
-        if self._caps.supports_oob and self._caps.supports_oob_check:
-            self._transport.send_oob_break()
-            self._send_marker(self._write_buf, TNS_MARKER_TYPE_RESET)
-
-        # create the messages that need to be sent to the server
-        protocol_message = conn_impl._create_message(ProtocolMessage)
-        data_types_message = conn_impl._create_message(DataTypesMessage)
-        auth_message = conn_impl._create_message(AuthMessage)
-        auth_message._set_params(params, description)
-
-        # starting in Oracle Database version 23, fast authentication is
-        # possible; see if the server supports it
-        if self._caps.supports_fast_auth:
-            fast_auth_message = conn_impl._create_message(FastAuthMessage)
-            fast_auth_message.protocol_message = protocol_message
-            fast_auth_message.data_types_message = data_types_message
-            fast_auth_message.auth_message = auth_message
-            self._process_message(fast_auth_message)
-
-        # otherwise, do the normal authentication; disable end of response for
-        # the first two messages as the server does not send an end of response
-        # for these messages
-        else:
-            supports_end_of_response = self._caps.supports_end_of_response
-            self._caps.supports_end_of_response = False
-            self._process_message(protocol_message)
-            self._process_message(data_types_message)
-            self._caps.supports_end_of_response = supports_end_of_response
-            self._process_message(auth_message)
-
-        # send authorization message a second time, if needed, to respond to
-        # the challenge sent by the server
-        if auth_message.resend:
-            self._process_message(auth_message)
-
-        # perform post connect activities
-        self._post_connect(conn_impl, auth_message)
-
-    cdef int _connect_tcp(self, ConnectParamsImpl params,
-                          Description description, Address address, str host,
-                          int port, str connect_string) except -1:
-        """
-        Creates a socket on which to communicate using the provided parameters.
-        If a proxy is configured, a connection to the proxy is established and
-        the target host and port is forwarded to the proxy.
-        """
-        cdef:
-            bint use_proxy = (address.https_proxy is not None)
-            double timeout = description.tcp_connect_timeout
-            bint use_tcps = (address.protocol == "tcps")
-            object connect_info, sock, data, reply, m
-
-        # establish connection to appropriate host/port
-        if use_proxy:
-            if not use_tcps:
-                errors._raise_err(errors.ERR_HTTPS_PROXY_REQUIRES_TCPS)
-            connect_info = (address.https_proxy, address.https_proxy_port)
-        else:
-            connect_info = (host, port)
-            if not use_tcps and (params._token is not None
-                    or params.access_token_callback is not None):
-                errors._raise_err(errors.ERR_ACCESS_TOKEN_REQUIRES_TCPS)
-        if not use_proxy and description.use_tcp_fast_open:
-            sock = socket.socket(address.ip_family, socket.SOCK_STREAM)
-            sock.sendto(connect_string.encode(), socket.MSG_FASTOPEN,
-                        connect_info)
-        else:
-            sock = socket.create_connection(connect_info, timeout)
-
-        # complete connection through proxy, if applicable
-        if use_proxy:
-            data = f"CONNECT {host}:{port} HTTP/1.0\r\n\r\n"
-            sock.send(data.encode())
-            reply = sock.recv(1024)
-            m = re.search('HTTP/1.[01]\\s+(\\d+)\\s+', reply.decode())
-            if m is None or m.groups()[0] != '200':
-                errors._raise_err(errors.ERR_PROXY_FAILURE,
-                                  response=reply.decode())
-
-        # set socket on transport
-        self._transport.set_from_socket(sock, params, description, address)
-
-        # for TCPS connections, OOB processing is not supported and TLS
-        # negotiation is required
-        if use_tcps:
-            self._caps.supports_oob = False
-            self._transport.create_ssl_context(params, description, address)
-            self._transport.negotiate_tls(sock, address, description)
-
-    cdef int _end_request(self, BaseThinConnImpl conn_impl) except -1:
-        """
-        Ends the request on the database. This rolls back any open transaction
-        and releases any DRCP session, if applicable.
-        """
-        cdef Message message
-        message = self._on_request_end_phase_one(conn_impl)
-        if message is not None:
-            self._process_message(message)
-        self._on_request_end_phase_two(conn_impl)
-        if not self._get_is_healthy():
-            try:
-                self._close(conn_impl)
-            except:
-                pass
-
-    cdef int _process_message(self, Message message) except -1:
-        cdef uint32_t timeout = message.conn_impl._call_timeout
-        try:
-            self._read_buf.reset_packets()
-            message.send(self._write_buf)
-            self._receive_packet(message, check_request_boundary=True)
-            message.process(self._read_buf)
-        except socket.timeout:
-            try:
-                self._break_external()
-                self._receive_packet(message)
-                self._break_in_progress = False
-                errors._raise_err(errors.ERR_CALL_TIMEOUT_EXCEEDED,
-                                  timeout=timeout)
-            except socket.timeout:
-                self._disconnect()
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED,
-                                  "socket timed out while recovering from " \
-                                  "previous socket timeout")
-            raise
-        except MarkerDetected:
-            self._reset()
-            message.process(self._read_buf)
-        except BaseException as e:
-            if not self._in_connect \
-                    and self._write_buf._packet_sent \
-                    and self._read_buf._transport is not None \
-                    and self._read_buf._transport._transport is not None:
-                self._send_marker(self._write_buf, TNS_MARKER_TYPE_BREAK)
-                self._reset()
-            raise
-        if message.flush_out_binds:
-            self._write_buf.start_request(TNS_PACKET_TYPE_DATA)
-            self._write_buf.write_uint8(TNS_MSG_TYPE_FLUSH_OUT_BINDS)
-            self._write_buf.end_request()
-            self._receive_packet(message)
-            message.process(self._read_buf)
-        if self._break_in_progress:
-            try:
-                if self._caps.supports_oob:
-                    self._send_marker(self._write_buf,
-                                      TNS_MARKER_TYPE_INTERRUPT)
-                self._receive_packet(message)
-            except socket.timeout:
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED,
-                                  "socket timed out while awaiting break " \
-                                  "response from server")
-            message.process(self._read_buf)
-            self._break_in_progress = False
-        self._process_call_status(message.conn_impl, message.call_status)
-        if message.error_occurred:
-            if message.retry:
-                message.error_occurred = False
-                return self._process_message(message)
-            message._check_and_raise_exception()
-
-    cdef int _process_single_message(self, Message message) except -1:
-        """
-        Process a single message within a request.
-        """
-        message.preprocess()
-        with self._request_lock:
-            self._process_message(message)
-            if message.resend:
-                self._process_message(message)
-        message.postprocess()
-
-    cdef int _receive_packet(self, Message message,
-                             bint check_request_boundary=False) except -1:
-        cdef:
-            bint orig_check_request_boundary
-            ReadBuffer buf = self._read_buf
-            uint16_t refuse_message_len
-            const char_type* ptr
-        orig_check_request_boundary = buf._check_request_boundary
-        buf._check_request_boundary = \
-                check_request_boundary and self._caps.supports_end_of_response
-        try:
-            buf.wait_for_packets_sync()
-        finally:
-            buf._check_request_boundary = orig_check_request_boundary
-        if buf._current_packet.packet_type == TNS_PACKET_TYPE_MARKER:
-            self._reset()
-        elif buf._current_packet.packet_type == TNS_PACKET_TYPE_REFUSE:
-            self._write_buf._packet_sent = False
-            buf.skip_raw_bytes(2)
-            buf.read_uint16be(&refuse_message_len)
-            if refuse_message_len == 0:
-                message.error_info.message = None
-            else:
-                ptr = buf.read_raw_bytes(refuse_message_len)
-                message.error_info.message = ptr[:refuse_message_len].decode()
-
-    cdef int _reset(self) except -1:
-        cdef uint8_t marker_type, packet_type
-
-        # send reset marker
-        self._send_marker(self._write_buf, TNS_MARKER_TYPE_RESET)
-
-        # read and discard all packets until a reset marker is received
-        while True:
-            packet_type = self._read_buf._current_packet.packet_type
-            if packet_type == TNS_PACKET_TYPE_MARKER:
-                self._read_buf.skip_raw_bytes(2)
-                self._read_buf.read_ub1(&marker_type)
-                if marker_type == TNS_MARKER_TYPE_RESET:
-                    break
-            self._read_buf.wait_for_packets_sync()
-
-        # read error packet; first skip as many marker packets as may be sent
-        # by the server; if the server doesn't handle out-of-band breaks
-        # properly, some quit immediately and others send multiple reset
-        # markers (this addresses both situations without resulting in strange
-        # errors)
-        while packet_type == TNS_PACKET_TYPE_MARKER:
-            self._read_buf.wait_for_packets_sync()
-            packet_type = self._read_buf._current_packet.packet_type
-        self._break_in_progress = False
-
-    cdef int close(self, ThinConnImpl conn_impl, bint in_del) except -1:
-        """
-        Closes the connection. If a transaction is in progress it will be
-        rolled back. DRCP sessions will be released. For standalone
-        connections, the session will be logged off.
-        """
-        with self._request_lock:
-            try:
-                self._end_request(conn_impl)
-                self._close(conn_impl)
-            except:
-                if not in_del:
-                    raise
-
-
-cdef class BaseAsyncProtocol(BaseProtocol):
-
-    cdef:
-        object _proxy_waiter
-
-    def __init__(self):
-        BaseProtocol.__init__(self)
-        self._request_lock = asyncio.Lock()
-        self._transport._is_async = True
-
-    async def _close(self, BaseThinConnImpl conn_impl):
-        """
-        Closes the connection to the database.
-        """
-        cdef Message message
-        try:
-            message = self._on_close_phase_one(conn_impl)
-            if message is not None:
-                await self._process_message(message)
-            self._on_close_phase_two(conn_impl)
-        finally:
-            self._disconnect()
-
-    async def _connect_phase_one(self,
-                                 AsyncThinConnImpl conn_impl,
-                                 ConnectParamsImpl params,
-                                 Description description,
-                                 Address address,
-                                 str connect_string):
-        """
-        Method for performing the required steps for establishing a connection
-        within the scope of a retry. If the listener refuses the connection, a
-        retry will be performed, if retry_count is set.
-        """
-        cdef:
-            ConnectMessage connect_message = None
-            uint8_t packet_type, packet_flags = 0
-            object ssl_context, connect_info
-            ConnectParamsImpl temp_params
-            str host, redirect_data
-            object orig_transport
-            Address temp_address
-            int port, pos
-
-        # asyncio doesn't support OOB processing
-        self._caps.supports_oob = False
-
-        # establish initial TCP connection and get initial connect string
-        host = address.ip_address
-        port = address.port
-        orig_transport = await self._connect_tcp(params, description, address,
-                                                 host, port)
-
-        # send connect message and process response; this may request the
-        # message to be resent multiple times; if a redirect packet is
-        # detected, a new TCP connection is established first
-        while True:
-
-            # create connection message, if needed
-            if connect_message is None:
-                connect_message = conn_impl._create_message(ConnectMessage)
-                connect_message.host = host
-                connect_message.port = port
-                connect_message.description = description
-                connect_message.connect_string_bytes = connect_string.encode()
-                connect_message.connect_string_len = \
-                        <uint16_t> len(connect_message.connect_string_bytes)
-                connect_message.packet_flags = packet_flags
-
-            # process connection message
-            await self._process_message(connect_message)
-            packet_type = self._read_buf._current_packet.packet_type
-            if connect_message.redirect_data is not None:
-                redirect_data = connect_message.redirect_data
-                pos = redirect_data.find('\x00')
-                if pos < 0:
-                    errors._raise_err(errors.ERR_INVALID_REDIRECT_DATA,
-                                      data=redirect_data)
-                temp_params = ConnectParamsImpl()
-                temp_params._parse_connect_string(redirect_data[:pos])
-                temp_address = temp_params._get_addresses()[0]
-                host = temp_address.host
-                port = temp_address.port
-                connect_string = redirect_data[pos + 1:]
-                orig_transport = await self._connect_tcp(params, description,
-                                                         address, host, port)
-                connect_message = None
-                packet_flags = TNS_PACKET_FLAG_REDIRECT
-            elif packet_type == TNS_PACKET_TYPE_ACCEPT:
-                self._transport._max_packet_size = self._caps.sdu
-                self._write_buf._size_for_sdu()
-                break
-
-            # for TCPS connections, OOB processing is not supported; if the
-            # packet flags indicate that TLS renegotiation is required, this is
-            # performed now
-            if address.protocol == "tcps":
-                self._caps.supports_oob = False
-                packet_flags = self._read_buf._current_packet.packet_flags
-                if packet_flags & TNS_PACKET_FLAG_TLS_RENEG:
-                    self._transport._transport = orig_transport
-                    await self._transport.negotiate_tls_async(self, address,
-                                                              description)
-
-    async def _connect_phase_two(self, AsyncThinConnImpl conn_impl,
-                                 Description description,
-                                 ConnectParamsImpl params):
-        """"
-        Method for perfoming the required steps for establishing a connection
-        oustide the scope of a retry. If any of the steps in this method fail,
-        an exception will be raised.
-        """
-        cdef:
-            DataTypesMessage data_types_message
-            FastAuthMessage fast_auth_message
-            ProtocolMessage protocol_message
-            bint supports_end_of_response
-            AuthMessage auth_message
-
-        # create the messages that need to be sent to the server
-        protocol_message = conn_impl._create_message(ProtocolMessage)
-        data_types_message = conn_impl._create_message(DataTypesMessage)
-        auth_message = conn_impl._create_message(AuthMessage)
-        auth_message._set_params(params, description)
-
-        # starting in Oracle Database version 23, fast authentication is
-        # possible; see if the server supports it
-        if self._caps.supports_fast_auth:
-            fast_auth_message = conn_impl._create_message(FastAuthMessage)
-            fast_auth_message.protocol_message = protocol_message
-            fast_auth_message.data_types_message = data_types_message
-            fast_auth_message.auth_message = auth_message
-            await self._process_message(fast_auth_message)
-
-        # otherwise, do the normal authentication; disable end of response for
-        # the first two messages as the server does not send an end of response
-        # for these messages
-        else:
-            supports_end_of_response = self._caps.supports_end_of_response
-            self._caps.supports_end_of_response = False
-            await self._process_message(protocol_message)
-            await self._process_message(data_types_message)
-            self._caps.supports_end_of_response = supports_end_of_response
-            await self._process_message(auth_message)
-
-        # send authorization message a second time, if needed, to respond to
-        # the challenge sent by the server
-        if auth_message.resend:
-            await self._process_message(auth_message)
-
-        # perform post connect activities
-        self._post_connect(conn_impl, auth_message)
-
-
-    async def _connect_tcp(self, ConnectParamsImpl params,
-                           Description description, Address address, str host,
-                           int port):
-        """
-        Creates a socket on which to communicate using the provided parameters.
-        If a proxy is configured, a connection to the proxy is established and
-        the target host and port is forwarded to the proxy.
-        """
-        cdef:
-            bint use_proxy = (address.https_proxy is not None)
-            double timeout = description.tcp_connect_timeout
-            bint use_tcps = (address.protocol == "tcps")
-            object connect_info, data, reply, m
-            str connect_host
-            int connect_port
-
-        # establish connection to appropriate host/port
-        if use_proxy:
-            if not use_tcps:
-                errors._raise_err(errors.ERR_HTTPS_PROXY_REQUIRES_TCPS)
-            connect_host = address.https_proxy
-            connect_port = address.https_proxy_port
-        else:
-            connect_host = host
-            connect_port = port
-            if not use_tcps and (params._token is not None
-                    or params.access_token_callback is not None):
-                errors._raise_err(errors.ERR_ACCESS_TOKEN_REQUIRES_TCPS)
-        transport, protocol = await self._read_buf._loop.create_connection(
-            lambda: self,
-            connect_host,
-            connect_port
-        )
-
-        # complete connection through proxy, if applicable
-        if use_proxy:
-            self._proxy_waiter = self._read_buf._loop.create_future()
-            data = f"CONNECT {host}:{port} HTTP/1.0\r\n\r\n"
-            transport.write(data.encode())
-            reply = await self._proxy_waiter
-            m = re.search('HTTP/1.[01]\\s+(\\d+)\\s+', reply.decode())
-            if m is None or m.groups()[0] != '200':
-                errors._raise_err(errors.ERR_PROXY_FAILURE,
-                                  response=reply.decode())
-
-        # set socket on transport
-        self._transport.set_from_socket(transport, params, description,
-                                        address)
-
-        # negotiate TLS, if applicable
-        if use_tcps:
-            self._transport.create_ssl_context(params, description, address)
-            return await self._transport.negotiate_tls_async(self, address,
-                                                             description)
-
-    async def _end_request(self, BaseThinConnImpl conn_impl):
-        """
-        Ends the request on the database. This rolls back any open transaction
-        and releases any DRCP session, if applicable.
-        """
-        cdef Message message
-        message = self._on_request_end_phase_one(conn_impl)
-        if message is not None:
-            await self._process_message(message)
-        self._on_request_end_phase_two(conn_impl)
-        if not self._get_is_healthy():
-            try:
-                await self._close(conn_impl)
-            except:
-                pass
-
-    async def _process_message(self, Message message):
-        """
-        Sends a message to the server and processes its response.
-        """
-        cdef:
-            uint32_t timeout = message.conn_impl._call_timeout
-            object timeout_obj = (timeout / 1000) or None
-        try:
-            coroutine = self._process_message_helper(message)
-            await asyncio.wait_for(coroutine, timeout_obj)
-        except asyncio.TimeoutError:
-            try:
-                coroutine = self._process_timeout_helper(message, timeout)
-                await asyncio.wait_for(coroutine, timeout_obj)
-            except asyncio.TimeoutError:
-                self._disconnect()
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED,
-                                  "socket timed out while recovering from " \
-                                  "previous socket timeout")
-            raise
-        except MarkerDetected:
-            await self._reset()
-            message.process(self._read_buf)
-        except:
-            if not self._in_connect \
-                    and self._write_buf._packet_sent \
-                    and self._transport is not None:
-                self._send_marker(self._write_buf, TNS_MARKER_TYPE_BREAK)
-                await self._reset()
-            raise
-        if message.flush_out_binds:
-            self._write_buf.start_request(TNS_PACKET_TYPE_DATA)
-            self._write_buf.write_uint8(TNS_MSG_TYPE_FLUSH_OUT_BINDS)
-            self._write_buf.end_request()
-            await self._receive_packet(message)
-            message.process(self._read_buf)
-        if self._break_in_progress:
-            try:
-                coroutine = self._receive_packet(message)
-                await asyncio.wait_for(coroutine, timeout_obj)
-            except asyncio.TimeoutError:
-                self._disconnect()
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED,
-                                  "socket timed out while awaiting break " \
-                                  "response from server")
-            message.process(self._read_buf)
-            self._break_in_progress = False
-        self._process_call_status(message.conn_impl, message.call_status)
-        if message.error_occurred:
-            if message.retry:
-                message.error_occurred = False
-                return await self._process_message(message)
-            message._check_and_raise_exception()
-
-    async def _process_message_helper(self, Message message):
-        """
-        Helper routine that is called to process a message within a timeout.
-        """
-        self._read_buf.reset_packets()
-        message.send(self._write_buf)
-        await self._receive_packet(message, check_request_boundary=True)
-        while True:
-            try:
-                message.process(self._read_buf)
-                break
-            except OutOfPackets:
-                await self._receive_packet(message)
-                message.on_out_of_packets()
-                self._read_buf.restore_point()
-
-    async def _process_single_message(self, Message message):
-        """
-        Process a single message within a request.
-        """
-        message.preprocess()
-        async with self._request_lock:
-            await self._process_message(message)
-            if message.resend:
-                await self._process_message(message)
-        await message.postprocess_async()
-
-    async def _process_timeout_helper(self, Message message, uint32_t timeout):
-        """
-        Helper routine that is called to process a timeout.
-        """
-        self._break_external()
-        await self._receive_packet(message)
-        self._break_in_progress = False
-        errors._raise_err(errors.ERR_CALL_TIMEOUT_EXCEEDED, timeout=timeout)
-
-    async def _receive_packet(self, Message message,
-                              bint check_request_boundary=False,
-                              bint in_pipeline=False):
-        cdef:
-            ReadBuffer buf = self._read_buf
-            uint16_t refuse_message_len
-            const char_type* ptr
-        buf._check_request_boundary = \
-                check_request_boundary and self._caps.supports_end_of_response
-        await buf.wait_for_packets_async()
-        buf._check_request_boundary = False
-        if buf._current_packet.packet_type == TNS_PACKET_TYPE_MARKER:
-            if in_pipeline:
-                # skip to next packet as the marker packet doesn't contain any
-                # useful information
-                buf.wait_for_packets_sync()
-            else:
-                await self._reset()
-        elif buf._current_packet.packet_type == TNS_PACKET_TYPE_REFUSE:
-            self._write_buf._packet_sent = False
-            buf.skip_raw_bytes(2)
-            buf.read_uint16be(&refuse_message_len)
-            if refuse_message_len == 0:
-                message.error_info.message = None
-            else:
-                ptr = buf.read_raw_bytes(refuse_message_len)
-                message.error_info.message = ptr[:refuse_message_len].decode()
-
-    async def _reset(self):
-        cdef:
-            uint8_t marker_type, packet_type
-
-        # send reset marker
-        self._send_marker(self._write_buf, TNS_MARKER_TYPE_RESET)
-
-        # read and discard all packets until a reset marker is received
-        while True:
-            packet_type = self._read_buf._current_packet.packet_type
-            if packet_type == TNS_PACKET_TYPE_MARKER:
-                self._read_buf.skip_raw_bytes(2)
-                self._read_buf.read_ub1(&marker_type)
-                if marker_type == TNS_MARKER_TYPE_RESET:
-                    break
-            await self._read_buf.wait_for_packets_async()
-
-        # read error packet; first skip as many marker packets as may be sent
-        # by the server; if the server doesn't handle out-of-band breaks
-        # properly, some quit immediately and others send multiple reset
-        # markers (this addresses both situations without resulting in strange
-        # errors)
-        while packet_type == TNS_PACKET_TYPE_MARKER:
-            await self._read_buf.wait_for_packets_async()
-            packet_type = self._read_buf._current_packet.packet_type
-        self._break_in_progress = False
-
-    async def close(self, AsyncThinConnImpl conn_impl, bint in_del):
-        """
-        Closes the connection. If a transaction is in progress it will be
-        rolled back. DRCP sessions will be released. For standalone
-        connections, the session will be logged off.
-        """
-        async with self._request_lock:
-            try:
-                await self._end_request(conn_impl)
-                await self._close(conn_impl)
-            except:
-                if not in_del:
-                    raise
-
-            # otherwise, destroy the database object type cache, send the
-            # logoff message and final close packet
-            conn_impl._clear_dbobject_type_cache()
-            if self._transport is not None:
-                if not conn_impl._drcp_enabled:
-                    message = conn_impl._create_message(LogoffMessage)
-                    await self._process_message(message)
-                self._final_close(self._write_buf)
-
-    def connection_lost(self, exc):
-        """
-        Called when a connection has been lost. The presence of an exception
-        indicates an abornmal loss of the connection. If in the process of
-        establishing a connection, losing the connection is ignored since this
-        can happen normally when a listener redirect is encountered.
-        """
-        if not self._in_connect:
-            self._transport = None
-            self._read_buf._transport = None
-            self._write_buf._transport = None
-            self._read_buf._pending_error_num = TNS_ERR_SESSION_SHUTDOWN
-            if self._read_buf._waiter is not None \
-                    and not self._read_buf._waiter.done():
-                error = errors._create_err(errors.ERR_CONNECTION_CLOSED)
-                self._read_buf._waiter.set_exception(error.exc_type(error))
-
-    def data_received(self, data):
-        """
-        Called when data has been received on the transport.
-        """
-        cdef:
-            bint notify_waiter = False
-            Packet packet
-        if self._proxy_waiter is not None:
-            self._proxy_waiter.set_result(data)
-            self._proxy_waiter = None
-        else:
-            packet = self._transport.extract_packet(data)
-            while packet is not None:
-                self._read_buf._process_packet(packet, &notify_waiter, False)
-                if notify_waiter:
-                    self._read_buf.notify_packet_received()
-                packet = self._transport.extract_packet()
-
-    async def end_pipeline(self, BaseThinConnImpl conn_impl, list messages,
-                           bint continue_on_error):
-        """
-        Called when all messages for the pipeline have been sent to the
-        database. An end pipeline message is sent to the database and then
-        the responses to all of the messages are processed.
-        """
-        cdef:
-            ssize_t num_responses_to_discard
-            ReadBuffer buf = self._read_buf
-            Message message, end_message
-        end_message = conn_impl._create_message(EndPipelineMessage)
-        end_message.send(self._write_buf)
-        buf._check_request_boundary = True
-        buf._in_pipeline = True
-        try:
-            num_responses_to_discard = len(messages) + 1
-            for message in messages:
-                try:
-                    if not buf.has_response():
-                        await buf.wait_for_response_async()
-                    buf._start_packet()
-                    message.preprocess()
-                    message.process(buf)
-                    num_responses_to_discard -= 1
-                    self._process_call_status(conn_impl, message.call_status)
-                    message._check_and_raise_exception()
-                except Exception as e:
-                    if not continue_on_error:
-                        raise
-                    message.pipeline_result_impl._capture_err(e)
-            await self._receive_packet(end_message,
-                                       check_request_boundary=True)
-            end_message.process(buf)
-            num_responses_to_discard = 0
-            end_message._check_and_raise_exception()
-        except:
-            await buf.discard_pipeline_responses(num_responses_to_discard)
-            raise
-        finally:
-            buf._check_request_boundary = False
-            buf._in_pipeline = False
-
-
-class AsyncProtocol(BaseAsyncProtocol, asyncio.Protocol):
-    pass
diff --git a/src/oracledb/impl/thin/queue.pyx b/src/oracledb/impl/thin/queue.pyx
deleted file mode 100644
index 904b2d0e..00000000
--- a/src/oracledb/impl/thin/queue.pyx
+++ /dev/null
@@ -1,526 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# queue.pyx
-#
-# Cython file defining the thin Queue implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BaseThinQueueImpl(BaseQueueImpl):
-
-    cdef:
-        BaseThinConnImpl _conn_impl
-        bytes payload_toid
-
-    cdef AqArrayMessage _create_array_deq_message(self, uint32_t num_iters):
-        """
-        Create the message used for dequeuing multiple AQ messages
-        """
-        cdef:
-            AqArrayMessage message
-            uint32_t i
-        message = self._conn_impl._create_message(AqArrayMessage)
-        message.num_iters = num_iters
-        message.props_impls = [ThinMsgPropsImpl() for i in range(num_iters)]
-        message.queue_impl = self
-        message.deq_options_impl = self.deq_options_impl
-        message.operation = TNS_AQ_ARRAY_DEQ
-        return message
-
-    cdef AqArrayMessage _create_array_enq_message(self, list props_impls):
-        """
-        Create the message used for enqueuing multiple AQ messages
-        """
-        cdef AqArrayMessage message
-        message = self._conn_impl._create_message(AqArrayMessage)
-        message.queue_impl = self
-        message.enq_options_impl = self.enq_options_impl
-        message.props_impls = props_impls
-        message.operation = TNS_AQ_ARRAY_ENQ
-        message.num_iters = len(props_impls)
-        return message
-
-    cdef AqDeqMessage _create_deq_message(self):
-        """
-        Create the message for dequeuing a payload.
-        """
-        cdef:
-            ThinMsgPropsImpl props_impl
-            AqDeqMessage message
-        props_impl = ThinMsgPropsImpl()
-        message = self._conn_impl._create_message(AqDeqMessage)
-        message.queue_impl = self
-        message.deq_options_impl = self.deq_options_impl
-        message.props_impl = props_impl
-        return message
-
-    cdef AqEnqMessage _create_enq_message(self, ThinMsgPropsImpl props_impl):
-        """
-        Create the message for enqueuing the provided payload.
-        """
-        cdef AqEnqMessage message
-        message = self._conn_impl._create_message(AqEnqMessage)
-        message.queue_impl = self
-        message.enq_options_impl = self.enq_options_impl
-        message.props_impl = props_impl
-        return message
-
-    def initialize(self, BaseThinConnImpl conn_impl, str name,
-                   ThinDbObjectTypeImpl payload_type, bint is_json):
-        """
-        Internal method for initializing the queue.
-        """
-        self._conn_impl = conn_impl
-        self.is_json = is_json
-        self.deq_options_impl = ThinDeqOptionsImpl()
-        self.enq_options_impl = ThinEnqOptionsImpl()
-        self.payload_type = payload_type
-        if self.is_json:
-            self.payload_toid = bytes([0]*15+[0x47])
-        elif self.payload_type is not None:
-            self.payload_toid = payload_type.oid
-        else:
-            self.payload_toid = bytes([0]*15+[0x17])
-        self.name = name
-
-
-cdef class ThinQueueImpl(BaseThinQueueImpl):
-
-    def deq_many(self, uint32_t max_num_messages):
-        """
-        Internal method for dequeuing multiple messages from a queue.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            AqArrayMessage message
-        message = self._create_array_deq_message(max_num_messages)
-        protocol._process_single_message(message)
-        if message.no_msg_found:
-            return []
-        return message.props_impls[:message.num_iters]
-
-    def deq_one(self):
-        """
-        Internal method for dequeuing a single message from a queue.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            AqDeqMessage message
-        message = self._create_deq_message()
-        protocol._process_single_message(message)
-        if not message.no_msg_found:
-            return message.props_impl
-
-    def enq_many(self, list props_impls):
-        """
-        Internal method for enqueuing many messages into a queue.
-        """
-        cdef :
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            AqArrayMessage message
-        message = self._create_array_enq_message(props_impls)
-        protocol._process_single_message(message)
-
-    def enq_one(self, ThinMsgPropsImpl props_impl):
-        """
-        Internal method for enqueuing a single message into a queue.
-        """
-        cdef:
-            Protocol protocol = <Protocol> self._conn_impl._protocol
-            AqEnqMessage message
-        message = self._create_enq_message(props_impl)
-        protocol._process_single_message(message)
-
-
-cdef class AsyncThinQueueImpl(BaseThinQueueImpl):
-
-    async def deq_many(self, uint32_t max_num_messages):
-        """
-        Internal method for dequeuing multiple messages from a queue.
-        """
-        cdef:
-            BaseAsyncProtocol protocol
-            AqArrayMessage message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_array_deq_message(max_num_messages)
-        await protocol._process_single_message(message)
-        if message.no_msg_found:
-            return []
-        return message.props_impls[:message.num_iters]
-
-    async def deq_one(self):
-        """
-        Internal method for dequeuing a single message from a queue.
-        """
-        cdef:
-            BaseAsyncProtocol protocol
-            AqDeqMessage message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_deq_message()
-        await protocol._process_single_message(message)
-        if not message.no_msg_found:
-            return message.props_impl
-
-    async def enq_many(self, list props_impls):
-        """
-        Internal method for enqueuing many messages into a queue.
-        """
-        cdef :
-            BaseAsyncProtocol protocol
-            AqArrayMessage message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_array_enq_message(props_impls)
-        await protocol._process_single_message(message)
-
-    async def enq_one(self, ThinMsgPropsImpl props_impl):
-        """
-        Internal method for enqueuing a single message into a queue.
-        """
-        cdef:
-            BaseAsyncProtocol protocol
-            AqEnqMessage message
-        protocol = <BaseAsyncProtocol> self._conn_impl._protocol
-        message = self._create_enq_message(props_impl)
-        await protocol._process_single_message(message)
-
-
-cdef class ThinDeqOptionsImpl(BaseDeqOptionsImpl):
-    cdef:
-        str condition
-        str consumer_name
-        str correlation
-        uint16_t delivery_mode
-        uint32_t mode
-        bytes msgid
-        uint32_t navigation
-        str transformation
-        uint32_t visibility
-        uint32_t wait
-
-    def __init__(self):
-        self.delivery_mode = TNS_AQ_MSG_PERSISTENT
-        self.mode = TNS_AQ_DEQ_REMOVE
-        self.navigation = TNS_AQ_DEQ_NEXT_MSG
-        self.visibility = TNS_AQ_DEQ_ON_COMMIT
-        self.wait = TNS_AQ_DEQ_WAIT_FOREVER
-
-    def get_condition(self):
-        """
-        Internal method for getting the condition.
-        """
-        return self.condition
-
-    def get_consumer_name(self):
-        """
-        Internal method for getting the consumer name.
-        """
-        return self.consumer_name
-
-    def get_correlation(self):
-        """
-        Internal method for getting the correlation.
-        """
-        return self.correlation
-
-    def get_message_id(self):
-        """
-        Internal method for getting the message id.
-        """
-        return self.msgid
-
-    def get_mode(self):
-        """
-        Internal method for getting the mode.
-        """
-        return self.mode
-
-    def get_navigation(self):
-        """
-        Internal method for getting the navigation.
-        """
-        return self.navigation
-
-    def get_transformation(self):
-        """
-        Internal method for getting the transformation.
-        """
-        return self.transformation
-
-    def get_visibility(self):
-        """
-        Internal method for getting the visibility.
-        """
-        return self.visibility
-
-    def get_wait(self):
-        """
-        Internal method for getting the wait.
-        """
-        return self.wait
-
-    def set_condition(self, str value):
-        """
-        Internal method for setting the condition.
-        """
-        self.condition = value
-
-    def set_consumer_name(self, str value):
-        """
-        Internal method for setting the consumer name.
-        """
-        self.consumer_name =  value
-
-    def set_correlation(self, str value):
-        """
-        Internal method for setting the correlation.
-        """
-        self.correlation = value
-
-    def set_delivery_mode(self, uint16_t value):
-        """
-        Internal method for setting the delivery mode.
-        """
-        self.delivery_mode = value
-
-    def set_mode(self, uint32_t value):
-        """
-        Internal method for setting the mode.
-        """
-        self.mode = value
-
-    def set_message_id(self, bytes value):
-        """
-        Internal method for setting the message id.
-        """
-        self.msgid = value
-
-    def set_navigation(self, uint32_t value):
-        """
-        Internal method for setting the navigation.
-        """
-        self.navigation = value
-
-    def set_transformation(self, str value):
-        """
-        Internal method for setting the transformation.
-        """
-        self.transformation = value
-
-    def set_visibility(self, uint32_t value):
-        """
-        Internal method for setting the visibility.
-        """
-        self.visibility = value
-
-    def set_wait(self, uint32_t value):
-        """
-        Internal method for setting the wait.
-        """
-        self.wait = value
-
-
-cdef class ThinEnqOptionsImpl(BaseEnqOptionsImpl):
-    cdef:
-        str transformation
-        uint32_t visibility
-        uint32_t delivery_mode
-
-    def __init__(self):
-        self.visibility = TNS_AQ_ENQ_ON_COMMIT
-        self.delivery_mode = TNS_AQ_MSG_PERSISTENT
-
-    def get_transformation(self):
-        """
-        Internal method for getting the transformation.
-        """
-        return self.transformation
-
-    def get_visibility(self):
-        """
-        Internal method for getting the visibility.
-        """
-        return self.visibility
-
-    def set_delivery_mode(self, uint16_t value):
-        """
-        Internal method for setting the delivery mode.
-        """
-        self.delivery_mode = value
-
-    def set_transformation(self, str value):
-        """
-        Internal method for setting the transformation.
-        """
-        self.transformation = value
-
-    def set_visibility(self, uint32_t value):
-        """
-        Internal method for setting the visibility.
-        """
-        self.visibility = value
-
-
-cdef class ThinMsgPropsImpl(BaseMsgPropsImpl):
-
-    cdef:
-        int32_t delay
-        str correlation
-        str exceptionq
-        int32_t expiration
-        int32_t priority
-        list recipients
-        int32_t num_attempts
-        uint32_t delivery_mode
-        cydatetime.datetime enq_time
-        bytes msgid
-        int32_t state
-        object payload_obj
-        BaseThinConnImpl _conn_impl
-        bytes enq_txn_id
-        bytes sender_agent_name
-        bytes sender_agent_address
-        unsigned char sender_agent_protocol
-        bytes original_msg_id
-
-    def __init__(self):
-        self.delay = TNS_AQ_MSG_NO_DELAY
-        self.expiration = TNS_AQ_MSG_NO_EXPIRATION
-        self.recipients = []
-        self.sender_agent_protocol = 0
-
-    def get_num_attempts(self):
-        """
-        Internal method for getting the number of attempts made.
-        """
-        return self.num_attempts
-
-    def get_correlation(self):
-        """
-        Internal method for getting the correlation.
-        """
-        return self.correlation
-
-    def get_delay(self):
-        """
-        Internal method for getting the delay.
-        """
-        return self.delay
-
-    def get_delivery_mode(self):
-        """
-        Internal method for getting the delivery mode.
-        """
-        return self.delivery_mode
-
-    def get_enq_time(self):
-        """
-        Internal method for getting the enqueue time.
-        """
-        return self.enq_time
-
-    def get_exception_queue(self):
-        """
-        Internal method for getting the exception queue.
-        """
-        return self.exceptionq
-
-    def get_expiration(self):
-        """
-        Internal method for getting the message expiration.
-        """
-        return self.expiration
-
-    def get_message_id(self):
-        """
-        Internal method for getting the message id.
-        """
-        return self.msgid
-
-    def get_priority(self):
-        """
-        Internal method for getting the priority.
-        """
-        return self.priority
-
-    def get_state(self):
-        """
-        Internal method for getting the message state.
-        """
-        return self.state
-
-    def set_correlation(self, str value):
-        """
-        Internal method for setting the correlation.
-        """
-        self.correlation = value
-
-    def set_delay(self, int32_t value):
-        """
-        Internal method for setting the delay.
-        """
-        self.delay = value
-
-    def set_exception_queue(self, str value):
-        """
-        Internal method for setting the exception queue.
-        """
-        self.exceptionq = value
-
-    def set_expiration(self, int32_t value):
-        """
-        Internal method for setting the message expiration.
-        """
-        self.expiration = value
-
-    def set_payload_bytes(self, bytes value):
-        """
-        Internal method for setting the payload from bytes.
-        """
-        self.payload_obj = value
-
-    def set_payload_object(self, ThinDbObjectImpl value):
-        """
-        Internal method for setting the payload from an object.
-        """
-        self.payload_obj = value
-
-    def set_payload_json(self, object json_val):
-        """
-        Internal method for setting the payload from a JSON object
-        """
-        self.payload_obj = json_val
-
-    def set_priority(self, int32_t value):
-        """
-        Internal method for setting the priority.
-        """
-        self.priority = value
-
-    def set_recipients(self, list value):
-        """
-        Internal method for setting the recipients list.
-        """
-        self.recipients = value
diff --git a/src/oracledb/impl/thin/statement.pyx b/src/oracledb/impl/thin/statement.pyx
deleted file mode 100644
index abdd25f7..00000000
--- a/src/oracledb/impl/thin/statement.pyx
+++ /dev/null
@@ -1,446 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# statement.pyx
-#
-# Cython file defining the Statement and BindInfo classes used to hold
-# information about statements that are executed and any bind parameters that
-# may be bound to those statements (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class BindInfo:
-
-    cdef:
-        uint32_t num_elements
-        bint _is_return_bind
-        uint8_t ora_type_num
-        uint32_t buffer_size
-        int16_t precision
-        uint8_t bind_dir
-        uint32_t size
-        str _bind_name
-        bint is_array
-        int16_t scale
-        uint8_t csfrm
-        ThinVarImpl _bind_var_impl
-
-    def __cinit__(self, str name, bint is_return_bind):
-        self._bind_name = name
-        self._is_return_bind = is_return_bind
-
-    cdef BindInfo copy(self):
-        return BindInfo(self._bind_name, self._is_return_bind)
-
-
-cdef class StatementParser(BaseParser):
-
-    cdef:
-        bint returning_keyword_found
-
-    cdef int _parse_bind_name(self, Statement stmt) except -1:
-        """
-        Bind variables are identified as follows:
-        - Quoted and non-quoted bind names are allowed.
-        - Quoted bind names can contain any characters.
-        - Non-quoted bind names must begin with an alphabetic character.
-        - Non-quoted bind names can only contain alphanumeric characters, the
-          underscore, the dollar sign and the pound sign.
-        - Non-quoted bind names cannot be Oracle Database Reserved Names (this
-          is left to the server to detct and return an appropriate error).
-        """
-        cdef:
-            bint quoted_name = False, in_bind = False, digits_only = False
-            ssize_t start_pos = 0
-            str bind_name
-            Py_UCS4 ch
-        self.temp_pos = self.pos + 1
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not in_bind:
-                if cpython.Py_UNICODE_ISSPACE(ch):
-                    self.temp_pos += 1
-                    continue
-                elif ch == '"':
-                    quoted_name = True
-                elif cpython.Py_UNICODE_ISDIGIT(ch):
-                    digits_only = True
-                elif not cpython.Py_UNICODE_ISALPHA(ch):
-                    break
-                in_bind = True
-                start_pos = self.temp_pos
-            elif digits_only and not cpython.Py_UNICODE_ISDIGIT(ch):
-                self.pos = self.temp_pos - 1
-                break
-            elif quoted_name and ch == '"':
-                self.pos = self.temp_pos
-                break
-            elif not digits_only and not quoted_name \
-                    and not cpython.Py_UNICODE_ISALNUM(ch) \
-                    and ch not in ('_', '$', '#'):
-                self.pos = self.temp_pos - 1
-                break
-            self.temp_pos += 1
-        if in_bind:
-            if quoted_name:
-                bind_name = stmt._sql[start_pos + 1:self.temp_pos]
-            elif digits_only:
-                bind_name = stmt._sql[start_pos:self.temp_pos]
-            else:
-                bind_name = stmt._sql[start_pos:self.temp_pos].upper()
-            stmt._add_bind(bind_name)
-
-    cdef int _parse_multiple_line_comment(self) except -1:
-        """
-        Multiple line comments consist of the characters /* followed by all
-        characters up until */. This method is called when the first slash is
-        detected and checks for the subsequent asterisk. If found, the comment
-        is traversed and the current position is updated; otherwise, the
-        current position is left untouched.
-        """
-        cdef:
-            bint in_comment = False, exiting_comment = False
-            Py_UCS4 ch
-        self.temp_pos = self.pos + 1
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not in_comment:
-                if ch != '*':
-                    break
-                in_comment = True
-            elif ch == '*':
-                exiting_comment = True
-            elif exiting_comment:
-                if ch == '/':
-                    self.pos = self.temp_pos
-                    break
-                exiting_comment = False
-            self.temp_pos += 1
-
-    cdef int _parse_qstring(self) except -1:
-        """
-        Parses a q-string which consists of the characters "q" and a single
-        quote followed by a start separator, any text that does not contain the
-        end seprator and the end separator and ending quote. The following are
-        examples that demonstrate this:
-            - q'[...]'
-            - q'{...}'
-            - q'<...>'
-            - q'(...)'
-            - q'?...?' (where ? is any character)
-        """
-        cdef:
-            bint exiting_qstring = False, in_qstring = False
-            Py_UCS4 ch, sep = 0
-        self.temp_pos += 1
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not in_qstring:
-                if ch == '[':
-                    sep = ']'
-                elif ch == '{':
-                    sep = '}'
-                elif ch == '<':
-                    sep = '>'
-                elif ch == '(':
-                    sep = ')'
-                else:
-                    sep = ch
-                in_qstring = True
-            elif not exiting_qstring and ch == sep:
-                exiting_qstring = True
-            elif exiting_qstring:
-                if ch == "'":
-                    self.pos = self.temp_pos
-                    return 0
-                elif ch != sep:
-                    exiting_qstring = False
-            self.temp_pos += 1
-        errors._raise_err(errors.ERR_MISSING_ENDING_SINGLE_QUOTE)
-
-    cdef int _parse_single_line_comment(self) except -1:
-        """
-        Single line comments consist of two dashes and all characters up to the
-        next line break (or the end of the data). This method is called when
-        the first dash is detected and checks for the subsequent dash. If
-        found, the single line comment is traversed and the current position is
-        updated; otherwise, the current position is left untouched.
-        """
-        cdef:
-            bint in_comment = False
-            Py_UCS4 ch
-        self.temp_pos = self.pos + 1
-        while self.temp_pos < self.num_chars:
-            ch = self.get_current_char()
-            if not in_comment:
-                if ch != '-':
-                    return 0
-                in_comment = True
-            elif cpython.Py_UNICODE_ISLINEBREAK(ch):
-                break
-            self.temp_pos += 1
-        self.pos = self.temp_pos
-
-    cdef int parse(self, Statement stmt) except -1:
-        """
-        Parses the SQL stored in the statement in order to determine the
-        keyword that identifies the type of SQL being executed as well as a
-        list of bind variable names. A check is also made for DML returning
-        statements since the bind variables following the "INTO" keyword are
-        treated differently from other bind variables.
-        """
-        cdef:
-            bint initial_keyword_found = False, last_was_string = False
-            Py_UCS4 ch, last_ch = 0, alpha_start_ch = 0
-            ssize_t alpha_start_pos = 0, alpha_len
-            bint last_was_alpha = False, is_alpha
-            str keyword
-
-        # initialization
-        self.initialize(stmt._sql)
-
-        # scan all characters in the string
-        while self.pos < self.num_chars:
-            self.temp_pos = self.pos
-            ch = self.get_current_char()
-
-            # look for certain keywords (initial keyword and the ones for
-            # detecting DML returning statements
-            is_alpha = cpython.Py_UNICODE_ISALPHA(ch)
-            if is_alpha and not last_was_alpha:
-                alpha_start_pos = self.pos
-                alpha_start_ch = ch
-            elif not is_alpha and last_was_alpha:
-                alpha_len = self.pos - alpha_start_pos
-                if not initial_keyword_found:
-                    keyword = stmt._sql[alpha_start_pos:self.pos].upper()
-                    stmt._determine_statement_type(keyword)
-                    if stmt._is_ddl:
-                        break
-                    initial_keyword_found = True
-                elif stmt._is_dml and not self.returning_keyword_found \
-                        and alpha_len == 9 and alpha_start_ch in ('r', 'R'):
-                    keyword = stmt._sql[alpha_start_pos:self.pos].upper()
-                    if keyword == "RETURNING":
-                        self.returning_keyword_found = True
-                elif self.returning_keyword_found and alpha_len == 4 \
-                        and alpha_start_ch in ('i', 'I'):
-                    keyword = stmt._sql[alpha_start_pos:self.pos].upper()
-                    if keyword == "INTO":
-                        stmt._is_returning = True
-
-            # need to keep track of whether the last token parsed was a string
-            # (excluding whitespace) as if the last token parsed was a string
-            # a following colon is not a bind variable but a part of the JSON
-            # constant syntax
-            if ch == "'":
-                last_was_string = True
-                if last_ch in ('q', 'Q'):
-                    self._parse_qstring()
-                else:
-                    self.temp_pos += 1
-                    self.parse_quoted_string(ch)
-                    self.pos -= 1
-            elif not cpython.Py_UNICODE_ISSPACE(ch):
-                if ch == '-':
-                    self._parse_single_line_comment()
-                elif ch == '/':
-                    self._parse_multiple_line_comment()
-                elif ch == '"':
-                    self.temp_pos += 1
-                    self.parse_quoted_string(ch)
-                    self.pos -= 1
-                elif ch == ':' and not last_was_string:
-                    self._parse_bind_name(stmt)
-                last_was_string = False
-
-            # advance to next character and track previous character
-            self.pos += 1
-            last_was_alpha = is_alpha
-            last_ch = ch
-
-
-cdef class Statement:
-
-    cdef:
-        str _sql
-        bytes _sql_bytes
-        uint32_t _sql_length
-        uint16_t _cursor_id
-        bint _is_query
-        bint _is_plsql
-        bint _is_dml
-        bint _is_ddl
-        bint _is_returning
-        list _bind_info_list
-        list _fetch_metadata
-        list _fetch_vars
-        list _fetch_var_impls
-        object _bind_info_dict
-        object _last_output_type_handler
-        ArrowSchemaImpl _last_schema_impl
-        uint32_t _num_columns
-        bint _executed
-        bint _binds_changed
-        bint _no_prefetch
-        bint _requires_define
-        bint _return_to_cache
-        bint _is_nested
-        bint _in_use
-
-    cdef Statement copy(self):
-        cdef:
-            Statement copied_statement = Statement.__new__(Statement)
-            object bind_info_dict
-            BindInfo bind_info
-        copied_statement._sql = self._sql
-        copied_statement._sql_bytes = self._sql_bytes
-        copied_statement._sql_length = self._sql_length
-        copied_statement._is_query = self._is_query
-        copied_statement._is_plsql = self._is_plsql
-        copied_statement._is_dml = self._is_dml
-        copied_statement._is_ddl = self._is_ddl
-        copied_statement._is_returning = self._is_returning
-        copied_statement._bind_info_list = \
-                [bind_info.copy() for bind_info in self._bind_info_list]
-        copied_statement._bind_info_dict = collections.OrderedDict()
-        bind_info_dict = copied_statement._bind_info_dict
-        for bind_info in copied_statement._bind_info_list:
-            if bind_info._bind_name in bind_info_dict:
-                bind_info_dict[bind_info._bind_name].append(bind_info)
-            else:
-                bind_info_dict[bind_info._bind_name] = [bind_info]
-        copied_statement._return_to_cache = False
-        return copied_statement
-
-    cdef int _add_bind(self, str name) except -1:
-        """
-        Add bind information to the statement by examining the passed SQL for
-        bind variable names.
-        """
-        cdef BindInfo info, orig_info
-        if not self._is_plsql or name not in self._bind_info_dict:
-            info = BindInfo(name, self._is_returning)
-            self._bind_info_list.append(info)
-            if info._bind_name in self._bind_info_dict:
-                if self._is_returning:
-                    orig_info = self._bind_info_dict[info._bind_name][-1]
-                    if not orig_info._is_return_bind:
-                        errors._raise_err(errors.ERR_DML_RETURNING_DUP_BINDS,
-                                          name=info._bind_name)
-                self._bind_info_dict[info._bind_name].append(info)
-            else:
-                self._bind_info_dict[info._bind_name] = [info]
-
-    cdef _determine_statement_type(self, str sql_keyword):
-        """
-        Determine the type of the SQL statement by examining the first keyword
-        found in the statement.
-        """
-        if sql_keyword in ("DECLARE", "BEGIN", "CALL"):
-            self._is_plsql = True
-        elif sql_keyword in ("SELECT", "WITH"):
-            self._is_query = True
-        elif sql_keyword in ("INSERT", "UPDATE", "DELETE", "MERGE"):
-            self._is_dml = True
-        elif sql_keyword in ("CREATE", "ALTER", "DROP", "GRANT", "REVOKE",
-                             "ANALYZE", "AUDIT", "COMMENT", "TRUNCATE"):
-            self._is_ddl = True
-
-    cdef int _prepare(self, str sql) except -1:
-        """
-        Prepare the SQL for execution by determining the list of bind names
-        that are found within it. The length of the SQL text is also calculated
-        at this time.
-        """
-        cdef StatementParser parser = StatementParser.__new__(StatementParser)
-
-        # retain normalized SQL (as string and bytes) as well as the length
-        self._sql = sql
-        self._sql_bytes = self._sql.encode()
-        self._sql_length = <uint32_t> len(self._sql_bytes)
-
-        # parse SQL and populate bind variable list (bind by position) and dict
-        # (bind by name)
-        self._bind_info_dict = collections.OrderedDict()
-        self._bind_info_list = []
-        parser.parse(self)
-
-    cdef int _set_var(self, BindInfo bind_info, ThinVarImpl var_impl,
-                      ThinCursorImpl cursor_impl) except -1:
-        """
-        Set the variable on the bind information and copy across metadata that
-        will be used for binding. If the bind metadata has changed, mark the
-        statement as requiring a full execute. In addition, binding a REF
-        cursor also requires a full execute.
-        """
-        cdef:
-            OracleMetadata metadata = var_impl.metadata
-            object value
-        if metadata.dbtype._ora_type_num == ORA_TYPE_NUM_CURSOR:
-            for value in var_impl._values:
-                if value is not None and value._impl is cursor_impl:
-                    errors._raise_err(errors.ERR_SELF_BIND_NOT_SUPPORTED)
-            self._binds_changed = True
-        if metadata.dbtype._ora_type_num != bind_info.ora_type_num \
-                or metadata.max_size != bind_info.size \
-                or metadata.buffer_size != bind_info.buffer_size \
-                or metadata.precision != bind_info.precision \
-                or metadata.scale != bind_info.scale \
-                or var_impl.is_array != bind_info.is_array \
-                or var_impl.num_elements != bind_info.num_elements \
-                or metadata.dbtype._csfrm != bind_info.csfrm:
-            bind_info.ora_type_num = metadata.dbtype._ora_type_num
-            bind_info.csfrm = metadata.dbtype._csfrm
-            bind_info.is_array = var_impl.is_array
-            bind_info.num_elements = var_impl.num_elements
-            bind_info.size = metadata.max_size
-            bind_info.buffer_size = metadata.buffer_size
-            bind_info.precision = metadata.precision
-            bind_info.scale = metadata.scale
-            self._binds_changed = True
-        bind_info._bind_var_impl = var_impl
-
-    cdef int clear_all_state(self) except -1:
-        """
-        Clears all state associated with the cursor.
-        """
-        self._fetch_vars = None
-        self._fetch_metadata = None
-        self._fetch_var_impls = None
-        self._executed = False
-        self._binds_changed = False
-        self._requires_define = False
-        self._no_prefetch = False
-        self._cursor_id = 0
-
-    cdef bint requires_single_execute(self):
-        """
-        Returns a boolean indicating if the statement requires a single execute
-        in order to be processed correctly by the server. If a PL/SQL block has
-        not been executed before, the determination of input/output binds has
-        not been completed and so a single execution is required in order to
-        complete that determination.
-        """
-        return self._is_plsql and (self._cursor_id == 0 or self._binds_changed)
diff --git a/src/oracledb/impl/thin/statement_cache.pyx b/src/oracledb/impl/thin/statement_cache.pyx
deleted file mode 100644
index bfe35937..00000000
--- a/src/oracledb/impl/thin/statement_cache.pyx
+++ /dev/null
@@ -1,192 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# statement_cache.pyx
-#
-# Cython file defining the StatementCache class used to manage cached
-# statements (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class StatementCache:
-
-    cdef:
-        object _cached_statements
-        object _lock
-        uint32_t _max_size
-        uint32_t _max_cursors
-        array.array _cursors_to_close
-        ssize_t _num_cursors_to_close
-        set _open_cursors
-
-    cdef int _add_cursor_to_close(self, Statement stmt) except -1:
-        """
-        Add the statement's cursor to the list of cursors that need to be
-        closed.
-        """
-        if stmt._cursor_id != 0 and not stmt._is_nested:
-            self._cursors_to_close[self._num_cursors_to_close] = \
-                    stmt._cursor_id
-            self._num_cursors_to_close += 1
-        self._open_cursors.remove(stmt)
-
-    cdef int _adjust_cache(self) except -1:
-        """
-        Adjust the cache so that no more than the maximum number of statements
-        are cached.
-        """
-        cdef Statement stmt
-        while len(self._cached_statements) > self._max_size:
-            stmt = <Statement> self._cached_statements.popitem(last=False)[1]
-            if stmt._in_use:
-                stmt._return_to_cache = False
-            else:
-                self._add_cursor_to_close(stmt)
-
-    cdef int clear_cursor(self, Statement stmt) except -1:
-        """
-        Clears the particular cursor but retains it in the list of open
-        cursors. This is for cases where the cursor id needs to be cleared but
-        the cursor itself is still going to be used.
-        """
-        self._cursors_to_close[self._num_cursors_to_close] = stmt._cursor_id
-        self._num_cursors_to_close += 1
-        stmt._cursor_id = 0
-        stmt._fetch_var_impls = None
-        stmt._executed = False
-
-    cdef int clear_open_cursors(self) except -1:
-        """
-        Clears the list of open cursors and removes the list of cursors that
-        need to be closed. This is required when a DRCP session change has
-        taken place as the cursor ID values are invalidated.
-        """
-        cdef:
-            set new_open_cursors = set()
-            Statement stmt
-        with self._lock:
-            for stmt in self._open_cursors:
-                stmt.clear_all_state()
-                if stmt._in_use or stmt._return_to_cache:
-                    new_open_cursors.add(stmt)
-            self._open_cursors = new_open_cursors
-            self._num_cursors_to_close = 0
-
-    cdef Statement get_statement(self, str sql, bint cache_statement,
-                                 bint force_new):
-        """
-        Get a statement from the statement cache, or prepare a new statement
-        for use. If a statement is already in use or the statement is not
-        supposed to be cached, a copy will be made (and not returned to the
-        cache).
-        """
-        cdef Statement stmt = None
-        with self._lock:
-            if sql is not None:
-                stmt = self._cached_statements.get(sql)
-            if stmt is None:
-                stmt = Statement.__new__(Statement)
-                if sql is not None:
-                    stmt._prepare(sql)
-                if cache_statement and not stmt._is_ddl and self._max_size > 0:
-                    stmt._return_to_cache = True
-                    self._cached_statements[sql] = stmt
-                    self._adjust_cache()
-                self._open_cursors.add(stmt)
-            elif force_new or stmt._in_use:
-                if not cache_statement:
-                    self._add_cursor_to_close(stmt)
-                    del self._cached_statements[sql]
-                stmt = stmt.copy()
-                self._open_cursors.add(stmt)
-            elif not cache_statement:
-                del self._cached_statements[sql]
-                stmt._return_to_cache = False
-            else:
-                self._cached_statements.move_to_end(sql)
-        stmt._in_use = True
-        return stmt
-
-    cdef int initialize(self, uint32_t max_size,
-                         uint32_t max_cursors) except -1:
-        """
-        Initialize the statement cache.
-        """
-        if max_cursors == 0:
-            self._max_size = 0
-            self._max_cursors = 1
-        else:
-            self._max_size = max_size
-            self._max_cursors = max_cursors
-        self._cached_statements = collections.OrderedDict()
-        self._lock = threading.Lock()
-        self._open_cursors = set()
-        self._cursors_to_close = array.array('I')
-        array.resize(self._cursors_to_close, self._max_cursors)
-        self._num_cursors_to_close = 0
-
-    cdef int resize(self, uint32_t new_size) except -1:
-        """
-        Resizes the statement cache to the new value.
-        """
-        with self._lock:
-            self._max_size = new_size
-            self._adjust_cache()
-
-    cdef int return_statement(self, Statement stmt) except -1:
-        """
-        Return the statement to the statement cache, if applicable. If the
-        statement must not be returned to the statement cache, add the cursor
-        id to the list of cursor ids to close on the next round trip to the
-        database. Clear all bind variables and fetch variables in order to
-        ensure that unnecessary references are not retained.
-        """
-        cdef:
-            ThinVarImpl var_impl
-            BindInfo bind_info
-        if stmt._bind_info_list is not None:
-            for bind_info in stmt._bind_info_list:
-                bind_info._bind_var_impl = None
-        if stmt._fetch_var_impls is not None:
-            for var_impl in stmt._fetch_var_impls:
-                var_impl._values = [None] * var_impl.num_elements
-        with self._lock:
-            if stmt._return_to_cache:
-                stmt._in_use = False
-            else:
-                self._add_cursor_to_close(stmt)
-
-    cdef int write_cursors_to_close(self, WriteBuffer buf) except -1:
-        """
-        Write the list of cursors to close to the buffer.
-        """
-        cdef:
-            unsigned int *cursor_ids
-            ssize_t i
-        with self._lock:
-            buf.write_ub4(self._num_cursors_to_close)
-            cursor_ids = self._cursors_to_close.data.as_uints
-            for i in range(self._num_cursors_to_close):
-                buf.write_ub4(cursor_ids[i])
-            self._num_cursors_to_close = 0
diff --git a/src/oracledb/impl/thin/transport.pyx b/src/oracledb/impl/thin/transport.pyx
deleted file mode 100644
index 38f9eaae..00000000
--- a/src/oracledb/impl/thin/transport.pyx
+++ /dev/null
@@ -1,380 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# transport.pyx
-#
-# Cython file defining the transport class used by the client for sending and
-# receiving packets (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef bint DEBUG_PACKETS = ("PYO_DEBUG_PACKETS" in os.environ)
-
-cdef class Transport:
-
-    cdef:
-        object _transport
-        object _ssl_context
-        str _ssl_sni_data
-        uint32_t _transport_num
-        ssize_t _max_packet_size
-        uint32_t _op_num
-        bytes _partial_buf
-        bint _full_packet_size
-        bint _is_async
-
-    cdef str _calc_sni_data(self, Description description):
-        """
-        Calculates the string used for the special SNI handling that allows one
-        of the TLS negotiations to be bypassed.
-        """
-        cdef str server_type_part = ""
-        if description.server_type is not None:
-            server_type_part = f".T1.{description.server_type[:1]}"
-        return (
-            f"S{len(description.service_name)}.{description.service_name}"
-            f"{server_type_part}"
-            f".V3.{TNS_VERSION_DESIRED}"
-        )
-
-    cdef str _get_debugging_header(self, str operation):
-        """
-        Returns the header line used for debugging packets.
-        """
-        cdef str header
-        self._op_num += 1
-        current_date = datetime.datetime.now().isoformat(
-            sep=" ",
-            timespec="milliseconds"
-        )
-        return (
-            f"{current_date} "
-            f"{operation} [op {self._op_num}] on socket {self._transport_num}"
-        )
-
-    cdef int _print_output(self, str text) except -1:
-        """
-        Prints and flushes the text to stdout to ensure that multiple
-        threads don't lose output due to buffering.
-        """
-        print(text + "\n", flush=True)
-
-    cdef int _print_packet(self, str operation, object data) except -1:
-        """
-        Print the packet content in a format suitable for debugging.
-        """
-        offset = 0
-        hex_data = memoryview(data).hex().upper()
-        output_lines = [self._get_debugging_header(operation)]
-        while hex_data:
-            line_hex_data = hex_data[:16]
-            hex_data = hex_data[16:]
-            hex_dump_values = []
-            printable_values = []
-            for i in range(0, len(line_hex_data), 2):
-                hex_byte = line_hex_data[i:i + 2]
-                hex_dump_values.append(hex_byte)
-                byte_val = ord(bytes.fromhex(hex_byte))
-                char_byte = chr(byte_val)
-                if char_byte.isprintable() and byte_val < 128 \
-                        and char_byte != " ":
-                    printable_values.append(char_byte)
-                else:
-                    printable_values.append(".")
-            while len(hex_dump_values) < 8:
-                hex_dump_values.append("  ")
-                printable_values.append(" ")
-            output_lines.append(
-                f'{offset:04} : {" ".join(hex_dump_values)} '
-                f'|{"".join(printable_values)}|'
-            )
-            offset += 8
-        self._print_output("\n".join(output_lines))
-
-    cdef int disconnect(self) except -1:
-        """
-        Disconnects the transport.
-        """
-        if self._transport is not None:
-            if DEBUG_PACKETS:
-                self._print_output(
-                    self._get_debugging_header("Disconnecting transport")
-                )
-            self._transport.close()
-            self._transport = None
-
-    cdef int create_ssl_context(self, ConnectParamsImpl params,
-                                Description description,
-                                Address address) except -1:
-        """
-        Creates the SSL context used for establishing TLS communications
-        between the database and the client.
-        """
-
-        # start with a default SSL context, unless a custom one is supplied
-        self._ssl_context = params.ssl_context
-        if self._ssl_context is None:
-            self._ssl_context = ssl.create_default_context()
-
-        # set the minimum and maximum versions of the TLS protocol
-        if description.ssl_version is not None:
-            self._ssl_context.minimum_version = description.ssl_version
-            self._ssl_context.maximum_version = description.ssl_version
-
-        # if the platform is macOS, check if the certifi package is installed;
-        # if certifi is not installed, load the certificates from the macOS
-        # keychain in PEM format
-        if sys.platform == "darwin" and certifi is None:
-            global macos_certs
-            if macos_certs is None:
-                certs = subprocess.run(["security", "find-certificate",
-                                        "-a", "-p"],
-                                        stdout=subprocess.PIPE).stdout
-                macos_certs = certs.decode("utf-8")
-            self._ssl_context.load_verify_locations(cadata=macos_certs)
-
-        # if a wallet is specified, either mTLS is being used or a set of
-        # certificates is being loaded to validate the server
-        if description.wallet_location is not None:
-            pem_file_name = os.path.join(description.wallet_location,
-                                         PEM_WALLET_FILE_NAME)
-            if not os.path.exists(pem_file_name):
-                errors._raise_err(errors.ERR_WALLET_FILE_MISSING,
-                                  name=pem_file_name)
-            self._ssl_context.load_verify_locations(pem_file_name)
-            wallet_password = params._get_wallet_password()
-            try:
-                self._ssl_context.load_cert_chain(pem_file_name,
-                                                  password=wallet_password)
-            except ssl.SSLError:
-                pass
-
-        # the SSL host name is not checked but the SSL server DN matching
-        # algorithm is run instead after the TLS connection has been
-        # established
-        self._ssl_context.check_hostname = False
-
-        # calculate the SNI data to send to the server, if applicable
-        if description.use_sni:
-            self._ssl_sni_data = self._calc_sni_data(description)
-        else:
-            self._ssl_sni_data = None
-
-    cdef Packet extract_packet(self, bytes data=None):
-        """
-        Extracts a packet from the data, if possible (after first appending it
-        to the partial buffer, if applicable). Any extra data not needed by the
-        packet is stored in the partial buffer for a later call to this
-        function.
-        """
-        cdef:
-            ssize_t size, packet_size
-            Packet packet
-            char_type *ptr
-
-        # update the partial buffer with the new data
-        if data is not None:
-            if self._partial_buf is None:
-                self._partial_buf = data
-            else:
-                self._partial_buf += data
-        size = 0 if self._partial_buf is None else len(self._partial_buf)
-
-        # if enough bytes for the packet header, extract the packet size
-        if size >= PACKET_HEADER_SIZE:
-
-            # extract the packet size
-            ptr = <char_type*> self._partial_buf
-            if self._full_packet_size:
-                packet_size = decode_uint32be(ptr)
-            else:
-                packet_size = decode_uint16be(ptr)
-
-            # if enough bytes are available for the packet, return it
-            if size >= packet_size:
-                packet = Packet.__new__(Packet)
-                packet.packet_size = packet_size
-                packet.packet_type = ptr[4]
-                packet.packet_flags = ptr[5]
-
-                # store the packet buffer and adjust the partial buffer, as
-                # needed
-                if size == packet_size:
-                    packet.buf = self._partial_buf
-                    self._partial_buf = None
-                else:
-                    packet.buf = self._partial_buf[:packet_size]
-                    self._partial_buf = self._partial_buf[packet_size:]
-
-                # display packet, if requested
-                if DEBUG_PACKETS:
-                    self._print_packet("Receiving packet", packet.buf)
-                return packet
-
-    cdef tuple get_host_info(self):
-        """
-        Return a 2-tuple supplying the host and port to which the transport is
-        connected.
-        """
-        cdef object sock
-        if self._is_async:
-            sock = self._transport.get_extra_info('socket')
-        else:
-            sock = self._transport
-        return sock.getpeername()[:2]
-
-    cdef int has_data_ready(self, bint *data_ready) except -1:
-        """
-        Returns true if data is ready to be read on the transport.
-        """
-        socket_list = [self._transport]
-        read_socks, _, _ = select.select(socket_list, [], [], 0)
-        data_ready[0] = bool(read_socks)
-
-    cdef int negotiate_tls(self, object sock, Address address,
-                           Description description) except -1:
-        """
-        Negotiate TLS on the socket.
-        """
-        if DEBUG_PACKETS:
-            self._print_output(self._get_debugging_header("Negotiate TLS"))
-        self._transport = self._ssl_context.wrap_socket(
-            sock, server_hostname=self._ssl_sni_data
-        )
-        if description.ssl_server_dn_match:
-            check_server_dn(self._transport, description.ssl_server_cert_dn,
-                            address.host)
-
-    cdef int renegotiate_tls(self, Address address,
-                             Description description) except -1:
-        """
-        Renegotiate TLS on the socket.
-        """
-        orig_sock = self._transport
-        sock = socket.socket(family=orig_sock.family, type=orig_sock.type,
-                             proto=orig_sock.proto, fileno=orig_sock.detach())
-        self.negotiate_tls(sock, address, description)
-
-    async def negotiate_tls_async(self, BaseAsyncProtocol protocol,
-                                  Address address, Description description):
-        """
-        Negotiate TLS on the socket asynchronously.
-        """
-        if DEBUG_PACKETS:
-            self._print_output(self._get_debugging_header("Negotiate TLS"))
-        orig_transport = self._transport
-        loop = protocol._read_buf._loop
-        self._transport = await loop.start_tls(
-            self._transport, protocol,
-            self._ssl_context,
-            server_hostname=self._ssl_sni_data
-        )
-        if description.ssl_server_dn_match:
-            sock = self._transport.get_extra_info("ssl_object")
-            check_server_dn(sock, description.ssl_server_cert_dn, address.host)
-        return orig_transport
-
-    cdef int send_oob_break(self) except -1:
-        """
-        Sends an out-of-band break on the transport.
-        """
-        if DEBUG_PACKETS:
-            self._print_output(
-                self._get_debugging_header("Sending out of band break")
-            )
-        self._transport.send(b"!", socket.MSG_OOB)
-
-    cdef int set_from_socket(self, object transport,
-                             ConnectParamsImpl params,
-                             Description description,
-                             Address address) except -1:
-        """
-        Sets the transport from a socket.
-        """
-        cdef object sock
-        if self._is_async:
-            sock = transport.get_extra_info('socket')
-        else:
-            sock = transport
-        if description.expire_time > 0:
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-            if hasattr(socket, "TCP_KEEPIDLE") \
-                    and hasattr(socket, "TCP_KEEPINTVL") \
-                    and hasattr(socket, "TCP_KEEPCNT"):
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE,
-                                description.expire_time * 60)
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 6)
-                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 10)
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-        if sock.gettimeout() != 0:
-            sock.settimeout(None)
-        self._transport = transport
-        self._transport_num = sock.fileno()
-
-    cdef Packet read_packet(self, bint raise_exc=True):
-        """
-        Reads a packet from the transport.
-        """
-        cdef:
-            Packet packet
-            bytes data
-        packet = self.extract_packet()
-        while packet is None:
-            try:
-                data = self._transport.recv(self._max_packet_size)
-            except ConnectionResetError as e:
-                self._transport = None
-                if not raise_exc:
-                    return None
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED, str(e),
-                                  cause=e)
-            if len(data) == 0:
-                self.disconnect()
-                if not raise_exc:
-                    return None
-                errors._raise_err(errors.ERR_CONNECTION_CLOSED)
-            packet = self.extract_packet(data)
-        return packet
-
-    cdef int set_timeout(self, double value) except -1:
-        """
-        Sets the timeout on the transport.
-        """
-        self._transport.settimeout(value or None)
-
-    cdef int write_packet(self, WriteBuffer buf) except -1:
-        """
-        Writes a packet on the transport.
-        """
-        cdef bytes data = buf._data[:buf._pos]
-        if DEBUG_PACKETS:
-            self._print_packet("Sending packet", data)
-        try:
-            if self._is_async:
-                self._transport.write(data)
-            else:
-                self._transport.send(data)
-        except OSError as e:
-            self.disconnect()
-            errors._raise_err(errors.ERR_CONNECTION_CLOSED, cause=e)
diff --git a/src/oracledb/impl/thin/utils.pyx b/src/oracledb/impl/thin/utils.pyx
deleted file mode 100644
index 0695d542..00000000
--- a/src/oracledb/impl/thin/utils.pyx
+++ /dev/null
@@ -1,112 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# utils.pyx
-#
-# Cython file defining utility classes and methods (embedded in thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-class OutOfPackets(Exception):
-    pass
-
-class MarkerDetected(Exception):
-    pass
-
-class ConnectConstants:
-
-    def __init__(self):
-        self.pid = str(os.getpid())
-        pattern = r"(?P<major_num>\d+)\.(?P<minor_num>\d+)\.(?P<patch_num>\d+)"
-        match_dict = re.match(pattern, DRIVER_VERSION)
-        major_num = int(match_dict["major_num"])
-        minor_num = int(match_dict["minor_num"])
-        patch_num = int(match_dict["patch_num"])
-        self.full_version_num = \
-                major_num << 24 | minor_num << 20 | patch_num << 12
-
-
-cdef int _convert_base64(char_type *buf, long value, int size, int offset):
-    """
-    Converts every 6 bits into a character, from left to right. This is
-    similar to ordinary base64 encoding with a few differences and written
-    here for performance.
-    """
-    cdef int i
-    for i in range(size):
-        buf[offset + size - i - 1] = TNS_BASE64_ALPHABET_ARRAY[value & 0x3f]
-        value = value >> 6
-    return offset + size
-
-
-cdef object _encode_rowid(Rowid *rowid):
-    """
-    Converts the rowid structure into an encoded string, if the rowid structure
-    contains valid data; otherwise, it returns None.
-    """
-    cdef:
-        char_type buf[TNS_MAX_ROWID_LENGTH]
-        int offset = 0
-    if rowid.rba != 0 or rowid.partition_id != 0 or rowid.block_num != 0 \
-            or rowid.slot_num != 0:
-        offset = _convert_base64(buf, rowid.rba, 6, offset)
-        offset = _convert_base64(buf, rowid.partition_id, 3, offset)
-        offset = _convert_base64(buf, rowid.block_num, 6, offset)
-        offset = _convert_base64(buf, rowid.slot_num, 3, offset)
-        return buf[:TNS_MAX_ROWID_LENGTH].decode()
-
-
-cdef str _get_connect_data(Description description, str connection_id, ConnectParamsImpl params):
-    """
-    Return the connect data required by the listener in order to connect.
-    """
-    cid = f"(PROGRAM={params.program})" + \
-          f"(HOST={params.machine})" + \
-          f"(USER={params.osuser})"
-    if description.connection_id_prefix:
-        description.connection_id = description.connection_id_prefix + \
-                connection_id
-    else:
-        description.connection_id = connection_id
-    return description.build_connect_string(cid)
-
-
-cdef int _check_cryptography() except -1:
-    """
-    Checks to see that the cryptography package was imported successfully.
-    """
-    if CRYPTOGRAPHY_IMPORT_ERROR is not None:
-        errors._raise_err(errors.ERR_NO_CRYPTOGRAPHY_PACKAGE,
-                          str(CRYPTOGRAPHY_IMPORT_ERROR))
-
-
-def init_thin_impl(package):
-    """
-    Initializes globals after the package has been completely initialized. This
-    is to avoid circular imports and eliminate the need for global lookups.
-    """
-    global _connect_constants, errors, exceptions
-    _connect_constants = ConnectConstants()
-    errors = package.errors
-    exceptions = package.exceptions
diff --git a/src/oracledb/impl/thin/var.pyx b/src/oracledb/impl/thin/var.pyx
deleted file mode 100644
index 72eacdd4..00000000
--- a/src/oracledb/impl/thin/var.pyx
+++ /dev/null
@@ -1,148 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# var.pyx
-#
-# Cython file defining the variable implementation class (embedded in
-# thin_impl.pyx).
-#------------------------------------------------------------------------------
-
-cdef class ThinVarImpl(BaseVarImpl):
-    cdef:
-        object _last_raw_value
-        ArrowArrayImpl _last_arrow_array
-        ArrowArrayImpl _saved_arrow_array
-        list _coroutine_indexes
-
-    cdef int _bind(self, object conn, BaseCursorImpl cursor_impl,
-                   uint32_t num_execs, object name, uint32_t pos) except -1:
-        cdef:
-            ThinCursorImpl thin_cursor_impl = <ThinCursorImpl> cursor_impl
-            Statement stmt = thin_cursor_impl._statement
-            object bind_info_dict = stmt._bind_info_dict
-            list bind_info_list = stmt._bind_info_list
-            OracleMetadata metadata = self.metadata
-            ssize_t idx, num_binds, num_vars
-            BindInfo bind_info
-            str normalized_name
-            bint is_async
-            object value
-
-        # for PL/SQL blocks, if the size of a string or bytes object exceeds
-        # 32,767 bytes it must be converted to a BLOB/CLOB; an out converter
-        # needs to be established as well to return the string in the way that
-        # the user expects to get it
-        if stmt._is_plsql and metadata.max_size > 32767:
-            if metadata.dbtype._ora_type_num == ORA_TYPE_NUM_RAW \
-                    or metadata.dbtype._ora_type_num == ORA_TYPE_NUM_LONG_RAW:
-                metadata.dbtype = DB_TYPE_BLOB
-            elif metadata.dbtype._csfrm == CS_FORM_NCHAR:
-                metadata.dbtype = DB_TYPE_NCLOB
-            else:
-                metadata.dbtype = DB_TYPE_CLOB
-            orig_converter = self.outconverter
-            def converter(v):
-                v = v.read()
-                if orig_converter is not None:
-                    v = orig_converter(v)
-                return v
-            self.outconverter = converter
-
-        # for variables containing LOBs, create temporary LOBs, if needed
-        is_async = thin_cursor_impl._conn_impl._protocol._transport._is_async
-        if metadata.dbtype._ora_type_num == ORA_TYPE_NUM_CLOB \
-                or metadata.dbtype._ora_type_num == ORA_TYPE_NUM_BLOB:
-            for idx, value in enumerate(self._values):
-                if value is not None \
-                        and not isinstance(value, (PY_TYPE_LOB,
-                                                   PY_TYPE_ASYNC_LOB)):
-                    self._values[idx] = conn.createlob(metadata.dbtype, value)
-                    if is_async:
-                        if self._coroutine_indexes is None:
-                            self._coroutine_indexes = []
-                        self._coroutine_indexes.append(idx)
-
-        # bind by name
-        if name is not None:
-            if name.startswith('"') and name.endswith('"'):
-                normalized_name = name[1:-1]
-            else:
-                normalized_name = name.upper()
-            if normalized_name.startswith(":"):
-                normalized_name = normalized_name[1:]
-            if normalized_name not in bind_info_dict:
-                errors._raise_err(errors.ERR_INVALID_BIND_NAME, name=name)
-            for bind_info in bind_info_dict[normalized_name]:
-                stmt._set_var(bind_info, self, thin_cursor_impl)
-
-        # bind by position
-        else:
-            num_binds = len(bind_info_list)
-            num_vars = len(cursor_impl.bind_vars)
-            if num_binds != num_vars:
-                errors._raise_err(errors.ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS,
-                                  expected_num=num_binds, actual_num=num_vars)
-            bind_info = bind_info_list[pos - 1]
-            stmt._set_var(bind_info, self, thin_cursor_impl)
-
-    cdef int _finalize_init(self) except -1:
-        """
-        Internal method that finalizes initialization of the variable.
-        """
-        BaseVarImpl._finalize_init(self)
-        self._values = [None] * self.num_elements
-
-    cdef ArrowArrayImpl _finish_building_arrow_array(self):
-        """
-        Finish building the Arrow array associated with the variable and then
-        return that array (after clearing it in the variable so that a new
-        array will be built if more rows are fetched). In thin mode, the
-        duplicate row handling requires the last array to be retained, so do
-        that here.
-        """
-        self._last_arrow_array = BaseVarImpl._finish_building_arrow_array(self)
-        return self._last_arrow_array
-
-    cdef list _get_array_value(self):
-        """
-        Internal method to return the value of the array.
-        """
-        return self._values[:self.num_elements_in_array]
-
-    cdef object _get_scalar_value(self, uint32_t pos):
-        """
-        Internal method to return the value of the variable at the given
-        position.
-        """
-        return self._values[pos]
-
-    @cython.boundscheck(False)
-    @cython.wraparound(False)
-    cdef int _set_scalar_value(self, uint32_t pos, object value) except -1:
-        """
-        Set the value of the variable at the given position. At this point it
-        is assumed that all checks have been performed!
-        """
-        self._values[pos] = value
diff --git a/src/oracledb/lob.py b/src/oracledb/lob.py
deleted file mode 100644
index 55813035..00000000
--- a/src/oracledb/lob.py
+++ /dev/null
@@ -1,318 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# lob.py
-#
-# Contains the LOB class for managing BLOB, CLOB, NCLOB and BFILE data.
-# -----------------------------------------------------------------------------
-
-from typing import Optional, Union
-
-from .base import BaseMetaClass
-from .base_impl import DbType, DB_TYPE_BFILE, DB_TYPE_BLOB
-from . import errors
-
-
-class BaseLOB(metaclass=BaseMetaClass):
-
-    def __del__(self):
-        self._impl.free_lob()
-
-    def _check_is_bfile(self):
-        if self._impl.dbtype is not DB_TYPE_BFILE:
-            errors._raise_err(errors.ERR_OPERATION_ONLY_SUPPORTED_ON_BFILE)
-
-    def _check_not_bfile(self):
-        if self._impl.dbtype is DB_TYPE_BFILE:
-            errors._raise_err(errors.ERR_OPERATION_NOT_SUPPORTED_ON_BFILE)
-
-    def _check_value_to_write(self, value):
-        """
-        Checks the value to write and returns the actual value to write.
-        Character LOBs must write strings but can accept UTF-8 encoded bytes
-        (which will be decoded to strings). Binary LOBs must write bytes but
-        can accept strings (which will be encoded in UTF-8).
-        """
-        if self.type is DB_TYPE_BLOB:
-            if isinstance(value, str):
-                return value.encode()
-            elif isinstance(value, bytes):
-                return value
-        else:
-            if isinstance(value, str):
-                return value
-            elif isinstance(value, bytes):
-                return value.decode()
-        raise TypeError("expecting string or bytes")
-
-    @classmethod
-    def _from_impl(cls, impl):
-        if isinstance(impl, BaseLOB):
-            return impl
-        lob = cls.__new__(cls)
-        lob._impl = impl
-        return lob
-
-    def getfilename(self) -> tuple:
-        """
-        Returns a two-tuple consisting of the directory alias and file name for
-        a BFILE type LOB.
-        """
-        self._check_is_bfile()
-        return self._impl.get_file_name()
-
-    def setfilename(self, dir_alias: str, name: str) -> None:
-        """
-        Sets the directory alias and name of a BFILE type LOB.
-        """
-        self._check_is_bfile()
-        self._impl.set_file_name(dir_alias, name)
-
-    @property
-    def type(self) -> DbType:
-        """
-        This read-only attribute returns the type of the LOB as one of the
-        database type constants.
-        """
-        return self._impl.dbtype
-
-
-class LOB(BaseLOB):
-
-    def __reduce__(self):
-        value = self.read()
-        return (type(value), (value,))
-
-    def __str__(self):
-        return self.read()
-
-    def close(self) -> None:
-        """
-        Closes the LOB. Call this when writing is completed so that the indexes
-        associated with the LOB can be updated -– but only if open() was called
-        first.
-        """
-        self._impl.close()
-
-    def fileexists(self) -> bool:
-        """
-        Returns a boolean indicating if the file referenced by a BFILE type LOB
-        exists.
-        """
-        self._check_is_bfile()
-        return self._impl.file_exists()
-
-    def getchunksize(self) -> int:
-        """
-        Returns the chunk size for the LOB. Reading and writing to the LOB in
-        chunks of multiples of this size will improve performance.
-        """
-        self._check_not_bfile()
-        return self._impl.get_chunk_size()
-
-    def isopen(self) -> bool:
-        """
-        Returns a boolean indicating if the LOB has been opened using the
-        method open().
-        """
-        return self._impl.get_is_open()
-
-    def open(self) -> None:
-        """
-        Opens the LOB for writing. This will improve performance when writing
-        to the LOB in chunks and there are functional or extensible indexes
-        associated with the LOB. If this method is not called, each write will
-        perform an open internally followed by a close after the write has been
-        completed.
-        """
-        self._impl.open()
-
-    def read(
-        self, offset: int = 1, amount: Optional[int] = None
-    ) -> Union[str, bytes]:
-        """
-        Returns a portion (or all) of the data in the LOB. Note that the amount
-        and offset are in bytes for BLOB and BFILE type LOBs and in UCS-2 code
-        points for CLOB and NCLOB type LOBs. UCS-2 code points are equivalent
-        to characters for all but supplemental characters. If supplemental
-        characters are in the LOB, the offset and amount will have to be chosen
-        carefully to avoid splitting a character.
-        """
-        if amount is None:
-            amount = self._impl.get_max_amount()
-            if amount >= offset:
-                amount = amount - offset + 1
-            else:
-                amount = 1
-        elif amount <= 0:
-            errors._raise_err(errors.ERR_INVALID_LOB_AMOUNT)
-        if offset <= 0:
-            errors._raise_err(errors.ERR_INVALID_LOB_OFFSET)
-        return self._impl.read(offset, amount)
-
-    def size(self) -> int:
-        """
-        Returns the size of the data in the LOB. For BLOB and BFILE type LOBs,
-        this is the number of bytes. For CLOB and NCLOB type LOBs, this is the
-        number of UCS-2 code points. UCS-2 code points are equivalent to
-        characters for all but supplemental characters.
-        """
-        return self._impl.get_size()
-
-    def trim(
-        self, new_size: int = 0, *, newSize: Optional[int] = None
-    ) -> None:
-        """
-        Trims the LOB to the new size (the second parameter is deprecated and
-        should not be used).
-        """
-        self._check_not_bfile()
-        if newSize is not None:
-            if new_size != 0:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="newSize",
-                    new_name="new_size",
-                )
-            new_size = newSize
-        self._impl.trim(new_size)
-
-    def write(self, data: Union[str, bytes], offset: int = 1) -> None:
-        """
-        Writes the data to the LOB at the given offset. The offset is in bytes
-        for BLOB type LOBs and in UCS-2 code points for CLOB and NCLOB type
-        LOBs. UCS-2 code points are equivalent to characters for all but
-        supplemental characters. If supplemental characters are in the LOB, the
-        offset will have to be chosen carefully to avoid splitting a character.
-        Note that if you want to make the LOB value smaller, you must use the
-        trim() function.
-        """
-        self._check_not_bfile()
-        self._impl.write(self._check_value_to_write(data), offset)
-
-
-class AsyncLOB(BaseLOB):
-
-    async def close(self) -> None:
-        """
-        Closes the LOB. Call this when writing is completed so that the indexes
-        associated with the LOB can be updated -– but only if open() was called
-        first.
-        """
-        await self._impl.close()
-
-    async def fileexists(self) -> bool:
-        """
-        Returns a boolean indicating if the file referenced by a BFILE type LOB
-        exists.
-        """
-        self._check_is_bfile()
-        return await self._impl.file_exists()
-
-    async def getchunksize(self) -> int:
-        """
-        Returns the chunk size for the LOB. Reading and writing to the LOB in
-        chunks of multiples of this size will improve performance.
-        """
-        self._check_not_bfile()
-        return await self._impl.get_chunk_size()
-
-    async def isopen(self) -> bool:
-        """
-        Returns a boolean indicating if the LOB has been opened using the
-        method open().
-        """
-        return await self._impl.get_is_open()
-
-    async def open(self) -> None:
-        """
-        Opens the LOB for writing. This will improve performance when writing
-        to the LOB in chunks and there are functional or extensible indexes
-        associated with the LOB. If this method is not called, each write will
-        perform an open internally followed by a close after the write has been
-        completed.
-        """
-        await self._impl.open()
-
-    async def read(
-        self, offset: int = 1, amount: Optional[int] = None
-    ) -> Union[str, bytes]:
-        """
-        Returns a portion (or all) of the data in the LOB. Note that the amount
-        and offset are in bytes for BLOB and BFILE type LOBs and in UCS-2 code
-        points for CLOB and NCLOB type LOBs. UCS-2 code points are equivalent
-        to characters for all but supplemental characters. If supplemental
-        characters are in the LOB, the offset and amount will have to be chosen
-        carefully to avoid splitting a character.
-        """
-        if amount is None:
-            amount = self._impl.get_max_amount()
-            if amount >= offset:
-                amount = amount - offset + 1
-            else:
-                amount = 1
-        if offset <= 0:
-            errors._raise_err(errors.ERR_INVALID_LOB_OFFSET)
-        return await self._impl.read(offset, amount)
-
-    async def size(self) -> int:
-        """
-        Returns the size of the data in the LOB. For BLOB and BFILE type LOBs
-        this is the number of bytes. For CLOB and NCLOB type LOBs this is the
-        number of UCS-2 code points. UCS-2 code points are equivalent to
-        characters for all but supplemental characters.
-        """
-        return await self._impl.get_size()
-
-    async def trim(
-        self, new_size: int = 0, *, newSize: Optional[int] = None
-    ) -> None:
-        """
-        Trims the LOB to the new size (the second parameter is deprecated and
-        should not be used).
-        """
-        self._check_not_bfile()
-        if newSize is not None:
-            if new_size != 0:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="newSize",
-                    new_name="new_size",
-                )
-            new_size = newSize
-        await self._impl.trim(new_size)
-
-    async def write(self, data: Union[str, bytes], offset: int = 1) -> None:
-        """
-        Writes the data to the LOB at the given offset. The offset is in bytes
-        for BLOB type LOBs and in UCS-2 code points for CLOB and NCLOB type
-        LOBs. UCS-2 code points are equivalent to characters for all but
-        supplemental characters. If supplemental characters are in the LOB, the
-        offset will have to be chosen carefully to avoid splitting a character.
-        Note that if you want to make the LOB value smaller, you must use the
-        trim() function.
-        """
-        self._check_not_bfile()
-        await self._impl.write(self._check_value_to_write(data), offset)
diff --git a/src/oracledb/pipeline.py b/src/oracledb/pipeline.py
deleted file mode 100644
index bb2d0565..00000000
--- a/src/oracledb/pipeline.py
+++ /dev/null
@@ -1,491 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pipeline.py
-#
-# Contains the Pipeline class used for executing multiple operations.
-# -----------------------------------------------------------------------------
-
-from typing import Any, Callable, Optional, Union
-
-from . import utils
-from .base import BaseMetaClass
-from .base_impl import PipelineImpl, PipelineOpImpl, PipelineOpResultImpl
-from .defaults import defaults
-from .enums import PipelineOpType
-from .errors import _Error
-from .fetch_info import FetchInfo
-
-
-class PipelineOp(metaclass=BaseMetaClass):
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return f"<{cls_name} of type {self.op_type.name}>"
-
-    def _create_result(self):
-        """
-        Internal method used for creating a result object that is returned when
-        running a pipeline.
-        """
-        impl = PipelineOpResultImpl(self._impl)
-        result = PipelineOpResult.__new__(PipelineOpResult)
-        result._operation = self
-        result._impl = impl
-        return result
-
-    @property
-    def arraysize(self) -> int:
-        """
-        This read-only attribute returns the array size that will be used when
-        fetching query rows with :meth:`Pipeline.add_fetchall()`. For all other
-        operations, the value returned is *0*.
-        """
-        return self._impl.arraysize
-
-    @property
-    def fetch_decimals(self) -> bool:
-        """
-        Returns whether or not to fetch columns of type ``NUMBER`` as
-        ``decimal.Decimal`` values for a query.
-        """
-        return self._impl.fetch_decimals
-
-    @property
-    def fetch_lobs(self) -> bool:
-        """
-        Returns whether or not to fetch LOB locators for a query.
-        """
-        return self._impl.fetch_lobs
-
-    @property
-    def keyword_parameters(self) -> Any:
-        """
-        This read-only attribute returns the keyword parameters to the stored
-        procedure or function being called by the operation, if applicable.
-        """
-        return self._impl.keyword_parameters
-
-    @property
-    def name(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the stored procedure or
-        function being called by the operation, if applicable.
-        """
-        return self._impl.name
-
-    @property
-    def num_rows(self) -> int:
-        """
-        This read-only attribute returns the number of rows to fetch when
-        performing a query of a specific number of rows. For all other
-        operations, the value returned is *0*.
-        """
-        return self._impl.num_rows
-
-    @property
-    def op_type(self) -> PipelineOpType:
-        """
-        This read-only attribute returns the type of operation that is taking
-        place.
-        """
-        return PipelineOpType(self._impl.op_type)
-
-    @property
-    def parameters(self) -> Any:
-        """
-        This read-only attribute returns the parameters to the stored procedure
-        or function or the parameters bound to the statement being executed by
-        the operation, if applicable.
-        """
-        return self._impl.parameters
-
-    @property
-    def return_type(self) -> Any:
-        """
-        This read-only attribute returns the return type of the stored function
-        being called by the operation, if applicable.
-        """
-        return self._impl.return_type
-
-    @property
-    def rowfactory(self) -> Union[Callable, None]:
-        """
-        This read-only attribute returns the row factory callable function to
-        be used in a query executed by the operation, if applicable.
-        """
-        return self._impl.rowfactory
-
-    @property
-    def statement(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the statement being executed by the
-        operation, if applicable.
-        """
-        return self._impl.statement
-
-
-class PipelineOpResult(metaclass=BaseMetaClass):
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return (
-            f"<{cls_name} for operation of type {self.operation.op_type.name}>"
-        )
-
-    @property
-    def columns(self) -> Union[list[FetchInfo], None]:
-        """
-        This read-only attribute is a list of FetchInfo objects. This
-        attribute will be *None* for operations that do not return rows.
-        """
-        if self._impl.fetch_metadata is not None:
-            return [FetchInfo._from_impl(i) for i in self._impl.fetch_metadata]
-
-    @property
-    def error(self) -> Union[_Error, None]:
-        """
-        This read-only attribute returns the error that occurred when running
-        this operation. If no error occurred, then the value *None* is
-        returned.
-        """
-        return self._impl.error
-
-    @property
-    def operation(self) -> PipelineOp:
-        """
-        This read-only attribute returns the PipelineOp operation object that
-        generated the result.
-        """
-        return self._operation
-
-    @property
-    def return_value(self) -> Any:
-        """
-        This read-only attribute returns the return value of the called PL/SQL
-        function, if a function was called for the operation.
-        """
-        return self._impl.return_value
-
-    @property
-    def rows(self) -> Union[list, None]:
-        """
-        This read-only attribute returns the rows that were fetched by the
-        operation, if a query was executed.
-        """
-        return self._impl.rows
-
-    @property
-    def warning(self) -> Union[_Error, None]:
-        """
-        This read-only attribute returns any warning that was encountered when
-        running this operation. If no warning was encountered, then the value
-        *None* is returned.
-        """
-        return self._impl.warning
-
-
-class Pipeline(metaclass=BaseMetaClass):
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return f"<{cls_name} with {len(self._impl.operations)} operations>"
-
-    def _add_op(self, op_impl):
-        """
-        Internal method for adding an PipelineOpImpl instance to the list of
-        operations, creating an associated PipelineOp instance to correspond to
-        it.
-        """
-        self._impl.operations.append(op_impl)
-        op = PipelineOp.__new__(PipelineOp)
-        op._impl = op_impl
-        self._operations.append(op)
-        return op
-
-    def add_callfunc(
-        self,
-        name: str,
-        return_type: Any,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation to the pipeline that calls a stored PL/SQL function
-        with the given parameters and return type. The created PipelineOp
-        object is also returned from this function.
-
-        When the Pipeline is executed, the PipelineOpResult object that is
-        returned for this operation will have the
-        :attr:`~PipelineOpResult.return_value` attribute populated with the
-        return value of the PL/SQL function if the call completes
-        successfully.
-        """
-        utils.verify_stored_proc_args(parameters, keyword_parameters)
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.CALL_FUNC,
-            name=name,
-            return_type=return_type,
-            parameters=parameters,
-            keyword_parameters=keyword_parameters,
-        )
-        return self._add_op(op_impl)
-
-    def add_callproc(
-        self,
-        name: str,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation that calls a stored procedure with the given
-        parameters. The created PipelineOp object is also returned from
-        this function.
-        """
-        utils.verify_stored_proc_args(parameters, keyword_parameters)
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.CALL_PROC,
-            name=name,
-            parameters=parameters,
-            keyword_parameters=keyword_parameters,
-        )
-        return self._add_op(op_impl)
-
-    def add_commit(self) -> PipelineOp:
-        """
-        Adds an operation that performs a commit.
-        """
-        op_impl = PipelineOpImpl(op_type=PipelineOpType.COMMIT)
-        return self._add_op(op_impl)
-
-    def add_execute(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation that executes a statement with the given parameters.
-        The created PipelineOp object is also returned from this function.
-
-        Do not use this for queries that return rows.  Instead use
-        :meth:`Pipeline.add_fetchall()`, :meth:`Pipeline.add_fetchmany()`, or
-        :meth:`Pipeline.add_fetchone()`.
-        """
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.EXECUTE,
-            statement=statement,
-            parameters=parameters,
-        )
-        return self._add_op(op_impl)
-
-    def add_executemany(
-        self,
-        statement: str,
-        parameters: Union[list, int],
-    ) -> PipelineOp:
-        """
-        Adds an operation that executes a SQL statement once using all bind
-        value mappings or sequences found in the sequence parameters. This can
-        be used to insert, update, or delete multiple rows in a table. It can
-        also invoke a PL/SQL procedure multiple times.
-
-        The created PipelineOp object is also returned from this function.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one bind variable placeholder in ``statement``. It can
-        also be a list of dictionaries, where the keys match the bind variable
-        placeholder names in ``statement``. If there are no bind values, or
-        values have previously been bound, the ``parameters`` value can be an
-        integer specifying the number of iterations.
-        """
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.EXECUTE_MANY,
-            statement=statement,
-            parameters=parameters,
-        )
-        return self._add_op(op_impl)
-
-    def add_fetchall(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation that executes a query and returns all of the rows
-        from the result set.  The created PipelineOp object is also returned
-        from this function.
-
-        When the Pipeline is executed, the PipelineOpResult object that is
-        returned for this operation will have the
-        :attr:`~PipelineOpResult.rows` attribute populated with the list of
-        rows returned by the query.
-
-        The default value for ``arraysize`` is
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this operation's :attr:`Cursor.prefetchrows` size is set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        The ``fetch_lobs`` parameter specifies whether to return LOB locators
-        or ``str``/``bytes`` values when fetching LOB columns. The default
-        value is :data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        ``decimal.Decimal`` values when fetching columns of type ``NUMBER``.
-        The default value is
-        :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-        """
-        if arraysize is None:
-            arraysize = defaults.arraysize
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.FETCH_ALL,
-            statement=statement,
-            parameters=parameters,
-            arraysize=arraysize,
-            rowfactory=rowfactory,
-            fetch_lobs=fetch_lobs,
-            fetch_decimals=fetch_decimals,
-        )
-        return self._add_op(op_impl)
-
-    def add_fetchmany(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        num_rows: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation that executes a query and returns up to the specified
-        number of rows from the result set.  The created PipelineOp object is
-        also returned from this function.
-
-        When the Pipeline is executed, the PipelineOpResult object that is
-        returned for this operation will have the
-        :attr:`~PipelineOpResult.rows` attribute populated with the list of
-        rows returned by the query.
-
-        The default value for ``num_rows`` is the value of
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this operation's :attr:`Cursor.prefetchrows` size is set to
-        the value of the explicit or default ``num_rows`` parameter, allowing
-        all rows to be fetched in one round-trip.
-
-        Since only one fetch is performed for a query operation, consider
-        adding a ``FETCH NEXT`` clause to the statement to prevent the
-        database processing rows that will never be fetched.
-
-        The ``fetch_lobs`` parameter specifies whether to return LOB locators
-        or ``str``/``bytes`` values when fetching LOB columns. The default
-        value is :data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        ``decimal.Decimal`` values when fetching columns of type ``NUMBER``.
-        The default value is
-        :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-        """
-        if num_rows is None:
-            num_rows = defaults.arraysize
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.FETCH_MANY,
-            statement=statement,
-            parameters=parameters,
-            num_rows=num_rows,
-            rowfactory=rowfactory,
-            fetch_lobs=fetch_lobs,
-            fetch_decimals=fetch_decimals,
-        )
-        return self._add_op(op_impl)
-
-    def add_fetchone(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        rowfactory: Optional[Callable] = None,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> PipelineOp:
-        """
-        Adds an operation that executes a query and returns the first row of
-        the result set if one exists (or *None*, if no rows exist).  The
-        created PipelineOp object is also returned from this function.
-
-        When the Pipeline is executed, the PipelineOpResult object that is
-        returned for this operation will have the
-        :attr:`~PipelineOpResult.rows` attribute populated with this row if the
-        query is performed successfully.
-
-        Internally, this operation's :attr:`Cursor.prefetchrows` and
-        :attr:`Cursor.arraysize` sizes will be set to *1*.
-
-        Since only one fetch is performed for a query operation, consider
-        adding a ``WHERE`` condition or using a ``FETCH NEXT`` clause in the
-        statement to prevent the database processing rows that will never be
-        fetched.
-
-        The ``fetch_lobs`` parameter specifies whether to return LOB locators
-        or ``str``/``bytes`` values when fetching LOB columns. The default
-        value is :data:`oracledb.defaults.fetch_lobs <Defaults.fetch_lobs>`.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        ``decimal.Decimal`` values when fetching columns of type ``NUMBER``.
-        The default value is
-        :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-        """
-        op_impl = PipelineOpImpl(
-            op_type=PipelineOpType.FETCH_ONE,
-            statement=statement,
-            parameters=parameters,
-            rowfactory=rowfactory,
-            fetch_lobs=fetch_lobs,
-            fetch_decimals=fetch_decimals,
-        )
-        return self._add_op(op_impl)
-
-    @property
-    def operations(self) -> list[PipelineOp]:
-        """
-        This read-only attribute returns the list of operations associated with
-        the pipeline.
-        """
-        return self._operations
-
-
-def create_pipeline() -> Pipeline:
-    """
-    Creates a pipeline object which can be used to process a set of operations
-    against a database.
-    """
-    pipeline = Pipeline.__new__(Pipeline)
-    pipeline._impl = PipelineImpl()
-    pipeline._operations = []
-    return pipeline
diff --git a/src/oracledb/plugins/azure_config_provider.py b/src/oracledb/plugins/azure_config_provider.py
deleted file mode 100644
index 52719f85..00000000
--- a/src/oracledb/plugins/azure_config_provider.py
+++ /dev/null
@@ -1,274 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# azure_config_provider.py
-#
-# Python file contains the hook method config_azure_hook() that fetches config
-# store from Azure App Configuration.
-# -----------------------------------------------------------------------------
-
-import json
-import re
-
-import oracledb
-
-from urllib.parse import urlparse, parse_qs
-from azure.appconfiguration import AzureAppConfigurationClient
-from azure.keyvault.secrets import SecretClient
-from azure.core.exceptions import ResourceNotFoundError
-from azure.identity import (
-    ClientSecretCredential,
-    CertificateCredential,
-    ManagedIdentityCredential,
-    ChainedTokenCredential,
-    EnvironmentCredential,
-)
-
-
-def _get_authentication_method(parameters):
-    auth_method = parameters.get("authentication", parameters.get("method"))
-    if auth_method is not None:
-        auth_method = auth_method.upper()
-        if auth_method == "AZURE_DEFAULT":
-            auth_method = None
-    return auth_method
-
-
-def _get_credential(parameters):
-    """
-    Returns the appropriate credential given the input supplied by the original
-    connect string.
-    """
-
-    tokens = []
-    auth_method = _get_authentication_method(parameters)
-
-    if auth_method is None or auth_method == "AZURE_SERVICE_PRINCIPAL":
-        if "azure_client_secret" in parameters:
-            tokens.append(
-                ClientSecretCredential(
-                    _get_required_parameter(parameters, "azure_tenant_id"),
-                    _get_required_parameter(parameters, "azure_client_id"),
-                    _get_required_parameter(parameters, "azure_client_secret"),
-                )
-            )
-        elif "azure_client_certificate_path" in parameters:
-            tokens.append(
-                CertificateCredential(
-                    _get_required_parameter(parameters, "azure_tenant_id"),
-                    _get_required_parameter(parameters, "azure_client_id"),
-                    _get_required_parameter(
-                        parameters, "azure_client_certificate_path"
-                    ),
-                )
-            )
-    if auth_method is None or auth_method == "AZURE_MANAGED_IDENTITY":
-        client_id = parameters.get("azure_managed_identity_client_id")
-        if client_id is not None:
-            tokens.append(ManagedIdentityCredential(client_id=client_id))
-
-    if len(tokens) == 0:
-        message = (
-            "Authentication options were not available in Connection String"
-        )
-        raise Exception(message)
-    elif len(tokens) == 1:
-        return tokens[0]
-    tokens.append(EnvironmentCredential())
-    return ChainedTokenCredential(*tokens)
-
-
-def _get_password(pwd_string, parameters):
-    try:
-        pwd = json.loads(pwd_string)
-    except json.JSONDecodeError:
-        message = (
-            "Password is expected to be JSON"
-            " containing Azure Vault details."
-        )
-        raise Exception(message)
-
-    pwd["value"] = pwd.pop("uri")
-    pwd["type"] = "azurevault"
-
-    # make authentication section
-    pwd["authentication"] = authentication = {}
-
-    authentication["method"] = auth_method = _get_authentication_method(
-        parameters
-    )
-
-    if auth_method is None or auth_method == "AZURE_SERVICE_PRINCIPAL":
-        if "azure_client_secret" in parameters:
-            authentication["azure_tenant_id"] = _get_required_parameter(
-                parameters, "azure_tenant_id"
-            )
-            authentication["azure_client_id"] = _get_required_parameter(
-                parameters, "azure_client_id"
-            )
-            authentication["azure_client_secret"] = _get_required_parameter(
-                parameters, "azure_client_secret"
-            )
-
-        elif "azure_client_certificate_path" in parameters:
-            authentication["azure_tenant_id"] = (
-                _get_required_parameter(parameters, "azure_tenant_id"),
-            )
-            authentication["azure_client_id"] = (
-                _get_required_parameter(parameters, "azure_client_id"),
-            )
-            authentication["azure_client_certificate_path"] = (
-                _get_required_parameter(
-                    parameters, "azure_client_certificate_path"
-                )
-            )
-
-    if auth_method is None or auth_method == "AZURE_MANAGED_IDENTITY":
-        authentication["azure_managed_identity_client_id"] = parameters.get(
-            "azure_managed_identity_client_id"
-        )
-    return pwd
-
-
-def _get_required_parameter(parameters, name, location="connection string"):
-    try:
-        return parameters[name]
-    except KeyError:
-        message = f'Parameter named "{name}" is missing from {location}'
-        raise Exception(message) from None
-
-
-def _get_setting(client, key, sub_key, label, required=True):
-    """
-    Returns the configuration setting given the client, key and label.
-    """
-    try:
-        if key.endswith("/"):
-            actual_key = f"{key}{sub_key}"
-        else:
-            actual_key = f"{key}/{sub_key}"
-        obj = client.get_configuration_setting(key=actual_key, label=label)
-    except ResourceNotFoundError:
-        if required:
-            message = f"Missing required configuration key: {actual_key}"
-            raise Exception(message)
-        return None
-    return obj.value
-
-
-def _parse_parameters(protocol_arg: str) -> dict:
-    """
-    Parse the parameters from the protocol argument string.
-    """
-    pos = protocol_arg.find("?")
-    parsed_url = urlparse(protocol_arg[pos + 1 :])
-    parsed_values = parse_qs(parsed_url.path)
-    parameters = {
-        key.lower(): value[0] for key, value in parsed_values.items()
-    }
-    config_name = protocol_arg[:pos].rstrip("/")
-    if not config_name.endswith(".azconfig.io"):
-        config_name += ".azconfig.io"
-    parameters["appconfigname"] = config_name
-    return parameters
-
-
-def password_type_azure_vault_hook(args):
-    uri = _get_required_parameter(args, "value", '"password" key section')
-    credential = args.get("credential")
-
-    if credential is None:
-        # if credential not present, this might be coming
-        # from oci config provider, so create credential
-        # for azure key vault.
-        auth = args.get("authentication")
-        if auth is None:
-            raise Exception(
-                "Azure Vault authentication details were not provided."
-            )
-        credential = _get_credential(auth)
-
-    pattern = re.compile(
-        r"(?P<vault_url>https://[A-Za-z0-9._-]+)/"
-        r"secrets/(?P<secretKey>[A-Za-z][A-Za-z0-9-]*)$"
-    )
-    match = pattern.match(uri)
-    if match is None:
-        raise Exception("Invalid Azure Vault details")
-    vault_url = match.group("vault_url")
-    secret_key = match.group("secretKey")
-    secret_client = SecretClient(vault_url, credential)
-    return secret_client.get_secret(secret_key).value
-
-
-def _process_config(parameters, connect_params):
-    """
-    Processes the configuration stored in the Azure App configuration store.
-    """
-
-    credential = _get_credential(parameters)
-    client = AzureAppConfigurationClient(
-        "https://" + _get_required_parameter(parameters, "appconfigname"),
-        credential,
-    )
-    key = _get_required_parameter(parameters, "key")
-    label = parameters.get("label")
-
-    # get the common parameters
-    config = {}
-    config["connect_descriptor"] = _get_setting(
-        client, key, "connect_descriptor", label
-    )
-    config["user"] = _get_setting(client, key, "user", label, required=False)
-    pwd = _get_setting(client, key, "password", label, required=False)
-    if pwd is not None:
-        config["password"] = _get_password(pwd, parameters)
-
-    config["config_time_to_live"] = _get_setting(
-        client, key, "config_time_to_live", label, required=False
-    )
-    config["config_time_to_live_grace_period"] = _get_setting(
-        client, key, "config_time_to_live_grace_period", label, required=False
-    )
-
-    # get the python-oracledb specific parameters
-    settings = _get_setting(client, key, "pyo", label, required=False)
-    if settings is not None:
-        config["pyo"] = json.loads(settings)
-
-    # set the configuration
-    connect_params.set_from_config(config)
-
-
-def config_azure_hook(protocol, protocol_arg, connect_params):
-    """
-    Hook for handling parameters stored in an Azure configuration store.
-    """
-    parameters = _parse_parameters(protocol_arg)
-    _process_config(parameters, connect_params)
-
-
-oracledb.register_password_type("azurevault", password_type_azure_vault_hook)
-oracledb.register_protocol("config-azure", config_azure_hook)
diff --git a/src/oracledb/plugins/azure_tokens.py b/src/oracledb/plugins/azure_tokens.py
deleted file mode 100644
index a40f697c..00000000
--- a/src/oracledb/plugins/azure_tokens.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# azure_tokens.py
-#
-# Methods that generates an OAuth2 access token using the MSAL SDK
-# -----------------------------------------------------------------------------
-
-import enum
-
-import msal
-import oracledb
-
-
-class AuthType(str, enum.Enum):
-    AzureServicePrincipal = "AzureServicePrincipal".lower()
-
-
-def _service_principal_credentials(token_auth_config):
-    """
-    Returns the access token for authentication as a service principal.
-    """
-    msal_config = {
-        "authority": token_auth_config["authority"],
-        "client_id": token_auth_config["client_id"],
-        "client_credential": token_auth_config["client_credential"],
-    }
-    # Initialize the Confidential Client Application
-    cca = msal.ConfidentialClientApplication(**msal_config)
-    auth_response = cca.acquire_token_for_client(
-        scopes=[token_auth_config["scopes"]]
-    )
-
-    if "access_token" in auth_response:
-        return auth_response["access_token"]
-
-
-def generate_token(token_auth_config, refresh=False):
-    """
-    Generates an Azure access token based on provided credentials.
-    """
-    auth_type = token_auth_config["auth_type"].lower()
-    if auth_type == AuthType.AzureServicePrincipal:
-        return _service_principal_credentials(token_auth_config)
-
-
-def has_azure_auth_type(extra_auth_params):
-    """
-    Validates that extra_auth_params contains a valid 'auth_type'
-    """
-    if extra_auth_params is None:
-        return False
-    auth_type = extra_auth_params.get("auth_type")
-    return auth_type is not None and auth_type.lower() in AuthType
-
-
-def azure_token_hook(params: oracledb.ConnectParams):
-    """
-    Azure-specific hook for generating a token.
-    """
-    if has_azure_auth_type(params.extra_auth_params):
-
-        def token_callback(refresh):
-            return generate_token(params.extra_auth_params, refresh)
-
-        params.set(access_token=token_callback)
-
-
-# Register the token hook for Azure
-oracledb.register_params_hook(azure_token_hook)
diff --git a/src/oracledb/plugins/oci_config_provider.py b/src/oracledb/plugins/oci_config_provider.py
deleted file mode 100644
index 7abf3aab..00000000
--- a/src/oracledb/plugins/oci_config_provider.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# oci_config_provider.py
-#
-# Python file contains the hook method config_oci_hook() that fetches config
-# store from OCI Object Storage.
-# -----------------------------------------------------------------------------
-
-import base64
-import json
-import oci
-import oracledb
-import re
-
-from urllib.parse import urlparse, parse_qs
-
-oci_from_file = oci.config.from_file
-oci_client_error = oci.exceptions.ClientError
-oci_object_storage_client = oci.object_storage.ObjectStorageClient
-oci_secrets_client = oci.secrets.SecretsClient
-
-
-"""
-Pattern to parse OCI Object Connect String
-"""
-cloud_net_naming_pattern_oci = re.compile(
-    r"(?P<objservername>[^/]+)/n/(?P<namespace>[^/]+)/b/(?P<bucketname>[^/]+)/o/(?P<filename>[^/]+)(/c/(?P<alias>[^/]+))?"
-)
-
-
-def _get_config(parameters, connect_params):
-    config = {}
-
-    credential, signer = _get_credential(parameters)
-    auth_method = parameters.get("authentication")
-    if auth_method is not None:
-        auth_method = auth_method.upper()
-
-    if auth_method is None or auth_method == "OCI_DEFAULT":
-        client_oci = oci_object_storage_client(credential)
-    elif (
-        auth_method == "OCI_INSTANCE_PRINCIPAL"
-        or auth_method == "OCI_RESOURCE_PRINCIPAL"
-    ):
-        client_oci = oci_object_storage_client(
-            config=credential, signer=signer
-        )
-    get_object_request = {
-        "object_name": _get_required_parameter(parameters, "filename"),
-        "bucket_name": _get_required_parameter(parameters, "bucketname"),
-        "namespace_name": _get_required_parameter(parameters, "namespace"),
-    }
-
-    get_object_response = client_oci.get_object(**get_object_request)
-    resp = _stream_to_string(get_object_response.data)
-    settings = json.loads(resp)
-    user_alias = parameters.get("alias")
-    if user_alias:
-        settings = settings[user_alias]
-
-    # Connect Descriptor
-    config["connect_descriptor"] = _get_required_parameter(
-        settings, "connect_descriptor"
-    )
-
-    # user and password
-    if connect_params.user is None:
-        config["user"] = settings.get("user")
-        if "password" in settings:
-            config["password"] = pwd = settings["password"]
-            if pwd["type"] == "ocivault":
-                authentication = pwd.setdefault("authentication", {})
-                authentication.setdefault("method", auth_method)
-                authentication["credential"] = credential
-
-    # config cache settings
-    config["config_time_to_live"] = settings.get("config_time_to_live")
-    config["config_time_to_live_grace_period"] = settings.get(
-        "config_time_to_live_grace_period"
-    )
-
-    # pyo parameters settings
-    config["pyo"] = settings.get("pyo", None)
-
-    # set the configuration
-    connect_params.set_from_config(config)
-
-
-def _get_credential(parameters):
-    """
-    Returns the appropriate credential given the input supplied by the original
-    connect string.
-    """
-    auth_method = parameters.get("authentication", parameters.get("method"))
-
-    if auth_method is not None:
-        auth_method = auth_method.upper()
-
-    # if region is not in connection string, retrieve from object server name.
-    region = parameters.get(
-        "oci_region", _retrieve_region(parameters.get("objservername"))
-    )
-
-    try:
-        if auth_method is None or auth_method == "OCI_DEFAULT":
-            # Default Authentication
-            # default path ~/.oci/config
-            return oci_from_file(), None
-    except oci.exceptions.ClientError:
-        # try to create config with connection string parameters.
-        if "oci_tenancy" in parameters and "oci_user" in parameters:
-            with open(parameters["oci_key_file"], "r") as file_content:
-                public_key = file_content.read()
-            provider = dict(
-                tenancy=parameters["oci_tenancy"],
-                user=parameters["oci_user"],
-                fingerprint=parameters["oci_fingerprint"],
-                key_file=parameters["oci_key_file"],
-                private_key_content=public_key,
-                region=region,
-            )
-            return provider, None
-
-    if auth_method == "OCI_INSTANCE_PRINCIPAL":
-        signer = oci.auth.signers.InstancePrincipalsSecurityTokenSigner()
-        return (
-            dict(region=region),
-            signer,
-        )
-
-    elif auth_method == "OCI_RESOURCE_PRINCIPAL":
-        signer = oci.auth.signers.get_resource_principals_signer()
-        return {}, signer
-    else:
-        msg = "Authentication options were not available in Connection String"
-        raise Exception(msg)
-
-
-def _get_required_parameter(parameters, name, location="connection string"):
-    try:
-        return parameters[name]
-    except KeyError:
-        message = f'Parameter named "{name}" is missing from {location}'
-        raise Exception(message) from None
-
-
-def _parse_parameters(protocol_arg: str) -> dict:
-    """
-    Parse the parameters from the protocol argument string.
-    """
-    pos = protocol_arg.find("?")
-    parsed_url = urlparse(protocol_arg[pos + 1 :])
-    parsed_values = parse_qs(parsed_url.path)
-    parameters = {
-        key.lower(): value[0] for key, value in parsed_values.items()
-    }
-
-    match = cloud_net_naming_pattern_oci.match(protocol_arg[:pos])
-    if match:
-        parameters["objservername"] = match.group("objservername")
-        parameters["namespace"] = match.group("namespace")
-        parameters["bucketname"] = match.group("bucketname")
-        parameters["filename"] = match.group("filename")
-        if match.group("alias"):
-            parameters["alias"] = match.group("alias")
-    return parameters
-
-
-def password_type_oci_vault_hook(args):
-    secret_id = _get_required_parameter(
-        args, "value", '"password" key section'
-    )
-    authentication = args.get("authentication")
-    if authentication is None:
-        raise Exception(
-            "OCI Key Vault authentication details were not provided."
-        )
-
-    # if credentials are not present, create credentials with given
-    # authentication details.
-    credential = authentication.get("credential")
-    if credential is None:
-        credential, signer = _get_credential(authentication)
-
-    auth_method = authentication.get("method")
-    if auth_method is not None:
-        auth_method = auth_method.upper()
-    if auth_method is None or auth_method == "OCI_DEFAULT":
-        secret_client_oci = oci_secrets_client(credential)
-    elif auth_method == "OCI_INSTANCE_PRINCIPAL":
-        signer = oci.auth.signers.InstancePrincipalsSecurityTokenSigner()
-        secret_client_oci = oci_secrets_client(
-            config=credential, signer=signer
-        )
-    elif auth_method == "OCI_RESOURCE_PRINCIPAL":
-        signer = oci.auth.signers.get_resource_principals_signer()
-        secret_client_oci = oci_secrets_client(
-            config=credential, signer=signer
-        )
-
-    get_secret_bundle_response = secret_client_oci.get_secret_bundle(
-        secret_id=secret_id
-    )
-    # decoding the vault content
-    b64content = get_secret_bundle_response.data.secret_bundle_content.content
-    return base64.b64decode(b64content).decode()
-
-
-def _retrieve_region(objservername):
-    if objservername is not None:
-        arr = objservername.split(".")
-        return arr[1].lower().replace("_", "-")
-
-
-def _stream_to_string(stream):
-    return b"".join(stream).decode()
-
-
-def config_oci_hook(
-    protocol: str, protocol_arg: str, connect_params: oracledb.ConnectParams
-):
-    """
-    Hook for handling parameters stored in an OCI Object store.
-    """
-    parameters = _parse_parameters(protocol_arg)
-    _get_config(parameters, connect_params)
-
-
-oracledb.register_password_type("ocivault", password_type_oci_vault_hook)
-oracledb.register_protocol("config-ociobject", config_oci_hook)
diff --git a/src/oracledb/plugins/oci_tokens.py b/src/oracledb/plugins/oci_tokens.py
deleted file mode 100644
index ddfd1de1..00000000
--- a/src/oracledb/plugins/oci_tokens.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# oci_tokens.py
-#
-# Methods that generates an OCI access token using the OCI SDK
-# -----------------------------------------------------------------------------
-
-import enum
-import pathlib
-
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-import oci
-import oracledb
-
-
-class AuthType(str, enum.Enum):
-    ConfigFileAuthentication = "ConfigFileAuthentication".lower()
-    InstancePrincipal = "InstancePrincipal".lower()
-    SecurityToken = "SecurityToken".lower()
-    SecurityTokenSimple = "SecurityTokenSimple".lower()
-    SimpleAuthentication = "SimpleAuthentication".lower()
-
-
-def _config_file_based_authentication(token_auth_config):
-    """
-    Config file base authentication implementation: config parameters
-    are provided in a file.
-    """
-    config = _load_oci_config(token_auth_config)
-    client = oci.identity_data_plane.DataplaneClient(config)
-    return _generate_access_token(client, token_auth_config)
-
-
-def _generate_access_token(client, token_auth_config):
-    """
-    Token generation logic used by authentication methods.
-    """
-    key_pair = _get_key_pair()
-    scope = token_auth_config.get("scope", "urn:oracle:db::id::*")
-
-    details = oci.identity_data_plane.models.GenerateScopedAccessTokenDetails(
-        scope=scope, public_key=key_pair["public_key"]
-    )
-    response = client.generate_scoped_access_token(
-        generate_scoped_access_token_details=details
-    )
-
-    return (response.data.token, key_pair["private_key"])
-
-
-def _get_key_pair():
-    """
-    Generates a public-private key pair for proof of possession.
-    """
-    private_key = rsa.generate_private_key(
-        public_exponent=65537,
-        key_size=4096,
-    )
-    private_key_pem = private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.PKCS8,
-        encryption_algorithm=serialization.NoEncryption(),
-    ).decode("utf-8")
-
-    public_key_pem = (
-        private_key.public_key()
-        .public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo,
-        )
-        .decode("utf-8")
-    )
-
-    if not oracledb.is_thin_mode():
-        private_key_pem = "".join(
-            line.strip()
-            for line in private_key_pem.splitlines()
-            if not (
-                line.startswith("-----BEGIN") or line.startswith("-----END")
-            )
-        )
-
-    return {"private_key": private_key_pem, "public_key": public_key_pem}
-
-
-def _instance_principal_authentication(token_auth_config):
-    """
-    Instance principal authentication: for compute instances
-    with dynamic group access.
-    """
-    signer = oci.auth.signers.InstancePrincipalsSecurityTokenSigner()
-    client = oci.identity_data_plane.DataplaneClient(config={}, signer=signer)
-    return _generate_access_token(client, token_auth_config)
-
-
-def _load_oci_config(token_auth_config):
-    """
-    Load OCI configuration using the file location and profile specified
-    in token_auth_config, or fall back to OCI defaults.
-    """
-    file_location = token_auth_config.get(
-        "file_location", oci.config.DEFAULT_LOCATION
-    )
-    profile = token_auth_config.get("profile", oci.config.DEFAULT_PROFILE)
-    config = oci.config.from_file(file_location, profile)
-    oci.config.validate_config(config)
-    return config
-
-
-def _security_token_authentication(token_auth_config):
-    """
-    Session token-based authentication: uses the security token specified by
-    the security_token_file parameter based on the OCI config file.
-    """
-    config = _load_oci_config(token_auth_config)
-    client = _security_token_create_dataplane_client(config)
-    return _generate_access_token(client, token_auth_config)
-
-
-def _security_token_create_dataplane_client(config):
-    """
-    Create and return an OCI Identity Data Plane client using
-    the security token and private key specified in the given OCI config.
-    """
-    token = pathlib.Path(config["security_token_file"]).read_text()
-    private_key = oci.signer.load_private_key_from_file(config["key_file"])
-    signer = oci.auth.signers.SecurityTokenSigner(token, private_key)
-    return oci.identity_data_plane.DataplaneClient(config, signer=signer)
-
-
-def _security_token_simple_authentication(token_auth_config):
-    """
-    Session token-based authentication: uses security token authentication.
-    Config parameters are passed as parameters.
-    """
-    config = {
-        "key_file": token_auth_config["key_file"],
-        "fingerprint": token_auth_config["fingerprint"],
-        "tenancy": token_auth_config["tenancy"],
-        "region": token_auth_config["region"],
-        "security_token_file": token_auth_config["security_token_file"],
-    }
-    client = _security_token_create_dataplane_client(config)
-    return _generate_access_token(client, token_auth_config)
-
-
-def _simple_authentication(token_auth_config):
-    """
-    Simple authentication: config parameters are passed as parameters
-    """
-    config = {
-        "user": token_auth_config["user"],
-        "key_file": token_auth_config["key_file"],
-        "fingerprint": token_auth_config["fingerprint"],
-        "tenancy": token_auth_config["tenancy"],
-        "region": token_auth_config["region"],
-        "profile": token_auth_config["profile"],
-    }
-    oci.config.validate_config(config)
-
-    client = oci.identity_data_plane.DataplaneClient(config)
-    return _generate_access_token(client, token_auth_config)
-
-
-def generate_token(token_auth_config, refresh=False):
-    """
-    Generates an OCI access token based on provided credentials.
-    """
-    auth_type = token_auth_config["auth_type"].lower()
-    if auth_type == AuthType.ConfigFileAuthentication:
-        return _config_file_based_authentication(token_auth_config)
-    elif auth_type == AuthType.InstancePrincipal:
-        return _instance_principal_authentication(token_auth_config)
-    elif auth_type == AuthType.SecurityToken:
-        return _security_token_authentication(token_auth_config)
-    elif auth_type == AuthType.SecurityTokenSimple:
-        return _security_token_simple_authentication(token_auth_config)
-    elif auth_type == AuthType.SimpleAuthentication:
-        return _simple_authentication(token_auth_config)
-
-
-def has_oci_auth_type(extra_auth_params):
-    """
-    Validates that extra_auth_params contains a valid 'auth_type'
-    """
-    if extra_auth_params is None:
-        return False
-    auth_type = extra_auth_params.get("auth_type")
-    return auth_type is not None and auth_type.lower() in AuthType
-
-
-def oci_token_hook(params: oracledb.ConnectParams):
-    """
-    OCI-specific hook for generating a token.
-    """
-    if has_oci_auth_type(params.extra_auth_params):
-
-        def token_callback(refresh):
-            return generate_token(params.extra_auth_params, refresh)
-
-        params.set(access_token=token_callback)
-
-
-# Register the token hook for OCI
-oracledb.register_params_hook(oci_token_hook)
diff --git a/src/oracledb/pool.py b/src/oracledb/pool.py
deleted file mode 100644
index db9aa195..00000000
--- a/src/oracledb/pool.py
+++ /dev/null
@@ -1,1704 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pool.py
-#
-# Contains the ConnectionPool class and the factory method create_pool() used
-# for creating connection pools.
-#
-# *** NOTICE *** This file is generated from a template and should not be
-# modified directly. See build_from_template.py in the utils subdirectory for
-# more information.
-# -----------------------------------------------------------------------------
-
-import functools
-import ssl
-import threading
-from typing import Callable, Type, Union, Any, Optional
-
-import oracledb
-
-from . import base_impl, thick_impl, thin_impl
-from . import connection as connection_module
-from . import driver_mode
-from . import errors
-from .base import BaseMetaClass
-from .pool_params import PoolParams
-
-
-class BaseConnectionPool(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(
-        self,
-        dsn: Optional[str] = None,
-        *,
-        params: Optional[PoolParams] = None,
-        cache_name: Optional[str] = None,
-        **kwargs,
-    ) -> None:
-        """
-        Constructor for creating a connection pool.
-        """
-        if params is None:
-            params_impl = base_impl.PoolParamsImpl()
-        elif not isinstance(params, PoolParams):
-            errors._raise_err(errors.ERR_INVALID_POOL_PARAMS)
-        else:
-            params_impl = params._impl.copy()
-        with driver_mode.get_manager() as mode_mgr:
-            thin = mode_mgr.thin
-            dsn = params_impl.process_args(dsn, kwargs, thin)
-            self._set_connection_type(params_impl.connectiontype)
-            self._cache_name = cache_name
-            if cache_name is not None:
-                named_pools.add_pool(cache_name, self)
-            try:
-                if issubclass(
-                    self._connection_type, connection_module.AsyncConnection
-                ):
-                    impl = thin_impl.AsyncThinPoolImpl(dsn, params_impl)
-                elif thin:
-                    impl = thin_impl.ThinPoolImpl(dsn, params_impl)
-                else:
-                    impl = thick_impl.ThickPoolImpl(dsn, params_impl)
-                self._impl = impl
-                self.session_callback = params_impl.session_callback
-            except:
-                if cache_name is not None:
-                    del named_pools.pools[cache_name]
-                raise
-
-    def _verify_open(self) -> None:
-        """
-        Verifies that the pool is open and able to perform its work.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_POOL_NOT_OPEN)
-
-    @property
-    def busy(self) -> int:
-        """
-        This read-only attribute returns the number of connections currently
-        acquired.
-        """
-        self._verify_open()
-        return self._impl.get_busy_count()
-
-    @property
-    def dsn(self) -> str:
-        """
-        This read-only attribute returns the TNS entry of the database to which
-        a connection has been established.
-        """
-        self._verify_open()
-        return self._impl.dsn
-
-    @property
-    def getmode(self) -> oracledb.PoolGetMode:
-        """
-        This read-write attribute determines how connections are returned from
-        the pool. If :data:`~oracledb.POOL_GETMODE_FORCEGET` is specified, a
-        new connection will be returned even if there are no free connections
-        in the pool.  :data:`~oracledb.POOL_GETMODE_NOWAIT` will raise an
-        exception if there are no free connections are available in the pool.
-        If :data:`~oracledb.POOL_GETMODE_WAIT` is specified and there are no
-        free connections in the pool, the caller will wait until a free
-        connection is available. :data:`~oracledb.POOL_GETMODE_TIMEDWAIT` uses
-        the value of :data:`~ConnectionPool.wait_timeout` to determine how long
-        the caller should wait for a connection to become available before
-        returning an error.
-        """
-        self._verify_open()
-        return oracledb.PoolGetMode(self._impl.get_getmode())
-
-    @getmode.setter
-    def getmode(self, value: oracledb.PoolGetMode) -> None:
-        self._verify_open()
-        self._impl.set_getmode(value)
-
-    @property
-    def homogeneous(self) -> bool:
-        """
-        This read-only boolean attribute indicates whether the pool is
-        considered :ref:`homogeneous <connpooltypes>` or not. If the pool is
-        not homogeneous, different authentication can be used for each
-        connection acquired from the pool.
-        """
-        self._verify_open()
-        return self._impl.homogeneous
-
-    @property
-    def increment(self) -> int:
-        """
-        This read-only attribute returns the number of connections that will be
-        established when additional connections need to be created.
-        """
-        self._verify_open()
-        return self._impl.increment
-
-    @property
-    def max(self) -> int:
-        """
-        This read-only attribute returns the maximum number of connections that
-        the pool can control.
-        """
-        self._verify_open()
-        return self._impl.max
-
-    @property
-    def max_lifetime_session(self) -> int:
-        """
-        This read-write attribute is the maximum length of time (in seconds)
-        that a pooled connection may exist since first being created. A value
-        of *0* means there is no limit. Connections become candidates for
-        termination when they are acquired or released back to the pool, and
-        have existed for longer than ``max_lifetime_session`` seconds.
-        Connections that are in active use will not be closed. In
-        python-oracledb Thick mode, Oracle Client libraries 12.1 or later must
-        be used and, prior to Oracle Client 21, cleanup only occurs when the
-        pool is accessed.
-        """
-        self._verify_open()
-        return self._impl.get_max_lifetime_session()
-
-    @max_lifetime_session.setter
-    def max_lifetime_session(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_max_lifetime_session(value)
-
-    @property
-    def max_sessions_per_shard(self) -> int:
-        """
-        This read-write attribute returns the number of sessions that can be
-        created per shard in the pool. Setting this attribute greater than zero
-        specifies the maximum number of sessions in the pool that can be used
-        for any given shard in a sharded database. This lets connections in the
-        pool be balanced across the shards. A value of *0* will not set any
-        maximum number of sessions for each shard. This attribute is only
-        available in Oracle Client 18.3 and higher.
-        """
-        self._verify_open()
-        return self._impl.get_max_sessions_per_shard()
-
-    @max_sessions_per_shard.setter
-    def max_sessions_per_shard(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_max_sessions_per_shard(value)
-
-    @property
-    def min(self) -> int:
-        """
-        This read-only attribute returns the number of connections with which
-        the connection pool was created and the minimum number of connections
-        that will be controlled by the connection pool.
-        """
-        self._verify_open()
-        return self._impl.min
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name assigned to the pool by
-        Oracle.
-        """
-        self._verify_open()
-        return self._impl.name
-
-    @property
-    def opened(self) -> int:
-        """
-        This read-only attribute returns the number of connections currently
-        opened by the pool.
-        """
-        self._verify_open()
-        return self._impl.get_open_count()
-
-    @property
-    def ping_interval(self) -> int:
-        """
-        This read-write integer attribute specifies the pool ping interval in
-        seconds. When a connection is acquired from the pool, a check is first
-        made to see how long it has been since the connection was put into the
-        pool. If this idle time exceeds ``ping_interval``, then a
-        :ref:`round-trip <roundtrips>` ping to the database is performed. If
-        the connection is unusable, it is discarded and a different connection
-        is selected to be returned by :meth:`acquire()`.  Setting
-        ``ping_interval`` to a negative value disables pinging.  Setting it to
-        *0* forces a ping for every :meth:`acquire()` and is not recommended.
-        """
-        self._verify_open()
-        return self._impl.get_ping_interval()
-
-    @ping_interval.setter
-    def ping_interval(self, value: int) -> None:
-        self._impl.set_ping_interval(value)
-
-    @property
-    def soda_metadata_cache(self) -> bool:
-        """
-        This read-write boolean attribute returns whether the SODA metadata
-        cache is enabled or not. Enabling the cache significantly improves the
-        performance of methods :meth:`SodaDatabase.createCollection()` (when
-        not specifying a value for the ``metadata`` parameter) and
-        :meth:`SodaDatabase.openCollection()`. Note that the cache can become
-        out of date if changes to the metadata of cached collections are made
-        externally.
-        """
-        self._verify_open()
-        return self._impl.get_soda_metadata_cache()
-
-    @soda_metadata_cache.setter
-    def soda_metadata_cache(self, value: bool) -> None:
-        if not isinstance(value, bool):
-            message = "soda_metadata_cache must be a boolean value."
-            raise TypeError(message)
-        self._verify_open()
-        self._impl.set_soda_metadata_cache(value)
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        This read-write attribute specifies the size of the statement cache
-        that will be used for connections obtained from the pool. Once a
-        connection is created, that connection’s statement cache size can only
-        be changed by setting the ``stmtcachesize`` attribute on the connection
-        itself.
-        """
-        self._verify_open()
-        return self._impl.get_stmt_cache_size()
-
-    @stmtcachesize.setter
-    def stmtcachesize(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_stmt_cache_size(value)
-
-    @property
-    def thin(self) -> bool:
-        """
-        This read-only attribute returns a boolean indicating if
-        python-oracledb is in Thin mode (*True*) or Thick mode (*False*).
-        """
-        self._verify_open()
-        return not isinstance(self._impl, thick_impl.ThickPoolImpl)
-
-    @property
-    def timeout(self) -> int:
-        """
-        This read-write attribute specifies the time (in seconds) after which
-        idle connections will be terminated in order to maintain an optimum
-        number of open connections. A value of *0* means that no idle
-        connections are terminated. Note that in python-oracledb Thick mode
-        with older Oracle Client Libraries, the termination only occurs when
-        the pool is accessed.
-        """
-        self._verify_open()
-        return self._impl.get_timeout()
-
-    @timeout.setter
-    def timeout(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_timeout(value)
-
-    @property
-    def tnsentry(self) -> str:
-        """
-        Deprecated. Use dsn instead.
-        """
-        return self.dsn
-
-    @property
-    def username(self) -> str:
-        """
-        This read-only attribute returns the name of the user which established
-        the connection to the database.
-        """
-        self._verify_open()
-        return self._impl.username
-
-    @property
-    def wait_timeout(self) -> int:
-        """
-        This read-write attribute specifies the time (in milliseconds) that the
-        caller should wait for a connection to become available in the pool
-        before returning with an error. This value is only used if the
-        ``getmode`` parameter to :meth:`oracledb.create_pool()` was the value
-        :data:`oracledb.POOL_GETMODE_TIMEDWAIT`.
-        """
-        self._verify_open()
-        return self._impl.get_wait_timeout()
-
-    @wait_timeout.setter
-    def wait_timeout(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_wait_timeout(value)
-
-
-class ConnectionPool(BaseConnectionPool):
-
-    def __del__(self):
-        if self._impl is not None:
-            self._impl.close(True)
-            self._impl = None
-
-    def _set_connection_type(self, conn_class):
-        """
-        Called internally when the pool is created to ensure that the correct
-        connection class is used for all connections created by the pool.
-        """
-        if conn_class is None:
-            conn_class = connection_module.Connection
-        elif not issubclass(
-            conn_class, connection_module.Connection
-        ) or issubclass(conn_class, connection_module.AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        self._connection_type = conn_class
-
-    def acquire(
-        self,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: int = oracledb.PURITY_DEFAULT,
-        tag: Optional[str] = None,
-        matchanytag: bool = False,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-    ) -> "connection_module.Connection":
-        """
-        Acquires a connection from the session pool and returns a
-        :ref:`connection object <connobj>`.
-
-        If the pool is :ref:`homogeneous <connpooltypes>`, the ``user`` and
-        ``password`` parameters cannot be specified. If they are, an exception
-        will be raised.
-
-        The ``cclass`` parameter, if specified, should be a string
-        corresponding to the connection class for :ref:`drcp`.
-
-        The ``purity`` parameter is expected to be one of
-        :data:`~oracledb.PURITY_NEW`, :data:`~oracledb.PURITY_SELF`, or
-        :data:`~oracledb.PURITY_DEFAULT`.
-
-        The ``tag`` parameter, if specified, is expected to be a string with
-        name=value pairs like "k1=v1;k2=v2" and will limit the connections that
-        can be returned from a connection pool unless the ``matchanytag``
-        parameter is set to *True*. In that case, connections with the
-        specified tag will be preferred over others, but if no such connections
-        are available, then a connection with a different tag may be returned
-        instead. In any case, untagged connections will always be returned if
-        no connections with the specified tag are available. Connections are
-        tagged when they are :meth:`released <ConnectionPool.release>` back to
-        the pool.
-
-        The ``shardingkey`` and ``supershardingkey`` parameters, if specified,
-        are expected to be a sequence of values which will be used to identify
-        the database shard to connect to. The key values can be strings,
-        numbers, bytes, or dates.  See :ref:`connsharding`.
-
-        When using the :ref:`connection pool cache <connpoolcache>`, calling
-        :meth:`oracledb.connect()` with a ``pool_alias`` parameter is the same
-        as calling ``pool.acquire()``.
-        """
-        self._verify_open()
-
-        return oracledb.connect(
-            conn_class=self._connection_type,
-            user=user,
-            password=password,
-            cclass=cclass,
-            purity=purity,
-            tag=tag,
-            matchanytag=matchanytag,
-            shardingkey=shardingkey,
-            supershardingkey=supershardingkey,
-            pool=self,
-        )
-
-    def close(self, force: bool = False) -> None:
-        """
-        Closes the pool now, rather than when the last reference to it is
-        released, which makes it unusable for further work.
-
-        If any connections have been acquired and not released back to the
-        pool, this method will fail unless the ``force`` parameter is set to
-        *True*.
-        """
-        self._verify_open()
-        self._impl.close(force)
-        if self._cache_name is not None:
-            named_pools.remove_pool(self._cache_name)
-        self._impl = None
-
-    def drop(self, connection: "connection_module.Connection") -> None:
-        """
-        Drops the connection from the pool which is useful if the connection is
-        no longer usable (such as when the session is killed).
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.Connection):
-            message = "connection must be an instance of oracledb.Connection"
-            raise TypeError(message)
-        connection._verify_connected()
-        self._impl.drop(connection._impl)
-        connection._impl = None
-
-    def reconfigure(
-        self,
-        min: Optional[int] = None,
-        max: Optional[int] = None,
-        increment: Optional[int] = None,
-        getmode: Optional[int] = None,
-        timeout: Optional[int] = None,
-        wait_timeout: Optional[int] = None,
-        max_lifetime_session: Optional[int] = None,
-        max_sessions_per_shard: Optional[int] = None,
-        soda_metadata_cache: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        ping_interval: Optional[int] = None,
-    ) -> None:
-        """
-        Reconfigures various parameters of a connection pool. The pool size can
-        be altered with ``reconfigure()`` by passing values for
-        :data:`~ConnectionPool.min`, :data:`~ConnectionPool.max` or
-        :data:`~ConnectionPool.increment`.  The
-        :data:`~ConnectionPool.getmode`, :data:`~ConnectionPool.timeout`,
-        :data:`~ConnectionPool.wait_timeout`,
-        :data:`~ConnectionPool.max_lifetime_session`,
-        :data:`~ConnectionPool.max_sessions_per_shard`,
-        :data:`~ConnectionPool.soda_metadata_cache`,
-        :data:`~ConnectionPool.stmtcachesize` and
-        :data:`~ConnectionPool.ping_interval` attributes can be set directly or
-        with ``reconfigure()``.
-
-        All parameters are optional. Unspecified parameters will leave those
-        pool attributes unchanged. The parameters are processed in two stages.
-        After any size change has been processed, reconfiguration on the other
-        parameters is done sequentially. If an error such as an invalid value
-        occurs when changing one attribute, then an exception will be generated
-        but any already changed attributes will retain their new values.
-
-        During reconfiguration of a pool's size, the behavior of
-        :meth:`ConnectionPool.acquire()` depends on the ``getmode`` in effect
-        when ``acquire()`` is called:
-
-        * With mode :data:`~oracledb.POOL_GETMODE_FORCEGET`, an ``acquire()``
-          call will wait until the pool has been reconfigured.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_TIMEDWAIT`, an ``acquire()``
-          call will try to acquire a connection in the time specified by
-          pool.wait_timeout and return an error if the time taken exceeds that
-          value.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_WAIT`, an ``acquire()`` call
-          will wait until after the pool has been reconfigured and a connection
-          is available.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_NOWAIT`, if the number of
-          busy connections is less than the pool size, ``acquire()`` will
-          return a new connection after pool reconfiguration is complete.
-
-        Closing connections with :meth:`ConnectionPool.release()` or
-        :meth:`Connection.close()` will wait until any pool size
-        reconfiguration is complete.
-
-        Closing the connection pool with :meth:`ConnectionPool.close()` will
-        wait until reconfiguration is complete.
-        """
-
-        if min is None:
-            min = self.min
-        if max is None:
-            max = self.max
-        if increment is None:
-            increment = self.increment
-        if self.min != min or self.max != max or self.increment != increment:
-            self._impl.reconfigure(min, max, increment)
-        if getmode is not None:
-            self.getmode = getmode
-        if timeout is not None:
-            self.timeout = timeout
-        if wait_timeout is not None:
-            self.wait_timeout = wait_timeout
-        if max_lifetime_session is not None:
-            self.max_lifetime_session = max_lifetime_session
-        if max_sessions_per_shard is not None:
-            self.max_sessions_per_shard = max_sessions_per_shard
-        if soda_metadata_cache is not None:
-            self.soda_metadata_cache = soda_metadata_cache
-        if stmtcachesize is not None:
-            self.stmtcachesize = stmtcachesize
-        if ping_interval is not None:
-            self.ping_interval = ping_interval
-
-    def release(
-        self,
-        connection: "connection_module.Connection",
-        tag: Optional[str] = None,
-    ) -> None:
-        """
-        Releases the connection back to the pool now, rather than whenever
-        __del__ is called. The connection will be unusable from this point
-        forward; an Error exception will be raised if any operation is
-        attempted with the connection. Any cursors or LOBs created by the
-        connection will also be marked unusable and an Error exception will be
-        raised if any operation is attempted with them.
-
-        Internally, references to the connection are held by cursor objects,
-        LOB objects, etc. Once all of these references are released, the
-        connection itself will be released back to the pool automatically.
-        Either control references to these related objects carefully or
-        explicitly release connections back to the pool in order to ensure
-        sufficient resources are available.
-
-        If the tag is not *None*, it is expected to be a string with name=value
-        pairs like "k1=v1;k2=v2" and will override the value in the property
-        :attr:`Connection.tag`. If either :attr:`Connection.tag` or the tag
-        parameter are not *None*, the connection will be retagged when it is
-        released back to the pool.
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.Connection):
-            message = "connection must be an instance of oracledb.Connection"
-            raise TypeError(message)
-        connection._verify_connected()
-        if tag is not None:
-            connection.tag = tag
-        self._impl.return_connection(connection._impl)
-        connection._impl = None
-
-
-def _pool_factory(
-    f: Callable[..., ConnectionPool],
-) -> Callable[..., ConnectionPool]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested ConnectionPool class. The base
-    ConnectionPool class constructor does not check the validity of the
-    supplied keyword parameters.
-    """
-
-    @functools.wraps(f)
-    def create_pool(
-        dsn: Optional[str] = None,
-        *,
-        pool_class: Type[ConnectionPool] = ConnectionPool,
-        pool_alias: Optional[str] = None,
-        params: Optional[PoolParams] = None,
-        **kwargs,
-    ) -> ConnectionPool:
-        f(
-            dsn=dsn,
-            pool_class=pool_class,
-            pool_alias=pool_alias,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(pool_class, ConnectionPool):
-            errors._raise_err(errors.ERR_INVALID_POOL_CLASS)
-        return pool_class(dsn, params=params, cache_name=pool_alias, **kwargs)
-
-    return create_pool
-
-
-@_pool_factory
-def create_pool(
-    dsn: Optional[str] = None,
-    *,
-    pool_class: Type[ConnectionPool] = ConnectionPool,
-    pool_alias: Optional[str] = None,
-    params: Optional[PoolParams] = None,
-    min: Optional[int] = None,
-    max: Optional[int] = None,
-    increment: Optional[int] = None,
-    connectiontype: Optional[Type["oracledb.Connection"]] = None,
-    getmode: Optional[oracledb.PoolGetMode] = None,
-    homogeneous: Optional[bool] = None,
-    timeout: Optional[int] = None,
-    wait_timeout: Optional[int] = None,
-    max_lifetime_session: Optional[int] = None,
-    session_callback: Optional[Callable] = None,
-    max_sessions_per_shard: Optional[int] = None,
-    soda_metadata_cache: Optional[bool] = None,
-    ping_interval: Optional[int] = None,
-    ping_timeout: Optional[int] = None,
-    user: Optional[str] = None,
-    proxy_user: Optional[str] = None,
-    password: Optional[str] = None,
-    newpassword: Optional[str] = None,
-    wallet_password: Optional[str] = None,
-    access_token: Optional[Union[str, tuple, Callable]] = None,
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    https_proxy: Optional[str] = None,
-    https_proxy_port: Optional[int] = None,
-    service_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    sid: Optional[str] = None,
-    server_type: Optional[str] = None,
-    cclass: Optional[str] = None,
-    purity: Optional[oracledb.Purity] = None,
-    expire_time: Optional[int] = None,
-    retry_count: Optional[int] = None,
-    retry_delay: Optional[int] = None,
-    tcp_connect_timeout: Optional[float] = None,
-    ssl_server_dn_match: Optional[bool] = None,
-    ssl_server_cert_dn: Optional[str] = None,
-    wallet_location: Optional[str] = None,
-    events: Optional[bool] = None,
-    externalauth: Optional[bool] = None,
-    mode: Optional[oracledb.AuthMode] = None,
-    disable_oob: Optional[bool] = None,
-    stmtcachesize: Optional[int] = None,
-    edition: Optional[str] = None,
-    tag: Optional[str] = None,
-    matchanytag: Optional[bool] = None,
-    config_dir: Optional[str] = None,
-    appcontext: Optional[list] = None,
-    shardingkey: Optional[list] = None,
-    supershardingkey: Optional[list] = None,
-    debug_jdwp: Optional[str] = None,
-    connection_id_prefix: Optional[str] = None,
-    ssl_context: Optional[Any] = None,
-    sdu: Optional[int] = None,
-    pool_boundary: Optional[str] = None,
-    use_tcp_fast_open: Optional[bool] = None,
-    ssl_version: Optional[ssl.TLSVersion] = None,
-    program: Optional[str] = None,
-    machine: Optional[str] = None,
-    terminal: Optional[str] = None,
-    osuser: Optional[str] = None,
-    driver_name: Optional[str] = None,
-    use_sni: Optional[bool] = None,
-    thick_mode_dsn_passthrough: Optional[bool] = None,
-    extra_auth_params: Optional[dict] = None,
-    pool_name: Optional[str] = None,
-    handle: Optional[int] = None,
-) -> ConnectionPool:
-    """
-    Creates a connection pool with the supplied parameters and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool_class`` parameter is expected to be ConnectionPool or a subclass
-    of ConnectionPool.
-
-    The ``pool_alias`` parameter is expected to be a string representing the
-    name used to store and reference the pool in the python-oracledb connection
-    pool cache. If this parameter is not specified, then the pool will not be
-    added to the cache. The value of this parameter can be used with the
-    :meth:`oracledb.get_pool()` and :meth:`oracledb.connect()` methods to
-    access the pool.
-
-    The ``params`` parameter is expected to be of type PoolParams and contains
-    parameters that are used to create the pool. See the documentation on
-    PoolParams for more information. If this parameter is not specified, the
-    additional keyword parameters will be used to create an instance of
-    PoolParams. If both the ``params`` parameter and additional keyword
-    parameters are specified, the values in the keyword parameters have
-    precedence. Note that if a ``dsn`` is also supplied, then in
-    python-oracledb Thin mode, the values of the parameters specified (if any)
-    within the dsn will override the values passed as additional keyword
-    parameters, which themselves override the values set in the ``params``
-    parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    - ``min``: the minimum number of connections the pool should contain
-      (default: 1)
-
-    - ``max``: the maximum number of connections the pool should contain
-      (default: 2)
-
-    - ``increment``: the number of connections that should be added to the pool
-      whenever the pool needs to grow
-      (default: 1)
-
-    - ``connectiontype``: the class of the connection that should be returned
-      during calls to pool.acquire(). It must be oracledb.Connection or a
-      subclass of oracledb.Connection
-      (default: None)
-
-    - ``getmode``: how pool.acquire() will behave. One of the constants
-      :data:`oracledb.POOL_GETMODE_WAIT`, :data:`oracledb.POOL_GETMODE_NOWAIT`,
-      :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-      :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-      (default: :attr:`oracledb.POOL_GETMODE_WAIT`)
-
-    - ``homogeneous``: a boolean indicating whether the connections in the pool
-      are homogeneous (same user) or heterogeneous (multiple users)
-      (default: True)
-
-    - ``timeout``: the length of time (in seconds) that a connection may remain
-      idle in the pool before it is terminated. If it is 0 then connections are
-      never terminated
-      (default: 0)
-
-    - ``wait_timeout``: the length of time (in milliseconds) that a caller
-      should wait when acquiring a connection from the pool with getmode set to
-      :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-      (default: 0)
-
-    - ``max_lifetime_session``: the length of time (in seconds) that
-      connections can remain in the pool. If it is 0 then connections may
-      remain in the pool indefinitely
-      (default: 0)
-
-    - ``session_callback``: a callable that is invoked when a connection is
-      returned from the pool for the first time, or when the connection tag
-      differs from the one requested
-      (default: None)
-
-    - ``max_sessions_per_shard``: the maximum number of connections that may be
-      associated with a particular shard
-      (default: 0)
-
-    - ``soda_metadata_cache``: a boolean indicating whether or not the SODA
-      metadata cache should be enabled
-      (default: False)
-
-    - ``ping_interval``: the length of time (in seconds) after which an unused
-      connection in the pool will be a candidate for pinging when
-      pool.acquire() is called. If the ping to the database indicates the
-      connection is not alive a replacement connection will be returned by
-      pool.acquire(). If ping_interval is a negative value the ping
-      functionality will be disabled
-      (default: 60)
-
-    - ``ping_timeout``: the maximum length of time (in milliseconds) to wait
-      for a connection in the pool to respond to an internal ping to the
-      database before being discarded and replaced during a call to acquire()
-      (default: 5000)
-
-    - ``user``: the name of the database user to connect to
-      (default: None)
-
-    - ``proxy_user``: the name of the proxy user to connect to. If this value
-      is not specified, it will be parsed out of user if user is in the form
-      "user[proxy_user]"
-      (default: None)
-
-    - ``password``: the password for the database user
-      (default: None)
-
-    - ``newpassword``: a new password for the database user. The new password
-      will take effect immediately upon a successful connection to the database
-      (default: None)
-
-    - ``wallet_password``: the password to use to decrypt the wallet, if it is
-      encrypted. This is not the database password. For Oracle Autonomous
-      Database this is the password created when downloading the wallet. This
-      value is only used in python-oracledb Thin mode.
-      (default: None)
-
-    - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-      string, it specifies an Entra ID OAuth2 token used for Open Authorization
-      (OAuth 2.0) token based authentication. If it is a 2-tuple, it specifies
-      the token and private key strings used for Oracle Cloud Infrastructure
-      (OCI) Identity and Access Management (IAM) token based authentication. If
-      it is a callable, it returns either a string or a 2-tuple used for OAuth
-      2.0 or OCI IAM token based authentication and is useful when the pool
-      needs to expand and create new connections but the current authentication
-      token has expired
-      (default: None)
-
-    - ``host``: the hostname or IP address of the machine hosting the database
-      or the database listener
-      (default: None)
-
-    - ``port``: the port number on which the database listener is listening
-      (default: 1521)
-
-    - ``protocol``: one of the strings "tcp" or "tcps" indicating whether to
-      use unencrypted network traffic or encrypted network traffic (TLS)
-      (default: "tcp")
-
-    - ``https_proxy``: the hostname or IP address of a proxy host to use for
-      tunneling secure connections
-      (default: None)
-
-    - ``https_proxy_port``: the port on which to communicate with the proxy
-      host
-      (default: 0)
-
-    - ``service_name``: the service name of the database
-      (default: None)
-
-    - ``instance_name``: the instance name of the database
-      (default: None)
-
-    - ``sid``: the system identifier (SID) of the database. Note using a
-      service_name instead is recommended
-      (default: None)
-
-    - ``server_type``: the type of server connection that should be
-      established. If specified, it should be one of strings "dedicated",
-      "shared" or "pooled"
-      (default: None)
-
-    - ``cclass``: the connection class to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: None)
-
-    - ``purity``: the connection purity to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-    - ``expire_time``: the number of minutes between the sending of keepalive
-      probes. If this parameter is set to a value greater than zero it enables
-      keepalive
-      (default: 0)
-
-    - ``retry_count``: the number of times that initial connection
-      establishment should be retried before the connection attempt is
-      terminated
-      (default: 0)
-
-    - ``retry_delay``: the number of seconds to wait before retrying to
-      establish a connection
-      (default: 1)
-
-    - ``tcp_connect_timeout``: a float indicating the maximum number of seconds
-      to wait when establishing a connection to the database host
-      (default: 20.0)
-
-    - ``ssl_server_dn_match``: a boolean indicating whether the server
-      certificate distinguished name (DN) should be matched in addition to the
-      regular certificate verification that is performed. Note that if the
-      ssl_server_cert_dn parameter is not privided, host name matching is
-      performed instead
-      (default: True)
-
-    - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-      matched with the server. This value is ignored if the ssl_server_dn_match
-      parameter is not set to the value True. If specified this value is used
-      for any verfication. Otherwise the hostname will be used
-      (default: None)
-
-    - ``wallet_location``: the directory where the wallet can be found. In
-      python-oracledb Thin mode this must be the directory containing the PEM-
-      encoded wallet file ewallet.pem. In python-oracledb Thick mode this must
-      be the directory containing the file cwallet.sso
-      (default: None)
-
-    - ``events``: a boolean specifying whether events mode should be enabled.
-      This value is only used in python-oracledb Thick mode and is needed for
-      continuous query notification and high availability event notifications
-      (default: False)
-
-    - ``externalauth``: a boolean indicating whether to use external
-      authentication
-      (default: False)
-
-    - ``mode``: the authorization mode to use. One of the constants
-      :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-      :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-      :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-      :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`, or
-      :data:`oracledb.AUTH_MODE_SYSRAC`
-      (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-    - ``disable_oob``: a boolean indicating whether out-of-band breaks should
-      be disabled. This value is only used in python-oracledb Thin mode. It has
-      no effect on Windows which does not support this functionality
-      (default: False)
-
-    - ``stmtcachesize``: the size of the statement cache
-      (default: :attr:`oracledb.defaults.stmtcachesize
-      <Defaults.stmtcachesize>`)
-
-    - ``edition``: edition to use for the connection. This parameter cannot be
-      used simultaneously with the cclass parameter
-      (default: None)
-
-    - ``tag``: identifies the type of connection that should be returned from a
-      pool. This value is only used in python-oracledb Thick mode
-      (default: None)
-
-    - ``matchanytag``: a boolean specifying whether any tag can be used when
-      acquiring a connection from the pool. This value is only used in python-
-      oracledb Thick mode
-      (default: False)
-
-    - ``config_dir``: a directory in which the optional tnsnames.ora
-      configuration file is located. This value is only used in python-oracledb
-      Thin mode. For python-oracledb Thick mode, it is used if
-      :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-      mode use the ``config_dir`` parameter of
-      :meth:`oracledb.init_oracle_client()`
-      (default: :attr:`oracledb.defaults.config_dir
-      <Defaults.config_dir>`)
-
-    - ``appcontext``: application context used by the connection. It should be
-      a list of 3-tuples (namespace, name, value) and each entry in the tuple
-      should be a string
-      (default: None)
-
-    - ``shardingkey``: a list of strings, numbers, bytes or dates that identify
-      the database shard to connect to. This value is only used in python-
-      oracledb Thick mode
-      (default: None)
-
-    - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-      identify the database shard to connect to. This value is only used in
-      python-oracledb Thick mode
-      (default: None)
-
-    - ``debug_jdwp``: a string with the format "host=<host>;port=<port>" that
-      specifies the host and port of the PL/SQL debugger. This value is only
-      used in python-oracledb Thin mode.  For python-oracledb Thick mode set
-      the ORA_DEBUG_JDWP environment variable
-      (default: None)
-
-    - ``connection_id_prefix``: an application specific prefix that is added to
-      the connection identifier used for tracing
-      (default: None)
-
-    - ``ssl_context``: an SSLContext object used for connecting to the database
-      using TLS.  This SSL context will be modified to include the private key
-      or any certificates found in a separately supplied wallet. This parameter
-      should only be specified if the default SSLContext object cannot be used
-      (default: None)
-
-    - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes. The
-      value tunes internal buffers used for communication to the database.
-      Bigger values can increase throughput for large queries or bulk data
-      loads, but at the cost of higher memory use. The SDU size that will
-      actually be used is negotiated down to the lower of this value and the
-      database network SDU configuration value
-      (default: 8192)
-
-    - ``pool_boundary``: one of the values "statement" or "transaction"
-      indicating when pooled DRCP connections can be returned to the pool. This
-      requires the use of DRCP with Oracle Database 23.4 or higher
-      (default: None)
-
-    - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast open.
-      This is an Oracle Autonomous Database Serverless (ADB-S) specific
-      property for clients connecting from within OCI Cloud network. Please
-      refer to the ADB-S documentation for more information
-      (default: False)
-
-    - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-      ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-      (default: None)
-
-    - ``program``: a string recorded by Oracle Database as the program from
-      which the connection originates
-      (default: :attr:`oracledb.defaults.program
-      <Defaults.program>`)
-
-    - ``machine``: a string recorded by Oracle Database as the name of the
-      machine from which the connection originates
-      (default: :attr:`oracledb.defaults.machine
-      <Defaults.machine>`)
-
-    - ``terminal``: a string recorded by Oracle Database as the terminal
-      identifier from which the connection originates
-      (default: :attr:`oracledb.defaults.terminal
-      <Defaults.terminal>`)
-
-    - ``osuser``: a string recorded by Oracle Database as the operating system
-      user who originated the connection
-      (default: :attr:`oracledb.defaults.osuser
-      <Defaults.osuser>`)
-
-    - ``driver_name``: a string recorded by Oracle Database as the name of the
-      driver which originated the connection
-      (default: :attr:`oracledb.defaults.driver_name
-      <Defaults.driver_name>`)
-
-    - ``use_sni``: a boolean indicating whether to use the TLS SNI extension to
-      bypass the second TLS neogiation that would otherwise be required
-      (default: False)
-
-    - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass the
-      connect string to the Oracle Client libraries unchanged without parsing
-      by the driver. Setting this to False makes python-oracledb Thick and Thin
-      mode applications behave similarly regarding connection string parameter
-      handling and locating any optional tnsnames.ora configuration file
-      (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>`)
-
-    - ``extra_auth_params``: a dictionary containing configuration parameters
-      necessary for Oracle Database authentication using plugins, such as the
-      Azure and OCI cloud-native authentication plugins
-      (default: None)
-
-    - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP with
-      Oracle Database 23.4, or higher
-      (default: None)
-
-    - ``handle``: an integer representing a pointer to a valid service context
-      handle. This value is only used in python-oracledb Thick mode. It should
-      be used with extreme caution
-      (default: 0)
-    """
-    pass
-
-
-class AsyncConnectionPool(BaseConnectionPool):
-
-    def _set_connection_type(self, conn_class):
-        """
-        Called internally when the pool is created to ensure that the correct
-        connection class is used for all connections created by the pool.
-        """
-        if conn_class is None:
-            conn_class = connection_module.AsyncConnection
-        elif not issubclass(conn_class, connection_module.AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        self._connection_type = conn_class
-
-    def acquire(
-        self,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: int = oracledb.PURITY_DEFAULT,
-        tag: Optional[str] = None,
-        matchanytag: bool = False,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-    ) -> "connection_module.AsyncConnection":
-        """
-        Acquires a connection from the pool and returns an :ref:`asynchronous
-        connection object <asyncconnobj>`.
-
-        If the pool is :ref:`homogeneous <connpooltypes>`, the ``user`` and
-        ``password`` parameters cannot be specified. If they are, an exception
-        will be raised.
-
-        The ``cclass`` parameter, if specified, should be a string
-        corresponding to the connection class for :ref:`drcp`.
-
-        The ``purity`` parameter is expected to be one of
-        :data:`~oracledb.PURITY_NEW`, :data:`~oracledb.PURITY_SELF`, or
-        :data:`~oracledb.PURITY_DEFAULT`.
-
-        The ``tag``, ``matchanytag``, ``shardingkey``, and ``supershardingkey``
-        parameters are ignored in python-oracledb Thin mode.
-        """
-        self._verify_open()
-
-        return oracledb.connect_async(
-            conn_class=self._connection_type,
-            user=user,
-            password=password,
-            cclass=cclass,
-            purity=purity,
-            tag=tag,
-            matchanytag=matchanytag,
-            shardingkey=shardingkey,
-            supershardingkey=supershardingkey,
-            pool=self,
-        )
-
-    async def close(self, force: bool = False) -> None:
-        """
-        Closes the pool now, rather than when the last reference to it is
-        released, which makes it unusable for further work.
-
-        If any connections have been acquired and not released back to the
-        pool, this method will fail unless the ``force`` parameter is set to
-        *True*.
-        """
-        self._verify_open()
-        await self._impl.close(force)
-        if self._cache_name is not None:
-            named_pools.remove_pool(self._cache_name)
-        self._impl = None
-
-    async def drop(self, connection: "connection_module.Connection") -> None:
-        """
-        Drops the connection from the pool which is useful if the connection is
-        no longer usable (such as when the session is killed).
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.AsyncConnection):
-            message = (
-                "connection must be an instance of oracledb.AsyncConnection"
-            )
-            raise TypeError(message)
-        connection._verify_connected()
-        await self._impl.drop(connection._impl)
-        connection._impl = None
-
-    async def release(
-        self,
-        connection: "connection_module.AsyncConnection",
-        tag: Optional[str] = None,
-    ) -> None:
-        """
-        Releases the connection back to the pool now. The connection will be
-        unusable from this point forward. An Error exception will be raised if
-        any operation is attempted with the connection. Any cursors or LOBs
-        created by the connection will also be marked unusable and an Error
-        exception will be raised if any operation is attempted with them.
-
-        The ``tag`` parameter is ignored in python-oracledb Thin mode.
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.AsyncConnection):
-            message = (
-                "connection must be an instance of oracledb.AsyncConnection"
-            )
-            raise TypeError(message)
-        if tag is not None:
-            connection.tag = tag
-        await self._impl.return_connection(connection._impl)
-        connection._impl = None
-
-
-def _async_pool_factory(
-    f: Callable[..., AsyncConnectionPool],
-) -> Callable[..., AsyncConnectionPool]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested ConnectionPool class. The base
-    ConnectionPool class constructor does not check the validity of the
-    supplied keyword parameters.
-    """
-
-    @functools.wraps(f)
-    def create_pool_async(
-        dsn: Optional[str] = None,
-        *,
-        pool_class: Type[ConnectionPool] = AsyncConnectionPool,
-        pool_alias: Optional[str] = None,
-        params: Optional[PoolParams] = None,
-        **kwargs,
-    ) -> AsyncConnectionPool:
-        f(
-            dsn=dsn,
-            pool_class=pool_class,
-            pool_alias=pool_alias,
-            params=params,
-            **kwargs,
-        )
-        oracledb.enable_thin_mode()
-        if not issubclass(pool_class, AsyncConnectionPool):
-            errors._raise_err(errors.ERR_INVALID_POOL_CLASS)
-        return pool_class(dsn, params=params, cache_name=pool_alias, **kwargs)
-
-    return create_pool_async
-
-
-@_async_pool_factory
-def create_pool_async(
-    dsn: Optional[str] = None,
-    *,
-    pool_class: Type[ConnectionPool] = AsyncConnectionPool,
-    pool_alias: Optional[str] = None,
-    params: Optional[PoolParams] = None,
-    min: Optional[int] = None,
-    max: Optional[int] = None,
-    increment: Optional[int] = None,
-    connectiontype: Optional[Type["oracledb.AsyncConnection"]] = None,
-    getmode: Optional[oracledb.PoolGetMode] = None,
-    homogeneous: Optional[bool] = None,
-    timeout: Optional[int] = None,
-    wait_timeout: Optional[int] = None,
-    max_lifetime_session: Optional[int] = None,
-    session_callback: Optional[Callable] = None,
-    max_sessions_per_shard: Optional[int] = None,
-    soda_metadata_cache: Optional[bool] = None,
-    ping_interval: Optional[int] = None,
-    ping_timeout: Optional[int] = None,
-    user: Optional[str] = None,
-    proxy_user: Optional[str] = None,
-    password: Optional[str] = None,
-    newpassword: Optional[str] = None,
-    wallet_password: Optional[str] = None,
-    access_token: Optional[Union[str, tuple, Callable]] = None,
-    host: Optional[str] = None,
-    port: Optional[int] = None,
-    protocol: Optional[str] = None,
-    https_proxy: Optional[str] = None,
-    https_proxy_port: Optional[int] = None,
-    service_name: Optional[str] = None,
-    instance_name: Optional[str] = None,
-    sid: Optional[str] = None,
-    server_type: Optional[str] = None,
-    cclass: Optional[str] = None,
-    purity: Optional[oracledb.Purity] = None,
-    expire_time: Optional[int] = None,
-    retry_count: Optional[int] = None,
-    retry_delay: Optional[int] = None,
-    tcp_connect_timeout: Optional[float] = None,
-    ssl_server_dn_match: Optional[bool] = None,
-    ssl_server_cert_dn: Optional[str] = None,
-    wallet_location: Optional[str] = None,
-    events: Optional[bool] = None,
-    externalauth: Optional[bool] = None,
-    mode: Optional[oracledb.AuthMode] = None,
-    disable_oob: Optional[bool] = None,
-    stmtcachesize: Optional[int] = None,
-    edition: Optional[str] = None,
-    tag: Optional[str] = None,
-    matchanytag: Optional[bool] = None,
-    config_dir: Optional[str] = None,
-    appcontext: Optional[list] = None,
-    shardingkey: Optional[list] = None,
-    supershardingkey: Optional[list] = None,
-    debug_jdwp: Optional[str] = None,
-    connection_id_prefix: Optional[str] = None,
-    ssl_context: Optional[Any] = None,
-    sdu: Optional[int] = None,
-    pool_boundary: Optional[str] = None,
-    use_tcp_fast_open: Optional[bool] = None,
-    ssl_version: Optional[ssl.TLSVersion] = None,
-    program: Optional[str] = None,
-    machine: Optional[str] = None,
-    terminal: Optional[str] = None,
-    osuser: Optional[str] = None,
-    driver_name: Optional[str] = None,
-    use_sni: Optional[bool] = None,
-    thick_mode_dsn_passthrough: Optional[bool] = None,
-    extra_auth_params: Optional[dict] = None,
-    pool_name: Optional[str] = None,
-    handle: Optional[int] = None,
-) -> AsyncConnectionPool:
-    """
-    Creates a connection pool with the supplied parameters and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool_class`` parameter is expected to be AsyncConnectionPool or a
-    subclass of AsyncConnectionPool.
-
-    The ``pool_alias`` parameter is expected to be a string representing the
-    name used to store and reference the pool in the python-oracledb connection
-    pool cache. If this parameter is not specified, then the pool will not be
-    added to the cache. The value of this parameter can be used with the
-    :meth:`oracledb.get_pool()` and :meth:o`racledb.connect_async()` methods to
-    access the pool.
-
-    The ``params`` parameter is expected to be of type PoolParams and contains
-    parameters that are used to create the pool. See the documentation on
-    PoolParams for more information. If this parameter is not specified, the
-    additional keyword parameters will be used to create an instance of
-    PoolParams. If both the ``params`` parameter and additional keyword
-    parameters are specified, the values in the keyword parameters have
-    precedence. Note that if a ``dsn`` is also supplied, then in
-    python-oracledb Thin mode, the values of the parameters specified (if any)
-    within the ``dsn`` will override the values passed as additional keyword
-    parameters, which themselves override the values set in the ``params``
-    parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    - ``min``: the minimum number of connections the pool should contain
-      (default: 1)
-
-    - ``max``: the maximum number of connections the pool should contain
-      (default: 2)
-
-    - ``increment``: the number of connections that should be added to the pool
-      whenever the pool needs to grow
-      (default: 1)
-
-    - ``connectiontype``: the class of the connection that should be returned
-      during calls to pool.acquire(). It must be oracledb.AsyncConnection or a
-      subclass of oracledb.AsyncConnection
-      (default: None)
-
-    - ``getmode``: how pool.acquire() will behave. One of the constants
-      :data:`oracledb.POOL_GETMODE_WAIT`, :data:`oracledb.POOL_GETMODE_NOWAIT`,
-      :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-      :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-      (default: :attr:`oracledb.POOL_GETMODE_WAIT`)
-
-    - ``homogeneous``: a boolean indicating whether the connections in the pool
-      are homogeneous (same user) or heterogeneous (multiple users)
-      (default: True)
-
-    - ``timeout``: the length of time (in seconds) that a connection may remain
-      idle in the pool before it is terminated. If it is 0 then connections are
-      never terminated
-      (default: 0)
-
-    - ``wait_timeout``: the length of time (in milliseconds) that a caller
-      should wait when acquiring a connection from the pool with getmode set to
-      :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-      (default: 0)
-
-    - ``max_lifetime_session``: the length of time (in seconds) that
-      connections can remain in the pool. If it is 0 then connections may
-      remain in the pool indefinitely
-      (default: 0)
-
-    - ``session_callback``: a callable that is invoked when a connection is
-      returned from the pool for the first time, or when the connection tag
-      differs from the one requested
-      (default: None)
-
-    - ``max_sessions_per_shard``: the maximum number of connections that may be
-      associated with a particular shard
-      (default: 0)
-
-    - ``soda_metadata_cache``: a boolean indicating whether or not the SODA
-      metadata cache should be enabled
-      (default: False)
-
-    - ``ping_interval``: the length of time (in seconds) after which an unused
-      connection in the pool will be a candidate for pinging when
-      pool.acquire() is called. If the ping to the database indicates the
-      connection is not alive a replacement connection will be returned by
-      pool.acquire(). If ping_interval is a negative value the ping
-      functionality will be disabled
-      (default: 60)
-
-    - ``ping_timeout``: the maximum length of time (in milliseconds) to wait
-      for a connection in the pool to respond to an internal ping to the
-      database before being discarded and replaced during a call to acquire()
-      (default: 5000)
-
-    - ``user``: the name of the database user to connect to
-      (default: None)
-
-    - ``proxy_user``: the name of the proxy user to connect to. If this value
-      is not specified, it will be parsed out of user if user is in the form
-      "user[proxy_user]"
-      (default: None)
-
-    - ``password``: the password for the database user
-      (default: None)
-
-    - ``newpassword``: a new password for the database user. The new password
-      will take effect immediately upon a successful connection to the database
-      (default: None)
-
-    - ``wallet_password``: the password to use to decrypt the wallet, if it is
-      encrypted. This is not the database password. For Oracle Autonomous
-      Database this is the password created when downloading the wallet. This
-      value is only used in python-oracledb Thin mode.
-      (default: None)
-
-    - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-      string, it specifies an Entra ID OAuth2 token used for Open Authorization
-      (OAuth 2.0) token based authentication. If it is a 2-tuple, it specifies
-      the token and private key strings used for Oracle Cloud Infrastructure
-      (OCI) Identity and Access Management (IAM) token based authentication. If
-      it is a callable, it returns either a string or a 2-tuple used for OAuth
-      2.0 or OCI IAM token based authentication and is useful when the pool
-      needs to expand and create new connections but the current authentication
-      token has expired
-      (default: None)
-
-    - ``host``: the hostname or IP address of the machine hosting the database
-      or the database listener
-      (default: None)
-
-    - ``port``: the port number on which the database listener is listening
-      (default: 1521)
-
-    - ``protocol``: one of the strings "tcp" or "tcps" indicating whether to
-      use unencrypted network traffic or encrypted network traffic (TLS)
-      (default: "tcp")
-
-    - ``https_proxy``: the hostname or IP address of a proxy host to use for
-      tunneling secure connections
-      (default: None)
-
-    - ``https_proxy_port``: the port on which to communicate with the proxy
-      host
-      (default: 0)
-
-    - ``service_name``: the service name of the database
-      (default: None)
-
-    - ``instance_name``: the instance name of the database
-      (default: None)
-
-    - ``sid``: the system identifier (SID) of the database. Note using a
-      service_name instead is recommended
-      (default: None)
-
-    - ``server_type``: the type of server connection that should be
-      established. If specified, it should be one of strings "dedicated",
-      "shared" or "pooled"
-      (default: None)
-
-    - ``cclass``: the connection class to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: None)
-
-    - ``purity``: the connection purity to use for Database Resident Connection
-      Pooling (DRCP)
-      (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-    - ``expire_time``: the number of minutes between the sending of keepalive
-      probes. If this parameter is set to a value greater than zero it enables
-      keepalive
-      (default: 0)
-
-    - ``retry_count``: the number of times that initial connection
-      establishment should be retried before the connection attempt is
-      terminated
-      (default: 0)
-
-    - ``retry_delay``: the number of seconds to wait before retrying to
-      establish a connection
-      (default: 1)
-
-    - ``tcp_connect_timeout``: a float indicating the maximum number of seconds
-      to wait when establishing a connection to the database host
-      (default: 20.0)
-
-    - ``ssl_server_dn_match``: a boolean indicating whether the server
-      certificate distinguished name (DN) should be matched in addition to the
-      regular certificate verification that is performed. Note that if the
-      ssl_server_cert_dn parameter is not privided, host name matching is
-      performed instead
-      (default: True)
-
-    - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-      matched with the server. This value is ignored if the ssl_server_dn_match
-      parameter is not set to the value True. If specified this value is used
-      for any verfication. Otherwise the hostname will be used
-      (default: None)
-
-    - ``wallet_location``: the directory where the wallet can be found. In
-      python-oracledb Thin mode this must be the directory containing the PEM-
-      encoded wallet file ewallet.pem. In python-oracledb Thick mode this must
-      be the directory containing the file cwallet.sso
-      (default: None)
-
-    - ``events``: a boolean specifying whether events mode should be enabled.
-      This value is only used in python-oracledb Thick mode and is needed for
-      continuous query notification and high availability event notifications
-      (default: False)
-
-    - ``externalauth``: a boolean indicating whether to use external
-      authentication
-      (default: False)
-
-    - ``mode``: the authorization mode to use. One of the constants
-      :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-      :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-      :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-      :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`, or
-      :data:`oracledb.AUTH_MODE_SYSRAC`
-      (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-    - ``disable_oob``: a boolean indicating whether out-of-band breaks should
-      be disabled. This value is only used in python-oracledb Thin mode. It has
-      no effect on Windows which does not support this functionality
-      (default: False)
-
-    - ``stmtcachesize``: the size of the statement cache
-      (default: :attr:`oracledb.defaults.stmtcachesize
-      <Defaults.stmtcachesize>`)
-
-    - ``edition``: edition to use for the connection. This parameter cannot be
-      used simultaneously with the cclass parameter
-      (default: None)
-
-    - ``tag``: identifies the type of connection that should be returned from a
-      pool. This value is only used in python-oracledb Thick mode
-      (default: None)
-
-    - ``matchanytag``: a boolean specifying whether any tag can be used when
-      acquiring a connection from the pool. This value is only used in python-
-      oracledb Thick mode
-      (default: False)
-
-    - ``config_dir``: a directory in which the optional tnsnames.ora
-      configuration file is located. This value is only used in python-oracledb
-      Thin mode. For python-oracledb Thick mode, it is used if
-      :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-      mode use the ``config_dir`` parameter of
-      :meth:`oracledb.init_oracle_client()`
-      (default: :attr:`oracledb.defaults.config_dir
-      <Defaults.config_dir>`)
-
-    - ``appcontext``: application context used by the connection. It should be
-      a list of 3-tuples (namespace, name, value) and each entry in the tuple
-      should be a string
-      (default: None)
-
-    - ``shardingkey``: a list of strings, numbers, bytes or dates that identify
-      the database shard to connect to. This value is only used in python-
-      oracledb Thick mode
-      (default: None)
-
-    - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-      identify the database shard to connect to. This value is only used in
-      python-oracledb Thick mode
-      (default: None)
-
-    - ``debug_jdwp``: a string with the format "host=<host>;port=<port>" that
-      specifies the host and port of the PL/SQL debugger. This value is only
-      used in python-oracledb Thin mode.  For python-oracledb Thick mode set
-      the ORA_DEBUG_JDWP environment variable
-      (default: None)
-
-    - ``connection_id_prefix``: an application specific prefix that is added to
-      the connection identifier used for tracing
-      (default: None)
-
-    - ``ssl_context``: an SSLContext object used for connecting to the database
-      using TLS.  This SSL context will be modified to include the private key
-      or any certificates found in a separately supplied wallet. This parameter
-      should only be specified if the default SSLContext object cannot be used
-      (default: None)
-
-    - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes. The
-      value tunes internal buffers used for communication to the database.
-      Bigger values can increase throughput for large queries or bulk data
-      loads, but at the cost of higher memory use. The SDU size that will
-      actually be used is negotiated down to the lower of this value and the
-      database network SDU configuration value
-      (default: 8192)
-
-    - ``pool_boundary``: one of the values "statement" or "transaction"
-      indicating when pooled DRCP connections can be returned to the pool. This
-      requires the use of DRCP with Oracle Database 23.4 or higher
-      (default: None)
-
-    - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast open.
-      This is an Oracle Autonomous Database Serverless (ADB-S) specific
-      property for clients connecting from within OCI Cloud network. Please
-      refer to the ADB-S documentation for more information
-      (default: False)
-
-    - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-      ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-      (default: None)
-
-    - ``program``: a string recorded by Oracle Database as the program from
-      which the connection originates
-      (default: :attr:`oracledb.defaults.program
-      <Defaults.program>`)
-
-    - ``machine``: a string recorded by Oracle Database as the name of the
-      machine from which the connection originates
-      (default: :attr:`oracledb.defaults.machine
-      <Defaults.machine>`)
-
-    - ``terminal``: a string recorded by Oracle Database as the terminal
-      identifier from which the connection originates
-      (default: :attr:`oracledb.defaults.terminal
-      <Defaults.terminal>`)
-
-    - ``osuser``: a string recorded by Oracle Database as the operating system
-      user who originated the connection
-      (default: :attr:`oracledb.defaults.osuser
-      <Defaults.osuser>`)
-
-    - ``driver_name``: a string recorded by Oracle Database as the name of the
-      driver which originated the connection
-      (default: :attr:`oracledb.defaults.driver_name
-      <Defaults.driver_name>`)
-
-    - ``use_sni``: a boolean indicating whether to use the TLS SNI extension to
-      bypass the second TLS neogiation that would otherwise be required
-      (default: False)
-
-    - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass the
-      connect string to the Oracle Client libraries unchanged without parsing
-      by the driver. Setting this to False makes python-oracledb Thick and Thin
-      mode applications behave similarly regarding connection string parameter
-      handling and locating any optional tnsnames.ora configuration file
-      (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-      <Defaults.thick_mode_dsn_passthrough>`)
-
-    - ``extra_auth_params``: a dictionary containing configuration parameters
-      necessary for Oracle Database authentication using plugins, such as the
-      Azure and OCI cloud-native authentication plugins
-      (default: None)
-
-    - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP with
-      Oracle Database 23.4, or higher
-      (default: None)
-
-    - ``handle``: an integer representing a pointer to a valid service context
-      handle. This value is only used in python-oracledb Thick mode. It should
-      be used with extreme caution
-      (default: 0)
-    """
-    pass
-
-
-class NamedPools:
-
-    def __init__(self):
-        self.lock = threading.Lock()
-        self.pools = {}
-
-    def add_pool(self, alias, pool):
-        """
-        Adds a pool to the cache. An exception is raised if a pool is already
-        cached with the given alias.
-        """
-        if not isinstance(alias, str):
-            raise TypeError("pool_alias must be a string")
-        with self.lock:
-            if alias in self.pools:
-                errors._raise_err(errors.ERR_NAMED_POOL_EXISTS, alias=alias)
-            self.pools[alias] = pool
-
-    def remove_pool(self, alias):
-        """
-        Removes the pool with the given alias from the cache. An exception is
-        raised if there is no pool cached with the given alias.
-        """
-        with self.lock:
-            if alias not in self.pools:
-                errors._raise_err(errors.ERR_NAMED_POOL_MISSING, alias=alias)
-            del self.pools[alias]
-
-
-named_pools = NamedPools()
-
-
-def get_pool(
-    pool_alias: str,
-) -> Union[ConnectionPool, AsyncConnectionPool, None]:
-    """
-    Returns a :ref:`ConnectionPool object <connpool>` from the python-oracledb
-    pool cache. The pool must have been previously created by passing the same
-    ``pool_alias`` value to :meth:`oracledb.create_pool()` or
-    :meth:`oracledb.create_pool_async()`.
-
-    If a pool with the given name does not exist, *None* is returned.
-    """
-    return named_pools.pools.get(pool_alias)
diff --git a/src/oracledb/pool_params.py b/src/oracledb/pool_params.py
deleted file mode 100644
index f35cefa9..00000000
--- a/src/oracledb/pool_params.py
+++ /dev/null
@@ -1,1017 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pool_params.py
-#
-# Contains the PoolParams class used for managing the parameters required to
-# create a connection pool.
-#
-# *** NOTICE *** This file is generated from a template and should not be
-# modified directly. See build_from_template.py in the utils subdirectory for
-# more information.
-# -----------------------------------------------------------------------------
-
-import ssl
-from typing import Callable, Type, Union, Any, Optional
-
-import oracledb
-
-from . import base_impl, utils
-from .connect_params import ConnectParams
-
-
-class PoolParams(ConnectParams):
-    """
-    Contains all parameters used for creating a connection pool.
-    """
-
-    __module__ = oracledb.__name__
-    __slots__ = ["_impl"]
-    _impl_class = base_impl.PoolParamsImpl
-
-    @utils.params_initer
-    def __init__(
-        self,
-        *,
-        min: Optional[int] = None,
-        max: Optional[int] = None,
-        increment: Optional[int] = None,
-        connectiontype: Optional[Type["oracledb.Connection"]] = None,
-        getmode: Optional[oracledb.PoolGetMode] = None,
-        homogeneous: Optional[bool] = None,
-        timeout: Optional[int] = None,
-        wait_timeout: Optional[int] = None,
-        max_lifetime_session: Optional[int] = None,
-        session_callback: Optional[Callable] = None,
-        max_sessions_per_shard: Optional[int] = None,
-        soda_metadata_cache: Optional[bool] = None,
-        ping_interval: Optional[int] = None,
-        ping_timeout: Optional[int] = None,
-        user: Optional[str] = None,
-        proxy_user: Optional[str] = None,
-        password: Optional[str] = None,
-        newpassword: Optional[str] = None,
-        wallet_password: Optional[str] = None,
-        access_token: Optional[Union[str, tuple, Callable]] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        protocol: Optional[str] = None,
-        https_proxy: Optional[str] = None,
-        https_proxy_port: Optional[int] = None,
-        service_name: Optional[str] = None,
-        instance_name: Optional[str] = None,
-        sid: Optional[str] = None,
-        server_type: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: Optional[oracledb.Purity] = None,
-        expire_time: Optional[int] = None,
-        retry_count: Optional[int] = None,
-        retry_delay: Optional[int] = None,
-        tcp_connect_timeout: Optional[float] = None,
-        ssl_server_dn_match: Optional[bool] = None,
-        ssl_server_cert_dn: Optional[str] = None,
-        wallet_location: Optional[str] = None,
-        events: Optional[bool] = None,
-        externalauth: Optional[bool] = None,
-        mode: Optional[oracledb.AuthMode] = None,
-        disable_oob: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        edition: Optional[str] = None,
-        tag: Optional[str] = None,
-        matchanytag: Optional[bool] = None,
-        config_dir: Optional[str] = None,
-        appcontext: Optional[list] = None,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-        debug_jdwp: Optional[str] = None,
-        connection_id_prefix: Optional[str] = None,
-        ssl_context: Optional[Any] = None,
-        sdu: Optional[int] = None,
-        pool_boundary: Optional[str] = None,
-        use_tcp_fast_open: Optional[bool] = None,
-        ssl_version: Optional[ssl.TLSVersion] = None,
-        program: Optional[str] = None,
-        machine: Optional[str] = None,
-        terminal: Optional[str] = None,
-        osuser: Optional[str] = None,
-        driver_name: Optional[str] = None,
-        use_sni: Optional[bool] = None,
-        thick_mode_dsn_passthrough: Optional[bool] = None,
-        extra_auth_params: Optional[dict] = None,
-        pool_name: Optional[str] = None,
-        handle: Optional[int] = None,
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        - ``min``: the minimum number of connections the pool should contain
-          (default: 1)
-
-        - ``max``: the maximum number of connections the pool should contain
-          (default: 2)
-
-        - ``increment``: the number of connections that should be added to the
-          pool whenever the pool needs to grow
-          (default: 1)
-
-        - ``connectiontype``: the class of the connection that should be
-          returned during calls to pool.acquire(). It must be
-          oracledb.Connection or a subclass of oracledb.Connection
-          (default: None)
-
-        - ``getmode``: how pool.acquire() will behave. One of the constants
-          :data:`oracledb.POOL_GETMODE_WAIT`,
-          :data:`oracledb.POOL_GETMODE_NOWAIT`,
-          :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-          :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-          (default: :attr:`oracledb.POOL_GETMODE_WAIT`)
-
-        - ``homogeneous``: a boolean indicating whether the connections in the
-          pool are homogeneous (same user) or heterogeneous (multiple users)
-          (default: True)
-
-        - ``timeout``: the length of time (in seconds) that a connection may
-          remain idle in the pool before it is terminated. If it is 0 then
-          connections are never terminated
-          (default: 0)
-
-        - ``wait_timeout``: the length of time (in milliseconds) that a caller
-          should wait when acquiring a connection from the pool with getmode
-          set to :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-          (default: 0)
-
-        - ``max_lifetime_session``: the length of time (in seconds) that
-          connections can remain in the pool. If it is 0 then connections may
-          remain in the pool indefinitely
-          (default: 0)
-
-        - ``session_callback``: a callable that is invoked when a connection is
-          returned from the pool for the first time, or when the connection tag
-          differs from the one requested
-          (default: None)
-
-        - ``max_sessions_per_shard``: the maximum number of connections that
-          may be associated with a particular shard
-          (default: 0)
-
-        - ``soda_metadata_cache``: a boolean indicating whether or not the SODA
-          metadata cache should be enabled
-          (default: False)
-
-        - ``ping_interval``: the length of time (in seconds) after which an
-          unused connection in the pool will be a candidate for pinging when
-          pool.acquire() is called. If the ping to the database indicates the
-          connection is not alive a replacement connection will be returned by
-          pool.acquire(). If ping_interval is a negative value the ping
-          functionality will be disabled
-          (default: 60)
-
-        - ``ping_timeout``: the maximum length of time (in milliseconds) to
-          wait for a connection in the pool to respond to an internal ping to
-          the database before being discarded and replaced during a call to
-          acquire()
-          (default: 5000)
-
-        - ``user``: the name of the database user to connect to
-          (default: None)
-
-        - ``proxy_user``: the name of the proxy user to connect to. If this
-          value is not specified, it will be parsed out of user if user is in
-          the form "user[proxy_user]"
-          (default: None)
-
-        - ``password``: the password for the database user
-          (default: None)
-
-        - ``newpassword``: a new password for the database user. The new
-          password will take effect immediately upon a successful connection to
-          the database
-          (default: None)
-
-        - ``wallet_password``: the password to use to decrypt the wallet, if it
-          is encrypted. This is not the database password. For Oracle
-          Autonomous Database this is the password created when downloading the
-          wallet. This value is only used in python-oracledb Thin mode.
-          (default: None)
-
-        - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-          string, it specifies an Entra ID OAuth2 token used for Open
-          Authorization (OAuth 2.0) token based authentication. If it is a
-          2-tuple, it specifies the token and private key strings used for
-          Oracle Cloud Infrastructure (OCI) Identity and Access Management
-          (IAM) token based authentication. If it is a callable, it returns
-          either a string or a 2-tuple used for OAuth 2.0 or OCI IAM token
-          based authentication and is useful when the pool needs to expand and
-          create new connections but the current authentication token has
-          expired
-          (default: None)
-
-        - ``host``: the hostname or IP address of the machine hosting the
-          database or the database listener
-          (default: None)
-
-        - ``port``: the port number on which the database listener is listening
-          (default: 1521)
-
-        - ``protocol``: one of the strings "tcp" or "tcps" indicating whether
-          to use unencrypted network traffic or encrypted network traffic (TLS)
-          (default: "tcp")
-
-        - ``https_proxy``: the hostname or IP address of a proxy host to use
-          for tunneling secure connections
-          (default: None)
-
-        - ``https_proxy_port``: the port on which to communicate with the proxy
-          host
-          (default: 0)
-
-        - ``service_name``: the service name of the database
-          (default: None)
-
-        - ``instance_name``: the instance name of the database
-          (default: None)
-
-        - ``sid``: the system identifier (SID) of the database. Note using a
-          service_name instead is recommended
-          (default: None)
-
-        - ``server_type``: the type of server connection that should be
-          established. If specified, it should be one of strings "dedicated",
-          "shared" or "pooled"
-          (default: None)
-
-        - ``cclass``: the connection class to use for Database Resident
-          Connection Pooling (DRCP)
-          (default: None)
-
-        - ``purity``: the connection purity to use for Database Resident
-          Connection Pooling (DRCP)
-          (default: :attr:`oracledb.PURITY_DEFAULT`)
-
-        - ``expire_time``: the number of minutes between the sending of
-          keepalive probes. If this parameter is set to a value greater than
-          zero it enables keepalive
-          (default: 0)
-
-        - ``retry_count``: the number of times that initial connection
-          establishment should be retried before the connection attempt is
-          terminated
-          (default: 0)
-
-        - ``retry_delay``: the number of seconds to wait before retrying to
-          establish a connection
-          (default: 1)
-
-        - ``tcp_connect_timeout``: a float indicating the maximum number of
-          seconds to wait when establishing a connection to the database host
-          (default: 20.0)
-
-        - ``ssl_server_dn_match``: a boolean indicating whether the server
-          certificate distinguished name (DN) should be matched in addition to
-          the regular certificate verification that is performed. Note that if
-          the ssl_server_cert_dn parameter is not privided, host name matching
-          is performed instead
-          (default: True)
-
-        - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-          matched with the server. This value is ignored if the
-          ssl_server_dn_match parameter is not set to the value True. If
-          specified this value is used for any verfication. Otherwise the
-          hostname will be used
-          (default: None)
-
-        - ``wallet_location``: the directory where the wallet can be found. In
-          python-oracledb Thin mode this must be the directory containing the
-          PEM-encoded wallet file ewallet.pem. In python-oracledb Thick mode
-          this must be the directory containing the file cwallet.sso
-          (default: None)
-
-        - ``events``: a boolean specifying whether events mode should be
-          enabled. This value is only used in python-oracledb Thick mode and is
-          needed for continuous query notification and high availability event
-          notifications
-          (default: False)
-
-        - ``externalauth``: a boolean indicating whether to use external
-          authentication
-          (default: False)
-
-        - ``mode``: the authorization mode to use. One of the constants
-          :data:`oracledb.AUTH_MODE_DEFAULT`,
-          :data:`oracledb.AUTH_MODE_PRELIM`, :data:`oracledb.AUTH_MODE_SYSASM`,
-          :data:`oracledb.AUTH_MODE_SYSBKP`, :data:`oracledb.AUTH_MODE_SYSDBA`,
-          :data:`oracledb.AUTH_MODE_SYSDGD`, :data:`oracledb.AUTH_MODE_SYSKMT`,
-          :data:`oracledb.AUTH_MODE_SYSOPER`, or
-          :data:`oracledb.AUTH_MODE_SYSRAC`
-          (default: :attr:`oracledb.AUTH_MODE_DEFAULT`)
-
-        - ``disable_oob``: a boolean indicating whether out-of-band breaks
-          should be disabled. This value is only used in python-oracledb Thin
-          mode. It has no effect on Windows which does not support this
-          functionality
-          (default: False)
-
-        - ``stmtcachesize``: the size of the statement cache
-          (default: :attr:`oracledb.defaults.stmtcachesize
-          <Defaults.stmtcachesize>`)
-
-        - ``edition``: edition to use for the connection. This parameter cannot
-          be used simultaneously with the cclass parameter
-          (default: None)
-
-        - ``tag``: identifies the type of connection that should be returned
-          from a pool. This value is only used in python-oracledb Thick mode
-          (default: None)
-
-        - ``matchanytag``: a boolean specifying whether any tag can be used
-          when acquiring a connection from the pool. This value is only used in
-          python-oracledb Thick mode
-          (default: False)
-
-        - ``config_dir``: a directory in which the optional tnsnames.ora
-          configuration file is located. This value is only used in python-
-          oracledb Thin mode. For python-oracledb Thick mode, it is used if
-          :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-          mode use the ``config_dir`` parameter of
-          :meth:`oracledb.init_oracle_client()`
-          (default: :attr:`oracledb.defaults.config_dir
-          <Defaults.config_dir>`)
-
-        - ``appcontext``: application context used by the connection. It should
-          be a list of 3-tuples (namespace, name, value) and each entry in the
-          tuple should be a string
-          (default: None)
-
-        - ``shardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-          (default: None)
-
-        - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-          (default: None)
-
-        - ``debug_jdwp``: a string with the format "host=<host>;port=<port>"
-          that specifies the host and port of the PL/SQL debugger. This value
-          is only used in python-oracledb Thin mode.  For python-oracledb Thick
-          mode set the ORA_DEBUG_JDWP environment variable
-          (default: None)
-
-        - ``connection_id_prefix``: an application specific prefix that is
-          added to the connection identifier used for tracing
-          (default: None)
-
-        - ``ssl_context``: an SSLContext object used for connecting to the
-          database using TLS.  This SSL context will be modified to include the
-          private key or any certificates found in a separately supplied
-          wallet. This parameter should only be specified if the default
-          SSLContext object cannot be used
-          (default: None)
-
-        - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes.
-          The value tunes internal buffers used for communication to the
-          database. Bigger values can increase throughput for large queries or
-          bulk data loads, but at the cost of higher memory use. The SDU size
-          that will actually be used is negotiated down to the lower of this
-          value and the database network SDU configuration value
-          (default: 8192)
-
-        - ``pool_boundary``: one of the values "statement" or "transaction"
-          indicating when pooled DRCP connections can be returned to the pool.
-          This requires the use of DRCP with Oracle Database 23.4 or higher
-          (default: None)
-
-        - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast
-          open. This is an Oracle Autonomous Database Serverless (ADB-S)
-          specific property for clients connecting from within OCI Cloud
-          network. Please refer to the ADB-S documentation for more information
-          (default: False)
-
-        - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-          ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-          (default: None)
-
-        - ``program``: a string recorded by Oracle Database as the program from
-          which the connection originates
-          (default: :attr:`oracledb.defaults.program
-          <Defaults.program>`)
-
-        - ``machine``: a string recorded by Oracle Database as the name of the
-          machine from which the connection originates
-          (default: :attr:`oracledb.defaults.machine
-          <Defaults.machine>`)
-
-        - ``terminal``: a string recorded by Oracle Database as the terminal
-          identifier from which the connection originates
-          (default: :attr:`oracledb.defaults.terminal
-          <Defaults.terminal>`)
-
-        - ``osuser``: a string recorded by Oracle Database as the operating
-          system user who originated the connection
-          (default: :attr:`oracledb.defaults.osuser
-          <Defaults.osuser>`)
-
-        - ``driver_name``: a string recorded by Oracle Database as the name of
-          the driver which originated the connection
-          (default: :attr:`oracledb.defaults.driver_name
-          <Defaults.driver_name>`)
-
-        - ``use_sni``: a boolean indicating whether to use the TLS SNI
-          extension to bypass the second TLS neogiation that would otherwise be
-          required
-          (default: False)
-
-        - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass
-          the connect string to the Oracle Client libraries unchanged without
-          parsing by the driver. Setting this to False makes python-oracledb
-          Thick and Thin mode applications behave similarly regarding
-          connection string parameter handling and locating any optional
-          tnsnames.ora configuration file
-          (default: :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>`)
-
-        - ``extra_auth_params``: a dictionary containing configuration
-          parameters necessary for Oracle Database authentication using
-          plugins, such as the Azure and OCI cloud-native authentication
-          plugins
-          (default: None)
-
-        - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP
-          with Oracle Database 23.4, or higher
-          (default: None)
-
-        - ``handle``: an integer representing a pointer to a valid service
-          context handle. This value is only used in python-oracledb Thick
-          mode. It should be used with extreme caution
-          (default: 0)
-        """
-        pass
-
-    def __repr__(self):
-        return (
-            self.__class__.__qualname__ + "("
-            f"min={self.min!r}, "
-            f"max={self.max!r}, "
-            f"increment={self.increment!r}, "
-            f"connectiontype={self.connectiontype!r}, "
-            f"getmode={self.getmode!r}, "
-            f"homogeneous={self.homogeneous!r}, "
-            f"timeout={self.timeout!r}, "
-            f"wait_timeout={self.wait_timeout!r}, "
-            f"max_lifetime_session={self.max_lifetime_session!r}, "
-            f"session_callback={self.session_callback!r}, "
-            f"max_sessions_per_shard={self.max_sessions_per_shard!r}, "
-            f"soda_metadata_cache={self.soda_metadata_cache!r}, "
-            f"ping_interval={self.ping_interval!r}, "
-            f"ping_timeout={self.ping_timeout!r}, "
-            f"user={self.user!r}, "
-            f"proxy_user={self.proxy_user!r}, "
-            f"host={self.host!r}, "
-            f"port={self.port!r}, "
-            f"protocol={self.protocol!r}, "
-            f"https_proxy={self.https_proxy!r}, "
-            f"https_proxy_port={self.https_proxy_port!r}, "
-            f"service_name={self.service_name!r}, "
-            f"instance_name={self.instance_name!r}, "
-            f"sid={self.sid!r}, "
-            f"server_type={self.server_type!r}, "
-            f"cclass={self.cclass!r}, "
-            f"purity={self.purity!r}, "
-            f"expire_time={self.expire_time!r}, "
-            f"retry_count={self.retry_count!r}, "
-            f"retry_delay={self.retry_delay!r}, "
-            f"tcp_connect_timeout={self.tcp_connect_timeout!r}, "
-            f"ssl_server_dn_match={self.ssl_server_dn_match!r}, "
-            f"ssl_server_cert_dn={self.ssl_server_cert_dn!r}, "
-            f"wallet_location={self.wallet_location!r}, "
-            f"events={self.events!r}, "
-            f"externalauth={self.externalauth!r}, "
-            f"mode={self.mode!r}, "
-            f"disable_oob={self.disable_oob!r}, "
-            f"stmtcachesize={self.stmtcachesize!r}, "
-            f"edition={self.edition!r}, "
-            f"tag={self.tag!r}, "
-            f"matchanytag={self.matchanytag!r}, "
-            f"config_dir={self.config_dir!r}, "
-            f"appcontext={self.appcontext!r}, "
-            f"shardingkey={self.shardingkey!r}, "
-            f"supershardingkey={self.supershardingkey!r}, "
-            f"debug_jdwp={self.debug_jdwp!r}, "
-            f"connection_id_prefix={self.connection_id_prefix!r}, "
-            f"ssl_context={self.ssl_context!r}, "
-            f"sdu={self.sdu!r}, "
-            f"pool_boundary={self.pool_boundary!r}, "
-            f"use_tcp_fast_open={self.use_tcp_fast_open!r}, "
-            f"ssl_version={self.ssl_version!r}, "
-            f"program={self.program!r}, "
-            f"machine={self.machine!r}, "
-            f"terminal={self.terminal!r}, "
-            f"osuser={self.osuser!r}, "
-            f"driver_name={self.driver_name!r}, "
-            f"use_sni={self.use_sni!r}, "
-            f"thick_mode_dsn_passthrough={self.thick_mode_dsn_passthrough!r}, "
-            f"extra_auth_params={self.extra_auth_params!r}, "
-            f"pool_name={self.pool_name!r}"
-            ")"
-        )
-
-    @property
-    def connectiontype(self) -> Type["oracledb.Connection"]:
-        """
-        The class of the connection that should be returned during calls to
-        pool.acquire(). It must be oracledb.Connection or a subclass of
-        oracledb.Connection.
-        """
-        return self._impl.connectiontype
-
-    @property
-    def getmode(self) -> oracledb.PoolGetMode:
-        """
-        How pool.acquire() will behave. One of the constants
-        :data:`oracledb.POOL_GETMODE_WAIT`,
-        :data:`oracledb.POOL_GETMODE_NOWAIT`,
-        :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-        :data:`oracledb.POOL_GETMODE_TIMEDWAIT`.
-        """
-        return oracledb.PoolGetMode(self._impl.getmode)
-
-    @property
-    def homogeneous(self) -> bool:
-        """
-        A boolean indicating whether the connections in the pool are
-        homogeneous (same user) or heterogeneous (multiple users).
-        """
-        return self._impl.homogeneous
-
-    @property
-    def increment(self) -> int:
-        """
-        The number of connections that should be added to the pool whenever the
-        pool needs to grow.
-        """
-        return self._impl.increment
-
-    @property
-    def max(self) -> int:
-        """
-        The maximum number of connections the pool should contain.
-        """
-        return self._impl.max
-
-    @property
-    def max_lifetime_session(self) -> int:
-        """
-        The length of time (in seconds) that connections can remain in the
-        pool. If it is 0 then connections may remain in the pool indefinitely.
-        """
-        return self._impl.max_lifetime_session
-
-    @property
-    def max_sessions_per_shard(self) -> int:
-        """
-        The maximum number of connections that may be associated with a
-        particular shard.
-        """
-        return self._impl.max_sessions_per_shard
-
-    @property
-    def min(self) -> int:
-        """
-        The minimum number of connections the pool should contain.
-        """
-        return self._impl.min
-
-    @property
-    def ping_interval(self) -> int:
-        """
-        The length of time (in seconds) after which an unused connection in the
-        pool will be a candidate for pinging when pool.acquire() is called. If
-        the ping to the database indicates the connection is not alive a
-        replacement connection will be returned by pool.acquire(). If
-        ping_interval is a negative value the ping functionality will be
-        disabled.
-        """
-        return self._impl.ping_interval
-
-    @property
-    def ping_timeout(self) -> int:
-        """
-        The maximum length of time (in milliseconds) to wait for a connection
-        in the pool to respond to an internal ping to the database before being
-        discarded and replaced during a call to acquire().
-        """
-        return self._impl.ping_timeout
-
-    @property
-    def session_callback(self) -> Callable:
-        """
-        A callable that is invoked when a connection is returned from the pool
-        for the first time, or when the connection tag differs from the one
-        requested.
-        """
-        return self._impl.session_callback
-
-    @property
-    def soda_metadata_cache(self) -> bool:
-        """
-        A boolean indicating whether or not the SODA metadata cache should be
-        enabled.
-        """
-        return self._impl.soda_metadata_cache
-
-    @property
-    def timeout(self) -> int:
-        """
-        The length of time (in seconds) that a connection may remain idle in
-        the pool before it is terminated. If it is 0 then connections are never
-        terminated.
-        """
-        return self._impl.timeout
-
-    @property
-    def wait_timeout(self) -> int:
-        """
-        The length of time (in milliseconds) that a caller should wait when
-        acquiring a connection from the pool with getmode set to
-        :data:`oracledb.POOL_GETMODE_TIMEDWAIT`.
-        """
-        return self._impl.wait_timeout
-
-    def copy(self) -> "PoolParams":
-        """
-        Creates a copy of the parameters and returns it.
-        """
-        params = PoolParams.__new__(PoolParams)
-        params._impl = self._impl.copy()
-        return params
-
-    @utils.params_setter
-    def set(
-        self,
-        *,
-        min: Optional[int] = None,
-        max: Optional[int] = None,
-        increment: Optional[int] = None,
-        connectiontype: Optional[Type["oracledb.Connection"]] = None,
-        getmode: Optional[oracledb.PoolGetMode] = None,
-        homogeneous: Optional[bool] = None,
-        timeout: Optional[int] = None,
-        wait_timeout: Optional[int] = None,
-        max_lifetime_session: Optional[int] = None,
-        session_callback: Optional[Callable] = None,
-        max_sessions_per_shard: Optional[int] = None,
-        soda_metadata_cache: Optional[bool] = None,
-        ping_interval: Optional[int] = None,
-        ping_timeout: Optional[int] = None,
-        user: Optional[str] = None,
-        proxy_user: Optional[str] = None,
-        password: Optional[str] = None,
-        newpassword: Optional[str] = None,
-        wallet_password: Optional[str] = None,
-        access_token: Optional[Union[str, tuple, Callable]] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        protocol: Optional[str] = None,
-        https_proxy: Optional[str] = None,
-        https_proxy_port: Optional[int] = None,
-        service_name: Optional[str] = None,
-        instance_name: Optional[str] = None,
-        sid: Optional[str] = None,
-        server_type: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: Optional[oracledb.Purity] = None,
-        expire_time: Optional[int] = None,
-        retry_count: Optional[int] = None,
-        retry_delay: Optional[int] = None,
-        tcp_connect_timeout: Optional[float] = None,
-        ssl_server_dn_match: Optional[bool] = None,
-        ssl_server_cert_dn: Optional[str] = None,
-        wallet_location: Optional[str] = None,
-        events: Optional[bool] = None,
-        externalauth: Optional[bool] = None,
-        mode: Optional[oracledb.AuthMode] = None,
-        disable_oob: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        edition: Optional[str] = None,
-        tag: Optional[str] = None,
-        matchanytag: Optional[bool] = None,
-        config_dir: Optional[str] = None,
-        appcontext: Optional[list] = None,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-        debug_jdwp: Optional[str] = None,
-        connection_id_prefix: Optional[str] = None,
-        ssl_context: Optional[Any] = None,
-        sdu: Optional[int] = None,
-        pool_boundary: Optional[str] = None,
-        use_tcp_fast_open: Optional[bool] = None,
-        ssl_version: Optional[ssl.TLSVersion] = None,
-        program: Optional[str] = None,
-        machine: Optional[str] = None,
-        terminal: Optional[str] = None,
-        osuser: Optional[str] = None,
-        driver_name: Optional[str] = None,
-        use_sni: Optional[bool] = None,
-        thick_mode_dsn_passthrough: Optional[bool] = None,
-        extra_auth_params: Optional[dict] = None,
-        pool_name: Optional[str] = None,
-        handle: Optional[int] = None,
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        - ``min``: the minimum number of connections the pool should contain
-
-        - ``max``: the maximum number of connections the pool should contain
-
-        - ``increment``: the number of connections that should be added to the
-          pool whenever the pool needs to grow
-
-        - ``connectiontype``: the class of the connection that should be
-          returned during calls to pool.acquire(). It must be
-          oracledb.Connection or a subclass of oracledb.Connection
-
-        - ``getmode``: how pool.acquire() will behave. One of the constants
-          :data:`oracledb.POOL_GETMODE_WAIT`,
-          :data:`oracledb.POOL_GETMODE_NOWAIT`,
-          :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-          :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-
-        - ``homogeneous``: a boolean indicating whether the connections in the
-          pool are homogeneous (same user) or heterogeneous (multiple users)
-
-        - ``timeout``: the length of time (in seconds) that a connection may
-          remain idle in the pool before it is terminated. If it is 0 then
-          connections are never terminated
-
-        - ``wait_timeout``: the length of time (in milliseconds) that a caller
-          should wait when acquiring a connection from the pool with getmode
-          set to :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-
-        - ``max_lifetime_session``: the length of time (in seconds) that
-          connections can remain in the pool. If it is 0 then connections may
-          remain in the pool indefinitely
-
-        - ``session_callback``: a callable that is invoked when a connection is
-          returned from the pool for the first time, or when the connection tag
-          differs from the one requested
-
-        - ``max_sessions_per_shard``: the maximum number of connections that
-          may be associated with a particular shard
-
-        - ``soda_metadata_cache``: a boolean indicating whether or not the SODA
-          metadata cache should be enabled
-
-        - ``ping_interval``: the length of time (in seconds) after which an
-          unused connection in the pool will be a candidate for pinging when
-          pool.acquire() is called. If the ping to the database indicates the
-          connection is not alive a replacement connection will be returned by
-          pool.acquire(). If ping_interval is a negative value the ping
-          functionality will be disabled
-
-        - ``ping_timeout``: the maximum length of time (in milliseconds) to
-          wait for a connection in the pool to respond to an internal ping to
-          the database before being discarded and replaced during a call to
-          acquire()
-
-        - ``user``: the name of the database user to connect to
-
-        - ``proxy_user``: the name of the proxy user to connect to. If this
-          value is not specified, it will be parsed out of user if user is in
-          the form "user[proxy_user]"
-
-        - ``password``: the password for the database user
-
-        - ``newpassword``: a new password for the database user. The new
-          password will take effect immediately upon a successful connection to
-          the database
-
-        - ``wallet_password``: the password to use to decrypt the wallet, if it
-          is encrypted. This is not the database password. For Oracle
-          Autonomous Database this is the password created when downloading the
-          wallet. This value is only used in python-oracledb Thin mode.
-
-        - ``access_token``: a string, or a 2-tuple, or a callable. If it is a
-          string, it specifies an Entra ID OAuth2 token used for Open
-          Authorization (OAuth 2.0) token based authentication. If it is a
-          2-tuple, it specifies the token and private key strings used for
-          Oracle Cloud Infrastructure (OCI) Identity and Access Management
-          (IAM) token based authentication. If it is a callable, it returns
-          either a string or a 2-tuple used for OAuth 2.0 or OCI IAM token
-          based authentication and is useful when the pool needs to expand and
-          create new connections but the current authentication token has
-          expired
-
-        - ``host``: the hostname or IP address of the machine hosting the
-          database or the database listener
-
-        - ``port``: the port number on which the database listener is listening
-
-        - ``protocol``: one of the strings "tcp" or "tcps" indicating whether
-          to use unencrypted network traffic or encrypted network traffic (TLS)
-
-        - ``https_proxy``: the hostname or IP address of a proxy host to use
-          for tunneling secure connections
-
-        - ``https_proxy_port``: the port on which to communicate with the proxy
-          host
-
-        - ``service_name``: the service name of the database
-
-        - ``instance_name``: the instance name of the database
-
-        - ``sid``: the system identifier (SID) of the database. Note using a
-          service_name instead is recommended
-
-        - ``server_type``: the type of server connection that should be
-          established. If specified, it should be one of strings "dedicated",
-          "shared" or "pooled"
-
-        - ``cclass``: the connection class to use for Database Resident
-          Connection Pooling (DRCP)
-
-        - ``purity``: the connection purity to use for Database Resident
-          Connection Pooling (DRCP)
-
-        - ``expire_time``: the number of minutes between the sending of
-          keepalive probes. If this parameter is set to a value greater than
-          zero it enables keepalive
-
-        - ``retry_count``: the number of times that initial connection
-          establishment should be retried before the connection attempt is
-          terminated
-
-        - ``retry_delay``: the number of seconds to wait before retrying to
-          establish a connection
-
-        - ``tcp_connect_timeout``: a float indicating the maximum number of
-          seconds to wait when establishing a connection to the database host
-
-        - ``ssl_server_dn_match``: a boolean indicating whether the server
-          certificate distinguished name (DN) should be matched in addition to
-          the regular certificate verification that is performed. Note that if
-          the ssl_server_cert_dn parameter is not privided, host name matching
-          is performed instead
-
-        - ``ssl_server_cert_dn``: the distinguished name (DN) which should be
-          matched with the server. This value is ignored if the
-          ssl_server_dn_match parameter is not set to the value True. If
-          specified this value is used for any verfication. Otherwise the
-          hostname will be used
-
-        - ``wallet_location``: the directory where the wallet can be found. In
-          python-oracledb Thin mode this must be the directory containing the
-          PEM-encoded wallet file ewallet.pem. In python-oracledb Thick mode
-          this must be the directory containing the file cwallet.sso
-
-        - ``events``: a boolean specifying whether events mode should be
-          enabled. This value is only used in python-oracledb Thick mode and is
-          needed for continuous query notification and high availability event
-          notifications
-
-        - ``externalauth``: a boolean indicating whether to use external
-          authentication
-
-        - ``mode``: the authorization mode to use. One of the constants
-          :data:`oracledb.AUTH_MODE_DEFAULT`,
-          :data:`oracledb.AUTH_MODE_PRELIM`, :data:`oracledb.AUTH_MODE_SYSASM`,
-          :data:`oracledb.AUTH_MODE_SYSBKP`, :data:`oracledb.AUTH_MODE_SYSDBA`,
-          :data:`oracledb.AUTH_MODE_SYSDGD`, :data:`oracledb.AUTH_MODE_SYSKMT`,
-          :data:`oracledb.AUTH_MODE_SYSOPER`, or
-          :data:`oracledb.AUTH_MODE_SYSRAC`
-
-        - ``disable_oob``: a boolean indicating whether out-of-band breaks
-          should be disabled. This value is only used in python-oracledb Thin
-          mode. It has no effect on Windows which does not support this
-          functionality
-
-        - ``stmtcachesize``: the size of the statement cache
-
-        - ``edition``: edition to use for the connection. This parameter cannot
-          be used simultaneously with the cclass parameter
-
-        - ``tag``: identifies the type of connection that should be returned
-          from a pool. This value is only used in python-oracledb Thick mode
-
-        - ``matchanytag``: a boolean specifying whether any tag can be used
-          when acquiring a connection from the pool. This value is only used in
-          python-oracledb Thick mode
-
-        - ``config_dir``: a directory in which the optional tnsnames.ora
-          configuration file is located. This value is only used in python-
-          oracledb Thin mode. For python-oracledb Thick mode, it is used if
-          :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-          <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick
-          mode use the ``config_dir`` parameter of
-          :meth:`oracledb.init_oracle_client()`
-
-        - ``appcontext``: application context used by the connection. It should
-          be a list of 3-tuples (namespace, name, value) and each entry in the
-          tuple should be a string
-
-        - ``shardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-
-        - ``supershardingkey``: a list of strings, numbers, bytes or dates that
-          identify the database shard to connect to. This value is only used in
-          python-oracledb Thick mode
-
-        - ``debug_jdwp``: a string with the format "host=<host>;port=<port>"
-          that specifies the host and port of the PL/SQL debugger. This value
-          is only used in python-oracledb Thin mode.  For python-oracledb Thick
-          mode set the ORA_DEBUG_JDWP environment variable
-
-        - ``connection_id_prefix``: an application specific prefix that is
-          added to the connection identifier used for tracing
-
-        - ``ssl_context``: an SSLContext object used for connecting to the
-          database using TLS.  This SSL context will be modified to include the
-          private key or any certificates found in a separately supplied
-          wallet. This parameter should only be specified if the default
-          SSLContext object cannot be used
-
-        - ``sdu``: the requested size of the Session Data Unit (SDU), in bytes.
-          The value tunes internal buffers used for communication to the
-          database. Bigger values can increase throughput for large queries or
-          bulk data loads, but at the cost of higher memory use. The SDU size
-          that will actually be used is negotiated down to the lower of this
-          value and the database network SDU configuration value
-
-        - ``pool_boundary``: one of the values "statement" or "transaction"
-          indicating when pooled DRCP connections can be returned to the pool.
-          This requires the use of DRCP with Oracle Database 23.4 or higher
-
-        - ``use_tcp_fast_open``: a boolean indicating whether to use TCP fast
-          open. This is an Oracle Autonomous Database Serverless (ADB-S)
-          specific property for clients connecting from within OCI Cloud
-          network. Please refer to the ADB-S documentation for more information
-
-        - ``ssl_version``: one of the values ssl.TLSVersion.TLSv1_2 or
-          ssl.TLSVersion.TLSv1_3 indicating which TLS version to use
-
-        - ``program``: a string recorded by Oracle Database as the program from
-          which the connection originates
-
-        - ``machine``: a string recorded by Oracle Database as the name of the
-          machine from which the connection originates
-
-        - ``terminal``: a string recorded by Oracle Database as the terminal
-          identifier from which the connection originates
-
-        - ``osuser``: a string recorded by Oracle Database as the operating
-          system user who originated the connection
-
-        - ``driver_name``: a string recorded by Oracle Database as the name of
-          the driver which originated the connection
-
-        - ``use_sni``: a boolean indicating whether to use the TLS SNI
-          extension to bypass the second TLS neogiation that would otherwise be
-          required
-
-        - ``thick_mode_dsn_passthrough``: a boolean indicating whether to pass
-          the connect string to the Oracle Client libraries unchanged without
-          parsing by the driver. Setting this to False makes python-oracledb
-          Thick and Thin mode applications behave similarly regarding
-          connection string parameter handling and locating any optional
-          tnsnames.ora configuration file
-
-        - ``extra_auth_params``: a dictionary containing configuration
-          parameters necessary for Oracle Database authentication using
-          plugins, such as the Azure and OCI cloud-native authentication
-          plugins
-
-        - ``pool_name``: the name of the DRCP pool when using multi-pool DRCP
-          with Oracle Database 23.4, or higher
-
-        - ``handle``: an integer representing a pointer to a valid service
-          context handle. This value is only used in python-oracledb Thick
-          mode. It should be used with extreme caution
-        """
-        pass
diff --git a/src/oracledb/py.typed b/src/oracledb/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/oracledb/soda.py b/src/oracledb/soda.py
deleted file mode 100644
index 39a6fa73..00000000
--- a/src/oracledb/soda.py
+++ /dev/null
@@ -1,746 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# soda.py
-#
-# Contains the classes for managing Simple Oracle Document Access (SODA):
-# SodaDatabase, SodaCollection, SodaDocument, SodaDocCursor and SodaOperation.
-# -----------------------------------------------------------------------------
-
-from typing import Any, Optional, Union
-from typing_extensions import Self
-import json
-
-from .base import BaseMetaClass
-from . import errors
-
-
-class SodaDatabase(metaclass=BaseMetaClass):
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return f"<{cls_name} on {self._conn!r}>"
-
-    @classmethod
-    def _from_impl(cls, conn, impl):
-        db = cls.__new__(cls)
-        db._conn = conn
-        db._impl = impl
-        return db
-
-    def _create_doc_impl(
-        self, content: Any, key: str = None, media_type: str = None
-    ) -> "SodaDocument":
-        """
-        Internal method used for creating a document implementation object with
-        the given content, key and media type.
-        """
-        if isinstance(content, str):
-            content_bytes = content.encode()
-        elif isinstance(content, bytes):
-            content_bytes = content
-        elif self._impl.supports_json:
-            return self._impl.create_json_document(content, key)
-        else:
-            content_bytes = json.dumps(content).encode()
-        return self._impl.create_document(content_bytes, key, media_type)
-
-    def createCollection(
-        self,
-        name: str,
-        metadata: Optional[Union[str, dict]] = None,
-        mapMode: bool = False,
-    ) -> "SodaCollection":
-        """
-        Creates a SODA collection with the given name and returns a new SODA
-        collection object. If you try to create a collection, and a collection
-        with the same name and metadata already exists, then that existing
-        collection is opened without error.
-
-        If ``metadata`` is specified, it is expected to be a string containing
-        valid JSON or a dictionary that will be transformed into a JSON string.
-        This JSON permits you to specify the configuration of the collection
-        including storage options; specifying the presence or absence of
-        columns for creation timestamp, last modified timestamp and version;
-        whether the collection can store only JSON documents; and methods of
-        key and version generation. The default metadata creates a collection
-        that only supports JSON documents and uses system generated keys.
-
-        If the ``mapMode`` parameter is set to *True*, the new collection is
-        mapped to an existing table instead of creating a table. If a
-        collection is created in this way, dropping the collection will not
-        drop the existing table either.
-        """
-        if metadata is not None and not isinstance(metadata, str):
-            metadata = json.dumps(metadata)
-        collection_impl = self._impl.create_collection(name, metadata, mapMode)
-        return SodaCollection._from_impl(self, collection_impl)
-
-    def createDocument(
-        self,
-        content: Any,
-        key: Optional[str] = None,
-        mediaType: str = "application/json",
-    ) -> "SodaDocument":
-        """
-        Creates a SODA document usable for SODA write operations. You only need
-        to use this method if your collection requires client-assigned keys or
-        has non-JSON content; otherwise, you can pass your content directly to
-        SODA write operations. SodaDocument attributes
-        :attr:`~SodaDoc.createdOn`, :attr:`~SodaDoc.lastModified`, and
-        :attr:`~SodaDoc.version` will be *None*.
-
-        The ``content`` parameter can be a dictionary or list which will be
-        transformed into a JSON string and then UTF-8 encoded. It can also be a
-        string which will be UTF-8 encoded or it can be a bytes object which
-        will be stored unchanged. If a bytes object is provided and the content
-        is expected to be JSON, note that SODA only supports UTF-8, UTF-16LE,
-        and UTF-16BE encodings.
-
-        The ``key`` parameter should only be supplied if the collection in
-        which the document is to be placed requires client-assigned keys.
-
-        The ``mediaType`` parameter should only be supplied if the collection
-        in which the document is to be placed supports non-JSON documents and
-        the content for this document is non-JSON. Using a standard MIME type
-        for this value is recommended but any string will be accepted.
-        """
-        doc_impl = self._create_doc_impl(content, key, mediaType)
-        return SodaDocument._from_impl(doc_impl)
-
-    def getCollectionNames(
-        self, startName: Optional[str] = None, limit: int = 0
-    ) -> list[str]:
-        """
-        Returns a list of the names of collections in the database that match
-        the criteria, in alphabetical order.
-
-        If the ``startName`` parameter is specified, the list of names returned
-        will start with this value and also contain any names that fall after
-        this value in alphabetical order.
-
-        If the ``limit`` parameter is specified and is non-zero, the number of
-        collection names returned will be limited to this value.
-        """
-        return self._impl.get_collection_names(startName, limit)
-
-    def openCollection(self, name: str) -> "SodaCollection":
-        """
-        Opens an existing collection with the given name and returns a new SODA
-        collection object. If a collection with that name does not exist,
-        *None* is returned.
-        """
-        collection_impl = self._impl.open_collection(name)
-        if collection_impl is not None:
-            return SodaCollection._from_impl(self, collection_impl)
-
-
-class SodaCollection(metaclass=BaseMetaClass):
-    @classmethod
-    def _from_impl(cls, db, impl):
-        coll = cls.__new__(cls)
-        coll._db = db
-        coll._impl = impl
-        return coll
-
-    def _process_doc_arg(self, arg):
-        if isinstance(arg, SodaDocument):
-            return arg._impl
-        return self._db._create_doc_impl(arg)
-
-    def createIndex(self, spec: Union[dict, str]) -> None:
-        """
-        Creates an index on a SODA collection.
-
-        The ``spec`` parameter is expected to be a dictionary or a JSON-encoded
-        string.
-
-        Note that a commit should be performed before attempting to create an
-        index.
-        """
-        if isinstance(spec, dict):
-            spec = json.dumps(spec)
-        elif not isinstance(spec, str):
-            raise TypeError("expecting a dictionary or string")
-        self._impl.create_index(spec)
-
-    def drop(self) -> bool:
-        """
-        Drops the collection from the database, if it exists. Note that if the
-        collection was created with ``mapMode`` set to *True*, the underlying
-        table will not be dropped.
-
-        A boolean value is returned indicating if the collection was actually
-        dropped.
-        """
-        return self._impl.drop()
-
-    def dropIndex(self, name: str, force: bool = False) -> bool:
-        """
-        Drops the index with the specified name, if it exists.
-
-        The force parameter, if set to *True*, can be used to force the
-        dropping of an index that the underlying Oracle Database domain index
-        does not normally permit. This is only applicable to spatial and JSON
-        search indexes.
-
-        A boolean value is returned indicating if the index was actually
-        dropped.
-        """
-        return self._impl.drop_index(name, force)
-
-    def find(self) -> "SodaOperation":
-        """
-        Begins an operation that will act upon documents in the collection. It
-        creates and returns a SodaOperation object which is used to specify the
-        criteria and the operation that will be performed on the documents that
-        match that criteria.
-        """
-        return SodaOperation(self)
-
-    def getDataGuide(self) -> "SodaDocument":
-        """
-        Returns a SODA document object containing property names, data types,
-        and lengths inferred from the JSON documents in the collection. It can
-        be useful for exploring the schema of a collection. Note that this
-        method is only supported for JSON-only collections where a JSON search
-        index has been created with the ‘dataguide’ option enabled. If there
-        are no documents in the collection, *None* is returned.
-        """
-        doc_impl = self._impl.get_data_guide()
-        if doc_impl is not None:
-            return SodaDocument._from_impl(doc_impl)
-
-    def insertMany(self, docs: list) -> None:
-        """
-        Inserts a list of documents into the collection at one time. Each of
-        the input documents can be a dictionary or list or an existing SODA
-        document object.
-
-        This method requires Oracle Client 18.5 (or later) and is available
-        only as a preview.
-        """
-        doc_impls = [self._process_doc_arg(d) for d in docs]
-        self._impl.insert_many(doc_impls, hint=None, return_docs=False)
-
-    def insertManyAndGet(
-        self, docs: list, hint: Optional[str] = None
-    ) -> list["SodaDocument"]:
-        """
-        Similar to :meth:`SodaCollection.insertMany()`, this method inserts a
-        list of documents into the collection at one time. The only difference
-        is that it returns a list of SODA Document objects. Note that for
-        performance reasons the returned documents do not contain the content.
-
-        The ``hint`` parameter, if specified, supplies a hint to the database
-        when processing the SODA operation. This is expected to be a string in
-        the same format as SQL hints but without any comment characters, for
-        example hint="MONITOR". While you could use this to pass any SQL hint,
-        the hints MONITOR (turn on monitoring) and NO_MONITOR (turn off
-        monitoring) are the most useful. Use of the ``hint`` parameter requires
-        Oracle Client 21.3 or later (or Oracle Client 19 from 19.11).
-
-        This method requires Oracle Client 18.5 (or later).
-        """
-        doc_impls = [self._process_doc_arg(d) for d in docs]
-        if hint is not None and not isinstance(hint, str):
-            raise TypeError("expecting a string")
-        return_doc_impls = self._impl.insert_many(
-            doc_impls, hint, return_docs=True
-        )
-        return [SodaDocument._from_impl(i) for i in return_doc_impls]
-
-    def insertOne(self, doc: Any) -> None:
-        """
-        Inserts a given document into the collection. The input document can be
-        a dictionary or list or an existing SODA document object.
-        """
-        doc_impl = self._process_doc_arg(doc)
-        self._impl.insert_one(doc_impl, hint=None, return_doc=False)
-
-    def insertOneAndGet(
-        self, doc: Any, hint: Optional[str] = None
-    ) -> "SodaDocument":
-        """
-        Similar to :meth:`~SodaCollection.insertOne()`, this method inserts a
-        given document into the collection. The only difference is that it
-        returns a SODA Document object. Note that for performance reasons the
-        returned document does not contain the content.
-
-        The ``hint`` parameter, if specified, supplies a hint to the database
-        when processing the SODA operation. This is expected to be a string in
-        the same format as SQL hints but without any comment characters, for
-        example hint="MONITOR". While you could use this to pass any SQL hint,
-        the hints MONITOR (turn on monitoring) and NO_MONITOR (turn off
-        monitoring) are the most useful. Use of the ``hint`` parameter requires
-        Oracle Client 21.3 or later (or Oracle Client 19 from 19.11).
-        """
-        doc_impl = self._process_doc_arg(doc)
-        if hint is not None and not isinstance(hint, str):
-            raise TypeError("expecting a string")
-        return_doc_impl = self._impl.insert_one(
-            doc_impl, hint, return_doc=True
-        )
-        return SodaDocument._from_impl(return_doc_impl)
-
-    def listIndexes(self) -> list:
-        """
-        Returns a list of specifications for the indexes found on the
-        collection.
-
-        This method requires Oracle Client 21.3 or later (or Oracle Client 19
-        from 19.13).
-        """
-        return [json.loads(s) for s in self._impl.list_indexes()]
-
-    @property
-    def metadata(self) -> dict:
-        """
-        This read-only attribute returns a dictionary containing the metadata
-        that was used to create the collection.
-        """
-        return json.loads(self._impl.get_metadata())
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name of the collection.
-        """
-        return self._impl.name
-
-    def save(self, doc: Any) -> None:
-        """
-        Saves a document into the collection. This method is equivalent to
-        :meth:`~SodaCollection.insertOne()` except that if client-assigned keys
-        are used, and the document with the specified key already exists in the
-        collection, it will be replaced with the input document.
-
-        This method requires Oracle Client 19.9 (or later) in addition to the
-        usual SODA requirements.
-        """
-        doc_impl = self._process_doc_arg(doc)
-        self._impl.save(doc_impl, hint=None, return_doc=False)
-
-    def saveAndGet(
-        self, doc: Any, hint: Optional[str] = None
-    ) -> "SodaDocument":
-        """
-        Saves a document into the collection. This method is equivalent to
-        :meth:`~SodaCollection.insertOneAndGet()` except that if
-        client-assigned keys are used, and the document with the specified key
-        already exists in the collection, it will be replaced with the input
-        document.
-
-        The ``hint`` parameter, if specified, supplies a hint to the database
-        when processing the SODA operation. This is expected to be a string in
-        the same format as SQL hints but without any comment characters, for
-        example hint="MONITOR". While you could use this to pass any SQL hint,
-        the hints MONITOR (turn on monitoring) and NO_MONITOR (turn off
-        monitoring) are the most useful. Use of the ``hint`` parameter requires
-        Oracle Client 21.3 or later (or Oracle Client 19 from 19.11).
-
-        This method requires Oracle Client 19.9 (or later) in addition to the
-        usual SODA requirements.
-        """
-        doc_impl = self._process_doc_arg(doc)
-        if hint is not None and not isinstance(hint, str):
-            raise TypeError("expecting a string")
-        return_doc_impl = self._impl.save(doc_impl, hint, return_doc=True)
-        return SodaDocument._from_impl(return_doc_impl)
-
-    def truncate(self) -> None:
-        """
-        Removes all of the documents in the collection, similarly to what is
-        done for rows in a table by the TRUNCATE TABLE statement.
-        """
-        self._impl.truncate()
-
-
-class SodaDocument(metaclass=BaseMetaClass):
-    @classmethod
-    def _from_impl(cls, impl):
-        doc = cls.__new__(cls)
-        doc._impl = impl
-        return doc
-
-    @property
-    def createdOn(self) -> str:
-        """
-        This read-only attribute returns the creation time of the document in
-        ISO 8601 format. Documents created by
-        :meth:`SodaDatabase.createDocument()` or fetched from collections where
-        this attribute is not stored will return *None*.
-        """
-        return self._impl.get_created_on()
-
-    def getContent(self) -> Union[dict, list]:
-        """
-        Returns the content of the document as a dictionary or list. This
-        method assumes that the content is application/json and will raise an
-        exception if this is not the case. If there is no content, however,
-        *None* will be returned.
-        """
-        content, encoding = self._impl.get_content()
-        if isinstance(content, bytes) and self.mediaType == "application/json":
-            return json.loads(content.decode(encoding))
-        return content
-
-    def getContentAsBytes(self) -> bytes:
-        """
-        Returns the content of the document as a bytes object. If there is no
-        content, however, *None* will be returned.
-        """
-        content, encoding = self._impl.get_content()
-        if isinstance(content, bytes):
-            return content
-        elif content is not None:
-            return str(content).encode()
-
-    def getContentAsString(self) -> str:
-        """
-        Returns the content of the document as a string. If the document
-        encoding is not known, UTF-8 will be used. If there is no content,
-        however, *None* will be returned.
-        """
-        content, encoding = self._impl.get_content()
-        if isinstance(content, bytes):
-            return content.decode(encoding)
-        elif content is not None:
-            return str(content)
-
-    @property
-    def key(self) -> str:
-        """
-        This read-only attribute returns the unique key assigned to this
-        document. Documents created by :meth:`SodaDatabase.createDocument()`
-        may not have a value assigned to them and return *None*.
-        """
-        return self._impl.get_key()
-
-    @property
-    def lastModified(self) -> str:
-        """
-        This read-only attribute returns the last modified time of the document
-        in ISO 8601 format. Documents created by
-        :meth:`SodaDatabase.createDocument()` or fetched from collections where
-        this attribute is not stored will return *None*.
-        """
-        return self._impl.get_last_modified()
-
-    @property
-    def mediaType(self) -> str:
-        """
-        This read-only attribute returns the media type assigned to the
-        document. By convention this is expected to be a MIME type but no
-        checks are performed on this value. If a value is not specified when
-        calling :meth:`SodaDatabase.createDocument()` or the document is
-        fetched from a collection where this component is not stored, the
-        string “application/json” is returned.
-        """
-        return self._impl.get_media_type()
-
-    @property
-    def version(self) -> str:
-        """
-        This read-only attribute returns the version assigned to this document.
-        Documents created by :meth:`SodaDatabase.createDocument()` or fetched
-        from collections where this attribute is not stored will return *None*.
-        """
-        return self._impl.get_version()
-
-
-class SodaDocCursor(metaclass=BaseMetaClass):
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self._impl is None:
-            errors._raise_err(errors.ERR_CURSOR_NOT_OPEN)
-        doc_impl = self._impl.get_next_doc()
-        if doc_impl is not None:
-            return SodaDocument._from_impl(doc_impl)
-        raise StopIteration
-
-    @classmethod
-    def _from_impl(cls, impl):
-        cursor = cls.__new__(cls)
-        cursor._impl = impl
-        return cursor
-
-    def close(self) -> None:
-        """
-        Closes the cursor now, rather than whenever __del__ is called. The
-        cursor will be unusable from this point forward; an Error exception
-        will be raised if any operation is attempted with the cursor.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_CURSOR_NOT_OPEN)
-        self._impl.close()
-        self._impl = None
-
-
-class SodaOperation(metaclass=BaseMetaClass):
-    def __init__(self, collection: SodaCollection) -> None:
-        self._collection = collection
-        self._key = None
-        self._keys = None
-        self._version = None
-        self._filter = None
-        self._hint = None
-        self._skip = None
-        self._limit = None
-        self._fetch_array_size = None
-        self._lock = False
-
-    def count(self) -> int:
-        """
-        Returns a count of the number of documents in the collection that match
-        the criteria. If :meth:`~SodaOperation.skip()` or
-        :meth:`~SodaOperation.limit()` were called on this object, an
-        exception is raised.
-        """
-        return self._collection._impl.get_count(self)
-
-    def fetchArraySize(self, value: int) -> Self:
-        """
-        This is a tuning method to specify the number of documents that are
-        internally fetched in batches by calls to
-        :meth:`~SodaOperation.getCursor()` and
-        :meth:`~SodaOperation.getDocuments()`. It does not affect how many
-        documents are returned to the application.
-
-        If ``fetchArraySize()`` is not used, or the ``value`` parameter is *0*,
-        the array size will default to *100*.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-
-        This method is only available when using Oracle Client 19.5, or later.
-        """
-        if not isinstance(value, int) or value < 0:
-            raise TypeError("expecting integer >= 0")
-        if value == 0:
-            self._fetch_array_size = None
-        else:
-            self._fetch_array_size = value
-        return self
-
-    def filter(self, value: Union[dict, str]) -> Self:
-        """
-        Sets a filter specification for complex document queries and ordering
-        of JSON documents. Filter specifications must be provided as a
-        dictionary or JSON-encoded string and can include comparisons, regular
-        expressions, logical and spatial operators, among others.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if isinstance(value, dict):
-            self._filter = json.dumps(value)
-        elif isinstance(value, str):
-            self._filter = value
-        else:
-            raise TypeError("expecting string or dictionary")
-        return self
-
-    def getCursor(self) -> "SodaDocCursor":
-        """
-        Returns a SodaDocCursor object that can be used to iterate over the
-        documents that match the criteria.
-        """
-        impl = self._collection._impl.get_cursor(self)
-        return SodaDocCursor._from_impl(impl)
-
-    def getDocuments(self) -> list["SodaDocument"]:
-        """
-        Returns a list of SodaDocument objects that match the criteria.
-        """
-        return [d for d in self.getCursor()]
-
-    def getOne(self) -> Union["SodaDocument", None]:
-        """
-        Returns a single SodaDocument object that matches the criteria. Note
-        that if multiple documents match the criteria only the first one is
-        returned.
-        """
-        doc_impl = self._collection._impl.get_one(self)
-        if doc_impl is not None:
-            return SodaDocument._from_impl(doc_impl)
-
-    def hint(self, value: str) -> Self:
-        """
-        Specifies a hint that will be provided to the SODA operation when it is
-        performed. This is expected to be a string in the same format as SQL
-        hints but without any comment characters. While you could use this to
-        pass any SQL hint, the hints MONITOR (turn on monitoring) and
-        NO_MONITOR (turn off monitoring) are the most useful. Use of this
-        method requires Oracle Client 21.3 or later (or Oracle Client 19 from
-        19.11).
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if not isinstance(value, str):
-            raise TypeError("expecting a string")
-        self._hint = value
-        return self
-
-    def lock(self) -> Self:
-        """
-        Specifies whether the documents fetched from the collection should be
-        locked (equivalent to SQL "select for update"). Use of this method
-        requires Oracle Client 21.3 or later (or Oracle Client 19 from 19.11).
-
-        The next commit or rollback on the connection made after the operation
-        is performed will "unlock" the documents. Ensure that the connection is
-        not in autocommit mode or the documents will be unlocked immediately
-        after the operation is complete.
-
-        This method should only be used with read operations (other than
-        :func:`~SodaOperation.count()`) and should not be used in conjunction
-        with non-terminal methods :meth:`~SodaOperation.skip()` and
-        :meth:`~SodaOperation.limit()`.
-
-        If this method is specified in conjunction with a write operation, this
-        method is ignored.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        self._lock = True
-        return self
-
-    def key(self, value: str) -> Self:
-        """
-        Specifies that the document with the specified key should be returned.
-        This causes any previous calls made to this method and
-        :meth:`~SodaOperation.keys()` to be ignored.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if not isinstance(value, str):
-            raise TypeError("expecting string")
-        self._key = value
-        self._keys = None
-        return self
-
-    def keys(self, value: list) -> Self:
-        """
-        Specifies that documents that match the keys found in the supplied
-        sequence should be returned. This causes any previous calls made to
-        this method and :meth:`~SodaOperation.key()` to be ignored.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        value_as_list = list(value)
-        for element in value_as_list:
-            if not isinstance(element, str):
-                raise TypeError("expecting sequence of strings")
-        self._keys = value_as_list
-        self._key = None
-        return self
-
-    def limit(self, value: int) -> Self:
-        """
-        Specifies that only the specified number of documents should be
-        returned. This method is only usable for read operations such as
-        :meth:`~SodaOperation.getCursor()` and
-        :meth:`~SodaOperation.getDocuments()`. For write operations, any value
-        set using this method is ignored.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if not isinstance(value, int) or value <= 0:
-            raise TypeError("expecting positive integer")
-        self._limit = value
-        return self
-
-    def remove(self) -> int:
-        """
-        Removes all of the documents in the collection that match the criteria.
-        The number of documents that have been removed is returned.
-        """
-        return self._collection._impl.remove(self)
-
-    def replaceOne(self, doc: Any) -> bool:
-        """
-        Replaces a single document in the collection with the specified
-        document. The input document can be a dictionary or list or an existing
-        SODA document object. A boolean indicating if a document was replaced
-        or not is returned.
-
-        Currently, the method :meth:`~SodaOperation.key()` must be called
-        before this method can be called.
-        """
-        doc_impl = self._collection._process_doc_arg(doc)
-        return self._collection._impl.replace_one(
-            self, doc_impl, return_doc=False
-        )
-
-    def replaceOneAndGet(self, doc: Any) -> "SodaDocument":
-        """
-        Similar to :meth:`~SodaOperation.replaceOne()`, this method replaces a
-        single document in the collection with the specified document. The only
-        difference is that it returns a SodaDocument object. Note that for
-        performance reasons the returned document does not contain the content.
-        """
-        doc_impl = self._collection._process_doc_arg(doc)
-        return_doc_impl = self._collection._impl.replace_one(
-            self, doc_impl, return_doc=True
-        )
-        return SodaDocument._from_impl(return_doc_impl)
-
-    def skip(self, value: int) -> Self:
-        """
-        Specifies the number of documents that match the other criteria that
-        will be skipped. This method is only usable for read operations such as
-        :meth:`~SodaOperation.getOne()`, :meth:`~SodaOperation.getCursor()`,
-        and :meth:`~SodaOperation.getDocuments()`. For write operations, any
-        value set using this method is ignored.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if not isinstance(value, int) or value < 0:
-            raise TypeError("expecting integer >= 0")
-        self._skip = value
-        return self
-
-    def version(self, value: str) -> Self:
-        """
-        Specifies that documents with the specified version should be returned.
-        Typically this is used with :meth:`~SodaOperation.key()` to implement
-        optimistic locking, so that the write operation called later does not
-        affect a document that someone else has modified.
-
-        As a convenience, the SodaOperation object is returned so that further
-        criteria can be specified by chaining methods together.
-        """
-        if not isinstance(value, str):
-            raise TypeError("expecting string")
-        self._version = value
-        return self
diff --git a/src/oracledb/sparse_vector.py b/src/oracledb/sparse_vector.py
deleted file mode 100644
index bb6b35a4..00000000
--- a/src/oracledb/sparse_vector.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# sparse_vector.py
-#
-# Contains the SparseVector class which stores information about a sparse
-# vector. Sparse vectors are available in Oracle Database 23.6 and higher.
-# -----------------------------------------------------------------------------
-
-import array
-from typing import Union
-
-from .base import BaseMetaClass
-from .base_impl import get_array_type_code_uint32, SparseVectorImpl
-
-ARRAY_TYPE_CODE_UINT32 = get_array_type_code_uint32()
-
-
-class SparseVector(metaclass=BaseMetaClass):
-    """
-    Provides information about sparse vectors.
-    """
-
-    def __init__(
-        self,
-        num_dimensions: int,
-        indices: Union[list, array.array],
-        values: Union[list, array.array],
-    ):
-        """
-        Creates and returns a :ref:`SparseVector object <sparsevectorsobj>`.
-
-        The ``num_dimensions`` parameter is the number of dimensions contained
-        in the vector.
-
-        The ``indices`` parameter is the indices (zero-based) of non-zero
-        values in the vector.
-
-        The ``values`` parameter is the non-zero values stored in the vector.
-        """
-        if (
-            not isinstance(indices, array.array)
-            or indices.typecode != ARRAY_TYPE_CODE_UINT32
-        ):
-            indices = array.array(ARRAY_TYPE_CODE_UINT32, indices)
-        if not isinstance(values, array.array):
-            values = array.array("d", values)
-        if len(indices) != len(values):
-            raise TypeError("indices and values must be of the same length!")
-        self._impl = SparseVectorImpl.from_values(
-            num_dimensions, indices, values
-        )
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        return (
-            f"{cls_name}({self.num_dimensions}, "
-            f"{self.indices}, {self.values})"
-        )
-
-    def __str__(self):
-        return (
-            f"[{self.num_dimensions}, {list(self.indices)}, "
-            f"{list(self.values)}]"
-        )
-
-    @classmethod
-    def _from_impl(cls, impl):
-        vector = cls.__new__(cls)
-        vector._impl = impl
-        return vector
-
-    @property
-    def indices(self) -> array.array:
-        """
-        Returns the indices (zero-based) of non-zero values in the vector.
-        """
-        return self._impl.indices
-
-    @property
-    def num_dimensions(self) -> int:
-        """
-        Returns the number of dimensions contained in the vector.
-        """
-        return self._impl.num_dimensions
-
-    @property
-    def values(self) -> array.array:
-        """
-        Returns the non-zero values stored in the vector.
-        """
-        return self._impl.values
diff --git a/src/oracledb/subscr.py b/src/oracledb/subscr.py
deleted file mode 100644
index 6e0c9d80..00000000
--- a/src/oracledb/subscr.py
+++ /dev/null
@@ -1,378 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# subscr.py
-#
-# Contains the Subscription class and Message classes used for managing
-# subscriptions to database events and the messages that are sent when those
-# events are detected.
-# -----------------------------------------------------------------------------
-
-from typing import Callable, Optional, Union
-from .base import BaseMetaClass
-from . import connection
-
-
-class Subscription(metaclass=BaseMetaClass):
-    def __repr__(self):
-        return f"<oracledb.Subscription on {self.connection!r}>"
-
-    @classmethod
-    def _from_impl(cls, impl):
-        subscr = cls.__new__(cls)
-        subscr._impl = impl
-        return subscr
-
-    @property
-    def callback(self) -> Callable:
-        """
-        This read-only attribute returns the callback that was registered when
-        the subscription was created.
-        """
-        return self._impl.callback
-
-    @property
-    def connection(self) -> "connection.Connection":
-        """
-        This read-only attribute returns the connection that was used to
-        register the subscription when it was created.
-        """
-        return self._impl.connection
-
-    @property
-    def id(self) -> int:
-        """
-        This read-only attribute returns the value of REGID found in the
-        database view USER_CHANGE_NOTIFICATION_REGS or the value of REG_ID
-        found in the database view USER_SUBSCR_REGISTRATIONS. For AQ
-        subscriptions, this value is *0*.
-        """
-        return self._impl.id
-
-    @property
-    def ip_address(self) -> str:
-        """
-        This read-only attribute returns the IP address used for callback
-        notifications from the database server. If not set during construction,
-        this value is *None*.
-        """
-        return self._impl.ip_address
-
-    @property
-    def ipAddress(self) -> str:
-        """
-        Deprecated. Use property ip_address instead.
-        """
-        return self.ip_address
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name used to register the
-        subscription when it was created.
-        """
-        return self._impl.name
-
-    @property
-    def namespace(self) -> int:
-        """
-        This read-only attribute returns the namespace used to register the
-        subscription when it was created.
-        """
-        return self._impl.namespace
-
-    @property
-    def operations(self) -> int:
-        """
-        This read-only attribute returns the operations that will send
-        notifications for each table or query that is registered using this
-        subscription.
-        """
-        return self._impl.operations
-
-    @property
-    def port(self) -> int:
-        """
-        This read-only attribute returns the port used for callback
-        notifications from the database server. If not set during
-        construction, this value is *0*.
-        """
-        return self._impl.port
-
-    @property
-    def protocol(self) -> int:
-        """
-        This read-only attribute returns the protocol used to register the
-        subscription when it was created.
-        """
-        return self._impl.protocol
-
-    @property
-    def qos(self) -> int:
-        """
-        This read-only attribute returns the quality of service flags used to
-        register the subscription when it was created.
-        """
-        return self._impl.qos
-
-    def registerquery(
-        self, statement: str, args: Optional[Union[list, dict]] = None
-    ) -> int:
-        """
-        Registers the query for subsequent notification when tables referenced
-        by the query are changed. This behaves similarly to
-        :meth:`Cursor.execute()` but only queries are permitted and the
-        ``args`` parameter, if specified, must be a sequence or dictionary. If
-        the ``qos`` parameter included the flag
-        :data:`oracledb.SUBSCR_QOS_QUERY` when the subscription was created,
-        then the ID for the registered query is returned; otherwise, *None* is
-        returned.
-        """
-        if args is not None and not isinstance(args, (list, dict)):
-            raise TypeError("expecting args to be a dictionary or list")
-        return self._impl.register_query(statement, args)
-
-    @property
-    def timeout(self) -> int:
-        """
-        This read-only attribute returns the timeout (in seconds) that was
-        specified when the subscription was created. A value of *0* indicates
-        that there is no timeout.
-        """
-        return self._impl.timeout
-
-
-class Message(metaclass=BaseMetaClass):
-    def __init__(self, subscription: Subscription) -> None:
-        self._subscription = subscription
-        self._consumer_name = None
-        self._dbname = None
-        self._queries = []
-        self._queue_name = None
-        self._registered = False
-        self._tables = []
-        self._txid = None
-        self._type = 0
-        self._msgid = None
-
-    @property
-    def consumer_name(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the consumer which
-        generated the notification. It will be populated if the
-        subscription was created with the namespace
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ` and the queue is a multiple
-        consumer queue.
-        """
-        return self._consumer_name
-
-    @property
-    def consumerName(self) -> Union[str, None]:
-        """
-        Deprecated. Use property consumer_name instead.
-        """
-        return self.consumer_name
-
-    @property
-    def dbname(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the database that
-        generated the notification.
-        """
-        return self._dbname
-
-    @property
-    def msgid(self) -> Union[bytes, None]:
-        """
-        This read-only attribute returns the message id of the AQ message that
-        generated the notification. It will only be populated if the
-        subscription was created with the namespace
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ`.
-        """
-        return self._msgid
-
-    @property
-    def queries(self) -> list["MessageQuery"]:
-        """
-        This read-only attribute returns a list of message query objects that
-        give information about query result sets changed for this notification.
-        This attribute will be an empty list if the ``qos`` parameter did not
-        include the flag :data:`~oracledb.SUBSCR_QOS_QUERY` when the
-        subscription was created.
-        """
-        return self._queries
-
-    @property
-    def queue_name(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the queue which generated
-        the notification. It will only be populated if the subscription was
-        created with the namespace :data:`oracledb.SUBSCR_NAMESPACE_AQ`.
-        """
-        return self._queue_name
-
-    @property
-    def queueName(self) -> Union[str, None]:
-        """
-        Deprecated. Use property queue_name instead.
-        """
-        return self.queue_name
-
-    @property
-    def registered(self) -> bool:
-        """
-        This read-only attribute returns whether the subscription which
-        generated this notification is still registered with the database. The
-        subscription is automatically deregistered with the database when the
-        subscription timeout value is reached or when the first notification is
-        sent (when the quality of service flag
-        :data:`oracledb.SUBSCR_QOS_DEREG_NFY` is used).
-        """
-        return self._registered
-
-    @property
-    def subscription(self) -> Subscription:
-        """
-        This read-only attribute returns the subscription object for which this
-        notification was generated.
-        """
-        return self._subscription
-
-    @property
-    def tables(self) -> list["MessageTable"]:
-        """
-        This read-only attribute returns a list of message table objects that
-        give information about the tables changed for this notification. This
-        attribute will be an empty list if the ``qos`` parameter included the
-        flag :data:`~oracledb.SUBSCR_QOS_QUERY` when the subscription was
-        created.
-        """
-        return self._tables
-
-    @property
-    def txid(self) -> Union[bytes, None]:
-        """
-        This read-only attribute returns the id of the transaction that
-        generated the notification.
-        """
-        return self._txid
-
-    @property
-    def type(self) -> int:
-        """
-        This read-only attribute returns the type of message that has been
-        sent.
-        """
-        return self._type
-
-
-class MessageQuery(metaclass=BaseMetaClass):
-    def __init__(self) -> None:
-        self._id = 0
-        self._operation = 0
-        self._tables = []
-
-    @property
-    def id(self) -> int:
-        """
-        This read-only attribute returns the query id of the query for which
-        the result set changed. The value will match the value returned by
-        :meth:`Subscription.registerquery()` when the related query was
-        registered.
-        """
-        return self._id
-
-    @property
-    def operation(self) -> int:
-        """
-        This read-only attribute returns the operation that took place on the
-        query result set that was changed. Valid values for this attribute are
-        :data:`~oracledb.EVENT_DEREG` and :data:`~oracledb.EVENT_QUERYCHANGE`.
-        """
-        return self._operation
-
-    @property
-    def tables(self) -> list["MessageTable"]:
-        """
-        This read-only attribute returns a list of message table objects that
-        give information about the table changes that caused the query result
-        set to change for this notification.
-        """
-        return self._tables
-
-
-class MessageRow(metaclass=BaseMetaClass):
-    def __init__(self) -> None:
-        self._operation = 0
-        self._rowid = None
-
-    @property
-    def operation(self) -> int:
-        """
-        This read-only attribute returns the operation that took place on the
-        row that was changed.
-        """
-        return self._operation
-
-    @property
-    def rowid(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the rowid of the row that was changed.
-        """
-        return self._rowid
-
-
-class MessageTable(metaclass=BaseMetaClass):
-    def __init__(self) -> None:
-        self._name = None
-        self._operation = 0
-        self._rows = []
-
-    @property
-    def name(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the table that was
-        changed.
-        """
-        return self._name
-
-    @property
-    def operation(self) -> int:
-        """
-        This read-only attribute returns the operation that took place on the
-        table that was changed.
-        """
-        return self._operation
-
-    @property
-    def rows(self) -> list["MessageRow"]:
-        """
-        This read-only attribute returns a list of message row objects that
-        give information about the rows changed on the table. This value is
-        only filled in if the ``qos`` parameter to the
-        :meth:`Connection.subscribe()` method included the flag
-        :data:`~oracledb.SUBSCR_QOS_ROWIDS`.
-        """
-        return self._rows
diff --git a/src/oracledb/thick_impl.pyx b/src/oracledb/thick_impl.pyx
deleted file mode 100644
index 54b9e168..00000000
--- a/src/oracledb/thick_impl.pyx
+++ /dev/null
@@ -1,128 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# thick_impl.pyx
-#
-# Cython file for interfacing with ODPI-C.
-#------------------------------------------------------------------------------
-
-# cython: language_level=3
-
-cimport cython
-cimport cpython
-cimport cpython.datetime as cydatetime
-from cpython cimport array
-
-import array
-import datetime
-import decimal
-import locale
-import sys
-
-cydatetime.import_datetime()
-
-from .base_impl cimport (
-    ARRAY_TYPE_CODE_UINT32,
-    BaseConnImpl,
-    BaseCursorImpl,
-    BaseDbObjectImpl,
-    BaseDbObjectAttrImpl,
-    BaseDbObjectTypeImpl,
-    BaseDeqOptionsImpl,
-    BaseEnqOptionsImpl,
-    BaseLobImpl,
-    BaseMsgPropsImpl,
-    BasePoolImpl,
-    BaseQueueImpl,
-    BaseSodaCollImpl,
-    BaseSodaDbImpl,
-    BaseSodaDocImpl,
-    BaseSodaDocCursorImpl,
-    BaseSubscrImpl,
-    BaseVarImpl,
-    BindVar,
-    C_DEFAULTS,
-    char_type,
-    ConnectParamsImpl,
-    convert_arrow_to_oracle_data,
-    convert_oracle_data_to_arrow,
-    convert_vector_to_arrow,
-    DbType,
-    DB_TYPE_NUM_CURSOR,
-    DRIVER_NAME,
-    DRIVER_VERSION,
-    DRIVER_INSTALLATION_URL,
-    ENCODING_UTF8,
-    OracleData,
-    OracleMetadata,
-    OracleNumber,
-    PURITY_DEFAULT,
-    PY_TYPE_DATE,
-    PY_TYPE_DATETIME,
-    PY_TYPE_DB_OBJECT,
-    PY_TYPE_DECIMAL,
-    PY_TYPE_JSON_ID,
-    PY_TYPE_INTERVAL_YM,
-    PY_TYPE_LOB,
-    PY_TYPE_MESSAGE,
-    PY_TYPE_MESSAGE_QUERY,
-    PY_TYPE_MESSAGE_ROW,
-    PY_TYPE_MESSAGE_TABLE,
-    PY_TYPE_SPARSE_VECTOR,
-    PY_TYPE_TIMEDELTA,
-    PoolParamsImpl,
-    PY_TYPE_NUM_FLOAT,
-    PY_TYPE_NUM_INT,
-    PY_TYPE_NUM_DECIMAL,
-    SparseVectorImpl,
-    VectorDecoder,
-    VectorEncoder,
-)
-from libc.string cimport memchr, memcpy, memset
-
-include "impl/thick/odpi.pxd"
-
-cdef struct DriverInfo:
-    dpiContext *context
-    dpiVersionInfo client_version_info
-    bint soda_use_json_desc
-
-cdef DriverInfo driver_info = \
-        DriverInfo(NULL, dpiVersionInfo(0, 0, 0, 0, 0, 0), True)
-
-driver_context_params = None
-
-include "impl/thick/buffer.pyx"
-include "impl/thick/connection.pyx"
-include "impl/thick/pool.pyx"
-include "impl/thick/cursor.pyx"
-include "impl/thick/lob.pyx"
-include "impl/thick/json.pyx"
-include "impl/thick/var.pyx"
-include "impl/thick/dbobject.pyx"
-include "impl/thick/soda.pyx"
-include "impl/thick/queue.pyx"
-include "impl/thick/subscr.pyx"
-include "impl/thick/utils.pyx"
diff --git a/src/oracledb/thin_impl.pyx b/src/oracledb/thin_impl.pyx
deleted file mode 100644
index 3fbcca48..00000000
--- a/src/oracledb/thin_impl.pyx
+++ /dev/null
@@ -1,249 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# thin_impl.pyx
-#
-# Cython file for communicating with the server directly without the use of
-# any Oracle Client library.
-#------------------------------------------------------------------------------
-
-# cython: language_level=3
-
-cimport cython
-cimport cpython
-cimport cpython.datetime as cydatetime
-cimport cpython.ref
-
-from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
-from libc.string cimport memcpy, memset
-from cpython cimport array
-
-import array
-import asyncio
-import base64
-import collections
-import datetime
-import decimal
-import getpass
-import hashlib
-import inspect
-import json
-import os
-import socket
-import re
-import secrets
-import select
-import ssl
-import subprocess
-import sys
-import threading
-import time
-import uuid
-
-try:
-    import certifi
-except ImportError:
-    certifi = None
-macos_certs = None
-
-cydatetime.import_datetime()
-
-from .base_impl cimport (
-    Address,
-    AddressList,
-    AUTH_MODE_DEFAULT,
-    AUTH_MODE_PRELIM,
-    AUTH_MODE_SYSASM,
-    AUTH_MODE_SYSBKP,
-    AUTH_MODE_SYSDBA,
-    AUTH_MODE_SYSDGD,
-    AUTH_MODE_SYSKMT,
-    AUTH_MODE_SYSOPER,
-    AUTH_MODE_SYSRAC,
-    BaseConnImpl,
-    BaseCursorImpl,
-    BaseDbObjectAttrImpl,
-    BaseDbObjectImpl,
-    BaseDbObjectTypeImpl,
-    BaseDeqOptionsImpl,
-    BaseEnqOptionsImpl,
-    BaseMsgPropsImpl,
-    BaseQueueImpl,
-    BaseLobImpl,
-    BaseParser,
-    BasePoolImpl,
-    BaseVarImpl,
-    BatchLoadManager,
-    PipelineOpImpl,
-    PipelineOpResultImpl,
-    PIPELINE_OP_TYPE_CALL_FUNC,
-    PIPELINE_OP_TYPE_CALL_PROC,
-    PIPELINE_OP_TYPE_COMMIT,
-    PIPELINE_OP_TYPE_EXECUTE,
-    PIPELINE_OP_TYPE_EXECUTE_MANY,
-    PIPELINE_OP_TYPE_FETCH_ALL,
-    PIPELINE_OP_TYPE_FETCH_MANY,
-    PIPELINE_OP_TYPE_FETCH_ONE,
-    BindVar,
-    Buffer,
-    ConnectParamsImpl,
-    convert_arrow_to_oracle_data,
-    convert_oracle_data_to_python,
-    convert_oracle_data_to_arrow,
-    convert_python_to_oracle_data,
-    convert_vector_to_arrow,
-    convert_date_to_python,
-    CS_FORM_IMPLICIT,
-    CS_FORM_NCHAR,
-    DbType,
-    Description,
-    DescriptionList,
-    DRIVER_NAME,
-    DRIVER_VERSION,
-    ENCODING_UTF8,
-    ENCODING_UTF16,
-    GrowableBuffer,
-    PY_TYPE_NUM_FLOAT,
-    PY_TYPE_NUM_INT,
-    PY_TYPE_NUM_DECIMAL,
-    PY_TYPE_NUM_STR,
-    ORA_TYPE_NUM_BFILE,
-    ORA_TYPE_NUM_BINARY_DOUBLE,
-    ORA_TYPE_NUM_BINARY_FLOAT,
-    ORA_TYPE_NUM_BINARY_INTEGER,
-    ORA_TYPE_NUM_BLOB,
-    ORA_TYPE_NUM_BOOLEAN,
-    ORA_TYPE_NUM_CHAR,
-    ORA_TYPE_NUM_CLOB,
-    ORA_TYPE_NUM_CURSOR,
-    ORA_TYPE_NUM_DATE,
-    ORA_TYPE_NUM_INTERVAL_DS,
-    ORA_TYPE_NUM_INTERVAL_YM,
-    ORA_TYPE_NUM_JSON,
-    ORA_TYPE_NUM_LONG,
-    ORA_TYPE_NUM_LONG_RAW,
-    ORA_TYPE_NUM_NUMBER,
-    ORA_TYPE_NUM_OBJECT,
-    ORA_TYPE_NUM_RAW,
-    ORA_TYPE_NUM_ROWID,
-    ORA_TYPE_NUM_TIMESTAMP,
-    ORA_TYPE_NUM_TIMESTAMP_LTZ,
-    ORA_TYPE_NUM_TIMESTAMP_TZ,
-    ORA_TYPE_NUM_UROWID,
-    ORA_TYPE_NUM_VARCHAR,
-    ORA_TYPE_NUM_VECTOR,
-    OracleMetadata,
-    OracleData,
-    OsonDecoder,
-    OsonEncoder,
-    POOL_GETMODE_FORCEGET,
-    POOL_GETMODE_NOWAIT,
-    POOL_GETMODE_TIMEDWAIT,
-    POOL_GETMODE_WAIT,
-    PoolParamsImpl,
-    PURITY_DEFAULT,
-    PURITY_NEW,
-    PURITY_SELF,
-    PY_TYPE_ASYNC_LOB,
-    PY_TYPE_DATE,
-    PY_TYPE_DATETIME,
-    PY_TYPE_DB_OBJECT,
-    PY_TYPE_DECIMAL,
-    PY_TYPE_INTERVAL_YM,
-    PY_TYPE_LOB,
-    PY_TYPE_TIMEDELTA,
-    TNS_LONG_LENGTH_INDICATOR,
-    TNS_NULL_LENGTH_INDICATOR,
-    TPC_TXN_FLAGS_NEW,
-    TPC_TXN_FLAGS_RESUME,
-    TPC_TXN_FLAGS_SESSIONLESS,
-    decode_uint16be,
-    decode_uint32be,
-    decode_date,
-    VectorDecoder,
-    VectorEncoder,
-    encode_uint16be,
-)
-
-from .base_impl import (
-    DB_TYPE_BLOB,
-    DB_TYPE_CLOB,
-    DB_TYPE_NCLOB,
-    DB_TYPE_BINARY_INTEGER,
-    DB_TYPE_CURSOR,
-    DB_TYPE_NUMBER,
-    DB_TYPE_OBJECT,
-    DB_TYPE_XMLTYPE,
-)
-
-from .arrow_impl cimport ArrowArrayImpl, ArrowSchemaImpl, DataFrameImpl
-
-ctypedef unsigned char char_type
-
-# flag whether the cryptography package exists
-cdef object CRYPTOGRAPHY_IMPORT_ERROR = None
-
-include "impl/thin/constants.pxi"
-include "impl/thin/utils.pyx"
-include "impl/thin/crypto.pyx"
-include "impl/thin/capabilities.pyx"
-include "impl/thin/transport.pyx"
-include "impl/thin/packet.pyx"
-include "impl/thin/messages/base.pyx"
-include "impl/thin/messages/aq_base.pyx"
-include "impl/thin/messages/aq_array.pyx"
-include "impl/thin/messages/aq_deq.pyx"
-include "impl/thin/messages/aq_enq.pyx"
-include "impl/thin/messages/auth.pyx"
-include "impl/thin/messages/commit.pyx"
-include "impl/thin/messages/connect.pyx"
-include "impl/thin/messages/data_types.pyx"
-include "impl/thin/messages/direct_path_prepare.pyx"
-include "impl/thin/messages/direct_path_load_stream.pyx"
-include "impl/thin/messages/direct_path_op.pyx"
-include "impl/thin/messages/end_pipeline.pyx"
-include "impl/thin/messages/execute.pyx"
-include "impl/thin/messages/fetch.pyx"
-include "impl/thin/messages/lob_op.pyx"
-include "impl/thin/messages/logoff.pyx"
-include "impl/thin/messages/ping.pyx"
-include "impl/thin/messages/protocol.pyx"
-include "impl/thin/messages/fast_auth.pyx"
-include "impl/thin/messages/rollback.pyx"
-include "impl/thin/messages/session_release.pyx"
-include "impl/thin/messages/tpc_change_state.pyx"
-include "impl/thin/messages/tpc_switch.pyx"
-include "impl/thin/protocol.pyx"
-include "impl/thin/queue.pyx"
-include "impl/thin/connection.pyx"
-include "impl/thin/statement.pyx"
-include "impl/thin/statement_cache.pyx"
-include "impl/thin/cursor.pyx"
-include "impl/thin/var.pyx"
-include "impl/thin/dbobject.pyx"
-include "impl/thin/dbobject_cache.pyx"
-include "impl/thin/lob.pyx"
-include "impl/thin/pool.pyx"
diff --git a/src/oracledb/utils.py b/src/oracledb/utils.py
deleted file mode 100644
index 77048b79..00000000
--- a/src/oracledb/utils.py
+++ /dev/null
@@ -1,392 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# utils.py
-#
-# Contains utility classes and methods.
-# -----------------------------------------------------------------------------
-
-import functools
-from typing import Any, Callable, Optional, Union
-import uuid
-
-from .arrow_array import ArrowArray
-from .dataframe import DataFrame
-
-from . import base_impl
-from . import driver_mode
-from . import errors
-from . import thick_impl
-
-
-def clientversion() -> tuple:
-    """
-    This function can only be called when python-oracledb is in Thick mode.
-    Using it in Thin mode will throw an exception.
-    """
-    return thick_impl.clientversion()
-
-
-def enable_thin_mode():
-    """
-    Makes python-oracledb be in Thin mode. After this method is called, Thick
-    mode cannot be enabled. If python-oracledb is already in Thick mode, then
-    calling ``enable_thin_mode()`` will fail. If Thin mode connections have
-    already been opened, or a connection pool created in Thin mode, then
-    calling ``enable_thin_mode()`` is a no-op.
-
-    Since python-oracledb defaults to Thin mode, almost all applications do not
-    need to call this method. However, because it bypasses python-oracledb's
-    internal mode-determination heuristic, it may be useful for applications
-    with multiple threads that concurrently create :ref:`standalone connections
-    <standaloneconnection>` when the application starts.
-    """
-    with driver_mode.get_manager(requested_thin_mode=True):
-        pass
-
-
-def from_arrow(obj: Any) -> Union[DataFrame, ArrowArray]:
-    """
-    This method converts a data frame to a
-    :ref:`DataFrame <oracledataframeobj>` or
-    :ref:`ArrowArray <oraclearrowarrayobj>` instance.
-
-    If ``obj`` supports the Arrow PyCapsule interface ``__arrow_c_stream__``
-    method, then ``from_arrow()`` returns the instance as a :ref:`DataFrame
-    <oracledataframeobj>`. If ``obj`` does not support that method, but does
-    support ``__arrow_c_array__``, then an :ref:`ArrowArray
-    <oraclearrowarrayobj>` is returned.
-    """
-    if hasattr(obj, "__arrow_c_stream__"):
-        return DataFrame._from_arrow(obj)
-    elif hasattr(obj, "__arrow_c_array__"):
-        return ArrowArray._from_arrow(obj)
-    msg = "object must implement the PyCapsule stream or array interfaces"
-    raise ValueError(msg)
-
-
-def init_oracle_client(
-    lib_dir: Optional[Union[str, bytes]] = None,
-    config_dir: Optional[Union[str, bytes]] = None,
-    error_url: Optional[str] = None,
-    driver_name: Optional[str] = None,
-):
-    """
-    Enables python-oracledb Thick mode by initializing the Oracle Client
-    library, see :ref:`enablingthick`. If a standalone connection or pool has
-    already been created in Thin mode, ``init_oracle_client()`` will raise an
-    exception and python-oracledb will remain in Thin mode.
-
-    If a standalone connection or pool has *not* already been created in Thin
-    mode, but ``init_oracle_client()`` raises an exception, python-oracledb
-    will remain in Thin mode but further calls to ``init_oracle_client()`` can
-    be made, if desired.
-
-    The ``init_oracle_client()`` method can be called multiple times in each
-    Python process as long as the arguments are the same each time.
-
-    The ``lib_dir`` parameter is a string or a bytes object that specifies the
-    directory containing Oracle Client libraries.  If the ``lib_dir`` parameter
-    is set, then the specified directory is the only one searched for the
-    Oracle Client libraries; otherwise, the operating system library search
-    path is used to locate the Oracle Client library.  If you are using Python
-    3.11 and later, then the value specified in this parameter is encoded
-    using `locale.getencoding() <https://docs.python.org/3/library/locale.html
-    #locale.getencoding>`__.  For all other Python versions, the encoding
-    "utf-8" is used.  If a bytes object is specified in this parameter, then
-    this value will be used as is without any encoding.
-
-    The ``config_dir`` parameter is a string or a bytes object that specifies
-    the directory in which the
-    :ref:`Optional Oracle Net Configuration <optnetfiles>` and
-    :ref:`Optional Oracle Client Configuration <optclientfiles>` files reside.
-    If the ``config_dir`` parameter is set, then the specified directory is
-    used to find Oracle Client library configuration files.  This is
-    equivalent to setting the environment variable ``TNS_ADMIN`` and overrides
-    any value already set in ``TNS_ADMIN``.  If this parameter is not set, the
-    :ref:`Oracle standard <usingconfigfiles>` way of locating Oracle Client
-    library configuration files is used.  If you are using Python 3.11 and
-    later, then the value specified in this parameter is encoded using
-    `locale.getencoding() <https://docs.python.org/3/library/locale.html#
-    locale.getencoding>`__.  For all other Python versions, the encoding
-    "utf-8" is used.  If a bytes object is specified in this parameter, then
-    this value will be used as is without any encoding.
-
-    The ``error_url`` parameter is a string that specifies the URL which is
-    included in the python-oracledb exception message if the Oracle Client
-    libraries cannot be loaded.  If the ``error_url`` parameter is set, then
-    the specified value is included in the message of the exception raised
-    when the Oracle Client library cannot be loaded; otherwise, the
-    :ref:`installation` URL is included.  This parameter lets your application
-    display custom installation instructions.
-
-    The ``driver_name`` parameter is a string that specifies the driver name
-    value. If the ``driver_name`` parameter is set, then the specified value
-    can be found in database views that give information about connections.
-    For example, it is in the CLIENT_DRIVER column of the
-    V$SESSION_CONNECT_INFO view. From Oracle Database 12.2, the name displayed
-    can be 30 characters.  The standard is to set this value to ``"<name> :
-    version>"``, where <name> is the name of the driver and <version> is its
-    version. There should be a single space character before and after the
-    colon. If this parameter is not set, then the value specified in
-    :attr:`oracledb.defaults.driver_name <defaults.driver_name>` is used. If
-    the value of this attribute is *None*, then the default value in
-    python-oracledb Thick mode is like "python-oracledb thk : <version>". See
-    :ref:`otherinit`.
-
-    At successful completion of a call to ``oracledb.init_oracle_client()``,
-    the attribute :attr:`oracledb.defaults.config_dir <Defaults.config_dir>`
-    will be set as determined below (first one wins):
-
-    - the value of the ``oracledb.init_oracle_client()`` parameter
-      ``config_dir``, if one was passed.
-
-    - the value of :attr:`oracledb.defaults.config_dir <Defaults.config_dir>`
-      if it has one. i.e.
-      :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` remains
-      unchanged after ``oracledb.init_oracle_client()`` completes.
-
-    - the value of the environment variable ``$TNS_ADMIN``, if it is set.
-
-    - the value of ``$ORACLE_HOME/network/admin`` if the environment variable
-      ``$ORACLE_HOME`` is set.
-
-    - the directory of the loaded Oracle Client library, appended with
-      ``network/admin``. Note this directory is not determinable on AIX.
-
-    - otherwise the value *None* is used. (Leaving
-      :attr:`oracledb.defaults.config_dir <Defaults.config_dir>` unchanged).
-    """
-    thick_impl.init_oracle_client(lib_dir, config_dir, error_url, driver_name)
-
-
-def normalize_sessionless_transaction_id(
-    value: Optional[Union[bytes, str]] = None,
-) -> bytes:
-    """
-    Normalize and validate the transaction_id.
-
-    - If `value` is a string, it's UTF-8 encoded.
-    - If `value` is None, a UUID4-based transaction_id is generated.
-    - If `value` is not str/bytes/None, raises TypeError.
-    - If transaction_id exceeds 64 bytes, raises ValueError.
-
-    Returns:
-        bytes: Normalized transaction_id
-    """
-    if value is None:
-        value = uuid.uuid4().bytes
-    elif isinstance(value, str):
-        value = value.encode("utf-8")
-    elif not isinstance(value, bytes):
-        raise TypeError("invalid transaction_id: must be str, bytes, or None")
-
-    if len(value) > 64:
-        raise ValueError(
-            f"transaction_id size exceeds 64 bytes (got {len(value)})"
-        )
-
-    return value
-
-
-def params_initer(f):
-    """
-    Decorator function which is used on the ConnectParams and PoolParams
-    classes. It creates the implementation object using the implementation
-    class stored on the parameter class. It first, however, calls the original
-    method to ensure that the keyword parameters supplied are valid (the
-    original method itself does nothing).
-    """
-
-    @functools.wraps(f)
-    def wrapped_f(self, *args, **kwargs):
-        f(self, *args, **kwargs)
-        self._impl = self._impl_class()
-        if kwargs:
-            self._impl.set(kwargs)
-
-    return wrapped_f
-
-
-def params_setter(f):
-    """
-    Decorator function which is used on the ConnectParams and PoolParams
-    classes. It calls the set() method on the parameter implementation object
-    with the supplied keyword arguments. It first, however, calls the original
-    method to ensure that the keyword parameters supplied are valid (the
-    original method itself does nothing).
-    """
-
-    @functools.wraps(f)
-    def wrapped_f(self, *args, **kwargs):
-        f(self, *args, **kwargs)
-        self._impl.set(kwargs)
-
-    return wrapped_f
-
-
-def register_params_hook(hook_function: Callable) -> None:
-    """
-    Registers a user parameter hook function that will be called internally by
-    python-oracledb prior to connection or pool creation. The hook function
-    accepts a copy of the parameters that will be used to create the pool or
-    standalone connection and may modify them. For example, the cloud native
-    authentication plugins modify the "access_token" parameter with a function
-    that will acquire the token using information found in the
-    "extra_auth_parms" parameter.
-
-    Multiple hooks may be registered. They will be invoked in order of
-    registration.
-    """
-    if hook_function is None or not callable(hook_function):
-        raise TypeError("hook_function must be a callable and cannot be None")
-    base_impl.REGISTERED_PARAMS_HOOKS.append(hook_function)
-
-
-def register_password_type(
-    password_type: str, hook_function: Callable
-) -> None:
-    """
-    Registers a user password hook function that will be called internally by
-    python-oracledb when a password is supplied as a dictionary containing the
-    given ``password_type`` as the key "type". The hook function is called for
-    passwords specified as the ``password``, ``newpassword`` and
-    ``wallet_parameter`` parameters in calls to :meth:`oracledb.connect()`,
-    :meth:`oracledb.create_pool()`, :meth:`oracledb.connect_async()`, and
-    :meth:`oracledb.create_pool_async()`.
-
-    Your hook function is expected to accept the dictionary supplied by the
-    application and return the valid password.
-
-    Calling :meth:`~oracledb.register_password_type()` with the
-    ``hook_function`` parameter set to *None* will result in a previously
-    registered user function being removed and the default behavior restored.
-    """
-    if not isinstance(password_type, str):
-        raise TypeError("password_type must be a string")
-    if hook_function is not None and not callable(hook_function):
-        raise TypeError("hook_function must be a callable")
-    password_type = password_type.lower()
-    if hook_function is None:
-        base_impl.REGISTERED_PASSWORD_TYPES.pop(password_type)
-    else:
-        base_impl.REGISTERED_PASSWORD_TYPES[password_type] = hook_function
-
-
-def register_protocol(protocol: str, hook_function: Callable) -> None:
-    """
-    Registers a user protocol hook function that will be called internally by
-    python-oracledb Thin mode prior to connection or pool creation.  The hook
-    function will be invoked when :func:`oracledb.connect`,
-    :func:`oracledb.create_pool`, :meth:`oracledb.connect_async()`, or
-    :meth:`oracledb.create_pool_async()` are called with a ``dsn`` parameter
-    value prefixed with the specified protocol. The user function will also be
-    invoked when :meth:`ConnectParams.parse_connect_string()` is called in Thin
-    or Thick modes with a similar ``connect_string`` parameter value.
-
-    Your hook function is expected to construct valid connection details. For
-    example, if a hook function is registered for the "ldaps" protocol, then
-    calling :func:`oracledb.connect` with a connection string prefixed with
-    "ldaps://" will invoke the function.  The function can then perform LDAP
-    lookup to retrieve and set the actual database information that will be
-    used internally by python-oracledb to complete the connection creation.
-
-    The ``protocol`` parameter is a string that will be matched against the
-    prefix appearing before "://" in connection strings.
-
-    The ``hook_function`` parameter should be a function with the signature::
-
-        hook_function(protocol, protocol_arg, params)
-
-    The hook function will be called with the following arguments:
-
-    - The ``protocol`` parameter is the value that was registered.
-
-    - The ``protocol_arg`` parameter is the section after "://" in the
-      connection string used in the connection or pool creation call, or passed
-      to :meth:`~ConnectParams.parse_connect_string()`.
-
-    - The ``params`` parameter is an instance of :ref:`ConnectParams
-      <connparam>`.
-
-      When your hook function is invoked internally prior to connection or pool
-      creation, ``params`` will be the ConnectParams instance originally passed
-      to the :func:`oracledb.connect`, :func:`oracledb.create_pool`,
-      :meth:`oracledb.connect_async()`, or :meth:`oracledb.create_pool_async()`
-      call, if such an instance was passed.  Otherwise it will be a new
-      ConnectParams instance.  The hook function should parse ``protocol`` and
-      ``protocol_arg`` and take any desired action to update ``params``
-      :ref:`attributes <connparamsattr>` with appropriate connection
-      parameters. Attributes can be set using :meth:`ConnectParams.set()` or
-      :meth:`ConnectParams.parse_connect_string()`. The ConnectParams instance
-      will then be used to complete the connection or pool creation.
-
-      When your hook function is invoked by
-      :meth:`ConnectParams.parse_connect_string()`, then ``params`` will be the
-      invoking ConnectParams instance that you can update using
-      :meth:`ConnectParams.set()` or
-      :meth:`ConnectParams.parse_connect_string()`.
-
-    Internal hook functions for the "tcp" and "tcps" protocols are
-    pre-registered but can be overridden if needed. If any other protocol has
-    not been registered, then connecting will result in the error ``DPY-4021:
-    invalid protocol``.
-
-    Calling :meth:`~oracledb.register_protocol()` with the ``hook_function``
-    parameter set to *None* will result in a previously registered user
-    function being removed and the default behavior restored.
-    """
-    if not isinstance(protocol, str):
-        raise TypeError("protocol must be a string")
-    if hook_function is not None and not callable(hook_function):
-        raise TypeError("hook_function must be a callable")
-    protocol = protocol.lower()
-    if hook_function is None:
-        base_impl.REGISTERED_PROTOCOLS.pop(protocol)
-    else:
-        base_impl.REGISTERED_PROTOCOLS[protocol] = hook_function
-
-
-def unregister_params_hook(hook_function: Callable) -> None:
-    """
-    Unregisters a user parameter function that was earlier registered with a
-    call to :meth:`oracledb.register_params_hook()`.
-    """
-    base_impl.REGISTERED_PARAMS_HOOKS.remove(hook_function)
-
-
-def verify_stored_proc_args(
-    parameters: Union[list, tuple], keyword_parameters: dict
-) -> None:
-    """
-    Verifies that the arguments to a call to a stored procedure or function
-    are acceptable.
-    """
-    if parameters is not None and not isinstance(parameters, (list, tuple)):
-        errors._raise_err(errors.ERR_ARGS_MUST_BE_LIST_OR_TUPLE)
-    if keyword_parameters is not None and not isinstance(
-        keyword_parameters, dict
-    ):
-        errors._raise_err(errors.ERR_KEYWORD_ARGS_MUST_BE_DICT)
diff --git a/src/oracledb/var.py b/src/oracledb/var.py
deleted file mode 100644
index 85e6836a..00000000
--- a/src/oracledb/var.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# var.py
-#
-# Contains the Var class used for managing variables used during bind and
-# fetch. These hold the metadata as well as any necessary buffers.
-# -----------------------------------------------------------------------------
-
-from typing import Any, Callable, Optional, Union
-from .dbobject import DbObjectType
-from .base import BaseMetaClass
-from .base_impl import DbType
-
-
-class Var(metaclass=BaseMetaClass):
-    def __repr__(self):
-        value = self._impl.get_all_values()
-        if not self._impl.is_array and len(value) == 1:
-            value = value[0]
-        typ = self._type
-        return f"<oracledb.Var of type {typ.name} with value {repr(value)}>"
-
-    @classmethod
-    def _from_impl(cls, impl, typ=None):
-        var = cls.__new__(cls)
-        var._impl = impl
-        if typ is not None:
-            var._type = typ
-        elif impl.metadata.objtype is not None:
-            var._type = DbObjectType._from_impl(impl.metadata.objtype)
-        else:
-            var._type = impl.metadata.dbtype
-        return var
-
-    @property
-    def actual_elements(self) -> int:
-        """
-        This read-only attribute returns the actual number of elements in the
-        variable. This corresponds to the number of elements in a PL/SQL
-        index-by table for variables that are created using the method
-        :meth:`Cursor.arrayvar()`. For all other variables, this value will be
-        identical to the attribute num_elements.
-        """
-        if self._impl.is_array:
-            return self._impl.num_elements_in_array
-        return self._impl.num_elements
-
-    @property
-    def actualElements(self) -> int:
-        """
-        Deprecated. Use property actual_elements instead.
-        """
-        return self.actual_elements
-
-    @property
-    def buffer_size(self) -> int:
-        """
-        This read-only attribute returns the size of the buffer allocated for
-        each element in bytes.
-        """
-        return self._impl.metadata.buffer_size
-
-    @property
-    def bufferSize(self) -> int:
-        """
-        Deprecated. Use property buffer_size intead().
-        """
-        return self.buffer_size
-
-    @property
-    def convert_nulls(self) -> bool:
-        """
-        This read-only attribute returns whether null values are converted
-        using the supplied ``outconverter``.
-        """
-        return self._impl.convert_nulls
-
-    def getvalue(self, pos: int = 0) -> Any:
-        """
-        Returns the value at the given position in the variable. For variables
-        created using the method :meth:`Cursor.arrayvar()`, the value returned
-        will be a list of each of the values in the PL/SQL index-by table. For
-        variables bound to DML returning statements, the value returned will
-        also be a list corresponding to the returned data for the given
-        execution of the statement (as identified by the ``pos`` parameter).
-        """
-        return self._impl.get_value(pos)
-
-    @property
-    def inconverter(self) -> Optional[Callable]:
-        """
-        This read-only attribute specifies the method used to convert data from
-        Python to the Oracle database. The method signature is converter(value)
-        and the expected return value is the value to bind to the database. If
-        this attribute is *None*, the value is bound directly without any
-        conversion.
-        """
-        return self._impl.inconverter
-
-    @property
-    def num_elements(self) -> int:
-        """
-        This read-only attribute returns the number of elements allocated in an
-        array, or the number of scalar items that can be fetched into the
-        variable or bound to the variable.
-        """
-        return self._impl.num_elements
-
-    @property
-    def numElements(self) -> int:
-        """
-        Deprecated. Use property num_elements instead.
-        """
-        return self.num_elements
-
-    @property
-    def outconverter(self) -> Optional[Callable]:
-        """
-        This read-only attribute specifies the method used to convert data from
-        the Oracle database to Python. The method signature is converter(value)
-        and the expected return value is the value to return to Python. If this
-        attribute is *None*, the value is returned directly without any
-        conversion.
-        """
-        return self._impl.outconverter
-
-    def setvalue(self, pos: int, value: Any) -> None:
-        """
-        Sets the value at the given position in the variable.
-        """
-        self._impl.set_value(pos, value)
-
-    @property
-    def size(self) -> int:
-        """
-        This read-only attribute returns the size of the variable. For strings
-        this value is the size in characters. For all others, this is the same
-        value as the attribute buffer_size.
-        """
-        return self._impl.metadata.max_size
-
-    @property
-    def type(self) -> Union[DbType, DbObjectType]:
-        """
-        This read-only attribute returns the type of the variable. This will be
-        an :ref:`Oracle Object Type <dbobjecttype>` if the variable binds
-        Oracle objects; otherwise, it will be one of the
-        :ref:`database type constants <dbtypes>`.
-
-        Database type constants are now used when the variable is not used for
-        binding Oracle objects.
-        """
-        return self._type
-
-    @property
-    def values(self) -> list:
-        """
-        This read-only attribute returns a copy of the value of all actual
-        positions in the variable as a list. This is the equivalent of calling
-        getvalue() for each valid position and the length will correspond to
-        the value of the actual_elements attribute.
-        """
-        return self._impl.get_all_values()
diff --git a/src/oracledb/version.py b/src/oracledb/version.py
deleted file mode 100644
index 7f7a5f7f..00000000
--- a/src/oracledb/version.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# version.py
-#
-# Defines the version of the package. This is the only place where this is
-# found. The setup.cfg configuration file and the documentation configuration
-# file doc/src/conf.py both reference this file directly.
-# -----------------------------------------------------------------------------
-
-__version__ = "3.5.0b1"
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index b3a1d831..00000000
--- a/tests/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-This directory contains the test suite for python-oracledb.
-
-1.  Install pytest and tox:
-
-        python -m pip install pytest tox --upgrade
-
-2.  Set the required database credential and related environment variables
-    documented in [conftest.py][2].
-
-3.  The schemas and SQL objects that are referenced in the test suite can be
-    created by running the Python script [create_schema.py][1]. The script
-    requires administrative privileges to complete successfully:
-
-        python -m pytest tests/create_schema.py
-
-4.  Run the test suite by issuing the following command in the top-level
-    directory of your oracledb installation:
-
-        python -m tox
-
-    This will build the module in an independent environment and run the test
-    suite using the module that was just built in that environment.
-    Alternatively, you can use the currently installed build of oracledb and
-    run the following command instead:
-
-        python -m pytest
-
-    You may also run each of the test scripts independently, as in:
-
-        python -m pytest tests/test_1000_module.py
-
-    The tests run in thin mode by default. If you wish to run the tests in
-    thick mode, use the following command:
-
-        python -m pytest --use-thick-mode
-
-5.  After running the test suite, the schemas can be dropped by running the
-    Python script [drop_schema.py][3]. The script requires administrative
-    privileges to complete successfully. A set of environment variables should
-    be set as documented in the Python script [conftest.py][2]. Run the
-    script using the following command:
-
-        python -m pytest tests/drop_schema.py
-
-6.  Enable tests that require extra configuration
-
-    The following test(s) are automatically skipped if their required
-    environment variable(s) and setup is not available.
-
-    5.1  test_5000_externalauth.py
-
-         This test aims to test the usage of external authentication.
-
-         - Set the PYO_TEST_EXTERNAL_USER environment variable to the externally
-           identified user that will be connected using external authentication.
-
-         - Set up external authentication. See
-           [Connecting Using External Authentication][4] for creating an
-           Oracle Wallet or enabling OS authentication.
-
-         - Run the following SQL commands as a user with administrative
-           privileges (such as SYSTEM or ADMIN) to allow the external user to
-           connect to the database and behave as proxy for testing external
-           authentication with proxy:
-
-               grant create session to <External User>;
-
-               alter user <Schema Owner> grant connect through <External User>;
-
-
-
-[1]: https://github.com/oracle/python-oracledb/blob/main/tests/create_schema.py
-[2]: https://github.com/oracle/python-oracledb/blob/main/tests/conftest.py
-[3]: https://github.com/oracle/python-oracledb/blob/main/tests/drop_schema.py
-[4]: https://python-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#connecting-using-external-authentication
diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index b5e784ca..00000000
--- a/tests/conftest.py
+++ /dev/null
@@ -1,1051 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Sets the environment used by the python-oracledb test suite. Production
-# applications should consider using External Authentication to avoid hard
-# coded credentials.
-#
-# You can set values in environment variables to bypass having the test suite
-# request the information it requires.
-#
-#   PYO_TEST_MAIN_USER: user used for most test cases
-#   PYO_TEST_MAIN_PASSWORD: password of user used for most test cases
-#   PYO_TEST_PROXY_USER: user for testing proxying
-#   PYO_TEST_PROXY_PASSWORD: password of user for testing proxying
-#   PYO_TEST_CONNECT_STRING: connect string for test suite
-#   PYO_TEST_ADMIN_USER: administrative user for test suite
-#   PYO_TEST_ADMIN_PASSWORD: administrative password for test suite
-#   PYO_TEST_WALLET_LOCATION: location of wallet file (thin mode, mTLS)
-#   PYO_TEST_WALLET_PASSWORD: password for wallet file (thin mode, mTLS)
-#   PYO_TEST_EXTERNAL_USER: user for testing external authentication
-#   PYO_TEST_EDITION_NAME: name of edition for editioning tests
-#   PYO_TEST_PLUGINS: list of plugins to import before running tests
-#   PYO_TEST_ORACLE_CLIENT_PATH: Oracle Client or Instant Client library dir
-#
-# PYO_TEST_CONNECT_STRING can be set to an Easy Connect string, or a
-# Net Service Name from a tnsnames.ora file or external naming service,
-# or it can be the name of a local Oracle database instance.
-#
-# On Windows set PYO_TEST_ORACLE_CLIENT_PATH if Oracle libraries are not in
-# PATH. On macOS set the variable to the Instant Client directory. On Linux do
-# not set the variable; instead set LD_LIBRARY_PATH or configure ldconfig
-# before running Python.
-#
-# If oracledb is using Instant Client, then an Easy Connect string is generally
-# appropriate. The syntax is:
-#
-#   [//]host_name[:port][/service_name][:server_type][/instance_name]
-#
-# Commonly just the host_name and service_name are needed
-# e.g. "localhost/orclpdb1" or "localhost/XEPDB1"
-#
-# If using a tnsnames.ora file, the file can be in a default
-# location such as $ORACLE_HOME/network/admin/tnsnames.ora or
-# /etc/tnsnames.ora.  Alternatively set the TNS_ADMIN environment
-# variable and put the file in $TNS_ADMIN/tnsnames.ora.
-#
-# The administrative user for cloud databases is ADMIN and the administrative
-# user for on premises databases is SYSTEM.
-# -----------------------------------------------------------------------------
-
-import importlib
-import os
-import platform
-import secrets
-import string
-
-import numpy
-import oracledb
-import pandas
-import pytest
-
-
-class DefaultsContextManager:
-    def __init__(self, attribute, desired_value):
-        self.attribute = attribute
-        self.desired_value = desired_value
-
-    def __enter__(self):
-        self.original_value = getattr(oracledb.defaults, self.attribute)
-        setattr(oracledb.defaults, self.attribute, self.desired_value)
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        setattr(oracledb.defaults, self.attribute, self.original_value)
-
-
-class FullCodeErrorContextManager:
-
-    def __init__(self, full_codes):
-        self.full_codes = full_codes
-        if len(full_codes) == 1:
-            self.message_fragment = f'Error "{full_codes[0]}"'
-        else:
-            message_fragment = ", ".join(f'"{s}"' for s in full_codes[:-1])
-            message_fragment += f' or "{full_codes[-1]}"'
-            self.message_fragment = f"One of the errors {message_fragment}"
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, tb):
-        if exc_type is None:
-            raise AssertionError(f"{self.message_fragment} was not raised.")
-        if not issubclass(exc_type, oracledb.Error):
-            return False
-        if issubclass(exc_type, oracledb.Error):
-            self.error_obj = exc_value.args[0]
-            if self.error_obj.full_code not in self.full_codes:
-                message = (
-                    f"{self.message_fragment} should have been raised but "
-                    f'"{self.error_obj.full_code}" was raised instead.'
-                )
-                raise AssertionError(message)
-        return True
-
-
-class SystemStatInfo:
-    get_sid_sql = "select sys_context('userenv', 'sid') from dual"
-    get_stat_sql = """
-          select ss.value
-          from v$sesstat ss, v$statname sn
-          where ss.sid = :sid
-              and ss.statistic# = sn.statistic#
-              and sn.name = :stat_name
-          """
-    stat_name = None
-
-    def _initialize(self, conn, admin_conn):
-        self.prev_value = 0
-        self.admin_conn = admin_conn
-        with conn.cursor() as cursor:
-            cursor.execute(self.get_sid_sql)
-            (self.sid,) = cursor.fetchone()
-        self.get_value()
-
-    async def _initialize_async(self, conn, admin_conn):
-        self.prev_value = 0
-        self.admin_conn = admin_conn
-        with conn.cursor() as cursor:
-            await cursor.execute(self.get_sid_sql)
-            (self.sid,) = await cursor.fetchone()
-        await self.get_value_async()
-
-    def get_value(self):
-        with self.admin_conn.cursor() as cursor:
-            cursor.execute(
-                self.get_stat_sql, sid=self.sid, stat_name=self.stat_name
-            )
-            (current_value,) = cursor.fetchone()
-            diff_value = current_value - self.prev_value
-            self.prev_value = current_value
-            return diff_value
-
-    async def get_value_async(self):
-        with self.admin_conn.cursor() as cursor:
-            await cursor.execute(
-                self.get_stat_sql, sid=self.sid, stat_name=self.stat_name
-            )
-            (current_value,) = await cursor.fetchone()
-            diff_value = current_value - self.prev_value
-            self.prev_value = current_value
-            return diff_value
-
-
-class RoundTripInfo(SystemStatInfo):
-    stat_name = "SQL*Net roundtrips to/from client"
-
-
-class ParseCountInfo(SystemStatInfo):
-    stat_name = "parse count (total)"
-
-
-class TestEnv:
-
-    def _convert_df_value(self, df_val):
-        """
-        This method converts a dataframe cell value to use with assertions
-        For e.g. NaN and np.array cannot be compared directly. Values are
-        converted according to the following rules:
-         - NaN -> None
-         - np.array -> np.array.tolist() (Python list)
-        """
-        if isinstance(df_val, numpy.ndarray):
-            return df_val.tolist()
-        elif pandas.isna(df_val):
-            return None
-        elif isinstance(df_val, dict):
-            return {k: self._convert_df_value(v) for k, v in df_val.items()}
-        else:
-            return df_val
-
-    def _get_charset(self, conn):
-        """
-        Determines the character set in use by the database.
-        """
-        with conn.cursor() as cursor:
-            cursor.execute(
-                """
-                select value
-                from nls_database_parameters
-                where parameter = 'NLS_CHARACTERSET'
-                """
-            )
-            (value,) = cursor.fetchone()
-            return value
-
-    def _get_charset_ratios(self, conn):
-        """
-        Calculates the character set ratios used by the database.
-        """
-        cursor = conn.cursor()
-        cursor.execute(
-            """
-            select
-                cast('X' as varchar2(1)),
-                cast('Y' as nvarchar2(1))
-            from dual
-            """
-        )
-        varchar_info, nvarchar_info = cursor.description
-        return (varchar_info.internal_size, nvarchar_info.internal_size)
-
-    def _initialize(self):
-        """
-        Initializes the remaining items after establishing a connection to the
-        database. This is done so that alternative initialization of some
-        process wide variables in thick mode can take place independently for
-        some tests.
-        """
-
-        # if already initialized, nothing to do!
-        if self.initialized:
-            return
-
-        # setup thick mode, if needed
-        if self.use_thick_mode:
-            if oracledb.is_thin_mode():
-                oracledb.init_oracle_client(lib_dir=self.oracle_client_path)
-            oracledb.defaults.thick_mode_dsn_passthrough = False
-            self.client_version = oracledb.clientversion()[:2]
-
-        # import any requested plugins
-        if self.plugins is not None:
-            for name in self.plugins.split(","):
-                module_name = f"oracledb.plugins.{name}"
-                importlib.import_module(module_name)
-
-        # establish a connection to determine the remaining information
-        params = self.get_connect_params()
-        conn = oracledb.connect(dsn=self.connect_string, params=params)
-        version_parts = conn.version.split(".")[:2]
-        self.server_version = tuple(int(s) for s in version_parts)
-        self.is_drcp = self._is_drcp()
-        self.is_implicit_pooling = self._is_implicit_pooling()
-        self.is_on_oracle_cloud = self._is_on_oracle_cloud(conn)
-        self.charset = self._get_charset(conn)
-        self.charset_ratios = self._get_charset_ratios(conn)
-        self.sleep_proc_name = (
-            "dbms_session.sleep"
-            if self.server_version >= (18, 0)
-            else "dbms_lock.sleep"
-        )
-
-        # mark environment as fully initialized
-        self.initialized = True
-
-    def _is_drcp(self):
-        """
-        Calculates whether or not DRCP is being used.
-        """
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(self.connect_string)
-        server_type = params.server_type
-        return (
-            server_type == "pooled"
-            or isinstance(server_type, list)
-            and "pooled" in server_type
-        )
-
-    def _is_implicit_pooling(self):
-        """
-        Calculates whether implicit pooling is being used.
-        """
-        if not self.is_drcp:
-            return False
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(self.connect_string)
-        pool_boundary = params.pool_boundary
-        return (
-            pool_boundary is not None
-            or isinstance(pool_boundary, list)
-            and [s for s in pool_boundary if s]
-        )
-
-    def _is_on_oracle_cloud(self, conn):
-        """
-        Calculates whether the database is running on Oracle Cloud.
-        """
-        if self.server_version < (18, 0):
-            return False
-        cursor = conn.cursor()
-        cursor.execute(
-            """
-            select sys_context('userenv', 'cloud_service')
-            from dual
-            """
-        )
-        (service_name,) = cursor.fetchone()
-        return service_name is not None
-
-    def assert_raises_full_code(self, *full_codes):
-        """
-        Verifies that the block of code raises an exception with the specified
-        full codes.
-        """
-        return FullCodeErrorContextManager(full_codes)
-
-    def create_schema(self, conn):
-        """
-        Creates the database objects used by the python-oracledb test suite.
-        """
-        self.drop_schema(conn)
-        self.run_sql_script(
-            conn,
-            "create_schema",
-            main_user=self.main_user,
-            main_password=self.main_password,
-            proxy_user=self.proxy_user,
-            proxy_password=self.proxy_password,
-            edition_name=self.edition_name,
-        )
-        if self.has_server_version(21):
-            self.run_sql_script(
-                conn, "create_schema_21", main_user=self.main_user
-            )
-        if self.has_server_version(23, 4):
-            self.run_sql_script(
-                conn, "create_schema_23_4", main_user=self.main_user
-            )
-        if self.has_server_version(23, 5):
-            self.run_sql_script(
-                conn, "create_schema_23_5", main_user=self.main_user
-            )
-        if self.has_server_version(23, 7):
-            self.run_sql_script(
-                conn, "create_schema_23_7", main_user=self.main_user
-            )
-        if self.is_on_oracle_cloud:
-            self.run_sql_script(
-                conn, "create_schema_cloud", main_user=self.main_user
-            )
-
-    def drop_schema(self, conn):
-        """
-        Drops the database objects used by the python-oracledb test suite.
-        """
-        self.run_sql_script(
-            conn,
-            "drop_schema",
-            main_user=self.main_user,
-            proxy_user=self.proxy_user,
-            edition_name=self.edition_name,
-        )
-
-    def defaults_context_manager(self, attribute, desired_value):
-        """
-        Returns a defaults context manager which sets the specified attribute
-        to the desired value and restores it once the block completes.
-        """
-        return DefaultsContextManager(attribute, desired_value)
-
-    def get_admin_connection(self, use_async=False):
-        """
-        Returns an administrative connection to the database.
-        """
-        if not self.admin_user or not self.admin_password:
-            pytest.skip("missing administrative credentials")
-        if self.use_thick_mode and oracledb.is_thin_mode():
-            oracledb.init_oracle_client(lib_dir=self.oracle_client_path)
-        params = self.get_connect_params()
-        if self.admin_user.upper() == "SYS":
-            params = params.copy()
-            params.set(mode=oracledb.AUTH_MODE_SYSDBA)
-        method = oracledb.connect_async if use_async else oracledb.connect
-        return method(
-            dsn=self.connect_string,
-            params=params,
-            user=self.admin_user,
-            password=self.admin_password,
-        )
-
-    def get_admin_connection_async(self):
-        """
-        Returns an administrative connection to the database.
-        """
-        return self.get_admin_connection(use_async=True)
-
-    def get_and_clear_queue(
-        self,
-        conn,
-        queue_name,
-        payload_type=None,
-        message="not supported with this client/server combination",
-    ):
-        if payload_type == "JSON":
-            if not self.has_client_and_server_version(21):
-                pytest.skip(message)
-        elif isinstance(payload_type, str):
-            payload_type = conn.gettype(payload_type)
-        queue = conn.queue(queue_name, payload_type)
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        while queue.deqone():
-            pass
-        return conn.queue(queue_name, payload_type)
-
-    async def get_and_clear_queue_async(
-        self,
-        conn,
-        queue_name,
-        payload_type=None,
-        message="not supported with this client/server combination",
-    ):
-        if payload_type == "JSON":
-            if not self.has_client_and_server_version(21):
-                pytest.skip(message)
-        elif isinstance(payload_type, str):
-            payload_type = await conn.gettype(payload_type)
-        queue = conn.queue(queue_name, payload_type)
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        while await queue.deqone():
-            pass
-        return conn.queue(queue_name, payload_type)
-
-    def get_connect_params(self):
-        """
-        Returns an instance of ConnectParams used to manage connection
-        parameters.
-        """
-        return oracledb.ConnectParams(
-            user=self.main_user,
-            password=self.main_password,
-            config_dir=self.wallet_location,
-            wallet_location=self.wallet_location,
-            wallet_password=self.wallet_password,
-            disable_oob=True,
-        )
-
-    def get_connection(self, dsn=None, use_async=False, **kwargs):
-        """
-        Returns a connection to the database.
-        """
-        self._initialize()
-        if dsn is None:
-            dsn = self.connect_string
-        method = oracledb.connect_async if use_async else oracledb.connect
-        return method(dsn=dsn, params=self.get_connect_params(), **kwargs)
-
-    def get_connection_async(self, dsn=None, **kwargs):
-        """
-        Returns a connection to the database using asyncio.
-        """
-        return self.get_connection(dsn, use_async=True, **kwargs)
-
-    def get_data_from_df(self, df):
-        """
-        Returns data from the data frame in a normalized fashion suitable for
-        comparison. In particular, NaN values cannot be compared to one another
-        so they are converted to the value None for comparison purposes.
-        """
-        return [
-            tuple(self._convert_df_value(v) for v in row)
-            for row in df.itertuples(index=False, name=None)
-        ]
-
-    def get_db_object_as_plain_object(self, obj):
-        """
-        Returns a database object as a plain object to make assertions simpler.
-        """
-        if obj.type.iscollection:
-            element_values = []
-            for value in obj.aslist():
-                if isinstance(value, oracledb.DbObject):
-                    value = self.get_db_object_as_plain_object(value)
-                elif isinstance(value, oracledb.LOB):
-                    value = value.read()
-                element_values.append(value)
-            return element_values
-        attr_values = []
-        for attribute in obj.type.attributes:
-            value = getattr(obj, attribute.name)
-            if isinstance(value, oracledb.DbObject):
-                value = self.get_db_object_as_plain_object(value)
-            elif isinstance(value, oracledb.LOB):
-                value = value.read()
-            attr_values.append(value)
-        return tuple(attr_values)
-
-    async def get_db_object_as_plain_object_async(self, obj):
-        """
-        Returns a database object as a plain object to make assertions simpler.
-        """
-        if obj.type.iscollection:
-            element_values = []
-            for value in obj.aslist():
-                if isinstance(value, oracledb.DbObject):
-                    value = await self.get_db_object_as_plain_object_async(
-                        value
-                    )
-                elif isinstance(value, oracledb.AsyncLOB):
-                    value = await value.read()
-                element_values.append(value)
-            return element_values
-        attr_values = []
-        for attribute in obj.type.attributes:
-            value = getattr(obj, attribute.name)
-            if isinstance(value, oracledb.DbObject):
-                value = await self.get_db_object_as_plain_object_async(value)
-            elif isinstance(value, oracledb.AsyncLOB):
-                value = await value.read()
-            attr_values.append(value)
-        return tuple(attr_values)
-
-    def get_pool(self, use_async=False, **kwargs):
-        """
-        Returns a connection pool for the database.
-        """
-        self._initialize()
-        method = (
-            oracledb.create_pool_async if use_async else oracledb.create_pool
-        )
-        return method(
-            dsn=self.connect_string, params=self.get_pool_params(), **kwargs
-        )
-
-    def get_pool_async(self, **kwargs):
-        """
-        Returns a connection pool for the database using asyncio.
-        """
-        return self.get_pool(use_async=True, **kwargs)
-
-    def get_pool_params(self):
-        """
-        Returns an instance of PoolParams used to manage connection pool
-        parameters.
-        """
-        return oracledb.PoolParams(
-            user=self.main_user,
-            password=self.main_password,
-            config_dir=self.wallet_location,
-            wallet_location=self.wallet_location,
-            wallet_password=self.wallet_password,
-            disable_oob=True,
-        )
-
-    def get_random_string(self, length=10):
-        """
-        Return a random string of the specified length.
-        """
-        return "".join(
-            secrets.choice(string.ascii_letters) for i in range(length)
-        )
-
-    def get_sid_serial(self, conn):
-        """
-        Returns the sid and serial number of the connection as a 2-tuple.
-        """
-        if not self.use_thick_mode:
-            return (conn.session_id, conn.serial_num)
-        with conn.cursor() as cursor:
-            cursor.execute(
-                """
-                select
-                    dbms_debug_jdwp.current_session_id,
-                    dbms_debug_jdwp.current_session_serial
-                from dual
-                """
-            )
-            return cursor.fetchone()
-
-    def has_client_and_server_version(self, major_version, minor_version=0):
-        """
-        Returns a boolean indicating if the test environment is using a client
-        version and a database with the specified version or later.
-        """
-        if not self.has_client_version(major_version, minor_version):
-            return False
-        if not self.has_server_version(major_version, minor_version):
-            return False
-        return True
-
-    def has_client_version(self, major_version, minor_version=0):
-        """
-        Returns a boolean indicating if the test environment is using a client
-        version with the specified version or later.
-        """
-        self._initialize()
-        if oracledb.is_thin_mode():
-            return True
-        return self.client_version >= (major_version, minor_version)
-
-    def has_server_version(self, major_version, minor_version=0):
-        """
-        Returns a boolean indicating if the test environment is using a server
-        version with the specified version or later.
-        """
-        self._initialize()
-        return self.server_version >= (major_version, minor_version)
-
-    def run_sql_script(self, conn, script_name, **kwargs):
-        """
-        Runs the specified script with the specified replacement values.
-        """
-        statement_parts = []
-        cursor = conn.cursor()
-        replace_values = [("&" + k + ".", v) for k, v in kwargs.items()] + [
-            ("&" + k, v) for k, v in kwargs.items()
-        ]
-        script_dir = os.path.dirname(__file__)
-        file_name = os.path.join(script_dir, "sql", script_name + ".sql")
-        for line in open(file_name):
-            if line.strip() == "/":
-                statement = "".join(statement_parts).strip()
-                if statement:
-                    for search_value, replace_value in replace_values:
-                        statement = statement.replace(
-                            search_value, replace_value
-                        )
-                    try:
-                        cursor.execute(statement)
-                    except:
-                        print("Failed to execute SQL:", statement)
-                        raise
-                statement_parts = []
-            else:
-                statement_parts.append(line)
-        cursor.execute(
-            """
-            select name, type, line, position, text
-            from dba_errors
-            where owner = upper(:owner)
-            order by name, type, line, position
-            """,
-            owner=self.main_user,
-        )
-        prev_name = prev_obj_type = None
-        for name, obj_type, line_num, position, text in cursor:
-            if name != prev_name or obj_type != prev_obj_type:
-                print("%s (%s)" % (name, obj_type))
-                prev_name = name
-                prev_obj_type = obj_type
-            print("    %s/%s %s" % (line_num, position, text))
-        assert prev_name is None
-
-    def skip_unless_client_version(self, major_version, minor_version=0):
-        """
-        Skips the test unless the specified client version or higher is being
-        used.
-        """
-        if not self.has_client_version(major_version, minor_version):
-            if minor_version == 0:
-                version = str(major_version)
-            else:
-                version = f"{major_version}.{minor_version}"
-            pytest.skip(f"requires Oracle Client {version} or higher")
-
-    def skip_unless_server_version(self, major_version, minor_version=0):
-        """
-        Skips the test unless the specified server version or higher is being
-        used.
-        """
-        if not self.has_server_version(major_version, minor_version):
-            if minor_version == 0:
-                version = str(major_version)
-            else:
-                version = f"{major_version}.{minor_version}"
-            pytest.skip(f"requires Oracle Database {version} or higher")
-
-
-@pytest.fixture
-def admin_conn(test_env):
-    """
-    Return an administrative connection to the database using the pytest
-    configuration.
-    """
-    with test_env.get_admin_connection() as conn:
-        yield conn
-
-
-@pytest.fixture
-def anyio_backend():
-    """
-    Only asyncio is being tested currently.
-    """
-    return "asyncio"
-
-
-@pytest.fixture
-async def async_admin_conn(test_env):
-    """
-    Return an administrative connection to the database using the pytest
-    configuration with asyncio.
-    """
-    async with test_env.get_admin_connection_async() as conn:
-        yield conn
-
-
-@pytest.fixture
-async def async_conn(test_env):
-    """
-    Return a connection to the database using the pytest configuration with
-    asyncio
-    """
-    async with test_env.get_connection_async() as conn:
-        with conn.cursor() as cursor:
-            await cursor.execute("alter session set time_zone = '+00:00'")
-        yield conn
-
-
-@pytest.fixture
-async def async_cursor(async_conn):
-    """
-    Return a connection to the database using the pytest configuration using
-    asyncio.
-    """
-    with async_conn.cursor() as cursor:
-        yield cursor
-
-
-@pytest.fixture
-def conn(test_env):
-    """
-    Return a connection to the database using the pytest configuration.
-    """
-    with test_env.get_connection() as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("alter session set time_zone = '+00:00'")
-        yield conn
-
-
-@pytest.fixture
-def cursor(conn):
-    """
-    Return a connection to the database using the pytest configuration.
-    """
-    with conn.cursor() as cursor:
-        yield cursor
-
-
-@pytest.fixture
-def disable_fetch_lobs():
-    """
-    Disables fetching of LOB locators for the duration of the test.
-    """
-    orig_value = oracledb.defaults.fetch_lobs
-    oracledb.defaults.fetch_lobs = False
-    yield
-    oracledb.defaults.fetch_lobs = orig_value
-
-
-def get_env_value(name, default_value=None, required=False):
-    """
-    Returns the value of the environment variable if it is present and the
-    default value if it is not. If marked as required, the test suite will
-    immediately fail.
-    """
-    env_name = f"PYO_TEST_{name}"
-    value = os.environ.get(env_name)
-    if value is None:
-        if required:
-            msg = f"missing value for environment variable {env_name}"
-            pytest.exit(msg, 1)
-        return default_value
-    return value
-
-
-@pytest.fixture
-def parse_count_checker(conn, admin_conn, test_env):
-    """
-    Return an object used for checking the round trips on a connection.
-    """
-    if test_env.is_implicit_pooling:
-        pytest.skip("sessions can change with implicit pooling")
-    checker = ParseCountInfo()
-    checker._initialize(conn, admin_conn)
-    return checker
-
-
-@pytest.fixture
-async def parse_count_checker_async(async_conn, async_admin_conn, test_env):
-    """
-    Return an object used for checking the round trips on a connection.
-    """
-    if test_env.is_implicit_pooling:
-        pytest.skip("sessions can change with implicit pooling")
-    checker = ParseCountInfo()
-    await checker._initialize_async(async_conn, async_admin_conn)
-    return checker
-
-
-def pytest_addoption(parser):
-    """
-    Adds python-oracledb testing options to the command line.
-    """
-    parser.addoption("--use-thick-mode", action="store_true")
-
-
-@pytest.fixture
-def round_trip_checker(conn, admin_conn, test_env):
-    """
-    Return an object used for checking the round trips on a connection.
-    """
-    if test_env.is_implicit_pooling:
-        pytest.skip("sessions can change with implicit pooling")
-    checker = RoundTripInfo()
-    checker._initialize(conn, admin_conn)
-    return checker
-
-
-@pytest.fixture
-async def round_trip_checker_async(async_conn, async_admin_conn, test_env):
-    """
-    Return an object used for checking the round trips on a connection.
-    """
-    if test_env.is_implicit_pooling:
-        pytest.skip("sessions can change with implicit pooling")
-    checker = RoundTripInfo()
-    await checker._initialize_async(async_conn, async_admin_conn)
-    return checker
-
-
-@pytest.fixture
-def skip_if_drcp(test_env):
-    """
-    Skips the test if running with DRCP.
-    """
-    test_env._initialize()
-    if test_env.is_drcp:
-        pytest.skip("not supported with DRCP")
-
-
-@pytest.fixture
-def skip_if_implicit_pooling(test_env):
-    """
-    Skips the test if running with implicit pooling.
-    """
-    test_env._initialize()
-    if test_env.is_implicit_pooling:
-        pytest.skip("not supported with implicit pooling")
-
-
-@pytest.fixture
-def skip_unless_binary_vectors_supported(test_env):
-    """
-    Skips the test if binary vectors are not supported.
-    """
-    if not test_env.has_client_and_server_version(23, 5):
-        pytest.skip("no binary vector support")
-
-
-@pytest.fixture
-def skip_unless_call_timeout_supported(test_env):
-    """
-    Skips the test if not running in thin mode.
-    """
-    if not test_env.has_client_version(18):
-        pytest.skip("no call timeout support")
-
-
-@pytest.fixture
-def skip_unless_domains_supported(test_env):
-    """
-    Skips the test if domains are not supported.
-    """
-    if not test_env.has_server_version(23):
-        pytest.skip("no domain support")
-
-
-@pytest.fixture
-def skip_unless_json_supported(test_env):
-    """
-    Skips the test if JSON values are not supported.
-    """
-    if not test_env.has_client_and_server_version(12, 2):
-        pytest.skip("no JSON support")
-
-
-@pytest.fixture
-def skip_unless_long_passwords_supported(test_env):
-    """
-    Skips the test if not running in thin mode.
-    """
-    if not test_env.has_client_and_server_version(23):
-        pytest.skip("no long password support")
-
-
-@pytest.fixture
-def skip_unless_native_boolean_supported(test_env):
-    """
-    Skips the test if native booleans are not supported.
-    """
-    if not test_env.has_client_and_server_version(23):
-        pytest.skip("no native boolean support")
-
-
-@pytest.fixture
-def skip_unless_native_json_supported(test_env):
-    """
-    Skips the test if native JSON data is not supported.
-    """
-    if not test_env.has_client_and_server_version(21):
-        pytest.skip("no native JSON support")
-
-
-@pytest.fixture
-def skip_unless_plsql_boolean_supported(test_env):
-    """
-    Skips the test if PL/SQL booleans are not supported.
-    """
-    if not test_env.has_client_and_server_version(12, 1):
-        pytest.skip("no PL/SQL boolean support")
-
-
-@pytest.fixture
-def skip_unless_pool_timed_wait_supported(test_env):
-    """
-    Skips the test if pooled timed wait is not supported.
-    """
-    if not test_env.has_client_and_server_version(12, 2):
-        pytest.skip("no pool timed wait support")
-
-
-@pytest.fixture
-def skip_unless_sessionless_transactions_supported(test_env):
-    """
-    Skips the test if sessionless transactions are not supported.
-    """
-    if not test_env.has_client_and_server_version(23, 6):
-        pytest.skip("no sessionless transactions support")
-
-
-@pytest.fixture
-def skip_unless_sparse_vectors_supported(test_env):
-    """
-    Skips the test if sparse vectors are not supported.
-    """
-    if not test_env.has_client_and_server_version(23, 7):
-        pytest.skip("no sparse vector support")
-
-
-@pytest.fixture
-def skip_unless_thick_mode(test_env):
-    """
-    Skips the test if not running in thick mode.
-    """
-    if not test_env.use_thick_mode:
-        pytest.skip("requires thick mode")
-
-
-@pytest.fixture
-def skip_unless_thin_mode(test_env):
-    """
-    Skips the test if not running in thin mode.
-    """
-    if test_env.use_thick_mode:
-        pytest.skip("requires thin mode")
-
-
-@pytest.fixture
-def skip_unless_vectors_supported(test_env):
-    """
-    Skips the test if vectors are not supported.
-    """
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("no vector support")
-
-
-@pytest.fixture
-def soda_db(conn, test_env):
-    """
-    Return the SODA database object.
-    """
-    message = "not supported with this client/server combination"
-    if not test_env.use_thick_mode:
-        pytest.skip(message)
-    if not test_env.has_client_version(18, 3):
-        pytest.skip(message)
-    if not test_env.has_server_version(18):
-        pytest.skip(message)
-    if test_env.has_server_version(20, 1):
-        if not test_env.has_client_version(20, 1):
-            pytest.skip(message)
-    if test_env.has_client_version(23, 3) and platform.system() == "Darwin":
-        pytest.skip(message)
-    soda_db = conn.getSodaDatabase()
-    for name in soda_db.getCollectionNames():
-        soda_db.openCollection(name).drop()
-    return soda_db
-
-
-@pytest.fixture(scope="session")
-def test_env(pytestconfig):
-    """
-    Returns an object containing a test environment which can be used to
-    perform common checks.
-    """
-    env = TestEnv()
-    env.use_thick_mode = pytestconfig.getoption("--use-thick-mode")
-    env.main_user = get_env_value("MAIN_USER", default_value="pythontest")
-    env.main_password = get_env_value("MAIN_PASSWORD", required=True)
-    env.proxy_user = get_env_value(
-        "PROXY_USER", default_value="pythontestproxy"
-    )
-    env.proxy_password = get_env_value("PROXY_PASSWORD")
-    env.connect_string = get_env_value(
-        "CONNECT_STRING", default_value="localhost/orclpdb1"
-    )
-    env.admin_user = get_env_value("ADMIN_USER", default_value="admin")
-    env.admin_password = get_env_value("ADMIN_PASSWORD")
-    if env.use_thick_mode:
-        env.wallet_location = env.wallet_password = None
-    else:
-        env.wallet_location = get_env_value("WALLET_LOCATION")
-        env.wallet_password = get_env_value("WALLET_PASSWORD")
-    env.external_user = get_env_value("EXTERNAL_USER")
-    env.edition_name = get_env_value(
-        "EDITION_NAME", default_value="pythonedition"
-    )
-    env.plugins = get_env_value("PLUGINS")
-    env.oracle_client_path = (
-        get_env_value("ORACLE_CLIENT_PATH")
-        if platform.system() in ("Darwin", "Windows")
-        else None
-    )
-    env.initialized = False
-    return env
diff --git a/tests/create_schema.py b/tests/create_schema.py
deleted file mode 100644
index a9c5b4a4..00000000
--- a/tests/create_schema.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# create_schema.py
-#
-# Creates users and populates their schemas with the tables and packages
-# necessary for running the python-oracledb test suite.
-# -----------------------------------------------------------------------------
-
-
-def test_create_schema(admin_conn, test_env):
-    test_env.create_schema(admin_conn)
diff --git a/tests/drop_schema.py b/tests/drop_schema.py
deleted file mode 100644
index c9bb4225..00000000
--- a/tests/drop_schema.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# drop_schema.py
-#
-# Drops the database objects used by the python-oracledb test suite.
-#
-# This script is also executed by the Python script create_schema.py for
-# dropping the existing users and editions, if applicable, before creating the
-# test schemas.
-# -----------------------------------------------------------------------------
-
-
-def test_drop_schema(admin_conn, test_env):
-    test_env.drop_schema(admin_conn)
diff --git a/tests/ext/README.md b/tests/ext/README.md
deleted file mode 100644
index 7e1f7311..00000000
--- a/tests/ext/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This directory contains the extended test suite for python-oracledb. These
-tests either require specialized configuration or are timing dependent.
-Configuration for these extended tests can be found in the file pointed to by
-the environment variable `PYO_TEST_EXT_CONFIG_FILE` or, if the environment
-variable is not specified, then the file `config.ini` found in this directory.
-Configuration required to run the extended test is documented in each test
-file.
-
-All of the tests can be run by executing this command:
-
-    pytest tests/ext
-
-Or each file can be run independently.
-
-A sample configuration file is found in `sample_config.ini`.
diff --git a/tests/ext/conftest.py b/tests/ext/conftest.py
deleted file mode 100644
index 34ee9ff4..00000000
--- a/tests/ext/conftest.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# Loads the test environment found in the base directory and then extends it
-# with some methods used to determine which extended tests to run.
-# -----------------------------------------------------------------------------
-
-import configparser
-import os
-import pytest
-
-DATABASES_SECTION_NAME = "Databases"
-
-
-@pytest.fixture(scope="session")
-def extended_config(test_env):
-    return ExtendedConfig(test_env)
-
-
-@pytest.fixture
-def skip_unless_has_orapki(extended_config):
-    if not extended_config.get_bool_value("has_orapki"):
-        pytest.skip("extended configuration has_orapki is disabled")
-
-
-@pytest.fixture
-def skip_unless_local_database(extended_config):
-    if not extended_config.get_bool_value("local_database"):
-        pytest.skip("extended configuration local_database is disabled")
-
-
-@pytest.fixture
-def skip_unless_run_long_tests(extended_config):
-    if not extended_config.get_bool_value("run_long_tests"):
-        pytest.skip("extended configuration run_long_tests is disabled")
-
-
-class ExtendedConfig:
-
-    def __init__(self, test_env):
-        default_file_name = os.path.join(
-            os.path.dirname(__file__), "config.ini"
-        )
-        file_name = os.environ.get(
-            "PYO_TEST_EXT_CONFIG_FILE", default_file_name
-        )
-        self.parser = configparser.ConfigParser()
-        self.parser.read(file_name)
-        self.section_name = "DEFAULT"
-        if self.parser.has_section(DATABASES_SECTION_NAME):
-            for section_name, connect_string in self.parser.items(
-                DATABASES_SECTION_NAME
-            ):
-                if connect_string.upper() == test_env.connect_string.upper():
-                    self.section_name = section_name
-                    break
-
-    def get_bool_value(self, name, fallback=False):
-        """
-        Returns a boolean for a specifically named value.
-        """
-        return self.parser.getboolean(
-            self.section_name, name, fallback=fallback
-        )
diff --git a/tests/ext/sample_config.ini b/tests/ext/sample_config.ini
deleted file mode 100644
index ffbc46d2..00000000
--- a/tests/ext/sample_config.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# sample_config.ini
-#
-# Sample file for running extended tests. Copy this file to config.ini in the
-# same directory (or another location of your choice and set the environment
-# variable PYO_TEST_EXT_CONFIG_FILE to point to that location).
-# -----------------------------------------------------------------------------
-
-# this section covers common configuration
-[DEFAULT]
-
-# boolean indicating whether to run tests that take a long period of time
-run_long_tests = False
-
-# boolean indicating whether the orapki binary is available (generally requires
-# a full Oracle Database installation)
-has_orapki = False
-
-# boolean indicating whether the client and server are running on the same
-# machine (required for BFILE tests, for example)
-local_database = False
-
-
-# this section contains references to other sections which have different
-# configurations
-[Databases]
-
-# each entry contains the section name (key) and connect string (value)
-db_23 = localhost:1623/DB23PDB1
-
-
-# this section contains configuration for the named database which overrides
-# the values found in the DEFAULT section
-[db_23]
-local_database = True
diff --git a/tests/ext/test_ext_1000_pool_shrink.py b/tests/ext/test_ext_1000_pool_shrink.py
deleted file mode 100644
index 7373f37c..00000000
--- a/tests/ext/test_ext_1000_pool_shrink.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1000 - Module for testing pool strinking. No special setup is required but the
-tests here will only be run if the run_long_tests value is enabled.
-"""
-
-import time
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_run_long_tests):
-    pass
-
-
-def test_ext_1000(test_env):
-    "E1000 - test pool timeout with simple acquire after waiting"
-    pool = test_env.get_pool(min=3, max=10, increment=1, timeout=5)
-    conns = [pool.acquire() for i in range(7)]
-    assert pool.opened == 7
-    for conn in conns:
-        conn.close()
-    time.sleep(10)
-    conn = pool.acquire()
-    assert pool.opened == 3
-
-
-def test_ext_1001(test_env):
-    "E1001 - test pool timeout with older connection returned first"
-    pool = test_env.get_pool(min=2, max=5, increment=1, timeout=3)
-    conns = [pool.acquire() for i in range(3)]
-    conns[2].close()
-    for i in range(10):
-        with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                cursor.execute("select 1 from dual")
-    time.sleep(4)
-    conn = pool.acquire()
-    assert pool.opened == 3
-
-
-def test_ext_1002(skip_unless_thin_mode, test_env):
-    "E1002 - test pool timeout shrinks to min on pool inactivity"
-    pool = test_env.get_pool(min=3, max=10, increment=2, timeout=4)
-    conns = [pool.acquire() for i in range(6)]
-    assert pool.opened == 6
-    for conn in conns:
-        conn.close()
-    time.sleep(6)
-    assert pool.opened == 3
-
-
-def test_ext_1003(skip_unless_thin_mode, test_env):
-    "E1003 - test pool timeout eliminates extra connections on inactivity"
-    pool = test_env.get_pool(min=4, max=10, increment=4, timeout=3)
-    conns = [pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    time.sleep(2)
-    assert pool.opened == 8
-    time.sleep(3)
-    assert pool.opened == 5
-    del conns
-
-
-def test_ext_1004(skip_unless_thin_mode, test_env):
-    "E1004 - test pool max_lifetime_session on release"
-    pool = test_env.get_pool(
-        min=4, max=10, increment=4, max_lifetime_session=3
-    )
-    conns = [pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    time.sleep(2)
-    assert pool.opened == 8
-    time.sleep(2)
-    for conn in conns:
-        conn.close()
-    time.sleep(2)
-    assert pool.opened == 4
-
-
-def test_ext_1005(skip_unless_thin_mode, test_env):
-    "E1005 - test pool max_lifetime_session on acquire"
-    pool = test_env.get_pool(
-        min=4, max=10, increment=4, max_lifetime_session=4
-    )
-    conns = [pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    time.sleep(2)
-    assert pool.opened == 8
-    for conn in conns:
-        conn.close()
-    time.sleep(4)
-    with pool.acquire():
-        pass
-    time.sleep(2)
-    assert pool.opened == 4
diff --git a/tests/ext/test_ext_1100_external_auth.py b/tests/ext/test_ext_1100_external_auth.py
deleted file mode 100644
index e65f2182..00000000
--- a/tests/ext/test_ext_1100_external_auth.py
+++ /dev/null
@@ -1,210 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1100 - Module for testing external authentication. This requires access to the
-orapki executable found in a full database installation and will create and
-drop users in the database. The tests here will only run if the has_orapki
-value is enabled and, due to limitations in how the Oracle Client libraries
-work, can only be run by itself.
-"""
-
-import os
-import subprocess
-import tempfile
-
-import oracledb
-import pytest
-
-ALIAS_NAME = "ext_test_1100"
-USER = "ext_test_1100_user"
-
-
-@pytest.fixture(scope="module")
-def config(sqlnet_config, tnsnames_config, setup_user):
-    """
-    Builds the configuration used for the tests in this module. Note that if
-    the Oracle Client libraries have already been initialized then all of these
-    tests will be skipped.
-    """
-    pass
-
-
-@pytest.fixture(scope="module")
-def config_dir():
-    """
-    Returns the directory where the configuration will be stored.
-    """
-    with tempfile.TemporaryDirectory() as temp_dir:
-        yield temp_dir
-
-
-@pytest.fixture(scope="module")
-def setup_user(config_dir, test_env, user_password):
-    """
-    Builds the user credentials stored in the supplied wallet.
-    """
-    oracledb.init_oracle_client(config_dir=config_dir)
-    admin_conn = test_env.get_admin_connection()
-    with admin_conn.cursor() as cursor:
-        try:
-            cursor.execute(f"drop user {USER} cascade")
-        except oracledb.DatabaseError:
-            pass
-        cursor.execute(
-            f"create user {USER} identified by " + f"{user_password}"
-        )
-        cursor.execute(f"grant create session to {USER}")
-
-
-@pytest.fixture(scope="module")
-def sqlnet_config(config_dir, test_env, user_password):
-    """
-    Builds the SQL*Net configuration file.
-    """
-    if not test_env.use_thick_mode:
-        pytest.skip("requires thick mode")
-    elif not oracledb.is_thin_mode():
-        pytest.skip("must be run separately from all other tests")
-    subprocess.run(
-        [
-            "orapki",
-            "wallet",
-            "create",
-            "-wallet",
-            config_dir,
-            "-auto_login_only",
-        ],
-        stdout=subprocess.DEVNULL,
-    )
-    subprocess.run(
-        [
-            "mkstore",
-            "-wrl",
-            config_dir,
-            "-createCredential",
-            ALIAS_NAME,
-            USER,
-            user_password,
-        ],
-        stdout=subprocess.DEVNULL,
-    )
-    subprocess.run(
-        [
-            "mkstore",
-            "-wrl",
-            config_dir,
-            "-createCredential",
-            test_env.connect_string,
-            USER,
-            user_password,
-        ],
-        stdout=subprocess.DEVNULL,
-    )
-    contents = (
-        "WALLET_LOCATION=(SOURCE=(METHOD=FILE)(METHOD_DATA="
-        + f"(DIRECTORY={config_dir})))\n"
-        + "SQLNET.WALLET_OVERRIDE=TRUE"
-    )
-    file_name = os.path.join(config_dir, "sqlnet.ora")
-    with open(file_name, "w") as f:
-        f.write(contents)
-
-
-@pytest.fixture(scope="module")
-def tnsnames_config(config_dir, test_env):
-    """
-    Builds the tnsnames.ora configuration file.
-    """
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(test_env.connect_string)
-    connect_string = params.get_connect_string()
-    file_name = os.path.join(config_dir, "tnsnames.ora")
-    with open(file_name, "w") as f:
-        f.write(f"{ALIAS_NAME} = {connect_string}")
-
-
-@pytest.fixture(scope="module")
-def user_password(test_env):
-    return test_env.get_random_string()
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_thick_mode, skip_unless_has_orapki, config):
-    pass
-
-
-def test_ext_1100():
-    "E1100 - external authentication with tnsnames alias (implicit)"
-    with oracledb.connect(dsn=ALIAS_NAME) as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == USER.upper()
-
-
-def test_ext_1101():
-    "E1101 - external authentication with tnsnames alias (explicit)"
-    with oracledb.connect(externalauth=True, dsn=ALIAS_NAME) as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == USER.upper()
-
-
-def test_ext_1102(test_env):
-    "E1102 - external authentication with connect string (explicit)"
-    with oracledb.connect(
-        externalauth=True, dsn=test_env.connect_string
-    ) as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == USER.upper()
-
-
-def test_ext_1103():
-    "E1103 - external authentication with tnsnames alias (explicit)"
-    pool = oracledb.create_pool(
-        externalauth=True, dsn=ALIAS_NAME, homogeneous=False
-    )
-    with pool.acquire() as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == USER.upper()
-
-
-def test_ext_1104(test_env):
-    "E1104 - external authentication with connect string (explicit)"
-    pool = oracledb.create_pool(
-        externalauth=True,
-        homogeneous=False,
-        dsn=test_env.connect_string,
-    )
-    with pool.acquire() as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == USER.upper()
diff --git a/tests/ext/test_ext_1200_statement_cache.py b/tests/ext/test_ext_1200_statement_cache.py
deleted file mode 100644
index a7fec4ce..00000000
--- a/tests/ext/test_ext_1200_statement_cache.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1200 - Module for testing the use of the statement cache
-"""
-
-import random
-
-
-def test_ext_1200(conn, parse_count_checker):
-    "E1200 - verify statement cache is used"
-    statements = [
-        "select 0 from dual",
-        "select 1 from dual",
-        "select 2 from dual",
-    ]
-    conn.stmtcachesize = len(statements)
-    for i in range(500):
-        sql = random.choice(statements)
-        with conn.cursor() as cursor:
-            cursor.execute(sql)
-            cursor.fetchall()
-    assert parse_count_checker.get_value() == 3
-
-
-def test_ext_1201(conn, parse_count_checker):
-    "E1201 - verify statement cache uses LIFO"
-    statements = [
-        "select 0 from dual",
-        "select 1 from dual",
-        "select 2 from dual",
-    ]
-    conn.stmtcachesize = len(statements)
-    for sql in statements:
-        with conn.cursor() as cursor:
-            cursor.execute(sql)
-            cursor.fetchall()
-    with conn.cursor() as cursor:
-        cursor.execute("begin null; end;")
-    assert parse_count_checker.get_value() == 4
-    for sql in statements[1:]:
-        with conn.cursor() as cursor:
-            cursor.execute(sql)
-            cursor.fetchall()
-    assert parse_count_checker.get_value() == 0
-    with conn.cursor() as cursor:
-        cursor.execute(statements[0])
-        cursor.fetchall()
-    assert parse_count_checker.get_value() == 1
-
-
-def test_ext_1202(conn, parse_count_checker):
-    "E1202 - verify copied statement is independent of cached statement"
-    sql = "select : val from dual"
-    value1 = "One"
-    value2 = "Four"
-    value3 = "Five"
-    with conn.cursor() as cursor:
-        cursor.execute(sql, [value1])
-        rows = cursor.fetchall()
-        assert rows == [(value1,)]
-    assert parse_count_checker.get_value() == 1
-    with conn.cursor() as cursor:
-        cursor.execute(sql, [value1])
-        assert parse_count_checker.get_value() == 0
-        with conn.cursor() as copyCursor:
-            copyCursor.execute(sql, [value2])
-            rows = copyCursor.fetchall()
-            assert rows == [(value2,)]
-        rows = cursor.fetchall()
-        assert rows == [(value1,)]
-    assert parse_count_checker.get_value() == 1
-    with conn.cursor() as cursor:
-        cursor.execute(sql, [value3])
-        rows = cursor.fetchall()
-        assert rows == [(value3,)]
-    assert parse_count_checker.get_value() == 0
diff --git a/tests/ext/test_ext_1300_verifier_type.py b/tests/ext/test_ext_1300_verifier_type.py
deleted file mode 100644
index 9a8d37cc..00000000
--- a/tests/ext/test_ext_1300_verifier_type.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1300 - Module for testing the 11g and 12c verifier types. No special
-configuration is needed but a user is created and dropped.
-"""
-
-import oracledb
-import pytest
-
-USER = "ext_test_1300_user"
-
-
-@pytest.fixture(scope="module")
-def admin_conn(test_env):
-    """
-    Returns the password to use for the user that is created.
-    """
-    with test_env.get_admin_connection() as conn:
-        yield conn
-
-
-@pytest.fixture(scope="module")
-def user_password(test_env):
-    """
-    Returns the password to use for the user that is created.
-    """
-    return test_env.get_random_string()
-
-
-@pytest.fixture(scope="module")
-def verifier_data(admin_conn, test_env, user_password):
-    """
-    Returns the verifier data after creating a user with the given password.
-    """
-    with admin_conn.cursor() as cursor:
-        cursor.execute(
-            "select count(*) from user$ where name = :1",
-            [USER.upper()],
-        )
-        (count,) = cursor.fetchone()
-        keyword = "create" if count == 0 else "alter"
-        cursor.execute(f"{keyword} user {USER} identified by {user_password}")
-        cursor.execute(
-            "select spare4 from user$ where name = :1", [USER.upper()]
-        )
-        (verifier_data,) = cursor.fetchone()
-        cursor.execute(f"drop user {USER}")
-        yield verifier_data
-        user = test_env.main_user
-        password = test_env.main_password
-        cursor.execute(f"alter user {user} identified by {password}")
-
-
-@pytest.mark.parametrize("ix", [0, 1])
-def test_ext_1300(ix, admin_conn, test_env, verifier_data, user_password):
-    "E1300 - test with different verifiers"
-    user = test_env.main_user
-    verifier = verifier_data.split(";")[ix]
-    sql = f"alter user {user} identified by values '{verifier}'"
-    with admin_conn.cursor() as cursor:
-        cursor.execute(sql)
-    with oracledb.connect(
-        user=user, password=user_password, dsn=test_env.connect_string
-    ) as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (fetched_user,) = cursor.fetchone()
-            assert fetched_user == user.upper()
diff --git a/tests/ext/test_ext_1400_inband_notify.py b/tests/ext/test_ext_1400_inband_notify.py
deleted file mode 100644
index 9e267219..00000000
--- a/tests/ext/test_ext_1400_inband_notify.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1400 - Module for testing inband notification. No special setup is required
-but the test makes use of debugging packages that are not intended for normal
-use.
-"""
-
-import pytest
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_user(test_env):
-    test_env.skip_unless_server_version(19)
-    user = test_env.main_user
-    with test_env.get_admin_connection() as admin_conn:
-        with admin_conn.cursor() as cursor:
-            cursor.execute(f"grant execute on dbms_tg_dbg to {user}")
-            yield
-            cursor.execute(f"revoke execute on dbms_tg_dbg from {user}")
-
-
-def test_ext_1400(test_env):
-    "E1400 - test standalone connection is marked unhealthy"
-    conn = test_env.get_connection()
-    assert conn.is_healthy()
-    with conn.cursor() as cursor:
-        cursor.callproc("dbms_tg_dbg.set_session_drainable")
-        cursor.execute("select user from dual")
-        (user,) = cursor.fetchone()
-        assert user == test_env.main_user.upper()
-    assert not conn.is_healthy()
-
-
-def test_ext_1401(test_env):
-    "E1401 - test pooled connection that is marked unhealthy"
-    pool = test_env.get_pool(min=1, max=1, increment=1)
-    with pool.acquire() as conn:
-        assert conn.is_healthy()
-        with conn.cursor() as cursor:
-            cursor.callproc("dbms_tg_dbg.set_session_drainable")
-            info = test_env.get_sid_serial(conn)
-        assert not conn.is_healthy()
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == test_env.main_user.upper()
-    with pool.acquire() as conn:
-        assert conn.is_healthy()
-        new_info = test_env.get_sid_serial(conn)
-        assert new_info != info
-
-
-def test_ext_1402(test_env):
-    "E1402 - test pooled connection is dropped from pool"
-    pool = test_env.get_pool(min=1, max=1, increment=1)
-    with pool.acquire() as conn:
-        assert conn.is_healthy()
-        info = test_env.get_sid_serial(conn)
-    with pool.acquire() as conn:
-        new_info = test_env.get_sid_serial(conn)
-        assert new_info == info
-        with conn.cursor() as cursor:
-            cursor.callproc("dbms_tg_dbg.set_session_drainable")
-    with pool.acquire() as conn:
-        assert conn.is_healthy()
-        new_info = test_env.get_sid_serial(conn)
-        assert new_info != info
diff --git a/tests/ext/test_ext_1500_pool_grow.py b/tests/ext/test_ext_1500_pool_grow.py
deleted file mode 100644
index 43559793..00000000
--- a/tests/ext/test_ext_1500_pool_grow.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1500 - Module for testing pool growth when sessions are killed. No special
-setup is required but the tests here will only be run if the run_long_tests
-value is enabled.
-"""
-
-import time
-
-
-def test_ext_1500(skip_unless_run_long_tests, test_env):
-    "E1500 - test static pool grows back to the min after sessions killed"
-    test_env.skip_unless_client_version(19)
-    pool = test_env.get_pool(min=5, max=5, increment=1, ping_interval=0)
-    conns = [pool.acquire() for i in range(5)]
-    with test_env.get_admin_connection() as admin_conn:
-        with admin_conn.cursor() as admin_cursor:
-            for conn in conns:
-                sid, serial = test_env.get_sid_serial(conn)
-                kill_sql = f"alter system kill session '{sid},{serial}'"
-                admin_cursor.execute(kill_sql)
-    conns.clear()
-    conn = pool.acquire()
-    time.sleep(2)
-    assert pool.opened == pool.min
diff --git a/tests/ext/test_ext_1600_warnings.py b/tests/ext/test_ext_1600_warnings.py
deleted file mode 100644
index 3cd74363..00000000
--- a/tests/ext/test_ext_1600_warnings.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1600 - Module for testing the generation of warnings. No special setup is
-required but sys privilege is required in order to create and drop users.
-"""
-
-import time
-
-import oracledb
-import pytest
-
-PROFILE_NAME = "profile_ext_test_1600"
-USER_NAME = "user_ext_test_1600"
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_user(test_env):
-    password = test_env.main_password
-    with test_env.get_admin_connection() as admin_conn:
-        cursor = admin_conn.cursor()
-        cursor.execute(
-            f"""
-            declare
-                e_user_missing exception;
-                pragma exception_init(e_user_missing, -1918);
-            begin
-                execute immediate('drop user {USER_NAME} cascade');
-            exception
-            when e_user_missing then
-                null;
-            end;
-            """
-        )
-        cursor.execute(
-            f"""
-            declare
-                e_user_missing exception;
-                pragma exception_init(e_user_missing, -2380);
-            begin
-                execute immediate('drop profile {PROFILE_NAME}');
-            exception
-            when e_user_missing then
-                null;
-            end;
-            """
-        )
-        cursor.execute(f"create user {USER_NAME} identified by {password}")
-        cursor.execute(f"grant create session to {USER_NAME}")
-        cursor.execute(
-            f"""
-            create profile {PROFILE_NAME} limit
-            password_life_time 1 / 24 / 60 / 60
-            password_grace_time 7
-            """
-        )
-        cursor.execute(f"alter user {USER_NAME} profile {PROFILE_NAME}")
-        time.sleep(2)
-        yield
-        cursor.execute(f"drop user {USER_NAME} cascade")
-        cursor.execute(f"drop profile {PROFILE_NAME}")
-
-
-def test_ext_1600(test_env):
-    "E1600 - test standalone connection generates a warning"
-    with oracledb.connect(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-    ) as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-
-
-def test_ext_1601_pooled_conn_warning_min_0(test_env):
-    "E1601 - test pooled connection generates a warning (min 0)"
-    pool = oracledb.create_pool(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-        min=0,
-        max=5,
-        increment=1,
-    )
-    with pool.acquire() as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-    with pool.acquire() as conn:
-        assert conn.warning is None
-    pool.close(0)
-
-
-def test_ext_1602_pooled_conn_warning_min_1(test_env):
-    "E1602 - test pooled connection generates a warning (min 1)"
-    pool = oracledb.create_pool(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-        min=1,
-        max=5,
-        increment=1,
-    )
-    with pool.acquire() as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-    with pool.acquire() as conn:
-        assert conn.warning is None
-    pool.close(0)
diff --git a/tests/ext/test_ext_1700_warnings_async.py b/tests/ext/test_ext_1700_warnings_async.py
deleted file mode 100644
index 6efa96e7..00000000
--- a/tests/ext/test_ext_1700_warnings_async.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1700 - Module for testing the generation of warnings with asyncio. No special
-setup is required but sys privilege is required in order to create and drop
-users.
-"""
-
-import time
-
-import oracledb
-import pytest
-
-PROFILE_NAME = "profile_ext_test_1700"
-USER_NAME = "user_ext_test_1700"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_user(test_env):
-    password = test_env.main_password
-    with test_env.get_admin_connection() as admin_conn:
-        cursor = admin_conn.cursor()
-        cursor.execute(
-            f"""
-            declare
-                e_user_missing exception;
-                pragma exception_init(e_user_missing, -1918);
-            begin
-                execute immediate('drop user {USER_NAME} cascade');
-            exception
-            when e_user_missing then
-                null;
-            end;
-            """
-        )
-        cursor.execute(
-            f"""
-            declare
-                e_user_missing exception;
-                pragma exception_init(e_user_missing, -2380);
-            begin
-                execute immediate('drop profile {PROFILE_NAME}');
-            exception
-            when e_user_missing then
-                null;
-            end;
-            """
-        )
-        cursor.execute(f"create user {USER_NAME} identified by {password}")
-        cursor.execute(f"grant create session to {USER_NAME}")
-        cursor.execute(
-            f"""
-            create profile {PROFILE_NAME} limit
-            password_life_time 1 / 24 / 60 / 60
-            password_grace_time 7
-            """
-        )
-        cursor.execute(f"alter user {USER_NAME} profile {PROFILE_NAME}")
-        time.sleep(2)
-        yield
-        cursor.execute(f"drop user {USER_NAME} cascade")
-        cursor.execute(f"drop profile {PROFILE_NAME}")
-
-
-async def test_ext_1700(test_env):
-    "E1700 - test standalone connection generates a warning"
-    async with oracledb.connect_async(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-    ) as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-
-
-async def test_ext_1701(test_env):
-    "E1701 - test pooled connection generates a warning (min 0)"
-    pool = oracledb.create_pool_async(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-        min=0,
-        max=5,
-        increment=1,
-    )
-    async with pool.acquire() as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-    async with pool.acquire() as conn:
-        assert conn.warning is None
-    await pool.close(0)
-
-
-async def test_ext_1702(test_env):
-    "E1702 - test pooled connection generates a warning (min 1)"
-    pool = oracledb.create_pool_async(
-        user=USER_NAME,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-        min=1,
-        max=5,
-        increment=1,
-    )
-    async with pool.acquire() as conn:
-        assert conn.warning.full_code in ["ORA-28002", "ORA-28098"]
-    async with pool.acquire() as conn:
-        assert conn.warning is None
-    await pool.close(0)
diff --git a/tests/ext/test_ext_1800_inband_notif_async.py b/tests/ext/test_ext_1800_inband_notif_async.py
deleted file mode 100644
index 34a6cb4c..00000000
--- a/tests/ext/test_ext_1800_inband_notif_async.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1800 - Module for testing inband notification with asyncio. No special setup
-is required but the test makes use of debugging packages that are not intended
-for normal use.
-"""
-
-# -----------------------------------------------------------------------------
-# priv_test_1800_inband_notif_async.py
-#
-# Private tests for testing inband notification with asyncio. No special setup
-# is required.
-# -----------------------------------------------------------------------------
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_user(test_env):
-    test_env.skip_unless_server_version(19)
-    user = test_env.main_user
-    with test_env.get_admin_connection() as admin_conn:
-        with admin_conn.cursor() as cursor:
-            cursor.execute(f"grant execute on dbms_tg_dbg to {user}")
-            yield
-            cursor.execute(f"revoke execute on dbms_tg_dbg from {user}")
-
-
-async def test_ext_1800(test_env):
-    "E1800 - test standalone connection is marked unhealthy"
-    async with test_env.get_connection_async() as conn:
-        assert conn.is_healthy()
-        with conn.cursor() as cursor:
-            await cursor.callproc("dbms_tg_dbg.set_session_drainable")
-            await cursor.execute("select user from dual")
-            (user,) = await cursor.fetchone()
-            assert user == test_env.main_user.upper()
-        assert not conn.is_healthy()
-
-
-async def test_ext_1801(test_env):
-    "E1801 - test pooled connection that is marked unhealthy"
-    pool = test_env.get_pool_async(min=1, max=1, increment=1)
-    async with pool.acquire() as conn:
-        assert conn.is_healthy()
-        with conn.cursor() as cursor:
-            await cursor.callproc("dbms_tg_dbg.set_session_drainable")
-            info = (conn.session_id, conn.serial_num)
-        assert not conn.is_healthy()
-        with conn.cursor() as cursor:
-            await cursor.execute("select user from dual")
-            (user,) = await cursor.fetchone()
-            assert user == test_env.main_user.upper()
-    async with pool.acquire() as conn:
-        assert conn.is_healthy()
-        new_info = (conn.session_id, conn.serial_num)
-        assert new_info != info
-    await pool.close()
-
-
-async def test_ext_1802(test_env):
-    "E1802 - test pooled connection is dropped from pool"
-    pool = test_env.get_pool_async(min=1, max=1, increment=1)
-    async with pool.acquire() as conn:
-        assert conn.is_healthy()
-        info = (conn.session_id, conn.serial_num)
-    async with pool.acquire() as conn:
-        new_info = (conn.session_id, conn.serial_num)
-        assert new_info == info
-        with conn.cursor() as cursor:
-            await cursor.callproc("dbms_tg_dbg.set_session_drainable")
-    async with pool.acquire() as conn:
-        assert conn.is_healthy()
-        new_info = (conn.session_id, conn.serial_num)
-        assert new_info != info
diff --git a/tests/ext/test_ext_1900_pool_shrink_async.py b/tests/ext/test_ext_1900_pool_shrink_async.py
deleted file mode 100644
index 66b0af43..00000000
--- a/tests/ext/test_ext_1900_pool_shrink_async.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E1900 - Module for testing pool strinking with asyncio. No special setup is
-required but the tests here will only be run if the run_long_tests value is
-enabled.
-"""
-
-import asyncio
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend, skip_unless_thin_mode, skip_unless_run_long_tests
-):
-    pass
-
-
-async def test_ext_1900(test_env):
-    "E1900 - test pool timeout with simple acquite after waiting"
-    pool = test_env.get_pool_async(min=3, max=10, increment=1, timeout=5)
-    conns = [await pool.acquire() for i in range(7)]
-    assert pool.opened == 7
-    for conn in conns:
-        await conn.close()
-    await asyncio.sleep(7)
-    conn = await pool.acquire()
-    assert pool.opened == 3
-
-
-async def test_ext_1901(test_env):
-    "E1901 - test pool timeout with older connection returned first"
-    pool = test_env.get_pool_async(min=2, max=5, increment=1, timeout=3)
-    conns = [await pool.acquire() for i in range(3)]
-    await conns[2].close()
-    for i in range(10):
-        async with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                await cursor.execute("select 1 from dual")
-    await asyncio.sleep(4)
-    conn = await pool.acquire()
-    assert pool.opened == 3
-
-
-async def test_ext_1902(test_env):
-    "E1902 - test pool timeout shrinks to min on pool inactivity"
-    pool = test_env.get_pool_async(min=3, max=10, increment=2, timeout=4)
-    conns = [await pool.acquire() for i in range(6)]
-    assert pool.opened == 6
-    for conn in conns:
-        await conn.close()
-    await asyncio.sleep(6)
-    assert pool.opened == 3
-
-
-async def test_ext_1903(test_env):
-    "E1902 - test pool timeout eliminates extra connections on inactivity"
-    pool = test_env.get_pool_async(min=4, max=10, increment=4, timeout=3)
-    conns = [await pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    await asyncio.sleep(2)
-    assert pool.opened == 8
-    await asyncio.sleep(3)
-    assert pool.opened == 5
-    del conns
-
-
-async def test_ext_1904(test_env):
-    "E1904 - test pool max_lifetime_session on release"
-    pool = test_env.get_pool_async(
-        min=4, max=10, increment=4, max_lifetime_session=3
-    )
-    conns = [await pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    await asyncio.sleep(2)
-    assert pool.opened == 8
-    await asyncio.sleep(2)
-    for conn in conns:
-        await conn.close()
-    await asyncio.sleep(2)
-    assert pool.opened == 4
-
-
-async def test_ext_1905(test_env):
-    "E1905 - test pool max_lifetime_session on acquire"
-    pool = test_env.get_pool_async(
-        min=4, max=10, increment=4, max_lifetime_session=4
-    )
-    conns = [await pool.acquire() for i in range(5)]
-    assert pool.opened == 5
-    await asyncio.sleep(2)
-    assert pool.opened == 8
-    for conn in conns:
-        await conn.close()
-    await asyncio.sleep(4)
-    async with pool.acquire():
-        pass
-    await asyncio.sleep(2)
-    assert pool.opened == 4
diff --git a/tests/ext/test_ext_2000_pool_grow_async.py b/tests/ext/test_ext_2000_pool_grow_async.py
deleted file mode 100644
index b9fd69dc..00000000
--- a/tests/ext/test_ext_2000_pool_grow_async.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2000 - Module for testing pool growth with asyncio when sessions are killed.
-No special setup is required but the tests here will only be run if the
-run_long_tests value is enabled.
-"""
-
-# -----------------------------------------------------------------------------
-# priv_test_2000_pool_grow.py
-#
-# Private tests for testing pool growth when sessions are killed. No special
-# setup is required.
-# -----------------------------------------------------------------------------
-
-import asyncio
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend, skip_unless_thin_mode, skip_unless_run_long_tests
-):
-    pass
-
-
-async def test_ext_2000(test_env):
-    "E2000 - test static pool grows back to the min after sessions killed"
-    pool = test_env.get_pool_async(min=5, max=5, increment=1, ping_interval=0)
-    conns = [await pool.acquire() for i in range(5)]
-    admin_conn = await test_env.get_admin_connection_async()
-    with admin_conn.cursor() as admin_cursor:
-        for conn in conns:
-            sid, serial = (conn.session_id, conn.serial_num)
-            kill_sql = f"alter system kill session '{sid},{serial}'"
-            await admin_cursor.execute(kill_sql)
-    await admin_conn.close()
-    for conn in conns:
-        await conn.close()
-    conns.clear()
-    conn = await pool.acquire()
-    await asyncio.sleep(2)
-    assert pool.opened == pool.min
diff --git a/tests/ext/test_ext_2100_bfile_type.py b/tests/ext/test_ext_2100_bfile_type.py
deleted file mode 100644
index e1a5314c..00000000
--- a/tests/ext/test_ext_2100_bfile_type.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2100 - Module for testing BFILE. No special setup is required but the tests
-here will only be run if the local_database is enabled.
-"""
-
-import os
-import tempfile
-
-import oracledb
-import pytest
-
-DIR_NAME = "EXT_TEST_2100_DIR"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_local_database):
-    pass
-
-
-@pytest.fixture
-def temp_dir(test_env):
-    with tempfile.TemporaryDirectory() as temp_dir:
-        user = test_env.main_user
-        with test_env.get_admin_connection() as conn:
-            with conn.cursor() as cursor:
-                cursor.execute(
-                    f"""
-                    create or replace directory {DIR_NAME}
-                    as '{temp_dir}'
-                    """
-                )
-                cursor.execute(f"grant read on directory {DIR_NAME} to {user}")
-        yield temp_dir
-
-
-def test_ext_2100(temp_dir, cursor):
-    "E2100 - test fileexists() and getfilename()"
-    file_name = "test_2100.txt"
-    contents = b"Some arbitrary data for test 2100"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = cursor.fetchone()
-    assert bfile.read() == contents
-    assert bfile.fileexists()
-    assert bfile.getfilename() == (DIR_NAME, file_name)
-
-
-def test_ext_2101(temp_dir, cursor):
-    "E2101 - test setfilename()"
-    file_name = "test_2101.txt"
-    contents = b"Some arbitrary data for test 2101"
-    new_file_name = "test_2101b.txt"
-    new_contents = b"Some arbitrary different data for test 2101"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    with open(os.path.join(temp_dir, new_file_name), "wb") as f:
-        f.write(new_contents)
-    cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = cursor.fetchone()
-    assert bfile.read() == contents
-    bfile.setfilename(DIR_NAME, new_file_name)
-    assert bfile.read() == new_contents
-
-
-def test_ext_2102(temp_dir, cursor, test_env):
-    "E2102 - test BFILE with LOB methods"
-    file_name = "test_2102.txt"
-    contents = b"Some arbitrary data for test 2102"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = cursor.fetchone()
-    assert bfile.size() == len(contents)
-    assert bfile.read(7) == contents[6:]
-    assert bfile.read(7, 2) == contents[6:8]
-    assert not bfile.isopen()
-    bfile.open()
-    assert bfile.isopen()
-    bfile.close()
-    assert not bfile.isopen()
-    with test_env.assert_raises_full_code("DPY-3025"):
-        bfile.getchunksize()
-    with test_env.assert_raises_full_code("DPY-3025"):
-        bfile.trim(1)
-    with test_env.assert_raises_full_code("DPY-3025"):
-        bfile.write("1")
-
-
-def test_ext_2103(temp_dir, conn, cursor):
-    "E2103 - test binding a BFILE"
-    file_name = "test_2103.txt"
-    contents = b"Some arbitrary data for test 2103"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = cursor.fetchone()
-    cursor.execute("truncate table TestBfiles")
-    cursor.execute("insert into TestBfiles values (:1, :2)", [1, bfile])
-    conn.commit()
-
-
-def test_ext_2104(temp_dir, cursor, test_env):
-    "E2104 - test reading from a missing file"
-    file_name = "test_2104.txt"
-    cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = cursor.fetchone()
-    assert bfile.getfilename() == (DIR_NAME, file_name)
-    assert not bfile.fileexists()
-    with test_env.assert_raises_full_code("ORA-22288"):
-        bfile.read()
-
-
-def test_ext_2105(temp_dir, cursor):
-    "E2105 - test setting and getting BFILE var"
-    file_name1 = "test1.txt"
-    contents1 = b"extended test 2105 - first file"
-    with open(os.path.join(temp_dir, file_name1), "wb") as f:
-        f.write(contents1)
-    file_name2 = "test2.txt"
-    contents2 = b"extended test 2105 - second file"
-    with open(os.path.join(temp_dir, file_name2), "wb") as f:
-        f.write(contents2)
-    var1 = cursor.var(oracledb.DB_TYPE_BFILE)
-    var2 = cursor.var(oracledb.DB_TYPE_BFILE)
-    cursor.execute(
-        f"""
-        begin
-            :1 := BFILENAME('{DIR_NAME}', '{file_name1}');
-            :2 := BFILENAME('{DIR_NAME}', '{file_name2}');
-        end;
-        """,
-        [var1, var2],
-    )
-    assert var1.getvalue().read() == contents1
-    assert var2.getvalue().read() == contents2
-    cursor.execute("begin :1 := :2; end;", [var1, var2])
-    assert var1.getvalue().read() == contents2
diff --git a/tests/ext/test_ext_2200_bfile_type_async.py b/tests/ext/test_ext_2200_bfile_type_async.py
deleted file mode 100644
index 485cd330..00000000
--- a/tests/ext/test_ext_2200_bfile_type_async.py
+++ /dev/null
@@ -1,181 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2100 - Module for testing BFILE with asyncio. No special setup is required but
-the tests here will only be run if the local_database is enabled.
-"""
-
-import os
-import tempfile
-
-import oracledb
-import pytest
-
-DIR_NAME = "EXT_TEST_2200_DIR"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend, skip_unless_thin_mode, skip_unless_local_database
-):
-    pass
-
-
-@pytest.fixture
-def temp_dir(test_env):
-    with tempfile.TemporaryDirectory() as temp_dir:
-        user = test_env.main_user
-        with test_env.get_admin_connection() as conn:
-            with conn.cursor() as cursor:
-                cursor.execute(
-                    f"""
-                    create or replace directory {DIR_NAME}
-                    as '{temp_dir}'
-                    """
-                )
-                cursor.execute(f"grant read on directory {DIR_NAME} to {user}")
-        yield temp_dir
-
-
-async def test_ext_2200(temp_dir, async_cursor):
-    "E2200 - test fileexists() and getfilename()"
-    file_name = "test_2200.txt"
-    contents = b"Some arbitrary data for test 2200"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    await async_cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = await async_cursor.fetchone()
-    assert await bfile.read() == contents
-    assert await bfile.fileexists()
-    assert bfile.getfilename() == (DIR_NAME, file_name)
-
-
-async def test_ext_2201(temp_dir, async_cursor):
-    "E2201 - test setfilename()"
-    file_name = "test_2201.txt"
-    contents = b"Some arbitrary data for test 2201"
-    new_file_name = "test_2201b.txt"
-    new_contents = b"Some arbitrary different data for test 2201"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    with open(os.path.join(temp_dir, new_file_name), "wb") as f:
-        f.write(new_contents)
-    await async_cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = await async_cursor.fetchone()
-    assert await bfile.read() == contents
-    bfile.setfilename(DIR_NAME, new_file_name)
-    assert await bfile.read() == new_contents
-
-
-async def test_ext_2202(temp_dir, async_cursor, test_env):
-    "E2202 - test BFILE with LOB methods"
-    file_name = "test_2202.txt"
-    contents = b"Some arbitrary data for test 2202"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    await async_cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = await async_cursor.fetchone()
-    assert await bfile.size() == len(contents)
-    assert await bfile.read(7) == contents[6:]
-    assert await bfile.read(7, 2) == contents[6:8]
-    assert not await bfile.isopen()
-    await bfile.open()
-    assert await bfile.isopen()
-    await bfile.close()
-    assert not await bfile.isopen()
-    with test_env.assert_raises_full_code("DPY-3025"):
-        await bfile.getchunksize()
-    with test_env.assert_raises_full_code("DPY-3025"):
-        await bfile.trim(1)
-    with test_env.assert_raises_full_code("DPY-3025"):
-        await bfile.write("1")
-
-
-async def test_ext_2203(temp_dir, async_conn, async_cursor):
-    "E2203 - test binding a BFILE"
-    file_name = "test_2203.txt"
-    contents = b"Some arbitrary data for test 2203"
-    with open(os.path.join(temp_dir, file_name), "wb") as f:
-        f.write(contents)
-    await async_cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = await async_cursor.fetchone()
-    await async_cursor.execute("truncate table TestBfiles")
-    await async_cursor.execute(
-        "insert into TestBfiles values (:1, :2)", [1, bfile]
-    )
-    await async_conn.commit()
-
-
-async def test_ext_2204(temp_dir, async_cursor, test_env):
-    "E2204 - test reading from a missing file"
-    file_name = "test_2204.txt"
-    await async_cursor.execute(
-        "select bfilename(:1, :2) from dual",
-        [DIR_NAME, file_name],
-    )
-    (bfile,) = await async_cursor.fetchone()
-    assert bfile.getfilename() == (DIR_NAME, file_name)
-    assert not await bfile.fileexists()
-    with test_env.assert_raises_full_code("ORA-22288"):
-        await bfile.read()
-
-
-async def test_ext_2205(temp_dir, async_cursor):
-    "E2205 - test setting and getting BFILE var"
-    file_name1 = "test1.txt"
-    contents1 = b"extended test 2105 - first file"
-    with open(os.path.join(temp_dir, file_name1), "wb") as f:
-        f.write(contents1)
-    file_name2 = "test2.txt"
-    contents2 = b"extended test 2105 - second file"
-    with open(os.path.join(temp_dir, file_name2), "wb") as f:
-        f.write(contents2)
-    var1 = async_cursor.var(oracledb.DB_TYPE_BFILE)
-    var2 = async_cursor.var(oracledb.DB_TYPE_BFILE)
-    await async_cursor.execute(
-        f"""
-        begin
-            :1 := BFILENAME('{DIR_NAME}', '{file_name1}');
-            :2 := BFILENAME('{DIR_NAME}', '{file_name2}');
-        end;
-        """,
-        [var1, var2],
-    )
-    assert await var1.getvalue().read() == contents1
-    assert await var2.getvalue().read() == contents2
-    await async_cursor.execute("begin :1 := :2; end;", [var1, var2])
-    assert await var1.getvalue().read() == contents2
diff --git a/tests/ext/test_ext_2300_tg.py b/tests/ext/test_ext_2300_tg.py
deleted file mode 100644
index df67904f..00000000
--- a/tests/ext/test_ext_2300_tg.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2300 - Module for testing Transaction Guard (TG). No special setup is required
-but the test suite makes use of debugging packages that are not intended for
-normal use. It also creates and drops a service.
-"""
-
-import oracledb
-import pytest
-
-SERVICE_NAME = "oracledb-test-tg"
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_service(test_env):
-    user = test_env.main_user
-    with test_env.get_admin_connection() as admin_conn:
-        with admin_conn.cursor() as cursor:
-            cursor.execute(
-                f"""
-                declare
-                    params          dbms_service.svc_parameter_array;
-                begin
-                    params('COMMIT_OUTCOME') := 'true';
-                    params('RETENTION_TIMEOUT') := 604800;
-                    dbms_service.create_service('{SERVICE_NAME}',
-                                                '{SERVICE_NAME}', params);
-                    dbms_service.start_service('{SERVICE_NAME}');
-                end;
-                """
-            )
-            cursor.execute(f"grant execute on dbms_tg_dbg to {user}")
-            cursor.execute(f"grant execute on dbms_app_cont to {user}")
-        yield
-        with admin_conn.cursor() as cursor:
-            cursor.execute(f"revoke execute on dbms_tg_dbg from {user}")
-            cursor.execute(f"revoke execute on dbms_app_cont from {user}")
-            cursor.callproc("dbms_service.stop_service", [SERVICE_NAME])
-            cursor.callproc("dbms_service.delete_service", [SERVICE_NAME])
-
-
-def test_ext_2300(test_env):
-    "E2300 - test standalone connection"
-    params = test_env.get_connect_params().copy()
-    params.parse_connect_string(test_env.connect_string)
-    params.set(service_name=SERVICE_NAME)
-    for arg_name in ("pre_commit", "post_commit"):
-        conn = oracledb.connect(params=params)
-        cursor = conn.cursor()
-        cursor.execute("truncate table TestTempTable")
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            [2300, "String for test 2300"],
-        )
-        full_arg_name = f"dbms_tg_dbg.tg_failpoint_{arg_name}"
-        cursor.execute(
-            f"""
-            begin
-                dbms_tg_dbg.set_failpoint({full_arg_name});
-            end;
-            """
-        )
-        ltxid = conn.ltxid
-        with test_env.assert_raises_full_code("DPY-4011"):
-            conn.commit()
-        conn = oracledb.connect(params=params)
-        cursor = conn.cursor()
-        committed_var = cursor.var(bool)
-        completed_var = cursor.var(bool)
-        cursor.callproc(
-            "dbms_app_cont.get_ltxid_outcome",
-            [ltxid, committed_var, completed_var],
-        )
-        expected_value = arg_name == "post_commit"
-        assert committed_var.getvalue() == expected_value
-        assert completed_var.getvalue() == expected_value
-
-
-def test_ext_2301(test_env):
-    "E2301 - test pooled connection"
-    params = test_env.get_pool_params().copy()
-    params.parse_connect_string(test_env.connect_string)
-    params.set(service_name=SERVICE_NAME, max=10)
-    pool = oracledb.create_pool(params=params)
-    for arg_name in ("pre_commit", "post_commit"):
-        conn = pool.acquire()
-        cursor = conn.cursor()
-        cursor.execute("truncate table TestTempTable")
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            [2300, "String for test 2300"],
-        )
-        full_arg_name = f"dbms_tg_dbg.tg_failpoint_{arg_name}"
-        cursor.execute(
-            f"""
-            begin
-                dbms_tg_dbg.set_failpoint({full_arg_name});
-            end;
-            """
-        )
-        ltxid = conn.ltxid
-        with test_env.assert_raises_full_code("DPY-4011"):
-            conn.commit()
-        conn = pool.acquire()
-        cursor = conn.cursor()
-        committed_var = cursor.var(bool)
-        completed_var = cursor.var(bool)
-        cursor.callproc(
-            "dbms_app_cont.get_ltxid_outcome",
-            [ltxid, committed_var, completed_var],
-        )
-        expected_value = arg_name == "post_commit"
-        assert committed_var.getvalue() == expected_value
-        assert completed_var.getvalue() == expected_value
diff --git a/tests/ext/test_ext_2400_tg_async.py b/tests/ext/test_ext_2400_tg_async.py
deleted file mode 100644
index 85075d82..00000000
--- a/tests/ext/test_ext_2400_tg_async.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2400 - Module for testing Transaction Guard (TG) using asyncio. No special
-setup is required but the test suite makes use of debugging packages that are
-not intended for normal use. It also creates and drops a service.
-"""
-
-import oracledb
-import pytest
-
-SERVICE_NAME = "oracledb-test-tg-async"
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_service(test_env):
-    user = test_env.main_user
-    with test_env.get_admin_connection() as admin_conn:
-        with admin_conn.cursor() as cursor:
-            cursor.execute(
-                f"""
-                declare
-                    params          dbms_service.svc_parameter_array;
-                begin
-                    params('COMMIT_OUTCOME') := 'true';
-                    params('RETENTION_TIMEOUT') := 604800;
-                    dbms_service.create_service('{SERVICE_NAME}',
-                                                '{SERVICE_NAME}', params);
-                    dbms_service.start_service('{SERVICE_NAME}');
-                end;
-                """
-            )
-            cursor.execute(f"grant execute on dbms_tg_dbg to {user}")
-            cursor.execute(f"grant execute on dbms_app_cont to {user}")
-        yield
-        with admin_conn.cursor() as cursor:
-            cursor.execute(f"revoke execute on dbms_tg_dbg from {user}")
-            cursor.execute(f"revoke execute on dbms_app_cont from {user}")
-            cursor.callproc("dbms_service.stop_service", [SERVICE_NAME])
-            cursor.callproc("dbms_service.delete_service", [SERVICE_NAME])
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_ext_2400(test_env):
-    "E2400 - test standalone connection"
-    params = test_env.get_connect_params().copy()
-    params.parse_connect_string(test_env.connect_string)
-    params.set(service_name=SERVICE_NAME)
-    for arg_name in ("pre_commit", "post_commit"):
-        conn = await oracledb.connect_async(params=params)
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            [2400, "String for test 2400"],
-        )
-        full_arg_name = f"dbms_tg_dbg.tg_failpoint_{arg_name}"
-        await cursor.execute(
-            f"""
-            begin
-                dbms_tg_dbg.set_failpoint({full_arg_name});
-            end;
-            """
-        )
-        ltxid = conn.ltxid
-        with test_env.assert_raises_full_code("DPY-4011"):
-            await conn.commit()
-        conn = await oracledb.connect_async(params=params)
-        cursor = conn.cursor()
-        committed_var = cursor.var(bool)
-        completed_var = cursor.var(bool)
-        await cursor.callproc(
-            "dbms_app_cont.get_ltxid_outcome",
-            [ltxid, committed_var, completed_var],
-        )
-        expected_value = arg_name == "post_commit"
-        assert committed_var.getvalue() == expected_value
-        assert completed_var.getvalue() == expected_value
-
-
-async def test_ext_2401(test_env):
-    "E2401 - test pooled connection"
-    params = test_env.get_pool_params().copy()
-    params.parse_connect_string(test_env.connect_string)
-    params.set(service_name=SERVICE_NAME, max=10)
-    pool = oracledb.create_pool_async(params=params)
-    for arg_name in ("pre_commit", "post_commit"):
-        async with pool.acquire() as conn:
-            cursor = conn.cursor()
-            await cursor.execute("truncate table TestTempTable")
-            await cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:1, :2)
-                """,
-                [2400, "String for test 2400"],
-            )
-            full_arg_name = f"dbms_tg_dbg.tg_failpoint_{arg_name}"
-            await cursor.execute(
-                f"""
-                begin
-                    dbms_tg_dbg.set_failpoint({full_arg_name});
-                end;
-                """
-            )
-            ltxid = conn.ltxid
-            with test_env.assert_raises_full_code("DPY-4011"):
-                await conn.commit()
-        async with pool.acquire() as conn:
-            cursor = conn.cursor()
-            committed_var = cursor.var(bool)
-            completed_var = cursor.var(bool)
-            await cursor.callproc(
-                "dbms_app_cont.get_ltxid_outcome",
-                [ltxid, committed_var, completed_var],
-            )
-            expected_value = arg_name == "post_commit"
-            assert committed_var.getvalue() == expected_value
-            assert completed_var.getvalue() == expected_value
-    await pool.close()
diff --git a/tests/ext/test_ext_2500_config_cache.py b/tests/ext/test_ext_2500_config_cache.py
deleted file mode 100644
index 8eee0370..00000000
--- a/tests/ext/test_ext_2500_config_cache.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2500 - Module for testing caching of configurations from config stores. No
-special setup is required but the tests here will only be run if the
-run_long_tests value is enabled.
-"""
-
-import time
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_run_long_tests):
-    pass
-
-
-def test_ext_2500(test_env):
-    "E2500 - test config is cached"
-    sdu = 4096
-    protocol = "proto-test"
-    connect_string = f"{protocol}://test_ext_2500"
-    config = dict(
-        connect_descriptor=test_env.connect_string,
-        pyo=dict(sdu=sdu),
-    )
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        passed_params.set_from_config(config)
-        config["pyo"]["sdu"] *= 2
-
-    oracledb.register_protocol(protocol, hook)
-    try:
-        for i in range(2):
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.sdu == sdu
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_ext_2501(test_env):
-    "E2501 - test config cache is disabled with config_time_to_live = 0"
-    sdu = 4096
-    protocol = "proto-test"
-    connect_string = f"{protocol}://test_ext_2501"
-    config = dict(
-        connect_descriptor=test_env.connect_string,
-        config_time_to_live=0,
-        pyo=dict(sdu=sdu),
-    )
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        passed_params.set_from_config(config)
-        config["pyo"]["sdu"] *= 2
-
-    oracledb.register_protocol(protocol, hook)
-    try:
-        for i in range(2):
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.sdu == sdu + i * sdu
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_ext_2502(test_env):
-    "E2502 - test config cache expiry time"
-    sdu = 4096
-    protocol = "proto-test"
-    connect_string = f"{protocol}://test_ext_2502"
-    config = dict(
-        connect_descriptor=test_env.connect_string,
-        config_time_to_live=2,
-        pyo=dict(sdu=sdu),
-    )
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        passed_params.set_from_config(config)
-        config["pyo"]["sdu"] *= 2
-
-    oracledb.register_protocol(protocol, hook)
-    try:
-        expected_sdu = sdu
-        for i in range(7):
-            if i == 3 or i == 6:
-                expected_sdu *= 2
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.sdu == expected_sdu
-            time.sleep(0.75)
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_ext_2503(test_env):
-    "E2503 - test config cache soft/hard expiry time"
-    sdu = 4096
-    protocol = "proto-test"
-    connect_string = f"{protocol}://test_ext_2503"
-    config = dict(
-        connect_descriptor=test_env.connect_string,
-        config_time_to_live=2,
-        config_time_to_live_grace_period=3,
-        pyo=dict(sdu=sdu),
-    )
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        if config["pyo"]["sdu"] > sdu:
-            raise Exception("Arbitrary exception!")
-        passed_params.set_from_config(config)
-        config["pyo"]["sdu"] *= 2
-
-    oracledb.register_protocol(protocol, hook)
-    try:
-        for i in range(2):
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.sdu == sdu
-            time.sleep(3)
-        with test_env.assert_raises_full_code("DPY-2056"):
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-    finally:
-        oracledb.register_protocol(protocol, None)
diff --git a/tests/ext/test_ext_2600_sessionless_transaction.py b/tests/ext/test_ext_2600_sessionless_transaction.py
deleted file mode 100644
index accbb222..00000000
--- a/tests/ext/test_ext_2600_sessionless_transaction.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2600 - Module for testing timing of sessionless transactions. No special setup
-is required but the tests here will only be run if the run_long_tests value is
-enabled.
-"""
-
-import time
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    skip_unless_sessionless_transactions_supported, skip_unless_run_long_tests
-):
-    pass
-
-
-def test_ext_2600(cursor, test_env):
-    "E2600 - test error conditions with client API"
-    cursor.execute("truncate table TestTempTable")
-
-    transaction_id = "test_2600_transaction_id"
-    other_transaction_id = "test_2600_different_transaction_id"
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-
-        # suspending a non-existent transaction will fail only in thin
-        # mode
-        if conn.thin:
-            with test_env.assert_raises_full_code("DPY-3036"):
-                conn.suspend_sessionless_transaction()
-
-        # start first sessionless transaction
-        conn.begin_sessionless_transaction(
-            transaction_id=transaction_id, timeout=5
-        )
-
-        # starting another sessionless transaction will fail only in thin
-        # mode
-        if conn.thin:
-            with test_env.assert_raises_full_code("DPY-3035"):
-                conn.begin_sessionless_transaction(
-                    transaction_id=other_transaction_id, timeout=5
-                )
-
-        cursor.execute(
-            """
-            INSERT INTO TestTempTable(IntCol, StringCol1)
-            VALUES(:1, :2)
-            """,
-            (1, "test_row"),
-        )
-
-        # suspend using server API should fail
-        with test_env.assert_raises_full_code("DPY-3034"):
-            cursor.callproc("dbms_transaction.suspend_transaction")
-
-        # suspend using client API should succeed
-        conn.suspend_sessionless_transaction()
-
-        # wait till it times out
-        time.sleep(10)
-
-        # attmpting to resume the transaction should fail
-        with test_env.assert_raises_full_code("ORA-26218"):
-            conn.resume_sessionless_transaction(transaction_id=transaction_id)
diff --git a/tests/ext/test_ext_2700_sessionless_transaction_async.py b/tests/ext/test_ext_2700_sessionless_transaction_async.py
deleted file mode 100644
index 226e914c..00000000
--- a/tests/ext/test_ext_2700_sessionless_transaction_async.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-E2700 - Module for testing timing of sessionless transactions using asyncio. No
-special setup is required but the tests here will only be run if the
-run_long_tests value is enabled.
-"""
-
-import asyncio
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend,
-    skip_unless_thin_mode,
-    skip_unless_sessionless_transactions_supported,
-    skip_unless_run_long_tests,
-):
-    pass
-
-
-async def test_ext_2700(test_env, async_cursor):
-    "E2700 - test error conditions with client API"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    transaction_id = "test_2600_transaction_id"
-    other_transaction_id = "test_2600_different_transaction_id"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-
-        # suspending a non-existent transaction will fail
-        with test_env.assert_raises_full_code("DPY-3036"):
-            await conn.suspend_sessionless_transaction()
-
-        # start first sessionless transaction
-        await conn.begin_sessionless_transaction(
-            transaction_id=transaction_id, timeout=5
-        )
-
-        # starting another sessionless transaction will fail
-        with test_env.assert_raises_full_code("DPY-3035"):
-            await conn.begin_sessionless_transaction(
-                transaction_id=other_transaction_id, timeout=5
-            )
-
-        await cursor.execute(
-            """
-            INSERT INTO TestTempTable(IntCol, StringCol1)
-            VALUES(:1, :2)
-            """,
-            (1, "test_row"),
-        )
-
-        # suspend using server API should fail
-        with test_env.assert_raises_full_code("DPY-3034"):
-            await cursor.callproc("dbms_transaction.suspend_transaction")
-
-        # suspend using client API should succeed
-        await conn.suspend_sessionless_transaction()
-
-        # wait till it times out
-        await asyncio.sleep(10)
-
-        # attmpting to resume the transaction should fail
-        with test_env.assert_raises_full_code("ORA-26218"):
-            await conn.resume_sessionless_transaction(
-                transaction_id=transaction_id
-            )
diff --git a/tests/sql/create_schema.sql b/tests/sql/create_schema.sql
deleted file mode 100644
index 9f35eb5b..00000000
--- a/tests/sql/create_schema.sql
+++ /dev/null
@@ -1,1608 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite. It is executed by
- * the Python script create_schema.py.
- *---------------------------------------------------------------------------*/
-
-alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'
-/
-alter session set nls_numeric_characters='.,'
-/
-alter session set time_zone='+00:00'
-/
-
-create user &main_user identified by &main_password
-/
-
-create user &proxy_user identified by &proxy_password
-/
-alter user &proxy_user grant connect through &main_user
-/
-
-grant create session to &proxy_user
-/
-
-grant
-    create session,
-    create table,
-    create procedure,
-    create type,
-    create view,
-    select any dictionary,
-    change notification,
-    unlimited tablespace,
-    ctxapp
-to &main_user
-/
-
-grant aq_administrator_role to &main_user
-/
-
-begin
-
-    for r in
-            ( select role
-              from dba_roles
-              where role in ('SODA_APP')
-            ) loop
-        execute immediate 'grant ' || r.role || ' to &main_user';
-    end loop;
-
-end;
-/
-
--- create edition
-create edition &edition_name
-/
-
-grant use on edition &edition_name to &main_user
-/
-
--- create types
-create type &main_user..udt_SubObject as object (
-    SubNumberValue                      number,
-    SubStringValue                      varchar2(60)
-);
-/
-
-create type &main_user..udt_ObjectArray as
-varray(10) of &main_user..udt_SubObject;
-/
-
-create type &main_user..udt_Object as object (
-    NumberValue                         number,
-    StringValue                         varchar2(60),
-    FixedCharValue                      char(10),
-    NStringValue                        nvarchar2(60),
-    NFixedCharValue                     nchar(10),
-    RawValue                            raw(16),
-    IntValue                            integer,
-    SmallIntValue                       smallint,
-    RealValue                           real,
-    DoublePrecisionValue                double precision,
-    FloatValue                          float,
-    BinaryFloatValue                    binary_float,
-    BinaryDoubleValue                   binary_double,
-    DateValue                           date,
-    TimestampValue                      timestamp,
-    TimestampTZValue                    timestamp with time zone,
-    TimestampLTZValue                   timestamp with local time zone,
-    CLOBValue                           clob,
-    NCLOBValue                          nclob,
-    BLOBValue                           blob,
-    SubObjectValue                      &main_user..udt_SubObject,
-    SubObjectArray                      &main_user..udt_ObjectArray
-);
-/
-
-create type &main_user..udt_Array as varray(10) of number;
-/
-
-create type &main_user..udt_UnconstrainedTable as table of number;
-/
-
-create or replace type &main_user..udt_Building as object (
-    BuildingId                          number(9),
-    NumFloors                           number(3),
-    Description                         varchar2(60),
-    DateBuilt                           date
-);
-/
-
-create or replace type &main_user..udt_Book as object (
-    Title                               varchar2(100),
-    Authors                             varchar2(100),
-    Price                               number(5,2)
-);
-/
-
-create or replace type &main_user..udt_ObjectWithXmlType as object (
-    NumberValue                         number(9),
-    XMLValue                            sys.xmltype,
-    StringValue                         varchar2(60)
-);
-/
-
-create or replace type &main_user..udt_XmlTypeArray
-as table of sys.xmltype;
-/
-
-create or replace type &main_user..udt_TableOfNumber as table of number;
-/
-
-create or replace type &main_user..udt_TableOfTableOfNumber
-as table of &main_user..udt_TableOfNumber;
-/
-
-create or replace type &main_user..udt_VarrayOfTableOfNumber
-as varray(5) of &main_user..udt_TableOfNumber;
-/
-
-create or replace type &main_user..udt_VarrayOfNumber
-as varray(5) of number;
-/
-
-create or replace type &main_user..udt_TableOfVarrayOfNumber
-as table of &main_user..udt_VarrayOfNumber;
-/
-
--- create tables
-create table &main_user..TestNumbers (
-    IntCol                              number(9) not null,
-    LongIntCol                          number(16) not null,
-    NumberCol                           number(9, 2) not null,
-    FloatCol                            float not null,
-    UnconstrainedCol                    number not null,
-    NullableCol                         number(38)
-)
-/
-
-create table &main_user..TestStrings (
-    IntCol                              number(9) not null,
-    StringCol                           varchar2(20) not null,
-    RawCol                              raw(30) not null,
-    FixedCharCol                        char(40) not null,
-    NullableCol                         varchar2(50)
-)
-/
-
-create table &main_user..TestUnicodes (
-    IntCol                              number(9) not null,
-    UnicodeCol                          nvarchar2(20) not null,
-    FixedUnicodeCol                     nchar(40) not null,
-    NullableCol                         nvarchar2(50)
-)
-/
-
-create table &main_user..TestDates (
-    IntCol                              number(9) not null,
-    DateCol                             date not null,
-    NullableCol                         date
-)
-/
-
-create table &main_user..TestCLOBs (
-    IntCol                              number(9) not null,
-    CLOBCol                             clob not null,
-    ExtraNumCol1                        number(9),
-    ExtraCLOBCol1                       clob,
-    ExtraNumCol2                        number(9),
-    ExtraCLOBCol2                       clob
-)
-/
-
-create table &main_user..TestNCLOBs (
-    IntCol                              number(9) not null,
-    NCLOBCol                            nclob not null,
-    ExtraNumCol1                        number(9),
-    ExtraNCLOBCol1                      nclob,
-    ExtraNumCol2                        number(9),
-    ExtraNCLOBCol2                      nclob
-)
-/
-
-create table &main_user..TestBLOBs (
-    IntCol                              number(9) not null,
-    BLOBCol                             blob not null,
-    ExtraNumCol1                        number(9),
-    ExtraBLOBCol1                       blob,
-    ExtraNumCol2                        number(9),
-    ExtraBLOBCol2                       blob
-)
-/
-
-create table &main_user..TestBfiles (
-    IntCol                              number(9) not null,
-    BfileCol                            bfile not null
-)
-/
-
-create table &main_user..TestXML (
-    IntCol                              number(9) not null,
-    XMLCol                              xmltype not null
-)
-/
-
-create table &main_user..TestTempXML (
-    IntCol                              number(9) not null,
-    XMLCol                              xmltype not null
-)
-/
-
-create table &main_user..TestLongs (
-    IntCol                              number(9) not null,
-    LongCol                             long
-) nocompress
-/
-
-create table &main_user..TestLongRaws (
-    IntCol                              number(9) not null,
-    LongRawCol                          long raw
-) nocompress
-/
-
-create table &main_user..TestTempTable (
-    IntCol                              number(9) not null,
-    StringCol1                          varchar2(400),
-    StringCol2                          varchar2(400),
-    NumberCol                           number(25,2),
-    constraint TestTempTable_pk primary key (IntCol)
-)
-/
-
-create table &main_user..TestArrayDML (
-    IntCol                              number(9) not null,
-    StringCol                           varchar2(100),
-    IntCol2                             number(3),
-    constraint TestArrayDML_pk primary key (IntCol)
-)
-/
-
-create table &main_user..TestObjects (
-    IntCol                              number(9) not null,
-    ObjectCol                           &main_user..udt_Object,
-    ArrayCol                            &main_user..udt_Array
-)
-/
-
-create table &main_user..TestTimestamps (
-    IntCol                              number(9) not null,
-    TimestampCol                        timestamp not null,
-    NullableCol                         timestamp,
-    TimestampPrecisionCol               timestamp(4)
-)
-/
-
-create table &main_user..TestTimestampLTZs (
-    IntCol                              number(9) not null,
-    TimestampLTZCol                     timestamp with local time zone not null,
-    NullableCol                         timestamp with local time zone,
-    TimestampLTZPrecisionCol            timestamp(5) with local time zone
-)
-/
-
-create table &main_user..TestTimestampTZs (
-    IntCol                              number(9) not null,
-    TimestampTZCol                      timestamp with time zone not null,
-    NullableCol                         timestamp with time zone,
-    TimestampTZPrecisionCol             timestamp(7) with time zone
-)
-/
-
-create table &main_user..TestIntervals (
-    IntCol                              number(9) not null,
-    IntervalCol                         interval day to second not null,
-    NullableCol                         interval day to second,
-    IntervalPrecisionCol                interval day(7) to second,
-    IntervalPrecisionScaleCol           interval day(8) to second(9)
-)
-/
-
-create table &main_user..TestIntervalYMs (
-    IntCol                              number(9) not null,
-    IntervalCol                         interval year to month not null,
-    NullableCol                         interval year to month,
-    IntervalPrecisionCol                interval year(3) to month
-)
-/
-
-create table &main_user..TestUniversalRowids (
-    IntCol                              number(9) not null,
-    StringCol                           varchar2(250) not null,
-    DateCol                             date not null,
-    constraint TestUniversalRowids_pk primary key (IntCol, StringCol, DateCol)
-) organization index
-/
-
-create table &main_user..TestBuildings (
-    BuildingId                          number(9) not null,
-    BuildingObj                         &main_user..udt_Building not null
-)
-/
-
-create table &main_user..TestRowids (
-    IntCol                              number(9) not null,
-    RowidCol                            rowid,
-    URowidCol                           urowid
-)
-/
-
-create table &main_user..TestJsonCols (
-    IntCol                              number(9) not null,
-    JsonVarchar                         varchar2(4000) not null,
-    JsonClob                            clob not null,
-    JsonBlob                            blob not null,
-    constraint TestJsonCols_ck_1 check (JsonVarchar is json format json),
-    constraint TestJsonCols_ck_2 check (JsonClob is json format json),
-    constraint TestJsonCols_ck_3 check (JsonBlob is json format json)
-)
-/
-
-create table &main_user..TestAllTypes (
-    NumberValue                         number,
-    StringValue                         varchar2(60),
-    FixedCharValue                      char(10),
-    NStringValue                        nvarchar2(60),
-    NFixedCharValue                     nchar(10),
-    RawValue                            raw(16),
-    IntValue                            integer,
-    SmallIntValue                       smallint,
-    RealValue                           real,
-    DecimalValue                        number(20, 6),
-    DoublePrecisionValue                double precision,
-    FloatValue                          float,
-    BinaryFloatValue                    binary_float,
-    BinaryDoubleValue                   binary_double,
-    DateValue                           date,
-    TimestampValue                      timestamp,
-    TimestampTZValue                    timestamp with time zone,
-    TimestampLTZValue                   timestamp with local time zone,
-    CLOBValue                           clob,
-    NCLOBValue                          nclob,
-    BLOBValue                           blob,
-    SubObjectValue                      &main_user..udt_SubObject,
-    SubObjectArray                      &main_user..udt_ObjectArray,
-    InvisibleValue                      number invisible
-)
-/
-
-create table &main_user..PlsqlSessionCallbacks (
-    RequestedTag          varchar2(250),
-    ActualTag             varchar2(250),
-    FixupTimestamp        timestamp
-)
-/
-
-create table &main_user..TestDataframe (
-    Id                                  number(9),
-    FirstName                           varchar2(100),
-    LastName                            varchar2(100),
-    City                                varchar2(100),
-    Country                             varchar2(100),
-    DateOfBirth                         date,
-    Salary                              number(9, 2),
-    CreditScore                         number(3, 0),
-    LastUpdated                         timestamp,
-    DecimalData                         number(15, 4),
-    IntegerData                         number(15),
-    LongIntegerData                     number(38),
-    FloatData                           binary_float,
-    DoubleData                          binary_double,
-    RawData                             raw(100),
-    LongData                            clob,
-    LongRawData                         blob
-)
-/
-
-create table &main_user..NestedCollectionTests (
-    Id                    number(9),
-    TableCol              &main_user..udt_TableOfTableOfNumber,
-    VarrayCol             &main_user..udt_VarrayOfTableOfNumber
-)
-nested table TableCol store as NestedCollectionTests_nt (
-    nested table column_value store as NestedCollectionTests_nti
-)
-/
-
--- create queue table and queues for testing advanced queuing
-begin
-
-    dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_TAB',
-            '&main_user..UDT_BOOK');
-    dbms_aqadm.create_queue('&main_user..TEST_BOOK_QUEUE',
-            '&main_user..BOOK_QUEUE_TAB');
-    dbms_aqadm.start_queue('&main_user..TEST_BOOK_QUEUE');
-
-    dbms_aqadm.create_queue_table('&main_user..RAW_QUEUE_TAB', 'RAW');
-    dbms_aqadm.create_queue('&main_user..TEST_RAW_QUEUE',
-            '&main_user..RAW_QUEUE_TAB');
-    dbms_aqadm.start_queue('&main_user..TEST_RAW_QUEUE');
-
-    dbms_aqadm.create_queue_table('&main_user..BOOK_QUEUE_MULTI_TAB',
-            '&main_user..UDT_BOOK', multiple_consumers => TRUE);
-    dbms_aqadm.create_queue('&main_user..BOOK_QUEUE_MULTI',
-            '&main_user..BOOK_QUEUE_MULTI_TAB');
-    dbms_aqadm.start_queue('&main_user..BOOK_QUEUE_MULTI');
-    dbms_aqadm.add_subscriber('&main_user..BOOK_QUEUE_MULTI',
-            sys.aq$_agent('Sub1', null, null));
-
-end;
-/
-
--- create transformations
-begin
-    dbms_transform.create_transformation('&main_user', 'transform1',
-            '&main_user', 'UDT_BOOK', '&main_user', 'UDT_BOOK',
-            '&main_user..UDT_BOOK(source.user_data.TITLE, ' ||
-                    'source.user_data.AUTHORS, source.user_data.PRICE + 5)');
-    dbms_transform.create_transformation('&main_user', 'transform2',
-            '&main_user', 'UDT_BOOK', '&main_user', 'UDT_BOOK',
-            '&main_user..UDT_BOOK(source.user_data.TITLE, ' ||
-                    'source.user_data.AUTHORS, source.user_data.PRICE + 10)');
-end;
-/
-
--- populate tables
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestNumbers
-        values (i, power(38, i), i + i * 0.25, i + i * .75, i * i * i + i *.5,
-                decode(mod(i, 2), 0, null, power(143, i)));
-    end loop;
-end;
-/
-
-declare
-
-    t_RawValue                          raw(30);
-
-    function ConvertHexDigit(a_Value number) return varchar2 is
-    begin
-        if a_Value between 0 and 9 then
-            return to_char(a_Value);
-        end if;
-        return chr(ascii('A') + a_Value - 10);
-    end;
-
-    function ConvertToHex(a_Value varchar2) return varchar2 is
-        t_HexValue                      varchar2(60);
-        t_Digit                         number;
-    begin
-        for i in 1..length(a_Value) loop
-            t_Digit := ascii(substr(a_Value, i, 1));
-            t_HexValue := t_HexValue ||
-                    ConvertHexDigit(trunc(t_Digit / 16)) ||
-                    ConvertHexDigit(mod(t_Digit, 16));
-        end loop;
-        return t_HexValue;
-    end;
-
-begin
-    for i in 1..10 loop
-        t_RawValue := hextoraw(ConvertToHex('Raw ' || to_char(i)));
-        insert into &main_user..TestStrings
-        values (i, 'String ' || to_char(i), t_RawValue,
-                'Fixed Char ' || to_char(i),
-                decode(mod(i, 2), 0, null, 'Nullable ' || to_char(i)));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestUnicodes
-        values (i, 'Unicode ' || unistr('\3042') || ' ' || to_char(i),
-                'Fixed Unicode ' || to_char(i),
-                decode(mod(i, 2), 0, null, unistr('Nullable ') || to_char(i)));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestDates
-        values (i, to_date(20021209, 'YYYYMMDD') + i + i * .1,
-                decode(mod(i, 2), 0, null,
-                to_date(20021209, 'YYYYMMDD') + i + i + i * .15));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..100 loop
-        insert into &main_user..TestXML
-        values (i, '<?xml version="1.0"?><records>' ||
-                dbms_random.string('x', 1024) || '</records>');
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestTimestamps
-        values (i, to_timestamp('20021209', 'YYYYMMDD') +
-                    to_dsinterval(to_char(i) || ' 00:00:' || to_char(i * 2) ||
-                    '.' || to_char(i * 50)),
-                decode(mod(i, 2), 0, to_timestamp(null, 'YYYYMMDD'),
-                to_timestamp('20021209', 'YYYYMMDD') +
-                    to_dsinterval(to_char(i + 1) || ' 00:00:' ||
-                    to_char(i * 3) || '.' || to_char(i * 125))),
-                to_timestamp('20091214', 'YYYYMMDD'));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestTimestampLTZs
-        values (i, to_timestamp_tz('20220602 ' ||
-                    decode(mod(i, 2), 0, '-', '+') ||
-                    ltrim(to_char(i, '00')) || ':' ||
-                    decode(mod(i, 4), 0, '00', '30'), 'YYYYMMDD TZH:TZM') +
-                    to_dsinterval(to_char(i) || ' 00:00:' || to_char(i * 2) ||
-                    '.' || to_char(i * 50)),
-                decode(mod(i, 2), 0, to_timestamp(null, 'YYYYMMDD'),
-                to_timestamp_tz('20220602 00:00', 'YYYYMMDD TZH:TZM') +
-                    to_dsinterval(to_char(i + 1) || ' 00:00:' ||
-                    to_char(i * 3) || '.' || to_char(i * 125))),
-                to_timestamp_tz('20091214 00:00', 'YYYYMMDD TZH:TZM'));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestTimestampTZs
-        values (i, to_timestamp_tz('20220603 ' ||
-                    decode(mod(i, 2), 0, '-', '+') ||
-                    ltrim(to_char(i, '00')) || ':' ||
-                    decode(mod(i, 4), 0, '00', '30'), 'YYYYMMDD TZH:TZM') +
-                    to_dsinterval(to_char(i) || ' 00:00:' || to_char(i * 2) ||
-                    '.' || to_char(i * 50)),
-                decode(mod(i, 2), 0, to_timestamp(null, 'YYYYMMDD'),
-                to_timestamp_tz('20220603 00:00', 'YYYYMMDD TZH:TZM') +
-                    to_dsinterval(to_char(i + 1) || ' 00:00:' ||
-                    to_char(i * 3) || '.' || to_char(i * 125))),
-                to_timestamp_tz('20091214 00:00', 'YYYYMMDD TZH:TZM'));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestIntervals
-        values (i, to_dsinterval(to_char(i) || ' ' || to_char(i) || ':' ||
-                to_char(i * 2) || ':' || to_char(i * 3)),
-                decode(mod(i, 2), 0, to_dsinterval(null),
-                to_dsinterval(to_char(i + 5) || ' ' || to_char(i + 2) || ':' ||
-                to_char(i * 2 + 5) || ':' || to_char(i * 3 + 5))),
-                to_dsinterval('8 05:15:00'),
-                to_dsinterval('10 12:15:15'));
-    end loop;
-end;
-/
-
-begin
-    for i in 1..10 loop
-        insert into &main_user..TestIntervalYMs
-        values (i, to_yminterval(to_char(i - 5) || '-' || to_char(i)),
-                decode(mod(i, 2), 0, to_yminterval(null),
-                to_yminterval(to_char(i + 5) || '-' || to_char(i + 2))),
-                to_yminterval('3-8'));
-    end loop;
-end;
-/
-
-insert into &main_user..TestObjects values (1,
-    &main_user..udt_Object(1, 'First row', 'First', 'N First Row', 'N First',
-        '52617720446174612031', 2, 5, 12.125, 0.5, 12.5, 25.25, 50.125,
-        to_date(20070306, 'YYYYMMDD'),
-        to_timestamp('20080912 16:40:00', 'YYYYMMDD HH24:MI:SS'),
-        to_timestamp_tz('20091013 17:50:00 00:00',
-                'YYYYMMDD HH24:MI:SS TZH:TZM'),
-        to_timestamp_tz('20101114 18:55:00 00:00',
-                'YYYYMMDD HH24:MI:SS TZH:TZM'),
-        'Short CLOB value', 'Short NCLOB Value',
-        utl_raw.cast_to_raw('Short BLOB value'),
-        &main_user..udt_SubObject(11, 'Sub object 1'),
-        &main_user..udt_ObjectArray(
-                &main_user..udt_SubObject(5, 'first element'),
-                &main_user..udt_SubObject(6, 'second element'))),
-    &main_user..udt_Array(5, 10, null, 20))
-/
-
-insert into &main_user..TestObjects values (2, null,
-    &main_user..udt_Array(3, null, 9, 12, 15))
-/
-
-insert into &main_user..TestObjects values (3,
-    &main_user..udt_Object(3, 'Third row', 'Third', 'N Third Row', 'N Third',
-        '52617720446174612033', 4, 10, 6.5, 0.75, 43.25, 86.5, 192.125,
-        to_date(20070621, 'YYYYMMDD'),
-        to_timestamp('20071213 07:30:45', 'YYYYMMDD HH24:MI:SS'),
-        to_timestamp_tz('20170621 23:18:45 00:00',
-                'YYYYMMDD HH24:MI:SS TZH:TZM'),
-        to_timestamp_tz('20170721 08:27:13 00:00',
-                'YYYYMMDD HH24:MI:SS TZH:TZM'),
-        'Another short CLOB value', 'Another short NCLOB Value',
-        utl_raw.cast_to_raw('Yet another short BLOB value'),
-        &main_user..udt_SubObject(13, 'Sub object 3'),
-        &main_user..udt_ObjectArray(
-                &main_user..udt_SubObject(10, 'element #1'),
-                &main_user..udt_SubObject(20, 'element #2'),
-                &main_user..udt_SubObject(30, 'element #3'),
-                &main_user..udt_SubObject(40, 'element #4'))), null)
-/
-
-insert into &main_user..TestJsonCols values (1,
-    '[1, 2, 3]', '[4, 5, 6]', utl_raw.cast_to_raw('[7, 8, 9]'))
-/
-
-commit
-/
-
--- create procedures for testing callproc()
-create procedure &main_user..proc_Test (
-    a_InValue                           varchar2,
-    a_InOutValue                        in out number,
-    a_OutValue                          out number
-) as
-begin
-    a_InOutValue := a_InOutValue * length(a_InValue);
-    a_OutValue := length(a_InValue);
-end;
-/
-
-create procedure &main_user..proc_Test2 (
-    a_InValue                           varchar2,
-    a_InOutValue                        in out number,
-    a_OutValue                          out boolean
-) as
-begin
-    a_InOutValue := a_InOutValue * length(a_InValue);
-    a_OutValue := false;
-    if length(a_InValue) >= 2 then
-        a_OutValue := true;
-    end if;
-end;
-/
-
-create procedure &main_user..proc_TestNoArgs as
-begin
-    null;
-end;
-/
-
--- create procedure for testing refcursor
-create procedure &main_user..myrefcursorproc (
-    a_RefCursor                         out sys_refcursor
-) as
-begin
-    open a_RefCursor for
-        select *
-        from TestTempTable;
-end;
-/
-
--- create functions for testing callfunc()
-create function &main_user..func_Test (
-    a_String                            varchar2,
-    a_ExtraAmount                       number
-) return number as
-begin
-    return length(a_String) + a_ExtraAmount;
-end;
-/
-
-create function &main_user..func_Test2 (
-    a_String                            varchar2,
-    a_ExtraAmount                       number,
-    a_Boolean                           boolean
-) return number as
-begin
-    if a_Boolean then
-        return length(a_String) + a_ExtraAmount;
-    end if;
-    return length(a_String) - a_ExtraAmount;
-end;
-/
-
-create function &main_user..func_TestNoArgs
-return number as
-begin
-    return 712;
-end;
-/
-
--- create packages
-create or replace package &main_user..pkg_TestStringArrays as
-
-    type udt_StringList is table of varchar2(100) index by binary_integer;
-
-    function TestInArrays (
-        a_StartingLength                number,
-        a_Array                         udt_StringList
-    ) return number;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out nocopy udt_StringList
-    );
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out nocopy udt_StringList
-    );
-
-    procedure TestIndexBy (
-        a_Array                         out nocopy udt_StringList
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestStringArrays as
-
-    function TestInArrays (
-        a_StartingLength                number,
-        a_Array                         udt_StringList
-    ) return number is
-        t_Length                        number;
-    begin
-        t_Length := a_StartingLength;
-        for i in 1..a_Array.count loop
-            t_Length := t_Length + length(a_Array(i));
-        end loop;
-        return t_Length;
-    end;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out udt_StringList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := 'Converted element # ' ||
-                    to_char(i) || ' originally had length ' ||
-                    to_char(length(a_Array(i)));
-        end loop;
-    end;
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out udt_StringList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := 'Test out element # ' || to_char(i);
-        end loop;
-    end;
-
-    procedure TestIndexBy (
-        a_Array             out nocopy udt_StringList
-    ) is
-    begin
-        a_Array(-1048576) := 'First element';
-        a_Array(-576) := 'Second element';
-        a_Array(284) := 'Third element';
-        a_Array(8388608) := 'Fourth element';
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestUnicodeArrays as
-
-    type udt_UnicodeList is table of nvarchar2(100) index by binary_integer;
-
-    function TestInArrays (
-        a_StartingLength                number,
-        a_Array                         udt_UnicodeList
-    ) return number;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out nocopy udt_UnicodeList
-    );
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out nocopy udt_UnicodeList
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestUnicodeArrays as
-
-    function TestInArrays (
-        a_StartingLength                number,
-        a_Array                         udt_UnicodeList
-    ) return number is
-        t_Length                        number;
-    begin
-        t_Length := a_StartingLength;
-        for i in 1..a_Array.count loop
-            t_Length := t_Length + length(a_Array(i));
-        end loop;
-        return t_Length;
-    end;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out udt_UnicodeList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := unistr('Converted element ' || unistr('\3042') ||
-                    ' # ') || to_char(i) || ' originally had length ' ||
-                    to_char(length(a_Array(i)));
-        end loop;
-    end;
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out udt_UnicodeList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := unistr('Test out element ') || unistr('\3042') ||
-                    ' # ' || to_char(i);
-        end loop;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestNumberArrays as
-
-    type udt_NumberList is table of number index by binary_integer;
-
-    function TestInArrays (
-        a_StartingValue                 number,
-        a_Array                         udt_NumberList
-    ) return number;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out nocopy udt_NumberList
-    );
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out nocopy udt_NumberList
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestNumberArrays as
-
-    function TestInArrays (
-        a_StartingValue                 number,
-        a_Array                         udt_NumberList
-    ) return number is
-        t_Value                         number;
-    begin
-        t_Value := a_StartingValue;
-        for i in 1..a_Array.count loop
-            t_Value := t_Value + a_Array(i);
-        end loop;
-        return t_Value;
-    end;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out udt_NumberList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := a_Array(i) * 10;
-        end loop;
-    end;
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out udt_NumberList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := i * 100;
-        end loop;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestDateArrays as
-
-    type udt_DateList is table of date index by binary_integer;
-
-    function TestInArrays (
-        a_StartingValue                 number,
-        a_BaseDate                      date,
-        a_Array                         udt_DateList
-    ) return number;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out nocopy udt_DateList
-    );
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out nocopy udt_DateList
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestDateArrays as
-
-    function TestInArrays (
-        a_StartingValue                 number,
-        a_BaseDate                      date,
-        a_Array                         udt_DateList
-    ) return number is
-        t_Value                         number;
-    begin
-        t_Value := a_StartingValue;
-        for i in 1..a_Array.count loop
-            t_Value := t_Value + a_Array(i) - a_BaseDate;
-        end loop;
-        return t_Value;
-    end;
-
-    procedure TestInOutArrays (
-        a_NumElems                      number,
-        a_Array                         in out udt_DateList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := a_Array(i) + 7;
-        end loop;
-    end;
-
-    procedure TestOutArrays (
-        a_NumElems                      number,
-        a_Array                         out udt_DateList
-    ) is
-    begin
-        for i in 1..a_NumElems loop
-            a_Array(i) := to_date(20021212, 'YYYYMMDD') + i * 1.2;
-        end loop;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestRefCursors as
-
-    procedure TestOutCursor (
-        a_MaxIntValue                   number,
-        a_Cursor                        out sys_refcursor
-    );
-
-    function TestInCursor (
-        a_Cursor                        sys_refcursor
-    ) return varchar2;
-
-    function TestReturnCursor (
-        a_MaxIntValue                   number
-    ) return sys_refcursor;
-
-    procedure TestLobCursor (
-        a_Value                         varchar2,
-        a_Cursor                        out sys_refcursor
-    );
-
-    procedure TestCloseCursor (
-        a_Cursor                        sys_refcursor
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestRefCursors as
-
-    procedure TestOutCursor (
-        a_MaxIntValue                   number,
-        a_Cursor                        out sys_refcursor
-    ) is
-    begin
-        open a_Cursor for
-            select
-                IntCol,
-                StringCol
-            from TestStrings
-            where IntCol <= a_MaxIntValue
-            order by IntCol;
-    end;
-
-    function TestInCursor (
-        a_Cursor                        sys_refcursor
-    ) return varchar2 is
-        t_String                        varchar2(100);
-    begin
-        fetch a_Cursor into t_String;
-        return t_String || ' (Modified)';
-    end;
-
-    function TestReturnCursor (
-        a_MaxIntValue                   number
-    ) return sys_refcursor is
-        t_Cursor                        sys_refcursor;
-    begin
-        open t_Cursor for
-            select
-                IntCol,
-                StringCol
-            from TestSTrings
-            where IntCol <= a_MaxIntValue
-            order by IntCol;
-        return t_Cursor;
-    end;
-
-    procedure TestLobCursor (
-        a_Value                         varchar2,
-        a_Cursor                        out sys_refcursor
-    ) is
-    begin
-        open a_Cursor for
-            select to_clob(a_Value)
-            from dual;
-    end;
-
-    procedure TestCloseCursor (
-        a_Cursor                        sys_refcursor
-    ) is
-        t_Id                            number;
-        t_StrVal                        varchar2(400);
-    begin
-        delete from TestTempTable;
-        fetch a_Cursor into t_Id, t_StrVal;
-        if not a_Cursor%notfound then
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, t_StrVal);
-        end if;
-        close a_Cursor;
-        commit;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestBooleans as
-
-    type udt_BooleanList is table of boolean index by binary_integer;
-
-    function GetStringRep (
-        a_Value                         boolean
-    ) return varchar2;
-
-    function IsLessThan10 (
-        a_Value                         number
-    ) return boolean;
-
-    function TestInArrays (
-        a_Value                         udt_BooleanList
-    ) return number;
-
-    function TestOutValueNull
-    return boolean;
-
-    procedure TestOutArrays (
-        a_NumElements                   number,
-        a_Value                         out nocopy udt_BooleanList
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestBooleans as
-
-    function GetStringRep (
-        a_Value                         boolean
-    ) return varchar2 is
-    begin
-        if a_Value is null then
-            return 'NULL';
-        elsif a_Value then
-            return 'TRUE';
-        end if;
-        return 'FALSE';
-    end;
-
-    function IsLessThan10 (
-        a_Value                         number
-    ) return boolean is
-    begin
-        return a_Value < 10;
-    end;
-
-    function TestInArrays (
-        a_Value                         udt_BooleanList
-    ) return number is
-        t_Result                        pls_integer;
-    begin
-        t_Result := 0;
-        for i in 1..a_Value.count loop
-            if a_Value(i) then
-                t_Result := t_Result + 1;
-            end if;
-        end loop;
-        return t_Result;
-    end;
-
-    function TestOutValueNull
-    return boolean is
-    begin
-        return null;
-    end;
-
-    procedure TestOutArrays (
-        a_NumElements                   number,
-        a_Value                         out nocopy udt_BooleanList
-    ) is
-    begin
-        for i in 1..a_NumElements loop
-            a_Value(i) := (mod(i, 2) = 1);
-        end loop;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestBindObject as
-
-    subtype udt_RowType is TestTempTable%rowtype;
-
-    type udt_CollectionRowType is table of udt_RowType index by binary_integer;
-
-    function GetStringRep (
-        a_Object                        udt_Object
-    ) return varchar2;
-
-    procedure BindObjectOut (
-        a_NumberValue                   number,
-        a_StringValue                   varchar2,
-        a_Object                        out nocopy udt_Object
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestBindObject as
-
-    function GetStringRep (
-        a_Object                        udt_SubObject
-    ) return varchar2 is
-    begin
-        if a_Object is null then
-            return 'null';
-        end if;
-        return 'udt_SubObject(' ||
-                nvl(to_char(a_Object.SubNumberValue), 'null') || ', ' ||
-                case when a_Object.SubStringValue is null then 'null'
-                else '''' || a_Object.SubStringValue || '''' end || ')';
-    end;
-
-    function GetStringRep (
-        a_Array         udt_ObjectArray
-    ) return varchar2 is
-        t_StringRep     varchar2(4000);
-    begin
-        if a_Array is null then
-            return 'null';
-        end if;
-        t_StringRep := 'udt_ObjectArray(';
-        for i in 1..a_Array.count loop
-            if i > 1 then
-                t_StringRep := t_StringRep || ', ';
-            end if;
-            t_StringRep := t_StringRep || GetStringRep(a_Array(i));
-        end loop;
-        return t_StringRep || ')';
-    end;
-
-    function GetStringRep (
-        a_Object        udt_Object
-    ) return varchar2 is
-    begin
-        if a_Object is null then
-            return 'null';
-        end if;
-        return 'udt_Object(' ||
-                nvl(to_char(a_Object.NumberValue), 'null') || ', ' ||
-                case when a_Object.StringValue is null then 'null'
-                else '''' || a_Object.StringValue || '''' end || ', ' ||
-                case when a_Object.FixedCharValue is null then 'null'
-                else '''' || a_Object.FixedCharValue || '''' end || ', ' ||
-                case when a_Object.DateValue is null then 'null'
-                else 'to_date(''' ||
-                        to_char(a_Object.DateValue, 'YYYY-MM-DD') ||
-                        ''', ''YYYY-MM-DD'')' end || ', ' ||
-                case when a_Object.TimestampValue is null then 'null'
-                else 'to_timestamp(''' || to_char(a_Object.TimestampValue,
-                        'YYYY-MM-DD HH24:MI:SS') ||
-                        ''', ''YYYY-MM-DD HH24:MI:SS'')' end || ', ' ||
-                GetStringRep(a_Object.SubObjectValue) || ', ' ||
-                GetStringRep(a_Object.SubObjectArray) || ')';
-    end;
-
-    procedure BindObjectOut (
-        a_NumberValue                   number,
-        a_StringValue                   varchar2,
-        a_Object                        out nocopy udt_Object
-    ) is
-    begin
-        a_Object := udt_Object(a_NumberValue, a_StringValue, null, null, null,
-                null, null, null, null, null, null, null, null, null, null,
-                null, null, null, null, null, null, null);
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestRecords as
-
-    type udt_Record is record (
-        NumberValue                     number,
-        StringValue                     varchar2(30),
-        DateValue                       date,
-        TimestampValue                  timestamp,
-        BooleanValue                    boolean,
-        PlsIntegerValue                 pls_integer,
-        BinaryIntegerValue              binary_integer
-    );
-
-    type udt_RecordArray is table of udt_Record index by binary_integer;
-
-    function GetStringRep (
-        a_Value                         udt_Record
-    ) return varchar2;
-
-    procedure TestOut (
-        a_Value                         out nocopy udt_Record
-    );
-
-    function TestInArrays (
-        a_Value                         udt_RecordArray
-    ) return varchar2;
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestRecords as
-
-    function GetStringRep (
-        a_Value                         udt_Record
-    ) return varchar2 is
-    begin
-        return 'udt_Record(' ||
-                nvl(to_char(a_Value.NumberValue), 'null') || ', ' ||
-                case when a_Value.StringValue is null then 'null'
-                else '''' || a_Value.StringValue || '''' end || ', ' ||
-                case when a_Value.DateValue is null then 'null'
-                else 'to_date(''' ||
-                        to_char(a_Value.DateValue, 'YYYY-MM-DD') ||
-                        ''', ''YYYY-MM-DD'')' end || ', ' ||
-                case when a_Value.TimestampValue is null then 'null'
-                else 'to_timestamp(''' || to_char(a_Value.TimestampValue,
-                        'YYYY-MM-DD HH24:MI:SS') ||
-                        ''', ''YYYY-MM-DD HH24:MI:SS'')' end || ', ' ||
-                case when a_Value.BooleanValue is null then 'null'
-                when a_Value.BooleanValue then 'true'
-                else 'false' end || ', ' ||
-                nvl(to_char(a_Value.PlsIntegerValue), 'null') || ', ' ||
-                nvl(to_char(a_Value.BinaryIntegerValue), 'null') || ')';
-    end;
-
-    procedure TestOut (
-        a_Value                         out nocopy udt_Record
-    ) is
-    begin
-        a_Value.NumberValue := 25;
-        a_Value.StringValue := 'String in record';
-        a_Value.DateValue := to_date(20160216, 'YYYYMMDD');
-        a_Value.TimestampValue := to_timestamp('20160216 18:23:55',
-                'YYYYMMDD HH24:MI:SS');
-        a_Value.BooleanValue := true;
-        a_Value.PlsIntegerValue := 45;
-        a_Value.BinaryIntegerValue := 10;
-    end;
-
-    function TestInArrays (
-        a_Value             udt_RecordArray
-    ) return varchar2 is
-        t_Result            varchar2(4000);
-    begin
-        for i in 0..a_Value.count - 1 loop
-            if t_Result is not null then
-                t_Result := t_Result || '; ';
-            end if;
-            t_Result := t_Result || GetStringRep(a_Value(i));
-        end loop;
-        return t_Result;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestNestedRecords as
-
-    type udt_Inner is record (
-        Attr1                           number,
-        Attr2                           number
-    );
-
-    type udt_Outer is record (
-        Inner1                          udt_Inner,
-        Inner2                          udt_Inner
-    );
-
-    function GetOuter (
-        a_Value1                        number,
-        a_Value2                        number
-    ) return udt_Outer;
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestNestedRecords as
-
-    function GetOuter (
-        a_Value1                        number,
-        a_Value2                        number
-    ) return udt_Outer is
-        t_Outer                         udt_Outer;
-    begin
-        t_Outer.Inner1.Attr2 := a_Value1;
-        t_Outer.Inner2.Attr2 := a_Value2;
-        return t_Outer;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_NestedTable as
-
-    function GetTableOfNumber
-    return udt_TableOfNumber;
-
-    function GetTableOfVarrayOfNumber
-    return udt_TableOfVarrayOfNumber;
-
-    function GetVarrayOfNumber
-    return udt_VarrayOfNumber;
-
-end;
-/
-
-create or replace package body &main_user..pkg_NestedTable as
-
-    function GetTableOfNumber
-    return udt_TableOfNumber is
-    begin
-        return udt_TableOfNumber(15, 25, 35, 45);
-    end;
-
-    function GetTableOfVarrayOfNumber
-    return udt_TableOfVarrayOfNumber is
-    begin
-        return udt_TableOfVarrayOfNumber(
-            udt_VarrayOfNumber(10, 20),
-            udt_VarrayOfNumber(30, 40)
-        );
-    end;
-
-    function GetVarrayOfNumber
-    return udt_VarrayOfNumber is
-    begin
-        return udt_VarrayOfNumber(10, 20, 30);
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_SessionCallback as
-
-    procedure TheCallback (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    );
-
-end;
-/
-
-create or replace package body &main_user..pkg_SessionCallback as
-
-    type udt_Properties is table of varchar2(64) index by varchar2(64);
-
-    procedure LogCall (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    ) is
-        pragma autonomous_transaction;
-    begin
-        insert into PlsqlSessionCallbacks
-        values (a_RequestedTag, a_ActualTag, systimestamp);
-        commit;
-    end;
-
-    procedure ParseProperty (
-        a_Property                      varchar2,
-        a_Name                          out nocopy varchar2,
-        a_Value                         out nocopy varchar2
-    ) is
-        t_Pos                           number;
-    begin
-        t_Pos := instr(a_Property, '=');
-        if t_Pos = 0 then
-            raise_application_error(-20000, 'Tag must contain key=value pairs');
-        end if;
-        a_Name := substr(a_Property, 1, t_Pos - 1);
-        a_Value := substr(a_Property, t_Pos + 1);
-    end;
-
-    procedure SetProperty (
-        a_Name                          varchar2,
-        a_Value                         varchar2
-    ) is
-        t_ValidValues                   udt_Properties;
-    begin
-        if a_Name = 'TIME_ZONE' then
-            t_ValidValues('UTC') := 'UTC';
-            t_ValidValues('MST') := '-07:00';
-        elsif a_Name = 'NLS_DATE_FORMAT' then
-            t_ValidValues('SIMPLE') := 'YYYY-MM-DD HH24:MI';
-            t_ValidValues('FULL') := 'YYYY-MM-DD HH24:MI:SS';
-        else
-            raise_application_error(-20000, 'Unsupported session setting');
-        end if;
-        if not t_ValidValues.exists(a_Value) then
-            raise_application_error(-20000, 'Unsupported session setting');
-        end if;
-        execute immediate
-                'ALTER SESSION SET ' || a_Name || '=''' ||
-                t_ValidValues(a_Value) || '''';
-    end;
-
-    procedure ParseTag (
-        a_Tag                           varchar2,
-        a_Properties                    out nocopy udt_Properties
-    ) is
-        t_PropertyName                  varchar2(64);
-        t_PropertyValue                 varchar2(64);
-        t_StartPos                      number;
-        t_EndPos                        number;
-    begin
-        t_StartPos := 1;
-        while t_StartPos < length(a_Tag) loop
-            t_EndPos := instr(a_Tag, ';', t_StartPos);
-            if t_EndPos = 0 then
-                t_EndPos := length(a_Tag) + 1;
-            end if;
-            ParseProperty(substr(a_Tag, t_StartPos, t_EndPos - t_StartPos),
-                    t_PropertyName, t_PropertyValue);
-            a_Properties(t_PropertyName) := t_PropertyValue;
-            t_StartPos := t_EndPos + 1;
-        end loop;
-    end;
-
-    procedure TheCallback (
-        a_RequestedTag                  varchar2,
-        a_ActualTag                     varchar2
-    ) is
-        t_RequestedProps                udt_Properties;
-        t_ActualProps                   udt_Properties;
-        t_PropertyName                  varchar2(64);
-    begin
-        LogCall(a_RequestedTag, a_ActualTag);
-        ParseTag(a_RequestedTag, t_RequestedProps);
-        ParseTag(a_ActualTag, t_ActualProps);
-        t_PropertyName := t_RequestedProps.first;
-        while t_PropertyName is not null loop
-            if not t_ActualProps.exists(t_PropertyName) or
-                    t_ActualProps(t_PropertyName) !=
-                    t_RequestedProps(t_PropertyName) then
-                SetProperty(t_PropertyName, t_RequestedProps(t_PropertyName));
-            end if;
-            t_PropertyName := t_RequestedProps.next(t_PropertyName);
-        end loop;
-    end;
-
-end;
-/
-
-create or replace package &main_user..pkg_TestLOBs as
-
-    procedure GetSize(
-        a_BLOB                          blob,
-        a_Size                          out number
-    );
-
-    procedure GetSize(
-        a_CLOB                          clob,
-        a_Size                          out number
-    );
-
-    procedure TestInOut (
-        a_CLOB                          in out clob,
-        a_SearchValue                   varchar2,
-        a_ReplaceValue                  varchar2
-    );
-
-    function GetLOB (
-        a_Num                           number,
-        a_Format                        varchar2
-    ) return clob;
-
-end;
-/
-
-create or replace package body &main_user..pkg_TestLOBs as
-
-    procedure GetSize(
-        a_BLOB                          blob,
-        a_Size                          out number
-    ) is
-    begin
-        a_Size := dbms_lob.getlength(a_BLOB);
-    end;
-
-    procedure GetSize(
-        a_CLOB                          clob,
-        a_Size                          out number
-    ) is
-    begin
-        a_Size := dbms_lob.getlength(a_CLOB);
-    end;
-
-    procedure TestInOut (
-        a_CLOB                          in out clob,
-        a_SearchValue                   varchar2,
-        a_ReplaceValue                  varchar2
-    ) is
-    begin
-        if a_SearchValue is not null then
-            a_CLOB := replace(a_CLOB, a_SearchValue, a_ReplaceValue);
-        end if;
-    end;
-
-    function GetLOB (
-        a_Num                           number,
-        a_Format                        varchar2
-    ) return clob is
-    begin
-        return to_clob(replace(a_Format, '{}', to_char(a_Num)));
-    end;
-
-end;
-/
diff --git a/tests/sql/create_schema_21.sql b/tests/sql/create_schema_21.sql
deleted file mode 100644
index b99e22f0..00000000
--- a/tests/sql/create_schema_21.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_21.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite that require Oracle
- * Database 21c or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create table &main_user..TestJson (
-    IntCol number(9) not null,
-    JsonCol json not null
-)
-/
-
-create table &main_user..TestOsonCols (
-    IntCol                              number(9) not null,
-    OsonCol                             blob not null,
-    constraint TestOsonCols_ck_1 check (OsonCol is json format oson)
-)
-/
-
-insert into &main_user..TestJsonCols values (2,
-    'null', empty_clob(), empty_blob())
-/
-
-begin
-    dbms_aqadm.create_queue_table('&main_user..JSON_QUEUE_TAB', 'JSON');
-    dbms_aqadm.create_queue('&main_user..TEST_JSON_QUEUE',
-            '&main_user..JSON_QUEUE_TAB');
-    dbms_aqadm.start_queue('&main_user..TEST_JSON_QUEUE');
-end;
-/
diff --git a/tests/sql/create_schema_23_4.sql b/tests/sql/create_schema_23_4.sql
deleted file mode 100644
index 45c99dcd..00000000
--- a/tests/sql/create_schema_23_4.sql
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_23_4.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite that require Oracle
- * Database 23.4 or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create domain &main_user..SimpleDomain as number(3, 0) NOT NULL
-/
-
-create table &main_user..TableWithDomainAndAnnotations (
-    id number(9) not null,
-    age number(3, 0) domain &main_user..SimpleDomain
-    annotations (
-        Anno_1 'first annotation',
-        Anno_2 'second annotation',
-        Anno_3
-    )
-)
-/
-
-insert into &main_user..TableWithDomainAndAnnotations values (1, 25)
-/
-
-commit
-/
-
-create table &main_user..TestVectors (
-    IntCol                  number(9) not null,
-    VectorFlexAllCol        vector,
-    VectorFlexTypeCol       vector(2),
-    VectorFlex8Col          vector(*, int8),
-    VectorFlex32Col         vector(*, float32),
-    VectorFlex64Col         vector(*, float64),
-    Vector8Col              vector(16, int8),
-    Vector32Col             vector(16, float32),
-    Vector64Col             vector(16, float64)
-)
-/
-
-create table &main_user..TestCompressedJson (
-    IntCol number(9) not null,
-    JsonCol json not null
-)
-json (JsonCol)
-store as (compress high)
-/
-
-create table &main_user..TestBooleans (
-    IntCol                  number(9) not null,
-    BooleanCol1             boolean not null,
-    BooleanCol2             boolean,
-    BooleanCol3             boolean
-)
-/
diff --git a/tests/sql/create_schema_23_5.sql b/tests/sql/create_schema_23_5.sql
deleted file mode 100644
index 1b85714b..00000000
--- a/tests/sql/create_schema_23_5.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2024, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_23_5.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite that require Oracle
- * Database 23.5 or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create table &main_user..TestBinaryVectors (
-    IntCol                  number(9) not null,
-    VectorBinaryCol         vector(64, binary)
-)
-/
diff --git a/tests/sql/create_schema_23_7.sql b/tests/sql/create_schema_23_7.sql
deleted file mode 100644
index d5e6d5f1..00000000
--- a/tests/sql/create_schema_23_7.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_23_7.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite that require Oracle
- * Database 23.7 or higher. It is executed by the Python script
- * create_schema.py.
- *---------------------------------------------------------------------------*/
-
-create table &main_user..TestSparseVectors (
-    IntCol                      number(9) not null,
-    SparseVectorFlexAllCol      vector(*, *, sparse),
-    SparseVectorFlexTypeCol     vector(2, *, sparse),
-    SparseVectorFlex8Col        vector(*, int8, sparse),
-    SparseVectorFlex32Col       vector(*, float32, sparse),
-    SparseVectorFlex64Col       vector(*, float64, sparse),
-    SparseVector8Col            vector(16, int8, sparse),
-    SparseVector32Col           vector(16, float32, sparse),
-    SparseVector64Col           vector(16, float64, sparse)
-)
-/
diff --git a/tests/sql/create_schema_cloud.sql b/tests/sql/create_schema_cloud.sql
deleted file mode 100644
index d378d9fc..00000000
--- a/tests/sql/create_schema_cloud.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * create_schema_cloud.sql
- *
- * Performs the actual work of creating and populating the schemas with the
- * database objects used by the python-oracledb test suite. This script is
- * specific to Oracle Cloud and is only executed when being run against the
- * Oracle Cloud, after the main script (create_schema.sql) is run. It is
- * executed by the Python script create_schema.py.
- *---------------------------------------------------------------------------*/
-
-grant select on v$database to &main_user
-/
-
-grant select on v$parameter to &main_user
-/
-
-grant select on v$session to &main_user
-/
diff --git a/tests/sql/drop_schema.sql b/tests/sql/drop_schema.sql
deleted file mode 100644
index 8bfad5c0..00000000
--- a/tests/sql/drop_schema.sql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-----------------------------------------------------------------------------
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates.
- *
- * This software is dual-licensed to you under the Universal Permissive License
- * (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
- * 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- * either license.*
- *
- * If you elect to accept the software under the Apache License, Version 2.0,
- * the following applies:
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *---------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * drop_schema.sql
- *
- * Performs the actual work of dropping the database schemas used by the
- * python-oracledb test suite. It is executed by the Python script
- * drop_schema.py.
- *---------------------------------------------------------------------------*/
-
-begin
-
-    for r in
-            ( select username
-              from dba_users
-              where username in (upper('&main_user'), upper('&proxy_user'))
-            ) loop
-        execute immediate 'drop user ' || r.username || ' cascade';
-    end loop;
-
-    for r in
-            ( select edition_name
-              from dba_editions
-	          start with edition_name = upper('&edition_name')
-	          connect by prior edition_name = parent_edition_name
-	          order by level desc
-            ) loop
-        execute immediate 'drop edition ' || r.edition_name || ' cascade';
-    end loop;
-
-end;
-/
diff --git a/tests/stc/README.md b/tests/stc/README.md
deleted file mode 100644
index 69a01535..00000000
--- a/tests/stc/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains files that can be used with a static type checker like
-mypy to validate that the typing found in python-oracledb is accurate.
diff --git a/tests/stc/stc_1000_cursor.py b/tests/stc/stc_1000_cursor.py
deleted file mode 100644
index 61b245ee..00000000
--- a/tests/stc/stc_1000_cursor.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1000 - Module for static type checking of the cursor module.
-"""
-
-import oracledb
-
-
-def stc_1000(cursor: oracledb.Cursor):
-    cursor.execute(None, parameters=None)
-    cursor.execute("sql", parameters=None)
-    cursor.execute("sql", parameters=[1, 2, 3])
-    cursor.execute("sql", parameters=(1, 2, 3))
-    cursor.execute("sql", parameters=dict(arg1=5, arg2=6))
-
-
-def stc_1001(cursor: oracledb.Cursor):
-    cursor.callproc("name", parameters=None)
-    cursor.callproc("name", parameters=(1, 2, 3))
-    cursor.callproc("name", parameters=[1, 2, 3])
-    cursor.callproc("name", keyword_parameters=None)
-    cursor.callproc("name", keyword_parameters=dict(arg1=5, arg2=6))
-    cursor.callproc("name", keywordParameters=None)
-    cursor.callproc("name", keywordParameters=dict(arg1=5, arg2=6))
-
-
-def stc_1002(cursor: oracledb.Cursor):
-    cursor.callfunc("name", str, parameters=None)
-    cursor.callfunc("name", str, parameters=(1, 2, 3))
-    cursor.callfunc("name", str, parameters=[1, 2, 3])
-    cursor.callfunc("name", str, keyword_parameters=None)
-    cursor.callfunc("name", str, keyword_parameters=dict(arg1=5, arg2=6))
-    cursor.callfunc("name", str, keywordParameters=None)
-    cursor.callfunc("name", str, keywordParameters=dict(arg1=5, arg2=6))
-
-
-def stc_1003(cursor: oracledb.Cursor):
-    cursor.executemany(None, [(1, 2, 3), (4, 5, 6)])
-    cursor.executemany("sql", [(1, 2, 3), (4, 5, 6)])
-    cursor.executemany("sql", 8)
-
-
-def stc_1004(cursor: oracledb.Cursor):
-    cursor.fetchmany(size=None)
-    cursor.fetchmany(size=5)
-    cursor.fetchmany(numRows=None)
-    cursor.fetchmany(numRows=5)
-
-
-async def stc_1005(cursor: oracledb.AsyncCursor):
-    await cursor.callfunc("name", str, parameters=None)
-    await cursor.callfunc("name", str, parameters=(1, 2, 3))
-    await cursor.callfunc("name", str, parameters=[1, 2, 3])
-    await cursor.callfunc("name", str, keyword_parameters=None)
-    await cursor.callfunc("name", str, keyword_parameters=dict(arg1=5, arg2=6))
-
-
-async def stc_1006(cursor: oracledb.AsyncCursor):
-    await cursor.callproc("name", parameters=None)
-    await cursor.callproc("name", parameters=(1, 2, 3))
-    await cursor.callproc("name", parameters=[1, 2, 3])
-    await cursor.callproc("name", keyword_parameters=None)
-    await cursor.callproc("name", keyword_parameters=dict(arg1=5, arg2=6))
-
-
-async def stc_1007(cursor: oracledb.AsyncCursor):
-    await cursor.execute(None, parameters=None)
-    await cursor.execute("sql", parameters=None)
-    await cursor.execute("sql", parameters=[1, 2, 3])
-    await cursor.execute("sql", parameters=(1, 2, 3))
-    await cursor.execute("sql", parameters=dict(arg1=5, arg2=6))
-
-
-async def stc_1008(cursor: oracledb.AsyncCursor):
-    await cursor.executemany(None, [(1, 2, 3), (4, 5, 6)])
-    await cursor.executemany("sql", [(1, 2, 3), (4, 5, 6)])
-    await cursor.executemany("sql", 8)
-
-
-async def stc_1009(cursor: oracledb.AsyncCursor):
-    await cursor.fetchmany(size=None)
-    await cursor.fetchmany(size=5)
diff --git a/tests/test_1000_module.py b/tests/test_1000_module.py
deleted file mode 100644
index a6888b34..00000000
--- a/tests/test_1000_module.py
+++ /dev/null
@@ -1,240 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1000 - Module for testing top-level module methods
-"""
-
-import datetime
-
-import oracledb
-
-
-def test_1000():
-    "1000 - test DateFromTicks()"
-    today = datetime.datetime.today()
-    timestamp = today.timestamp()
-    date = oracledb.DateFromTicks(int(timestamp))
-    assert date == today.date()
-
-
-def test_1001():
-    "1001 - test management of __future__ object"
-    assert oracledb.__future__.dummy is None
-    oracledb.__future__.dummy = "Unimportant"
-    assert oracledb.__future__.dummy is None
-
-
-def test_1002():
-    "1002 - test TimestampFromTicks()"
-    timestamp = datetime.datetime.today().timestamp()
-    today = datetime.datetime.fromtimestamp(timestamp)
-    date = oracledb.TimestampFromTicks(timestamp)
-    assert date == today
-
-
-def test_1003(test_env):
-    "1003 - test unsupported time functions"
-    with test_env.assert_raises_full_code("DPY-3000"):
-        oracledb.Time(12, 0, 0)
-    with test_env.assert_raises_full_code("DPY-3000"):
-        oracledb.TimeFromTicks(100)
-
-
-def test_1004():
-    "1004 - test makedsn() with valid arguments"
-    for name, value in [
-        ("SID", "sid_1004"),
-        ("SERVICE_NAME", "my_service_1004"),
-    ]:
-        host = "host_1004"
-        port = 1004
-        region = "US WEST"
-        sharding_key = "ShardKey"
-        super_sharding_key = "SuperShardKey"
-        args = (
-            host,
-            port,
-            value if name == "SID" else None,
-            value if name == "SERVICE_NAME" else None,
-            region,
-            sharding_key,
-            super_sharding_key,
-        )
-        result = oracledb.makedsn(*args)
-        expected_value = (
-            f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})"
-            f"(PORT={port}))(CONNECT_DATA=({name}={value})"
-            f"(REGION={region})(SHARDING_KEY={sharding_key})"
-            f"(SUPER_SHARDING_KEY={super_sharding_key})))"
-        )
-        assert result == expected_value
-
-
-def test_1005(test_env):
-    "1005 - test makedsn() with invalid arguments"
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(host="(invalid)", port=1521)
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(host="host", port=1521, sid="(invalid)")
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(host="host", port=1521, service_name="(invalid)")
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(host="host", port=1521, region="(invalid)")
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(host="host", port=1521, sharding_key="(invalid)")
-    with test_env.assert_raises_full_code("DPY-2020"):
-        oracledb.makedsn(
-            host="host", port=1521, super_sharding_key="(invalid)"
-        )
-
-
-def test_1006():
-    "1006 - test aliases match"
-
-    # database type aliases
-    assert oracledb.BFILE is oracledb.DB_TYPE_BFILE
-    assert oracledb.BLOB is oracledb.DB_TYPE_BLOB
-    assert oracledb.BOOLEAN is oracledb.DB_TYPE_BOOLEAN
-    assert oracledb.CLOB is oracledb.DB_TYPE_CLOB
-    assert oracledb.CURSOR is oracledb.DB_TYPE_CURSOR
-    assert oracledb.FIXED_CHAR is oracledb.DB_TYPE_CHAR
-    assert oracledb.FIXED_NCHAR is oracledb.DB_TYPE_NCHAR
-    assert oracledb.INTERVAL is oracledb.DB_TYPE_INTERVAL_DS
-    assert oracledb.LONG_BINARY is oracledb.DB_TYPE_LONG_RAW
-    assert oracledb.LONG_STRING is oracledb.DB_TYPE_LONG
-    assert oracledb.NATIVE_INT is oracledb.DB_TYPE_BINARY_INTEGER
-    assert oracledb.NATIVE_FLOAT is oracledb.DB_TYPE_BINARY_DOUBLE
-    assert oracledb.NCHAR is oracledb.DB_TYPE_NVARCHAR
-    assert oracledb.NCLOB is oracledb.DB_TYPE_NCLOB
-    assert oracledb.OBJECT is oracledb.DB_TYPE_OBJECT
-    assert oracledb.TIMESTAMP is oracledb.DB_TYPE_TIMESTAMP
-
-    # type aliases
-    assert oracledb.ObjectType is oracledb.DbObjectType
-    assert oracledb.Object is oracledb.DbObject
-    assert oracledb.SessionPool is oracledb.ConnectionPool
-
-    # authentication mode aliases
-    assert oracledb.DEFAULT_AUTH is oracledb.AUTH_MODE_DEFAULT
-    assert oracledb.SYSASM is oracledb.AUTH_MODE_SYSASM
-    assert oracledb.SYSBKP is oracledb.AUTH_MODE_SYSBKP
-    assert oracledb.SYSDBA is oracledb.AUTH_MODE_SYSDBA
-    assert oracledb.SYSDGD is oracledb.AUTH_MODE_SYSDGD
-    assert oracledb.SYSKMT is oracledb.AUTH_MODE_SYSKMT
-    assert oracledb.SYSOPER is oracledb.AUTH_MODE_SYSOPER
-    assert oracledb.SYSRAC is oracledb.AUTH_MODE_SYSRAC
-    assert oracledb.PRELIM_AUTH is oracledb.AUTH_MODE_PRELIM
-
-    # pool "get" mode aliases
-    assert oracledb.SPOOL_ATTRVAL_WAIT is oracledb.POOL_GETMODE_WAIT
-    assert oracledb.SPOOL_ATTRVAL_NOWAIT is oracledb.POOL_GETMODE_NOWAIT
-    assert oracledb.SPOOL_ATTRVAL_FORCEGET is oracledb.POOL_GETMODE_FORCEGET
-    assert oracledb.SPOOL_ATTRVAL_TIMEDWAIT is oracledb.POOL_GETMODE_TIMEDWAIT
-
-    # purity aliases
-    assert oracledb.ATTR_PURITY_DEFAULT is oracledb.PURITY_DEFAULT
-    assert oracledb.ATTR_PURITY_NEW is oracledb.PURITY_NEW
-    assert oracledb.ATTR_PURITY_SELF is oracledb.PURITY_SELF
-
-    # other aliases
-    assert oracledb.SUBSCR_PROTO_OCI is oracledb.SUBSCR_PROTO_CALLBACK
-    assert oracledb.version is oracledb.__version__
-
-
-def test_1007(test_env, skip_unless_thin_mode):
-    "1007 - test clientversion() fails without init_oracle_client()"
-    with test_env.assert_raises_full_code("DPY-2021"):
-        oracledb.clientversion()
-
-
-def test_1008():
-    "1008 - test enumeration aliases match"
-
-    # authentication mode enumeration
-    assert oracledb.AUTH_MODE_DEFAULT is oracledb.AuthMode.DEFAULT
-    assert oracledb.AUTH_MODE_PRELIM is oracledb.AuthMode.PRELIM
-    assert oracledb.AUTH_MODE_SYSASM is oracledb.AuthMode.SYSASM
-    assert oracledb.AUTH_MODE_SYSBKP is oracledb.AuthMode.SYSBKP
-    assert oracledb.AUTH_MODE_SYSDBA is oracledb.AuthMode.SYSDBA
-    assert oracledb.AUTH_MODE_SYSDGD is oracledb.AuthMode.SYSDGD
-    assert oracledb.AUTH_MODE_SYSKMT is oracledb.AuthMode.SYSKMT
-    assert oracledb.AUTH_MODE_SYSOPER is oracledb.AuthMode.SYSOPER
-    assert oracledb.AUTH_MODE_SYSRAC is oracledb.AuthMode.SYSRAC
-
-    # batch operation type enumeration
-    assert (
-        oracledb.PIPELINE_OP_TYPE_CALL_FUNC
-        is oracledb.PipelineOpType.CALL_FUNC
-    )
-    assert (
-        oracledb.PIPELINE_OP_TYPE_CALL_PROC
-        is oracledb.PipelineOpType.CALL_PROC
-    )
-    assert oracledb.PIPELINE_OP_TYPE_COMMIT is oracledb.PipelineOpType.COMMIT
-    assert oracledb.PIPELINE_OP_TYPE_EXECUTE is oracledb.PipelineOpType.EXECUTE
-    assert (
-        oracledb.PIPELINE_OP_TYPE_EXECUTE_MANY
-        is oracledb.PipelineOpType.EXECUTE_MANY
-    )
-    assert (
-        oracledb.PIPELINE_OP_TYPE_FETCH_ALL
-        is oracledb.PipelineOpType.FETCH_ALL
-    )
-    assert (
-        oracledb.PIPELINE_OP_TYPE_FETCH_MANY
-        is oracledb.PipelineOpType.FETCH_MANY
-    )
-    assert (
-        oracledb.PIPELINE_OP_TYPE_FETCH_ONE
-        is oracledb.PipelineOpType.FETCH_ONE
-    )
-
-    # pool "get" mode enumeration
-    assert oracledb.POOL_GETMODE_FORCEGET is oracledb.PoolGetMode.FORCEGET
-    assert oracledb.POOL_GETMODE_WAIT is oracledb.PoolGetMode.WAIT
-    assert oracledb.POOL_GETMODE_NOWAIT is oracledb.PoolGetMode.NOWAIT
-    assert oracledb.POOL_GETMODE_TIMEDWAIT is oracledb.PoolGetMode.TIMEDWAIT
-
-    # purity enumeration
-    assert oracledb.PURITY_DEFAULT is oracledb.Purity.DEFAULT
-    assert oracledb.PURITY_NEW is oracledb.Purity.NEW
-    assert oracledb.PURITY_SELF is oracledb.Purity.SELF
-
-    # vector format enumeration
-    assert oracledb.VECTOR_FORMAT_BINARY is oracledb.VectorFormat.BINARY
-    assert oracledb.VECTOR_FORMAT_FLOAT32 is oracledb.VectorFormat.FLOAT32
-    assert oracledb.VECTOR_FORMAT_FLOAT64 is oracledb.VectorFormat.FLOAT64
-    assert oracledb.VECTOR_FORMAT_INT8 is oracledb.VectorFormat.INT8
-
-
-def test_1009(test_env, conn):
-    "1009 - test enable_thin_mode()"
-    if test_env.use_thick_mode:
-        with test_env.assert_raises_full_code("DPY-2053"):
-            oracledb.enable_thin_mode()
-    else:
-        oracledb.enable_thin_mode()
-        with test_env.assert_raises_full_code("DPY-2019"):
-            oracledb.init_oracle_client()
diff --git a/tests/test_1100_connection.py b/tests/test_1100_connection.py
deleted file mode 100644
index 6e208f2c..00000000
--- a/tests/test_1100_connection.py
+++ /dev/null
@@ -1,927 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1100 - Module for testing connections
-"""
-
-import random
-import string
-import threading
-import time
-
-import oracledb
-import pytest
-
-
-def _verify_connect_arg(test_env, arg_name, arg_value, sql):
-    """
-    Verifies an argument passed during connect() matches the value actually
-    used by the connection.
-    """
-    args = {}
-    args[arg_name] = arg_value
-    conn = test_env.get_connection(**args)
-    cursor = conn.cursor()
-    cursor.execute(sql)
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == arg_value
-
-
-def test_1100(test_env, conn):
-    "1100 - simple connection to database"
-    assert conn.username == test_env.main_user
-    assert conn.dsn == test_env.connect_string
-    assert conn.thin == (not test_env.use_thick_mode)
-
-
-def test_1101(skip_if_drcp, test_env):
-    "1101 - test use of application context"
-    namespace = "CLIENTCONTEXT"
-    app_context_entries = [
-        (namespace, "ATTR1", "VALUE1"),
-        (namespace, "ATTR2", "VALUE2"),
-        (namespace, "ATTR3", "VALUE3"),
-    ]
-    conn = test_env.get_connection(appcontext=app_context_entries)
-    cursor = conn.cursor()
-    for namespace, name, value in app_context_entries:
-        cursor.execute(
-            "select sys_context(:1, :2) from dual", (namespace, name)
-        )
-        (actual_value,) = cursor.fetchone()
-        assert actual_value == value
-
-
-def test_1102(test_env):
-    "1102 - test invalid use of application context"
-    with pytest.raises(TypeError):
-        test_env.get_connection(appcontext=[("userenv", "action")])
-
-
-def test_1103(conn, test_env):
-    "1103 - test connection end-to-end tracing attributes"
-
-    # determine the list of attributes to check
-    attributes_to_check = []
-    if test_env.has_client_version(12, 1):
-        if not test_env.is_on_oracle_cloud:
-            sql = """select dbop_name from v$sql_monitor
-                     where sid = sys_context('userenv', 'sid')
-                     and status = 'EXECUTING'"""
-            attributes_to_check.append(("dbop", "oracledb_dbop", sql))
-    sql = "select sys_context('userenv', 'action') from dual"
-    attributes_to_check.append(("action", "oracledb_Action", sql))
-    attributes_to_check.append(("action", None, sql))
-    sql = "select sys_context('userenv', 'module') from dual"
-    attributes_to_check.append(("module", "oracledb_Module", sql))
-    attributes_to_check.append(("module", None, sql))
-    sql = "select sys_context('userenv', 'client_info') from dual"
-    attributes_to_check.append(("clientinfo", "oracledb_cinfo", sql))
-    attributes_to_check.append(("clientinfo", None, sql))
-    sql = "select sys_context('userenv', 'client_identifier') from dual"
-    attributes_to_check.append(("client_identifier", "oracledb_cid", sql))
-    attributes_to_check.append(("client_identifier", None, sql))
-    if not conn.thin:
-        sql = """select ecid from v$session
-                 where sid = sys_context('userenv', 'sid')"""
-        attributes_to_check.append(("econtext_id", "oracledb_ecid", sql))
-        attributes_to_check.append(("econtext_id", None, sql))
-
-    # check each of the scenarios
-    for attr_name, value, sql in attributes_to_check:
-        setattr(conn, attr_name, value)
-        with conn.cursor() as cursor:
-            cursor.execute(sql)
-            (result,) = cursor.fetchone()
-        assert result == value
-
-
-def test_1104(test_env):
-    "1104 - test use of autocommit"
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    other_conn = test_env.get_connection()
-    other_cursor = other_conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    other_cursor.execute("select IntCol from TestTempTable")
-    assert other_cursor.fetchall() == []
-    conn.autocommit = True
-    cursor.execute("insert into TestTempTable (IntCol) values (2)")
-    other_cursor.execute("select IntCol from TestTempTable order by IntCol")
-    assert other_cursor.fetchall() == [(1,), (2,)]
-
-
-def test_1105(test_env):
-    "1105 - connection to database with bad connect string"
-    with test_env.assert_raises_full_code(
-        "DPY-4000", "DPY-4026", "DPY-4027", "ORA-12154"
-    ):
-        oracledb.connect("not a valid connect string!!")
-    with test_env.assert_raises_full_code("DPY-4000", "DPY-4001"):
-        dsn = f"{test_env.main_user}@{test_env.connect_string}"
-        oracledb.connect(dsn)
-
-
-def test_1106(test_env):
-    "1106 - connection to database with bad password"
-    with test_env.assert_raises_full_code("ORA-01017"):
-        test_env.get_connection(password=test_env.main_password + "X")
-
-
-def test_1107(skip_if_drcp, conn, test_env):
-    "1107 - test changing password"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    sys_random = random.SystemRandom()
-    new_password = "".join(
-        sys_random.choice(string.ascii_letters) for i in range(20)
-    )
-    conn.changepassword(test_env.main_password, new_password)
-    conn = test_env.get_connection(password=new_password)
-    conn.changepassword(new_password, test_env.main_password)
-
-
-def test_1108(skip_if_drcp, conn, test_env):
-    "1108 - test changing password to an invalid value"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    new_password = "1" * 1500
-    with test_env.assert_raises_full_code("ORA-01017", "ORA-00988"):
-        conn.changepassword(test_env.main_password, new_password)
-    with test_env.assert_raises_full_code(
-        "ORA-01017", "ORA-00988", "ORA-28008"
-    ):
-        conn.changepassword("incorrect old password", new_password)
-
-
-def test_1109(skip_if_drcp, conn, test_env):
-    "1109 - test connecting with password containing / and @ symbols"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    sys_random = random.SystemRandom()
-    chars = list(sys_random.choice(string.ascii_letters) for i in range(20))
-    chars[4] = "/"
-    chars[8] = "@"
-    new_password = "".join(chars)
-    conn.changepassword(test_env.main_password, new_password)
-    try:
-        test_env.get_connection(password=new_password)
-    finally:
-        conn.changepassword(new_password, test_env.main_password)
-
-
-def test_1110(conn, test_env):
-    "1110 - confirm an exception is raised after closing a connection"
-    conn.close()
-    with test_env.assert_raises_full_code("DPY-1001"):
-        conn.rollback()
-
-
-def test_1111(skip_unless_thick_mode, conn, test_env):
-    "1111 - test creating a connection using a handle"
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    int_value = random.randint(1, 32768)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:val, null)
-        """,
-        val=int_value,
-    )
-    conn2 = oracledb.connect(handle=conn.handle)
-    cursor = conn2.cursor()
-    cursor.execute("select IntCol from TestTempTable")
-    (fetched_int_value,) = cursor.fetchone()
-    assert fetched_int_value == int_value
-
-    cursor.close()
-    with test_env.assert_raises_full_code("DPI-1034"):
-        conn2.close()
-    conn.close()
-
-
-def test_1112(conn):
-    "1112 - connection version is a string"
-    assert isinstance(conn.version, str)
-
-
-def test_1113(test_env):
-    "1113 - connection rolls back before close"
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    other_conn = test_env.get_connection()
-    other_cursor = other_conn.cursor()
-    other_cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    other_cursor.close()
-    other_conn.close()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 0
-
-
-def test_1114(test_env):
-    "1114 - connection rolls back before destruction"
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    other_conn = test_env.get_connection()
-    other_cursor = other_conn.cursor()
-    other_cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    del other_cursor
-    del other_conn
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 0
-
-
-def test_1115(test_env):
-    "1115 - multiple connections to database with multiple threads"
-
-    def connect_and_drop():
-        with test_env.get_connection() as conn:
-            cursor = conn.cursor()
-            cursor.execute("select count(*) from TestNumbers")
-            (count,) = cursor.fetchone()
-            assert count == 10
-
-    threads = []
-    for i in range(20):
-        thread = threading.Thread(None, connect_and_drop)
-        threads.append(thread)
-        thread.start()
-        time.sleep(0.1)
-    for thread in threads:
-        thread.join()
-
-
-def test_1116(conn, test_env):
-    "1116 - test string format of connection"
-    expected_value = (
-        "<oracledb.Connection to "
-        f"{test_env.main_user}@{test_env.connect_string}>"
-    )
-    assert str(conn) == expected_value
-
-
-def test_1117(test_env):
-    "1117 - test context manager - close"
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute("truncate table TestTempTable")
-        cursor.execute("insert into TestTempTable (IntCol) values (1)")
-        conn.commit()
-        cursor.execute("insert into TestTempTable (IntCol) values (2)")
-    with test_env.assert_raises_full_code("DPY-1001"):
-        conn.ping()
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 1
-
-
-def test_1118(conn, test_env):
-    "1118 - test connection attribute values"
-    if test_env.has_client_version(12, 1):
-        assert conn.ltxid == b""
-    assert not conn.autocommit
-    conn.autocommit = True
-    assert conn.autocommit
-    assert conn.current_schema is None
-    conn.current_schema = "system"
-    assert conn.current_schema == "system"
-    assert conn.edition is None
-    conn.external_name = "test_external"
-    assert conn.external_name == "test_external"
-    conn.internal_name = "test_internal"
-    assert conn.internal_name == "test_internal"
-    if conn.max_identifier_length is not None:
-        assert isinstance(conn.max_identifier_length, int)
-    conn.stmtcachesize = 30
-    assert conn.stmtcachesize == 30
-    with pytest.raises(TypeError):
-        conn.stmtcachesize = "value"
-    assert conn.warning is None
-
-
-def test_1119(conn, test_env):
-    "1119 - test closed connection attribute values"
-    conn.close()
-    attr_names = [
-        "current_schema",
-        "edition",
-        "external_name",
-        "internal_name",
-        "stmtcachesize",
-        "warning",
-    ]
-    if test_env.has_client_version(12, 1):
-        attr_names.append("ltxid")
-    for name in attr_names:
-        with test_env.assert_raises_full_code("DPY-1001"):
-            getattr(conn, name)
-
-
-def test_1120(conn, round_trip_checker):
-    "1120 - test connection ping makes a round trip"
-    conn.ping()
-    assert round_trip_checker.get_value() == 1
-
-
-def test_1121(skip_unless_thick_mode, conn):
-    "1121 - test begin, prepare, cancel transaction"
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    conn.begin(10, "trxnId", "branchId")
-    assert not conn.prepare()
-    conn.begin(10, "trxnId", "branchId")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    assert conn.prepare()
-    conn.cancel()
-    conn.rollback()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 0
-
-
-def test_1122(skip_unless_thick_mode, conn):
-    "1122 - test multiple transactions on the same connection"
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-
-    id_ = random.randint(0, 2**128)
-    xid = (0x1234, "%032x" % id_, "%032x" % 9)
-    conn.begin(*xid)
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (1, 'tesName')
-            """
-        )
-        assert conn.prepare()
-        conn.commit()
-
-    for begin_trans in (True, False):
-        val = 3
-        if begin_trans:
-            conn.begin()
-            val = 2
-        with conn.cursor() as cursor:
-            cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:int_val, 'tesName')
-                """,
-                int_val=val,
-            )
-            conn.commit()
-
-    expected_rows = [(1, "tesName"), (2, "tesName"), (3, "tesName")]
-    with conn.cursor() as cursor:
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == expected_rows
-
-
-def test_1123(skip_unless_thick_mode, conn):
-    "1123 - test multiple global transactions on the same connection"
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-
-    id_ = random.randint(0, 2**128)
-    xid = (0x1234, "%032x" % id_, "%032x" % 9)
-    conn.begin(*xid)
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (1, 'tesName')
-            """
-        )
-        assert conn.prepare()
-        conn.commit()
-
-    for begin_trans in (True, False):
-        val = 3
-        if begin_trans:
-            conn.begin()
-            val = 2
-        with conn.cursor() as cursor:
-            cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:int_val, 'tesName')
-                """,
-                int_val=val,
-            )
-            conn.commit()
-
-    id2_ = random.randint(0, 2**128)
-    xid2 = (0x1234, "%032x" % id2_, "%032x" % 9)
-    conn.begin(*xid2)
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (4, 'tesName')
-            """
-        )
-        assert conn.prepare()
-        conn.commit()
-
-    expected_rows = [
-        (1, "tesName"),
-        (2, "tesName"),
-        (3, "tesName"),
-        (4, "tesName"),
-    ]
-    with conn.cursor() as cursor:
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == expected_rows
-
-
-def test_1124(skip_unless_thick_mode, conn, test_env):
-    "1124 - test creating global txn after a local txn"
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (2, 'tesName')
-            """
-        )
-
-    id_ = random.randint(0, 2**128)
-    xid = (0x1234, "%032x" % id_, "%032x" % 9)
-    with test_env.assert_raises_full_code("ORA-24776"):
-        conn.begin(*xid)
-
-
-def test_1125(conn):
-    "1125 - single connection to database with multiple threads"
-
-    def verify_fetched_data():
-        expected_data = [f"String {i + 1}" for i in range(10)]
-        sql = "select StringCol from TestStrings order by IntCol"
-        for i in range(5):
-            with conn.cursor() as cursor:
-                fetched_data = [s for s, in cursor.execute(sql)]
-                assert fetched_data == expected_data
-
-    threads = [threading.Thread(target=verify_fetched_data) for i in range(3)]
-    for t in threads:
-        t.start()
-    for t in threads:
-        t.join()
-
-
-def test_1126(conn, test_env):
-    "1126 - test connection cancel"
-
-    def perform_cancel():
-        time.sleep(0.1)
-        conn.cancel()
-
-    thread = threading.Thread(target=perform_cancel)
-    thread.start()
-    try:
-        with conn.cursor() as cursor:
-            with pytest.raises(oracledb.OperationalError):
-                cursor.callproc(test_env.sleep_proc_name, [2])
-    finally:
-        thread.join()
-    with conn.cursor() as cursor:
-        cursor.execute("select user from dual")
-        (user,) = cursor.fetchone()
-        assert user == test_env.main_user.upper()
-
-
-def test_1127(skip_if_drcp, conn, test_env):
-    "1127 - test changing password during connect"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    sys_random = random.SystemRandom()
-    new_password = "".join(
-        sys_random.choice(string.ascii_letters) for i in range(20)
-    )
-    conn = test_env.get_connection(newpassword=new_password)
-    conn = test_env.get_connection(password=new_password)
-    conn.changepassword(new_password, test_env.main_password)
-
-
-def test_1128(test_env):
-    "1128 - test use of autocommit during reexecute"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    data_to_insert = [(1, "Test String #1"), (2, "Test String #2")]
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    other_conn = test_env.get_connection()
-    other_cursor = other_conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(sql, data_to_insert[0])
-    other_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert other_cursor.fetchall() == []
-    conn.autocommit = True
-    cursor.execute(sql, data_to_insert[1])
-    other_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert other_cursor.fetchall() == data_to_insert
-
-
-def test_1129(conn, test_env):
-    "1129 - test current_schema is set properly"
-    assert conn.current_schema is None
-    user = test_env.main_user.upper()
-    if test_env.proxy_user is None:
-        pytest.skip("proxy user not defined")
-    proxy_user = test_env.proxy_user.upper()
-    cursor = conn.cursor()
-    cursor.execute(f"alter session set current_schema={proxy_user}")
-    assert conn.current_schema == proxy_user
-    conn.current_schema = user
-    assert conn.current_schema == user
-    cursor.execute("select sys_context('userenv', 'current_schema') from dual")
-    (result,) = cursor.fetchone()
-    assert result == user
-
-
-def test_1130(conn):
-    "1130 - test dbms_output package"
-    cursor = conn.cursor()
-    test_string = "Testing DBMS_OUTPUT package"
-    cursor.callproc("dbms_output.enable")
-    cursor.callproc("dbms_output.put_line", [test_string])
-    string_var = cursor.var(str)
-    number_var = cursor.var(int)
-    cursor.callproc("dbms_output.get_line", (string_var, number_var))
-    assert string_var.getvalue() == test_string
-
-
-def test_1131(skip_unless_call_timeout_supported, conn, test_env):
-    "1131 - test connection call_timeout"
-    conn.call_timeout = 500  # milliseconds
-    assert conn.call_timeout == 500
-    with test_env.assert_raises_full_code("DPY-4011", "DPY-4024"):
-        conn.cursor().callproc(test_env.sleep_proc_name, [2])
-
-
-def test_1132(test_env):
-    "1132 - test Connection repr()"
-
-    class MyConnection(oracledb.Connection):
-        pass
-
-    conn = test_env.get_connection(conn_class=MyConnection)
-    qual_name = conn.__class__.__qualname__
-    expected_value = f"<{__name__}.{qual_name} to {conn.username}@{conn.dsn}>"
-    assert repr(conn) == expected_value
-
-    conn.close()
-    expected_value = f"<{__name__}.{qual_name} disconnected>"
-    assert repr(conn) == expected_value
-
-
-def test_1133(conn):
-    "1133 - test getting write-only attributes"
-    with pytest.raises(AttributeError):
-        conn.action
-    with pytest.raises(AttributeError):
-        conn.dbop
-    with pytest.raises(AttributeError):
-        conn.clientinfo
-    with pytest.raises(AttributeError):
-        conn.econtext_id
-    with pytest.raises(AttributeError):
-        conn.module
-    with pytest.raises(AttributeError):
-        conn.client_identifier
-
-
-def test_1134(test_env):
-    "1134 - test error for invalid type for params and pool"
-    pool = test_env.get_pool()
-    pool.close()
-    with test_env.assert_raises_full_code("DPY-1002"):
-        test_env.get_connection(pool=pool)
-    with pytest.raises(TypeError):
-        test_env.get_connection(pool="This isn't an instance of a pool")
-    with test_env.assert_raises_full_code("DPY-2025"):
-        oracledb.connect(params={"number": 7})
-
-
-def test_1135(conn):
-    "1135 - test connection instance name"
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select upper(sys_context('userenv', 'instance_name'))
-        from dual
-        """
-    )
-    (instance_name,) = cursor.fetchone()
-    assert conn.instance_name.upper() == instance_name
-
-
-def test_1136(skip_unless_call_timeout_supported, conn):
-    "1136 - test deprecated attributes"
-    conn.callTimeout = 500
-    assert conn.callTimeout == 500
-
-
-def test_1137(skip_if_drcp, skip_unless_long_passwords_supported, test_env):
-    "1137 - test maximum allowed length for password"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-
-    conn = test_env.get_connection()
-    original_password = test_env.main_password
-    new_password_32 = "a" * 32
-    conn.changepassword(original_password, new_password_32)
-    conn = test_env.get_connection(password=new_password_32)
-
-    new_password_1024 = "a" * 1024
-    conn.changepassword(new_password_32, new_password_1024)
-    conn = test_env.get_connection(password=new_password_1024)
-    conn.changepassword(new_password_1024, original_password)
-
-    new_password_1025 = "a" * 1025
-    with test_env.assert_raises_full_code("ORA-28218", "ORA-00972"):
-        conn.changepassword(original_password, new_password_1025)
-
-
-def test_1138(conn):
-    "1138 - test getting db_name"
-    cursor = conn.cursor()
-    cursor.execute("select name from V$DATABASE")
-    (db_name,) = cursor.fetchone()
-    assert conn.db_name.upper() == db_name.upper()
-
-
-def test_1139(conn):
-    "1139 - test getting max_open_cursors"
-    cursor = conn.cursor()
-    cursor.execute("select value from V$PARAMETER where name='open_cursors'")
-    (max_open_cursors,) = cursor.fetchone()
-    assert conn.max_open_cursors == int(max_open_cursors)
-
-
-def test_1140(conn):
-    "1140 - test getting service_name"
-    cursor = conn.cursor()
-    cursor.execute("select sys_context('userenv', 'service_name') from dual")
-    (service_name,) = cursor.fetchone()
-    assert conn.service_name.upper() == service_name.upper()
-
-
-def test_1141(conn):
-    "1141 - test transaction_in_progress"
-    assert not conn.transaction_in_progress
-
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    assert not conn.transaction_in_progress
-
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    assert conn.transaction_in_progress
-
-    conn.commit()
-    assert not conn.transaction_in_progress
-
-
-def test_1142(conn):
-    "1142 - test getting db_domain"
-    cursor = conn.cursor()
-    cursor.execute("select value from V$PARAMETER where name='db_domain'")
-    (db_domain,) = cursor.fetchone()
-    assert conn.db_domain == db_domain
-
-
-def test_1143(test_env):
-    "1143 - test connecting with a proxy user"
-    conn = test_env.get_connection(proxy_user=test_env.proxy_user)
-    assert conn.username == test_env.main_user
-    assert conn.proxy_user == test_env.proxy_user
-
-
-def test_1144(skip_unless_thin_mode, conn, test_env):
-    "1144 - test connection.sdu"
-    sdu = random.randint(512, conn.sdu)
-    conn = test_env.get_connection(sdu=sdu)
-    assert conn.sdu == sdu
-
-
-def test_1145(test_env):
-    "1145 - test connection with invalid conn_class"
-    with test_env.assert_raises_full_code("DPY-2023"):
-        test_env.get_connection(conn_class=oracledb.ConnectionPool)
-
-
-def test_1146(skip_unless_thin_mode, test_env):
-    "1146 - test passing program when creating a connection"
-    sql = (
-        "select program from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_connect_arg(test_env, "program", "newprogram", sql)
-
-
-def test_1147(skip_unless_thin_mode, test_env):
-    "1147 - test passing machine when creating a connection"
-    sql = (
-        "select machine from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_connect_arg(test_env, "machine", "newmachine", sql)
-
-
-def test_1148(skip_unless_thin_mode, test_env):
-    "1148 - test passing terminal when creating a connection"
-    sql = (
-        "select terminal from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_connect_arg(test_env, "terminal", "newterminal", sql)
-
-
-def test_1149(skip_unless_thin_mode, test_env):
-    "1149 - test passing osuser when creating a connection"
-    sql = (
-        "select osuser from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_connect_arg(test_env, "osuser", "newosuser", sql)
-
-
-def test_1150(test_env):
-    "1150 - test passing driver_name when creating a connection"
-    sql = (
-        "select distinct client_driver from v$session_connect_info "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_connect_arg(test_env, "driver_name", "newdriver", sql)
-
-
-def test_1151(skip_unless_thin_mode, conn):
-    "1151 - test getting session id"
-    cursor = conn.cursor()
-    cursor.execute("select dbms_debug_jdwp.current_session_id from dual")
-    (fetched_value,) = cursor.fetchone()
-    assert conn.session_id == fetched_value
-
-
-def test_1152(skip_unless_thin_mode, conn):
-    "1152 - test getting session serial number"
-    cursor = conn.cursor()
-    cursor.execute("select dbms_debug_jdwp.current_session_serial from dual")
-    (fetched_value,) = cursor.fetchone()
-    assert conn.serial_num == fetched_value
-
-
-def test_1153(skip_unless_thin_mode, test_env):
-    "1153 - test passed params in hook with standalone connection"
-    sdu = 4096
-    params = test_env.get_connect_params()
-    protocol = "proto-test"
-    orig_connect_string = test_env.connect_string
-    connect_string = f"{protocol}://{orig_connect_string}"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        assert passed_protocol == protocol
-        assert passed_protocol_arg == orig_connect_string
-        passed_params.parse_connect_string(passed_protocol_arg)
-        passed_params.set(sdu=sdu)
-
-    try:
-        oracledb.register_protocol(protocol, hook)
-        oracledb.connect(dsn=connect_string, params=params)
-        assert params.sdu == sdu
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_1154(conn, test_env):
-    "1154 - test altering connection edition"
-    assert conn.edition is None
-    cursor = conn.cursor()
-    sql = "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"
-    default_edition = "ORA$BASE"
-    test_edition = test_env.edition_name
-    for edition in [test_edition, default_edition]:
-        cursor.execute(f"alter session set edition = {edition}")
-        cursor.execute(sql)
-        assert conn.edition == cursor.fetchone()[0]
-        assert conn.edition == edition.upper()
-
-
-def test_1155(test_env):
-    "1155 - test connect() with edition"
-    edition = test_env.edition_name
-    conn = test_env.get_connection(edition=edition)
-    cursor = conn.cursor()
-    cursor.execute(
-        "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"
-    )
-    assert cursor.fetchone()[0] == edition.upper()
-    assert conn.edition == edition
-
-
-def test_1156(conn, test_env):
-    "1156 - test connect() with parameters hook"
-    orig_stmtcachesize = conn.stmtcachesize
-    stmtcachesize = orig_stmtcachesize + 10
-
-    def hook(params):
-        params.set(stmtcachesize=stmtcachesize)
-
-    try:
-        oracledb.register_params_hook(hook)
-        conn = test_env.get_connection()
-        assert conn.stmtcachesize == stmtcachesize
-    finally:
-        oracledb.unregister_params_hook(hook)
-
-    conn = test_env.get_connection()
-    assert conn.stmtcachesize == orig_stmtcachesize
-
-
-def test_1157(test_env, conn):
-    "1157 - test connect() with multiple parameters hooks"
-
-    def hook1(params):
-        order.append("first")
-
-    def hook2(params):
-        order.append("second")
-
-    def hook3(params):
-        order.append("third")
-
-    test_env.get_connection()
-    oracledb.register_params_hook(hook1)
-    oracledb.register_params_hook(hook2)
-    oracledb.register_params_hook(hook3)
-    try:
-        order = []
-        test_env.get_connection()
-        assert order == ["first", "second", "third"]
-    finally:
-        oracledb.unregister_params_hook(hook1)
-        oracledb.unregister_params_hook(hook2)
-        oracledb.unregister_params_hook(hook3)
-
-
-def test_1158(conn, test_env):
-    "1158 - test error in the middle of a database response"
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    data = [(i + 1, 2 if i < 1499 else 0) for i in range(1500)]
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, NumberCol) values (:1, :2)",
-        data,
-    )
-    conn.commit()
-    cursor.arraysize = 1500
-    with test_env.assert_raises_full_code("ORA-01476"):
-        cursor.execute(
-            """
-            select IntCol, 1 / NumberCol
-            from TestTempTable
-            where IntCol < 1500
-            union all
-            select IntCol, 1 / NumberCol
-            from TestTempTable
-            where IntCol = 1500
-            """
-        )
-        cursor.fetchall()
diff --git a/tests/test_1300_cursor_var.py b/tests/test_1300_cursor_var.py
deleted file mode 100644
index f75b0465..00000000
--- a/tests/test_1300_cursor_var.py
+++ /dev/null
@@ -1,504 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1300 - Module for testing cursor variables
-"""
-
-import oracledb
-
-
-def test_1300(conn, test_env):
-    "1300 - test binding in a cursor"
-    ref_cursor = conn.cursor()
-    assert ref_cursor.description is None
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        begin
-            open :cursor for select 'X' StringValue from dual;
-        end;
-        """,
-        cursor=ref_cursor,
-    )
-    varchar_ratio, _ = test_env.charset_ratios
-    expected_value = [
-        (
-            "STRINGVALUE",
-            oracledb.DB_TYPE_CHAR,
-            1,
-            varchar_ratio,
-            None,
-            None,
-            True,
-        )
-    ]
-    assert ref_cursor.description == expected_value
-    assert ref_cursor.fetchall() == [("X",)]
-
-
-def test_1301(conn, test_env):
-    "1301 - test binding in a cursor from a package"
-    ref_cursor = conn.cursor()
-    assert ref_cursor.description is None
-    cursor = conn.cursor()
-    cursor.callproc("pkg_TestRefCursors.TestOutCursor", (2, ref_cursor))
-    varchar_ratio, _ = test_env.charset_ratios
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "STRINGCOL",
-            oracledb.DB_TYPE_VARCHAR,
-            20,
-            20 * varchar_ratio,
-            None,
-            None,
-            False,
-        ),
-    ]
-    assert ref_cursor.description == expected_value
-    assert ref_cursor.fetchall() == [(1, "String 1"), (2, "String 2")]
-
-
-def test_1302(conn, test_env):
-    "1302 - test that binding the cursor itself is not supported"
-    cursor = conn.cursor()
-    sql = """
-            begin
-                open :pcursor for
-                    select 1 from dual;
-            end;"""
-    with test_env.assert_raises_full_code("DPY-3009"):
-        cursor.execute(sql, pcursor=cursor)
-
-
-def test_1303(conn):
-    "1303 - test returning a ref cursor after closing it"
-    out_cursor = conn.cursor()
-    sql = """
-            begin
-                open :pcursor for
-                    select IntCol
-                    from TestNumbers
-                    order by IntCol;
-            end;"""
-    cursor = conn.cursor()
-    cursor.execute(sql, pcursor=out_cursor)
-    rows = out_cursor.fetchall()
-    out_cursor.close()
-    out_cursor = conn.cursor()
-    cursor.execute(sql, pcursor=out_cursor)
-    rows2 = out_cursor.fetchall()
-    assert rows == rows2
-
-
-def test_1304(conn):
-    "1304 - test fetching a cursor"
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select IntCol, cursor(select IntCol + 1 from dual) CursorValue
-        from TestNumbers
-        order by IntCol
-        """
-    )
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "CURSORVALUE",
-            oracledb.DB_TYPE_CURSOR,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-    for i in range(1, 11):
-        number, child_cursor = cursor.fetchone()
-        assert number == i
-        assert child_cursor.fetchall() == [(i + 1,)]
-
-
-def test_1305(conn):
-    "1305 - test that ref cursor binds cannot use optimised path"
-    ref_cursor = conn.cursor()
-    sql = """
-            begin
-                open :rcursor for
-                    select IntCol, StringCol
-                    from TestStrings where IntCol
-                    between :start_value and :end_value;
-            end;"""
-    expected_value = [(2, "String 2"), (3, "String 3"), (4, "String 4")]
-    cursor = conn.cursor()
-    cursor.execute(sql, rcursor=ref_cursor, start_value=2, end_value=4)
-    assert ref_cursor.fetchall() == expected_value
-    ref_cursor.close()
-
-    expected_value = [(5, "String 5"), (6, "String 6")]
-    ref_cursor = conn.cursor()
-    cursor.execute(sql, rcursor=ref_cursor, start_value=5, end_value=6)
-    assert ref_cursor.fetchall() == expected_value
-
-
-def test_1306(conn, round_trip_checker):
-    "1306 - test round trips using a REF cursor"
-
-    # simple DDL only requires a single round trip
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-        assert round_trip_checker.get_value() == 1
-
-    # array execution only requires a single round trip
-    num_rows = 590
-    with conn.cursor() as cursor:
-        sql = "insert into TestTempTable (IntCol) values (:1)"
-        data = [(n + 1,) for n in range(num_rows)]
-        cursor.executemany(sql, data)
-        assert round_trip_checker.get_value() == 1
-
-    # create REF cursor and execute stored procedure
-    # (array size set before procedure is called)
-    with conn.cursor() as cursor:
-        refcursor = conn.cursor()
-        refcursor.arraysize = 150
-        cursor.callproc("myrefcursorproc", [refcursor])
-        refcursor.fetchall()
-        assert round_trip_checker.get_value() == 5
-
-    # create REF cursor and execute stored procedure
-    # (array size set after procedure is called)
-    with conn.cursor() as cursor:
-        refcursor = conn.cursor()
-        cursor.callproc("myrefcursorproc", [refcursor])
-        refcursor.arraysize = 145
-        refcursor.fetchall()
-        assert round_trip_checker.get_value() == 6
-
-
-def test_1307(conn):
-    "1307 - test executing different SQL after getting a REF cursor"
-    with conn.cursor() as cursor:
-        refcursor = conn.cursor()
-        cursor.callproc("myrefcursorproc", [refcursor])
-        var = cursor.var(int)
-        refcursor.execute("begin :1 := 15; end;", [var])
-        assert var.getvalue() == 15
-
-
-def test_1308(conn):
-    "1308 - test calling a function that returns a REF cursor"
-    with conn.cursor() as cursor:
-        ref_cursor = cursor.callfunc(
-            "pkg_TestRefCursors.TestReturnCursor",
-            oracledb.DB_TYPE_CURSOR,
-            [2],
-        )
-        assert ref_cursor.fetchall() == [(1, "String 1"), (2, "String 2")]
-
-
-def test_1309(conn):
-    "1309 - test using an output type handler with a REF cursor"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(str, arraysize=cursor.arraysize)
-
-    conn.outputtypehandler = type_handler
-    var = conn.cursor().var(oracledb.DB_TYPE_CURSOR)
-    string_val = "Test String - 1309"
-    with conn.cursor() as cursor:
-        cursor.callproc("pkg_TestRefCursors.TestLobCursor", [string_val, var])
-    ref_cursor = var.getvalue()
-    assert ref_cursor.fetchall() == [(string_val,)]
-    assert var.getvalue() is ref_cursor
-
-
-def test_1310(conn, test_env):
-    "1310 - bind a REF cursor but never open it"
-    cursor = conn.cursor()
-    ref_cursor_var = cursor.var(oracledb.DB_TYPE_CURSOR)
-    cursor.execute(
-        """
-        begin
-            if false then
-                open :cursor for
-                    select user
-                    from dual;
-            end if;
-        end;
-        """,
-        cursor=ref_cursor_var,
-    )
-    ref_cursor = ref_cursor_var.getvalue()
-    if ref_cursor is not None:
-        with test_env.assert_raises_full_code("DPY-4025"):
-            ref_cursor.fetchall()
-
-
-def test_1311(test_env):
-    "1311 - test fetching a cursor with a custom class"
-
-    class Counter:
-        num_cursors_created = 0
-
-        @classmethod
-        def cursor_created(cls):
-            cls.num_cursors_created += 1
-
-    class MyConnection(oracledb.Connection):
-        def cursor(self):
-            Counter.cursor_created()
-            return super().cursor()
-
-    conn = test_env.get_connection(conn_class=MyConnection)
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select
-            cursor(select 1 from dual),
-            cursor(select 2 from dual)
-        from dual
-        """
-    )
-    cursor.fetchall()
-    assert Counter.num_cursors_created == 3
-
-
-def test_1312(conn):
-    "1312 - test that nested cursors are fetched correctly"
-    sql = """
-        select
-        'Level 1 String',
-        cursor(
-            select
-            'Level 2 String',
-            cursor(
-                select
-                'Level 3 String',
-                cursor(
-                    select 1, 'Level 4 String A' from dual
-                    union all
-                    select 2, 'Level 4 String B' from dual
-                    union all
-                    select 3, 'Level 4 String C' from dual
-                ) as nc3
-                from dual
-            ) as nc2
-            from dual
-        ) as nc1
-        from dual"""
-    cursor = conn.cursor()
-    cursor.execute(sql)
-
-    def transform_row(r):
-        return tuple(transform_fn(v) for v in r)
-
-    def transform_fn(v):
-        if isinstance(v, oracledb.Cursor):
-            return [transform_row(r) for r in v]
-        return v
-
-    rows = [transform_row(r) for r in cursor]
-    expected_value = [
-        (
-            "Level 1 String",
-            [
-                (
-                    "Level 2 String",
-                    [
-                        (
-                            "Level 3 String",
-                            [
-                                (1, "Level 4 String A"),
-                                (2, "Level 4 String B"),
-                                (3, "Level 4 String C"),
-                            ],
-                        ),
-                    ],
-                ),
-            ],
-        )
-    ]
-    assert rows == expected_value
-
-
-def test_1313(conn):
-    "1313 - test fetching nested cursors with more columns than parent"
-    sql = """
-        select
-            'Top Level String',
-            cursor(
-                select
-                    'Nested String 1',
-                    'Nested String 2',
-                    'Nested String 3'
-                from dual
-            )
-        from dual"""
-    cursor = conn.cursor()
-    cursor.execute(sql)
-
-    def transform_row(r):
-        return tuple(transform_fn(v) for v in r)
-
-    def transform_fn(v):
-        if isinstance(v, oracledb.Cursor):
-            return [transform_row(r) for r in v]
-        return v
-
-    rows = [transform_row(r) for r in cursor]
-    expected_value = [
-        (
-            "Top Level String",
-            [("Nested String 1", "Nested String 2", "Nested String 3")],
-        )
-    ]
-    assert rows == expected_value
-
-
-def test_1314(conn):
-    "1314 - test reusing a closed ref cursor for executing different sql"
-    sql = "select 13141, 'String 13141' from dual"
-    ref_cursor = conn.cursor()
-    ref_cursor.prefetchrows = 0
-    ref_cursor.execute(sql)
-    plsql = "begin pkg_TestRefCursors.TestCloseCursor(:rcursor); end;"
-    cursor = conn.cursor()
-    cursor.execute(plsql, rcursor=ref_cursor)
-    sql = "select 13142, 'String 13142' from dual"
-    ref_cursor.execute(sql)
-    assert ref_cursor.fetchall() == [(13142, "String 13142")]
-
-
-def test_1315(conn):
-    "1315 - test reusing a closed ref cursor for executing same sql"
-    sql = "select 1315, 'String 1315' from dual"
-    ref_cursor = conn.cursor()
-    ref_cursor.prefetchrows = 0
-    ref_cursor.execute(sql)
-    plsql = "begin pkg_TestRefCursors.TestCloseCursor(:rcursor); end;"
-    cursor = conn.cursor()
-    cursor.execute(plsql, rcursor=ref_cursor)
-    ref_cursor.execute(sql)
-    assert ref_cursor.fetchall() == [(1315, "String 1315")]
-
-
-def test_1316(conn, test_env):
-    "1316 - test using a closed ref cursor for OUT bind"
-    value = "test 1316a"
-    sql = """
-        declare
-            t_Cursor sys_refcursor;
-        begin
-            open t_Cursor for
-                select :value
-                from dual;
-            :cursor := t_Cursor;
-        end;
-    """
-    cursor = conn.cursor()
-    var = cursor.var(oracledb.DB_TYPE_CURSOR)
-    cursor.execute(sql, [value, var])
-    ref_cursor = var.getvalue()
-    assert ref_cursor.fetchall() == [(value,)]
-    ref_cursor.close()
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.execute(sql, [value, var])
-
-
-def test_1317(conn, cursor, test_env):
-    "1317 - test binding a closed cursor"
-    ref_cursor = conn.cursor()
-    ref_cursor.close()
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.callfunc("pkg_testRefCursors.TestInCursor", str, [ref_cursor])
-
-
-def test_1318(test_env):
-    "1318 - test ref cursor doesn't work after connection is closed"
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    var = cursor.var(oracledb.DB_TYPE_CURSOR)
-    cursor.callproc("myrefcursorproc", [var])
-    conn.close()
-    with test_env.assert_raises_full_code("DPY-1001"):
-        ref_cursor = var.getvalue()
-        ref_cursor.fetchall()
-
-
-def test_1319(cursor, test_env):
-    "1319 - test binding cursor that is not from the same connection"
-    sql = """
-        declare
-            t_Cursor sys_refcursor;
-        begin
-            open t_Cursor for
-                select 1319
-                from dual;
-            :cursor := t_Cursor;
-        end;
-    """
-    ref_cursor = test_env.get_connection().cursor()
-    with test_env.assert_raises_full_code("DPY-3027"):
-        cursor.execute(sql, [ref_cursor])
-
-
-def test_1320(conn):
-    "1320 - test fetching nested cursors repeatedly"
-    sql = """
-        select
-            s.Description,
-            cursor(select 'Nested String for ' || s.Description from dual)
-        from
-            (
-                select 'Top Level String 1' as Description
-                from dual
-                union all
-                select 'Top Level String 2'
-                from dual
-                union all
-                select 'Top Level String 3'
-                from dual
-                union all
-                select 'Top Level String 4'
-                from dual
-                union all
-                select 'Top Level String 5'
-                from dual
-            ) s"""
-
-    for i in range(3):
-        with conn.cursor() as cursor:
-            cursor.arraysize = 10
-            cursor.execute(sql)
-            desc, nested1 = cursor.fetchone()
-            assert desc == "Top Level String 1"
-            nested_rows = nested1.fetchall()
-            assert nested_rows == [("Nested String for Top Level String 1",)]
-            desc, nested2 = cursor.fetchone()
-            assert desc == "Top Level String 2"
-            nested_rows = nested2.fetchall()
-            assert nested_rows == [("Nested String for Top Level String 2",)]
diff --git a/tests/test_1400_datetime_var.py b/tests/test_1400_datetime_var.py
deleted file mode 100644
index 3f9edb03..00000000
--- a/tests/test_1400_datetime_var.py
+++ /dev/null
@@ -1,321 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1400 - Module for testing date/time variables
-"""
-
-import pytest
-import datetime
-
-import oracledb
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        base_date = datetime.datetime(2002, 12, 9)
-        date_interval = datetime.timedelta(days=i, hours=i * 2, minutes=i * 24)
-        date_col = base_date + date_interval
-        if i % 2:
-            date_interval = datetime.timedelta(
-                days=i * 2, hours=i * 3, minutes=i * 36
-            )
-            nullable_col = base_date + date_interval
-        else:
-            nullable_col = None
-        data_tuple = (i, date_col, nullable_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_1400(cursor, module_data_by_key):
-    "1400 - test binding in a date"
-    cursor.execute(
-        "select * from TestDates where DateCol = :value",
-        value=datetime.datetime(2002, 12, 13, 9, 36, 0),
-    )
-    assert cursor.fetchall() == [module_data_by_key[4]]
-
-
-def test_1401(cursor, module_data_by_key):
-    "1401 - test binding in a datetime.datetime value"
-    cursor.execute(
-        "select * from TestDates where DateCol = :value",
-        value=datetime.datetime(2002, 12, 13, 9, 36, 0),
-    )
-    assert cursor.fetchall() == [module_data_by_key[4]]
-
-
-def test_1402(cursor):
-    "1402 - test binding date in a datetime variable"
-    var = cursor.var(oracledb.DATETIME)
-    date_val = datetime.date.today()
-    var.setvalue(0, date_val)
-    cursor.execute("select :1 from dual", [var])
-    (result,) = cursor.fetchone()
-    assert result.date() == date_val
-
-
-def test_1403(cursor, module_data_by_key):
-    "1403 - test binding in a date after setting input sizes to a string"
-    cursor.setinputsizes(value=15)
-    cursor.execute(
-        "select * from TestDates where DateCol = :value",
-        value=datetime.datetime(2002, 12, 14, 12, 0, 0),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_1404(cursor):
-    "1404 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DATETIME)
-    cursor.execute(
-        "select * from TestDates where DateCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_1405(cursor, module_data):
-    "1405 - test binding in a date array"
-    array = [r[1] for r in module_data]
-    return_value = cursor.callfunc(
-        "pkg_TestDateArrays.TestInArrays",
-        oracledb.DB_TYPE_NUMBER,
-        [5, datetime.date(2002, 12, 12), array],
-    )
-    assert return_value == 35.5
-    array += array[:5]
-    return_value = cursor.callfunc(
-        "pkg_TestDateArrays.TestInArrays",
-        oracledb.DB_TYPE_NUMBER,
-        [7, datetime.date(2002, 12, 13), array],
-    )
-    assert return_value == 24.0
-
-
-def test_1406(cursor, module_data):
-    "1406 - test binding in a date array (with setinputsizes)"
-    return_value = cursor.var(oracledb.NUMBER)
-    cursor.setinputsizes(array=[oracledb.DATETIME, 10])
-    array = [r[1] for r in module_data]
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestDateArrays.TestInArrays(
-                :start_value, :base_date, :array);
-        end;
-        """,
-        return_value=return_value,
-        start_value=6,
-        base_date=oracledb.Date(2002, 12, 13),
-        array=array,
-    )
-    assert return_value.getvalue() == 26.5
-
-
-def test_1407(cursor, module_data):
-    "1407 - test binding in a date array (with arrayvar)"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = cursor.arrayvar(oracledb.DATETIME, 10, 20)
-    array.setvalue(0, [r[1] for r in module_data])
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestDateArrays.TestInArrays(
-                :start_value, :base_date, :array);
-        end;
-        """,
-        return_value=return_value,
-        start_value=7,
-        base_date=oracledb.Date(2002, 12, 14),
-        array=array,
-    )
-    assert return_value.getvalue() == 17.5
-
-
-def test_1408(cursor, module_data):
-    "1408 - test binding in/out a date array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.DATETIME, 10, 100)
-    original_data = [r[1] for r in module_data]
-    array.setvalue(0, original_data)
-    cursor.execute(
-        """
-        begin
-            pkg_TestDateArrays.TestInOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=5,
-        array=array,
-    )
-    expected_value = [
-        datetime.datetime(2002, 12, 17, 2, 24, 0),
-        datetime.datetime(2002, 12, 18, 4, 48, 0),
-        datetime.datetime(2002, 12, 19, 7, 12, 0),
-        datetime.datetime(2002, 12, 20, 9, 36, 0),
-        datetime.datetime(2002, 12, 21, 12, 0, 0),
-    ] + original_data[5:]
-    assert array.getvalue() == expected_value
-
-
-def test_1409(cursor):
-    "1409 - test binding out a date array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.DATETIME, 6, 100)
-    cursor.execute(
-        """
-        begin
-            pkg_TestDateArrays.TestOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=6,
-        array=array,
-    )
-    expected_value = [
-        datetime.datetime(2002, 12, 13, 4, 48, 0),
-        datetime.datetime(2002, 12, 14, 9, 36, 0),
-        datetime.datetime(2002, 12, 15, 14, 24, 0),
-        datetime.datetime(2002, 12, 16, 19, 12, 0),
-        datetime.datetime(2002, 12, 18, 0, 0, 0),
-        datetime.datetime(2002, 12, 19, 4, 48, 0),
-    ]
-    assert array.getvalue() == expected_value
-
-
-def test_1410(cursor):
-    "1410 - test binding out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DATETIME)
-    cursor.execute(
-        """
-        begin
-            :value := to_date(20021209, 'YYYYMMDD');
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == datetime.datetime(2002, 12, 9)
-
-
-def test_1411(cursor):
-    "1411 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DATETIME)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=datetime.datetime(2002, 12, 12, 10, 0, 0),
-    )
-    fetched_value = bind_vars["value"].getvalue()
-    assert fetched_value == datetime.datetime(2002, 12, 17, 16, 0, 0)
-
-
-def test_1412(cursor):
-    "1412 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DATETIME)
-    cursor.execute(
-        """
-        begin
-            :value := to_date('20021231 12:31:00', 'YYYYMMDD HH24:MI:SS');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2002, 12, 31, 12, 31, 0)
-
-
-def test_1413(cursor):
-    "1413 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DATETIME)
-    var.setvalue(0, datetime.datetime(2002, 12, 9, 6, 0, 0))
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2002, 12, 14, 12, 0, 0)
-
-
-def test_1414(cursor):
-    "1414 - test cursor description is accurate"
-    cursor.execute("select * from TestDates")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        ("DATECOL", oracledb.DB_TYPE_DATE, 23, None, None, None, False),
-        ("NULLABLECOL", oracledb.DB_TYPE_DATE, 23, None, None, None, True),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_1415(cursor, module_data):
-    "1415 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestDates order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_1416(cursor, module_data):
-    "1416 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestDates order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_1417(cursor, module_data_by_key):
-    "1417 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestDates
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_1418(cursor):
-    "1418 - test fetching a date with year < 0"
-    with pytest.raises(ValueError):
-        cursor.execute(
-            "select to_date('-4712-01-01', 'SYYYY-MM-DD') from dual"
-        )
-        cursor.fetchone()
diff --git a/tests/test_1500_types.py b/tests/test_1500_types.py
deleted file mode 100644
index 82362a0c..00000000
--- a/tests/test_1500_types.py
+++ /dev/null
@@ -1,238 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1500 - Module for testing comparisons with database types and API types,
-including the synonyms retained for backwards compatibility. This module also
-tests for pickling/unpickling of database types and API types.
-"""
-
-import pickle
-
-import oracledb
-
-
-def _test_compare(db_type, api_type):
-    assert db_type == db_type
-    assert db_type == api_type
-    assert api_type == db_type
-    assert db_type != 5
-    assert db_type != oracledb.DB_TYPE_OBJECT
-
-
-def _test_pickle(typ):
-    assert typ is pickle.loads(pickle.dumps(typ))
-
-
-def test_1500():
-    "1500 - test oracledb.DB_TYPE_BFILE comparisons and pickling"
-    assert oracledb.DB_TYPE_BFILE == oracledb.BFILE
-    _test_pickle(oracledb.DB_TYPE_BFILE)
-
-
-def test_1501():
-    "1501 - test oracledb.DB_TYPE_BINARY_DOUBLE comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_BINARY_DOUBLE, oracledb.NUMBER)
-    assert oracledb.DB_TYPE_BINARY_DOUBLE == oracledb.NATIVE_FLOAT
-    _test_pickle(oracledb.DB_TYPE_BINARY_DOUBLE)
-
-
-def test_1502():
-    "1502 - test oracledb.DB_TYPE_BINARY_FLOAT comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_BINARY_FLOAT, oracledb.NUMBER)
-    _test_pickle(oracledb.DB_TYPE_BINARY_FLOAT)
-
-
-def test_1503():
-    "1503 - test oracledb.DB_TYPE_BINARY_INTEGER comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_BINARY_INTEGER, oracledb.NUMBER)
-    assert oracledb.DB_TYPE_BINARY_INTEGER == oracledb.NATIVE_INT
-    _test_pickle(oracledb.DB_TYPE_BINARY_INTEGER)
-
-
-def test_1504():
-    "1504 - test oracledb.DB_TYPE_BLOB comparisons and pickling"
-    assert oracledb.DB_TYPE_BLOB == oracledb.BLOB
-    _test_pickle(oracledb.DB_TYPE_BLOB)
-
-
-def test_1505():
-    "1505 - test oracledb.DB_TYPE_BOOLEAN comparisons and pickling"
-    assert oracledb.DB_TYPE_BOOLEAN == oracledb.BOOLEAN
-    _test_pickle(oracledb.DB_TYPE_BOOLEAN)
-
-
-def test_1506():
-    "1506 - test oracledb.DB_TYPE_CHAR comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_CHAR, oracledb.STRING)
-    assert oracledb.DB_TYPE_CHAR == oracledb.FIXED_CHAR
-    _test_pickle(oracledb.DB_TYPE_CHAR)
-
-
-def test_1507():
-    "1507 - test oracledb.DB_TYPE_CLOB comparisons and pickling"
-    assert oracledb.DB_TYPE_CLOB == oracledb.CLOB
-    _test_pickle(oracledb.DB_TYPE_CLOB)
-
-
-def test_1508():
-    "1508 - test oracledb.DB_TYPE_CURSOR comparisons and pickling"
-    assert oracledb.DB_TYPE_CURSOR == oracledb.CURSOR
-    _test_pickle(oracledb.DB_TYPE_CURSOR)
-
-
-def test_1509():
-    "1509 - test oracledb.DB_TYPE_DATE comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_DATE, oracledb.DATETIME)
-    _test_pickle(oracledb.DB_TYPE_DATE)
-
-
-def test_1510():
-    "1510 - test oracledb.DB_TYPE_INTERVAL_DS comparisons and pickling"
-    assert oracledb.DB_TYPE_INTERVAL_DS == oracledb.INTERVAL
-    _test_pickle(oracledb.DB_TYPE_INTERVAL_DS)
-
-
-def test_1511():
-    "1511 - test oracledb.DB_TYPE_LONG comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_LONG, oracledb.STRING)
-    assert oracledb.DB_TYPE_LONG == oracledb.LONG_STRING
-    _test_pickle(oracledb.DB_TYPE_LONG)
-
-
-def test_1512():
-    "1512 - test oracledb.DB_TYPE_LONG_RAW comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_LONG_RAW, oracledb.BINARY)
-    assert oracledb.DB_TYPE_LONG_RAW == oracledb.LONG_BINARY
-    _test_pickle(oracledb.DB_TYPE_LONG_RAW)
-
-
-def test_1513():
-    "1513 - test oracledb.DB_TYPE_NCHAR comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_NCHAR, oracledb.STRING)
-    assert oracledb.DB_TYPE_NCHAR == oracledb.FIXED_NCHAR
-    _test_pickle(oracledb.DB_TYPE_NCHAR)
-
-
-def test_1514():
-    "1514 - test oracledb.DB_TYPE_NCLOB comparisons and pickling"
-    assert oracledb.DB_TYPE_NCLOB == oracledb.NCLOB
-    _test_pickle(oracledb.DB_TYPE_NCLOB)
-
-
-def test_1515():
-    "1515 - test oracledb.DB_TYPE_NUMBER comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_NUMBER, oracledb.NUMBER)
-    _test_pickle(oracledb.DB_TYPE_NUMBER)
-
-
-def test_1516():
-    "1516 - test oracledb.DB_TYPE_NVARCHAR comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_NVARCHAR, oracledb.STRING)
-    assert oracledb.DB_TYPE_NVARCHAR == oracledb.NCHAR
-    _test_pickle(oracledb.DB_TYPE_NVARCHAR)
-
-
-def test_1517():
-    "1517 - test oracledb.DB_TYPE_OBJECT comparisons and pickling"
-    assert oracledb.DB_TYPE_OBJECT == oracledb.OBJECT
-    _test_pickle(oracledb.DB_TYPE_OBJECT)
-
-
-def test_1518():
-    "1518 - test oracledb.DB_TYPE_RAW comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_RAW, oracledb.BINARY)
-    _test_pickle(oracledb.DB_TYPE_RAW)
-
-
-def test_1519():
-    "1519 - test oracledb.DB_TYPE_ROWID comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_ROWID, oracledb.ROWID)
-    _test_pickle(oracledb.DB_TYPE_ROWID)
-
-
-def test_1520():
-    "1520 - test oracledb.DB_TYPE_TIMESTAMP comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_TIMESTAMP, oracledb.DATETIME)
-    assert oracledb.DB_TYPE_TIMESTAMP == oracledb.TIMESTAMP
-    _test_pickle(oracledb.DB_TYPE_TIMESTAMP)
-
-
-def test_1521():
-    "1521 - test oracledb.DB_TYPE_TIMESTAMP_LTZ comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_TIMESTAMP_LTZ, oracledb.DATETIME)
-    _test_pickle(oracledb.DB_TYPE_TIMESTAMP_LTZ)
-
-
-def test_1522():
-    "1522 - test oracledb.DB_TYPE_TIMESTAMP_TZ comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_TIMESTAMP_TZ, oracledb.DATETIME)
-    _test_pickle(oracledb.DB_TYPE_TIMESTAMP_TZ)
-
-
-def test_1523():
-    "1523 - test oracledb.DB_TYPE_VARCHAR comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_VARCHAR, oracledb.STRING)
-    _test_pickle(oracledb.DB_TYPE_VARCHAR)
-
-
-def test_1524():
-    "1524 - test oracledb.NUMBER pickling"
-    _test_pickle(oracledb.NUMBER)
-
-
-def test_1525():
-    "1525 - test oracledb.STRING pickling"
-    _test_pickle(oracledb.STRING)
-
-
-def test_1526():
-    "1526 - test oracledb.DATETIME pickling"
-    _test_pickle(oracledb.DATETIME)
-
-
-def test_1527():
-    "1527 - test oracledb.BINARY pickling"
-    _test_pickle(oracledb.BINARY)
-
-
-def test_1528():
-    "1528 - test oracledb.ROWID pickling"
-    _test_pickle(oracledb.ROWID)
-
-
-def test_1529():
-    "1529 - test oracledb.DB_TYPE_UROWID comparisons and pickling"
-    _test_compare(oracledb.DB_TYPE_UROWID, oracledb.ROWID)
-    _test_pickle(oracledb.DB_TYPE_UROWID)
-
-
-def test_1530():
-    "1530 - test oracledb.DB_TYPE_JSON pickling"
-    _test_pickle(oracledb.DB_TYPE_JSON)
-
-
-def test_1531():
-    "1531 - test oracledb.DB_TYPE_INTERVAL_YM pickling"
-    _test_pickle(oracledb.DB_TYPE_INTERVAL_YM)
diff --git a/tests/test_1600_dml_returning.py b/tests/test_1600_dml_returning.py
deleted file mode 100644
index 507afc7d..00000000
--- a/tests/test_1600_dml_returning.py
+++ /dev/null
@@ -1,638 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1600 - Module for testing DML returning clauses
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-def test_1600(cursor):
-    "1600 - test insert (single row) with DML returning"
-    cursor.execute("truncate table TestTempTable")
-    int_val = 5
-    str_val = "A test string"
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[int_val]]
-    assert str_var.values == [[str_val]]
-
-
-def test_1601(cursor):
-    "1601 - test insert (multiple rows) with DML returning"
-    cursor.execute("truncate table TestTempTable")
-    int_values = [5, 8, 17, 24, 6]
-    str_values = ["Test 5", "Test 8", "Test 17", "Test 24", "Test 6"]
-    int_var = cursor.var(oracledb.NUMBER, arraysize=len(int_values))
-    str_var = cursor.var(str, arraysize=len(int_values))
-    cursor.setinputsizes(None, None, int_var, str_var)
-    data = list(zip(int_values, str_values))
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        data,
-    )
-    assert int_var.values == [[v] for v in int_values]
-    assert str_var.values == [[v] for v in str_values]
-
-
-def test_1602(cursor, test_env):
-    "1602 - test insert with DML returning into too small a variable"
-    cursor.execute("truncate table TestTempTable")
-    int_val = 6
-    str_val = "A different test string"
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str, 2)
-    parameters = dict(
-        int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
-    )
-    with test_env.assert_raises_full_code("DPY-4002", "DPI-1037"):
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :int_var, :str_var
-            """,
-            parameters,
-        )
-
-
-def test_1603(cursor):
-    "1603 - test update single row with DML returning"
-    int_val = 7
-    str_val = "The updated value of the string"
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        (int_val, "The initial value of the string"),
-    )
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str)
-    cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = :str_val
-        where IntCol = :int_val
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[int_val]]
-    assert str_var.values == [[str_val]]
-
-
-def test_1604(cursor):
-    "1604 - test update no rows with DML returning"
-    int_val = 8
-    str_val = "The updated value of the string"
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        (int_val, "The initial value of the string"),
-    )
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str)
-    cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = :str_val
-        where IntCol = :int_val
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val + 1,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[]]
-    assert str_var.values == [[]]
-    assert int_var.getvalue() == []
-    assert str_var.getvalue() == []
-
-
-def test_1605(cursor):
-    "1605 - test update multiple rows with DML returning"
-    cursor.execute("truncate table TestTempTable")
-    for i in (8, 9, 10):
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1) values (:1, :2)
-            """,
-            (i, f"The initial value of string {i}"),
-        )
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str)
-    cursor.execute(
-        """
-        update TestTempTable set
-            IntCol = IntCol + 15,
-            StringCol1 = 'The final value of string ' || to_char(IntCol)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert cursor.rowcount == 3
-    assert int_var.values == [[23, 24, 25]]
-    expected_values = [
-        [
-            "The final value of string 8",
-            "The final value of string 9",
-            "The final value of string 10",
-        ]
-    ]
-    assert str_var.values == expected_values
-
-
-def test_1606(cursor):
-    "1606 - test update multiple rows with DML returning (executemany)"
-    data = [(i, f"The initial value of string {i}") for i in range(1, 11)]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        data,
-    )
-    int_var = cursor.var(oracledb.NUMBER, arraysize=3)
-    str_var = cursor.var(str, arraysize=3)
-    cursor.setinputsizes(None, int_var, str_var)
-    cursor.executemany(
-        """
-        update TestTempTable set
-            IntCol = IntCol + 25,
-            StringCol1 = 'Updated value of string ' || to_char(IntCol)
-        where IntCol < :inVal
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        [[3], [8], [11]],
-    )
-    expected_values = [[26, 27], [28, 29, 30, 31, 32], [33, 34, 35]]
-    assert int_var.values == expected_values
-    expected_values = [
-        ["Updated value of string 1", "Updated value of string 2"],
-        [
-            "Updated value of string 3",
-            "Updated value of string 4",
-            "Updated value of string 5",
-            "Updated value of string 6",
-            "Updated value of string 7",
-        ],
-        [
-            "Updated value of string 8",
-            "Updated value of string 9",
-            "Updated value of string 10",
-        ],
-    ]
-    assert str_var.values == expected_values
-
-
-def test_1607(conn, cursor):
-    "1607 - test inserting an object with DML returning"
-    type_obj = conn.gettype("UDT_OBJECT")
-    string_value = "The string that will be verified"
-    obj = type_obj.newobject()
-    obj.STRINGVALUE = string_value
-    out_var = cursor.var(oracledb.DB_TYPE_OBJECT, typename="UDT_OBJECT")
-    cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (4, :obj)returning ObjectCol into :outObj
-        """,
-        obj=obj,
-        outObj=out_var,
-    )
-    (result,) = out_var.getvalue()
-    assert result.STRINGVALUE == string_value
-    conn.rollback()
-
-
-def test_1608(cursor):
-    "1608 - test inserting a row and returning a rowid"
-    cursor.execute("truncate table TestTempTable")
-    var = cursor.var(oracledb.ROWID)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (278, 'String 278')
-        returning rowid into :1
-        """,
-        [var],
-    )
-    (rowid,) = var.getvalue()
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        where rowid = :1
-        """,
-        [rowid],
-    )
-    assert cursor.fetchall() == [(278, "String 278")]
-
-
-def test_1609(conn, cursor):
-    "1609 - test inserting with a REF cursor and returning a rowid"
-    cursor.execute("truncate table TestTempTable")
-    var = cursor.var(oracledb.ROWID)
-    in_cursor = conn.cursor()
-    in_cursor.execute(
-        """
-        select StringCol
-        from TestStrings
-        where IntCol >= 5
-        order by IntCol
-        """
-    )
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (187, pkg_TestRefCursors.TestInCursor(:1))
-        returning rowid into :2
-        """,
-        (in_cursor, var),
-    )
-    (rowid,) = var.getvalue()
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        where rowid = :1
-        """,
-        [rowid],
-    )
-    assert cursor.fetchall() == [(187, "String 7 (Modified)")]
-
-
-def test_1610(cursor):
-    "1610 - test delete returning decreasing number of rows"
-    data = [(i, f"Test String {i}") for i in range(1, 11)]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    results = []
-    int_var = cursor.var(int)
-    cursor.setinputsizes(None, int_var)
-    for int_val in (5, 8, 10):
-        cursor.execute(
-            """
-            delete from TestTempTable
-            where IntCol < :1
-            returning IntCol into :2
-            """,
-            [int_val],
-        )
-        results.append(int_var.getvalue())
-    assert results == [[1, 2, 3, 4], [5, 6, 7], [8, 9]]
-
-
-def test_1611(cursor):
-    "1611 - test delete returning no rows after returning many rows"
-    data = [(i, f"Test String {i}") for i in range(1, 11)]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    int_var = cursor.var(int)
-    cursor.execute(
-        """
-        delete from TestTempTable
-        where IntCol < :1
-        returning IntCol into :2
-        """,
-        [5, int_var],
-    )
-    assert int_var.getvalue() == [1, 2, 3, 4]
-    cursor.execute(None, [4, int_var])
-    assert int_var.getvalue() == []
-
-
-def test_1612(cursor, test_env):
-    "1612 - test DML returning when an error occurs"
-    cursor.execute("truncate table TestTempTable")
-    int_val = 7
-    str_val = "A" * 401
-    int_var = cursor.var(oracledb.NUMBER)
-    str_var = cursor.var(str)
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :int_var, :str_var"""
-    parameters = dict(
-        int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
-    )
-    with test_env.assert_raises_full_code("ORA-12899"):
-        cursor.execute(sql, parameters)
-
-
-def test_1613(cursor):
-    "1613 - test DML returning with no input variables, multiple iters"
-    cursor.execute("truncate table TestTempTable")
-    sql = """
-            insert into TestTempTable (IntCol)
-            values ((select count(*) + 1 from TestTempTable))
-            returning IntCol into :1"""
-    var = cursor.var(int)
-    cursor.execute(sql, [var])
-    assert var.getvalue() == [1]
-    cursor.execute(sql, [var])
-    assert var.getvalue() == [2]
-
-
-def test_1614(cursor):
-    "1614 - test DML returning with a quoted bind name"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :"_val1" , :"VaL_2" """
-    cursor.parse(sql)
-    expected_bind_names = ["INT_VAL", "STR_VAL", "_val1", "VaL_2"]
-    assert cursor.bindnames() == expected_bind_names
-
-
-def test_1615(cursor, test_env):
-    "1615 - test DML returning with an invalid bind name"
-    sql = """
-            insert into TestTempTable (IntCol)
-            values (:int_val)
-            returning IntCol, StringCol1 into :ROWID"""
-    with test_env.assert_raises_full_code("ORA-01745"):
-        cursor.parse(sql)
-
-
-def test_1616(cursor):
-    "1616 - test DML returning with a non-ascii bind name"
-    sql = """
-            insert into TestTempTable (IntCol)
-            values (:int_val)
-            returning IntCol, StringCol1 into :méil"""
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["INT_VAL", "MÉIL"]
-
-
-def test_1617(conn, cursor):
-    "1617 - test DML returning with input bind variable data"
-    cursor.execute("truncate table TestTempTable")
-    out_var = cursor.var(int)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol)
-        values (:int_val)
-        returning IntCol + :add_val into :out_val
-        """,
-        int_val=5,
-        add_val=18,
-        out_val=out_var,
-    )
-    conn.commit()
-    assert out_var.getvalue() == [23]
-
-
-def test_1618(conn, cursor):
-    "1618 - test DML returning with LOBs and an output converter"
-    cursor.execute("delete from TestCLOBs")
-    out_var = cursor.var(
-        oracledb.DB_TYPE_CLOB, outconverter=lambda value: value.read()
-    )
-    lob_value = "A short CLOB - 1618"
-    cursor.execute(
-        """
-        insert into TestCLOBs (IntCol, ClobCol)
-        values (1, :in_val)
-        returning CLOBCol into :out_val
-        """,
-        in_val=lob_value,
-        out_val=out_var,
-    )
-    conn.commit()
-    assert out_var.getvalue() == [lob_value]
-
-
-def test_1619(conn, cursor):
-    "1619 - test DML returning with CLOB converted to LONG"
-    cursor.execute("delete from TestCLOBs")
-    out_var = cursor.var(oracledb.DB_TYPE_LONG)
-    lob_value = "A short CLOB - 1619"
-    cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, :in_val)
-        returning CLOBCol into :out_val
-        """,
-        in_val=lob_value,
-        out_val=out_var,
-    )
-    conn.commit()
-    assert out_var.getvalue() == [lob_value]
-
-
-def test_1620(cursor):
-    "1620 - test dml returning with an index organized table"
-    cursor.execute("truncate table TestUniversalRowids")
-    rowid_var = cursor.var(oracledb.ROWID)
-    data = (1, "ABC", datetime.datetime(2017, 4, 11), rowid_var)
-    sql = """
-            insert into TestUniversalRowids values (:1, :2, :3)
-            returning rowid into :4"""
-    cursor.execute(sql, data)
-    (rowid_value,) = rowid_var.getvalue()
-    cursor.execute(
-        """
-        select *
-        from TestUniversalRowids
-        where rowid = :1
-        """,
-        [rowid_value],
-    )
-    (row,) = cursor.fetchall()
-    assert row == data[:3]
-
-
-def test_1621(cursor):
-    "1621 - test plsql returning rowids with index organized table"
-    cursor.execute("truncate table TestUniversalRowids")
-    rowid_var = cursor.var(oracledb.ROWID)
-    data = (1, "ABC", datetime.datetime(2017, 4, 11), rowid_var)
-    cursor.execute(
-        """
-        begin
-            insert into TestUniversalRowids values (:1, :2, :3)
-            returning rowid into :4;
-        end;
-        """,
-        data,
-    )
-    rowid_value = rowid_var.values[0]
-    cursor.execute(
-        """
-        select *
-        from TestUniversalRowids
-        where rowid = :1
-        """,
-        [rowid_value],
-    )
-    (row,) = cursor.fetchall()
-    assert row == data[:3]
-
-
-def test_1622(cursor):
-    "1622 - parse DML returning with no spaces"
-    cursor.execute("truncate table TestTempTable")
-    sql = (
-        "insert into TestTempTable (IntCol) values (:in_val)"
-        "returning(IntCol)into :out_val"
-    )
-    out_val = cursor.var(int, arraysize=5)
-    cursor.execute(sql, in_val=25, out_val=out_val)
-    assert out_val.getvalue() == [25]
-
-
-def test_1623(skip_unless_thin_mode, cursor, test_env):
-    "1623 - execute DML returning with duplicated binds"
-    cursor.execute("truncate table TestTempTable")
-    str_val = cursor.var(str)
-    str_val.setvalue(0, "Test Data")
-    sql = """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:id_val, :str_val || ' (Additional String)')
-        returning StringCol1 into :str_val
-    """
-    with test_env.assert_raises_full_code("DPY-2048"):
-        cursor.execute(sql, id_val=1, str_val=str_val)
-
-
-def test_1624(cursor):
-    "1624 - use bind variable in new statement after RETURNING statement"
-    cursor.execute("truncate table TestTempTable")
-    sql = (
-        "insert into TestTempTable (IntCol) values (:in_val)"
-        "returning IntCol + 15 into :out_val"
-    )
-    out_val = cursor.var(int, arraysize=5)
-    cursor.execute(sql, in_val=25, out_val=out_val)
-    assert out_val.getvalue() == [40]
-    sql = "begin :out_val := :in_val + 35; end;"
-    cursor.execute(sql, in_val=35, out_val=out_val)
-    assert out_val.getvalue() == 70
-
-
-def test_1625(conn, cursor):
-    "1625 - test DML returning with multiple LOBs returned"
-    lob_data = [
-        "Short CLOB - 1625a",
-        "Short CLOB - 1625b",
-        "Short CLOB - 1625c",
-        "Short CLOB - 1625d",
-    ]
-    all_data = [(i + 1, d) for i, d in enumerate(lob_data)]
-    cursor.execute("delete from TestCLOBs")
-    cursor.executemany(
-        "insert into TestCLOBs (IntCol, ClobCol) values (:1, :2)", all_data
-    )
-    ret_val = cursor.var(oracledb.DB_TYPE_CLOB)
-    cursor.execute(
-        """
-        update TestCLOBs set
-            ExtraNumCol1 = 1
-        where ExtraNumCol1 is null
-        returning ClobCol into :ret_val
-        """,
-        [ret_val],
-    )
-    conn.commit()
-    ret_lob_data = [v.read() for v in ret_val.getvalue()]
-    ret_lob_data.sort()
-    assert ret_lob_data == lob_data
-
-
-# blocked by bug 37741324 in thick mode
-def test_1626(skip_unless_thin_mode, conn, cursor, test_env):
-    "1626 - test DML returning with multiple DbObjects returned"
-    if not test_env.has_server_version(21):
-        pytest.skip("awaiting fix for bug 37756810")
-    arrays = [
-        (1626, 1627, 1628),
-        (1629, 1630, 1631),
-        (1632, 1633, 1634),
-        (1635, 1636, 1637),
-    ]
-    all_data = [(i + 4, v[0], v[1], v[2]) for i, v in enumerate(arrays)]
-    cursor.execute("delete from TestObjects where IntCol > 3")
-    cursor.executemany(
-        """
-        insert into TestObjects (IntCol, ArrayCol)
-        values (:1, udt_Array(:1, :2, :3))
-        """,
-        all_data,
-    )
-    typ = conn.gettype("UDT_ARRAY")
-    ret_val = cursor.var(typ)
-    cursor.execute(
-        """
-        update TestObjects set
-            ObjectCol = null
-        where IntCol > 3
-        returning ArrayCol into :ret_val
-        """,
-        [ret_val],
-    )
-    conn.commit()
-    ret_obj_data = [tuple(v) for v in ret_val.getvalue()]
-    ret_obj_data.sort()
-    assert ret_obj_data == arrays
diff --git a/tests/test_1700_error.py b/tests/test_1700_error.py
deleted file mode 100644
index aea7873a..00000000
--- a/tests/test_1700_error.py
+++ /dev/null
@@ -1,219 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1700 - Module for testing error objects
-"""
-
-import pytest
-import pickle
-
-import oracledb
-
-
-def test_1700(cursor):
-    "1700 - test parse error returns offset correctly"
-    with pytest.raises(oracledb.Error) as excinfo:
-        cursor.execute("begin t_Missing := 5; end;")
-    (error_obj,) = excinfo.value.args
-    assert error_obj.full_code == "ORA-06550"
-    assert error_obj.offset == 6
-
-
-def test_1701(cursor):
-    "1701 - test picking/unpickling an error object"
-    with pytest.raises(oracledb.Error) as excinfo:
-        cursor.execute(
-            """
-            begin
-                raise_application_error(-20101, 'Test!');
-            end;
-            """
-        )
-    (error_obj,) = excinfo.value.args
-    assert isinstance(error_obj, oracledb._Error)
-    assert "Test!" in error_obj.message
-    assert error_obj.code == 20101
-    assert error_obj.offset == 0
-    assert isinstance(error_obj.isrecoverable, bool)
-    assert not error_obj.isrecoverable
-    new_error_obj = pickle.loads(pickle.dumps(error_obj))
-    assert isinstance(new_error_obj, oracledb._Error)
-    assert new_error_obj.message == error_obj.message
-    assert new_error_obj.code == error_obj.code
-    assert new_error_obj.offset == error_obj.offset
-    assert new_error_obj.context == error_obj.context
-    assert new_error_obj.isrecoverable == error_obj.isrecoverable
-
-
-def test_1702(conn):
-    "1702 - test generation of full_code for ORA, DPI and DPY errors"
-    cursor = conn.cursor()
-    with pytest.raises(oracledb.Error) as excinfo:
-        cursor.execute(None)
-    (error_obj,) = excinfo.value.args
-    assert error_obj.full_code == "DPY-2001"
-    if not conn.thin:
-        with pytest.raises(oracledb.Error) as excinfo:
-            cursor.execute("truncate table TestTempTable")
-            int_var = cursor.var(int)
-            str_var = cursor.var(str, 2)
-            cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (1, 'Longer than two chars')
-                returning IntCol, StringCol1
-                into :int_var, :str_var
-                """,
-                int_var=int_var,
-                str_var=str_var,
-            )
-        (error_obj,) = excinfo.value.args
-        assert error_obj.full_code == "DPI-1037"
-
-
-def test_1703(conn, test_env):
-    "1703 - test generation of error help portal URL"
-    if not test_env.has_client_version(23):
-        pytest.skip("unsupported client")
-    cursor = conn.cursor()
-    with pytest.raises(oracledb.Error) as excinfo:
-        cursor.execute("select 1 / 0 from dual")
-    (error_obj,) = excinfo.value.args
-    to_check = "Help: https://docs.oracle.com/error-help/db/ora-01476/"
-    assert to_check in error_obj.message
-
-
-def test_1704(cursor):
-    "1704 - verify warning is generated when creating a procedure"
-    proc_name = "bad_proc_1704"
-    assert cursor.warning is None
-    cursor.execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null
-        end;
-        """
-    )
-    assert cursor.warning.full_code == "DPY-7000"
-    cursor.execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null;
-        end;
-        """
-    )
-    assert cursor.warning is None
-    cursor.execute(f"drop procedure {proc_name}")
-
-
-def test_1705(cursor):
-    "1705 - verify warning is generated when creating a function"
-    func_name = "bad_func_1705"
-    cursor.execute(
-        f"""
-        create or replace function {func_name}
-        return number as
-        begin
-            return null
-        end;
-        """
-    )
-    assert cursor.warning.full_code == "DPY-7000"
-    cursor.execute(f"drop function {func_name}")
-    assert cursor.warning is None
-
-
-def test_1706(cursor):
-    "1706 - verify warning is generated when creating a type"
-    type_name = "bad_type_1706"
-    cursor.execute(
-        f"""
-        create or replace type {type_name} as object (
-            x bad_type
-        );
-        """
-    )
-    assert cursor.warning.full_code == "DPY-7000"
-    cursor.execute(f"drop type {type_name}")
-    assert cursor.warning is None
-
-
-def test_1707(cursor):
-    "1707 - verify warning is generated with executemany()"
-    proc_name = "bad_proc_1707"
-    assert cursor.warning is None
-    cursor.executemany(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null
-        end;
-        """,
-        1,
-    )
-    assert cursor.warning.full_code == "DPY-7000"
-    cursor.execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null;
-        end;
-        """
-    )
-    assert cursor.warning is None
-    cursor.execute(f"drop procedure {proc_name}")
-
-
-def test_1708(cursor):
-    "1708 - user defined errors do not generate error help portal URL"
-    for code in (20000, 20500, 20999):
-        with pytest.raises(oracledb.Error) as excinfo:
-            cursor.execute(
-                f"""
-                begin
-                    raise_application_error(-{code}, 'User defined error');
-                end;
-                """
-            )
-        error_obj = excinfo.value.args[0]
-        assert error_obj.code == code
-        assert error_obj.full_code == f"ORA-{code}"
-        assert "Help:" not in error_obj.message
-
-
-def test_1709(skip_if_drcp, conn, test_env):
-    "1709 - error from killed connection is deemed recoverable"
-    admin_conn = test_env.get_admin_connection()
-    conn = test_env.get_connection()
-    sid, serial = test_env.get_sid_serial(conn)
-    with admin_conn.cursor() as admin_cursor:
-        sql = f"alter system kill session '{sid},{serial}'"
-        admin_cursor.execute(sql)
-    with test_env.assert_raises_full_code("DPY-4011") as excinfo:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-    assert excinfo.error_obj.isrecoverable
diff --git a/tests/test_1800_interval_var.py b/tests/test_1800_interval_var.py
deleted file mode 100644
index 4b0eded1..00000000
--- a/tests/test_1800_interval_var.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1800 - Module for testing interval variables
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        delta = datetime.timedelta(
-            days=i, hours=i, minutes=i * 2, seconds=i * 3
-        )
-        if i % 2 == 0:
-            nullable_delta = None
-        else:
-            nullable_delta = datetime.timedelta(
-                days=i + 5,
-                hours=i + 2,
-                minutes=i * 2 + 5,
-                seconds=i * 3 + 5,
-            )
-        precision_col = datetime.timedelta(
-            days=8,
-            hours=5,
-            minutes=15,
-            seconds=0,
-        )
-        precision_scale_col = datetime.timedelta(
-            days=10,
-            hours=12,
-            minutes=15,
-            seconds=15,
-        )
-        data_tuple = (
-            i,
-            delta,
-            nullable_delta,
-            precision_col,
-            precision_scale_col,
-        )
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_1800(cursor, module_data_by_key):
-    "1800 - test binding in an interval"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_DS)
-    value = datetime.timedelta(days=5, hours=5, minutes=10, seconds=15)
-    cursor.execute(
-        "select * from TestIntervals where IntervalCol = :value",
-        value=value,
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_1801(cursor):
-    "1801 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_DS)
-    cursor.execute(
-        "select * from TestIntervals where IntervalCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_1802(cursor):
-    "1802 - test binding out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_DS)
-    cursor.execute(
-        """
-        begin
-            :value := to_dsinterval('8 09:24:18.123789');
-        end;
-        """
-    )
-    expected_value = datetime.timedelta(
-        days=8, hours=9, minutes=24, seconds=18, microseconds=123789
-    )
-    assert bind_vars["value"].getvalue() == expected_value
-
-
-def test_1803(cursor):
-    "1803 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_DS)
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_dsinterval('5 08:30:00');
-        end;
-        """,
-        value=datetime.timedelta(days=5, hours=2, minutes=15),
-    )
-    expected_value = datetime.timedelta(days=10, hours=10, minutes=45)
-    assert bind_vars["value"].getvalue() == expected_value
-
-
-def test_1804(cursor):
-    "1804 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_DS)
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_dsinterval('5 08:30:00');
-        end;
-        """,
-        value=datetime.timedelta(days=5, seconds=12.123789),
-    )
-    expected_value = datetime.timedelta(
-        days=10, hours=8, minutes=30, seconds=12, microseconds=123789
-    )
-    assert bind_vars["value"].getvalue() == expected_value
-
-
-def test_1805(cursor):
-    "1805 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_INTERVAL_DS)
-    cursor.execute(
-        """
-        begin
-            :value := to_dsinterval('15 18:35:45.586');
-        end;
-        """,
-        value=var,
-    )
-    expected_value = datetime.timedelta(
-        days=15, hours=18, minutes=35, seconds=45, milliseconds=586
-    )
-    assert var.getvalue() == expected_value
-
-
-def test_1806(cursor):
-    "1806 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_INTERVAL_DS)
-    var.setvalue(0, datetime.timedelta(days=1, minutes=50))
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_dsinterval('8 05:15:00');
-        end;
-        """,
-        value=var,
-    )
-    expected_value = datetime.timedelta(days=9, hours=6, minutes=5)
-    assert var.getvalue() == expected_value
-
-
-def test_1807(cursor):
-    "1807 - test cursor description is accurate"
-    cursor.execute("select * from TestIntervals")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "INTERVALCOL",
-            oracledb.DB_TYPE_INTERVAL_DS,
-            None,
-            None,
-            2,
-            6,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_INTERVAL_DS,
-            None,
-            None,
-            2,
-            6,
-            True,
-        ),
-        (
-            "INTERVALPRECISIONCOL",
-            oracledb.DB_TYPE_INTERVAL_DS,
-            None,
-            None,
-            7,
-            6,
-            True,
-        ),
-        (
-            "INTERVALPRECISIONSCALECOL",
-            oracledb.DB_TYPE_INTERVAL_DS,
-            None,
-            None,
-            8,
-            9,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_1808(cursor, module_data):
-    "1808 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestIntervals order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_1809(cursor, module_data):
-    "1809 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestIntervals order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_1810(cursor, module_data_by_key):
-    "1810 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestIntervals
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_1811(cursor):
-    "1811 - test binding and fetching a negative interval"
-    value = datetime.timedelta(days=-1, seconds=86314, microseconds=431152)
-    cursor.execute("select :1 from dual", [value])
-    (result,) = cursor.fetchone()
-    assert result == value
diff --git a/tests/test_1900_lob_var.py b/tests/test_1900_lob_var.py
deleted file mode 100644
index cc5140e6..00000000
--- a/tests/test_1900_lob_var.py
+++ /dev/null
@@ -1,674 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-1900 - Module for testing LOB (CLOB and BLOB) variables
-"""
-
-import pickle
-
-import oracledb
-import pytest
-
-
-def _get_temp_lobs(conn, sid):
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select cache_lobs + nocache_lobs + abstract_lobs
-        from v$temporary_lobs
-        where sid = :sid
-        """,
-        sid=sid,
-    )
-    row = cursor.fetchone()
-    if row is None:
-        return 0
-    return int(row[0])
-
-
-def _perform_test(cursor, lob_type, input_type):
-    long_string = ""
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    cursor.execute(f"delete from Test{lob_type}s")
-    cursor.connection.commit()
-    for i in range(11):
-        if i > 0:
-            char = chr(ord("A") + i - 1)
-            long_string += char * 25000
-        elif input_type is not db_type:
-            continue
-        cursor.setinputsizes(long_string=input_type)
-        if lob_type == "BLOB":
-            bind_value = long_string.encode()
-        else:
-            bind_value = long_string
-        cursor.execute(
-            f"""
-            insert into Test{lob_type}s (IntCol, {lob_type}Col)
-            values (:integer_value, :long_string)
-            """,
-            integer_value=i,
-            long_string=bind_value,
-        )
-    cursor.connection.commit()
-    cursor.execute(
-        f"""
-        select IntCol, {lob_type}Col
-        from Test{lob_type}s
-        order by IntCol
-        """
-    )
-    _validate_query(cursor, lob_type)
-
-
-def _test_bind_ordering(conn, cursor, lob_type):
-    main_col = "A" * 32768
-    extra_col_1 = "B" * 65536
-    extra_col_2 = "C" * 131072
-    if lob_type == "BLOB":
-        main_col = main_col.encode()
-        extra_col_1 = extra_col_1.encode()
-        extra_col_2 = extra_col_2.encode()
-    conn.stmtcachesize = 0
-    cursor.execute(f"delete from Test{lob_type}s")
-    conn.commit()
-    data = (1, main_col, 8, extra_col_1, 15, extra_col_2)
-    cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col,
-            ExtraNumCol1, Extra{lob_type}Col1, ExtraNumCol2,
-            Extra{lob_type}Col2)
-        values (:1, :2, :3, :4, :5, :6)
-        """,
-        data,
-    )
-    cursor.execute(f"select * from Test{lob_type}s", fetch_lobs=False)
-    assert cursor.fetchone() == data
-
-
-def _test_fetch_lobs_direct(cursor, lob_type):
-    cursor.execute(f"delete from Test{lob_type}s")
-    cursor.connection.commit()
-    data = []
-    long_string = ""
-    for i in range(1, 11):
-        if i > 0:
-            char = chr(ord("A") + i - 1)
-            long_string += char * 25000
-        if lob_type == "BLOB":
-            data.append((i, long_string.encode()))
-        else:
-            data.append((i, long_string))
-    cursor.executemany(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:1, :2)
-        """,
-        data,
-    )
-    cursor.execute(
-        f"""
-        select IntCol, {lob_type}Col
-        from Test{lob_type}s
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == data
-
-
-def _test_lob_operations(cursor, test_env, lob_type):
-    cursor.execute(f"delete from Test{lob_type}s")
-    cursor.connection.commit()
-    cursor.setinputsizes(long_string=getattr(oracledb, lob_type))
-    long_string = "X" * 75000
-    write_value = "TEST"
-    if lob_type == "BLOB":
-        long_string = long_string.encode("ascii")
-        write_value = write_value.encode("ascii")
-    cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:integer_value, :long_string)
-        """,
-        integer_value=1,
-        long_string=long_string,
-    )
-    cursor.execute(
-        f"""
-        select {lob_type}Col
-        from Test{lob_type}s
-        where IntCol = 1
-        """
-    )
-    (lob,) = cursor.fetchone()
-    assert not lob.isopen()
-    lob.open()
-    with test_env.assert_raises_full_code("ORA-22293"):
-        lob.open()
-    assert lob.isopen()
-    lob.close()
-    with test_env.assert_raises_full_code("ORA-22289"):
-        lob.close()
-    assert not lob.isopen()
-    assert lob.size() == 75000
-    lob.write(write_value, 75001)
-    pytest.raises(TypeError, lob.write, 1000, 1)
-    pytest.raises(TypeError, lob.write, "data", "1")
-    assert lob.size() == 75000 + len(write_value)
-    with test_env.assert_raises_full_code("DPY-2030"):
-        lob.read(0)
-    with test_env.assert_raises_full_code("DPY-2030"):
-        lob.read(-25)
-    with test_env.assert_raises_full_code("DPY-2047"):
-        lob.read(amount=0)
-    with test_env.assert_raises_full_code("DPY-2047"):
-        lob.read(amount=-5)
-    assert lob.read() == long_string + write_value
-    lob.write(write_value, 1)
-    assert lob.read() == write_value + long_string[4:] + write_value
-    lob.trim(25000)
-    assert lob.size() == 25000
-    lob.trim(newSize=10000)
-    assert lob.size() == 10000
-    with test_env.assert_raises_full_code("DPY-2014"):
-        lob.trim(new_size=50, newSize=60)
-    pytest.raises(TypeError, lob.trim, new_size="10000")
-    pytest.raises(TypeError, lob.trim, newSize="10000")
-    lob.trim(new_size=40)
-    assert lob.size() == 40
-    lob.trim()
-    assert lob.size() == 0
-    assert isinstance(lob.getchunksize(), int)
-
-
-def _test_pickle(conn, lob_type):
-    value = "A test string value for pickling"
-    if lob_type == "BLOB":
-        value = value.encode("ascii")
-    db_type = getattr(oracledb, "DB_TYPE_" + lob_type)
-    lob = conn.createlob(db_type, value)
-    pickled_data = pickle.dumps(lob)
-    unpickled_value = pickle.loads(pickled_data)
-    assert unpickled_value == value
-
-
-def _test_temporary_lob(conn, cursor, lob_type):
-    cursor.execute(f"delete from Test{lob_type}s")
-    conn.commit()
-    value = "A test string value"
-    if lob_type == "BLOB":
-        value = value.encode("ascii")
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    lob = conn.createlob(db_type, value)
-    cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:int_val, :lob_val)
-        """,
-        int_val=1,
-        lob_val=lob,
-    )
-    cursor.execute(f"select {lob_type}Col from Test{lob_type}s")
-    (lob,) = cursor.fetchone()
-    assert lob.read() == value
-
-
-def _validate_query(rows, lob_type):
-    long_string = ""
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    for row in rows:
-        integer_value, lob = row
-        assert lob.type == db_type
-        if integer_value == 0:
-            assert lob.size() == 0
-            expected_value = ""
-            if lob_type == "BLOB":
-                expected_value = expected_value.encode()
-            assert lob.read() == expected_value
-        else:
-            char = chr(ord("A") + integer_value - 1)
-            prev_char = chr(ord("A") + integer_value - 2)
-            long_string += char * 25000
-            if lob_type == "BLOB":
-                expected_value = long_string.encode("ascii")
-                char = char.encode("ascii")
-                prev_char = prev_char.encode("ascii")
-            else:
-                expected_value = long_string
-            assert lob.size() == len(expected_value)
-            assert lob.read() == expected_value
-            if lob_type == "CLOB":
-                assert str(lob) == expected_value
-            assert lob.read(len(expected_value)) == char
-        if integer_value > 1:
-            offset = (integer_value - 1) * 25000 - 4
-            string = prev_char * 5 + char * 5
-            assert lob.read(offset, 10) == string
-
-
-def test_1900(conn, cursor):
-    "1900 - test binding a LOB value directly"
-    cursor.execute("delete from TestCLOBs")
-    cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, 'Short value')
-        """
-    )
-    conn.commit()
-    cursor.execute("select ClobCol from TestCLOBs")
-    (lob,) = cursor.fetchone()
-    cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (2, :value)
-        """,
-        value=lob,
-    )
-
-
-def test_1901(cursor):
-    "1901 - test cursor description is accurate for BLOBs"
-    cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, 0),
-        ("BLOBCOL", oracledb.DB_TYPE_BLOB, None, None, None, None, 0),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_1902(cursor):
-    "1902 - test binding and fetching BLOB data (directly)"
-    _perform_test(cursor, "BLOB", oracledb.DB_TYPE_BLOB)
-
-
-def test_1903(cursor):
-    "1903 - test binding and fetching BLOB data (indirectly)"
-    _perform_test(cursor, "BLOB", oracledb.DB_TYPE_LONG_RAW)
-
-
-def test_1904(cursor, test_env):
-    "1904 - test operations on BLOBs"
-    _test_lob_operations(cursor, test_env, "BLOB")
-
-
-def test_1905(cursor):
-    "1905 - test cursor description is accurate for CLOBs"
-    cursor.execute("select IntCol, ClobCol from TestCLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        ("CLOBCOL", oracledb.DB_TYPE_CLOB, None, None, None, None, False),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_1906(cursor):
-    "1906 - test binding and fetching CLOB data (directly)"
-    _perform_test(cursor, "CLOB", oracledb.DB_TYPE_CLOB)
-
-
-def test_1907(cursor):
-    "1907 - test binding and fetching CLOB data (indirectly)"
-    _perform_test(cursor, "CLOB", oracledb.DB_TYPE_LONG)
-
-
-def test_1908(cursor, test_env):
-    "1908 - test operations on CLOBs"
-    _test_lob_operations(cursor, test_env, "CLOB")
-
-
-def test_1909(conn, cursor):
-    "1909 - test creating a temporary BLOB"
-    _test_temporary_lob(conn, cursor, "BLOB")
-
-
-def test_1910(conn, cursor):
-    "1910 - test creating a temporary CLOB"
-    _test_temporary_lob(conn, cursor, "CLOB")
-
-
-def test_1911(conn, cursor):
-    "1911 - test creating a temporary NCLOB"
-    _test_temporary_lob(conn, cursor, "NCLOB")
-
-
-def test_1912(cursor):
-    "1912 - test retrieving data from a CLOB after multiple fetches"
-    cursor.arraysize = 1
-    _perform_test(cursor, "CLOB", oracledb.DB_TYPE_CLOB)
-
-
-def test_1913(cursor):
-    "1913 - test cursor description is accurate for NCLOBs"
-    cursor.execute("select IntCol, NClobCol from TestNCLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, 0),
-        ("NCLOBCOL", oracledb.DB_TYPE_NCLOB, None, None, None, None, 0),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_1914(cursor):
-    "1914 - test binding and fetching NCLOB data (directly)"
-    _perform_test(cursor, "NCLOB", oracledb.DB_TYPE_NCLOB)
-
-
-def test_1915(conn, cursor):
-    "1915 - test binding and fetching NCLOB data (with non-ASCII chars)"
-    value = "\u03b4\u4e2a"
-    cursor.execute("delete from TestNCLOBs")
-    cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        """
-        insert into TestNCLOBs (IntCol, NClobCol)
-        values (1, :val)
-        """,
-        val=value,
-    )
-    conn.commit()
-    cursor.execute("select NCLOBCol from TestNCLOBs")
-    (nclob,) = cursor.fetchone()
-    cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        "update TestNCLOBs set NCLOBCol = :val", val=nclob.read() + value
-    )
-    cursor.execute("select NCLOBCol from TestNCLOBs")
-    (nclob,) = cursor.fetchone()
-    assert nclob.read() == value + value
-
-
-def test_1916(cursor):
-    "1916 - test binding and fetching NCLOB data (indirectly)"
-    _perform_test(cursor, "NCLOB", oracledb.DB_TYPE_LONG)
-
-
-def test_1917(cursor, test_env):
-    "1917 - test operations on NCLOBs"
-    _test_lob_operations(cursor, test_env, "NCLOB")
-
-
-def test_1918(skip_if_implicit_pooling, conn, cursor):
-    "1918 - test temporary LOBs"
-    cursor.execute("select sys_context('USERENV', 'SID') from dual")
-    (sid,) = cursor.fetchone()
-    temp_lobs = _get_temp_lobs(conn, sid)
-    with conn.cursor() as cursor:
-        cursor.arraysize = 27
-        assert temp_lobs == 0
-        cursor.execute("select extract(xmlcol, '/').getclobval() from TestXML")
-        for (lob,) in cursor:
-            lob.read()
-            del lob
-    temp_lobs = _get_temp_lobs(conn, sid)
-    assert temp_lobs == 0
-
-
-def test_1919(cursor):
-    "1919 - test assign string to NCLOB beyond array size"
-    nclobVar = cursor.var(oracledb.DB_TYPE_NCLOB)
-    pytest.raises(IndexError, nclobVar.setvalue, 1, "test char")
-
-
-def test_1920(conn, cursor, test_env):
-    "1920 - test read/write temporary LOBs using supplemental characters"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-    supplemental_chars = (
-        "𠜎 𠜱 𠝹 𠱓 𠱸 𠲖 𠳏 𠳕 𠴕 𠵼 𠵿 𠸎 𠸏 𠹷 𠺝 𠺢 𠻗 𠻹 𠻺 𠼭 𠼮 "
-        "𠽌 𠾴 𠾼 𠿪 𡁜 𡁯 𡁵 𡁶 𡁻 𡃁 𡃉 𡇙 𢃇 𢞵 𢫕 𢭃 𢯊 𢱑 𢱕 𢳂 𢴈 "
-        "𢵌 𢵧 𢺳 𣲷 𤓓 𤶸 𤷪 𥄫 𦉘 𦟌 𦧲 𦧺 𧨾 𨅝 𨈇 𨋢 𨳊 𨳍 𨳒 𩶘"
-    )
-    cursor.execute("delete from TestCLOBs")
-    lob = conn.createlob(oracledb.DB_TYPE_CLOB, supplemental_chars)
-    cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, :val)
-        """,
-        [lob],
-    )
-    conn.commit()
-    cursor.execute("select ClobCol from TestCLOBs")
-    (lob,) = cursor.fetchone()
-    assert lob.read() == supplemental_chars
-
-
-def test_1921(cursor, test_env):
-    "1921 - test automatic conversion to CLOB for PL/SQL"
-    test_env.skip_unless_server_version(12, 2)
-    var = cursor.var(str, outconverter=lambda v: v[-15:])
-    var.setvalue(0, "A" * 50000)
-    cursor.execute(
-        """
-        declare
-            t_Clob          clob;
-        begin
-            t_Clob := :data;
-            dbms_lob.copy(:data, t_Clob, 50000);
-            dbms_lob.writeappend(:data, 5, 'BBBBB');
-        end;
-        """,
-        data=var,
-    )
-    assert var.getvalue() == "A" * 10 + "B" * 5
-
-
-def test_1922(cursor, test_env):
-    "1922 - test automatic conversion to NCLOB for PL/SQL"
-    test_env.skip_unless_server_version(12, 2)
-    var = cursor.var(oracledb.DB_TYPE_NCHAR, outconverter=lambda v: v[-12:])
-    var.setvalue(0, "N" * 51234)
-    cursor.execute(
-        """
-        declare
-            t_Clob          nclob;
-        begin
-            t_Clob := :data;
-            dbms_lob.copy(:data, t_Clob, 51234);
-            dbms_lob.writeappend(:data, 7, 'PPPPPPP');
-        end;
-        """,
-        data=var,
-    )
-    assert var.getvalue() == "N" * 5 + "P" * 7
-
-
-def test_1923(cursor, test_env):
-    "1923 - test automatic conversion to BLOB for PL/SQL"
-    test_env.skip_unless_server_version(12, 2)
-    var = cursor.var(bytes, outconverter=lambda v: v[-14:])
-    var.setvalue(0, b"L" * 52345)
-    cursor.execute(
-        """
-        declare
-            t_Blob          blob;
-        begin
-            t_Blob := :data;
-            dbms_lob.copy(:data, t_Blob, 52345);
-            dbms_lob.writeappend(:data, 6, '515151515151');
-        end;
-        """,
-        data=var,
-    )
-    assert var.getvalue() == b"L" * 8 + b"Q" * 6
-
-
-def test_1924(conn):
-    "1924 - test pickling of BLOB"
-    _test_pickle(conn, "BLOB")
-
-
-def test_1925(conn):
-    "1925 - test pickling of CLOB"
-    _test_pickle(conn, "CLOB")
-
-
-def test_1926(conn):
-    "1925 - test pickling of NCLOB"
-    _test_pickle(conn, "NCLOB")
-
-
-def test_1927(cursor, disable_fetch_lobs):
-    "1927 - test fetching BLOB as bytes"
-    _test_fetch_lobs_direct(cursor, "BLOB")
-
-
-def test_1928(cursor, disable_fetch_lobs):
-    "1928 - test fetching CLOB as str"
-    _test_fetch_lobs_direct(cursor, "CLOB")
-
-
-def test_1929(cursor, disable_fetch_lobs):
-    "1929 - test fetching NCLOB as str"
-    _test_fetch_lobs_direct(cursor, "NCLOB")
-
-
-def test_1930(conn, cursor):
-    "1930 - test bind ordering with BLOB"
-    _test_bind_ordering(conn, cursor, "BLOB")
-
-
-def test_1931(conn, cursor):
-    "1931 - test bind ordering with CLOB"
-    _test_bind_ordering(conn, cursor, "CLOB")
-
-
-def test_1932(conn, cursor):
-    "1932 - test bind ordering with NCLOB"
-    _test_bind_ordering(conn, cursor, "NCLOB")
-
-
-def test_1933(conn):
-    "1933 - test creating a lob with an invalid type"
-    with pytest.raises(TypeError):
-        conn.createlob(oracledb.DB_TYPE_NUMBER)
-    with pytest.raises(TypeError):
-        conn.createlob(oracledb.DB_TYPE_BFILE)
-
-
-def test_1934(conn):
-    "1934 - test creation of temporary LOBs with varying data"
-    cases = [
-        (oracledb.DB_TYPE_BLOB, b"test_1934A", b"!", b"test_1934A!"),
-        (oracledb.DB_TYPE_BLOB, "test_1934B", "!", b"test_1934B!"),
-        (oracledb.DB_TYPE_CLOB, b"test_1934C", b"!", "test_1934C!"),
-        (oracledb.DB_TYPE_CLOB, "test_1934D", "!", "test_1934D!"),
-        (oracledb.DB_TYPE_NCLOB, b"test_1934E", b"!", "test_1934E!"),
-        (oracledb.DB_TYPE_NCLOB, "test_1934F", "!", "test_1934F!"),
-    ]
-    for typ, initial_data, additional_data, expected_result in cases:
-        lob = conn.createlob(typ, initial_data)
-        lob.write(additional_data, len(initial_data) + 1)
-        assert lob.read() == expected_result
-
-
-def test_1935(test_env):
-    "1935 - test reading and writing a LOB with a closed connection"
-    types = [
-        oracledb.DB_TYPE_BLOB,
-        oracledb.DB_TYPE_CLOB,
-        oracledb.DB_TYPE_NCLOB,
-    ]
-    for typ in types:
-        conn = test_env.get_connection()
-        lob = conn.createlob(typ, "Temp LOB")
-        conn.close()
-        with test_env.assert_raises_full_code("DPY-1001"):
-            lob.read()
-        with test_env.assert_raises_full_code("DPY-1001"):
-            lob.write("x")
-
-
-def test_1936(cursor, test_env):
-    "1936 - test reading a non-existent directory"
-    directory_name = "TEST_1936_MISSING_DIR"
-    file_name = "test_1936_missing_file.txt"
-    cursor.execute(
-        "select BFILENAME(:1, :2) from dual", [directory_name, file_name]
-    )
-    (bfile,) = cursor.fetchone()
-    assert bfile.getfilename() == (directory_name, file_name)
-    with test_env.assert_raises_full_code("ORA-22285"):
-        bfile.fileexists()
-    with test_env.assert_raises_full_code("ORA-22285"):
-        bfile.read()
-
-
-def test_1937(conn, test_env):
-    "1937 - test using BFILE methods on non-BFILE LOBs"
-    types = [
-        oracledb.DB_TYPE_BLOB,
-        oracledb.DB_TYPE_CLOB,
-        oracledb.DB_TYPE_NCLOB,
-    ]
-    for typ in types:
-        lob = conn.createlob(typ)
-        with test_env.assert_raises_full_code("DPY-3026"):
-            lob.getfilename()
-        with test_env.assert_raises_full_code("DPY-3026"):
-            lob.setfilename("not_relevant", "not_relevant")
-        with test_env.assert_raises_full_code("DPY-3026"):
-            lob.fileexists()
-
-
-def test_1938(conn, cursor):
-    "1938 - confirm that LOB objects are retained across getvalue() calls"
-    for typ in (
-        oracledb.DB_TYPE_BLOB,
-        oracledb.DB_TYPE_CLOB,
-        oracledb.DB_TYPE_NCLOB,
-    ):
-        var = cursor.var(typ)
-        lob = conn.createlob(typ, "Some data for test 1938")
-        var.setvalue(0, lob)
-        assert var.getvalue() is lob
-
-
-def test_1939(cursor):
-    "1939 - temporary LOB in/out without modification"
-    value = "test - 1939"
-    var = cursor.var(oracledb.DB_TYPE_CLOB)
-    var.setvalue(0, value)
-    assert var.getvalue().read() == value
-    cursor.callproc("pkg_TestLOBs.TestInOut", [var, None, None])
-    assert var.getvalue().read() == value
-
-
-def test_1940(cursor):
-    "1940 - temporary LOB in/out with modification"
-    search_value = "test"
-    replace_value = "replaced"
-    initial_value = f"{search_value} - 1939"
-    final_value = f"{replace_value} - 1939"
-    var = cursor.var(oracledb.DB_TYPE_CLOB)
-    var.setvalue(0, initial_value)
-    assert var.getvalue().read() == initial_value
-    cursor.callproc(
-        "pkg_TestLOBs.TestInOut", [var, search_value, replace_value]
-    )
-    assert var.getvalue().read() == final_value
diff --git a/tests/test_2000_long_var.py b/tests/test_2000_long_var.py
deleted file mode 100644
index 887d84e4..00000000
--- a/tests/test_2000_long_var.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2000 - Module for testing long and long raw variables
-"""
-
-import oracledb
-
-
-def _perform_test(cursor, typ):
-    name_part = "Long" if typ is oracledb.DB_TYPE_LONG else "LongRaw"
-
-    cursor.execute(f"truncate table Test{name_part}s")
-    cursor.setinputsizes(long_string=typ)
-    long_string = ""
-    for i in range(1, 11):
-        char = chr(ord("A") + i - 1)
-        long_string += char * 25000
-        if i % 3 == 1:
-            bind_value = None
-        else:
-            if typ is oracledb.DB_TYPE_LONG_RAW:
-                bind_value = long_string.encode()
-            else:
-                bind_value = long_string
-        cursor.execute(
-            f"""
-            insert into Test{name_part}s (IntCol, {name_part}Col)
-            values (:integer_value, :long_string)
-            """,
-            integer_value=i,
-            long_string=bind_value,
-        )
-    cursor.connection.commit()
-    cursor.execute(f"select * from Test{name_part}s order by IntCol")
-    long_string = ""
-    for integer_value, fetched_value in cursor:
-        char = chr(ord("A") + integer_value - 1)
-        long_string += char * 25000
-        if integer_value % 3 == 1:
-            expected_value = None
-        else:
-            if typ is oracledb.DB_TYPE_LONG_RAW:
-                expected_value = long_string.encode()
-            else:
-                expected_value = long_string
-        if fetched_value is not None:
-            assert len(fetched_value) == integer_value * 25000
-        assert fetched_value == expected_value
-
-
-def test_2000(cursor):
-    "2000 - test binding and fetching long data"
-    _perform_test(cursor, oracledb.DB_TYPE_LONG)
-
-
-def test_2001(conn, cursor):
-    "2001 - test binding long data with executemany()"
-    data = []
-    cursor.execute("truncate table TestLongs")
-    for i in range(5):
-        char = chr(ord("A") + i)
-        long_str = char * (32768 * (i + 1))
-        data.append((i + 1, long_str))
-    cursor.executemany("insert into TestLongs values (:1, :2)", data)
-    conn.commit()
-    cursor.execute("select * from TestLongs order by IntCol")
-    assert cursor.fetchall() == data
-
-
-def test_2002(cursor):
-    "2002 - test binding and fetching long raw data"
-    _perform_test(cursor, oracledb.DB_TYPE_LONG_RAW)
-
-
-def test_2003(cursor):
-    "2003 - test cursor description is accurate for longs"
-    cursor.execute("select * from TestLongs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        ("LONGCOL", oracledb.DB_TYPE_LONG, None, None, None, None, True),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2004(cursor):
-    "2004 - test cursor description is accurate for long raws"
-    cursor.execute("select * from TestLongRaws")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "LONGRAWCOL",
-            oracledb.DB_TYPE_LONG_RAW,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2005(skip_unless_thick_mode, cursor, test_env):
-    "2005 - test array size too large generates an exception"
-    cursor.arraysize = 268435456
-    with test_env.assert_raises_full_code("DPI-1015"):
-        cursor.execute("select * from TestLongRaws")
diff --git a/tests/test_2100_nchar_var.py b/tests/test_2100_nchar_var.py
deleted file mode 100644
index 66a0d223..00000000
--- a/tests/test_2100_nchar_var.py
+++ /dev/null
@@ -1,332 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2100 - Module for testing NCHAR variables
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        unicode_col = f"Unicode \u3042 {i}"
-        fixed_char_col = f"Fixed Unicode {i}".ljust(40)
-        if i % 2:
-            nullable_col = f"Nullable {i}"
-        else:
-            nullable_col = None
-        data_tuple = (i, unicode_col, fixed_char_col, nullable_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_2100(cursor):
-    "2100 - test value length"
-    return_value = cursor.var(int)
-    cursor.execute(
-        """
-        begin
-            :retval := LENGTH(:value);
-        end;
-        """,
-        value="InVal \u3042",
-        retval=return_value,
-    )
-    assert return_value.getvalue() == 7
-
-
-def test_2101(cursor, module_data_by_key):
-    "2101 - test binding in a unicode"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        "select * from TestUnicodes where UnicodeCol = :value",
-        value="Unicode \u3042 5",
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_2102(cursor):
-    "2102 - test binding a different variable on second execution"
-    retval_1 = cursor.var(oracledb.DB_TYPE_NVARCHAR, 30)
-    retval_2 = cursor.var(oracledb.DB_TYPE_NVARCHAR, 30)
-    cursor.execute(
-        r"begin :retval := unistr('Called \3042'); end;", retval=retval_1
-    )
-    assert retval_1.getvalue() == "Called \u3042"
-    cursor.execute("begin :retval := 'Called'; end;", retval=retval_2)
-    assert retval_2.getvalue() == "Called"
-
-
-def test_2103(cursor, module_data_by_key):
-    "2103 - test binding in a string after setting input sizes to a number"
-    unicode_val = cursor.var(oracledb.DB_TYPE_NVARCHAR)
-    unicode_val.setvalue(0, "Unicode \u3042 6")
-    cursor.setinputsizes(value=oracledb.NUMBER)
-    cursor.execute(
-        "select * from TestUnicodes where UnicodeCol = :value",
-        value=unicode_val,
-    )
-    assert cursor.fetchall() == [module_data_by_key[6]]
-
-
-def test_2104(cursor, module_data):
-    "2104 - test binding in a unicode array"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = [r[1] for r in module_data]
-    array_var = cursor.arrayvar(oracledb.DB_TYPE_NVARCHAR, array)
-    statement = """
-            begin
-                :retval := pkg_TestUnicodeArrays.TestInArrays(
-                    :integer_value, :array);
-            end;"""
-    cursor.execute(
-        statement, retval=return_value, integer_value=5, array=array_var
-    )
-    assert return_value.getvalue() == 116
-    array = [f"Unicode - \u3042 {i}" for i in range(15)]
-    array_var = cursor.arrayvar(oracledb.DB_TYPE_NVARCHAR, array)
-    cursor.execute(statement, integer_value=8, array=array_var)
-    assert return_value.getvalue() == 208
-
-
-def test_2105(cursor, module_data):
-    "2105 - test binding in a unicode array (with setinputsizes)"
-    return_value = cursor.var(oracledb.NUMBER)
-    cursor.setinputsizes(array=[oracledb.DB_TYPE_NVARCHAR, 10])
-    array = [r[1] for r in module_data]
-    cursor.execute(
-        """
-        begin
-            :retval := pkg_TestUnicodeArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        retval=return_value,
-        integer_value=6,
-        array=array,
-    )
-    assert return_value.getvalue() == 117
-
-
-def test_2106(cursor, module_data):
-    "2106 - test binding in a unicode array (with arrayvar)"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = cursor.arrayvar(oracledb.DB_TYPE_NVARCHAR, 10, 20)
-    array.setvalue(0, [r[1] for r in module_data])
-    cursor.execute(
-        """
-        begin
-            :retval := pkg_TestUnicodeArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        retval=return_value,
-        integer_value=7,
-        array=array,
-    )
-    assert return_value.getvalue() == 118
-
-
-def test_2107(cursor, module_data):
-    "2107 - test binding in/out a unicode array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.DB_TYPE_NVARCHAR, 10, 100)
-    original_data = [r[1] for r in module_data]
-    fmt = "Converted element \u3042 # %d originally had length %d"
-    expected_data = [
-        fmt % (i, len(original_data[i - 1])) for i in range(1, 6)
-    ] + original_data[5:]
-    array.setvalue(0, original_data)
-    cursor.execute(
-        """
-        begin
-            pkg_TestUnicodeArrays.TestInOutArrays(:numElems, :array);
-        end;
-        """,
-        numElems=5,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2108(cursor):
-    "2108 - test binding out a unicode array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.DB_TYPE_NVARCHAR, 6, 100)
-    fmt = "Test out element \u3042 # %d"
-    expected_data = [fmt % i for i in range(1, 7)]
-    cursor.execute(
-        """
-        begin
-            pkg_TestUnicodeArrays.TestOutArrays(:numElems, :array);
-        end;
-        """,
-        numElems=6,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2109(cursor):
-    "2109 - test binding in a null"
-    cursor.execute(
-        "select * from TestUnicodes where UnicodeCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_2110(cursor):
-    "2110 - test binding out with set input sizes defined (by type)"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        r"""
-        begin
-            :value := unistr('TSI \3042');
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == "TSI \u3042"
-
-
-def test_2111(cursor):
-    "2111 - test binding in/out with set input sizes defined (by type)"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        r"""
-        begin
-            :value := :value || unistr(' TSI \3042');
-        end;
-        """,
-        value="InVal \u3041",
-    )
-    assert bind_vars["value"].getvalue() == "InVal \u3041 TSI \u3042"
-
-
-def test_2112(cursor):
-    "2112 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_NVARCHAR)
-    cursor.execute(
-        r"""
-        begin
-            :value := unistr('TSI (VAR) \3042');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == "TSI (VAR) \u3042"
-
-
-def test_2113(cursor):
-    "2113 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_NVARCHAR)
-    var.setvalue(0, "InVal \u3041")
-    cursor.execute(
-        r"""
-        begin
-            :value := :value || unistr(' TSI (VAR) \3042');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == "InVal \u3041 TSI (VAR) \u3042"
-
-
-def test_2114(cursor, test_env):
-    "2114 - test cursor description is accurate"
-    cursor.execute("select * from TestUnicodes")
-    varchar_ratio, nvarchar_ratio = test_env.charset_ratios
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "UNICODECOL",
-            oracledb.DB_TYPE_NVARCHAR,
-            20,
-            20 * nvarchar_ratio,
-            None,
-            None,
-            False,
-        ),
-        (
-            "FIXEDUNICODECOL",
-            oracledb.DB_TYPE_NCHAR,
-            40,
-            40 * nvarchar_ratio,
-            None,
-            None,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_NVARCHAR,
-            50,
-            50 * nvarchar_ratio,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2115(cursor, module_data):
-    "2115 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestUnicodes order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_2116(cursor, module_data):
-    "2116 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestUnicodes order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_2117(cursor, module_data_by_key):
-    "2117 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestUnicodes
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
diff --git a/tests/test_2200_number_var.py b/tests/test_2200_number_var.py
deleted file mode 100644
index bd15d320..00000000
--- a/tests/test_2200_number_var.py
+++ /dev/null
@@ -1,601 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2200 - Module for testing number variables
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        number_col = i + i * 0.25
-        float_col = i + i * 0.75
-        unconstrained_col = i**3 + i * 0.5
-        if i % 2:
-            nullable_col = 143**i
-        else:
-            nullable_col = None
-        data_tuple = (
-            i,
-            38**i,
-            number_col,
-            float_col,
-            unconstrained_col,
-            nullable_col,
-        )
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def output_type_handler_binary_int(cursor, metadata):
-    return cursor.var(
-        oracledb.DB_TYPE_BINARY_INTEGER, arraysize=cursor.arraysize
-    )
-
-
-def output_type_handler_decimal(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_NUMBER:
-        return cursor.var(
-            str,
-            255,
-            outconverter=decimal.Decimal,
-            arraysize=cursor.arraysize,
-        )
-
-
-def output_type_handler_str(cursor, metadata):
-    return cursor.var(str, 255, arraysize=cursor.arraysize)
-
-
-def test_2200(skip_unless_plsql_boolean_supported, cursor):
-    "2200 - test binding in a boolean"
-    result = cursor.callfunc("pkg_TestBooleans.GetStringRep", str, [True])
-    assert result == "TRUE"
-
-
-def test_2201(cursor):
-    "2201 - test binding in a boolean as a number"
-    var = cursor.var(oracledb.NUMBER)
-    var.setvalue(0, True)
-    cursor.execute("select :1 from dual", [var])
-    (result,) = cursor.fetchone()
-    assert result == 1
-    var.setvalue(0, False)
-    cursor.execute("select :1 from dual", [var])
-    (result,) = cursor.fetchone()
-    assert result == 0
-
-
-def test_2202(cursor, module_data_by_key):
-    "2202 - test binding in a decimal.Decimal"
-    cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where NumberCol - :value1 - :value2 = trunc(NumberCol)
-        """,
-        value1=decimal.Decimal("0.20"),
-        value2=decimal.Decimal("0.05"),
-    )
-    expected_data = [
-        module_data_by_key[1],
-        module_data_by_key[5],
-        module_data_by_key[9],
-    ]
-    assert cursor.fetchall() == expected_data
-
-
-def test_2203(cursor, module_data_by_key):
-    "2203 - test binding in a float"
-    cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where NumberCol - :value = trunc(NumberCol)
-        """,
-        value=0.25,
-    )
-    expected_data = [
-        module_data_by_key[1],
-        module_data_by_key[5],
-        module_data_by_key[9],
-    ]
-    assert cursor.fetchall() == expected_data
-
-
-def test_2204(cursor, module_data_by_key):
-    "2204 - test binding in an integer"
-    cursor.execute(
-        "select * from TestNumbers where IntCol = :value",
-        value=2,
-    )
-    assert cursor.fetchall() == [module_data_by_key[2]]
-
-
-def test_2205(cursor):
-    "2205 - test binding in a large long integer as Oracle number"
-    in_val = 6088343244
-    value_var = cursor.var(oracledb.NUMBER)
-    value_var.setvalue(0, in_val)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5;
-        end;
-        """,
-        value=value_var,
-    )
-    assert value_var.getvalue() == in_val + 5
-
-
-def test_2206(cursor):
-    "2206 - test binding in a large long integer as Python integer"
-    long_value = -9999999999999999999
-    cursor.execute("select :value from dual", value=long_value)
-    (result,) = cursor.fetchone()
-    assert result == long_value
-
-
-def test_2207(cursor, module_data_by_key):
-    "2207 - test binding in an integer after setting input sizes to string"
-    cursor.setinputsizes(value=15)
-    cursor.execute(
-        "select * from TestNumbers where IntCol = :value",
-        value=3,
-    )
-    assert cursor.fetchall() == [module_data_by_key[3]]
-
-
-def test_2208(cursor):
-    "2208 - test binding in a decimal after setting input sizes to number"
-    value = decimal.Decimal("319438950232418390.273596")
-    cursor.setinputsizes(value=oracledb.NUMBER)
-    cursor.outputtypehandler = output_type_handler_decimal
-    cursor.execute("select :value from dual", value=value)
-    (out_value,) = cursor.fetchone()
-    assert out_value == value
-
-
-def test_2209(cursor):
-    "2209 - test binding in a null"
-    cursor.execute(
-        "select * from TestNumbers where IntCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_2210(cursor, module_data):
-    "2210 - test binding in a number array"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = [r[2] for r in module_data]
-    statement = """
-            begin
-                :return_value := pkg_TestNumberArrays.TestInArrays(
-                    :start_value, :array);
-            end;"""
-    cursor.execute(
-        statement, return_value=return_value, start_value=5, array=array
-    )
-    assert return_value.getvalue() == 73.75
-    array = list(range(15))
-    cursor.execute(statement, start_value=10, array=array)
-    assert return_value.getvalue() == 115.0
-
-
-def test_2211(cursor, module_data):
-    "2211 - test binding in a number array (with setinputsizes)"
-    return_value = cursor.var(oracledb.NUMBER)
-    cursor.setinputsizes(array=[oracledb.NUMBER, 10])
-    array = [r[2] for r in module_data]
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestNumberArrays.TestInArrays(
-                :start_value, :array);
-        end;
-        """,
-        return_value=return_value,
-        start_value=6,
-        array=array,
-    )
-    assert return_value.getvalue() == 74.75
-
-
-def test_2212(cursor, module_data):
-    "2212 - test binding in a number array (with arrayvar)"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = cursor.arrayvar(oracledb.NUMBER, [r[2] for r in module_data])
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestNumberArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        return_value=return_value,
-        integer_value=7,
-        array=array,
-    )
-    assert return_value.getvalue() == 75.75
-
-
-def test_2213(cursor):
-    "2213 - test binding in a zero length number array (with arrayvar)"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = cursor.arrayvar(oracledb.NUMBER, 0)
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestNumberArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        return_value=return_value,
-        integer_value=8,
-        array=array,
-    )
-    assert return_value.getvalue() == 8.0
-    assert array.getvalue() == []
-
-
-def test_2214(cursor, module_data):
-    "2214 - test binding in/out a number array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.NUMBER, 10)
-    original_data = [r[2] for r in module_data]
-    expected_data = [
-        original_data[i - 1] * 10 for i in range(1, 6)
-    ] + original_data[5:]
-    array.setvalue(0, original_data)
-    cursor.execute(
-        """
-        begin
-            pkg_TestNumberArrays.TestInOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=5,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2215(cursor):
-    "2215 - test binding out a Number array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.NUMBER, 6)
-    expected_data = [i * 100 for i in range(1, 7)]
-    cursor.execute(
-        """
-        begin
-            pkg_TestNumberArrays.TestOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=6,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2216(cursor):
-    "2216 - test binding out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.NUMBER)
-    cursor.execute(
-        """
-        begin
-            :value := 5;
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == 5
-
-
-def test_2217(cursor):
-    "2217 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.NUMBER)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5;
-        end;
-        """,
-        value=1.25,
-    )
-    assert bind_vars["value"].getvalue() == 6.25
-
-
-def test_2218(cursor):
-    "2218 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.NUMBER)
-    cursor.execute(
-        """
-        begin
-            :value := 5;
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == 5
-
-
-def test_2219(cursor):
-    "2219 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.NUMBER)
-    var.setvalue(0, 2.25)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5;
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == 7.25
-
-
-def test_2220(cursor):
-    "2220 - test cursor description is accurate"
-    cursor.execute("select * from TestNumbers")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        ("LONGINTCOL", oracledb.DB_TYPE_NUMBER, 17, None, 16, 0, False),
-        ("NUMBERCOL", oracledb.DB_TYPE_NUMBER, 13, None, 9, 2, False),
-        ("FLOATCOL", oracledb.DB_TYPE_NUMBER, 127, None, 126, -127, False),
-        (
-            "UNCONSTRAINEDCOL",
-            oracledb.DB_TYPE_NUMBER,
-            127,
-            None,
-            0,
-            -127,
-            False,
-        ),
-        ("NULLABLECOL", oracledb.DB_TYPE_NUMBER, 39, None, 38, 0, True),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2221(cursor, module_data):
-    "2221 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestNumbers order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_2222(cursor, module_data):
-    "2222 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestNumbers order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_2223(cursor, module_data_by_key):
-    "2223 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_2224(cursor):
-    "2224 - test that fetching a long integer returns such in Python"
-    cursor.execute(
-        """
-        select NullableCol
-        from TestNumbers
-        where IntCol = 9
-        """
-    )
-    (col,) = cursor.fetchone()
-    assert col == 25004854810776297743
-
-
-def test_2225(cursor):
-    "2225 - test fetching a floating point number returns such in Python"
-    cursor.execute("select 1.25 from dual")
-    (result,) = cursor.fetchone()
-    assert result == 1.25
-
-
-def test_2226(cursor):
-    "2226 - test that fetching an integer returns such in Python"
-    cursor.execute("select 148 from dual")
-    (result,) = cursor.fetchone()
-    assert result == 148
-    assert isinstance(result, int)
-
-
-def test_2227(cursor):
-    "2227 - test that acceptable boundary numbers are handled properly"
-    in_values = [
-        decimal.Decimal("9.99999999999999e+125"),
-        decimal.Decimal("-9.99999999999999e+125"),
-        0.0,
-        1e-130,
-        -1e-130,
-    ]
-    out_values = [
-        int("9" * 15 + "0" * 111),
-        -int("9" * 15 + "0" * 111),
-        0,
-        1e-130,
-        -1e-130,
-    ]
-    for in_value, out_value in zip(in_values, out_values):
-        cursor.execute("select :1 from dual", [in_value])
-        (result,) = cursor.fetchone()
-        assert result == out_value
-
-
-def test_2228(cursor, test_env):
-    "2228 - test that unacceptable boundary numbers are rejected"
-    test_values = [
-        (1e126, "DPY-4003"),
-        (-1e126, "DPY-4003"),
-        (float("inf"), "DPY-4004"),
-        (float("-inf"), "DPY-4004"),
-        (float("NaN"), "DPY-4004"),
-        (decimal.Decimal("1e126"), "DPY-4003"),
-        (decimal.Decimal("-1e126"), "DPY-4003"),
-        (decimal.Decimal("inf"), "DPY-4004"),
-        (decimal.Decimal("-inf"), "DPY-4004"),
-        (decimal.Decimal("NaN"), "DPY-4004"),
-    ]
-    for value, error in test_values:
-        with test_env.assert_raises_full_code(error):
-            cursor.execute("select :1 from dual", [value])
-
-
-def test_2229(cursor):
-    "2229 - test that fetching the result of division returns a float"
-    cursor.execute(
-        """
-        select IntCol / 7
-        from TestNumbers
-        where IntCol = 1
-        """
-    )
-    (result,) = cursor.fetchone()
-    assert result == 1.0 / 7.0
-    assert isinstance(result, float)
-
-
-def test_2230(cursor):
-    "2230 - test that string format is returned properly"
-    var = cursor.var(oracledb.NUMBER)
-    assert var.type is oracledb.DB_TYPE_NUMBER
-    assert str(var) == "<oracledb.Var of type DB_TYPE_NUMBER with value None>"
-    var.setvalue(0, 4.5)
-    assert str(var) == "<oracledb.Var of type DB_TYPE_NUMBER with value 4.5>"
-
-
-def test_2231(cursor):
-    "2231 - test that binding binary double is possible"
-    statement = "select :1 from dual"
-    cursor.setinputsizes(oracledb.DB_TYPE_BINARY_DOUBLE)
-    cursor.execute(statement, (5,))
-    assert cursor.bindvars[0].type == oracledb.DB_TYPE_BINARY_DOUBLE
-    (value,) = cursor.fetchone()
-    assert value == 5
-
-    cursor.execute(statement, (1.5,))
-    assert cursor.bindvars[0].type == oracledb.DB_TYPE_BINARY_DOUBLE
-    (value,) = cursor.fetchone()
-    assert value == 1.5
-
-    cursor.execute(statement, [decimal.Decimal("NaN")])
-    assert cursor.bindvars[0].type == oracledb.DB_TYPE_BINARY_DOUBLE
-    (value,) = cursor.fetchone()
-    assert str(value) == str(float("NaN"))
-
-
-def test_2232(cursor):
-    "2232 - test fetching numbers as binary integers"
-    cursor.outputtypehandler = output_type_handler_binary_int
-    for value in (1, 2**31, 2**63 - 1, -1, -(2**31), -(2**63) + 1):
-        cursor.execute("select :1 from dual", [str(value)])
-        (fetched_value,) = cursor.fetchone()
-        assert value == fetched_value
-
-
-def test_2233(cursor):
-    "2233 - test binding native integer as an out bind"
-    simple_var = cursor.var(oracledb.DB_TYPE_BINARY_INTEGER)
-    cursor.execute("begin :value := 2.9; end;", [simple_var])
-    assert simple_var.getvalue() == 2
-
-    simple_var = cursor.var(oracledb.DB_TYPE_BINARY_INTEGER)
-    cursor.execute("begin :value := 1.5; end;", [simple_var])
-    assert simple_var.getvalue() == 1
-
-
-def test_2234(cursor):
-    "2234 - test binding in a native integer"
-    statement = "begin :value := :value + 2.5; end;"
-    simple_var = cursor.var(oracledb.DB_TYPE_BINARY_INTEGER)
-    simple_var.setvalue(0, 0)
-    cursor.execute(statement, [simple_var])
-    assert simple_var.getvalue() == 2
-
-    simple_var.setvalue(0, -5)
-    cursor.execute(statement, [simple_var])
-    assert simple_var.getvalue() == -2
-
-
-def test_2235(cursor):
-    "2235 - test setting decimal value for binary int"
-    simple_var = cursor.var(oracledb.DB_TYPE_BINARY_INTEGER)
-    simple_var.setvalue(0, 2.5)
-    cursor.execute("begin :value := :value + 2.5; end;", [simple_var])
-    assert simple_var.getvalue() == 4
-
-
-def test_2236(cursor):
-    "2236 - bind a large value to binary int"
-    simple_var = cursor.var(oracledb.DB_TYPE_BINARY_INTEGER)
-    cursor.execute("begin :value := POWER(2, 31) - 1; end;", [simple_var])
-    assert simple_var.getvalue() == 2**31 - 1
-
-    cursor.execute("begin :value := POWER(-2, 31) - 1; end;", [simple_var])
-    assert simple_var.getvalue() == -(2**31) - 1
-
-
-def test_2237(cursor, disable_fetch_lobs):
-    "2237 - fetch a number with oracledb.defaults.fetch_lobs = False"
-    cursor.execute("select 1 from dual")
-    (result,) = cursor.fetchone()
-    assert isinstance(result, int)
-
-
-def test_2238(cursor):
-    "2238 - fetch a small constant with a decimal point"
-    cursor.outputtypehandler = output_type_handler_str
-    cursor.execute("select 3 / 2 from dual")
-    (result,) = cursor.fetchone()
-    assert len(result) == 3
-    assert result[0] == "1"
-    assert result[2] == "5"
diff --git a/tests/test_2300_object_var.py b/tests/test_2300_object_var.py
deleted file mode 100644
index 8a0009e9..00000000
--- a/tests/test_2300_object_var.py
+++ /dev/null
@@ -1,996 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2300 - Module for testing object variables
-"""
-
-import datetime
-import decimal
-import re
-
-import oracledb
-import pytest
-
-
-def _test_data(
-    cursor,
-    test_env,
-    expected_int_value,
-    expected_obj_value,
-    expected_array_value,
-):
-    int_value, object_value, array_value = cursor.fetchone()
-    if object_value is not None:
-        assert isinstance(object_value.INTVALUE, int)
-        assert isinstance(object_value.SMALLINTVALUE, int)
-        assert isinstance(object_value.FLOATVALUE, float)
-    if object_value is not None:
-        object_value = test_env.get_db_object_as_plain_object(object_value)
-    if array_value is not None:
-        array_value = array_value.aslist()
-    assert int_value == expected_int_value
-    assert object_value == expected_obj_value
-    assert array_value == expected_array_value
-
-
-def test_2300(cursor):
-    "2300 - test binding a null value (IN)"
-    var = cursor.var(oracledb.DB_TYPE_OBJECT, typename="UDT_OBJECT")
-    result = cursor.callfunc("pkg_TestBindObject.GetStringRep", str, [var])
-    assert result == "null"
-
-
-def test_2301(conn, cursor):
-    "2301 - test binding an object (IN)"
-    type_obj = conn.gettype("UDT_OBJECT")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 13
-    obj.STRINGVALUE = "Test String"
-    result = cursor.callfunc("pkg_TestBindObject.GetStringRep", str, [obj])
-    exp = "udt_Object(13, 'Test String', null, null, null, null, null)"
-    assert result == exp
-    obj.NUMBERVALUE = None
-    obj.STRINGVALUE = "Test With Dates"
-    obj.DATEVALUE = datetime.datetime(2016, 2, 10)
-    obj.TIMESTAMPVALUE = datetime.datetime(2016, 2, 10, 14, 13, 50)
-    result = cursor.callfunc("pkg_TestBindObject.GetStringRep", str, [obj])
-    expected_value = (
-        "udt_Object(null, 'Test With Dates', null, "
-        "to_date('2016-02-10', 'YYYY-MM-DD'), "
-        "to_timestamp('2016-02-10 14:13:50', "
-        "'YYYY-MM-DD HH24:MI:SS'), "
-        "null, null)"
-    )
-    assert result == expected_value
-    obj.DATEVALUE = None
-    obj.TIMESTAMPVALUE = None
-    sub_type_obj = conn.gettype("UDT_SUBOBJECT")
-    sub_obj = sub_type_obj.newobject()
-    sub_obj.SUBNUMBERVALUE = decimal.Decimal("18.25")
-    sub_obj.SUBSTRINGVALUE = "Sub String"
-    obj.SUBOBJECTVALUE = sub_obj
-    result = cursor.callfunc("pkg_TestBindObject.GetStringRep", str, [obj])
-    expected_value = (
-        "udt_Object(null, 'Test With Dates', null, null, "
-        "null, udt_SubObject(18.25, 'Sub String'), null)"
-    )
-    assert result == expected_value
-
-
-def test_2302(conn):
-    "2302 - test copying an object"
-    type_obj = conn.gettype("UDT_OBJECT")
-    obj = type_obj()
-    obj.NUMBERVALUE = 5124
-    obj.STRINGVALUE = "A test string"
-    obj.DATEVALUE = datetime.datetime(2016, 2, 24)
-    obj.TIMESTAMPVALUE = datetime.datetime(2016, 2, 24, 13, 39, 10)
-    copied_obj = obj.copy()
-    assert obj.NUMBERVALUE == copied_obj.NUMBERVALUE
-    assert obj.STRINGVALUE == copied_obj.STRINGVALUE
-    assert obj.DATEVALUE == copied_obj.DATEVALUE
-    assert obj.TIMESTAMPVALUE == copied_obj.TIMESTAMPVALUE
-
-
-def test_2303(conn):
-    "2303 - test getting an empty collection as a list"
-    type_obj = conn.gettype("UDT_ARRAY")
-    obj = type_obj.newobject()
-    assert obj.aslist() == []
-
-
-def test_2304(cursor, test_env):
-    "2304 - test fetching objects"
-    cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        order by IntCol
-        """
-    )
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "OBJECTCOL",
-            oracledb.DB_TYPE_OBJECT,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-        (
-            "ARRAYCOL",
-            oracledb.DB_TYPE_OBJECT,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-    expected_value = (
-        1,
-        "First row",
-        "First     ",
-        "N First Row",
-        "N First   ",
-        b"Raw Data 1",
-        2,
-        5,
-        12.125,
-        0.5,
-        12.5,
-        25.25,
-        50.125,
-        datetime.datetime(2007, 3, 6, 0, 0, 0),
-        datetime.datetime(2008, 9, 12, 16, 40),
-        datetime.datetime(2009, 10, 13, 17, 50),
-        oracledb.Timestamp(2010, 11, 14, 18, 55),
-        "Short CLOB value",
-        "Short NCLOB Value",
-        b"Short BLOB value",
-        (11, "Sub object 1"),
-        [(5, "first element"), (6, "second element")],
-    )
-    _test_data(cursor, test_env, 1, expected_value, [5, 10, None, 20])
-    _test_data(cursor, test_env, 2, None, [3, None, 9, 12, 15])
-    expected_value = (
-        3,
-        "Third row",
-        "Third     ",
-        "N Third Row",
-        "N Third   ",
-        b"Raw Data 3",
-        4,
-        10,
-        6.5,
-        0.75,
-        43.25,
-        86.5,
-        192.125,
-        datetime.datetime(2007, 6, 21, 0, 0, 0),
-        datetime.datetime(2007, 12, 13, 7, 30, 45),
-        datetime.datetime(2017, 6, 21, 23, 18, 45),
-        oracledb.Timestamp(2017, 7, 21, 8, 27, 13),
-        "Another short CLOB value",
-        "Another short NCLOB Value",
-        b"Yet another short BLOB value",
-        (13, "Sub object 3"),
-        [
-            (10, "element #1"),
-            (20, "element #2"),
-            (30, "element #3"),
-            (40, "element #4"),
-        ],
-    )
-    _test_data(cursor, test_env, 3, expected_value, None)
-
-
-def test_2305(conn):
-    "2305 - test getting object type"
-    type_obj = conn.gettype("UDT_OBJECT")
-    assert not type_obj.iscollection
-    assert type_obj.schema == conn.username.upper()
-    assert type_obj.name == "UDT_OBJECT"
-    sub_object_value_type = conn.gettype("UDT_SUBOBJECT")
-    sub_object_array_type = conn.gettype("UDT_OBJECTARRAY")
-    expected_metadata = [
-        ("NUMBERVALUE", oracledb.DB_TYPE_NUMBER, 0, -127, None),
-        ("STRINGVALUE", oracledb.DB_TYPE_VARCHAR, None, None, 60),
-        ("FIXEDCHARVALUE", oracledb.DB_TYPE_CHAR, None, None, 10),
-        ("NSTRINGVALUE", oracledb.DB_TYPE_NVARCHAR, None, None, 120),
-        ("NFIXEDCHARVALUE", oracledb.DB_TYPE_NCHAR, None, None, 20),
-        ("RAWVALUE", oracledb.DB_TYPE_RAW, None, None, 16),
-        ("INTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("SMALLINTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("REALVALUE", oracledb.DB_TYPE_NUMBER, 63, -127, None),
-        ("DOUBLEPRECISIONVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        ("FLOATVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        (
-            "BINARYFLOATVALUE",
-            oracledb.DB_TYPE_BINARY_FLOAT,
-            None,
-            None,
-            None,
-        ),
-        (
-            "BINARYDOUBLEVALUE",
-            oracledb.DB_TYPE_BINARY_DOUBLE,
-            None,
-            None,
-            None,
-        ),
-        ("DATEVALUE", oracledb.DB_TYPE_DATE, None, None, None),
-        ("TIMESTAMPVALUE", oracledb.DB_TYPE_TIMESTAMP, None, None, None),
-        (
-            "TIMESTAMPTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            None,
-            None,
-            None,
-        ),
-        (
-            "TIMESTAMPLTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            None,
-            None,
-            None,
-        ),
-        ("CLOBVALUE", oracledb.DB_TYPE_CLOB, None, None, None),
-        ("NCLOBVALUE", oracledb.DB_TYPE_NCLOB, None, None, None),
-        ("BLOBVALUE", oracledb.DB_TYPE_BLOB, None, None, None),
-        ("SUBOBJECTVALUE", sub_object_value_type, None, None, None),
-        ("SUBOBJECTARRAY", sub_object_array_type, None, None, None),
-    ]
-    actual_metadata = [
-        (attr.name, attr.type, attr.precision, attr.scale, attr.max_size)
-        for attr in type_obj.attributes
-    ]
-    assert actual_metadata == expected_metadata
-    assert sub_object_array_type.iscollection
-    assert sub_object_array_type.attributes == []
-
-
-def test_2306(conn, cursor):
-    "2306 - test object type data"
-    cursor.execute(
-        """
-        select ObjectCol
-        from TestObjects
-        where ObjectCol is not null
-          and rownum <= 1
-        """
-    )
-    (obj,) = cursor.fetchone()
-    assert obj.type.schema == conn.username.upper()
-    assert obj.type.name == "UDT_OBJECT"
-    assert obj.type.attributes[0].name == "NUMBERVALUE"
-
-
-def test_2307(conn, cursor, test_env):
-    "2307 - test inserting and then querying object with all data types"
-    cursor.execute("delete from TestClobs")
-    cursor.execute("delete from TestNClobs")
-    cursor.execute("delete from TestBlobs")
-    cursor.execute("delete from TestObjects where IntCol > 3")
-    cursor.execute(
-        """
-        insert into TestClobs (IntCol, ClobCol)
-        values (1, 'A short CLOB')
-        """
-    )
-    cursor.execute(
-        """
-        insert into TestNClobs (IntCol, NClobCol)
-        values (1, 'A short NCLOB')
-        """
-    )
-    cursor.execute(
-        """
-        insert into TestBlobs (IntCol, BlobCol)
-        values (1, utl_raw.cast_to_raw('A short BLOB'))
-        """
-    )
-    conn.commit()
-    cursor.execute("select CLOBCol from TestClobs")
-    (clob,) = cursor.fetchone()
-    cursor.execute("select NCLOBCol from TestNClobs")
-    (nclob,) = cursor.fetchone()
-    cursor.execute("select BLOBCol from TestBlobs")
-    (blob,) = cursor.fetchone()
-    type_obj = conn.gettype("UDT_OBJECT")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 5
-    obj.STRINGVALUE = "A string"
-    obj.FIXEDCHARVALUE = "Fixed str"
-    obj.NSTRINGVALUE = "A NCHAR string"
-    obj.NFIXEDCHARVALUE = "Fixed N"
-    obj.RAWVALUE = b"Raw Value"
-    obj.INTVALUE = 27
-    obj.SMALLINTVALUE = 13
-    obj.REALVALUE = 184.875
-    obj.DOUBLEPRECISIONVALUE = 1.375
-    obj.FLOATVALUE = 23.0
-    obj.DATEVALUE = datetime.date(2017, 5, 9)
-    obj.TIMESTAMPVALUE = datetime.datetime(2017, 5, 9, 9, 41, 13)
-    obj.TIMESTAMPTZVALUE = datetime.datetime(1986, 8, 2, 15, 27, 38)
-    obj.TIMESTAMPLTZVALUE = datetime.datetime(1999, 11, 12, 23, 5, 2)
-    obj.BINARYFLOATVALUE = 14.25
-    obj.BINARYDOUBLEVALUE = 29.1625
-    obj.CLOBVALUE = clob
-    obj.NCLOBVALUE = nclob
-    obj.BLOBVALUE = blob
-    sub_type_obj = conn.gettype("UDT_SUBOBJECT")
-    sub_obj = sub_type_obj.newobject()
-    sub_obj.SUBNUMBERVALUE = 23
-    sub_obj.SUBSTRINGVALUE = "Substring value"
-    obj.SUBOBJECTVALUE = sub_obj
-    cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (4, :obj)
-        """,
-        obj=obj,
-    )
-    cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        where IntCol = 4
-        """
-    )
-    expected_value = (
-        5,
-        "A string",
-        "Fixed str ",
-        "A NCHAR string",
-        "Fixed N   ",
-        b"Raw Value",
-        27,
-        13,
-        184.875,
-        1.375,
-        23.0,
-        14.25,
-        29.1625,
-        datetime.datetime(2017, 5, 9, 0, 0, 0),
-        datetime.datetime(2017, 5, 9, 9, 41, 13),
-        datetime.datetime(1986, 8, 2, 15, 27, 38),
-        oracledb.Timestamp(1999, 11, 12, 23, 5, 2),
-        "A short CLOB",
-        "A short NCLOB",
-        b"A short BLOB",
-        (23, "Substring value"),
-        None,
-    )
-    _test_data(cursor, test_env, 4, expected_value, None)
-    obj.CLOBVALUE = "A short CLOB (modified)"
-    obj.NCLOBVALUE = "A short NCLOB (modified)"
-    obj.BLOBVALUE = "A short BLOB (modified)"
-    cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (5, :obj)
-        """,
-        obj=obj,
-    )
-    cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        where IntCol = 5
-        """
-    )
-    expected_value = (
-        5,
-        "A string",
-        "Fixed str ",
-        "A NCHAR string",
-        "Fixed N   ",
-        b"Raw Value",
-        27,
-        13,
-        184.875,
-        1.375,
-        23.0,
-        14.25,
-        29.1625,
-        datetime.datetime(2017, 5, 9, 0, 0, 0),
-        datetime.datetime(2017, 5, 9, 9, 41, 13),
-        datetime.datetime(1986, 8, 2, 15, 27, 38),
-        oracledb.Timestamp(1999, 11, 12, 23, 5, 2),
-        "A short CLOB (modified)",
-        "A short NCLOB (modified)",
-        b"A short BLOB (modified)",
-        (23, "Substring value"),
-        None,
-    )
-    _test_data(cursor, test_env, 5, expected_value, None)
-    conn.rollback()
-
-
-def test_2308(conn, test_env):
-    "2308 - test trying to find an object type that does not exist"
-    pytest.raises(TypeError, conn.gettype, 2)
-    with test_env.assert_raises_full_code("DPY-2035"):
-        conn.gettype("A TYPE THAT DOES NOT EXIST")
-
-
-def test_2309(conn, test_env):
-    "2309 - test appending an object of the wrong type to a collection"
-    collection_obj_type = conn.gettype("UDT_OBJECTARRAY")
-    collection_obj = collection_obj_type.newobject()
-    array_obj_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_obj_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2008"):
-        collection_obj.append(array_obj)
-
-
-def test_2310(conn):
-    "2310 - test that referencing a sub object affects the parent object"
-    obj_type = conn.gettype("UDT_OBJECT")
-    sub_obj_type = conn.gettype("UDT_SUBOBJECT")
-    obj = obj_type.newobject()
-    obj.SUBOBJECTVALUE = sub_obj_type.newobject()
-    obj.SUBOBJECTVALUE.SUBNUMBERVALUE = 5
-    obj.SUBOBJECTVALUE.SUBSTRINGVALUE = "Substring"
-    assert obj.SUBOBJECTVALUE.SUBNUMBERVALUE == 5
-    assert obj.SUBOBJECTVALUE.SUBSTRINGVALUE == "Substring"
-
-
-def test_2311(conn, test_env):
-    "2311 - test accessing sub object after parent object destroyed"
-    obj_type = conn.gettype("UDT_OBJECT")
-    sub_obj_type = conn.gettype("UDT_SUBOBJECT")
-    array_type = conn.gettype("UDT_OBJECTARRAY")
-    sub_obj1 = sub_obj_type.newobject()
-    sub_obj1.SUBNUMBERVALUE = 2
-    sub_obj1.SUBSTRINGVALUE = "AB"
-    sub_obj2 = sub_obj_type.newobject()
-    sub_obj2.SUBNUMBERVALUE = 3
-    sub_obj2.SUBSTRINGVALUE = "CDE"
-    obj = obj_type.newobject()
-    obj.SUBOBJECTARRAY = array_type.newobject([sub_obj1, sub_obj2])
-    sub_obj_array = obj.SUBOBJECTARRAY
-    del obj
-    expected = [(2, "AB"), (3, "CDE")]
-    assert test_env.get_db_object_as_plain_object(sub_obj_array) == expected
-
-
-def test_2312(conn, test_env):
-    "2312 - test assigning an object of wrong type to an object attribute"
-    obj_type = conn.gettype("UDT_OBJECT")
-    obj = obj_type.newobject()
-    wrong_obj_type = conn.gettype("UDT_OBJECTARRAY")
-    wrong_obj = wrong_obj_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2008"):
-        setattr(obj, "SUBOBJECTVALUE", wrong_obj)
-
-
-def test_2313(conn, cursor, test_env):
-    "2313 - test setting value of object variable to wrong object type"
-    wrong_obj_type = conn.gettype("UDT_OBJECTARRAY")
-    wrong_obj = wrong_obj_type.newobject()
-    var = cursor.var(oracledb.DB_TYPE_OBJECT, typename="UDT_OBJECT")
-    with test_env.assert_raises_full_code("DPY-2008"):
-        var.setvalue(0, wrong_obj)
-
-
-def test_2314(conn, test_env):
-    "2314 - test object string format"
-    obj_type = conn.gettype("UDT_OBJECT")
-    user = test_env.main_user.upper()
-    assert str(obj_type) == f"<oracledb.DbObjectType {user}.UDT_OBJECT>"
-    assert str(obj_type.attributes[0]) == "<oracledb.DbObjectAttr NUMBERVALUE>"
-
-
-def test_2315(conn, test_env):
-    "2315 - test Trim number of elements from collection"
-    sub_obj_type = conn.gettype("UDT_SUBOBJECT")
-    array_type = conn.gettype("UDT_OBJECTARRAY")
-    data = [(1, "AB"), (2, "CDE"), (3, "FGH"), (4, "IJK"), (5, "LMN")]
-    array_obj = array_type()
-    for num_val, str_val in data:
-        subObj = sub_obj_type()
-        subObj.SUBNUMBERVALUE = num_val
-        subObj.SUBSTRINGVALUE = str_val
-        array_obj.append(subObj)
-    assert test_env.get_db_object_as_plain_object(array_obj) == data
-    array_obj.trim(2)
-    assert test_env.get_db_object_as_plain_object(array_obj) == data[:3]
-    array_obj.trim(1)
-    assert test_env.get_db_object_as_plain_object(array_obj) == data[:2]
-    array_obj.trim(0)
-    assert test_env.get_db_object_as_plain_object(array_obj) == data[:2]
-    array_obj.trim(2)
-    assert test_env.get_db_object_as_plain_object(array_obj) == []
-
-
-def test_2316(conn, test_env):
-    "2316 - test the metadata of a SQL type"
-    user = test_env.main_user
-    typ = conn.gettype("UDT_OBJECTARRAY")
-    assert typ.schema == user.upper()
-    assert typ.name == "UDT_OBJECTARRAY"
-    assert typ.package_name is None
-    assert typ.element_type.schema == user.upper()
-    assert typ.element_type.name == "UDT_SUBOBJECT"
-    assert typ.element_type.package_name is None
-    assert typ.attributes == []
-    assert typ.iscollection
-
-
-def test_2317(conn, test_env):
-    "2317 - test the metadata of a PL/SQL type"
-    user = test_env.main_user
-    typ = conn.gettype("PKG_TESTSTRINGARRAYS.UDT_STRINGLIST")
-    assert typ.schema == user.upper()
-    assert typ.name == "UDT_STRINGLIST"
-    assert typ.package_name == "PKG_TESTSTRINGARRAYS"
-    assert typ.element_type == oracledb.DB_TYPE_VARCHAR
-    assert typ.attributes == []
-    assert typ.iscollection
-
-
-def test_2318(cursor, test_env):
-    "2318 - test creating an object variable without a type name"
-    with test_env.assert_raises_full_code("DPY-2037"):
-        cursor.var(oracledb.DB_TYPE_OBJECT)
-
-
-def test_2319(conn):
-    "2319 - test getting an empty collection as a dictionary"
-    type_obj = conn.gettype("UDT_ARRAY")
-    obj = type_obj.newobject()
-    assert obj.asdict() == {}
-
-
-def test_2320(conn):
-    "2320 - test if an element exists in a collection"
-    array_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_type.newobject()
-    assert not array_obj.exists(0)
-    array_obj.append(40)
-    assert array_obj.exists(0)
-    assert not array_obj.exists(1)
-
-
-def test_2321(conn):
-    "2321 - test first and last methods"
-    array_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_type.newobject()
-    assert array_obj.first() is None
-    assert array_obj.last() is None
-    for i in range(7):
-        array_obj.append(i)
-    assert array_obj.first() == 0
-    assert array_obj.last() == 6
-
-
-def test_2322(conn):
-    "2322 - test getting the size of a collections"
-    array_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_type.newobject()
-    assert array_obj.size() == 0
-    for i in range(5):
-        array_obj.append(i)
-    assert array_obj.size() == 5
-
-
-def test_2323(conn):
-    "2323 - test prev and next methods"
-    array_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_type.newobject()
-    assert array_obj.prev(0) is None
-    assert array_obj.next(0) is None
-    for i in range(2):
-        array_obj.append(i)
-    assert array_obj.prev(0) is None
-    assert array_obj.prev(1) == 0
-    assert array_obj.next(0) == 1
-    assert array_obj.next(1) is None
-
-
-def test_2324(conn, test_env):
-    "2324 - test setting and getting elements from a collection"
-    array_type = conn.gettype("UDT_ARRAY")
-    array_obj = array_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2038"):
-        array_obj.getelement(0)
-    with test_env.assert_raises_full_code("DPY-2039"):
-        array_obj.setelement(0, 7)
-    array_obj.append(7)
-    assert array_obj.getelement(0) == 7
-    array_obj.setelement(0, 10)
-    assert array_obj.getelement(0) == 10
-    with test_env.assert_raises_full_code("DPY-2039"):
-        array_obj.setelement(3, 4)
-
-
-def test_2325(conn, test_env):
-    "2325 - test appending too many elements to a collection"
-    array_type = conn.gettype("UDT_ARRAY")
-    numbers = [i for i in range(11)]
-    with test_env.assert_raises_full_code("DPY-2039"):
-        array_type.newobject(numbers)
-
-    array_obj = array_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2039"):
-        array_obj.extend(numbers)
-
-    array_obj = array_type.newobject()
-    for elem in numbers[:10]:
-        array_obj.append(elem)
-    with test_env.assert_raises_full_code("DPY-2039"):
-        array_obj.append(numbers[10])
-
-
-def test_2326(conn, cursor):
-    "2326 - test appending elements to an unconstrained table"
-    data = [1, 3, 6, 10, 15, 21]
-    typ = conn.gettype("UDT_UNCONSTRAINEDTABLE")
-    obj = typ.newobject(data)
-    cursor.execute("select :1 from dual", [obj])
-    (output_obj,) = cursor.fetchone()
-    assert output_obj.aslist() == data
-
-
-def test_2327(conn, cursor):
-    "2327 - test collection with thousands of entries"
-    typ = conn.gettype("PKG_TESTNUMBERARRAYS.UDT_NUMBERLIST")
-    obj = typ.newobject()
-    obj.setelement(1, 1)
-    running_total = 1
-    for i in range(1, 35000):
-        running_total += i + 1
-        obj.append(running_total)
-    result = cursor.callfunc(
-        "pkg_TestNumberArrays.TestInArrays", int, (2327, obj)
-    )
-    assert result == 7146445847327
-
-
-def test_2328(skip_unless_thick_mode, conn):
-    "2328 - test object with unknown type in one of its attributes"
-    typ = conn.gettype("UDT_OBJECTWITHXMLTYPE")
-    assert typ.attributes[1].type == oracledb.DB_TYPE_UNKNOWN
-
-
-def test_2329(skip_unless_thick_mode, conn):
-    "2329 - test object with unknown type as the element type"
-    typ = conn.gettype("UDT_XMLTYPEARRAY")
-    assert typ.element_type == oracledb.DB_TYPE_UNKNOWN
-
-
-def test_2330(conn):
-    "2330 - test DB Object repr()"
-    typ = conn.gettype("UDT_ARRAY")
-    obj = typ.newobject()
-    fqn = f"{typ.schema}.{typ.name}"
-    expected_str = f"^<oracledb.DbObject {fqn} at 0x.+>$"
-    assert re.fullmatch(expected_str, repr(obj)) is not None
-
-    # object of a package
-    typ = conn.gettype("PKG_TESTSTRINGARRAYS.UDT_STRINGLIST")
-    obj = typ.newobject()
-    fqn = f"{typ.schema}.{typ.package_name}.{typ.name}"
-    expected_str = f"^<oracledb.DbObject {fqn} at 0x.+>$"
-    assert re.fullmatch(expected_str, repr(obj)) is not None
-
-
-def test_2331(conn, test_env):
-    "2331 - test creating an object with invalid data type"
-    type_obj = conn.gettype("UDT_ARRAY")
-    with test_env.assert_raises_full_code("DPY-3013"):
-        type_obj.newobject([490, "not a number"])
-    with test_env.assert_raises_full_code("DPY-3013"):
-        type_obj([71, "not a number"])
-
-
-def test_2332(conn):
-    "2332 - test getting an invalid attribute name from an object"
-    typ = conn.gettype("UDT_OBJECT")
-    obj = typ.newobject()
-    with pytest.raises(AttributeError):
-        obj.MISSING
-
-
-def test_2333(conn, test_env):
-    "2333 - test validating a string attribute"
-    typ = conn.gettype("UDT_OBJECT")
-    obj = typ.newobject()
-    for attr_name, max_size in [
-        ("STRINGVALUE", 60),
-        ("FIXEDCHARVALUE", 10),
-        ("NSTRINGVALUE", 120),
-        ("NFIXEDCHARVALUE", 20),
-        ("RAWVALUE", 16),
-    ]:
-        value = "A" * max_size
-        setattr(obj, attr_name, value)
-        value += "X"
-        with test_env.assert_raises_full_code("DPY-2043"):
-            setattr(obj, attr_name, value)
-
-
-def test_2334(conn, test_env):
-    "2334 - test validating a string element value"
-    typ = conn.gettype("PKG_TESTSTRINGARRAYS.UDT_STRINGLIST")
-    obj = typ.newobject()
-    obj.append("A" * 100)
-    with test_env.assert_raises_full_code("DPY-2044"):
-        obj.append("A" * 101)
-    obj.append("B" * 100)
-    with test_env.assert_raises_full_code("DPY-2044"):
-        obj.setelement(2, "C" * 101)
-
-
-def test_2335(conn):
-    "2335 - test validating a string attribute with null value"
-    typ = conn.gettype("UDT_OBJECT")
-    obj = typ.newobject()
-    obj.STRINGVALUE = None
-
-
-def test_2336(conn, test_env):
-    "2336 - test initializing (with a sequence) a non collection obj"
-    obj_type = conn.gettype("UDT_OBJECT")
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj_type.newobject([1, 2])
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj_type([3, 4])
-
-
-def test_2337(conn):
-    "2337 - test %ROWTYPE with all types"
-    sub_obj_type = conn.gettype("UDT_SUBOBJECT")
-    sub_arr_type = conn.gettype("UDT_OBJECTARRAY")
-    expected_metadata = [
-        ("NUMBERVALUE", oracledb.DB_TYPE_NUMBER, 0, -127, None),
-        ("STRINGVALUE", oracledb.DB_TYPE_VARCHAR, None, None, 60),
-        ("FIXEDCHARVALUE", oracledb.DB_TYPE_CHAR, None, None, 10),
-        ("NSTRINGVALUE", oracledb.DB_TYPE_NVARCHAR, None, None, 120),
-        ("NFIXEDCHARVALUE", oracledb.DB_TYPE_NCHAR, None, None, 20),
-        ("RAWVALUE", oracledb.DB_TYPE_RAW, None, None, 16),
-        ("INTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("SMALLINTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("REALVALUE", oracledb.DB_TYPE_NUMBER, 63, -127, None),
-        ("DECIMALVALUE", oracledb.DB_TYPE_NUMBER, 20, 6, None),
-        ("DOUBLEPRECISIONVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        ("FLOATVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        (
-            "BINARYFLOATVALUE",
-            oracledb.DB_TYPE_BINARY_FLOAT,
-            None,
-            None,
-            None,
-        ),
-        (
-            "BINARYDOUBLEVALUE",
-            oracledb.DB_TYPE_BINARY_DOUBLE,
-            None,
-            None,
-            None,
-        ),
-        ("DATEVALUE", oracledb.DB_TYPE_DATE, None, None, None),
-        ("TIMESTAMPVALUE", oracledb.DB_TYPE_TIMESTAMP, None, None, None),
-        (
-            "TIMESTAMPTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            None,
-            None,
-            None,
-        ),
-        (
-            "TIMESTAMPLTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            None,
-            None,
-            None,
-        ),
-        ("CLOBVALUE", oracledb.DB_TYPE_CLOB, None, None, None),
-        ("NCLOBVALUE", oracledb.DB_TYPE_NCLOB, None, None, None),
-        ("BLOBVALUE", oracledb.DB_TYPE_BLOB, None, None, None),
-        ("SUBOBJECTVALUE", sub_obj_type, None, None, None),
-        ("SUBOBJECTARRAY", sub_arr_type, None, None, None),
-    ]
-    obj_type = conn.gettype("TESTALLTYPES%ROWTYPE")
-    actual_metadata = [
-        (attr.name, attr.type, attr.precision, attr.scale, attr.max_size)
-        for attr in obj_type.attributes
-    ]
-    assert actual_metadata == expected_metadata
-
-
-def test_2338(cursor):
-    "2338 - test collection iteration"
-    cursor.execute("select udt_array(5, 10, 15) from dual")
-    (obj,) = cursor.fetchone()
-    result = [i for i in obj]
-    assert result == [5, 10, 15]
-
-
-def test_2339(skip_unless_thin_mode, cursor):
-    "2339 - test fetching an object containing an XmlType instance"
-    num_val = 2339
-    xml_val = "<item>test_2339</item>"
-    str_val = "A string for test 2339"
-    cursor.execute(
-        f"""
-        select udt_ObjectWithXmlType({num_val}, sys.xmltype('{xml_val}'),
-                '{str_val}') from dual
-        """
-    )
-    (obj,) = cursor.fetchone()
-    assert obj.NUMBERVALUE == num_val
-    assert obj.XMLVALUE == xml_val
-    assert obj.STRINGVALUE == str_val
-
-
-def test_2340(conn, cursor):
-    "2340 - test DbObject instances are retained across getvalue() calls"
-    typ = conn.gettype("UDT_OBJECT")
-    obj = typ.newobject()
-    var = cursor.var(typ)
-    var.setvalue(0, obj)
-    assert var.getvalue() is obj
-
-
-def test_2341(test_env):
-    "2341 - test insufficient privileges for gettype()"
-    main_user = test_env.main_user.upper()
-    conn = test_env.get_connection(
-        user=test_env.proxy_user, password=test_env.proxy_password
-    )
-    with test_env.assert_raises_full_code("DPY-2035"):
-        conn.gettype(f"{main_user}.UDT_OBJECTARRAY")
-
-
-def test_2342(conn, cursor, test_env):
-    "2342 - test nested records"
-    test_env.skip_unless_server_version(21)
-    options = [(None, None), (1, None), (None, 2), (1, 2)]
-    typ = conn.gettype("PKG_TESTNESTEDRECORDS.UDT_OUTER")
-    for option in options:
-        value1, value2 = option
-        obj = cursor.callfunc(
-            "pkg_TestNestedRecords.GetOuter", typ, (value1, value2)
-        )
-        assert obj.INNER1 is not None
-        assert obj.INNER1.ATTR1 is None
-        assert obj.INNER1.ATTR2 == value1
-        assert obj.INNER2 is not None
-        assert obj.INNER2.ATTR1 is None
-        assert obj.INNER2.ATTR2 == value2
-
-
-def test_2343(conn, cursor):
-    "2343 - test varray of numbers"
-    obj_type = conn.gettype("UDT_VARRAYOFNUMBER")
-    obj = cursor.callfunc("pkg_NestedTable.GetVarrayOfNumber", obj_type)
-    assert obj.aslist() == [10, 20, 30]
-
-
-def test_2344(conn, cursor):
-    "2344 - test table of numbers"
-    obj_type = conn.gettype("UDT_TABLEOFNUMBER")
-    obj = cursor.callfunc("pkg_NestedTable.GetTableOfNumber", obj_type)
-    assert obj.aslist() == [15, 25, 35, 45]
-
-
-def test_2345(conn, cursor, test_env):
-    "2345 - test table of varray of numbers"
-    obj_type = conn.gettype("UDT_TABLEOFVARRAYOFNUMBER")
-    obj = cursor.callfunc("pkg_NestedTable.GetTableOfVarrayOfNumber", obj_type)
-    plain_obj = test_env.get_db_object_as_plain_object(obj)
-    assert plain_obj == [[10, 20], [30, 40]]
-
-
-def test_2346(conn, cursor, test_env):
-    "2346 - test nested table of nested tables"
-    num_tab_type = conn.gettype("UDT_TABLEOFNUMBER")
-    tab_num_tab_type = conn.gettype("UDT_TABLEOFTABLEOFNUMBER")
-
-    num_tab_1 = num_tab_type.newobject([1, 2])
-    num_tab_2 = num_tab_type.newobject([3, 4, 5])
-    num_tab_3 = num_tab_type.newobject([6, 7, 8, 9, 10])
-    tab_num_tab = tab_num_tab_type.newobject(
-        [num_tab_1, None, num_tab_2, None, num_tab_3]
-    )
-
-    cursor.execute(
-        """
-        insert into NestedCollectionTests (Id, TableCol)
-        values (:1, :2)
-        """,
-        [1, tab_num_tab],
-    )
-    cursor.execute("select TableCol from NestedCollectionTests")
-    (obj,) = cursor.fetchone()
-    plain_obj = test_env.get_db_object_as_plain_object(obj)
-    expected_data = [[1, 2], None, [3, 4, 5], None, [6, 7, 8, 9, 10]]
-    assert plain_obj == expected_data
-
-
-def test_2347(conn, cursor, test_env):
-    "2347 - test nested table of varrays"
-    num_tab_type = conn.gettype("UDT_TABLEOFNUMBER")
-    arr_num_tab_type = conn.gettype("UDT_VARRAYOFTABLEOFNUMBER")
-
-    num_tab_1 = num_tab_type.newobject([4, 8])
-    num_tab_2 = num_tab_type.newobject([1, 3, 5])
-    num_tab_3 = num_tab_type.newobject([2, 6, 10, 7, 9])
-    tab_num_tab = arr_num_tab_type.newobject(
-        [num_tab_1, None, num_tab_2, None, num_tab_3]
-    )
-
-    cursor.execute(
-        """
-        insert into NestedCollectionTests (Id, VarrayCol)
-        values (:1, :2)
-        """,
-        [1, tab_num_tab],
-    )
-    cursor.execute("select VarrayCol from NestedCollectionTests")
-    (obj,) = cursor.fetchone()
-    plain_obj = test_env.get_db_object_as_plain_object(obj)
-    expected_data = [[4, 8], None, [1, 3, 5], None, [2, 6, 10, 7, 9]]
-    assert plain_obj == expected_data
-
-
-def test_2348(conn, test_env):
-    "2348 - test using collection methods on an object that is not one"
-    obj_type = conn.gettype("UDT_OBJECT")
-    obj = obj_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.append(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.asdict()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.aslist()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.delete(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.exists(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.extend([5])
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.first()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.getelement(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.last()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.next(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.prev(5)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.setelement(5, None)
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.size()
-    with test_env.assert_raises_full_code("DPY-2036"):
-        obj.trim(0)
diff --git a/tests/test_2400_pool.py b/tests/test_2400_pool.py
deleted file mode 100644
index f81adfee..00000000
--- a/tests/test_2400_pool.py
+++ /dev/null
@@ -1,1070 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2400 - Module for testing pools
-"""
-
-import re
-import threading
-
-import oracledb
-import pytest
-
-
-class CallableSessionCallback:
-
-    def __init__(self):
-        self.session_called = False
-
-    def __call__(self, conn, requested_tag):
-        self.session_called = True
-
-        supported_formats = {
-            "SIMPLE": "'YYYY-MM-DD HH24:MI'",
-            "FULL": "'YYYY-MM-DD HH24:MI:SS'",
-        }
-
-        supported_time_zones = {"UTC": "'UTC'", "MST": "'-07:00'"}
-
-        supported_keys = {
-            "NLS_DATE_FORMAT": supported_formats,
-            "TIME_ZONE": supported_time_zones,
-        }
-        if requested_tag is not None:
-            state_parts = []
-            for directive in requested_tag.split(";"):
-                parts = directive.split("=")
-                if len(parts) != 2:
-                    raise ValueError("Tag must contain key=value pairs")
-                key, value = parts
-                value_dict = supported_keys.get(key)
-                if value_dict is None:
-                    raise ValueError(
-                        "Tag only supports keys: %s"
-                        % (", ".join(supported_keys))
-                    )
-                actual_value = value_dict.get(value)
-                if actual_value is None:
-                    raise ValueError(
-                        "Key %s only supports values: %s"
-                        % (key, ", ".join(value_dict))
-                    )
-                state_parts.append(f"{key} = {actual_value}")
-            sql = f"alter session set {' '.join(state_parts)}"
-            cursor = conn.cursor()
-            cursor.execute(sql)
-        conn.tag = requested_tag
-
-
-def _connect_and_drop(pool):
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        cursor.execute("select count(*) from TestNumbers")
-        (count,) = cursor.fetchone()
-        assert count == 10
-
-
-def _connect_and_generate_error(pool, test_env):
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        with test_env.assert_raises_full_code("ORA-01476"):
-            cursor.execute("select 1 / 0 from dual")
-
-
-def _perform_reconfigure_test(
-    test_env,
-    parameter_name,
-    parameter_value,
-    min=3,
-    max=30,
-    increment=4,
-    timeout=5,
-    wait_timeout=5000,
-    stmtcachesize=25,
-    max_lifetime_session=1000,
-    max_sessions_per_shard=3,
-    ping_interval=30,
-    getmode=oracledb.POOL_GETMODE_WAIT,
-    soda_metadata_cache=False,
-):
-    creation_args = dict(
-        min=min,
-        max=max,
-        increment=increment,
-        timeout=timeout,
-        stmtcachesize=stmtcachesize,
-        ping_interval=ping_interval,
-        getmode=getmode,
-    )
-    if test_env.has_client_version(12, 1):
-        creation_args["max_lifetime_session"] = max_lifetime_session
-    if test_env.has_client_version(12, 2):
-        creation_args["wait_timeout"] = wait_timeout
-    if test_env.has_client_version(18, 3):
-        creation_args["max_sessions_per_shard"] = max_sessions_per_shard
-    if test_env.has_client_version(19, 11):
-        creation_args["soda_metadata_cache"] = soda_metadata_cache
-
-    pool = test_env.get_pool(**creation_args)
-    conn = pool.acquire()
-
-    reconfigure_args = {}
-    reconfigure_args[parameter_name] = parameter_value
-    pool.reconfigure(**reconfigure_args)
-    conn.close()
-
-    actual_args = {}
-    for name in creation_args:
-        actual_args[name] = getattr(pool, name)
-    expected_args = creation_args.copy()
-    expected_args.update(reconfigure_args)
-    assert actual_args == expected_args
-
-
-def _verify_connection(conn, expected_user, expected_proxy_user=None):
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select
-            sys_context('userenv', 'session_user'),
-            sys_context('userenv', 'proxy_user')
-        from dual
-        """
-    )
-    actual_user, actual_proxy_user = cursor.fetchone()
-    assert actual_user == expected_user.upper()
-    if expected_proxy_user is not None:
-        expected_proxy_user = expected_proxy_user.upper()
-    assert actual_proxy_user == expected_proxy_user
-
-
-def _verify_create_arg(test_env, arg_name, arg_value, sql):
-    args = {}
-    args[arg_name] = arg_value
-    pool = test_env.get_pool(**args)
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        cursor.execute(sql)
-        (fetched_value,) = cursor.fetchone()
-        assert fetched_value == arg_value
-    pool.close()
-
-
-def test_2400(test_env):
-    "2400 - test getting default pool parameters"
-    pool = test_env.get_pool()
-    assert pool.busy == 0
-    assert pool.dsn == test_env.connect_string
-    assert pool.tnsentry == pool.dsn
-    if test_env.has_client_version(12, 2):
-        assert pool.getmode == oracledb.POOL_GETMODE_WAIT
-        assert pool.getmode is oracledb.PoolGetMode.WAIT
-    assert pool.homogeneous
-    assert pool.increment == 1
-    assert pool.max == 2
-    if test_env.has_client_version(12, 1):
-        assert pool.max_lifetime_session == 0
-    if not pool.thin and test_env.has_client_version(18, 3):
-        assert pool.max_sessions_per_shard == 0
-    assert pool.min == 1
-    if pool.thin:
-        assert pool.name is None
-    else:
-        assert re.search("^OCI:SP:.+", pool.name) is not None
-    assert pool.ping_interval == 60
-    assert pool.stmtcachesize == oracledb.defaults.stmtcachesize
-    if not pool.thin and test_env.has_client_version(19, 11):
-        assert not pool.soda_metadata_cache
-        assert pool.thin == (not test_env.use_thick_mode)
-    assert pool.timeout == 0
-    assert pool.username == test_env.main_user
-
-
-def test_2401(skip_unless_thick_mode, test_env):
-    "2401 - test that proxy authentication is possible"
-    pool = test_env.get_pool(
-        min=2, max=8, increment=3, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    assert pool.homogeneous, "homogeneous should be True by default"
-    with test_env.assert_raises_full_code("DPI-1012"):
-        pool.acquire(user="missing_proxyuser")
-    pool = test_env.get_pool(
-        min=2,
-        max=8,
-        increment=3,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        homogeneous=False,
-    )
-    assert not pool.homogeneous
-    conn = pool.acquire(user=test_env.proxy_user)
-    cursor = conn.cursor()
-    cursor.execute("select user from dual")
-    (user,) = cursor.fetchone()
-    assert user == test_env.proxy_user.upper()
-    conn.close()
-
-
-def test_2402(test_env):
-    "2402 - test setting pool attributes"
-    pool = test_env.get_pool()
-    test_values = [
-        ((11, 2), "ping_interval", 30),
-        ((11, 2), "stmtcachesize", 100),
-        ((11, 2), "timeout", 10),
-        ((12, 2), "getmode", oracledb.POOL_GETMODE_TIMEDWAIT),
-        ((12, 1), "max_lifetime_session", 3),
-    ]
-    for version, attr_name, value in test_values:
-        if test_env.has_client_version(*version):
-            setattr(pool, attr_name, value)
-            assert getattr(pool, attr_name) == value
-            pytest.raises(TypeError, setattr, pool, attr_name, "invalid value")
-
-    if not pool.thin and test_env.has_client_version(18, 3):
-        assert pool.max_sessions_per_shard == 0
-        pytest.raises(
-            TypeError, setattr, pool, "max_sessions_per_shard", "bad_val"
-        )
-
-    if not pool.thin and test_env.has_client_version(19, 11):
-        pool.soda_metadata_cache = True
-        assert pool.soda_metadata_cache
-        pytest.raises(TypeError, setattr, pool, "soda_metadata_cache", 22)
-
-
-def test_2403(test_env):
-    "2403 - connection rolls back before released back to the pool"
-    pool = test_env.get_pool(getmode=oracledb.POOL_GETMODE_WAIT)
-    conn = pool.acquire()
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    cursor.close()
-    pool.release(conn)
-    pool = test_env.get_pool(getmode=oracledb.POOL_GETMODE_WAIT)
-    conn = pool.acquire()
-    cursor = conn.cursor()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 0
-    conn.close()
-
-
-def test_2404(test_env):
-    "2404 - test session pool with multiple threads"
-    pool = test_env.get_pool(
-        min=5, max=20, increment=2, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    threads = []
-    for i in range(20):
-        thread = threading.Thread(None, _connect_and_drop, args=(pool,))
-        threads.append(thread)
-        thread.start()
-    for thread in threads:
-        thread.join()
-
-
-def test_2405(test_env):
-    "2405 - test session pool with multiple threads (with errors)"
-    pool = test_env.get_pool(
-        min=5, max=20, increment=2, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    threads = []
-    for i in range(20):
-        thread = threading.Thread(
-            None, _connect_and_generate_error, args=(pool, test_env)
-        )
-        threads.append(thread)
-        thread.start()
-    for thread in threads:
-        thread.join()
-
-
-def test_2406(skip_if_drcp, test_env):
-    "2406 - test session pool with various types of purity"
-    pool = test_env.get_pool(
-        min=1, max=8, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-
-    # get connection and set the action
-    action = "TEST_ACTION"
-    conn = pool.acquire()
-    conn.action = action
-    cursor = conn.cursor()
-    cursor.execute("select 1 from dual")
-    cursor.close()
-    pool.release(conn)
-    assert pool.opened == 1, "opened (1)"
-
-    # verify that the connection still has the action set on it
-    conn = pool.acquire()
-    cursor = conn.cursor()
-    cursor.execute("select sys_context('userenv', 'action') from dual")
-    (result,) = cursor.fetchone()
-    assert result == action
-    cursor.close()
-    pool.release(conn)
-    assert pool.opened == 1, "opened (2)"
-
-    # get a new connection with new purity (should not have state)
-    conn = pool.acquire(purity=oracledb.ATTR_PURITY_NEW)
-    cursor = conn.cursor()
-    cursor.execute("select sys_context('userenv', 'action') from dual")
-    (result,) = cursor.fetchone()
-    assert result is None
-    cursor.close()
-    pool.release(conn)
-
-
-def test_2407(skip_if_drcp, skip_unless_thick_mode, test_env):
-    "2407 - test heterogeneous pool with user and password specified"
-    pool = test_env.get_pool(
-        min=2,
-        max=8,
-        increment=3,
-        homogeneous=False,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-    )
-    assert pool.homogeneous == 0
-    conn = pool.acquire()
-    _verify_connection(pool.acquire(), test_env.main_user)
-    conn.close()
-    conn = pool.acquire(test_env.main_user, test_env.main_password)
-    _verify_connection(conn, test_env.main_user)
-    conn.close()
-    conn = pool.acquire(test_env.proxy_user, test_env.proxy_password)
-    _verify_connection(conn, test_env.proxy_user)
-    conn.close()
-    user_str = f"{test_env.main_user}[{test_env.proxy_user}]"
-    conn = pool.acquire(user_str, test_env.main_password)
-    assert conn.username == test_env.main_user
-    assert conn.proxy_user == test_env.proxy_user
-    _verify_connection(conn, test_env.proxy_user, test_env.main_user)
-    conn.close()
-
-
-def test_2408(skip_if_drcp, skip_unless_thick_mode, test_env):
-    "2408 - test heterogeneous pool without user and password specified"
-    pool = test_env.get_pool(
-        user="",
-        password="",
-        min=2,
-        max=8,
-        increment=3,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        homogeneous=False,
-    )
-    conn = pool.acquire(test_env.main_user, test_env.main_password)
-    _verify_connection(conn, test_env.main_user)
-    conn.close()
-    conn = pool.acquire(test_env.proxy_user, test_env.proxy_password)
-    _verify_connection(conn, test_env.proxy_user)
-    conn.close()
-    user_str = f"{test_env.main_user}[{test_env.proxy_user}]"
-    conn = pool.acquire(user_str, test_env.main_password)
-    _verify_connection(conn, test_env.proxy_user, test_env.main_user)
-
-
-def test_2409(skip_unless_thick_mode, test_env):
-    "2409 - test heterogeneous pool with wrong password specified"
-    pool = test_env.get_pool(
-        min=2,
-        max=8,
-        increment=3,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        homogeneous=False,
-    )
-    with test_env.assert_raises_full_code("ORA-01017"):
-        pool.acquire(test_env.proxy_user, "this is the wrong password")
-
-
-def test_2410(skip_unless_thick_mode, test_env):
-    "2410 - test tagging a session"
-    pool = test_env.get_pool(
-        min=2, max=8, increment=3, getmode=oracledb.POOL_GETMODE_NOWAIT
-    )
-    tag_mst = "TIME_ZONE=MST"
-    tag_utc = "TIME_ZONE=UTC"
-
-    conn = pool.acquire()
-    assert conn.tag is None
-    pool.release(conn, tag=tag_mst)
-
-    conn = pool.acquire()
-    assert conn.tag is None
-    conn.tag = tag_utc
-    conn.close()
-
-    conn = pool.acquire(tag=tag_mst)
-    assert conn.tag == tag_mst
-    conn.close()
-
-    conn = pool.acquire(tag=tag_utc)
-    assert conn.tag == tag_utc
-    conn.close()
-
-
-def test_2411(skip_unless_thick_mode, test_env):
-    "2411 - test PL/SQL session callbacks"
-    test_env.skip_unless_client_version(12, 2)
-    callback = "pkg_SessionCallback.TheCallback"
-    pool = test_env.get_pool(
-        min=2,
-        max=8,
-        increment=3,
-        session_callback=callback,
-    )
-    tags = [
-        "NLS_DATE_FORMAT=SIMPLE",
-        "NLS_DATE_FORMAT=FULL;TIME_ZONE=UTC",
-        "NLS_DATE_FORMAT=FULL;TIME_ZONE=MST",
-    ]
-    actual_tags = [None, None, "NLS_DATE_FORMAT=FULL;TIME_ZONE=UTC"]
-
-    # truncate PL/SQL session callback log
-    conn = pool.acquire()
-    cursor = conn.cursor()
-    cursor.execute("truncate table PLSQLSessionCallbacks")
-    conn.close()
-
-    # request sessions with each of the first two tags
-    for tag in tags[:2]:
-        conn = pool.acquire(tag=tag)
-        conn.close()
-
-    # for the last tag, use the matchanytag flag
-    conn = pool.acquire(tag=tags[2], matchanytag=True)
-    conn.close()
-
-    # verify the PL/SQL session callback log is accurate
-    conn = pool.acquire()
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        select RequestedTag, ActualTag
-        from PLSQLSessionCallbacks
-        order by FixupTimestamp
-        """
-    )
-    results = cursor.fetchall()
-    expected_results = list(zip(tags, actual_tags))
-    assert results == expected_results
-    conn.close()
-
-
-def test_2412(skip_unless_thick_mode, test_env):
-    "2412 - testTagging with Invalid key"
-    pool = test_env.get_pool(getmode=oracledb.POOL_GETMODE_NOWAIT)
-    conn = pool.acquire()
-    pytest.raises(TypeError, pool.release, conn, tag=12345)
-    if test_env.has_client_version(12, 2):
-        with test_env.assert_raises_full_code("ORA-24488"):
-            pool.release(conn, tag="INVALID_TAG")
-
-
-def test_2413(test_env):
-    "2413 - test dropping/closing a connection from the pool"
-    pool = test_env.get_pool(min=1, max=5, increment=2)
-    conns1 = [pool.acquire() for _ in range(2)]
-    conns2 = [oracledb.connect(pool=pool) for _ in range(3)]
-    assert pool.busy == 5
-    assert pool.opened == 5
-
-    for conn in conns1:
-        pool.drop(conn)
-    assert pool.busy == 3
-    assert pool.opened == 3
-
-    for conn in conns2:
-        conn.close()
-    assert pool.busy == 0
-    assert pool.opened == 3
-
-
-def test_2414(test_env):
-    "2414 - test to ensure pure connections are being created correctly"
-    pool = test_env.get_pool(
-        min=1, max=2, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    conn1 = pool.acquire()
-    conn2 = pool.acquire()
-    assert pool.opened == 2, "opened (1)"
-    pool.release(conn1)
-    pool.release(conn2)
-    conn3 = pool.acquire(purity=oracledb.ATTR_PURITY_NEW)
-    assert pool.opened == 2, "opened (2)"
-    pool.release(conn3)
-
-
-def test_2415(skip_unless_thick_mode, test_env):
-    "2415 - test the reconfigure values are changed and rest unchanged"
-    _perform_reconfigure_test(test_env, "min", 5)
-    _perform_reconfigure_test(test_env, "max", 20)
-    _perform_reconfigure_test(test_env, "increment", 5)
-    _perform_reconfigure_test(test_env, "timeout", 10)
-    _perform_reconfigure_test(test_env, "stmtcachesize", 40)
-    _perform_reconfigure_test(test_env, "ping_interval", 50)
-    _perform_reconfigure_test(
-        test_env, "getmode", oracledb.POOL_GETMODE_NOWAIT
-    )
-    if test_env.has_client_version(12, 1):
-        _perform_reconfigure_test(test_env, "max_lifetime_session", 2000)
-    if test_env.has_client_version(12, 2):
-        _perform_reconfigure_test(test_env, "wait_timeout", 8000)
-    if test_env.has_client_version(18, 3):
-        _perform_reconfigure_test(test_env, "max_sessions_per_shard", 5)
-    if test_env.has_client_version(19, 11):
-        _perform_reconfigure_test(test_env, "soda_metadata_cache", True)
-
-
-def test_2417(skip_unless_thick_mode, test_env):
-    "2417 - test that session callbacks are being called correctly"
-    callback_obj = CallableSessionCallback()
-
-    pool = test_env.get_pool(
-        min=2,
-        max=5,
-        increment=1,
-        session_callback=callback_obj,
-    )
-
-    # new connection with a tag should invoke the session callback
-    with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-        cursor = conn.cursor()
-        cursor.execute("select to_char(2021-05-20) from dual")
-        (result,) = cursor.fetchone()
-        assert callback_obj.session_called
-
-    # acquiring a connection with the same tag should not invoke the
-    # session callback
-    callback_obj.session_called = False
-    with pool.acquire(tag="NLS_DATE_FORMAT=SIMPLE") as conn:
-        cursor = conn.cursor()
-        cursor.execute("select to_char(2021-05-20) from dual")
-        (result,) = cursor.fetchone()
-        assert not callback_obj.session_called
-
-    # acquiring a connection with a new tag should invoke the session
-    # callback
-    callback_obj.session_called = False
-    with pool.acquire(tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=UTC") as conn:
-        cursor = conn.cursor()
-        cursor.execute("select to_char(current_date) from dual")
-        (result,) = cursor.fetchone()
-        assert callback_obj.session_called
-
-    # acquiring a connection with a new tag and specifying that a
-    # connection with any tag can be acquired should invoke the session
-    # callback
-    callback_obj.session_called = False
-    with pool.acquire(
-        tag="NLS_DATE_FORMAT=FULL;TIME_ZONE=MST", matchanytag=True
-    ) as conn:
-        cursor = conn.cursor()
-        cursor.execute("select to_char(current_date) from dual")
-        (result,) = cursor.fetchone()
-        assert callback_obj.session_called
-
-    # new connection with no tag should invoke the session callback
-    callback_obj.session_called = False
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        cursor.execute("select to_char(current_date) from dual")
-        (result,) = cursor.fetchone()
-        assert callback_obj.session_called
-
-
-def test_2418(test_env):
-    "2418 - test closing a pool normally with no connections checked out"
-    pool = test_env.get_pool(
-        min=1, max=8, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    pool.close()
-
-
-def test_2419(test_env):
-    "2419 - test closing a pool normally with connections checked out"
-    pool = test_env.get_pool(
-        min=1, max=8, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    with pool.acquire():
-        with test_env.assert_raises_full_code("DPY-1005"):
-            pool.close()
-
-
-def test_2420(test_env):
-    "2420 - test closing a pool forcibly"
-    pool = test_env.get_pool(
-        min=1, max=8, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    with pool.acquire():
-        pool.close(force=True)
-
-
-def test_2421(test_env):
-    "2421 - using the pool after it is closed raises an exception"
-    pool = test_env.get_pool(
-        min=1, max=8, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    pool.close()
-    with test_env.assert_raises_full_code("DPY-1002"):
-        pool.acquire()
-
-
-def test_2422(test_env):
-    "2422 - using the pool beyond max limit raises an error"
-    if not test_env.has_client_version(19):
-        pytest.skip("not supported on this client")
-    pool = test_env.get_pool(
-        min=1, max=2, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    with pool.acquire(), pool.acquire():
-        pool.getmode = oracledb.POOL_GETMODE_NOWAIT
-        with test_env.assert_raises_full_code("DPY-4005"):
-            pool.acquire()
-
-
-def test_2423(test_env):
-    "2423 - callable session callback is executed for new connections"
-
-    class Counter:
-        num_calls = 0
-
-        @classmethod
-        def session_callback(cls, conn, requested_tag):
-            cls.num_calls += 1
-
-    pool = test_env.get_pool(
-        min=1,
-        max=2,
-        increment=1,
-        session_callback=Counter.session_callback,
-    )
-    with pool.acquire(), pool.acquire():
-        pass
-    with pool.acquire(), pool.acquire():
-        pass
-    assert Counter.num_calls == 2
-
-
-def test_2424(skip_if_drcp, admin_conn, test_env):
-    "2424 - drop the pooled connection on receiving dead connection error"
-    test_env.skip_unless_server_version(19)
-    pool = test_env.get_pool(min=2, max=2, increment=2)
-
-    # acquire connections from the pool and kill all the sessions
-    with admin_conn.cursor() as admin_cursor:
-        for conn in [pool.acquire() for i in range(2)]:
-            sid, serial = test_env.get_sid_serial(conn)
-            sql = f"alter system kill session '{sid},{serial}'"
-            admin_cursor.execute(sql)
-            conn.close()
-    assert pool.opened == 2
-
-    # when try to re-use the killed sessions error will be raised;
-    # release all such connections
-    for conn in [pool.acquire() for i in range(2)]:
-        with conn.cursor() as cursor:
-            with test_env.assert_raises_full_code("DPY-4011"):
-                cursor.execute("select user from dual")
-        conn.close()
-
-    # if a free connection is available, it can be used; otherwise a new
-    # connection will be created
-    for conn in [pool.acquire() for i in range(2)]:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == test_env.main_user.upper()
-        conn.close()
-    assert pool.opened == 2
-
-
-def test_2425(test_env):
-    "2425 - acquire a connection from an empty pool (min=0)"
-    pool = test_env.get_pool(min=0, max=2, increment=2)
-    with pool.acquire() as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (result,) = cursor.fetchone()
-            assert result == test_env.main_user.upper()
-
-
-def test_2426(test_env):
-    "2426 - get different object types from different connections"
-    pool = test_env.get_pool(min=1, max=2, increment=1)
-    with pool.acquire() as conn:
-        typ = conn.gettype("UDT_SUBOBJECT")
-        assert typ.name == "UDT_SUBOBJECT"
-    with pool.acquire() as conn:
-        typ = conn.gettype("UDT_OBJECTARRAY")
-        assert typ.name == "UDT_OBJECTARRAY"
-
-
-def test_2427(test_env):
-    "2427 - test creating a pool using a proxy user"
-    user_str = f"{test_env.main_user}[{test_env.proxy_user}]"
-    pool = test_env.get_pool(user=user_str)
-    _verify_connection(pool.acquire(), test_env.proxy_user, test_env.main_user)
-
-
-def test_2428(skip_if_drcp, test_env):
-    "2428 - test acquiring conn from pool in LIFO order"
-    pool = test_env.get_pool(
-        min=5, max=10, increment=1, getmode=oracledb.POOL_GETMODE_WAIT
-    )
-    sql = "select sys_context('userenv', 'sid') from dual"
-    conns = [pool.acquire() for i in range(3)]
-    sids = [conn.cursor().execute(sql).fetchone()[0] for conn in conns]
-
-    conns[1].close()
-    conns[2].close()
-    conns[0].close()
-
-    conn = pool.acquire()
-    sid = conn.cursor().execute(sql).fetchone()[0]
-    assert sid == sids[0], "not LIFO"
-
-
-def test_2429(test_env):
-    "2429 - verify that dynamic pool cannot have an increment of zero"
-    pool = test_env.get_pool(min=1, max=3, increment=0)
-    assert pool.increment == 1
-    with pool.acquire(), pool.acquire():
-        pass
-
-
-def test_2430(test_env):
-    "2430 - verify that static pool can have an increment of zero"
-    pool = test_env.get_pool(min=1, max=1, increment=0)
-    assert pool.increment == 0
-    with pool.acquire():
-        pass
-
-
-def test_2431(test_env):
-    "2431 - verify that connection with different cclass is reused"
-    test_env.skip_unless_server_version(19)
-    cclass = "cclass2431"
-    pool = test_env.get_pool(min=1, max=1)
-    # ignore the first acquire which, depending on the speed with which the
-    # minimum connections are created, may create a connection that is
-    # discarded; instead, use the second acquire which should remain in the
-    # pool
-    with pool.acquire(cclass=cclass) as conn:
-        pass
-    with pool.acquire(cclass=cclass) as conn:
-        sid_serial = test_env.get_sid_serial(conn)
-    with pool.acquire(cclass=cclass) as conn:
-        next_sid_serial = test_env.get_sid_serial(conn)
-        assert next_sid_serial == sid_serial
-    assert pool.opened == 1
-
-
-def test_2432(test_env):
-    "2432 - test creating a pool invalid params"
-    with test_env.assert_raises_full_code("DPY-2027"):
-        oracledb.create_pool(params="bad params")
-
-
-def test_2433(test_env):
-    "2433 - test releasing and dropping an invalid connection"
-    pool = test_env.get_pool()
-    pytest.raises(TypeError, pool.release, ["invalid connection"])
-    pytest.raises(TypeError, pool.drop, ["invalid connection"])
-
-
-def test_2434(test_env):
-    "2434 - test creating a pool with invalid pool_class"
-    with test_env.assert_raises_full_code("DPY-2026"):
-        oracledb.create_pool(pool_class=int)
-
-
-def test_2435(test_env):
-    "2435 - test creating a pool with a subclassed connection type"
-
-    class MyConnection(oracledb.Connection):
-        pass
-
-    pool = test_env.get_pool(connectiontype=MyConnection)
-    with pool.acquire() as conn:
-        assert isinstance(conn, MyConnection)
-
-
-def test_2436(test_env):
-    "2436 - test creating a pool with a subclassed pool type"
-
-    class MyPool(oracledb.ConnectionPool):
-        pass
-
-    pool = test_env.get_pool(pool_class=MyPool)
-    assert isinstance(pool, MyPool)
-
-
-def test_2437(test_env):
-    "2437 - test connectiontype with an invalid connection class"
-    with test_env.assert_raises_full_code("DPY-2023"):
-        test_env.get_pool(connectiontype=oracledb.AsyncConnection)
-    with test_env.assert_raises_full_code("DPY-2023"):
-        test_env.get_pool(connectiontype=int)
-
-
-def test_2438(skip_unless_pool_timed_wait_supported, test_env):
-    "2438 - ensure that timed wait times out with appropriate exception"
-    pool = test_env.get_pool(
-        getmode=oracledb.POOL_GETMODE_TIMEDWAIT, min=0, wait_timeout=1
-    )
-    with test_env.assert_raises_full_code("DPY-4005"):
-        pool.acquire()
-
-
-def test_2439(skip_unless_call_timeout_supported, test_env):
-    "2439 - ensure call timeout is reset on connections returned by pool"
-    pool = test_env.get_pool(ping_timeout=1000, ping_interval=0)
-    with pool.acquire() as conn:
-        assert conn.call_timeout == 0
-    with pool.acquire() as conn:
-        assert conn.call_timeout == 0
-
-
-def test_2440(test_env):
-    "2440 - test connection with an invalid pool"
-    with pytest.raises(TypeError):
-        oracledb.connect(pool="not a pool object")
-
-
-def test_2441(test_env):
-    "2441 - test oracledb.POOL_GETMODE_FORCEGET"
-    pool = test_env.get_pool(
-        min=1, max=3, increment=1, getmode=oracledb.POOL_GETMODE_FORCEGET
-    )
-    num_conns = 10
-    active_sessions = set()
-    conns = [pool.acquire() for _ in range(num_conns)]
-    for conn in conns:
-        active_sessions.add(test_env.get_sid_serial(conn))
-    assert pool.opened == num_conns
-    assert pool.busy == num_conns
-    assert len(active_sessions) == num_conns
-
-
-def test_2442(skip_unless_thin_mode, test_env):
-    "2442 - test passing program when creating a pool"
-    sql = (
-        "select program from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_create_arg(test_env, "program", "newprogram", sql)
-
-
-def test_2443(skip_unless_thin_mode, test_env):
-    "2443 - test passing machine when creating a pool"
-    sql = (
-        "select machine from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_create_arg(test_env, "machine", "newmachine", sql)
-
-
-def test_2444(skip_unless_thin_mode, test_env):
-    "2444 - test passing terminal when creating a pool"
-    sql = (
-        "select terminal from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_create_arg(test_env, "terminal", "newterminal", sql)
-
-
-def test_2445(skip_unless_thin_mode, test_env):
-    "2445 - test passing osuser when creating a pool"
-    sql = (
-        "select osuser from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_create_arg(test_env, "osuser", "newosuser", sql)
-
-
-def test_2446(test_env):
-    "2446 - test passing driver_name when creating a pool"
-    sql = (
-        "select distinct client_driver from v$session_connect_info "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    _verify_create_arg(test_env, "driver_name", "newdriver", sql)
-
-
-def test_2447(skip_unless_thin_mode, test_env):
-    "2447 - test register_parameter with pooled connection"
-    sdu = 4096
-    params = test_env.get_pool_params()
-    protocol = "proto-test"
-    orig_connect_string = test_env.connect_string
-    connect_string = f"{protocol}://{orig_connect_string}"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        assert passed_protocol == protocol
-        assert passed_protocol_arg == orig_connect_string
-        passed_params.parse_connect_string(passed_protocol_arg)
-        passed_params.set(sdu=sdu)
-
-    try:
-        oracledb.register_protocol(protocol, hook)
-        pool = oracledb.create_pool(dsn=connect_string, params=params)
-        assert params.sdu == sdu
-        with pool.acquire():
-            pass
-        pool.close()
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_2448(test_env):
-    "2448 - test create_pool() with edition"
-    edition = test_env.edition_name
-    pool = test_env.get_pool(edition=edition)
-    conn = pool.acquire()
-    assert conn.edition == edition
-
-
-def test_2449(test_env):
-    "2449 - test create_pool() and get_pool() with alias"
-    alias = "pool_alias_2449"
-    pool = test_env.get_pool(pool_alias=alias)
-    assert pool is oracledb.get_pool(alias)
-    pool.close()
-
-
-def test_2450(test_env):
-    "2450 - test create_pool() twice with the same alias"
-    alias = "pool_alias_2450"
-    pool = test_env.get_pool(pool_alias=alias)
-    with test_env.assert_raises_full_code("DPY-2055"):
-        test_env.get_pool(pool_alias=alias)
-    pool.close()
-    assert oracledb.get_pool(alias) is None
-
-
-def test_2451(test_env):
-    "2451 - test connect() with pool alias"
-    alias = "pool_alias_2451"
-    pool = test_env.get_pool(pool_alias=alias)
-    with test_env.assert_raises_full_code("DPY-2014"):
-        test_env.get_connection(pool=pool, pool_alias=alias)
-    with oracledb.connect(pool_alias=alias) as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (value,) = cursor.fetchone()
-            assert value == test_env.main_user.upper()
-    pool.close()
-    with test_env.assert_raises_full_code("DPY-2054"):
-        oracledb.connect(pool_alias=alias)
-
-
-def test_2452(test_env):
-    "2452 - test acquire() with pool alias and stmtcachesize"
-    alias = "pool_2452"
-    stmtcachesize = 35
-    test_env.get_pool(pool_alias=alias, stmtcachesize=stmtcachesize)
-    with oracledb.connect(pool_alias=alias) as conn:
-        assert conn.stmtcachesize == stmtcachesize
-    oracledb.get_pool(alias).close()
-
-
-def test_2453(test_env):
-    "2453 - test pool alias is case sensitive"
-    alias = "pool_2458"
-    test_env.get_pool(pool_alias=alias)
-    assert oracledb.get_pool(alias.upper()) is None
-    with test_env.assert_raises_full_code("DPY-2054"):
-        test_env.get_connection(pool_alias=alias.upper())
-    oracledb.get_pool(alias).close()
-
-
-def test_2454(test_env):
-    "2454 - test pool alias with invalid types"
-    aliases = [5, set(), dict(), bytearray(1)]
-    for alias in aliases:
-        with pytest.raises(TypeError):
-            test_env.get_pool(pool_alias=alias)
-
-
-def test_2455(test_env):
-    "2455 - test create_pool() with parameters hook"
-    pool = test_env.get_pool()
-    with pool.acquire() as conn:
-        orig_stmtcachesize = conn.stmtcachesize
-        stmtcachesize = orig_stmtcachesize + 10
-    pool.close()
-
-    def hook(params):
-        params.set(stmtcachesize=stmtcachesize)
-
-    try:
-        oracledb.register_params_hook(hook)
-        pool = test_env.get_pool()
-        with pool.acquire() as conn:
-            assert conn.stmtcachesize == stmtcachesize
-        pool.close()
-    finally:
-        oracledb.unregister_params_hook(hook)
-
-    pool = test_env.get_pool()
-    with pool.acquire() as conn:
-        assert conn.stmtcachesize == orig_stmtcachesize
-    pool.close()
-
-
-def test_2456(test_env):
-    "2456 - test creation of pool with min > max"
-    with test_env.assert_raises_full_code("DPY-2064"):
-        test_env.get_pool(min=3, max=2)
-
-
-def test_2457(skip_if_drcp, test_env):
-    "2457 - ping pooled connection on receiving dead connection error"
-    test_env.skip_unless_server_version(18)
-    admin_conn = test_env.get_admin_connection()
-    pool = test_env.get_pool(min=1, max=1, ping_interval=0)
-
-    # kill connection in pool
-    with admin_conn.cursor() as admin_cursor:
-        with pool.acquire() as conn:
-            sid, serial = test_env.get_sid_serial(conn)
-            sql = f"alter system kill session '{sid},{serial}'"
-            admin_cursor.execute(sql)
-
-    # acquire connection which should succeed without failure
-    with pool.acquire() as conn:
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-            (user,) = cursor.fetchone()
-            assert user == test_env.main_user.upper()
-
-
-def test_2458(test_env):
-    "2458 - connection to database with bad password"
-    with test_env.assert_raises_full_code("ORA-01017"):
-        pool = test_env.get_pool(password=test_env.main_password + "X")
-        pool.acquire()
diff --git a/tests/test_2500_string_var.py b/tests/test_2500_string_var.py
deleted file mode 100644
index fb450e25..00000000
--- a/tests/test_2500_string_var.py
+++ /dev/null
@@ -1,595 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2500 - Module for testing string variables
-"""
-
-import random
-import string
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        string_col = f"String {i}"
-        fixed_char_col = f"Fixed Char {i}".ljust(40)
-        raw_col = f"Raw {i}".encode("ascii")
-        if i % 2:
-            nullable_col = f"Nullable {i}"
-        else:
-            nullable_col = None
-        data_tuple = (i, string_col, raw_col, fixed_char_col, nullable_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def return_strings_as_bytes(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-        return cursor.var(str, arraysize=cursor.arraysize, bypass_decode=True)
-
-
-def test_2500(cursor):
-    "2500 - test creating array var and then increasing the internal size"
-    val = ["12345678901234567890"] * 3
-    var = cursor.arrayvar(str, len(val), 4)
-    var.setvalue(0, val)
-    assert var.getvalue() == val
-
-
-def test_2501(cursor, module_data_by_key):
-    "2501 - test binding in a string"
-    cursor.execute(
-        "select * from TestStrings where StringCol = :value",
-        value="String 5",
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_2502(cursor):
-    "2502 - test binding a different variable on second execution"
-    retval_1 = cursor.var(oracledb.STRING, 30)
-    retval_2 = cursor.var(oracledb.STRING, 30)
-    cursor.execute("begin :retval := 'Called'; end;", retval=retval_1)
-    assert retval_1.getvalue() == "Called"
-    cursor.execute("begin :retval := 'Called'; end;", retval=retval_2)
-    assert retval_2.getvalue() == "Called"
-
-
-def test_2503(cursor):
-    "2503 - test exceeding the number of elements returns IndexError"
-    var = cursor.var(str)
-    pytest.raises(IndexError, var.getvalue, 1)
-
-
-def test_2504(cursor, module_data_by_key):
-    "2504 - test binding in a string after setting input sizes to a number"
-    cursor.setinputsizes(value=oracledb.NUMBER)
-    cursor.execute(
-        "select * from TestStrings where StringCol = :value",
-        value="String 6",
-    )
-    assert cursor.fetchall() == [module_data_by_key[6]]
-
-
-def test_2505(cursor, module_data):
-    "2505 - test binding in a string array"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = [r[1] for r in module_data]
-    statement = """
-            begin
-                :return_value := pkg_TestStringArrays.TestInArrays(
-                    :integer_value, :array);
-            end;"""
-    cursor.execute(
-        statement, return_value=return_value, integer_value=5, array=array
-    )
-    assert return_value.getvalue() == 86
-    array = [f"String - {i}" for i in range(15)]
-    cursor.execute(statement, integer_value=8, array=array)
-    assert return_value.getvalue() == 163
-
-
-def test_2506(cursor, module_data):
-    "2506 - test binding in a string array (with setinputsizes)"
-    return_value = cursor.var(oracledb.NUMBER)
-    cursor.setinputsizes(array=[oracledb.STRING, 10])
-    array = [r[1] for r in module_data]
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestStringArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        return_value=return_value,
-        integer_value=6,
-        array=array,
-    )
-    assert return_value.getvalue() == 87
-
-
-def test_2507(cursor, module_data):
-    "2507 - test binding in a string array (with arrayvar)"
-    return_value = cursor.var(oracledb.NUMBER)
-    array = cursor.arrayvar(oracledb.STRING, 10, 20)
-    array.setvalue(0, [r[1] for r in module_data])
-    cursor.execute(
-        """
-        begin
-            :return_value := pkg_TestStringArrays.TestInArrays(
-                :integer_value, :array);
-        end;
-        """,
-        return_value=return_value,
-        integer_value=7,
-        array=array,
-    )
-    assert return_value.getvalue() == 88
-
-
-def test_2508(cursor, module_data):
-    "2508 - test binding in/out a string array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.STRING, 10, 100)
-    original_data = [r[1] for r in module_data]
-    expected_data = [
-        "Converted element # %d originally had length %d"
-        % (i, len(original_data[i - 1]))
-        for i in range(1, 6)
-    ] + original_data[5:]
-    array.setvalue(0, original_data)
-    cursor.execute(
-        """
-        begin
-            pkg_TestStringArrays.TestInOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=5,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2509(cursor):
-    "2509 - test binding out a string array (with arrayvar)"
-    array = cursor.arrayvar(oracledb.STRING, 6, 100)
-    expected_data = [f"Test out element # {i}" for i in range(1, 7)]
-    cursor.execute(
-        """
-        begin
-            pkg_TestStringArrays.TestOutArrays(:num_elems, :array);
-        end;
-        """,
-        num_elems=6,
-        array=array,
-    )
-    assert array.getvalue() == expected_data
-
-
-def test_2510(cursor, module_data_by_key):
-    "2510 - test binding in a raw"
-    cursor.setinputsizes(value=oracledb.BINARY)
-    cursor.execute(
-        "select * from TestStrings where RawCol = :value",
-        value="Raw 4".encode(),
-    )
-    assert cursor.fetchall() == [module_data_by_key[4]]
-
-
-def test_2511(cursor, module_data_by_key):
-    "2511 - test binding (and fetching) a rowid"
-    cursor.execute("select rowid from TestStrings where IntCol = 3")
-    (rowid,) = cursor.fetchone()
-    cursor.execute(
-        "select * from TestStrings where rowid = :value",
-        value=rowid,
-    )
-    assert cursor.fetchall() == [module_data_by_key[3]]
-
-
-def test_2513(cursor):
-    "2513 - test binding in a null"
-    cursor.execute(
-        "select * from TestStrings where StringCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_2514(cursor):
-    "2514 - test binding out with set input sizes defined (by type)"
-    bind_vars = cursor.setinputsizes(value=oracledb.STRING)
-    cursor.execute(
-        """
-        begin
-            :value := 'TSI';
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == "TSI"
-
-
-def test_2515(cursor):
-    "2515 - test binding out with set input sizes defined (by integer)"
-    bind_vars = cursor.setinputsizes(value=30)
-    cursor.execute(
-        """
-        begin
-            :value := 'TSI (I)';
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == "TSI (I)"
-
-
-def test_2516(cursor):
-    "2516 - test binding in/out with set input sizes defined (by type)"
-    bind_vars = cursor.setinputsizes(value=oracledb.STRING)
-    cursor.execute(
-        """
-        begin
-            :value := :value || ' TSI';
-        end;
-        """,
-        value="InVal",
-    )
-    assert bind_vars["value"].getvalue() == "InVal TSI"
-
-
-def test_2517(cursor):
-    "2517 - test binding in/out with set input sizes defined (by integer)"
-    bind_vars = cursor.setinputsizes(value=30)
-    cursor.execute(
-        """
-        begin
-            :value := :value || ' TSI (I)';
-        end;
-        """,
-        value="InVal",
-    )
-    assert bind_vars["value"].getvalue() == "InVal TSI (I)"
-
-
-def test_2518(cursor):
-    "2518 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.STRING)
-    cursor.execute(
-        """
-        begin
-            :value := 'TSI (VAR)';
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == "TSI (VAR)"
-
-
-def test_2519(cursor):
-    "2519 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.STRING)
-    var.setvalue(0, "InVal")
-    cursor.execute(
-        """
-        begin
-            :value := :value || ' TSI (VAR)';
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == "InVal TSI (VAR)"
-
-
-def test_2520(cursor):
-    "2520 - test that binding a long string succeeds"
-    cursor.setinputsizes(big_string=oracledb.DB_TYPE_LONG)
-    cursor.execute(
-        """
-        declare
-            t_Temp varchar2(20000);
-        begin
-            t_Temp := :big_string;
-        end;
-        """,
-        big_string="X" * 10000,
-    )
-
-
-def test_2521(cursor):
-    "2521 - test that setinputsizes() returns a long variable"
-    var = cursor.setinputsizes(test=90000)["test"]
-    in_string = "1234567890" * 9000
-    var.setvalue(0, in_string)
-    out_string = var.getvalue()
-    msg = (
-        f"output does not match: in was {len(in_string)}, "
-        f"out was {len(out_string)}"
-    )
-    assert in_string == out_string, msg
-
-
-def test_2522(cursor, test_env):
-    "2522 - test cursor description is accurate"
-    cursor.execute("select * from TestStrings")
-    varchar_ratio, nvarchar_ratio = test_env.charset_ratios
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "STRINGCOL",
-            oracledb.DB_TYPE_VARCHAR,
-            20,
-            20 * varchar_ratio,
-            None,
-            None,
-            False,
-        ),
-        ("RAWCOL", oracledb.DB_TYPE_RAW, 30, 30, None, None, False),
-        (
-            "FIXEDCHARCOL",
-            oracledb.DB_TYPE_CHAR,
-            40,
-            40 * varchar_ratio,
-            None,
-            None,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_VARCHAR,
-            50,
-            50 * varchar_ratio,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2523(cursor, module_data):
-    "2523 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestStrings order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_2524(cursor, module_data):
-    "2524 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestStrings order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_2525(cursor, module_data_by_key):
-    "2525 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestStrings
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_2526(conn, cursor, test_env):
-    "2526 - test binding and fetching supplemental charcters"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-    supplemental_chars = (
-        "𠜎 𠜱 𠝹 𠱓 𠱸 𠲖 𠳏 𠳕 𠴕 𠵼 𠵿 𠸎 𠸏 "
-        "𠹷 𠺝 𠺢 𠻗 𠻹 𠻺 𠼭 𠼮 𠽌 𠾴 𠾼 𠿪 𡁜 "
-        "𡁯 𡁵 𡁶 𡁻 𡃁 𡃉 𡇙 𢃇 𢞵 𢫕 𢭃 𢯊 𢱑 "
-        "𢱕 𢳂 𢴈 𢵌 𢵧 𢺳 𣲷 𤓓 𤶸 𤷪 𥄫 𦉘 𦟌 "
-        "𦧲 𦧺 𧨾 𨅝 𨈇 𨋢 𨳊 𨳍 𨳒 𩶘"
-    )
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        (1, supplemental_chars),
-    )
-    conn.commit()
-    cursor.execute("select StringCol1 from TestTempTable")
-    (value,) = cursor.fetchone()
-    assert value == supplemental_chars
-
-
-def test_2527(conn, cursor):
-    "2527 - test binding twice with a larger string the second time"
-    cursor.execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    short_string = "short string"
-    long_string = "long string " * 30
-    cursor.execute(sql, (1, short_string))
-    cursor.execute(sql, (2, long_string))
-    conn.commit()
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == [(1, short_string), (2, long_string)]
-
-
-def test_2528(conn, test_env):
-    "2528 - test issue 50 - avoid error ORA-24816"
-    if not test_env.has_server_version(12, 2):
-        pytest.skip("not supported on this server")
-
-    cursor = conn.cursor()
-    try:
-        cursor.execute("drop table issue_50 purge")
-    except oracledb.DatabaseError:
-        pass
-    cursor.execute(
-        """
-        create table issue_50 (
-            Id          number(11) primary key,
-            Str1        nvarchar2(256),
-            Str2        nvarchar2(256),
-            Str3        nvarchar2(256),
-            NClob1      nclob,
-            NClob2      nclob
-        )
-        """
-    )
-    id_var = cursor.var(oracledb.NUMBER)
-    cursor.execute(
-        """
-        insert into issue_50 (Id, Str2, Str3, NClob1, NClob2, Str1)
-        values (:arg0, :arg1, :arg2, :arg3, :arg4, :arg5)
-        returning id into :arg6
-        """,
-        [1, "555a4c78", "f319ef0e", "23009914", "", "", id_var],
-    )
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        insert into issue_50 (Id, Str2, Str3, NClob1, NClob2, Str1)
-        values (:arg0, :arg1, :arg2, :arg3, :arg4, :arg5)
-        returning id into :arg6
-        """,
-        [2, "d5ff845a", "94275767", "bf161ff6", "", "", id_var],
-    )
-    cursor.execute("drop table issue_50 purge")
-
-
-def test_2529(cursor, test_env):
-    "2529 - test assigning a string to rowid"
-    var = cursor.var(oracledb.ROWID)
-    with test_env.assert_raises_full_code("DPY-3004"):
-        var.setvalue(0, "ABDHRYTHFJGKDKKDH")
-
-
-def test_2530(cursor):
-    "2530 - test fetching XMLType (< 1K) as a string"
-    cursor.execute(
-        """
-        select XMLElement("string", stringCol) as xml
-        from TestStrings
-        where intCol = 1
-        """
-    )
-    (actual_value,) = cursor.fetchone()
-    assert actual_value == "<string>String 1</string>"
-    assert cursor.description == [
-        ("XML", oracledb.DB_TYPE_XMLTYPE, None, None, None, None, True)
-    ]
-
-
-def test_2531(cursor):
-    "2531 - test inserting and fetching XMLType (1K) as a string"
-    cursor.execute("truncate table TestTempXML")
-    chars = string.ascii_uppercase + string.ascii_lowercase
-    random_string = "".join(random.choice(chars) for _ in range(1024))
-    int_val = 2531
-    xml_string = f"<data>{random_string}</data>"
-    cursor.execute(
-        "insert into TestTempXML (IntCol, XMLCol) values (:1, :2)",
-        (int_val, xml_string),
-    )
-    cursor.execute(
-        "select XMLCol from TestTempXML where intCol = :1",
-        [int_val],
-    )
-    (actual_value,) = cursor.fetchone()
-    assert actual_value.strip() == xml_string
-
-
-def test_2532(cursor, module_data):
-    "2532 - fetching null and not null values can use optimised path"
-    sql = """
-            select * from TestStrings
-            where IntCol between :start_value and :end_value"""
-    cursor.execute(sql, start_value=2, end_value=5)
-    assert cursor.fetchall() == module_data[1:5]
-    cursor.execute(sql, start_value=5, end_value=8)
-    assert cursor.fetchall() == module_data[4:8]
-    cursor.execute(sql, start_value=8, end_value=10)
-    assert cursor.fetchall() == module_data[7:10]
-
-
-def test_2533(conn, cursor):
-    "2533 - test bypass string decode"
-    cursor.execute("truncate table TestTempTable")
-    string_val = "I bought a cafetière on the Champs-Élysées"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    with conn.cursor() as cursor:
-        cursor.execute(sql, (1, string_val))
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchone() == (1, string_val)
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = return_strings_as_bytes
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchone() == (1, string_val.encode())
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = None
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchone() == (1, string_val)
-
-
-def test_2534(skip_unless_thin_mode, conn, cursor):
-    "2534 - test inserting and fetching XMLType (32K) as a string"
-    cursor.execute("truncate table TestTempXML")
-    chars = string.ascii_uppercase + string.ascii_lowercase
-    random_string = "".join(random.choice(chars) for _ in range(32768))
-    int_val = 2534
-    xml_string = f"<data>{random_string}</data>"
-    lob = conn.createlob(oracledb.DB_TYPE_CLOB)
-    lob.write(xml_string)
-    cursor.execute(
-        """
-        insert into TestTempXML (IntCol, XMLCol)
-        values (:1, sys.xmltype(:2))
-        """,
-        (int_val, lob),
-    )
-    cursor.execute(
-        "select XMLCol from TestTempXML where intCol = :1",
-        [int_val],
-    )
-    (actual_value,) = cursor.fetchone()
-    assert actual_value.strip() == xml_string
diff --git a/tests/test_2600_timestamp_var.py b/tests/test_2600_timestamp_var.py
deleted file mode 100644
index cb8b899d..00000000
--- a/tests/test_2600_timestamp_var.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2600 - Module for testing timestamp variables
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        base_date = datetime.datetime(2002, 12, 9)
-        date_interval = datetime.timedelta(days=i)
-        date_value = base_date + date_interval
-        str_value = str(i * 50)
-        fsecond = int(str_value + "0" * (6 - len(str_value)))
-        date_col = datetime.datetime(
-            date_value.year,
-            date_value.month,
-            date_value.day,
-            date_value.hour,
-            date_value.minute,
-            i * 2,
-            fsecond,
-        )
-        if i % 2:
-            date_interval = datetime.timedelta(days=i + 1)
-            date_value = base_date + date_interval
-            str_value = str(i * 125)
-            fsecond = int(str_value + "0" * (6 - len(str_value)))
-            nullable_col = datetime.datetime(
-                date_value.year,
-                date_value.month,
-                date_value.day,
-                date_value.hour,
-                date_value.minute,
-                i * 3,
-                fsecond,
-            )
-        else:
-            nullable_col = None
-        precision_col = datetime.datetime(2009, 12, 14)
-        data_tuple = (i, date_col, nullable_col, precision_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_2600(cursor, module_data_by_key):
-    "2600 - test binding in a timestamp"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        "select * from TestTimestamps where TimestampCol = :value",
-        value=datetime.datetime(2002, 12, 14, 0, 0, 10, 250000),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_2601(cursor):
-    "2601 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        "select * from TestTimestamps where TimestampCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_2602(cursor):
-    "2602 - test binding out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        """
-        begin
-            :value := to_timestamp('20021209', 'YYYYMMDD');
-        end;
-        """
-    )
-    assert bind_vars["value"].getvalue() == datetime.datetime(2002, 12, 9)
-
-
-def test_2603(cursor):
-    "2603 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=datetime.datetime(2002, 12, 12, 10, 0, 0),
-    )
-    value = bind_vars["value"].getvalue()
-    assert value == datetime.datetime(2002, 12, 17, 16, 0, 0)
-
-
-def test_2604(cursor):
-    "2604 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        """
-        begin
-            :value := to_date('20021231 12:31:00',
-                'YYYYMMDD HH24:MI:SS');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2002, 12, 31, 12, 31, 0)
-
-
-def test_2605(cursor):
-    "2605 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP)
-    var.setvalue(0, datetime.datetime(2002, 12, 9, 6, 0, 0))
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2002, 12, 14, 12, 0, 0)
-
-
-def test_2606(cursor):
-    "2606 - test cursor description is accurate"
-    cursor.execute("select * from TestTimestamps")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "TIMESTAMPCOL",
-            oracledb.DB_TYPE_TIMESTAMP,
-            23,
-            None,
-            0,
-            6,
-            False,
-        ),
-        ("NULLABLECOL", oracledb.DB_TYPE_TIMESTAMP, 23, None, 0, 6, True),
-        (
-            "TIMESTAMPPRECISIONCOL",
-            oracledb.DB_TYPE_TIMESTAMP,
-            23,
-            None,
-            0,
-            4,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_2607(cursor, module_data):
-    "2607 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestTimestamps order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_2608(cursor, module_data):
-    "2608 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestTimestamps order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_2609(cursor, module_data_by_key):
-    "2609 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestTimestamps
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_2610(cursor, module_data_by_key):
-    "2610 - test binding a timestamp with zero fractional seconds"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        """
-        select *
-        from TestTimestamps
-        where trunc(TimestampCol) = :value
-        """,
-        value=datetime.datetime(2002, 12, 14),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_2611(cursor, module_data_by_key):
-    "2611 - test binding a timestamp with datetime.date as input"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP)
-    cursor.execute(
-        """
-        select *
-        from TestTimestamps
-        where trunc(TimestampCol) = :value
-        """,
-        value=datetime.date(2002, 12, 14),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
diff --git a/tests/test_2700_aq_dbobject.py b/tests/test_2700_aq_dbobject.py
deleted file mode 100644
index 8a1f36b1..00000000
--- a/tests/test_2700_aq_dbobject.py
+++ /dev/null
@@ -1,614 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2700 - Module for testing AQ with DbObject payloads.
-"""
-
-import decimal
-import threading
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def book_data():
-    return [
-        ("Wings of Fire", "A.P.J. Abdul Kalam", decimal.Decimal("15.75")),
-        ("The Story of My Life", "Hellen Keller", decimal.Decimal("10.50")),
-        ("The Chronicles of Narnia", "C.S. Lewis", decimal.Decimal("25.25")),
-    ]
-
-
-@pytest.fixture
-def queue(conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return test_env.get_and_clear_queue(conn, "TEST_BOOK_QUEUE", "UDT_BOOK")
-
-
-def _deq_in_thread(test_env, queue, results):
-    with test_env.get_connection() as conn:
-        books_type = conn.gettype(queue.payload_type.name)
-        thread_queue = conn.queue(queue.name, books_type)
-        thread_queue.deqoptions.wait = 10
-        props = thread_queue.deqone()
-        if props is not None:
-            book = props.payload
-            results.append((book.TITLE, book.AUTHORS, book.PRICE))
-        conn.commit()
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-def test_2700(queue):
-    "2700 - test dequeuing an empty queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-
-
-def test_2701(conn, queue, book_data):
-    "2701 - test enqueuing and dequeuing multiple messages"
-    props = conn.msgproperties()
-    for title, authors, price in book_data:
-        props.payload = book = queue.payload_type.newobject()
-        book.TITLE = title
-        book.AUTHORS = authors
-        book.PRICE = price
-        queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        book = props.payload
-        row = (book.TITLE, book.AUTHORS, book.PRICE)
-        results.append(row)
-    conn.commit()
-    assert results == book_data
-
-
-def test_2702(conn, queue, book_data):
-    "2702 - test dequeuing with DEQ_REMOVE_NODATA option"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[1]
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = queue.deqone()
-    assert props is not None
-    assert props.payload.TITLE is None
-
-
-def test_2703(queue):
-    "2703 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-def test_2704(conn, queue, book_data, test_env):
-    "2704 - test waiting for dequeue"
-    results = []
-    thread = threading.Thread(
-        target=_deq_in_thread,
-        args=(
-            test_env,
-            queue,
-            results,
-        ),
-    )
-    thread.start()
-    book = queue.payload_type.newobject()
-    title, authors, price = book_data[0]
-    book.TITLE = title
-    book.AUTHORS = authors
-    book.PRICE = price
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    conn.commit()
-    thread.join()
-    assert results == [(title, authors, price)]
-
-
-def test_2705(queue):
-    "2705 - test getting/setting enqueue options attributes"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-def test_2706(queue):
-    "2706 - test errors for invalid values for enqueue"
-    book = queue.payload_type.newobject()
-    pytest.raises(TypeError, queue.enqone, book)
-
-
-def test_2707(conn):
-    "2707 - test getting/setting message properties attributes"
-    props = conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-
-
-def test_2708(conn, queue, book_data, test_env):
-    "2708 - test enqueue visibility option - ENQ_ON_COMMIT"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-    conn.commit()
-    props = queue.deqone()
-    other_conn.commit()
-    assert props is not None
-
-
-def test_2709(conn, queue, book_data, test_env):
-    "2709 - test enqueue visibility option - ENQ_IMMEDIATE"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    book = props.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    other_conn.commit()
-    assert results == book_data[0]
-
-
-def test_2710(conn, queue, book_data, test_env):
-    "2710 - test enqueue/dequeue delivery modes identical - buffered"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props.deliverymode == oracledb.MSG_BUFFERED
-    book = props.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    other_conn.commit()
-    assert results == book_data[0]
-
-
-def test_2711(conn, queue, book_data, test_env):
-    "2711 - test enqueue/dequeue delivery modes identical - persistent"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props.deliverymode == oracledb.MSG_PERSISTENT
-    book = props.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    other_conn.commit()
-    assert results == book_data[0]
-
-
-def test_2712(conn, queue, book_data, test_env):
-    "2712 - test enqueue/dequeue delivery modes the same"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props.deliverymode == oracledb.MSG_PERSISTENT
-    book = props.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    other_conn.commit()
-    assert results == book_data[0]
-
-
-def test_2713(conn, queue, book_data, test_env):
-    "2713 - test enqueue/dequeue delivery modes different"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-
-
-def test_2714(skip_unless_thick_mode, conn, queue, book_data, test_env):
-    "2714 - test dequeue transformation"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    expected_price = book.PRICE + 10
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    conn.commit()
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    transformation_str = f"{conn.username}.transform2"
-    queue.deqoptions.transformation = transformation_str
-    assert queue.deqoptions.transformation == transformation_str
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props.payload.PRICE == expected_price
-
-
-def test_2715(skip_unless_thick_mode, conn, queue, book_data, test_env):
-    "2715 - test enqueue transformation"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    expected_price = book.PRICE + 5
-    queue.enqoptions.transformation = transformation_str = (
-        f"{conn.username}.transform1"
-    )
-    queue.enqoptions.transformation = transformation_str
-    if test_env.has_client_version(23):
-        assert queue.enqoptions.transformation == transformation_str
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    conn.commit()
-
-    other_conn = test_env.get_connection()
-    books_type = other_conn.gettype(queue.payload_type.name)
-    queue = other_conn.queue(queue.name, books_type)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props.payload.PRICE == expected_price
-
-
-def test_2716(conn, queue, test_env):
-    "2716 - test to verify payloadType is deprecated"
-    books_type = conn.gettype(queue.payload_type.name)
-    assert queue.payload_type == books_type
-    assert queue.payloadType == books_type
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.queue(queue.name, books_type, payloadType=books_type)
-
-
-def test_2717(conn, queue, test_env):
-    "2717 - test error for message with no payload"
-    props = conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        queue.enqone(props)
-
-
-def test_2718(conn, cursor, queue, book_data):
-    "2718 - verify that the msgid property is returned correctly"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    props = conn.msgproperties(payload=book)
-    assert props.msgid is None
-    queue.enqone(props)
-    cursor.execute("select msgid from book_queue_tab")
-    (actual_msgid,) = cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-def test_2719(conn, queue, book_data):
-    "2719 - verify use of recipients property"
-    books_type = conn.gettype(queue.payload_type.name)
-    book = books_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue = conn.queue("BOOK_QUEUE_MULTI", books_type)
-    props = conn.msgproperties(payload=book, recipients=["sub2", "sub3"])
-    assert props.recipients == ["sub2", "sub3"]
-    queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.consumername = "sub3"
-    props1 = queue.deqone()
-    book = props1.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    assert results == book_data[0]
-    queue.deqoptions.consumername = "sub1"
-    props1 = queue.deqone()
-    assert props1 is None
-
-
-def test_2720(skip_unless_thick_mode, conn, queue, book_data, test_env):
-    "2720 - verify attributes of AQ message which spawned notification"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("AQ notification not supported on the cloud")
-    condition = threading.Condition()
-    other_conn = test_env.get_connection(events=True)
-
-    def notification_callback(message=None, *args, **kwargs):
-        cursor = conn.cursor()
-        cursor.execute("select msgid from book_queue_tab")
-        (actual_msgid,) = cursor.fetchone()
-        assert message.msgid == actual_msgid
-        assert message.consumer_name is None
-        main_user = test_env.main_user.upper()
-        assert message.queue_name == f'"{main_user}"."{queue.name}"'
-        assert message.type == oracledb.EVENT_AQ
-        with condition:
-            condition.notify()
-
-    sub = other_conn.subscribe(
-        namespace=oracledb.SUBSCR_NAMESPACE_AQ,
-        name=queue.name,
-        timeout=300,
-        callback=notification_callback,
-    )
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    conn.commit()
-    with condition:
-        assert condition.wait(5)
-    other_conn.unsubscribe(sub)
-
-
-def test_2721(conn, cursor, queue):
-    "2721 - test message props enqtime"
-    book = queue.payload_type.newobject()
-    cursor.execute("select current_timestamp from dual")
-    (start_date,) = cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = conn.msgproperties(payload=book)
-    queue.enqone(props)
-    props = queue.deqone()
-    cursor.execute("select current_timestamp from dual")
-    (end_date,) = cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-def test_2722(conn, queue):
-    "2722 - test message props declared attributes"
-    book = queue.payload_type.newobject()
-    values = dict(
-        payload=book,
-        correlation="TEST_CORRELATION",
-        delay=7,
-        exceptionq="TEST_EXCEPTIONQ",
-        expiration=10,
-        priority=1,
-    )
-    props = conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-
-
-def test_2723(conn):
-    "2723 - test error for invalid type for payload_type"
-    pytest.raises(TypeError, conn.queue, "THE QUEUE", payload_type=4)
-
-
-def test_2724(conn):
-    "2724 - test setting bytes to payload"
-    props = conn.msgproperties()
-    bytes_val = b"Hello there"
-    props.payload = bytes_val
-    assert props.payload == bytes_val
-
-
-def test_2725(conn, queue):
-    "2725 - test getting queue attributes"
-    other_queue = conn.queue(queue.name, queue.payload_type)
-    assert other_queue.name == queue.name
-    assert queue.connection is conn
-
-
-def test_2726(queue):
-    "2726 - test getting write-only attributes"
-    with pytest.raises(AttributeError):
-        queue.enqoptions.deliverymode
-    with pytest.raises(AttributeError):
-        queue.deqoptions.deliverymode
-
-
-def test_2727(conn, queue, book_data, test_env):
-    "2727 - test correlation deqoption"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    correlations = ["Math", "Programming"]
-    num_messages = 3
-    messages = [
-        conn.msgproperties(payload=book, correlation=c)
-        for c in correlations
-        for i in range(num_messages)
-    ]
-    queue.enqmany(messages)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = correlations[0]
-    correlated_messages = queue.deqmany(num_messages + 1)
-    assert len(correlated_messages) == num_messages
-
-    queue.deqoptions.correlation = correlations[1]
-    with test_env.assert_raises_full_code("ORA-25241"):
-        queue.deqone()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    correlated_messages = queue.deqmany(num_messages + 1)
-    assert len(correlated_messages) == num_messages
-
-
-def test_2728(conn, queue, book_data):
-    "2728 - test correlation deqoption with pattern-matching characters"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    for correlation in ("PreCalculus-math1", "Calculus-Math2"):
-        props = conn.msgproperties(payload=book, correlation=correlation)
-        queue.enqone(props)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = "%Calculus-%ath_"
-    messages = queue.deqmany(5)
-    assert len(messages) == 2
-
-
-def test_2729(conn, queue, book_data):
-    "2729 - test condition deqoption with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-
-    priorities = [5, 10]
-    indexes = [0, 1]
-    for priority, ix in zip(priorities, indexes):
-        book = queue.payload_type.newobject()
-        book.TITLE, book.AUTHORS, book.PRICE = book_data[ix]
-        props = conn.msgproperties(payload=book, priority=priority)
-        queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    messages = queue.deqmany(3)
-    assert len(messages) == 0
-
-    for priority, ix in zip(priorities, indexes):
-        queue.deqoptions.condition = f"priority = {priority}"
-        messages = queue.deqmany(3)
-        assert len(messages) == 1
-        book = messages[0].payload
-        data = book.TITLE, book.AUTHORS, book.PRICE
-        assert data == book_data[ix]
-
-
-def test_2730(conn, queue, book_data):
-    "2730 - test mode deqoption with DEQ_REMOVE_NODATA"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-
-    book = queue.payload_type.newobject()
-    for data in book_data:
-        book.TITLE, book.AUTHORS, book.PRICE = data
-        props = conn.msgproperties(payload=book)
-        queue.enqone(props)
-
-    messages = queue.deqmany(5)
-    assert len(messages) == 3
-    for message in messages:
-        assert message.payload.TITLE is None
-        assert message.payload.AUTHORS is None
-        assert message.payload.PRICE is None
-
-
-def test_2731(conn, queue):
-    "2731 - test payload_type returns the correct value"
-    books_type = conn.gettype(queue.payload_type.name)
-    other_queue = conn.queue(queue.name, books_type)
-    assert other_queue.payload_type == books_type
-
-
-def test_2732(queue):
-    "2732 - test deprecated attributes (enqOptions, deqOptions)"
-    assert queue.enqOptions == queue.enqoptions
-    assert queue.deqOptions == queue.deqoptions
-
-
-def test_2733(conn, queue, book_data):
-    "2733 - test deprecated AQ methods (enqOne, deqOne)"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = book_data[0]
-    queue.enqOne(conn.msgproperties(book))
-    props = queue.deqOne()
-    book = props.payload
-    results = (book.TITLE, book.AUTHORS, book.PRICE)
-    assert results == book_data[0]
-
-
-def test_2734(conn, queue, test_env):
-    "2734 - test enqueuing to an object queue with the wrong payload"
-    props = conn.msgproperties(payload="A string")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        queue.enqone(props)
diff --git a/tests/test_2800_aq_bulk.py b/tests/test_2800_aq_bulk.py
deleted file mode 100644
index c78faa28..00000000
--- a/tests/test_2800_aq_bulk.py
+++ /dev/null
@@ -1,231 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2800 - Module for testing AQ Bulk enqueue/dequeue
-"""
-
-import datetime
-import threading
-
-import oracledb
-import pytest
-
-RAW_QUEUE_NAME = "TEST_RAW_QUEUE"
-JSON_QUEUE_NAME = "TEST_JSON_QUEUE"
-RAW_PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth message",
-    "The fifth message",
-    "The sixth message",
-    "The seventh message",
-    "The eighth message",
-    "The ninth message",
-    "The tenth message",
-    "The eleventh message",
-    "The twelfth and final message",
-]
-
-JSON_DATA_PAYLOAD = [
-    [
-        2.75,
-        True,
-        "Ocean Beach",
-        b"Some bytes",
-        {"keyA": 1.0, "KeyB": "Melbourne"},
-        datetime.datetime(2022, 8, 1, 0, 0),
-    ],
-    dict(name="John", age=30, city="New York"),
-]
-
-
-@pytest.fixture
-def queue(conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return test_env.get_and_clear_queue(conn, RAW_QUEUE_NAME)
-
-
-@pytest.fixture
-def json_queue(conn, test_env):
-    """
-    Creates the JSON queue used by the tests in this file.
-    """
-    return test_env.get_and_clear_queue(conn, JSON_QUEUE_NAME, "JSON")
-
-
-def _deq_in_thread(test_env, results):
-    with test_env.get_connection() as conn:
-        queue = conn.queue(RAW_QUEUE_NAME)
-        queue.deqoptions.wait = 10
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        while len(results) < len(RAW_PAYLOAD_DATA):
-            messages = queue.deqmany(5)
-            if not messages:
-                break
-            for message in messages:
-                results.append(message.payload.decode())
-        conn.commit()
-
-
-def test_2800(conn, queue):
-    "2800 - test bulk enqueue and dequeue"
-    messages = [conn.msgproperties(payload=data) for data in RAW_PAYLOAD_DATA]
-    queue.enqmany(messages)
-    messages = queue.deqmany(len(RAW_PAYLOAD_DATA))
-    data = [message.payload.decode() for message in messages]
-    conn.commit()
-    assert data == RAW_PAYLOAD_DATA
-
-
-def test_2801(conn, queue):
-    "2801 - test empty bulk dequeue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    messages = queue.deqmany(5)
-    conn.commit()
-    assert messages == []
-
-
-def test_2802(skip_unless_thick_mode, conn, queue, test_env):
-    "2802 - test bulk dequeue with wait"
-    results = []
-    thread = threading.Thread(
-        target=_deq_in_thread,
-        args=(
-            test_env,
-            results,
-        ),
-    )
-    thread.start()
-    messages = [conn.msgproperties(payload=data) for data in RAW_PAYLOAD_DATA]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    queue.enqmany(messages)
-    thread.join()
-    assert results == RAW_PAYLOAD_DATA
-
-
-def test_2803(conn, queue):
-    "2803 - test enqueue and dequeue multiple times"
-    data_to_enqueue = RAW_PAYLOAD_DATA
-    for num in (2, 6, 4):
-        messages = [
-            conn.msgproperties(payload=data) for data in data_to_enqueue[:num]
-        ]
-        data_to_enqueue = data_to_enqueue[num:]
-        queue.enqmany(messages)
-    conn.commit()
-    all_data = []
-    for num in (3, 5, 10):
-        messages = queue.deqmany(num)
-        all_data.extend(message.payload.decode() for message in messages)
-    conn.commit()
-    assert all_data == RAW_PAYLOAD_DATA
-
-
-def test_2804(skip_unless_thick_mode, conn, queue, test_env):
-    "2804 - test visibility option for enqueue and dequeue"
-
-    # first test with ENQ_ON_COMMIT (commit required)
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props1 = conn.msgproperties(payload="A first message")
-    props2 = conn.msgproperties(payload="A second message")
-    queue.enqmany([props1, props2])
-    other_connection = test_env.get_connection()
-    other_queue = other_connection.queue(RAW_QUEUE_NAME)
-    other_queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    other_queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-    messages = other_queue.deqmany(5)
-    assert len(messages) == 0
-    conn.commit()
-    messages = other_queue.deqmany(5)
-    assert len(messages) == 2
-    other_connection.rollback()
-
-    # second test with ENQ_IMMEDIATE (no commit required)
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    other_queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.enqmany([props1, props2])
-    messages = other_queue.deqmany(5)
-    assert len(messages) == 4
-    other_connection.rollback()
-    messages = other_queue.deqmany(5)
-    assert len(messages) == 0
-
-
-def test_2805(conn, queue, test_env):
-    "2805 - test error for messages with no payload"
-    messages = [conn.msgproperties() for _ in RAW_PAYLOAD_DATA]
-    with test_env.assert_raises_full_code("DPY-2000"):
-        queue.enqmany(messages)
-
-
-def test_2806(conn, cursor, queue):
-    "2806 - verify that the msgid property is returned correctly"
-    messages = [conn.msgproperties(payload=data) for data in RAW_PAYLOAD_DATA]
-    queue.enqmany(messages)
-    cursor.execute("select msgid from raw_queue_tab")
-    actual_msgids = set(m for m, in cursor)
-    msgids = set(message.msgid for message in messages)
-    assert msgids == actual_msgids
-    messages = queue.deqmany(len(RAW_PAYLOAD_DATA))
-    msgids = set(message.msgid for message in messages)
-    assert msgids == actual_msgids
-
-
-def test_2807(conn, json_queue):
-    "4800 - test enqueuing and dequeuing JSON message"
-    props = [conn.msgproperties(payload=data) for data in JSON_DATA_PAYLOAD]
-    json_queue.enqmany(props)
-    conn.commit()
-    json_queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    messages = json_queue.deqmany(5)
-    actual_data = [message.payload for message in messages]
-    assert actual_data == JSON_DATA_PAYLOAD
-
-
-def test_2808(conn, json_queue, test_env):
-    "2808 - test enqueuing to a JSON queue without a JSON payload"
-    props = conn.msgproperties(payload="string message")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        json_queue.enqmany([props, props])
-
-
-def test_2809(conn, json_queue):
-    "2809 - test errors for invalid values for enqmany and deqmany"
-    props = conn.msgproperties(payload="string message")
-    pytest.raises(TypeError, json_queue.enqmany, props)
-    pytest.raises(TypeError, json_queue.enqmany, ["Not", "msgproperties"])
-    pytest.raises(TypeError, json_queue.deqmany, "5")
-
-
-def test_2810(conn, queue):
-    "2810 - test deprecated AQ methods (enqMany, deqMany)"
-    data = [b"labrador", b"schnauzer", b"shih tzu"]
-    queue.enqMany([conn.msgproperties(d) for d in data])
-    props = queue.deqMany(len(data) + 1)
-    dequeued_data = [p.payload for p in props]
-    assert dequeued_data == data
diff --git a/tests/test_2900_rowid.py b/tests/test_2900_rowid.py
deleted file mode 100644
index cbad123c..00000000
--- a/tests/test_2900_rowid.py
+++ /dev/null
@@ -1,226 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-2900 - Module for testing Rowids
-"""
-
-import datetime
-
-import oracledb
-
-
-def _populate_test_universal_rowids(cursor):
-    cursor.execute("truncate table TestUniversalRowids")
-    data = [
-        (1, "ABC" * 75, datetime.datetime(2017, 4, 11)),
-        (2, "DEF" * 80, datetime.datetime(2017, 4, 12)),
-    ]
-    cursor.executemany(
-        "insert into TestUniversalRowids values (:1, :2, :3)",
-        data,
-    )
-    cursor.connection.commit()
-
-
-def _test_select_rowids(cursor, table_name):
-    cursor.execute(f"select rowid, IntCol from {table_name}")
-    sql = f"select IntCol from {table_name} where rowid = :val"
-    for rowid, int_val in cursor.fetchall():
-        cursor.execute(sql, val=rowid)
-        assert cursor.fetchall() == [(int_val,)]
-
-
-def test_2900(cursor):
-    "2900 - test selecting all rowids from a regular table"
-    _test_select_rowids(cursor, "TestNumbers")
-
-
-def test_2901(cursor):
-    "2901 - test selecting all rowids from an index organised table"
-    _populate_test_universal_rowids(cursor)
-    _test_select_rowids(cursor, "TestUniversalRowids")
-
-
-def test_2902(cursor, test_env):
-    "2902 - test inserting an invalid rowid"
-    sql = "insert into TestRowids (IntCol, RowidCol) values (1, :rid)"
-    with test_env.assert_raises_full_code("ORA-00932"):
-        cursor.execute(sql, rid=12345)
-    with test_env.assert_raises_full_code("ORA-01410"):
-        cursor.execute(sql, rid="523lkhlf")
-
-
-def test_2903(conn, cursor):
-    "2903 - test selecting regular rowids stored in a urowid column"
-    cursor.execute("truncate table TestRowids")
-    cursor.execute(
-        """
-        insert into TestRowids (IntCol, UrowidCol)
-        select IntCol, rowid
-        from TestNumbers
-        """
-    )
-    conn.commit()
-    cursor.execute("select IntCol, UrowidCol from TestRowids")
-    for int_val, rowid in cursor.fetchall():
-        cursor.execute(
-            "select IntCol from TestNumbers where rowid = :val",
-            val=rowid,
-        )
-        assert cursor.fetchall() == [(int_val,)]
-
-
-def test_2904(conn, cursor):
-    "2904 - test selecting regular rowids stored in a rowid column"
-    cursor.execute("truncate table TestRowids")
-    cursor.execute(
-        """
-        insert into TestRowids (IntCol, RowidCol)
-        select IntCol, rowid
-        from TestNumbers
-        """
-    )
-    conn.commit()
-    cursor.execute("select IntCol, RowidCol from TestRowids")
-    for int_val, rowid in cursor.fetchall():
-        cursor.execute(
-            """
-            select IntCol
-            from TestNumbers
-            where rowid = :val
-            """,
-            val=rowid,
-        )
-        assert cursor.fetchall() == [(int_val,)]
-
-
-def test_2905(conn, cursor):
-    "2905 - binding and inserting a rowid"
-    cursor.execute("truncate table TestRowids")
-    insert_data = [
-        (1, "String #1"),
-        (2, "String #2"),
-        (3, "String #3"),
-        (4, "String #4"),
-    ]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        insert_data,
-    )
-    conn.commit()
-    ridvar = cursor.var(oracledb.ROWID)
-    cursor.execute(
-        """
-        begin
-            select rowid into :rid
-            from TestTempTable
-            where IntCol = 3;
-        end;
-        """,
-        rid=ridvar,
-    )
-    cursor.setinputsizes(r1=oracledb.ROWID)
-    cursor.execute(
-        """
-        insert into TestRowids (IntCol, RowidCol)
-        values(1, :r1)
-        """,
-        r1=ridvar,
-    )
-    conn.commit()
-    cursor.execute("select IntCol, RowidCol from TestRowids")
-    int_val, rowid = cursor.fetchone()
-    cursor.execute(
-        """
-        select IntCol, StringCol1 from TestTempTable
-        where rowid = :val
-        """,
-        val=rowid,
-    )
-    assert cursor.fetchone() == (3, "String #3")
-
-
-def test_2906(skip_unless_thin_mode, conn, cursor):
-    "2906 - binding and inserting a rowid as urowid"
-    cursor.execute("truncate table TestRowids")
-    insert_data = [
-        (1, "String #1", datetime.datetime(2017, 4, 4)),
-        (2, "String #2", datetime.datetime(2017, 4, 5)),
-        (3, "String #3", datetime.datetime(2017, 4, 6)),
-        (4, "A" * 250, datetime.datetime(2017, 4, 7)),
-    ]
-    cursor.execute("truncate table TestUniversalRowids")
-    cursor.executemany(
-        """
-        insert into TestUniversalRowids
-        values (:1, :2, :3)
-        """,
-        insert_data,
-    )
-    conn.commit()
-    ridvar = cursor.var(oracledb.DB_TYPE_UROWID)
-    cursor.execute(
-        """
-        begin
-            select rowid into :rid
-            from TestUniversalRowids
-            where IntCol = 3;
-        end;
-        """,
-        rid=ridvar,
-    )
-    cursor.setinputsizes(r1=oracledb.DB_TYPE_UROWID)
-    cursor.execute(
-        """
-        insert into TestRowids (IntCol, UrowidCol)
-        values(1, :r1)
-        """,
-        r1=ridvar,
-    )
-    conn.commit()
-    cursor.execute("select IntCol, UrowidCol from TestRowids")
-    int_val, rowid = cursor.fetchone()
-    cursor.execute(
-        """
-        select IntCol, StringCol, DateCol
-        from TestUniversalRowids
-        where rowid = :val
-        """,
-        val=rowid,
-    )
-    assert cursor.fetchone() == (3, "String #3", datetime.datetime(2017, 4, 6))
-
-
-def test_2907(conn, cursor):
-    "2907 - fetching a null rowid"
-    cursor.execute("truncate table TestRowids")
-    cursor.execute("insert into TestRowids (IntCol) values (1)")
-    conn.commit()
-    cursor.execute("select * from TestRowids")
-    assert cursor.fetchone() == (1, None, None)
diff --git a/tests/test_3000_subscription.py b/tests/test_3000_subscription.py
deleted file mode 100644
index 34e383d6..00000000
--- a/tests/test_3000_subscription.py
+++ /dev/null
@@ -1,417 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3000 - Module for testing subscriptions
-"""
-
-import threading
-
-import oracledb
-import pytest
-
-
-class SubscriptionData:
-    def __init__(self, num_messages_expected):
-        self.condition = threading.Condition()
-        self.num_messages_expected = num_messages_expected
-        self.num_messages_received = 0
-
-    def _process_message(self, message):
-        pass
-
-    def callback_handler(self, message):
-        if message.type != oracledb.EVENT_DEREG:
-            self._process_message(message)
-            self.num_messages_received += 1
-        if (
-            message.type == oracledb.EVENT_DEREG
-            or self.num_messages_received == self.num_messages_expected
-        ):
-            with self.condition:
-                self.condition.notify()
-
-    def wait_for_messages(self):
-        if self.num_messages_received < self.num_messages_expected:
-            with self.condition:
-                self.condition.wait(10)
-
-
-class AQSubscriptionData(SubscriptionData):
-    pass
-
-
-class DMLSubscriptionData(SubscriptionData):
-    def __init__(self, num_messages_expected):
-        super().__init__(num_messages_expected)
-        self.table_operations = []
-        self.row_operations = []
-        self.rowids = []
-
-    def _process_message(self, message):
-        (table,) = message.tables
-        self.table_operations.append(table.operation)
-        for row in table.rows:
-            self.row_operations.append(row.operation)
-            self.rowids.append(row.rowid)
-
-
-@pytest.fixture(scope="module")
-def skip_unless_has_client_23(test_env):
-    """
-    Skips tests unless running with Oracle Client version 23.
-    """
-    if not test_env.use_thick_mode:
-        pytest.skip("requires thick mode")
-    if not test_env.has_client_version(23):
-        pytest.skip("crashes in older clients")
-
-
-def test_3000(skip_unless_has_client_23, cursor, test_env):
-    "3000 - test subscription for insert, update, delete and truncate"
-
-    # skip if running on the Oracle Cloud, which does not support
-    # subscriptions currently
-    if test_env.is_on_oracle_cloud:
-        message = "Oracle Cloud does not support subscriptions currently"
-        pytest.skip(message)
-
-    # truncate table in order to run test in known state
-    cursor.execute("truncate table TestTempTable")
-
-    # expected values
-    table_operations = [
-        oracledb.OPCODE_INSERT,
-        oracledb.OPCODE_UPDATE,
-        oracledb.OPCODE_INSERT,
-        oracledb.OPCODE_DELETE,
-        oracledb.OPCODE_ALTER | oracledb.OPCODE_ALLROWS,
-    ]
-    row_operations = [
-        oracledb.OPCODE_INSERT,
-        oracledb.OPCODE_UPDATE,
-        oracledb.OPCODE_INSERT,
-        oracledb.OPCODE_DELETE,
-    ]
-    rowids = []
-
-    # set up subscription
-    data = DMLSubscriptionData(5)
-    conn = test_env.get_connection(events=True)
-    sub = conn.subscribe(
-        callback=data.callback_handler,
-        timeout=10,
-        qos=oracledb.SUBSCR_QOS_ROWIDS,
-    )
-    sub.registerquery("select * from TestTempTable")
-    conn.autocommit = True
-    cursor = conn.cursor()
-
-    # insert statement
-    cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (1, 'test')"
-    )
-    cursor.execute("select rowid from TestTempTable where IntCol = 1")
-    rowids.extend(r for r, in cursor)
-
-    # update statement
-    cursor.execute(
-        "update TestTempTable set StringCol1 = 'update' where IntCol = 1"
-    )
-    cursor.execute("select rowid from TestTempTable where IntCol = 1")
-    rowids.extend(r for r, in cursor)
-
-    # second insert statement
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'test2')
-        """
-    )
-    cursor.execute("select rowid from TestTempTable where IntCol = 2")
-    rowids.extend(r for r, in cursor)
-
-    # delete statement
-    cursor.execute("delete TestTempTable where IntCol = 2")
-    rowids.append(rowids[-1])
-
-    # truncate table
-    cursor.execute("truncate table TestTempTable")
-
-    # wait for all messages to be sent
-    data.wait_for_messages()
-
-    # verify the correct messages were sent
-    assert data.table_operations == table_operations
-    assert data.row_operations == row_operations
-    assert data.rowids == rowids
-
-    # test string format of subscription object is as expected
-    fmt = "<oracledb.Subscription on <oracledb.Connection to %s@%s>>"
-    expected = fmt % (test_env.main_user, test_env.connect_string)
-    assert str(sub) == expected
-
-
-def test_3001(conn, test_env):
-    "3001 - test to verify deprecations"
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.subscribe(ip_address="www.oracle.in", ipAddress="www.oracle.in")
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.subscribe(grouping_class=1, groupingClass=1)
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.subscribe(grouping_value=3, groupingValue=3)
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.subscribe(grouping_type=2, groupingType=2)
-    with test_env.assert_raises_full_code("DPY-2014"):
-        conn.subscribe(client_initiated=True, clientInitiated=True)
-
-
-def test_3002(skip_unless_has_client_23, conn, test_env):
-    "3002 - test subscription for AQ"
-
-    # create queue and clear it of all messages
-    queue = conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    while queue.deqone():
-        pass
-    conn.commit()
-
-    # set up subscription
-    data = AQSubscriptionData(1)
-    conn = test_env.get_connection(events=True)
-    conn.subscribe(
-        namespace=oracledb.SUBSCR_NAMESPACE_AQ,
-        name=queue.name,
-        timeout=10,
-        callback=data.callback_handler,
-    )
-
-    # enqueue a message
-    queue.enqone(conn.msgproperties(payload="Some data"))
-    conn.commit()
-
-    # wait for all messages to be sent
-    data.wait_for_messages()
-
-
-@pytest.mark.skip("fails intermittently")
-def test_3003(skip_unless_has_client_23, test_env):
-    "3003 - test verifying what registerquery returns"
-    data = DMLSubscriptionData(5)
-    qos_constants = [
-        oracledb.SUBSCR_QOS_QUERY,
-        oracledb.SUBSCR_QOS_RELIABLE,
-        oracledb.SUBSCR_QOS_DEREG_NFY,
-        oracledb.SUBSCR_QOS_ROWIDS,
-        oracledb.SUBSCR_QOS_BEST_EFFORT,
-    ]
-    for qos_constant in qos_constants:
-        conn = test_env.get_connection(events=True)
-        sub = conn.subscribe(qos=qos_constant, callback=data.callback_handler)
-        query_id = sub.registerquery("select * from TestTempTable")
-        if qos_constant == oracledb.SUBSCR_QOS_QUERY:
-            assert isinstance(query_id, int)
-            assert isinstance(sub.id, int)
-        else:
-            assert query_id is None
-        conn.unsubscribe(sub)
-        conn.close()
-
-
-def test_3004(skip_unless_has_client_23, test_env):
-    "3004 - test Subscription repr()"
-    data = DMLSubscriptionData(5)
-    with test_env.get_connection(events=True) as conn:
-        sub = conn.subscribe(callback=data.callback_handler)
-        assert repr(sub) == f"<oracledb.Subscription on {conn}>"
-        conn.unsubscribe(sub)
-
-
-def test_3005(skip_unless_has_client_23, test_env):
-    "3005 - test registerquery with invalid parameters"
-    data = DMLSubscriptionData(5)
-    conn = test_env.get_connection(events=True)
-    sub = conn.subscribe(callback=data.callback_handler)
-    pytest.raises(
-        TypeError,
-        sub.registerquery,
-        "select * from TestTempTable",
-        "invalid args",
-    )
-    with test_env.assert_raises_full_code("ORA-00942"):
-        sub.registerquery("select * from Nonexistent")
-    with test_env.assert_raises_full_code("DPI-1013"):
-        sub.registerquery("insert into TestTempTable (IntCol) values (1)")
-    conn.unsubscribe(sub)
-
-
-def test_3006(skip_unless_has_client_23, test_env):
-    "3006 - test getting subscription attributes"
-    data = DMLSubscriptionData(1)
-    conn = test_env.get_connection(events=True)
-    cursor = conn.cursor()
-    args = dict(
-        callback=data.callback_handler,
-        ip_address=None,
-        port=0,
-        name="Sub1",
-        namespace=oracledb.SUBSCR_NAMESPACE_DBCHANGE,
-        timeout=10,
-        protocol=oracledb.SUBSCR_PROTO_OCI,
-        qos=oracledb.SUBSCR_QOS_QUERY,
-        operations=oracledb.OPCODE_INSERT,
-    )
-    sub = conn.subscribe(**args)
-    for attr_name in args:
-        assert getattr(sub, attr_name) == args[attr_name]
-    assert sub.connection == conn
-    cursor.execute("select REGID from USER_CHANGE_NOTIFICATION_REGS")
-    assert sub.id == cursor.fetchone()[0]
-    assert sub.ipAddress == sub.ip_address
-    conn.unsubscribe(sub)
-    conn.close()
-
-
-@pytest.mark.skip("fails intermittently")
-def test_3007(skip_unless_has_client_23, test_env):
-    "3007 - test getting Message, MessageQuery, MessageTable attributes"
-    condition = threading.Condition()
-    conn = test_env.get_connection(events=True)
-
-    def callback_handler(message):
-        assert message.dbname.upper() == conn.instance_name.upper()
-        assert message.registered
-        assert message.subscription == sub
-        assert message.tables == []
-        assert isinstance(message.txid, bytes)
-        assert message.type == oracledb.EVENT_QUERYCHANGE
-        assert isinstance(message.queries, list)
-        (queries,) = message.queries
-        assert queries.id == sub_id
-        assert queries.operation == oracledb.EVENT_QUERYCHANGE
-        assert isinstance(queries.tables, list)
-        (tables,) = queries.tables
-        table_name = f"{test_env.main_user.upper()}.TESTTEMPTABLE"
-        assert tables.name == table_name
-        assert isinstance(tables.operation, int)
-        assert isinstance(tables.rows, list)
-        with condition:
-            condition.notify()
-
-    sub = conn.subscribe(
-        callback=callback_handler, qos=oracledb.SUBSCR_QOS_QUERY
-    )
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    sub_id = sub.registerquery("select * from TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test')
-        """
-    )
-    conn.commit()
-
-    with condition:
-        assert condition.wait(5)
-    conn.unsubscribe(sub)
-
-
-def test_3008(skip_unless_has_client_23, test_env):
-    "3008 - test unsubscribe with invalid parameter"
-    conn = test_env.get_connection(events=True)
-    pytest.raises(TypeError, conn.unsubscribe, "not a sub object")
-    sub = conn.subscribe(callback=lambda x: f"Message: {x}")
-    conn.unsubscribe(sub)
-    with test_env.assert_raises_full_code("DPI-1002"):
-        conn.unsubscribe(sub)
-
-
-def test_3010(skip_unless_has_client_23, test_env):
-    "3010 - test registerquery in the middle of an active transaction"
-    connection = test_env.get_connection(events=True)
-    cursor = connection.cursor()
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (1, 'test')"
-    )
-    sub = connection.subscribe(callback=lambda x: f"Msg: {x}")
-    with test_env.assert_raises_full_code("ORA-29975"):
-        sub.registerquery("select * from TestTempTable")
-    connection.unsubscribe(sub)
-
-
-def test_3011(skip_unless_has_client_23, test_env):
-    "3011 - test registerquery with aq subscription"
-    connection = test_env.get_connection(events=True)
-    sub = connection.subscribe(
-        callback=lambda x: None,
-        namespace=oracledb.SUBSCR_NAMESPACE_AQ,
-        name="TEST_RAW_QUEUE",
-    )
-    with test_env.assert_raises_full_code("ORA-24315"):
-        sub.registerquery("select * from TestTempTable")
-    connection.unsubscribe(sub)
-
-
-def test_3013(skip_unless_has_client_23, cursor, test_env):
-    "3013 - test subscription with SUBSCR_QOS_DEREG_NFY deregisters"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("AQ notification not supported on the cloud")
-
-    def callback(message):
-        assert not message.registered
-        with condition:
-            condition.notify()
-
-    condition = threading.Condition()
-    cursor.execute("truncate table TestTempTable")
-    conn = test_env.get_connection(events=True)
-    cursor = conn.cursor()
-    sub = conn.subscribe(
-        callback=callback, qos=oracledb.SUBSCR_QOS_DEREG_NFY, timeout=2
-    )
-    sub.registerquery("select * from TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test')
-        """
-    )
-    conn.commit()
-    with condition:
-        assert condition.wait(5)
-    conn.unsubscribe(sub)
-
-
-def test_3014(skip_unless_has_client_23, test_env):
-    "3014 - test adding a consumer to a single consumer queue (negative)"
-    conn = test_env.get_connection(events=True)
-    single_consumer_queue = "TEST_RAW_QUEUE"
-    with test_env.assert_raises_full_code("ORA-25256"):
-        conn.subscribe(
-            callback=lambda x: None,
-            namespace=oracledb.SUBSCR_NAMESPACE_AQ,
-            name=f"{single_consumer_queue}:SUBSCRIBER",
-        )
diff --git a/tests/test_3100_boolean_var.py b/tests/test_3100_boolean_var.py
deleted file mode 100644
index 9d1ddb8a..00000000
--- a/tests/test_3100_boolean_var.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3100 - Module for testing boolean variables
-"""
-
-import oracledb
-
-
-def _test_bind_value_as_boolean(cursor, value):
-    expected_result = str(bool(value)).upper()
-    var = cursor.var(bool)
-    var.setvalue(0, value)
-    result = cursor.callfunc("pkg_TestBooleans.GetStringRep", str, [var])
-    assert result == expected_result
-
-
-def test_3100(skip_unless_plsql_boolean_supported, cursor):
-    "3100 - test binding in a False value"
-    result = cursor.callfunc("pkg_TestBooleans.GetStringRep", str, [False])
-    assert result == "FALSE"
-
-
-def test_3101(skip_unless_plsql_boolean_supported, cursor):
-    "3101 - test binding in a float as a boolean"
-    _test_bind_value_as_boolean(cursor, 0.0)
-    _test_bind_value_as_boolean(cursor, 1.0)
-
-
-def test_3102(skip_unless_plsql_boolean_supported, cursor):
-    "3102 - test binding in an integer as a boolean"
-    _test_bind_value_as_boolean(cursor, 0)
-    _test_bind_value_as_boolean(cursor, 1)
-
-
-def test_3103(skip_unless_plsql_boolean_supported, cursor):
-    "3103 - test binding in a null value"
-    cursor.setinputsizes(None, bool)
-    result = cursor.callfunc("pkg_TestBooleans.GetStringRep", str, [None])
-    assert result == "NULL"
-
-
-def test_3104(skip_unless_plsql_boolean_supported, cursor):
-    "3104 - test binding out a boolean value (False)"
-    result = cursor.callfunc(
-        "pkg_TestBooleans.IsLessThan10", oracledb.DB_TYPE_BOOLEAN, [15]
-    )
-    assert not result
-
-
-def test_3105(skip_unless_plsql_boolean_supported, cursor, test_env):
-    "3105 - test binding out a boolean value (True)"
-    test_env.skip_unless_server_version(12, 2)
-    result = cursor.callfunc("pkg_TestBooleans.IsLessThan10", bool, [5])
-    assert result
-
-
-def test_3106(skip_unless_plsql_boolean_supported, cursor):
-    "3106 - test binding in a string as a boolean"
-    _test_bind_value_as_boolean(cursor, "")
-    _test_bind_value_as_boolean(cursor, "0")
-
-
-def test_3107(skip_unless_plsql_boolean_supported, cursor):
-    "3107 - test binding in a True value"
-    result = cursor.callfunc("pkg_TestBooleans.GetStringRep", str, [True])
-    assert result == "TRUE"
-
-
-def test_3108(skip_unless_plsql_boolean_supported, cursor):
-    "3108 - test binding out a boolean value (None)"
-    result = cursor.callfunc("pkg_TestBooleans.TestOutValueNull", bool)
-    assert result is None
-
-
-def test_3109(skip_unless_native_boolean_supported, cursor):
-    "3109 - test binding and fetching boolean with Oracle DB version 23"
-    for value in (True, False):
-        cursor.execute("select not :1 from dual", [value])
-        (fetched_value,) = cursor.fetchone()
-        assert isinstance(fetched_value, bool)
-        assert fetched_value == (not value)
-
-
-def test_3110(skip_unless_native_boolean_supported, cursor):
-    "3110 - test binding and fetching string literals that represent True"
-    cursor.execute("truncate table TestBooleans")
-    true_values = ["true", "yes", "on", "1", "t", "y"]
-    cursor.executemany(
-        """insert into TestBooleans (IntCol, BooleanCol1, BooleanCol2)
-        values (:1, :2, :3)""",
-        [(i, v, v) for i, v in enumerate(true_values)],
-    )
-    cursor.execute(
-        "select BooleanCol1, BooleanCol2 from TestBooleans order by IntCol"
-    )
-    expected_values = [(True, True) for _ in true_values]
-    assert cursor.fetchall() == expected_values
-
-
-def test_3111(skip_unless_native_boolean_supported, cursor):
-    "3111 - test binding and fetching string literals that represent False"
-    cursor.execute("truncate table TestBooleans")
-    false_values = ["false", "no", "off", "0", "f", "n"]
-    cursor.executemany(
-        """insert into TestBooleans (IntCol, BooleanCol1, BooleanCol2)
-        values (:1, :2, :3)""",
-        [(i, v, v) for i, v in enumerate(false_values)],
-    )
-    cursor.execute(
-        "select BooleanCol1, BooleanCol2 from TestBooleans order by IntCol"
-    )
-    expected_value = [(False, False) for _ in range(len(false_values))]
-    assert cursor.fetchall() == expected_value
diff --git a/tests/test_3200_features_12_1.py b/tests/test_3200_features_12_1.py
deleted file mode 100644
index b13ce34b..00000000
--- a/tests/test_3200_features_12_1.py
+++ /dev/null
@@ -1,722 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3200 - Module for testing features introduced in 12.1
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def skip_unless_has_client_12_1(test_env):
-    """
-    All tests in the file are skipped unless the client version is at least
-    12.1.
-    """
-    if not test_env.has_client_version(12, 1):
-        pytest.skip("unsupported client")
-
-
-def test_3200(cursor, test_env):
-    "3200 - test executing with arraydmlrowcounts mode disabled"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [(1, "First"), (2, "Second")]
-    sql = "insert into TestArrayDML (IntCol, StringCol) values (:1, :2)"
-    cursor.executemany(sql, rows, arraydmlrowcounts=False)
-    with test_env.assert_raises_full_code("DPY-4006"):
-        cursor.getarraydmlrowcounts()
-    rows = [(3, "Third"), (4, "Fourth")]
-    cursor.executemany(sql, rows)
-    with test_env.assert_raises_full_code("DPY-4006"):
-        cursor.getarraydmlrowcounts()
-
-
-def test_3201(conn, cursor):
-    "3201 - test executing with arraydmlrowcounts mode enabled"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [
-        (1, "First", 100),
-        (2, "Second", 200),
-        (3, "Third", 300),
-        (4, "Fourth", 300),
-        (5, "Fifth", 300),
-    ]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-        arraydmlrowcounts=True,
-    )
-    conn.commit()
-    assert cursor.getarraydmlrowcounts() == [1, 1, 1, 1, 1]
-    cursor.execute("select count(*) from TestArrayDML")
-    (count,) = cursor.fetchone()
-    assert count == len(rows)
-
-
-def test_3202(conn, cursor):
-    "3202 - test binding a boolean collection (in)"
-    type_obj = conn.gettype("PKG_TESTBOOLEANS.UDT_BOOLEANLIST")
-    obj = type_obj.newobject()
-    obj.setelement(1, True)
-    obj.extend([True, False, True, True, False, True])
-    result = cursor.callfunc("pkg_TestBooleans.TestInArrays", int, [obj])
-    assert result == 5
-
-
-def test_3203(conn, cursor):
-    "3203 - test binding a boolean collection (out)"
-    type_obj = conn.gettype("PKG_TESTBOOLEANS.UDT_BOOLEANLIST")
-    obj = type_obj.newobject()
-    cursor.callproc("pkg_TestBooleans.TestOutArrays", (6, obj))
-    assert obj.aslist() == [True, False, True, False, True, False]
-
-
-def test_3204(conn, cursor):
-    "3204 - test binding a PL/SQL date collection (in)"
-    type_obj = conn.gettype("PKG_TESTDATEARRAYS.UDT_DATELIST")
-    obj = type_obj.newobject()
-    obj.setelement(1, datetime.datetime(2016, 2, 5))
-    obj.append(datetime.datetime(2016, 2, 8, 12, 15, 30))
-    obj.append(datetime.datetime(2016, 2, 12, 5, 44, 30))
-    result = cursor.callfunc(
-        "pkg_TestDateArrays.TestInArrays",
-        oracledb.NUMBER,
-        (2, datetime.datetime(2016, 2, 1), obj),
-    )
-    assert result == 24.75
-
-
-def test_3205(conn, cursor):
-    "3205 - test binding a PL/SQL date collection (in/out)"
-    type_obj = conn.gettype("PKG_TESTDATEARRAYS.UDT_DATELIST")
-    obj = type_obj.newobject()
-    obj.setelement(1, datetime.datetime(2016, 1, 1))
-    obj.append(datetime.datetime(2016, 1, 7))
-    obj.append(datetime.datetime(2016, 1, 13))
-    obj.append(datetime.datetime(2016, 1, 19))
-    cursor.callproc("pkg_TestDateArrays.TestInOutArrays", (4, obj))
-    expected_values = [
-        datetime.datetime(2016, 1, 8),
-        datetime.datetime(2016, 1, 14),
-        datetime.datetime(2016, 1, 20),
-        datetime.datetime(2016, 1, 26),
-    ]
-    assert obj.aslist() == expected_values
-
-
-def test_3206(conn, cursor):
-    "3206 - test binding a PL/SQL date collection (out)"
-    type_obj = conn.gettype("PKG_TESTDATEARRAYS.UDT_DATELIST")
-    obj = type_obj.newobject()
-    cursor.callproc("pkg_TestDateArrays.TestOutArrays", (3, obj))
-    expected_values = [
-        datetime.datetime(2002, 12, 13, 4, 48),
-        datetime.datetime(2002, 12, 14, 9, 36),
-        datetime.datetime(2002, 12, 15, 14, 24),
-    ]
-    assert obj.aslist() == expected_values
-
-
-def test_3207(conn, cursor):
-    "3207 - test binding a PL/SQL number collection (in)"
-    type_name = "PKG_TESTNUMBERARRAYS.UDT_NUMBERLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    obj.setelement(1, 10)
-    obj.extend([20, 30, 40, 50])
-    result = cursor.callfunc(
-        "pkg_TestNumberArrays.TestInArrays", int, (5, obj)
-    )
-    assert result == 155
-
-
-def test_3208(conn, cursor):
-    "3208 - test binding a PL/SQL number collection (in/out)"
-    type_name = "PKG_TESTNUMBERARRAYS.UDT_NUMBERLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    obj.setelement(1, 5)
-    obj.extend([8, 3, 2])
-    cursor.callproc("pkg_TestNumberArrays.TestInOutArrays", (4, obj))
-    assert obj.aslist() == [50, 80, 30, 20]
-
-
-def test_3209(conn, cursor):
-    "3209 - test binding a PL/SQL number collection (out)"
-    type_name = "PKG_TESTNUMBERARRAYS.UDT_NUMBERLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    cursor.callproc("pkg_TestNumberArrays.TestOutArrays", (3, obj))
-    assert obj.aslist() == [100, 200, 300]
-
-
-def test_3210(conn, cursor):
-    "3210 - test binding an array of PL/SQL records (in)"
-    rec_type = conn.gettype("PKG_TESTRECORDS.UDT_RECORD")
-    array_type = conn.gettype("PKG_TESTRECORDS.UDT_RECORDARRAY")
-    array_obj = array_type.newobject()
-    for i in range(3):
-        obj = rec_type.newobject()
-        obj.NUMBERVALUE = i + 1
-        obj.STRINGVALUE = f"String in record #{i + 1}"
-        obj.DATEVALUE = datetime.datetime(2017, i + 1, 1)
-        obj.TIMESTAMPVALUE = datetime.datetime(2017, 1, i + 1)
-        obj.BOOLEANVALUE = (i % 2) == 1
-        obj.PLSINTEGERVALUE = i * 5
-        obj.BINARYINTEGERVALUE = i * 2
-        array_obj.append(obj)
-    result = cursor.callfunc("pkg_TestRecords.TestInArrays", str, [array_obj])
-    expected_value = (
-        "udt_Record(1, 'String in record #1', "
-        "to_date('2017-01-01', 'YYYY-MM-DD'), "
-        "to_timestamp('2017-01-01 00:00:00', "
-        "'YYYY-MM-DD HH24:MI:SS'), false, 0, 0); "
-        "udt_Record(2, 'String in record #2', "
-        "to_date('2017-02-01', 'YYYY-MM-DD'), "
-        "to_timestamp('2017-01-02 00:00:00', "
-        "'YYYY-MM-DD HH24:MI:SS'), true, 5, 2); "
-        "udt_Record(3, 'String in record #3', "
-        "to_date('2017-03-01', 'YYYY-MM-DD'), "
-        "to_timestamp('2017-01-03 00:00:00', "
-        "'YYYY-MM-DD HH24:MI:SS'), false, 10, 4)"
-    )
-    assert result == expected_value
-
-
-def test_3211(conn, cursor):
-    "3211 - test binding a PL/SQL record (in)"
-    type_obj = conn.gettype("PKG_TESTRECORDS.UDT_RECORD")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 18
-    obj.STRINGVALUE = "A string in a record"
-    obj.DATEVALUE = datetime.datetime(2016, 2, 15)
-    obj.TIMESTAMPVALUE = datetime.datetime(2016, 2, 12, 14, 25, 36)
-    obj.BOOLEANVALUE = False
-    obj.PLSINTEGERVALUE = 21
-    obj.BINARYINTEGERVALUE = 5
-    result = cursor.callfunc("pkg_TestRecords.GetStringRep", str, [obj])
-    expected_value = (
-        "udt_Record(18, 'A string in a record', "
-        "to_date('2016-02-15', 'YYYY-MM-DD'), "
-        "to_timestamp('2016-02-12 14:25:36', "
-        "'YYYY-MM-DD HH24:MI:SS'), false, 21, 5)"
-    )
-    assert result == expected_value
-
-
-def test_3212(conn, cursor):
-    "3212 - test binding a PL/SQL record (out)"
-    type_obj = conn.gettype("PKG_TESTRECORDS.UDT_RECORD")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 5
-    obj.STRINGVALUE = "Test value"
-    obj.DATEVALUE = datetime.datetime.today()
-    obj.TIMESTAMPVALUE = datetime.datetime.today()
-    obj.BOOLEANVALUE = False
-    obj.PLSINTEGERVALUE = 23
-    obj.BINARYINTEGERVALUE = 9
-    cursor.callproc("pkg_TestRecords.TestOut", [obj])
-    assert obj.NUMBERVALUE == 25
-    assert obj.STRINGVALUE == "String in record"
-    assert obj.DATEVALUE == datetime.datetime(2016, 2, 16)
-    assert obj.TIMESTAMPVALUE == datetime.datetime(2016, 2, 16, 18, 23, 55)
-    assert obj.BOOLEANVALUE
-    assert obj.PLSINTEGERVALUE == 45
-    assert obj.BINARYINTEGERVALUE == 10
-
-
-def test_3213(conn, cursor):
-    "3213 - test binding a PL/SQL string collection (in)"
-    type_name = "PKG_TESTSTRINGARRAYS.UDT_STRINGLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    obj.setelement(1, "First element")
-    obj.setelement(2, "Second element")
-    obj.setelement(3, "Third element")
-    result = cursor.callfunc(
-        "pkg_TestStringArrays.TestInArrays", int, (5, obj)
-    )
-    assert result == 45
-
-
-def test_3214(conn, cursor):
-    "3214 - test binding a PL/SQL string collection (in/out)"
-    type_name = "PKG_TESTSTRINGARRAYS.UDT_STRINGLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    obj.setelement(1, "The first element")
-    obj.append("The second element")
-    obj.append("The third and final element")
-    cursor.callproc("pkg_TestStringArrays.TestInOutArrays", (3, obj))
-    expected_values = [
-        "Converted element # 1 originally had length 17",
-        "Converted element # 2 originally had length 18",
-        "Converted element # 3 originally had length 27",
-    ]
-    assert obj.aslist() == expected_values
-
-
-def test_3215(conn, cursor):
-    "3215 - test binding a PL/SQL string collection (out)"
-    type_name = "PKG_TESTSTRINGARRAYS.UDT_STRINGLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    cursor.callproc("pkg_TestStringArrays.TestOutArrays", (4, obj))
-    expected_values = [f"Test out element # {i + 1}" for i in range(4)]
-    assert obj.aslist() == expected_values
-
-
-def test_3216(conn, cursor):
-    "3216 - test binding a PL/SQL string collection (out with holes)"
-    type_name = "PKG_TESTSTRINGARRAYS.UDT_STRINGLIST"
-    type_obj = conn.gettype(type_name)
-    obj = type_obj.newobject()
-    cursor.callproc("pkg_TestStringArrays.TestIndexBy", [obj])
-    assert obj.first() == -1048576
-    assert obj.last() == 8388608
-    assert obj.next(-576) == 284
-    assert obj.prev(284) == -576
-    assert obj.size() == 4
-    assert obj.exists(-576)
-    assert not obj.exists(-577)
-    assert obj.getelement(284) == "Third element"
-    expected_list = [
-        "First element",
-        "Second element",
-        "Third element",
-        "Fourth element",
-    ]
-    assert obj.aslist() == expected_list
-    expected_dict = {
-        -1048576: "First element",
-        -576: "Second element",
-        284: "Third element",
-        8388608: "Fourth element",
-    }
-    assert obj.asdict() == expected_dict
-    obj.delete(-576)
-    obj.delete(284)
-    expected_list.pop(2)
-    expected_list.pop(1)
-    assert obj.aslist() == expected_list
-    expected_dict.pop(-576)
-    expected_dict.pop(284)
-    assert obj.asdict() == expected_dict
-
-
-def test_3217(cursor, test_env):
-    "3217 - test executing with arraydmlrowcounts with exception"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [(1, "First"), (2, "Second"), (2, "Third"), (4, "Fourth")]
-    sql = "insert into TestArrayDML (IntCol,StringCol) values (:1,:2)"
-    with test_env.assert_raises_full_code("ORA-00001"):
-        cursor.executemany(sql, rows, arraydmlrowcounts=True)
-    assert cursor.getarraydmlrowcounts() == [1, 1]
-
-
-def test_3218(cursor):
-    "3218 - test executing delete statement with arraydmlrowcount mode"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [
-        (1, "First", 100),
-        (2, "Second", 200),
-        (3, "Third", 300),
-        (4, "Fourth", 300),
-        (5, "Fifth", 300),
-        (6, "Sixth", 400),
-        (7, "Seventh", 400),
-        (8, "Eighth", 500),
-    ]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-    )
-    rows = [(200,), (300,), (400,)]
-    cursor.executemany(
-        "delete from TestArrayDML where IntCol2 = :1",
-        rows,
-        arraydmlrowcounts=True,
-    )
-    assert cursor.getarraydmlrowcounts() == [1, 3, 2]
-    assert cursor.rowcount == 6
-
-
-def test_3219(cursor):
-    "3219 - test executing update statement with arraydmlrowcount mode"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [
-        (1, "First", 100),
-        (2, "Second", 200),
-        (3, "Third", 300),
-        (4, "Fourth", 300),
-        (5, "Fifth", 300),
-        (6, "Sixth", 400),
-        (7, "Seventh", 400),
-        (8, "Eighth", 500),
-    ]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-    )
-    rows = [("One", 100), ("Two", 200), ("Three", 300), ("Four", 400)]
-    cursor.executemany(
-        "update TestArrayDML set StringCol = :1 where IntCol2 = :2",
-        rows,
-        arraydmlrowcounts=True,
-    )
-    assert cursor.getarraydmlrowcounts() == [1, 1, 3, 2]
-    assert cursor.rowcount == 7
-
-
-def test_3220(cursor):
-    "3220 - test getimplicitresults() returns the correct data"
-    cursor.execute(
-        """
-        declare
-            c1 sys_refcursor;
-            c2 sys_refcursor;
-        begin
-            open c1 for
-                select NullableCol
-                from TestNumbers
-                where IntCol between 3 and 5;
-
-            dbms_sql.return_result(c1);
-
-            open c2 for
-                select NullableCol
-                from TestNumbers
-                where IntCol between 7 and 10;
-
-            dbms_sql.return_result(c2);
-        end;
-        """
-    )
-    results = cursor.getimplicitresults()
-    assert len(results) == 2
-    assert [n for n, in results[0]] == [2924207, None, 59797108943]
-    assert [n for n, in results[1]] == [
-        1222791080775407,
-        None,
-        25004854810776297743,
-        None,
-    ]
-
-
-def test_3221(cursor, test_env):
-    "3221 - test getimplicitresults() without executing a statement"
-    with test_env.assert_raises_full_code("DPY-1004"):
-        cursor.getimplicitresults()
-
-
-def test_3222(cursor):
-    "3222 - test executing insert with multiple distinct batch errors"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [
-        (1, "First", 100),
-        (2, "Second", 200),
-        (2, "Third", 300),
-        (4, "Fourth", 400),
-        (5, "Fourth", 1000),
-    ]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-        batcherrors=True,
-        arraydmlrowcounts=True,
-    )
-    actual_errors = [
-        (error.offset, error.full_code) for error in cursor.getbatcherrors()
-    ]
-    assert actual_errors == [(4, "ORA-01438"), (2, "ORA-00001")]
-    assert cursor.getarraydmlrowcounts() == [1, 1, 0, 1, 0]
-
-
-def test_3223(cursor, test_env):
-    "3223 - test batcherrors mode set to False"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [(1, "First", 100), (2, "Second", 200), (2, "Third", 300)]
-    sql = """insert into TestArrayDML (IntCol, StringCol, IntCol2)
-             values (:1, :2, :3)"""
-    with test_env.assert_raises_full_code("ORA-00001"):
-        cursor.executemany(sql, rows, batcherrors=False)
-
-
-def test_3224(cursor):
-    "3224 - test executing in succession with batch error"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [
-        (1, "First", 100),
-        (2, "Second", 200),
-        (3, "Third", 300),
-        (4, "Second", 300),
-        (5, "Fifth", 300),
-        (6, "Sixth", 400),
-        (6, "Seventh", 400),
-        (8, "Eighth", 100),
-    ]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-        batcherrors=True,
-    )
-    actual_errors = [
-        (error.offset, error.full_code) for error in cursor.getbatcherrors()
-    ]
-    assert actual_errors == [(6, "ORA-00001")]
-    rows = [
-        (101, "First"),
-        (201, "Second"),
-        (3000, "Third"),
-        (900, "Ninth"),
-        (301, "Third"),
-    ]
-    cursor.executemany(
-        "update TestArrayDML set IntCol2 = :1 where StringCol = :2",
-        rows,
-        arraydmlrowcounts=True,
-        batcherrors=True,
-    )
-    actual_errors = [
-        (error.offset, error.full_code) for error in cursor.getbatcherrors()
-    ]
-    assert actual_errors == [(2, "ORA-01438")]
-    assert cursor.getarraydmlrowcounts() == [1, 2, 0, 0, 1]
-    assert cursor.rowcount == 4
-
-
-def test_3225(cursor):
-    "3225 - test using implicit cursors to execute new statements"
-    cursor.execute(
-        """
-        declare
-            c1 sys_refcursor;
-        begin
-            open c1 for
-                select NumberCol
-                from TestNumbers
-                where IntCol between 3 and 5;
-
-            dbms_sql.return_result(c1);
-        end;
-        """
-    )
-    results = cursor.getimplicitresults()
-    assert len(results) == 1
-    assert [n for n, in results[0]] == [3.75, 5, 6.25]
-    results[0].execute("select :1 from dual", [7])
-    (row,) = results[0].fetchone()
-    assert row == 7
-
-
-def test_3226(cursor):
-    "3226 - test batcherrors mode without any errors produced"
-    cursor.execute("truncate table TestArrayDML")
-    rows = [(1, "First", 100), (2, "Second", 200), (3, "Third", 300)]
-    cursor.executemany(
-        """
-        insert into TestArrayDML (IntCol, StringCol, IntCol2)
-        values (:1, :2, :3)
-        """,
-        rows,
-        batcherrors=True,
-    )
-    assert cursor.getbatcherrors() == []
-
-
-def test_3227(cursor):
-    "3227 - test batcherrors mode with multiple executes"
-    cursor.execute("truncate table TestArrayDML")
-    rows_1 = [
-        (1, "Value 1", 100),
-        (2, "Value 2", 200),
-        (2, "Value 2", 200),
-    ]
-    rows_2 = [
-        (3, "Value 3", 300),
-        (3, "Value 3", 300),
-        (4, "Value 4", 400),
-    ]
-    sql = """
-            insert into TestArrayDML (IntCol, StringCol, IntCol2)
-            values (:1, :2, :3)"""
-    cursor.executemany(sql, rows_1, batcherrors=True)
-    actual_errors = [
-        (error.offset, error.full_code) for error in cursor.getbatcherrors()
-    ]
-    assert actual_errors == [(2, "ORA-00001")]
-    cursor.executemany(sql, rows_2, batcherrors=True)
-    actual_errors = [
-        (error.offset, error.full_code) for error in cursor.getbatcherrors()
-    ]
-    assert actual_errors == [(1, "ORA-00001")]
-
-
-def test_3228(conn):
-    "3228 - test %ROWTYPE record type"
-    type_obj = conn.gettype("TESTTEMPTABLE%ROWTYPE")
-    assert type_obj.attributes[3].name == "NUMBERCOL"
-
-
-def test_3229(conn):
-    "3229 - test collection of %ROWTYPE record type"
-    type_name = "PKG_TESTBINDOBJECT.UDT_COLLECTIONROWTYPE"
-    type_obj = conn.gettype(type_name)
-    assert type_obj.element_type.attributes[3].name == "NUMBERCOL"
-
-
-def test_3230(cursor, test_env):
-    "3230 - enabling batcherrors parameter with PL/SQL"
-    with test_env.assert_raises_full_code("DPY-2040"):
-        cursor.executemany("begin null; end;", 30, batcherrors=True)
-
-
-def test_3231(cursor, test_env):
-    "3231 - enabling arraydmlrowcountsbatcherrors parameter with PL/SQL"
-    with test_env.assert_raises_full_code("DPY-2040"):
-        cursor.executemany("begin null; end;", 31, arraydmlrowcounts=True)
-
-
-def test_3232(test_env):
-    "3232 - fetch implicit cursors after closing connection"
-    conn = test_env.get_connection()
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        declare
-            c1 sys_refcursor;
-            c2 sys_refcursor;
-        begin
-            open c1 for
-                select NullableCol
-                from TestNumbers;
-
-            dbms_sql.return_result(c1);
-
-            open c2 for
-                select NullableCol
-                from TestNumbers;
-
-            dbms_sql.return_result(c2);
-        end;
-        """
-    )
-    cursor1, cursor2 = cursor.getimplicitresults()
-    conn.close()
-    with test_env.assert_raises_full_code("DPY-1001"):
-        cursor1.fetchall()
-    with test_env.assert_raises_full_code("DPY-1001"):
-        cursor2.fetchall()
-
-
-def test_3233(conn, test_env):
-    "3233 - fetch implicit cursors after closing parent cursor"
-    cursor = conn.cursor()
-    cursor.execute(
-        """
-        declare
-            c1 sys_refcursor;
-            c2 sys_refcursor;
-        begin
-            open c1 for
-                select NullableCol
-                from TestNumbers
-                where IntCol between 3 and 5;
-
-            dbms_sql.return_result(c1);
-
-            open c2 for
-                select NullableCol
-                from TestNumbers
-                where IntCol between 7 and 10;
-
-            dbms_sql.return_result(c2);
-        end;
-        """
-    )
-    cursor1, cursor2 = cursor.getimplicitresults()
-    cursor.close()
-    if conn.thin:
-        assert [n for n, in cursor1] == [2924207, None, 59797108943]
-        assert [n for n, in cursor2] == [
-            1222791080775407,
-            None,
-            25004854810776297743,
-            None,
-        ]
-    else:
-        with test_env.assert_raises_full_code("DPI-1039"):
-            cursor1.fetchall()
-        with test_env.assert_raises_full_code("DPI-1039"):
-            cursor1.fetchall()
-
-
-def test_3234(conn):
-    "3234 - test PL/SQL record metadata"
-    rec_type = conn.gettype("PKG_TESTRECORDS.UDT_RECORD")
-    expected_metadata = [
-        ("NUMBERVALUE", oracledb.DB_TYPE_NUMBER, 0, -127, None),
-        ("STRINGVALUE", oracledb.DB_TYPE_VARCHAR, None, None, 30),
-        ("DATEVALUE", oracledb.DB_TYPE_DATE, None, None, None),
-        ("TIMESTAMPVALUE", oracledb.DB_TYPE_TIMESTAMP, None, None, None),
-        ("BOOLEANVALUE", oracledb.DB_TYPE_BOOLEAN, None, None, None),
-        (
-            "PLSINTEGERVALUE",
-            oracledb.DB_TYPE_BINARY_INTEGER,
-            None,
-            None,
-            None,
-        ),
-        (
-            "BINARYINTEGERVALUE",
-            oracledb.DB_TYPE_BINARY_INTEGER,
-            None,
-            None,
-            None,
-        ),
-    ]
-    actual_metadata = [
-        (attr.name, attr.type, attr.precision, attr.scale, attr.max_size)
-        for attr in rec_type.attributes
-    ]
-    assert actual_metadata == expected_metadata
diff --git a/tests/test_3300_soda_database.py b/tests/test_3300_soda_database.py
deleted file mode 100644
index c3143b40..00000000
--- a/tests/test_3300_soda_database.py
+++ /dev/null
@@ -1,233 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3300 - Module for testing Simple Oracle Document Access (SODA) Database
-"""
-
-import datetime
-import decimal
-import json
-
-import pytest
-
-
-def _verify_doc(
-    doc,
-    bytes_content,
-    str_content=None,
-    content=None,
-    key=None,
-    media_type="application/json",
-):
-    assert doc.getContentAsBytes() == bytes_content
-    if str_content is not None:
-        assert doc.getContentAsString() == str_content
-    if content is not None:
-        assert doc.getContent() == content
-    assert doc.key == key
-    assert doc.mediaType == media_type
-    assert doc.version is None
-    assert doc.lastModified is None
-    assert doc.createdOn is None
-
-
-def test_3300(soda_db, test_env):
-    "3300 - test creating documents with JSON data"
-    val = {"testKey1": "testValue1", "testKey2": "testValue2"}
-    if test_env.has_client_version(23, 4):
-        str_val = str(val)
-    else:
-        str_val = json.dumps(val)
-    bytes_val = str_val.encode()
-    key = "MyKey"
-    media_type = "text/plain"
-    doc = soda_db.createDocument(val)
-    _verify_doc(doc, bytes_val, str_val, val)
-    str_val = json.dumps(val)
-    bytes_val = str_val.encode()
-    doc = soda_db.createDocument(str_val, key)
-    _verify_doc(doc, bytes_val, str_val, val, key)
-    doc = soda_db.createDocument(bytes_val, key, media_type)
-    _verify_doc(doc, bytes_val, str_val, bytes_val, key, media_type)
-
-
-def test_3301(soda_db):
-    "3301 - test creating documents with raw data"
-    val = b"<html/>"
-    key = "MyRawKey"
-    media_type = "text/html"
-    doc = soda_db.createDocument(val)
-    _verify_doc(doc, val)
-    doc = soda_db.createDocument(val, key)
-    _verify_doc(doc, val, key=key)
-    doc = soda_db.createDocument(val, key, media_type)
-    _verify_doc(doc, val, key=key, media_type=media_type)
-
-
-def test_3302(soda_db):
-    "3302 - test getting collection names from the database"
-    assert soda_db.getCollectionNames() == []
-    names = ["zCol", "dCol", "sCol", "aCol", "gCol"]
-    sorted_names = list(sorted(names))
-    for name in names:
-        soda_db.createCollection(name)
-    assert soda_db.getCollectionNames() == sorted_names
-    assert soda_db.getCollectionNames(limit=2) == sorted_names[:2]
-    assert soda_db.getCollectionNames("a") == sorted_names
-    assert soda_db.getCollectionNames("C") == sorted_names
-    assert soda_db.getCollectionNames("b", limit=3) == sorted_names[1:4]
-    assert soda_db.getCollectionNames("z") == sorted_names[-1:]
-
-
-def test_3303(soda_db):
-    "3303 - test opening a collection"
-    coll = soda_db.openCollection("CollectionThatDoesNotExist")
-    assert coll is None
-    created_coll = soda_db.createCollection("TestOpenCollection")
-    coll = soda_db.openCollection(created_coll.name)
-    assert coll.name == created_coll.name
-
-
-def test_3304(soda_db, conn):
-    "3304 - test SodaDatabase repr() and str()"
-    assert repr(soda_db) == f"<oracledb.SodaDatabase on {conn}>"
-    assert str(soda_db) == f"<oracledb.SodaDatabase on {conn}>"
-
-
-def test_3305(soda_db, test_env):
-    "3305 - test negative cases for SODA database methods"
-    pytest.raises(TypeError, soda_db.createCollection)
-    pytest.raises(TypeError, soda_db.createCollection, 1)
-    with test_env.assert_raises_full_code("ORA-40658"):
-        soda_db.createCollection(None)
-    with test_env.assert_raises_full_code("ORA-40675"):
-        soda_db.createCollection("CollMetadata", 7)
-    pytest.raises(TypeError, soda_db.getCollectionNames, 1)
-
-
-def test_3306(soda_db, test_env):
-    "3306 - test creating documents with JSON data using extended types"
-    if not test_env.has_client_version(23, 4):
-        pytest.skip("unsupported data types")
-    val = {
-        "testKey1": "testValue1",
-        "testKey2": decimal.Decimal("12.78"),
-        "testKey3": datetime.datetime(2023, 7, 3, 11, 10, 24),
-    }
-    doc = soda_db.createDocument(val)
-    str_val = str(val)
-    bytes_val = str_val.encode()
-    _verify_doc(doc, bytes_val, str_val, val)
-
-
-def test_3307(soda_db):
-    "3307 - test creating documents with int scalar value"
-    val = 144
-    str_val = "144"
-    bytes_val = b"144"
-    key = "MyKey"
-    media_type = "application/json"
-    doc = soda_db.createDocument(val)
-    _verify_doc(doc, bytes_val, str_val, val)
-    doc = soda_db.createDocument(val, key)
-    _verify_doc(doc, bytes_val, str_val, val, key)
-    doc = soda_db.createDocument(val, key, media_type)
-    _verify_doc(doc, bytes_val, str_val, val, key, media_type)
-
-
-def test_3308(soda_db, test_env):
-    "3308 - test creating documents with float scalar value"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("data types serialized differently")
-    val = 12.2
-    str_val = "12.2"
-    bytes_val = b"12.2"
-    decimal_val = decimal.Decimal(str_val)
-    key = "MyKey"
-    media_type = "application/json"
-    doc = soda_db.createDocument(val)
-    _verify_doc(doc, bytes_val, str_val, decimal_val)
-    doc = soda_db.createDocument(val, key)
-    _verify_doc(doc, bytes_val, str_val, decimal_val, key)
-    doc = soda_db.createDocument(val, key, media_type)
-    _verify_doc(doc, bytes_val, str_val, decimal_val, key, media_type)
-
-
-def test_3309(soda_db, test_env):
-    "3309 - test creating documents with a list"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("unsupported data types")
-    val = [12, "str", b"bytes", [1], {"dict": "3"}]
-    decimal_val = [
-        decimal.Decimal("12"),
-        "str",
-        b"bytes",
-        [decimal.Decimal("1")],
-        {"dict": "3"},
-    ]
-    str_val = "[Decimal('12'), 'str', b'bytes', [Decimal('1')], {'dict': '3'}]"
-    bytes_val = (
-        b"[Decimal('12'), 'str', b'bytes', [Decimal('1')], {'dict': '3'}]"
-    )
-    key = "MyKey"
-    media_type = "application/json"
-    doc = soda_db.createDocument(val)
-    _verify_doc(doc, bytes_val, str_val, decimal_val)
-    doc = soda_db.createDocument(val, key)
-    _verify_doc(doc, bytes_val, str_val, decimal_val, key)
-    doc = soda_db.createDocument(val, key, media_type)
-    _verify_doc(doc, bytes_val, str_val, decimal_val, key, media_type)
-
-
-def test_3310(soda_db, test_env):
-    "3310 - test creating documents with a boolean scalar value"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("data types serialized differently")
-    test_values = [(True, "True", b"True"), (False, "False", b"False")]
-    key = "MyKey"
-    media_type = "application/json"
-    for val, str_val, bytes_val in test_values:
-        doc = soda_db.createDocument(val)
-        _verify_doc(doc, bytes_val, str_val, val)
-        doc = soda_db.createDocument(val, key)
-        _verify_doc(doc, bytes_val, str_val, val, key)
-        doc = soda_db.createDocument(val, key, media_type)
-        _verify_doc(doc, bytes_val, str_val, val, key, media_type)
-
-
-def test_3311(soda_db, test_env):
-    "3311 - test creating documents with unsupported types"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("data types serialized differently")
-    values = [
-        tuple([144, 2]),
-        set("144"),
-        bytearray("omg", "utf-8"),
-        complex(2j),
-        range(4),
-    ]
-    for value in values:
-        with test_env.assert_raises_full_code("DPY-3003"):
-            soda_db.createDocument(value)
diff --git a/tests/test_3400_soda_collection.py b/tests/test_3400_soda_collection.py
deleted file mode 100644
index 325183a5..00000000
--- a/tests/test_3400_soda_collection.py
+++ /dev/null
@@ -1,1009 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3400 - Module for testing Simple Oracle Document Access (SODA) Collections
-"""
-
-import datetime
-import decimal
-import json
-import re
-
-import oracledb
-import pytest
-
-
-@pytest.fixture
-def skip_if_map_mode_not_supported(test_env):
-    """
-    Map mode is not supported in Oracle Client version 23.
-    """
-    if test_env.has_client_version(23):
-        pytest.skip("map mode not supported with native collections")
-
-
-@pytest.fixture
-def skip_if_save_not_supported(test_env):
-    """
-    save() is not supported in Oracle Database version 23. It also requires
-    a minimum client version of 19.9 as well.
-    """
-    if test_env.has_client_version(23):
-        pytest.skip("save() is not implemented in Oracle Database version 23")
-    if not test_env.has_client_version(19, 9):
-        pytest.skip("unsupported client")
-
-
-def _normalize_docs(docs):
-    """
-    Remove the embedded OID added in Oracle Database version 23, if found,
-    in order to ease comparison.
-    """
-    for doc in docs:
-        if doc is not None and "_id" in doc:
-            del doc["_id"]
-
-
-def _test_skip(coll, num_to_skip, expected_content):
-    filter_spec = {"$orderby": [{"path": "name", "order": "desc"}]}
-    doc = coll.find().filter(filter_spec).skip(num_to_skip).getOne()
-    content = doc.getContent() if doc is not None else None
-    _normalize_docs([content])
-    assert content == expected_content
-
-
-def test_3400(soda_db, test_env):
-    "3400 - test inserting invalid JSON value into SODA collection"
-    invalid_json = "{testKey:testValue}"
-    coll = soda_db.createCollection("InvalidJSON")
-    doc = soda_db.createDocument(invalid_json)
-    with test_env.assert_raises_full_code("ORA-40780", "ORA-02290"):
-        coll.insertOne(doc)
-
-
-def test_3401(soda_db, conn):
-    "3401 - test inserting documents into a SODA collection"
-    coll = soda_db.createCollection("TestInsertDocs")
-    values_to_insert = [
-        {"name": "George", "age": 47},
-        {"name": "Susan", "age": 39},
-        {"name": "John", "age": 50},
-        {"name": "Jill", "age": 54},
-    ]
-    inserted_keys = []
-    for value in values_to_insert:
-        doc = coll.insertOneAndGet(value)
-        inserted_keys.append(doc.key)
-    conn.commit()
-    assert coll.find().count() == len(values_to_insert)
-    for key, value in zip(inserted_keys, values_to_insert):
-        doc = coll.find().key(key).getOne().getContent()
-        _normalize_docs([doc])
-        assert doc == value
-
-
-def test_3402(soda_db, conn):
-    "3402 - test skipping documents in a SODA collection"
-    coll = soda_db.createCollection("TestSkipDocs")
-    values_to_insert = [
-        {"name": "Anna", "age": 62},
-        {"name": "Mark", "age": 37},
-        {"name": "Martha", "age": 43},
-        {"name": "Matthew", "age": 28},
-    ]
-    for value in values_to_insert:
-        coll.insertOne(value)
-    conn.commit()
-    _test_skip(coll, 0, values_to_insert[3])
-    _test_skip(coll, 1, values_to_insert[2])
-    _test_skip(coll, 3, values_to_insert[0])
-    _test_skip(coll, 4, None)
-    _test_skip(coll, 125, None)
-
-
-def test_3403(soda_db, conn):
-    "3403 - test replace documents in SODA collection"
-    coll = soda_db.createCollection("TestReplaceDoc")
-    content = {"name": "John", "address": {"city": "Sydney"}}
-    doc = coll.insertOneAndGet(content)
-    new_content = {"name": "John", "address": {"city": "Melbourne"}}
-    replaced = coll.find().key(doc.key).replaceOne(new_content)
-    assert replaced
-    conn.commit()
-    doc = coll.find().key(doc.key).getOne().getContent()
-    _normalize_docs([doc])
-    assert doc == new_content
-
-
-def test_3404(soda_db, conn):
-    "3404 - test search documents with different QBEs"
-    coll = soda_db.createCollection("TestSearchDocContent")
-    data = [
-        {
-            "name": "John",
-            "age": 22,
-            "birthday": "2000-12-15",
-            "locations": [{"city": "Bangalore"}, {"city": "Other"}],
-        },
-        {
-            "name": "Johnson",
-            "age": 45,
-            "birthday": "1978-02-03",
-            "locations": [{"city": "Banaras"}, {"city": "Manhattan"}],
-        },
-        {
-            "name": "William",
-            "age": 32,
-            "birthday": "1991-05-17",
-            "locations": {"city": "New Banaras"},
-        },
-    ]
-    coll.insertMany(data)
-    conn.commit()
-
-    # create index so $contains works
-    index = {"name": "js_ix_3404"}
-    coll.createIndex(index)
-
-    filter_specs = [
-        ({"name": {"$contains": "John"}}, 1),
-        ({"age": {"$contains": "45"}}, 1),
-        ({"name": {"$like": "J%n"}}, 2),
-        ({"name": {"$regex": ".*[ho]n"}}, 2),
-        ("""{"locations.city": {"$regex": "^Ban.*"}}""", 2),
-        ({"birthday": {"$date": {"$gt": "2000-01-01"}}}, 1),
-        ({"birthday": {"$date": "2000-12-15"}}, 1),
-        ({"age": {"$gt": 18}}, 3),
-        ({"age": {"$lt": 25}}, 1),
-        (
-            {
-                "$or": [
-                    {"age": {"$gt": 50}},
-                    {"locations[*].city": {"$like": "%Ban%"}},
-                ]
-            },
-            3,
-        ),
-        (
-            {
-                "$and": [
-                    {"age": {"$gt": 40}},
-                    {"locations[0 to 1].city": {"$like": "%aras"}},
-                ]
-            },
-            1,
-        ),
-        ({"name": {"$hasSubstring": "John"}}, 2),
-        ({"name": {"$instr": "John"}}, 2),
-        ({"name": {"$startsWith": "John"}}, 2),
-        ({"name": {"$upper": {"$startsWith": "JO"}}}, 2),
-        ({"age": {"$not": {"$eq": 22}}}, 2),
-        ({"age": {"$not": {"$lt": 30, "$gt": 10}}}, 2),
-        ({"locations": {"$type": "array"}}, 2),
-    ]
-    for filter_spec, expected_count in filter_specs:
-        assert (
-            coll.find().filter(filter_spec).count() == expected_count
-        ), filter_spec
-
-
-def test_3405(soda_db, conn):
-    "3405 - test removing documents"
-    coll = soda_db.createCollection("TestRemoveDocs")
-    data = [
-        {"name": "John", "address": {"city": "Bangalore"}},
-        {"name": "Johnson", "address": {"city": "Banaras"}},
-        {"name": "Joseph", "address": {"city": "Mangalore"}},
-        {"name": "Jibin", "address": {"city": "Secunderabad"}},
-        {"name": "Andrew", "address": {"city": "Hyderabad"}},
-        {"name": "Matthew", "address": {"city": "Mumbai"}},
-    ]
-    docs = [coll.insertOneAndGet(v) for v in data]
-    assert coll.find().key(docs[3].key).remove() == 1
-    assert coll.find().count() == len(data) - 1
-    search_results = coll.find().filter({"name": {"$like": "Jibin"}})
-    assert search_results.count() == 0
-    assert coll.find().filter({"name": {"$like": "John%"}}).remove() == 2
-    assert coll.find().count() == len(data) - 3
-    assert coll.find().filter({"name": {"$regex": "J.*"}}).remove() == 1
-    assert coll.find().count() == len(data) - 4
-    conn.commit()
-
-
-def test_3406(soda_db, conn, test_env):
-    "3406 - test create and drop Index"
-    index_name = "TestIndexes_ix_1"
-    index_spec = {
-        "name": index_name,
-        "fields": [
-            {"path": "address.city", "datatype": "string", "order": "asc"}
-        ],
-    }
-    coll = soda_db.createCollection("TestIndexes")
-    conn.commit()
-    coll.dropIndex(index_name)
-    coll.createIndex(index_spec)
-    pytest.raises(TypeError, coll.createIndex, 3)
-    with test_env.assert_raises_full_code("ORA-40733"):
-        coll.createIndex(index_spec)
-    assert coll.dropIndex(index_name)
-    assert not coll.dropIndex(index_name)
-
-
-def test_3407(soda_db, conn):
-    "3407 - test getting documents from Collection"
-    conn.autocommit = True
-    coll = soda_db.createCollection("TestGetDocs")
-    data = [
-        {"name": "John", "address": {"city": "Bangalore"}},
-        {"name": "Johnson", "address": {"city": "Banaras"}},
-        {"name": "Joseph", "address": {"city": "Mangalore"}},
-        {"name": "Jibin", "address": {"city": "Secunderabad"}},
-        {"name": "Andrew", "address": {"city": "Hyderabad"}},
-    ]
-    inserted_keys = list(sorted(coll.insertOneAndGet(v).key for v in data))
-    fetched_keys = list(sorted(doc.key for doc in coll.find().getDocuments()))
-    assert fetched_keys == inserted_keys
-
-
-def test_3408(soda_db, conn):
-    "3408 - test fetching documents from a cursor"
-    conn.autocommit = True
-    coll = soda_db.createCollection("TestFindViaCursor")
-    data = [
-        {"name": "John", "address": {"city": "Bangalore"}},
-        {"name": "Johnson", "address": {"city": "Banaras"}},
-        {"name": "Joseph", "address": {"city": "Mangalore"}},
-    ]
-    inserted_keys = list(sorted(coll.insertOneAndGet(v).key for v in data))
-    fetched_keys = list(sorted(doc.key for doc in coll.find().getCursor()))
-    assert fetched_keys == inserted_keys
-
-
-def test_3409(soda_db, conn):
-    "3409 - test removing multiple documents using multiple keys"
-    coll = soda_db.createCollection("TestRemoveMultipleDocs")
-    data = [
-        {"name": "John", "address": {"city": "Bangalore"}},
-        {"name": "Johnson", "address": {"city": "Banaras"}},
-        {"name": "Joseph", "address": {"city": "Mangalore"}},
-        {"name": "Jibin", "address": {"city": "Secunderabad"}},
-        {"name": "Andrew", "address": {"city": "Hyderabad"}},
-        {"name": "Matthew", "address": {"city": "Mumbai"}},
-    ]
-    docs = [coll.insertOneAndGet(v) for v in data]
-    keys = [docs[i].key for i in (1, 3, 5)]
-    num_removed = coll.find().keys(keys).remove()
-    assert num_removed == len(keys)
-    assert coll.find().count() == len(data) - len(keys)
-    conn.commit()
-
-
-def test_3410(soda_db, conn):
-    "3410 - test using version to get documents and remove them"
-    coll = soda_db.createCollection("TestDocumentVersion")
-    content = {"name": "John", "address": {"city": "Bangalore"}}
-    inserted_doc = coll.insertOneAndGet(content)
-    key = inserted_doc.key
-    version = inserted_doc.version
-    doc = coll.find().key(key).version(version).getOne().getContent()
-    _normalize_docs([doc])
-    assert doc == content
-    new_content = {"name": "James", "address": {"city": "Delhi"}}
-    replaced_doc = coll.find().key(key).replaceOneAndGet(new_content)
-    new_version = replaced_doc.version
-    doc = coll.find().key(key).version(version).getOne()
-    assert doc is None
-    doc = coll.find().key(key).version(new_version).getOne().getContent()
-    _normalize_docs([doc])
-    assert doc == new_content
-    assert coll.find().key(key).version(version).remove() == 0
-    assert coll.find().key(key).version(new_version).remove() == 1
-    assert coll.find().count() == 0
-    conn.commit()
-
-
-def test_3411(soda_db, conn):
-    "3411 - test keys with GetCursor"
-    coll = soda_db.createCollection("TestKeysWithGetCursor")
-    values_to_insert = [
-        {"name": "John", "address": {"city": "Bangalore"}},
-        {"name": "Johnson", "address": {"city": "Banaras"}},
-        {"name": "Joseph", "address": {"city": "Mangalore"}},
-        {"name": "Jibin", "address": {"city": "Secunderabad"}},
-        {"name": "Andrew", "address": {"city": "Hyderabad"}},
-        {"name": "Matthew", "address": {"city": "Mumbai"}},
-    ]
-    docs = [coll.insertOneAndGet(value) for value in values_to_insert]
-    keys = [docs[i].key for i in (2, 4, 5)]
-    fetched_keys = [doc.key for doc in coll.find().keys(keys).getCursor()]
-    assert list(sorted(fetched_keys)) == list(sorted(keys))
-    conn.commit()
-
-
-def test_3412(soda_db):
-    "3412 - test createdOn attribute of Document"
-    coll = soda_db.createCollection("CreatedOn")
-    data = {"name": "John", "address": {"city": "Bangalore"}}
-    doc = coll.insertOneAndGet(data)
-    assert doc.createdOn == doc.lastModified
-
-
-def test_3413(soda_db, conn, test_env):
-    "3413 - test Soda truncate"
-    if not test_env.has_client_version(20):
-        pytest.skip("unsupported client")
-    coll = soda_db.createCollection("TestTruncateDocs")
-    values_to_insert = [
-        {"name": "George", "age": 47},
-        {"name": "Susan", "age": 39},
-        {"name": "John", "age": 50},
-        {"name": "Jill", "age": 54},
-    ]
-    for value in values_to_insert:
-        coll.insertOne(value)
-    conn.commit()
-    assert coll.find().count() == len(values_to_insert)
-    coll.truncate()
-    assert coll.find().count() == 0
-
-
-def test_3414(soda_db, cursor, test_env):
-    "3414 - verify hints are reflected in the executed SQL statement"
-    if not test_env.has_client_version(19, 11):
-        pytest.skip("client version not supported")
-    statement = """
-            SELECT
-                ( SELECT t2.sql_fulltext
-                  FROM v$sql t2
-                  WHERE t2.sql_id = t1.prev_sql_id
-                    AND t2.child_number = t1.prev_child_number
-                )
-            FROM v$session t1
-            WHERE t1.audsid = sys_context('userenv', 'sessionid')"""
-    coll = soda_db.createCollection("TestSodaHint")
-    values_to_insert = [
-        {"name": "George", "age": 47},
-        {"name": "Susan", "age": 39},
-    ]
-    coll.insertOneAndGet(values_to_insert[0], hint="MONITOR")
-    cursor.execute(statement)
-    (result,) = cursor.fetchone()
-    assert "MONITOR" in result.read()
-
-    coll.find().hint("MONITOR").getOne().getContent()
-    cursor.execute(statement)
-    (result,) = cursor.fetchone()
-    assert "MONITOR" in result.read()
-
-    coll.insertOneAndGet(values_to_insert[1], hint="NO_MONITOR")
-    cursor.execute(statement)
-    (result,) = cursor.fetchone()
-    assert "NO_MONITOR" in result.read()
-
-
-def test_3415(soda_db):
-    "3415 - test error for invalid type for soda hint"
-    coll = soda_db.createCollection("InvalidSodaHint")
-    pytest.raises(
-        TypeError, coll.insertOneAndGet, dict(name="Fred", age=16), hint=5
-    )
-    pytest.raises(
-        TypeError,
-        coll.insertManyAndGet,
-        dict(name="George", age=25),
-        hint=10,
-    )
-    pytest.raises(
-        TypeError, coll.saveAndGet, dict(name="Sally", age=36), hint=5
-    )
-    pytest.raises(TypeError, coll.find().hint, 2)
-
-
-def test_3416(soda_db):
-    "3416 - test name and metadata attribute"
-    collection_name = "TestCollectionMetadata"
-    coll = soda_db.createCollection(collection_name)
-    assert coll.name == collection_name
-    assert coll.metadata["tableName"] == collection_name
-
-
-def test_3417(soda_db, conn, test_env):
-    "3417 - test insertMany"
-    if not test_env.has_client_version(18, 5):
-        pytest.skip("unsupported client")
-    coll = soda_db.createCollection("TestInsertMany")
-    values_to_insert = [
-        dict(name="George", age=25),
-        soda_db.createDocument(dict(name="Lucas", age=47)),
-    ]
-    coll.insertMany(values_to_insert)
-    conn.commit()
-    fetched_values = [doc.getContent() for doc in coll.find().getCursor()]
-    fetched_values.sort(key=lambda x: x["name"])
-    for fetched_val, expected_val in zip(fetched_values, values_to_insert):
-        if not isinstance(expected_val, dict):
-            expected_val = expected_val.getContent()
-        assert fetched_val == fetched_val
-    with test_env.assert_raises_full_code("DPI-1031"):
-        coll.insertMany([])
-
-
-def test_3418(skip_if_save_not_supported, soda_db, conn, test_env):
-    "3418 - test save"
-    coll = soda_db.createCollection("TestSodaSave")
-    values_to_save = [
-        dict(name="Jill", age=37),
-        soda_db.createDocument(dict(name="John", age=7)),
-        soda_db.createDocument(dict(name="Charles", age=24)),
-    ]
-    for value in values_to_save:
-        coll.save(value)
-    conn.commit()
-    fetched_docs = coll.find().getDocuments()
-    for fetched_doc, expected_doc in zip(fetched_docs, values_to_save):
-        if isinstance(expected_doc, dict):
-            expected_doc = soda_db.createDocument(expected_doc)
-        assert fetched_doc.getContent() == expected_doc.getContent()
-
-
-def test_3419(skip_if_save_not_supported, soda_db, cursor, test_env):
-    "3419 - test saveAndGet with hint"
-    statement = """
-            SELECT
-                ( SELECT t2.sql_fulltext
-                  FROM v$sql t2
-                  WHERE t2.sql_id = t1.prev_sql_id
-                    AND t2.child_number = t1.prev_child_number
-                )
-            FROM v$session t1
-            WHERE t1.audsid = sys_context('userenv', 'sessionid')"""
-    coll = soda_db.createCollection("TestSodaSaveWithHint")
-
-    values_to_save = [
-        dict(name="Jordan", age=59),
-        dict(name="Curry", age=34),
-    ]
-    hints = ["MONITOR", "NO_MONITOR"]
-    for value, hint in zip(values_to_save, hints):
-        coll.saveAndGet(value, hint=hint)
-        coll.find().hint(hint).getOne().getContent()
-        cursor.execute(statement)
-        (result,) = cursor.fetchone()
-        assert hint in result.read()
-
-
-def test_3420(skip_if_save_not_supported, soda_db, conn):
-    "3420 - test saveAndGet"
-    coll = soda_db.createCollection("TestSodaSaveAndGet")
-    values_to_save = [
-        dict(name="John", age=50),
-        soda_db.createDocument(dict(name="Mark", age=45)),
-        soda_db.createDocument(dict(name="Jill", age=32)),
-    ]
-    inserted_keys = []
-    for value in values_to_save:
-        doc = coll.saveAndGet(value)
-        inserted_keys.append(doc.key)
-    fetched_docs = coll.find().getDocuments()
-    conn.commit()
-    assert coll.find().count() == len(values_to_save)
-    for key, fetched_doc in zip(inserted_keys, fetched_docs):
-        doc = coll.find().key(key).getOne()
-        assert doc.getContent() == fetched_doc.getContent()
-
-
-def test_3421(soda_db, conn, test_env):
-    "3421 - test insert many and get"
-    if not test_env.has_client_version(18, 5):
-        pytest.skip("unsupported client")
-    for name in soda_db.getCollectionNames():
-        soda_db.openCollection(name).drop()
-    coll = soda_db.createCollection("TestInsertManyAndGet")
-    values_to_insert = [
-        dict(name="George", age=25),
-        soda_db.createDocument(dict(name="Lucas", age=47)),
-    ]
-    docs = coll.insertManyAndGet(values_to_insert)
-    inserted_keys = [doc.key for doc in docs]
-    conn.commit()
-    assert coll.find().count() == len(values_to_insert)
-    for key, expected_doc in zip(inserted_keys, values_to_insert):
-        if isinstance(expected_doc, dict):
-            expected_doc = soda_db.createDocument(expected_doc)
-        doc = coll.find().key(key).getOne().getContent()
-        _normalize_docs([doc])
-        assert doc == expected_doc.getContent()
-
-
-def test_3422(soda_db, test_env):
-    "3422 - close document cursor and confirm exception is raised"
-    coll = soda_db.createCollection("TestCloseSodaDocCursor")
-    cursor = coll.find().getCursor()
-    cursor.close()
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.close()
-    with test_env.assert_raises_full_code("DPY-1006"):
-        next(cursor)
-
-
-def test_3423(soda_db, conn):
-    "3423 - test limit to get specific amount of documents"
-    coll = soda_db.createCollection("TestSodaLimit")
-    values_to_insert = [{"group": "Camila"} for i in range(20)]
-    coll.insertMany(values_to_insert)
-    conn.commit()
-    docs = coll.find().getDocuments()
-    assert len(docs) == len(values_to_insert)
-    docs = coll.find().limit(3).getDocuments()
-    assert len(docs) == 3
-
-
-def test_3424(soda_db, conn, test_env):
-    "3424 - get count exceptions when using limit and skip"
-    coll = soda_db.createCollection("TestSodaCountExceptions")
-    data = [{"song": "WYMCA"} for i in range(20)]
-    coll.insertMany(data)
-    conn.commit()
-    with test_env.assert_raises_full_code("ORA-40748"):
-        coll.find().limit(5).count()
-    with test_env.assert_raises_full_code("ORA-40748"):
-        coll.find().skip(10).count()
-
-
-def test_3425(skip_if_map_mode_not_supported, soda_db, conn, test_env):
-    "3425 - test mapMode parameter"
-    data = [{"price": 4900}, {"price": 8}]
-    expected_data = data * 2
-
-    original_coll = soda_db.createCollection("TestCollMapMode")
-    original_coll.insertMany(data)
-    mapped_coll = soda_db.createCollection("TestCollMapMode", mapMode=True)
-    mapped_coll.insertMany(data)
-
-    for coll in [original_coll, mapped_coll]:
-        fetched_data = list(
-            doc.getContent() for doc in coll.find().getDocuments()
-        )
-        _normalize_docs(fetched_data)
-        assert fetched_data == expected_data
-        with test_env.assert_raises_full_code("ORA-40626"):
-            coll.drop()
-    conn.commit()
-    assert original_coll.drop()
-    assert not mapped_coll.drop()
-
-
-def test_3426(skip_if_map_mode_not_supported, soda_db, test_env):
-    "3426 - test mapping a new collection from an non-existent table"
-    with test_env.assert_raises_full_code("ORA-40623"):
-        soda_db.createCollection("TestSodaMapNonExistent", mapMode=True)
-
-
-def test_3427(soda_db):
-    "3427 - test negative cases for SodaOperation methods"
-    coll = soda_db.createCollection("TestSodaOperationNegative")
-    pytest.raises(TypeError, coll.find().filter, 5)
-    pytest.raises(TypeError, coll.find().key, 2)
-    pytest.raises(TypeError, coll.find().keys, [1, 2, 3])
-    pytest.raises(TypeError, coll.find().skip, "word")
-    pytest.raises(TypeError, coll.find().skip, -5)
-    pytest.raises(TypeError, coll.find().version, 1971)
-    pytest.raises(TypeError, coll.find().limit, "a word")
-
-
-def test_3428(soda_db, conn, round_trip_checker, test_env):
-    "3428 - test fetchArraySize"
-    if not test_env.has_client_version(19, 5):
-        pytest.skip("unsupported client")
-    coll = soda_db.createCollection("TestSodaFetchArraySize")
-    for i in range(90):
-        coll.insertOne({"name": "Emmanuel", "age": i + 1})
-    conn.commit()
-
-    # setting array size to 0 will use the default value of 100
-    # requires a single round-trip
-    round_trip_checker.get_value()
-    coll.find().fetchArraySize(0).getDocuments()
-    assert round_trip_checker.get_value() == 1
-
-    # setting array size to 1 requires a round-trip for each SodaDoc
-    coll.find().fetchArraySize(1).getDocuments()
-    assert round_trip_checker.get_value() == 91
-
-    # setting array size to 20 requires 5 round-trips
-    coll.find().fetchArraySize(20).getDocuments()
-    assert round_trip_checker.get_value() == 5
-
-    # getting a SodaDocCursor requires a round-trip
-    coll.find().fetchArraySize(0).getCursor()
-    assert round_trip_checker.get_value() == 1
-
-    # setting array size to 1 and iterating the SodaDocCursor requires a
-    # round-trip for each SodaDoc
-    soda_doc_cursor = coll.find().fetchArraySize(1).getCursor()
-    for soda_doc in soda_doc_cursor:
-        continue
-    assert round_trip_checker.get_value() == 91
-
-    # setting array size to 50 and iterating the SodaDocCursor requires
-    # two round-trips
-    soda_doc_cursor = coll.find().fetchArraySize(50).getCursor()
-    for soda_doc in soda_doc_cursor:
-        continue
-    assert round_trip_checker.get_value() == 2
-
-    # check a few negative scenarios
-    pytest.raises(TypeError, coll.find().fetchArraySize, "Mijares")
-    pytest.raises(TypeError, coll.find().fetchArraySize, -1)
-
-
-def test_3429(soda_db, test_env):
-    "3429 - test getting indexes on a collection"
-    test_env.skip_unless_client_version(19, 13)
-    coll = soda_db.createCollection("TestSodaListIndexes")
-    index_1 = {
-        "name": "ix_3428-1",
-        "fields": [
-            {"path": "address.city", "datatype": "string", "order": "asc"}
-        ],
-    }
-    index_2 = {
-        "name": "ix_3428-2",
-        "fields": [
-            {
-                "path": "address.postal_code",
-                "datatype": "string",
-                "order": "asc",
-            }
-        ],
-    }
-    assert coll.listIndexes() == []
-    coll.createIndex(index_1)
-    coll.createIndex(index_2)
-    indexes = coll.listIndexes()
-    indexes.sort(key=lambda x: x["name"])
-    assert indexes[0]["fields"][0]["path"] == "address.city"
-    assert indexes[1]["fields"][0]["path"] == "address.postal_code"
-
-
-def test_3430(soda_db, test_env):
-    "3430 - test locking documents on fetch"
-    if not test_env.has_client_version(19, 11):
-        pytest.skip("unsupported client")
-    coll = soda_db.createCollection("TestSodaLockDocs")
-    values_to_insert = [
-        {"name": "Bob", "age": 46},
-        {"name": "Barb", "age": 45},
-        {"name": "Sandy", "age": 47},
-    ]
-    coll.insertMany(values_to_insert)
-    coll.find().lock().getDocuments()
-
-
-def test_3431(soda_db):
-    "3431 - test that drop returns the correct boolean"
-    coll = soda_db.createCollection("TestDropCollection")
-    assert coll.drop()
-
-    # the collection has already been dropped
-    assert not coll.drop()
-
-
-def test_3432(skip_if_map_mode_not_supported, soda_db):
-    "3432 - test drop with an empty mapped collection"
-    original_coll = soda_db.createCollection("TestDropMapMode")
-    mapped_coll = soda_db.createCollection("TestDropMapMode", mapMode=True)
-    assert mapped_coll.drop()
-    assert not original_coll.drop()
-
-
-def test_3433(soda_db, conn):
-    "3433 - test that replaceOne() returns a correct boolean"
-    coll = soda_db.createCollection("TestReplaceDocReturns")
-    doc = coll.insertOneAndGet({"address": {"city": "Sydney"}})
-
-    new_content = {"address": {"city": "Melbourne"}}
-    assert coll.find().key(doc.key).replaceOne(new_content)
-
-    unregistered_key = "DB4A2628F1E0985C891F3F4836"
-    assert not coll.find().key(unregistered_key).replaceOne(new_content)
-    conn.commit()
-
-
-def test_3434(soda_db, test_env):
-    "3434 - replaceOne() and replaceOneAndGet() with invalid scenarios"
-    coll = soda_db.createCollection("TestReplaceOneNegative")
-    coll.insertMany([{"Wisdom": 1.7} for d in range(2)])
-    keys = [d.key for d in coll.find().getDocuments()]
-    with test_env.assert_raises_full_code("ORA-40734"):
-        coll.find().keys(keys).replaceOne({"data": "new"})
-    with test_env.assert_raises_full_code("ORA-40734"):
-        coll.find().keys(keys).replaceOneAndGet({"data": "new"})
-
-
-def test_3435(soda_db, test_env):
-    "3435 - test writting a read-only collection"
-    if not test_env.has_client_version(19, 9):
-        pytest.skip("client version not supported")
-
-    metadata = {
-        "readOnly": True,
-    }
-    coll = soda_db.createCollection("TestCollReadOnly", metadata)
-
-    methods = [
-        coll.insertOne,
-        coll.insertOneAndGet,
-        coll.insertMany,
-        coll.insertManyAndGet,
-        coll.save,
-        coll.saveAndGet,
-    ]
-    for method in methods:
-        with test_env.assert_raises_full_code("ORA-40663"):
-            method({"Song 1": "No end"})
-
-
-def test_3436(soda_db):
-    "3436 - createCollection() with the same name and metadata"
-    coll_name = "TestCollSameMetadata"
-    coll1 = soda_db.createCollection(coll_name, {"readOnly": True})
-    coll2 = soda_db.createCollection(coll_name, {"readOnly": True})
-    assert coll1.drop()
-    assert not coll2.drop()
-
-
-def test_3437(soda_db, test_env):
-    "3437 - createCollection() with the same name but different metadata"
-    coll_name = "TestCollDifferentMetadata"
-    coll = soda_db.createCollection(coll_name)
-    with test_env.assert_raises_full_code("ORA-40669"):
-        soda_db.createCollection(coll_name, {"readOnly": False})
-    coll.drop()
-
-    coll = soda_db.createCollection(coll_name, {"readOnly": True})
-    with test_env.assert_raises_full_code("ORA-40669"):
-        soda_db.createCollection(coll_name, {"readOnly": False})
-
-
-def test_3438(soda_db, conn, test_env):
-    "3438 - test getDataGuide() with an index with data-guide support"
-    coll = soda_db.createCollection("TestSodaDataGuideEnabled")
-    data = [
-        {
-            "team": "backend",
-            "created_in": 2001,
-            "members": [{"developer": "Joseph"}, {"tester": "Mark"}],
-        },
-        {"team": "frontend", "area": "user interface"},
-    ]
-    coll.insertMany(data)
-    conn.commit()
-    index = {
-        "name": "ix_3438",
-        "dataguide": "on",
-    }
-    coll.createIndex(index)
-
-    data_guide = coll.getDataGuide().getContent()
-    if test_env.has_client_and_server_version(23, 4):
-        assert data_guide["properties"]["_id"]["type"] == "id"
-
-    values = [
-        ("team", "string"),
-        ("created_in", "number"),
-        ("area", "string"),
-    ]
-    for name, typ in values:
-        assert data_guide["properties"][name]["type"] == typ
-        regex = f"(JSON_DOCUMENT|DATA)\\${name}"
-        val = data_guide["properties"][name]["o:preferred_column_name"]
-        assert re.fullmatch(regex, val) is not None
-
-    members_values = [
-        ("tester", "string", 4),
-        ("developer", "string", 8),
-    ]
-    for name, typ, length in members_values:
-        members_items = data_guide["properties"]["members"]["items"]
-        assert members_items["properties"][name]["type"] == typ
-        assert members_items["properties"][name]["o:length"] == length
-        regex = f"(JSON_DOCUMENT|DATA)\\${name}"
-        val = members_items["properties"][name]["o:preferred_column_name"]
-        assert re.fullmatch(regex, val) is not None
-
-
-def test_3439(soda_db, conn, test_env):
-    "3439 - test getDataGuide() with an index without data-guide support"
-    coll = soda_db.createCollection("TestSodaDataGuideDisabled")
-
-    coll.insertOne({"data": "test_3439"})
-    conn.commit()
-    index = {
-        "name": "ix-3439",
-        "dataguide": "off",
-    }
-    coll.createIndex(index)
-    with test_env.assert_raises_full_code("ORA-40582"):
-        coll.getDataGuide()
-
-
-def test_3440(soda_db):
-    "3440 - test getDataGuide() with an empty collection"
-    coll = soda_db.createCollection("TestDataGuideWithEmptyColl")
-    coll.createIndex({"name": "ix_3440", "dataguide": "on"})
-    assert coll.getDataGuide() is None
-
-
-def test_3441(soda_db, test_env):
-    "3441 - test getDataGuide() without a json search index"
-    coll = soda_db.createCollection("TestSodaDataGuideWithoutIndex")
-    with test_env.assert_raises_full_code("ORA-40582"):
-        coll.getDataGuide()
-
-
-def test_3442(soda_db, conn, test_env):
-    "3442 - test mapMode parameter with metadata"
-    data = [{"price": 4900}, {"price": 8}]
-    expected_data = data * 2
-    coll_name = "TestCollOriginal"
-
-    metadata = {
-        "tableName": coll_name,
-        "keyColumn": {"name": "ID"},
-        "contentColumn": {"name": "JSON_DOCUMENT", "sqlType": "BLOB"},
-        "versionColumn": {"name": "VERSION", "method": "UUID"},
-        "lastModifiedColumn": {"name": "LAST_MODIFIED"},
-        "creationTimeColumn": {"name": "CREATED_ON"},
-    }
-
-    original_coll = soda_db.createCollection(coll_name, metadata=metadata)
-    original_coll.insertMany(data)
-    mapped_coll = soda_db.createCollection(
-        "TestCollMapMode", metadata=metadata, mapMode=True
-    )
-    mapped_coll.insertMany(data)
-
-    for coll in [original_coll, mapped_coll]:
-        fetched_data = list(
-            doc.getContent() for doc in coll.find().getDocuments()
-        )
-        _normalize_docs(fetched_data)
-        assert fetched_data == expected_data
-
-    with test_env.assert_raises_full_code("ORA-40626"):
-        original_coll.drop()
-    assert mapped_coll.drop()
-    conn.commit()
-    assert original_coll.drop()
-    assert not mapped_coll.drop()
-
-
-def test_3443(soda_db, test_env):
-    "3443 - test mapping a new collection from an non-existent table"
-    metadata = {"tableName": "TestNone"}
-    with test_env.assert_raises_full_code("ORA-40623"):
-        soda_db.createCollection(
-            "TestSodaMapNonExistent", metadata=metadata, mapMode=True
-        )
-
-
-def test_3444(soda_db):
-    "3444 - test collections with mixture of media types"
-    metadata = dict(mediaTypeColumn=dict(name="media_type"))
-    coll = soda_db.createCollection("TestMixedMedia", metadata=metadata)
-    test_data = [
-        (dict(name="George", age=28), "application/json"),
-        ("Sample Text", "text/plain"),
-        (b"\x57\x25\xfe\x34\x56", "application/octet-stream"),
-    ]
-    for value, media_type in test_data:
-        coll.find().remove()
-        coll.insertOne(soda_db.createDocument(value, mediaType=media_type))
-        fetched_doc = coll.find().getDocuments()[0]
-        assert fetched_doc.mediaType == media_type
-        if media_type == "application/json":
-            assert fetched_doc.getContent() == value
-            assert json.loads(fetched_doc.getContentAsString()) == value
-            as_bytes = fetched_doc.getContentAsBytes().decode()
-            assert json.loads(as_bytes) == value
-        elif media_type == "text/plain":
-            assert fetched_doc.getContent() == value.encode()
-            assert fetched_doc.getContentAsString() == value
-            assert fetched_doc.getContentAsBytes() == value.encode()
-        else:
-            assert fetched_doc.getContent() == value
-            assert fetched_doc.getContentAsBytes() == value
-            pytest.raises(UnicodeDecodeError, fetched_doc.getContentAsString)
-
-
-def test_3445(soda_db, test_env):
-    "3445 - test fetching documents with JSON data using extended types"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("unsupported data types")
-
-    val = {
-        "testKey1": "testValue1",
-        "testKey2": decimal.Decimal("12.78"),
-        "testKey3": datetime.datetime(2023, 7, 3, 11, 10, 24),
-    }
-    doc = soda_db.createDocument(val)
-    assert doc.getContent() == val
-    coll = soda_db.createCollection("TestJSONExtendedTypes")
-    coll.insertOne(doc)
-    fetched_doc = coll.find().getDocuments()[0]
-    fetched_content = fetched_doc.getContent()
-    _normalize_docs([fetched_content])
-    assert fetched_content == val
-    assert doc.getContent() == val
-
-
-def test_3446(soda_db, conn, test_env):
-    "3446 - test round-trip of JsonId"
-    if not test_env.has_client_and_server_version(23, 4):
-        pytest.skip("unsupported data types")
-    coll = soda_db.createCollection("TestJsonId")
-    val = {
-        "key1": 5,
-        "key2": "A string",
-        "key3": b"Raw data",
-        "key4": datetime.datetime(2024, 3, 2, 10, 1, 36),
-    }
-    doc = soda_db.createDocument(val)
-    coll.insertOne(doc)
-    conn.commit()
-    fetched_doc = coll.find().getDocuments()[0]
-    fetched_content = fetched_doc.getContent()
-    assert type(fetched_content["_id"]) is oracledb.JsonId
-    updated_val = val.copy()
-    updated_val["key1"] = 25
-    content = fetched_content.copy()
-    content["key1"] = updated_val["key1"]
-    updated_doc = soda_db.createDocument(content)
-    coll.find().key(fetched_doc.key).replaceOne(updated_doc)
-    fetched_doc = coll.find().getDocuments()[0]
-    assert fetched_doc.getContent() == content
-
-
-def test_3447(soda_db):
-    "3447 - test getting documents with client-assigned keys"
-    metadata = {"keyColumn": {"assignmentMethod": "client"}}
-    coll = soda_db.createCollection("TestSearchByClientAssignedKeys", metadata)
-    test_values = [
-        ("doc1", {"name": "Help others", "files": []}),
-        ("doc2", {"name": "Family", "files": ["kids.txt"]}),
-        ("doc3", {"name": "Our pets", "files": ["dogs.pdf"]}),
-    ]
-    docs = [soda_db.createDocument(d, k) for k, d in test_values]
-    coll.insertMany(docs)
-
-    for key, data in test_values:
-        (fetched_doc,) = coll.find().key(key).getDocuments()
-        assert fetched_doc.getContent() == data
-
-    keys = [key for key, _ in test_values]
-    fetched_docs = coll.find().keys(keys).getDocuments()
-    assert len(fetched_docs) == 3
diff --git a/tests/test_3500_json.py b/tests/test_3500_json.py
deleted file mode 100644
index c4268351..00000000
--- a/tests/test_3500_json.py
+++ /dev/null
@@ -1,375 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3500 - Module for testing the JSON data type.
-"""
-
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def skip_tests(skip_unless_native_json_supported):
-    """
-    Skip all tests in the file unless native JSON is supported.
-    """
-
-
-@pytest.fixture(scope="module")
-def json_data():
-    """
-    Returns the data used for the tests in this module.
-    """
-    return [
-        True,
-        False,
-        "String",
-        b"Some Bytes",
-        {},
-        {"name": None},
-        {"name": "John"},
-        {"age": 30},
-        {"Permanent": True},
-        {
-            "employee": {
-                "name": "John",
-                "age": 30,
-                "city": "Delhi",
-                "Parmanent": True,
-            }
-        },
-        {"employees": ["John", "Matthew", "James"]},
-        {
-            "employees": [
-                {"employee1": {"name": "John", "city": "Delhi"}},
-                {"employee2": {"name": "Matthew", "city": "Mumbai"}},
-                {"employee3": {"name": "James", "city": "Bangalore"}},
-            ]
-        },
-    ]
-
-
-def _bind_scalar_as_json(cursor, data):
-    cursor.execute("delete from TestJson")
-    out_var = cursor.var(oracledb.DB_TYPE_JSON, arraysize=len(data))
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON, out_var)
-    bind_data = list(enumerate(data))
-    cursor.executemany(
-        """
-        insert into TestJson values (:1, :2)
-        returning JsonCol into :json_out
-        """,
-        bind_data,
-    )
-    cursor.connection.commit()
-    assert out_var.values == [[value] for value in data]
-
-
-def test_3500(cursor, json_data):
-    "3500 - insert and fetch single row with JSON"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.execute("insert into TestJson values (:1, :2)", [1, json_data])
-    cursor.execute("select JsonCol from TestJson")
-    (result,) = cursor.fetchone()
-    assert result == json_data
-
-
-def test_3501(cursor, json_data):
-    "3501 - inserting single rows with JSON and DML returning"
-    json_val = json_data[11]
-    cursor.execute("delete from TestJson")
-    json_out = cursor.var(oracledb.DB_TYPE_JSON)
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON, json_out)
-    cursor.execute(
-        """
-        insert into TestJson
-        values (:1, :2)
-        returning  JsonCol into :json_out
-        """,
-        [1, json_val],
-    )
-    assert json_out.getvalue(0) == [json_val]
-
-
-def test_3502(cursor, json_data):
-    "3502 - insert and fetch multiple rows with JSON"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    data = list(enumerate(json_data))
-    cursor.executemany("insert into TestJson values(:1, :2)", data)
-    cursor.execute("select * from TestJson")
-    assert cursor.fetchall() == data
-
-
-def test_3503(cursor, json_data):
-    "3503 - inserting multiple rows with JSON and DML returning"
-    cursor.execute("delete from TestJson")
-    int_values = [i for i in range(len(json_data))]
-    out_int_var = cursor.var(int, arraysize=len(int_values))
-    out_json_var = cursor.var(oracledb.DB_TYPE_JSON, arraysize=len(int_values))
-    cursor.setinputsizes(
-        None, oracledb.DB_TYPE_JSON, out_int_var, out_json_var
-    )
-    data = list(zip(int_values, json_data))
-    cursor.executemany(
-        """
-        insert into TestJson
-        values(:int_val, :json_val)
-        returning IntCol, JsonCol into :int_var, :json_var
-        """,
-        data,
-    )
-    assert out_int_var.values == [[v] for v in int_values]
-    assert out_json_var.values == [[v] for v in json_data]
-
-
-def test_3504(cursor):
-    "3504 - test binding boolean values as scalar JSON values"
-    data = [True, False, True, True, False, True]
-    _bind_scalar_as_json(cursor, data)
-
-
-def test_3505(cursor):
-    "3505 - test binding strings/bytes values as scalar JSON values"
-    data = [
-        "String 1",
-        b"A raw value",
-        "A much longer string",
-        b"A much longer RAW value",
-        "Short string",
-        b"Y",
-    ]
-    _bind_scalar_as_json(cursor, data)
-
-
-def test_3506(cursor):
-    "3506 - test binding dates/intervals as scalar JSON values"
-    data = [
-        datetime.datetime.today(),
-        datetime.datetime(2004, 2, 1, 3, 4, 5),
-        datetime.datetime(2020, 12, 2, 13, 29, 14),
-        datetime.timedelta(8.5),
-        datetime.datetime(2002, 12, 13, 9, 36, 0),
-        oracledb.Timestamp(2002, 12, 13, 9, 36, 0),
-        datetime.datetime(2002, 12, 13),
-    ]
-    _bind_scalar_as_json(cursor, data)
-
-
-def test_3507(cursor):
-    "3507 - test binding number in json values"
-    data = [
-        0,
-        1,
-        25.25,
-        6088343244,
-        -9999999999999999999,
-        decimal.Decimal("0.25"),
-        decimal.Decimal("10.25"),
-        decimal.Decimal("319438950232418390.273596"),
-    ]
-    _bind_scalar_as_json(cursor, data)
-
-
-def test_3508(cursor, test_env):
-    "3508 - test binding unsupported python type with JSON"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    insert_sql = "insert into TestJson values (:1, :2)"
-    with test_env.assert_raises_full_code("DPY-3003"):
-        cursor.execute(insert_sql, [1, list])
-
-
-def test_3509(cursor, test_env):
-    "3509 - test fetching an unsupported python type with JSON"
-    cursor.prefetchrows = 0
-    cursor.execute("select json(json_scalar(to_yminterval('8-04'))) from dual")
-    with test_env.assert_raises_full_code("DPY-3007"):
-        cursor.fetchone()
-
-
-def test_3510(cursor):
-    "3510 - fetch all supported types"
-    sql = """
-        select json('{
-            "binary_float": {"$numberFloat": 38.75},
-            "binary_double": {"$numberDouble": 125.875},
-            "date_no_time": {"$oracleDate": "2022-12-05"},
-            "date_with_time": {"$oracleDate": "2022-12-05T15:06:05"},
-            "empty_string": "",
-            "explicit_long": {"$numberLong": 9223372036854775807},
-            "false": false,
-            "interval_ds": {"$intervalDaySecond" : "P133DT2H5M8.123S"},
-            "long_integer": 12345678901234567890123456789012345,
-            "null": null,
-            "short_decimal": {"$numberDecimal": 18.25},
-            "short_integer": {"$numberInt": 5 },
-            "short_raw": {"$rawhex": "73686f72745f726177"},
-            "short_string": "A short string",
-            "small_integer": 1234,
-            "small_float": 25.25,
-            "string_uint8": "A longer string but still < 256 bytes",
-            "true": true,
-            "ts_no_fs": {"$oracleTimestamp": "2022-12-06T18:12:35"},
-            "ts_tz": {"$oracleTimestampTZ": "2022-12-07T22:59:15.1234Z"},
-            "ts_with_fs": {"$oracleTimestamp": "2022-12-06T18:12:35.123"}
-        }'
-        extended) from dual"""
-    expected_data = dict(
-        binary_float=38.75,
-        binary_double=125.875,
-        date_no_time=datetime.datetime(2022, 12, 5),
-        date_with_time=datetime.datetime(2022, 12, 5, 15, 6, 5),
-        empty_string="",
-        explicit_long=9223372036854775807,
-        false=False,
-        interval_ds=datetime.timedelta(
-            days=133, seconds=7508, microseconds=123000
-        ),
-        null=None,
-        long_integer=12345678901234567890123456789012345,
-        short_decimal=18.25,
-        short_integer=5,
-        short_raw=b"short_raw",
-        short_string="A short string",
-        small_integer=1234,
-        small_float=25.25,
-        string_uint8="A longer string but still < 256 bytes",
-        true=True,
-        ts_no_fs=datetime.datetime(2022, 12, 6, 18, 12, 35),
-        ts_tz=datetime.datetime(2022, 12, 7, 22, 59, 15, 123400),
-        ts_with_fs=datetime.datetime(2022, 12, 6, 18, 12, 35, 123000),
-    )
-    cursor.execute(sql)
-    (actual_data,) = cursor.fetchone()
-    assert actual_data == expected_data
-
-
-def test_3511(cursor, json_data):
-    "3511 - test inserting and updating JSON"
-    cursor.execute("delete from TestJSON")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "insert into TestJSON values (:1, :2)",
-        list(enumerate(json_data)),
-    )
-    data = [({"a": i}, i) for i in range(len(json_data))]
-    cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "update TestJSON set JsonCol = :1 where IntCol = :2",
-        data,
-    )
-    cursor.execute("select JsonCol, IntCol from TestJSON order by IntCol")
-    assert cursor.fetchall() == data
-
-
-def test_3512(cursor, json_data):
-    "3512 - test fetching json with json_query"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "insert into TestJSON values (:1, :2)",
-        list(enumerate(json_data)),
-    )
-    cases = [(1, "$.employees.employee1.name"), (2, "$.employees")]
-    for num_rows, json_query in cases:
-        cursor.execute(
-            f"""
-            select json_query(JsonCol, '{json_query}')
-            from TestJson
-            order by IntCol
-            """
-        )
-        result = [r for r, in cursor if r is not None]
-        assert len(result) == num_rows
-
-
-def test_3513(cursor, json_data):
-    "3513 - test fetching json with json_exists"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "insert into TestJSON values (:1, :2)",
-        list(enumerate(json_data)),
-    )
-    cases = [(1, "$.Permanent"), (2, "$.employees")]
-    for num_rows, json_query in cases:
-        cursor.execute(
-            f"""
-            select count(*)
-            from TestJson
-            where json_exists(JsonCol, '{json_query}')
-            """
-        )
-        (count,) = cursor.fetchone()
-        assert count == num_rows
-
-
-def test_3514(cursor, json_data):
-    "3514 - test selecting json data"
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "insert into TestJSON values (:1, :2)",
-        list(enumerate(json_data)),
-    )
-    cursor.execute(
-        """
-        select t.JsonCol.employees
-        from TestJson t
-        where t.JsonCol.employees is not null
-        order by t.IntCol
-        """
-    )
-    expected_data = [
-        json_data[-2]["employees"],
-        json_data[-1]["employees"],
-    ]
-    data = [r for r, in cursor]
-    assert data == expected_data
-
-
-def test_3515(cursor):
-    "3515 - test fetching json with json_serialize"
-    cursor.execute("delete from TestJson")
-    data = [{"a": 12.5}, {"b": True}, {"c": None}]
-    expected_data = ['{"a":12.5}', '{"b":true}', '{"c":null}']
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.executemany(
-        "insert into TestJSON values (:1, :2)", list(enumerate(data))
-    )
-    cursor.execute(
-        """
-        select json_serialize(JsonCol)
-        from TestJson
-        order by IntCol
-        """
-    )
-    fetched_data = [r for r, in cursor]
-    assert fetched_data == expected_data
diff --git a/tests/test_3600_outputtypehandler.py b/tests/test_3600_outputtypehandler.py
deleted file mode 100644
index e917a4fa..00000000
--- a/tests/test_3600_outputtypehandler.py
+++ /dev/null
@@ -1,897 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3600 - Module for testing the conversions of outputtype handler.
-"""
-
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-
-def _test_type_handler(
-    cursor, input_type, output_type, in_value, expected_out_value
-):
-    def type_handler(cursor, metadata):
-        return cursor.var(output_type, arraysize=cursor.arraysize)
-
-    cursor.outputtypehandler = type_handler
-    assert cursor.outputtypehandler == type_handler
-    var = cursor.var(input_type)
-    var.setvalue(0, in_value)
-    cursor.execute("select :1 from dual", [var])
-    (fetched_value,) = cursor.fetchone()
-    assert type(fetched_value) == type(expected_out_value)
-    assert fetched_value == expected_out_value
-
-
-def _test_type_handler_lob(cursor, lob_type, output_type):
-    db_type = getattr(oracledb, lob_type)
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is db_type:
-            return cursor.var(output_type, arraysize=cursor.arraysize)
-
-    cursor.outputtypehandler = type_handler
-    in_value = f"Some {lob_type} data"
-    if lob_type == "BLOB":
-        in_value = in_value.encode()
-    cursor.execute(f"delete from Test{lob_type}s")
-    cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values(1, :val)
-        """,
-        val=in_value,
-    )
-    cursor.connection.commit()
-    cursor.execute(
-        f"select {lob_type}Col, IntCol, {lob_type}Col from Test{lob_type}s"
-    )
-    assert cursor.fetchone() == (in_value, 1, in_value)
-
-
-@pytest.fixture(autouse=True)
-def setup(cursor):
-    cursor.execute(
-        """
-        ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'
-        NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS.FF6'
-        NLS_TIMESTAMP_TZ_FORMAT = 'YYYY-MM-DD HH24:MI:SS.FF6'
-        time_zone='Europe/London'
-        """
-    )
-
-
-def test_3600(cursor):
-    "3600 - output type handler: from VARCHAR to NUMBER"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER, "31.5", 31.5
-    )
-
-
-def test_3601(cursor):
-    "3601 - output type handler: from CHAR to NUMBER"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CHAR, oracledb.DB_TYPE_NUMBER, "31.5", 31.5
-    )
-
-
-def test_3602(cursor):
-    "3602 - output type handler: from LONG to NUMBER"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_LONG, oracledb.DB_TYPE_NUMBER, "31.5", 31.5
-    )
-
-
-def test_3603(cursor):
-    "3603 - test output type handler: from INTEGER to NUMBER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        oracledb.DB_TYPE_NUMBER,
-        31,
-        31,
-    )
-
-
-def test_3604(cursor):
-    "3604 - output type handler: from VARCHAR to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        "31.5",
-        31,
-    )
-
-
-def test_3605(cursor):
-    "3605 - output type handler: from CHAR to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_CHAR,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        "31.5",
-        31,
-    )
-
-
-def test_3606(cursor):
-    "3606 - output type handler: from LONG to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_LONG,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        "31.5",
-        31,
-    )
-
-
-def test_3607(cursor):
-    "3607 - output type handler: from NUMBER to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        31.5,
-        31,
-    )
-
-
-def test_3608(cursor):
-    "3608 - output type handler: from DOUBLE to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        31.5,
-        31,
-    )
-
-
-def test_3609(cursor):
-    "3609 - output type handler: from FLOAT to INTEGER"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        31.5,
-        31,
-    )
-
-
-def test_3610(cursor):
-    "3610 - output type handler: from DATE to VARCHAR"
-    in_val = datetime.date(2021, 2, 1)
-    out_val = "2021-02-01 00:00:00"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_DATE,
-        oracledb.DB_TYPE_VARCHAR,
-        in_val,
-        out_val,
-    )
-
-
-def test_3611(cursor):
-    "3611 - output type handler: from DATE to CHAR"
-    in_val = datetime.date(2021, 2, 1)
-    out_val = "2021-02-01 00:00:00"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_DATE, oracledb.DB_TYPE_CHAR, in_val, out_val
-    )
-
-
-def test_3612(cursor):
-    "3612 - output type handler: from DATE to LONG"
-    in_val = datetime.date(2021, 2, 1)
-    out_val = "2021-02-01 00:00:00"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_DATE, oracledb.DB_TYPE_LONG, in_val, out_val
-    )
-
-
-def test_3613(cursor):
-    "3613 - output type handler: from NUMBER to VARCHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_VARCHAR, 31.5, "31.5"
-    )
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_VARCHAR, 0, "0"
-    )
-
-
-def test_3614(cursor):
-    "3614 - output type handler: from NUMBER to CHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_CHAR, 31.5, "31.5"
-    )
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_CHAR, 0, "0"
-    )
-
-
-def test_3615(cursor):
-    "3615 - output type handler: from NUMBER to LONG"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_LONG, 31.5, "31.5"
-    )
-
-
-def test_3616(conn, cursor):
-    "3616 - output type handler: from INTERVAL to VARCHAR"
-    in_val = datetime.timedelta(days=-1, seconds=86314, microseconds=431152)
-    if conn.thin:
-        out_val = str(in_val)
-    else:
-        out_val = "-000000001 23:58:34.431152000"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_INTERVAL_DS,
-        oracledb.DB_TYPE_VARCHAR,
-        in_val,
-        out_val,
-    )
-
-
-def test_3617(conn, cursor):
-    "3617 - output type handler: from INTERVAL to CHAR"
-    in_val = datetime.timedelta(days=-1, seconds=86314, microseconds=431152)
-    if conn.thin:
-        out_val = str(in_val)
-    else:
-        out_val = "-000000001 23:58:34.431152000"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_INTERVAL_DS,
-        oracledb.DB_TYPE_CHAR,
-        in_val,
-        out_val,
-    )
-
-
-def test_3618(conn, cursor):
-    "3618 - output type handler: from INTERVAL to LONG"
-    in_val = datetime.timedelta(days=-1, seconds=86314, microseconds=431152)
-    if conn.thin:
-        out_val = str(in_val)
-    else:
-        out_val = "-000000001 23:58:34.431152000"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_INTERVAL_DS,
-        oracledb.DB_TYPE_LONG,
-        in_val,
-        out_val,
-    )
-
-
-def test_3619(cursor):
-    "3619 - output type handler: from TIMESTAMP to VARCHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP,
-        oracledb.DB_TYPE_VARCHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3620(cursor):
-    "3620 - output type handler: from TIMESTAMP to CHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP,
-        oracledb.DB_TYPE_CHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3621(cursor):
-    "3621 - output type handler: from TIMESTAMP to LONG"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP,
-        oracledb.DB_TYPE_LONG,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3622(cursor):
-    "3622 - output type handler: from TIMESTAMP_TZ to VARCHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_TZ,
-        oracledb.DB_TYPE_VARCHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3623(cursor):
-    "3623 - output type handler: from TIMESTAMP_TZ to CHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_TZ,
-        oracledb.DB_TYPE_CHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3624(cursor):
-    "3624 - output type handler: from TIMESTAMP_TZ to LONG"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_TZ,
-        oracledb.DB_TYPE_LONG,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3625(cursor):
-    "3625 - output type handler: from TIMESTAMP_LTZ to VARCHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_LTZ,
-        oracledb.DB_TYPE_VARCHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3626(cursor):
-    "3626 - output type handler: from TIMESTAMP_LTZ to CHAR"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_LTZ,
-        oracledb.DB_TYPE_CHAR,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3627(cursor):
-    "3627 - output type handler: from TIMESTAMP_LTZ to LONG"
-    in_val = datetime.datetime(2002, 12, 17, 1, 2, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_LTZ,
-        oracledb.DB_TYPE_LONG,
-        in_val,
-        str(in_val),
-    )
-
-
-def test_3628(cursor):
-    "3628 - output type handler: from INTEGER to VARCHAR"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        oracledb.DB_TYPE_VARCHAR,
-        31,
-        "31",
-    )
-
-
-def test_3629(cursor):
-    "3629 - output type handler: from INTEGER to CHAR"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        oracledb.DB_TYPE_CHAR,
-        31,
-        "31",
-    )
-
-
-def test_3630(cursor):
-    "3630 - output type handler: from INTEGER to LONG"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        oracledb.DB_TYPE_LONG,
-        31,
-        "31",
-    )
-
-
-def test_3631(cursor):
-    "3631 - output type handler: from NUMBER to DOUBLE"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        31.5,
-        31.5,
-    )
-
-
-def test_3632(cursor):
-    "3632 - output type handler: from FLOAT to DOUBLE"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        31.5,
-        31.5,
-    )
-
-
-def test_3633(cursor):
-    "3633 - output type handler: from VARCHAR to DOUBLE"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3634(cursor):
-    "3634 - output type handler: from CHAR to DOUBLE"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_CHAR,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3635(cursor):
-    "3635 - output type handler: from LONG to DOUBLE"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_LONG,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3636(cursor):
-    "3636 - output type handler: from NUMBER to FLOAT"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        31.5,
-        31.5,
-    )
-
-
-def test_3637(cursor):
-    "3637 - output type handler: from DOUBLE to FLOAT"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        31.5,
-        31.5,
-    )
-
-
-def test_3638(cursor):
-    "3638 - output type handler: from VARCHAR to FLOAT"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3639(cursor):
-    "3639 - output type handler: from CHAR to FLOAT"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_CHAR,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3640(cursor):
-    "3640 - output type handler: from LONG to FLOAT"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_LONG,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        "31.5",
-        31.5,
-    )
-
-
-def test_3641(cursor):
-    "3641 - output type handler: from VARCHAR to CHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_CHAR, "31.5", "31.5"
-    )
-
-
-def test_3642(cursor):
-    "3642 - output type handler: from VARCHAR to LONG"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_LONG, "31.5", "31.5"
-    )
-
-
-def test_3643(cursor):
-    "3643 - output type handler: from LONG to VARCHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_LONG, oracledb.DB_TYPE_VARCHAR, "31.5", "31.5"
-    )
-
-
-def test_3644(cursor):
-    "3644 - output type handler: from LONG to CHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_LONG, oracledb.DB_TYPE_CHAR, "31.5", "31.5"
-    )
-
-
-def test_3645(cursor):
-    "3645 - output type handler: from CHAR to VARCHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CHAR, oracledb.DB_TYPE_VARCHAR, "31.5", "31.5"
-    )
-
-
-def test_3646(cursor):
-    "3646 - output type handler: from CHAR to LONG"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CHAR, oracledb.DB_TYPE_LONG, "31.5", "31.5"
-    )
-
-
-def test_3647(cursor):
-    "3647 - output type handler: from TIMESTAMP to TIMESTAMP_TZ"
-    val = datetime.datetime(2002, 12, 17, 0, 0, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP,
-        oracledb.DB_TYPE_TIMESTAMP_TZ,
-        val,
-        val,
-    )
-
-
-def test_3648(cursor):
-    "3648 - output type handler: from TIMESTAMP to TIMESTAMP_LTZ"
-    val = datetime.datetime(2002, 12, 17, 0, 0, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP,
-        oracledb.DB_TYPE_TIMESTAMP_LTZ,
-        val,
-        val,
-    )
-
-
-def test_3649(cursor):
-    "3649 - output type handler: from TIMESTAMP_TZ to TIMESTAMP"
-    val = datetime.datetime(2002, 12, 17, 0, 0, 16, 400000)
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_TIMESTAMP_TZ,
-        oracledb.DB_TYPE_TIMESTAMP,
-        val,
-        val,
-    )
-
-
-def test_3650(cursor, test_env):
-    "3650 - output type handler: from NUMBER to DATE is invalid"
-    with test_env.assert_raises_full_code("DPY-4007", "ORA-00932"):
-        _test_type_handler(
-            cursor, oracledb.DB_TYPE_NUMBER, oracledb.DB_TYPE_DATE, 3, 3
-        )
-
-
-def test_3651(cursor):
-    "3651 - output type handler: from CLOB to CHAR"
-    val = "Some Clob String"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CLOB, oracledb.DB_TYPE_CHAR, val, val
-    )
-
-
-def test_3652(cursor):
-    "3652 - output type handler: from CLOB to VARCHAR"
-    val = "Some Clob String"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CLOB, oracledb.DB_TYPE_VARCHAR, val, val
-    )
-
-
-def test_3653(cursor):
-    "3653 - output type handler: from CLOB to LONG"
-    val = "Some Clob String"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CLOB, oracledb.DB_TYPE_LONG, val, val
-    )
-
-
-def test_3654(cursor):
-    "3654 - output type handler: from BLOB to RAW"
-    val = b"Some binary data"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_BLOB, oracledb.DB_TYPE_RAW, val, val
-    )
-
-
-def test_3655(cursor):
-    "3655 - output type handler: from BLOB to LONGRAW"
-    val = b"Some binary data"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_BLOB, oracledb.DB_TYPE_LONG_RAW, val, val
-    )
-
-
-def test_3656(cursor):
-    "3656 - output type handler: from permanent BLOBs to LONG_RAW"
-    _test_type_handler_lob(cursor, "BLOB", oracledb.DB_TYPE_LONG_RAW)
-
-
-def test_3657(cursor):
-    "3657 - output type handler: from permanent BLOBs to RAW"
-    _test_type_handler_lob(cursor, "BLOB", oracledb.DB_TYPE_RAW)
-
-
-def test_3658(cursor):
-    "3658 - output type handler: from permanent CLOBs to VARCHAR"
-    _test_type_handler_lob(cursor, "CLOB", oracledb.DB_TYPE_VARCHAR)
-
-
-def test_3659(cursor):
-    "3659 - output type handler: from permanent CLOBs to CHAR"
-    _test_type_handler_lob(cursor, "CLOB", oracledb.DB_TYPE_CHAR)
-
-
-def test_3660(cursor):
-    "3660 - output type handler: from permanent CLOBs to LONG"
-    _test_type_handler_lob(cursor, "CLOB", oracledb.DB_TYPE_LONG)
-
-
-def test_3661(cursor):
-    "3661 - output type handler: from NCLOB to CHAR"
-    val = "Some nclob data"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NCLOB, oracledb.DB_TYPE_CHAR, val, val
-    )
-
-
-def test_3662(cursor):
-    "3662 - output type handler: from NCLOB to VARCHAR"
-    val = "Some nclob data"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NCLOB, oracledb.DB_TYPE_VARCHAR, val, val
-    )
-
-
-def test_3663(cursor):
-    "3663 - output type handler: from NCLOB to LONG"
-    val = "Some nclob data"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NCLOB, oracledb.DB_TYPE_LONG, val, val
-    )
-
-
-def test_3664(cursor):
-    "3664 - output type handler: from permanent NCLOBs to VARCHAR"
-    _test_type_handler_lob(cursor, "NCLOB", oracledb.DB_TYPE_VARCHAR)
-
-
-def test_3665(cursor):
-    "3665 - output type handler: from permanent NCLOBs to CHAR"
-    _test_type_handler_lob(cursor, "NCLOB", oracledb.DB_TYPE_CHAR)
-
-
-def test_3666(cursor):
-    "3666 - output type handler: from permanent NCLOBs to LONG"
-    _test_type_handler_lob(cursor, "NCLOB", oracledb.DB_TYPE_LONG)
-
-
-def test_3667(cursor):
-    "3667 - output type handler: from NVARCHAR to VARCHAR"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NVARCHAR,
-        oracledb.DB_TYPE_VARCHAR,
-        "31.5",
-        "31.5",
-    )
-
-
-def test_3668(cursor):
-    "3668 - output type handler: from VARCHAR to NVARCHAR"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_NVARCHAR,
-        "31.5",
-        "31.5",
-    )
-
-
-def test_3669(cursor):
-    "3669 - output type handler: from NCHAR to CHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_NCHAR, oracledb.DB_TYPE_CHAR, "31.5", "31.5"
-    )
-
-
-def test_3670(cursor):
-    "3670 - output type handler: from CHAR to NCHAR"
-    _test_type_handler(
-        cursor, oracledb.DB_TYPE_CHAR, oracledb.DB_TYPE_NCHAR, "31.5", "31.5"
-    )
-
-
-def test_3671(cursor, test_env):
-    "3671 - execute raises an error if an incorrect arraysize is used"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(str)
-
-    cursor.arraysize = 100
-    cursor.outputtypehandler = type_handler
-    with test_env.assert_raises_full_code("DPY-2016"):
-        cursor.execute("select :1 from dual", [5])
-
-
-def test_3672(cursor, test_env):
-    "3672 - execute raises an error if a var is not returned"
-
-    def type_handler(cursor, metadata):
-        return "incorrect_return"
-
-    cursor.outputtypehandler = type_handler
-    with test_env.assert_raises_full_code("DPY-2015"):
-        cursor.execute("select :1 from dual", [5])
-
-
-def test_3673(cursor):
-    "3673 - output type handler: from NUMBER to decimal.Decimal"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NUMBER,
-        decimal.Decimal,
-        31.5,
-        decimal.Decimal("31.5"),
-    )
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_NUMBER,
-        decimal.Decimal,
-        0,
-        decimal.Decimal("0"),
-    )
-
-
-def test_3674(conn):
-    "3674 - use of output type handler does not affect description"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(str, arraysize=cursor.arraysize)
-
-    with conn.cursor() as cursor:
-        cursor.execute("select user from dual")
-        desc_before = cursor.description
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = type_handler
-        cursor.execute("select user from dual")
-        assert cursor.description == desc_before
-
-
-def test_3675(conn):
-    "3675 - use the old signature for an output type handler"
-
-    def type_handler(cursor, name, default_type, size, precision, scale):
-        return cursor.var(str, arraysize=cursor.arraysize)
-
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = type_handler
-        cursor.execute("select 1 from dual")
-        assert cursor.fetchall() == [("1",)]
-
-
-def test_3676(conn, cursor):
-    "3676 - re-execute query with second fetch returning no rows"
-
-    cursor.execute("truncate table TestTempTable")
-    data = [(i + 1,) for i in range(5)]
-    cursor.executemany("insert into TestTempTable (IntCol) values (:1)", data)
-    conn.commit()
-
-    def type_handler_1(cursor, metadata):
-        return cursor.var(
-            str,
-            arraysize=cursor.arraysize,
-            outconverter=lambda x: f"_{x}_",
-        )
-
-    def type_handler_2(cursor, metadata):
-        return cursor.var(
-            str,
-            arraysize=cursor.arraysize,
-            outconverter=lambda x: f"={x}=",
-        )
-
-    cursor.outputtypehandler = type_handler_1
-    cursor.arraysize = 6
-    cursor.prefetchrows = 6
-    sql = "select IntCol from TestTempTable where rownum <= :1"
-    cursor.execute(sql, [6])
-    expected_value = [(f"_{x}_",) for x, in data]
-    assert cursor.fetchall() == expected_value
-
-    cursor.outputtypehandler = type_handler_2
-    cursor.prefetchrows = 2
-    cursor.arraysize = 2
-    cursor.execute(sql, [0])
-    assert cursor.fetchall() == []
-
-
-def test_3677(conn, cursor):
-    "3677 - output type handler: from BINARY_DOUBLE to VARCHAR"
-    str_value = "36.75" if conn.thin else "3.675E+001"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        oracledb.DB_TYPE_VARCHAR,
-        36.75,
-        str_value,
-    )
-
-
-def test_3678(conn, cursor):
-    "3678 - output type handler: from BINARY_FLOAT to VARCHAR"
-    str_value = "16.25" if conn.thin else "1.625E+001"
-    _test_type_handler(
-        cursor,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        oracledb.DB_TYPE_VARCHAR,
-        16.25,
-        str_value,
-    )
diff --git a/tests/test_3700_var.py b/tests/test_3700_var.py
deleted file mode 100644
index 410db980..00000000
--- a/tests/test_3700_var.py
+++ /dev/null
@@ -1,649 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3700 - Module for testing all variable types.
-"""
-
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-
-def _test_positive_set_and_get(
-    cursor, test_env, var_type, value_to_set, expected_value, type_name=None
-):
-    var = cursor.var(var_type, typename=type_name)
-    var.setvalue(0, value_to_set)
-    result = var.getvalue()
-    if isinstance(result, oracledb.LOB):
-        result = result.read()
-    elif isinstance(result, oracledb.DbObject):
-        result = test_env.get_db_object_as_plain_object(result)
-    if isinstance(expected_value, datetime.date) and not isinstance(
-        expected_value, datetime.datetime
-    ):
-        if isinstance(result, datetime.datetime):
-            result = result.date()
-    assert type(result) == type(expected_value)
-    assert result == expected_value
-
-
-def _test_negative_set_and_get(cursor, var_type, value_to_set, type_name=None):
-    var = cursor.var(var_type, typename=type_name)
-    pytest.raises(
-        (TypeError, oracledb.DatabaseError), var.setvalue, 0, value_to_set
-    )
-
-
-def test_3700(cursor, test_env):
-    "3700 - setting values on variables of type DB_TYPE_NUMBER"
-    _test_positive_set_and_get(cursor, test_env, int, 5, 5)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NUMBER, 3.5, 3.5
-    )
-    _test_positive_set_and_get(
-        cursor,
-        test_env,
-        decimal.Decimal,
-        decimal.Decimal("24.8"),
-        decimal.Decimal("24.8"),
-    )
-    _test_positive_set_and_get(cursor, test_env, int, True, 1)
-    _test_positive_set_and_get(cursor, test_env, int, False, 0)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NUMBER, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NUMBER, "abc")
-
-
-def test_3701(cursor, test_env):
-    "3701 - setting values on variables of type DB_TYPE_BINARY_INTEGER"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_INTEGER, 5, 5
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_INTEGER, 3.5, 3
-    )
-    _test_positive_set_and_get(
-        cursor,
-        test_env,
-        oracledb.DB_TYPE_BINARY_INTEGER,
-        decimal.Decimal("24.8"),
-        24,
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_INTEGER, True, 1
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_INTEGER, False, 0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_INTEGER, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BINARY_INTEGER, "abc")
-
-
-def test_3702(cursor, test_env):
-    "3702 - setting values on variables of type DB_TYPE_VARCHAR"
-    value = "A VARCHAR string"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_VARCHAR, value, value
-    )
-    value = b"A raw string for VARCHAR"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_VARCHAR, value, value.decode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_VARCHAR, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_VARCHAR, 5)
-
-
-def test_3703(cursor, test_env):
-    "3703 - setting values on variables of type DB_TYPE_NVARCHAR"
-    value = "A NVARCHAR string"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NVARCHAR, value, value
-    )
-    value = b"A raw string for NVARCHAR"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NVARCHAR, value, value.decode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NVARCHAR, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NVARCHAR, 5)
-
-
-def test_3704(cursor, test_env):
-    "3704 - setting values on variables of type DB_TYPE_CHAR"
-    value = "A CHAR string"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CHAR, value, value
-    )
-    value = b"A raw string for CHAR"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CHAR, value, value.decode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CHAR, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_CHAR, 5)
-
-
-def test_3705(cursor, test_env):
-    "3705 - setting values on variables of type DB_TYPE_NCHAR"
-    value = "A NCHAR string"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NCHAR, value, value
-    )
-    value = b"A raw string for NCHAR"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CHAR, value, value.decode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NCHAR, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NCHAR, 5)
-
-
-def test_3706(cursor, test_env):
-    "3706 - setting values on variables of type DB_TYPE_LONG"
-    value = "Long Data" * 15000
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG, value, value
-    )
-    value = b"Raw data for LONG" * 15000
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG, value, value.decode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_LONG, 5)
-
-
-def test_3707(cursor, test_env):
-    "3707 - setting values on variables of type DB_TYPE_RAW"
-    value = b"Raw Data"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_RAW, value, value
-    )
-    value = "String data for RAW"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_RAW, value, value.encode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_RAW, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_RAW, 5)
-
-
-def test_3708(cursor, test_env):
-    "3708 - setting values on variables of type DB_TYPE_LONG_RAW"
-    value = b"Long Raw Data" * 15000
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG_RAW, value, value
-    )
-    value = "String data for LONG RAW" * 15000
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG_RAW, value, value.encode()
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_LONG_RAW, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_LONG_RAW, 5)
-
-
-def test_3709(cursor, test_env):
-    "3709 - setting values on variables of type DB_TYPE_DATE"
-    value = datetime.date(2017, 5, 6)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_DATE, value, value
-    )
-    value = datetime.datetime(2017, 5, 6, 9, 36, 0)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_DATE, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_DATE, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_DATE, 5)
-
-
-def test_3710(cursor, test_env):
-    "3710 - setting values on variables of type DB_TYPE_TIMESTAMP"
-    value = datetime.date(2017, 5, 6)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP, value, value
-    )
-    value = datetime.datetime(2017, 5, 6, 9, 36, 0, 300000)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_TIMESTAMP, 5)
-
-
-def test_3711(cursor, test_env):
-    "3711 - setting values on variables of type DB_TYPE_TIMESTAMP_TZ"
-    value = datetime.date(2017, 5, 6)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_TZ, value, value
-    )
-    value = datetime.datetime(2017, 5, 6, 9, 36, 0, 300000)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_TZ, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_TZ, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_TIMESTAMP_TZ, 5)
-
-
-def test_3712(cursor, test_env):
-    "3712 - setting values on variables of type DB_TYPE_TIMESTAMP_LTZ"
-    value = datetime.date(2017, 5, 6)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_LTZ, value, value
-    )
-    value = datetime.datetime(2017, 5, 6, 9, 36, 0, 300000)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_LTZ, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_TIMESTAMP_LTZ, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_TIMESTAMP_LTZ, 5)
-
-
-def test_3713(conn, cursor, test_env):
-    "3713 - setting values on variables of type DB_TYPE_BLOB"
-    value = b"Short temp BLOB value"
-    temp_blob = conn.createlob(oracledb.DB_TYPE_BLOB)
-    temp_blob.write(value)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BLOB, temp_blob, value
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_CLOB, temp_blob)
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NCLOB, temp_blob)
-    value = b"Short BLOB value"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BLOB, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BLOB, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BLOB, 5)
-
-
-def test_3714(conn, cursor, test_env):
-    "3714 - setting values on variables of type DB_TYPE_CLOB"
-    value = "Short temp CLOB value"
-    temp_clob = conn.createlob(oracledb.DB_TYPE_CLOB)
-    temp_clob.write(value)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CLOB, temp_clob, value
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BLOB, temp_clob)
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NCLOB, temp_clob)
-    value = "Short CLOB value"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CLOB, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CLOB, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_CLOB, 5)
-
-
-def test_3715(conn, cursor, test_env):
-    "3715 - setting values on variables of type DB_TYPE_NCLOB"
-    value = "Short temp NCLOB value"
-    temp_nclob = conn.createlob(oracledb.DB_TYPE_NCLOB)
-    temp_nclob.write(value)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NCLOB, temp_nclob, value
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BLOB, temp_nclob)
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_CLOB, temp_nclob)
-    value = "Short NCLOB Value"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NCLOB, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_NCLOB, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_NCLOB, 5)
-
-
-def test_3716(cursor, test_env):
-    "3716 - setting values on variables of type DB_TYPE_BINARY_FLOAT"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_FLOAT, 5, 5.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_FLOAT, 3.5, 3.5
-    )
-    _test_positive_set_and_get(
-        cursor,
-        test_env,
-        oracledb.DB_TYPE_BINARY_FLOAT,
-        decimal.Decimal("24.5"),
-        24.5,
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_FLOAT, True, 1.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_FLOAT, False, 0.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_FLOAT, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BINARY_FLOAT, "abc")
-
-
-def test_3717(cursor, test_env):
-    "3717 - setting values on variables of type DB_TYPE_BINARY_DOUBLE"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_DOUBLE, 5, 5.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_DOUBLE, 3.5, 3.5
-    )
-    _test_positive_set_and_get(
-        cursor,
-        test_env,
-        oracledb.DB_TYPE_BINARY_DOUBLE,
-        decimal.Decimal("192.125"),
-        192.125,
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_DOUBLE, True, 1.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_DOUBLE, False, 0.0
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BINARY_DOUBLE, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_BINARY_DOUBLE, "abc")
-
-
-def test_3718(cursor, test_env):
-    "3718 - setting values on variables of type DB_TYPE_BOOLEAN"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, 5, True
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, 2.0, True
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, "abc", True
-    )
-    _test_positive_set_and_get(
-        cursor,
-        test_env,
-        oracledb.DB_TYPE_BOOLEAN,
-        decimal.Decimal("24.8"),
-        True,
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, 0.0, False
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, 0, False
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_BOOLEAN, None, None
-    )
-
-
-def test_3719(cursor, test_env):
-    "3719 - setting values on variables of type DB_TYPE_INTERVAL_DS"
-    value = datetime.timedelta(days=5, seconds=56000, microseconds=123780)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_INTERVAL_DS, value, value
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_INTERVAL_DS, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_INTERVAL_DS, 5)
-
-
-def test_3720(cursor, test_env):
-    "3720 - setting values on variables of type DB_TYPE_ROWID"
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_ROWID, 12345)
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_ROWID, "523lkhlf")
-
-
-def test_3721(conn, cursor, test_env):
-    "3721 - setting values on variables of type DB_TYPE_OBJECT"
-    obj_type = conn.gettype("UDT_OBJECT")
-    obj = obj_type.newobject()
-    plain_obj = test_env.get_db_object_as_plain_object(obj)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_OBJECT, obj, plain_obj, "UDT_OBJECT"
-    )
-    _test_positive_set_and_get(cursor, test_env, obj_type, obj, plain_obj)
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_OBJECT, None, None, "UDT_OBJECT"
-    )
-    _test_positive_set_and_get(cursor, test_env, obj_type, None, None)
-    _test_negative_set_and_get(
-        cursor, oracledb.DB_TYPE_OBJECT, "abc", "UDT_OBJECT"
-    )
-    _test_negative_set_and_get(
-        cursor, oracledb.DB_TYPE_OBJECT, obj, "UDT_OBJECTARRAY"
-    )
-    wrong_obj_type = conn.gettype("UDT_OBJECTARRAY")
-    _test_negative_set_and_get(cursor, wrong_obj_type, obj)
-
-
-def test_3722(skip_unless_native_json_supported, cursor, test_env):
-    "3722 - setting values on variables of type DB_TYPE_JSON"
-    json_data = [
-        5,
-        25.25,
-        decimal.Decimal("10.25"),
-        True,
-        False,
-        datetime.datetime(2017, 5, 6),
-        datetime.datetime(2017, 5, 6, 9, 36, 0, 300000),
-        datetime.timedelta(days=5, seconds=56000, microseconds=123780),
-        {},
-        "String",
-        b"Some bytes",
-        {"keyA": 1, "KeyB": "Melbourne"},
-        [],
-        [1, "A"],
-        {"name": None},
-        {"name": "John"},
-        {"age": 30},
-        {"Permanent": True},
-        {
-            "employee": {
-                "name": "John",
-                "age": 30,
-                "city": "Delhi",
-                "Parmanent": True,
-            }
-        },
-        {"employees": ["John", "Matthew", "James"]},
-        {
-            "employees": [
-                {"employee1": {"name": "John", "city": "Delhi"}},
-                {"employee2": {"name": "Matthew", "city": "Mumbai"}},
-                {"employee3": {"name": "James", "city": "Bangalore"}},
-            ]
-        },
-    ]
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_JSON, json_data, json_data
-    )
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_JSON, None, None
-    )
-
-
-def test_3723(cursor, test_env):
-    "3723 - test setting values on variables of type DB_TYPE_CURSOR"
-    _test_positive_set_and_get(
-        cursor, test_env, oracledb.DB_TYPE_CURSOR, None, None
-    )
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_CURSOR, 5)
-
-
-def test_3724(cursor):
-    "3724 - test fetching columns containing all null values"
-    cursor.execute(
-        """
-        select null, to_char(null), to_number(null), to_date(null),
-            to_timestamp(null), to_clob(null), to_blob(null)
-        from dual
-        """
-    )
-    assert cursor.fetchall() == [(None, None, None, None, None, None, None)]
-
-
-def test_3725(skip_unless_thin_mode, cursor, test_env):
-    "3725 - setting values on variables of type DB_TYPE_UROWID"
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_UROWID, 12345)
-    _test_negative_set_and_get(cursor, oracledb.DB_TYPE_UROWID, "523lkhlf")
-
-
-def test_3726(cursor):
-    "3726 - getting value with an specific index"
-    var = cursor.var(oracledb.DB_TYPE_NUMBER, 1000, 2)
-    var.setvalue(0, 10)
-    assert var.getvalue(0) == 10
-    assert var.getvalue(1) is None
-    pytest.raises(IndexError, var.getvalue, 4)
-
-
-def test_3727(cursor):
-    "3727 - getting buffer_size attribute"
-    test_values = [
-        (oracledb.DB_TYPE_NUMBER, 200, 22),
-        (oracledb.DB_TYPE_VARCHAR, 3000, 12000),
-        (oracledb.DB_TYPE_RAW, 4000, 4000),
-        (oracledb.DB_TYPE_NCHAR, 1000, 4000),
-        (oracledb.DB_TYPE_CHAR, 2000, 8000),
-    ]
-    for typ, size, buffer_size in test_values:
-        var = cursor.var(typ, size)
-        assert var.buffer_size == buffer_size
-
-
-def test_3728(cursor):
-    "3728 - getting actual elements"
-    array_size = 8
-    var = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=array_size)
-    assert var.actual_elements == array_size
-    assert var.actual_elements == var.num_elements
-
-
-def test_3729(cursor):
-    "3729 - test deprecated attributes"
-    var = cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=200)
-    assert var.bufferSize == 22
-    assert var.actualElements == 200
-    assert var.numElements == 200
-
-
-def test_3730(cursor):
-    "3730 - test calling of outconverter with null values"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(
-            metadata.type_code,
-            outconverter=lambda v: f"|{v}|" if v else "",
-            convert_nulls=True,
-            arraysize=cursor.arraysize,
-        )
-
-    cursor.outputtypehandler = type_handler
-    cursor.execute(
-        """
-        select 'First - A', 'First - B'
-        from dual
-            union all
-        select 'Second - A', null
-        from dual
-            union all
-        select null, 'Third - B'
-        from dual
-        """
-    )
-    rows = cursor.fetchall()
-    expected_rows = [
-        ("|First - A|", "|First - B|"),
-        ("|Second - A|", ""),
-        ("", "|Third - B|"),
-    ]
-    assert rows == expected_rows
-
-
-def test_3731(cursor):
-    "3731 - test getting convert_nulls"
-    for convert_nulls in [True, False]:
-        simple_var = cursor.var(str, convert_nulls=convert_nulls)
-        assert simple_var.convert_nulls == convert_nulls
-
-
-def test_3732(conn, cursor, test_env):
-    "3732 - test encoding_errors"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-    str_value = "Я"
-    replacement_char = "�"
-    invalid_bytes = str_value.encode("windows-1251")
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, utl_raw.cast_to_varchar2(:1))
-        """,
-        [invalid_bytes],
-    )
-    conn.commit()
-
-    for arg_name in ["encoding_errors", "encodingErrors"]:
-
-        def type_handler(cursor, fetch_info):
-            args = dict(arraysize=cursor.arraysize)
-            args[arg_name] = "replace"
-            return cursor.var(fetch_info.type_code, **args)
-
-        with conn.cursor() as cursor:
-            cursor.outputtypehandler = type_handler
-            cursor.execute("select StringCol1 from TestTempTable")
-            (fetched_value,) = cursor.fetchone()
-            assert fetched_value == replacement_char
diff --git a/tests/test_3800_typehandler.py b/tests/test_3800_typehandler.py
deleted file mode 100644
index f783f33f..00000000
--- a/tests/test_3800_typehandler.py
+++ /dev/null
@@ -1,318 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3800 - Module for testing the input and output type handlers.
-"""
-
-import datetime
-import json
-
-import oracledb
-import pytest
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-
-    def __repr__(self):
-        return f"<Building {self.building_id}: {self.description}>"
-
-    def __eq__(self, other):
-        if isinstance(other, Building):
-            return (
-                other.building_id == self.building_id
-                and other.description == self.description
-                and other.num_floors == self.num_floors
-            )
-        return NotImplemented
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-    @classmethod
-    def from_json(cls, value):
-        result = json.loads(value)
-        return cls(**result)
-
-
-def building_in_converter(value):
-    return value.to_json()
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            oracledb.STRING,
-            arraysize=num_elements,
-            inconverter=building_in_converter,
-        )
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-        return cursor.var(
-            metadata.type_code,
-            arraysize=cursor.arraysize,
-            outconverter=Building.from_json,
-        )
-
-
-def test_3800(cursor, test_env):
-    "3800 - binding unsupported python object without input type handler"
-    cursor.execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    building = Building(1, "The First Building", 5)
-    with test_env.assert_raises_full_code("DPY-3002"):
-        cursor.execute(sql, [building.building_id, building])
-
-
-def test_3801(cursor):
-    "3801 - not callable input type handler"
-    cursor.execute("truncate table TestTempTable")
-    building = Building(1, "The First Building", 5)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    cursor.inputtypehandler = 5
-    assert cursor.inputtypehandler == 5
-    with pytest.raises(TypeError):
-        cursor.execute(sql, (building.building_id, building))
-
-
-def test_3802(conn, cursor):
-    "3802 - binding unsupported python object with input type handler"
-    cursor.execute("truncate table TestTempTable")
-    building = Building(1, "The First Building", 5)
-    cursor.inputtypehandler = input_type_handler
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        [building.building_id, building],
-    )
-    assert cursor.bindvars[1].inconverter == building_in_converter
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor.fetchall() == [(building.building_id, building.to_json())]
-
-
-def test_3803(conn, cursor, test_env):
-    "3803 - input type handler and output type handler on cursor level"
-    cursor.execute("truncate table TestTempTable")
-    building_one = Building(1, "The First Building", 5)
-    building_two = Building(2, "The Second Building", 87)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    cursor_one = conn.cursor()
-    cursor_two = conn.cursor()
-    cursor_one.inputtypehandler = input_type_handler
-    cursor_one.execute(sql, [building_one.building_id, building_one])
-    conn.commit()
-
-    cursor_one.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor_one.fetchall() == [
-        (building_one.building_id, building_one.to_json())
-    ]
-    with test_env.assert_raises_full_code("DPY-3002"):
-        cursor_two.execute(
-            sql,
-            (building_two.building_id, building_two),
-        )
-
-    cursor_two.outputtypehandler = output_type_handler
-    cursor_two.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor_two.fetchall() == [(building_one.building_id, building_one)]
-
-
-def test_3804(cursor, test_env):
-    "3804 - input type handler and output type handler on connection level"
-    cursor.execute("truncate table TestTempTable")
-    building_one = Building(1, "The First Building", 5)
-    building_two = Building(2, "The Second Building", 87)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    conn = test_env.get_connection()
-    conn.inputtypehandler = input_type_handler
-    assert conn.inputtypehandler == input_type_handler
-
-    cursor_one = conn.cursor()
-    cursor_two = conn.cursor()
-    cursor_one.execute(sql, [building_one.building_id, building_one])
-    cursor_two.execute(sql, [building_two.building_id, building_two])
-    conn.commit()
-
-    expected_data = [
-        (building_one.building_id, building_one),
-        (building_two.building_id, building_two),
-    ]
-    conn.outputtypehandler = output_type_handler
-    assert conn.outputtypehandler == output_type_handler
-    cursor_one.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor_one.fetchvars[1].outconverter == Building.from_json
-    assert cursor_one.fetchall() == expected_data
-
-    cursor_two.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor_two.fetchall() == expected_data
-    other_cursor = cursor.connection.cursor()
-    with test_env.assert_raises_full_code("DPY-3002"):
-        other_cursor.execute(sql, (building_one.building_id, building_one))
-
-
-def test_3805(conn, cursor):
-    "3805 - output type handler with outconvert and null values"
-    cursor.execute("truncate table TestTempTable")
-    data_to_insert = [(1, "String 1"), (2, None), (3, "String 2")]
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data_to_insert,
-    )
-    conn.commit()
-
-    def converter(value):
-        return "CONVERTED"
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-            return cursor.var(
-                str, outconverter=converter, arraysize=cursor.arraysize
-            )
-
-    cursor.outputtypehandler = output_type_handler
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    expected_data = [(1, "CONVERTED"), (2, None), (3, "CONVERTED")]
-    assert cursor.fetchall() == expected_data
-
-
-def test_3806(cursor, test_env):
-    "3806 - output type handler for fetching 21c JSON"
-
-    def output_type_handler(cursor, metadata):
-        # fetch 21c JSON datatype when using python-oracledb thin mode
-        if metadata.type_code is oracledb.DB_TYPE_JSON:
-            return cursor.var(
-                str, arraysize=cursor.arraysize, outconverter=json.loads
-            )
-        # if using Oracle Client version < 21, then database returns BLOB
-        # data type instead of JSON data type
-        elif metadata.type_code is oracledb.DB_TYPE_BLOB:
-            return cursor.var(
-                metadata.type,
-                arraysize=cursor.arraysize,
-                outconverter=lambda v: json.loads(v.read()),
-            )
-
-    # require a 21c+ database
-    if not test_env.has_server_version(21):
-        pytest.skip("unsupported database")
-
-    cursor.execute("delete from TestJson")
-    insert_sql = "insert into TestJson values (:1, :2)"
-    json_data = [
-        dict(name="John", city="Delhi"),
-        dict(name="George", city="Bangalore"),
-        dict(name="Sam", city="Mumbai"),
-    ]
-    data_to_insert = list(enumerate(json_data))
-    if test_env.has_client_version(21):
-        # take advantage of direct binding
-        cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-        cursor.executemany(insert_sql, data_to_insert)
-    else:
-        # insert data as JSON string
-        json_string_data = [(i, json.dumps(j)) for i, j in data_to_insert]
-        cursor.executemany(insert_sql, json_string_data)
-
-    if not test_env.has_client_version(21):
-        cursor.outputtypehandler = output_type_handler
-    cursor.execute("select * from TestJson")
-    assert cursor.fetchall() == data_to_insert
-
-
-def test_3807(cursor, test_env):
-    "3807 - output type handler for encoding errors"
-
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-            return cursor.var(
-                metadata.type_code,
-                arraysize=cursor.arraysize,
-                encoding_errors="replace",
-            )
-
-    cursor.outputtypehandler = output_type_handler
-    cursor.execute("select utl_raw.cast_to_varchar2('41ab42cd43ef') from dual")
-    (result,) = cursor.fetchone()
-    rc = chr(0xFFFD)
-    expected_result = f"A{rc}B{rc}C{rc}"
-    assert result == expected_result
-
-
-def test_3808(conn):
-    "3808 - output type handler with object implementing __call__()"
-
-    class TimestampOutputTypeHandler:
-
-        def __init__(self, unit="s"):
-            if unit == "ms":
-                self.factor = 1000
-            else:
-                self.factor = 1
-
-        def converter(self, d):
-            return int(d.timestamp() * self.factor)
-
-        def __call__(self, cursor, metadata):
-            if metadata.type_code is oracledb.DB_TYPE_TIMESTAMP:
-                return cursor.var(
-                    metadata.type_code,
-                    arraysize=cursor.arraysize,
-                    outconverter=self.converter,
-                )
-
-    d = datetime.datetime.today()
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = TimestampOutputTypeHandler("ms")
-        cursor.setinputsizes(oracledb.DB_TYPE_TIMESTAMP)
-        cursor.execute("select :d from dual", [d])
-        (result,) = cursor.fetchone()
-        assert result == int(d.timestamp() * 1000)
-    with conn.cursor() as cursor:
-        cursor.outputtypehandler = TimestampOutputTypeHandler("s")
-        cursor.setinputsizes(oracledb.DB_TYPE_TIMESTAMP)
-        cursor.execute("select :d from dual", [d])
-        (result,) = cursor.fetchone()
-        assert result == int(d.timestamp())
diff --git a/tests/test_3900_cursor_execute.py b/tests/test_3900_cursor_execute.py
deleted file mode 100644
index d54fa2b1..00000000
--- a/tests/test_3900_cursor_execute.py
+++ /dev/null
@@ -1,585 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-3900 - Module for testing the cursor execute() method
-"""
-
-import collections
-
-import oracledb
-
-
-def test_3900(cursor):
-    "3900 - test executing a statement without any arguments"
-    result = cursor.execute("begin null; end;")
-    assert result is None
-
-
-def test_3901(conn, test_env):
-    "3901 - test executing a None statement with bind variables"
-    cursor = conn.cursor()
-    with test_env.assert_raises_full_code("DPY-2001"):
-        cursor.execute(None, x=5)
-
-
-def test_3902(cursor):
-    "3902 - test executing a statement with args and empty keyword args"
-    simple_var = cursor.var(oracledb.NUMBER)
-    args = [simple_var]
-    kwargs = {}
-    result = cursor.execute("begin :1 := 25; end;", args, **kwargs)
-    assert result is None
-    assert simple_var.getvalue() == 25
-
-
-def test_3903(cursor):
-    "3903 - test executing a statement with keyword arguments"
-    simple_var = cursor.var(oracledb.NUMBER)
-    result = cursor.execute("begin :value := 5; end;", value=simple_var)
-    assert result is None
-    assert simple_var.getvalue() == 5
-
-
-def test_3904(cursor):
-    "3904 - test executing a statement with a dictionary argument"
-    simple_var = cursor.var(oracledb.NUMBER)
-    dict_arg = dict(value=simple_var)
-    result = cursor.execute("begin :value := 10; end;", dict_arg)
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-
-def test_3905(cursor, test_env):
-    "3905 - test executing a statement with both a dict and keyword args"
-    simple_var = cursor.var(oracledb.NUMBER)
-    dict_arg = dict(value=simple_var)
-    with test_env.assert_raises_full_code("DPY-2005"):
-        cursor.execute("begin :value := 15; end;", dict_arg, value=simple_var)
-
-
-def test_3906(cursor):
-    "3906 - test executing a statement and then changing the array size"
-    cursor.execute("select IntCol from TestNumbers")
-    cursor.arraysize = 20
-    assert len(cursor.fetchall()) == 10
-
-
-def test_3907(cursor, test_env):
-    "3907 - test that subsequent executes succeed after bad execute"
-    sql = "begin raise_application_error(-20000, 'this); end;"
-    with test_env.assert_raises_full_code("DPY-2041"):
-        cursor.execute(sql)
-    cursor.execute("begin null; end;")
-
-
-def test_3908(cursor, test_env):
-    "3908 - test that subsequent fetches fail after bad execute"
-    with test_env.assert_raises_full_code("ORA-00904"):
-        cursor.execute("select y from dual")
-    with test_env.assert_raises_full_code("DPY-1003"):
-        cursor.fetchall()
-
-
-def test_3909(cursor, test_env):
-    "3909 - test executing a statement with an incorrect named bind"
-    sql = "select * from TestStrings where IntCol = :value"
-    with test_env.assert_raises_full_code("DPY-4008", "ORA-01036"):
-        cursor.execute(sql, value2=3)
-
-
-def test_3910(cursor):
-    "3910 - test executing a statement with named binds"
-    result = cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where IntCol = :value1 and LongIntCol = :value2
-        """,
-        value1=1,
-        value2=38,
-    )
-    assert len(result.fetchall()) == 1
-
-
-def test_3911(cursor, test_env):
-    "3911 - test executing a statement with an incorrect positional bind"
-    sql = """
-            select *
-            from TestNumbers
-            where IntCol = :value and LongIntCol = :value2"""
-    with test_env.assert_raises_full_code("DPY-4009", "ORA-01008"):
-        cursor.execute(sql, [3])
-
-
-def test_3912(cursor):
-    "3912 - test executing a statement with positional binds"
-    result = cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where IntCol = :value and LongIntCol = :value2
-        """,
-        [1, 38],
-    )
-    assert len(result.fetchall()) == 1
-
-
-def test_3913(cursor):
-    "3913 - test executing a statement after rebinding a named bind"
-    statement = "begin :value := :value2 + 5; end;"
-    simple_var = cursor.var(oracledb.NUMBER)
-    simple_var2 = cursor.var(oracledb.NUMBER)
-    simple_var2.setvalue(0, 5)
-    result = cursor.execute(statement, value=simple_var, value2=simple_var2)
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-    simple_var = cursor.var(oracledb.NATIVE_FLOAT)
-    simple_var2 = cursor.var(oracledb.NATIVE_FLOAT)
-    simple_var2.setvalue(0, 10)
-    result = cursor.execute(statement, value=simple_var, value2=simple_var2)
-    assert result is None
-    assert simple_var.getvalue() == 15
-
-
-def test_3914(cursor):
-    "3914 - test executing a PL/SQL statement with duplicate binds"
-    simple_var = cursor.var(oracledb.NUMBER)
-    simple_var.setvalue(0, 5)
-    result = cursor.execute(
-        """
-        begin
-            :value := :value + 5;
-        end;
-        """,
-        value=simple_var,
-    )
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-
-def test_3915(cursor):
-    "3915 - test executing a PL/SQL statement with duplicate binds"
-    simple_var = cursor.var(oracledb.NUMBER)
-    simple_var.setvalue(0, 5)
-    cursor.execute("begin :value := :value + 5; end;", [simple_var])
-    assert simple_var.getvalue() == 10
-
-
-def test_3916(cursor, test_env):
-    "3916 - test executing a statement with an incorrect number of binds"
-    statement = "begin :value := :value2 + 5; end;"
-    var = cursor.var(oracledb.NUMBER)
-    var.setvalue(0, 5)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        cursor.execute(statement)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        cursor.execute(statement, value=var)
-    with test_env.assert_raises_full_code("DPY-4008", "ORA-01036"):
-        cursor.execute(statement, value=var, value2=var, value3=var)
-
-
-def test_3917(conn, cursor):
-    "3917 - change in size on subsequent binds does not use optimised path"
-    cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test String #1"), (2, "ABC" * 100)]
-    for row in data:
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            row,
-        )
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor.fetchall() == data
-
-
-def test_3918(conn, cursor):
-    "3918 - test that dml can use optimised path"
-    data_to_insert = [(i + 1, f"Test String #{i + 1}") for i in range(3)]
-    cursor.execute("truncate table TestTempTable")
-    for row in data_to_insert:
-        with conn.cursor() as other_cursor:
-            other_cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:1, :2)
-                """,
-                row,
-            )
-    conn.commit()
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert cursor.fetchall() == data_to_insert
-
-
-def test_3919(cursor, test_env):
-    "3919 - test calling execute() with invalid parameters"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    with test_env.assert_raises_full_code("DPY-2003"):
-        cursor.execute(sql, "These are not valid parameters")
-
-
-def test_3920(cursor, test_env):
-    "3920 - test calling execute() with mixed binds"
-    cursor.execute("truncate table TestTempTable")
-    cursor.setinputsizes(None, None, str)
-    data = dict(val1=1, val2="Test String 1")
-    with test_env.assert_raises_full_code("DPY-2006"):
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            returning StringCol1 into :out_var
-            """,
-            data,
-        )
-
-
-def test_3921(cursor):
-    "3921 - test binding by name with double quotes"
-    data = {'"_value1"': 1, '"VaLue_2"': 2, '"3VALUE"': 3}
-    cursor.execute(
-        'select :"_value1" + :"VaLue_2" + :"3VALUE" from dual',
-        data,
-    )
-    (result,) = cursor.fetchone()
-    assert result == 6
-
-
-def test_3922(cursor):
-    "3922 - test executing a statement with different input buffer sizes"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1, StringCol2)
-            values (:int_col, :str_val1, :str_val2) returning IntCol
-            into :ret_data"""
-    values1 = {"int_col": 1, "str_val1": '{"a", "b"}', "str_val2": None}
-    values2 = {"int_col": 2, "str_val1": None, "str_val2": '{"a", "b"}'}
-    values3 = {"int_col": 3, "str_val1": '{"a"}', "str_val2": None}
-
-    cursor.execute("truncate table TestTempTable")
-    ret_bind = cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    cursor.setinputsizes(ret_data=ret_bind)
-    cursor.execute(sql, values1)
-    assert ret_bind.values == [["1"]]
-
-    ret_bind = cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    cursor.setinputsizes(ret_data=ret_bind)
-    cursor.execute(sql, values2)
-    assert ret_bind.values == [["2"]]
-
-    ret_bind = cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    cursor.setinputsizes(ret_data=ret_bind)
-    cursor.execute(sql, values3)
-    assert ret_bind.values == [["3"]]
-
-
-def test_3923(conn, cursor):
-    "3923 - test using rowfactory"
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Test 1')
-        """
-    )
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in cursor.description]
-
-    def rowfactory(*row):
-        return dict(zip(column_names, row))
-
-    cursor.rowfactory = rowfactory
-    assert cursor.rowfactory == rowfactory
-    assert cursor.fetchall() == [{"INTCOL": 1, "STRINGCOL1": "Test 1"}]
-
-
-def test_3924(conn, cursor):
-    "3924 - test executing same query after setting rowfactory"
-    cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test 1"), (2, "Test 2")]
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in cursor.description]
-    cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-    results1 = cursor.fetchall()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    results2 = cursor.fetchall()
-    assert results1 == results2
-
-
-def test_3925(conn, cursor):
-    "3925 - test executing different query after setting rowfactory"
-    cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test 1"), (2, "Test 2")]
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in cursor.description]
-    cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-    cursor.execute(
-        """
-        select IntCol, StringCol
-        from TestSTrings
-        where IntCol between 1 and 3 order by IntCol
-        """
-    )
-    expected_data = [(1, "String 1"), (2, "String 2"), (3, "String 3")]
-    assert cursor.fetchall() == expected_data
-
-
-def test_3926(conn):
-    "3926 - test setting rowfactory on a REF cursor"
-    with conn.cursor() as cursor:
-        sql_function = "pkg_TestRefCursors.TestReturnCursor"
-        ref_cursor = cursor.callfunc(
-            sql_function, oracledb.DB_TYPE_CURSOR, [2]
-        )
-        column_names = [col[0] for col in ref_cursor.description]
-        ref_cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-        expected_value = [
-            {"INTCOL": 1, "STRINGCOL": "String 1"},
-            {"INTCOL": 2, "STRINGCOL": "String 2"},
-        ]
-        assert ref_cursor.fetchall() == expected_value
-
-
-def test_3927(cursor):
-    "3927 - test using a subclassed string as bind parameter keys"
-
-    class my_str(str):
-        pass
-
-    cursor.execute("truncate table TestTempTable")
-    keys = {my_str("str_val"): oracledb.DB_TYPE_VARCHAR}
-    cursor.setinputsizes(**keys)
-    values = {
-        my_str("int_val"): 3927,
-        my_str("str_val"): "3927 - String Value",
-    }
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        """,
-        values,
-    )
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor.fetchall() == [(3927, "3927 - String Value")]
-
-
-def test_3928(cursor):
-    "3928 - test using a sequence of parameters other than a list or tuple"
-
-    class MySeq(collections.abc.Sequence):
-        def __init__(self, *data):
-            self.data = data
-
-        def __len__(self):
-            return len(self.data)
-
-        def __getitem__(self, index):
-            return self.data[index]
-
-    values_to_insert = [MySeq(1, "String 1"), MySeq(2, "String 2")]
-    expected_data = [tuple(value) for value in values_to_insert]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        """,
-        values_to_insert,
-    )
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == expected_data
-
-
-def test_3929(cursor):
-    "3929 - test an output type handler with prefetch > arraysize"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(metadata.type_code, arraysize=cursor.arraysize)
-
-    cursor.arraysize = 2
-    cursor.prefetchrows = 3
-    cursor.outputtypehandler = type_handler
-    cursor.execute("select level from dual connect by level <= 5")
-    assert cursor.fetchall() == [(1,), (2,), (3,), (4,), (5,)]
-
-
-def test_3930(cursor, test_env):
-    "3930 - test setinputsizes() but without binding"
-    cursor.setinputsizes(None, int)
-    sql = "select :1, : 2 from dual"
-    with test_env.assert_raises_full_code("ORA-01008", "DPY-4010"):
-        cursor.execute(sql, [])
-
-
-def test_3931(conn, cursor, test_env):
-    "3931 - test getting FetchInfo attributes"
-    type_obj = conn.gettype("UDT_OBJECT")
-    varchar_ratio, _ = test_env.charset_ratios
-    test_values = [
-        (
-            "select IntCol from TestObjects",
-            10,
-            None,
-            False,
-            "INTCOL",
-            False,
-            9,
-            0,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_NUMBER,
-        ),
-        (
-            "select ObjectCol from TestObjects",
-            None,
-            None,
-            False,
-            "OBJECTCOL",
-            True,
-            None,
-            None,
-            type_obj,
-            oracledb.DB_TYPE_OBJECT,
-        ),
-        (
-            "select JsonVarchar from TestJsonCols",
-            4000,
-            4000 * varchar_ratio,
-            True,
-            "JSONVARCHAR",
-            False,
-            None,
-            None,
-            oracledb.DB_TYPE_VARCHAR,
-            oracledb.DB_TYPE_VARCHAR,
-        ),
-        (
-            "select FLOATCOL from TestNumbers",
-            127,
-            None,
-            False,
-            "FLOATCOL",
-            False,
-            126,
-            -127,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_NUMBER,
-        ),
-    ]
-    for (
-        sql,
-        display_size,
-        internal_size,
-        is_json,
-        name,
-        null_ok,
-        precision,
-        scale,
-        typ,
-        type_code,
-    ) in test_values:
-        cursor.execute(sql)
-        (fetch_info,) = cursor.description
-        assert isinstance(fetch_info, oracledb.FetchInfo)
-        assert fetch_info.display_size == display_size
-        assert fetch_info.internal_size == internal_size
-        if test_env.has_server_version(18, 0):
-            assert fetch_info.is_json == is_json
-        assert fetch_info.name == name
-        assert fetch_info.null_ok == null_ok
-        assert fetch_info.precision == precision
-        assert fetch_info.scale == scale
-        assert fetch_info.type == typ
-        assert fetch_info.type_code == type_code
-        assert fetch_info.vector_dimensions is None
-        assert fetch_info.vector_format is None
-
-
-def test_3932(cursor):
-    "3932 - test FetchInfo repr() and str()"
-    cursor.execute("select IntCol from TestObjects")
-    (fetch_info,) = cursor.description
-    expected = "('INTCOL', <DbType DB_TYPE_NUMBER>, 10, None, 9, 0, False)"
-    assert str(fetch_info) == expected
-    assert repr(fetch_info) == expected
-
-
-def test_3933(cursor):
-    "3933 - test slicing FetchInfo"
-    cursor.execute("select IntCol from TestObjects")
-    (fetch_info,) = cursor.description
-    assert fetch_info[1:3] == (oracledb.DB_TYPE_NUMBER, 10)
-
-
-def test_3934(cursor):
-    "3934 - test rowcount is zero for PL/SQL"
-    cursor.execute("begin null; end;")
-    assert cursor.rowcount == 0
-    cursor.execute("select user from dual")
-    cursor.fetchall()
-    assert cursor.rowcount == 1
-    cursor.execute("begin null; end;")
-    assert cursor.rowcount == 0
-
-
-def test_3935(cursor, test_env):
-    "3935 - test raising no_data_found in PL/SQL"
-    with test_env.assert_raises_full_code("ORA-01403"):
-        cursor.execute("begin raise no_data_found; end;")
-
-
-def test_3936(cursor, test_env):
-    "3936 - test executing an empty statement"
-    with test_env.assert_raises_full_code("DPY-2066"):
-        cursor.execute("")
-    with test_env.assert_raises_full_code("DPY-2066"):
-        cursor.execute("  ")
diff --git a/tests/test_4000_cursor_executemany.py b/tests/test_4000_cursor_executemany.py
deleted file mode 100644
index 19e6ef4c..00000000
--- a/tests/test_4000_cursor_executemany.py
+++ /dev/null
@@ -1,493 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4000 - Module for testing the cursor executemany() method
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture
-def empty_tab(cursor):
-    cursor.execute("truncate table TestTempTable")
-
-
-def test_4000(conn, cursor, empty_tab):
-    "4000 - test executing a statement multiple times (named args)"
-    rows = [{"value": n} for n in range(250)]
-    cursor.arraysize = 100
-    cursor.executemany(
-        "insert into TestTempTable (IntCol) values (:value)",
-        rows,
-    )
-    conn.commit()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == len(rows)
-
-
-def test_4001(conn, cursor, empty_tab):
-    "4001 - test executing a statement multiple times (positional args)"
-    rows = [[n] for n in range(230)]
-    cursor.arraysize = 100
-    cursor.executemany(
-        "insert into TestTempTable (IntCol) values (:1)",
-        rows,
-    )
-    conn.commit()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == len(rows)
-
-
-def test_4002(conn, cursor, empty_tab):
-    "4002 - test executing a statement multiple times (with prepare)"
-    rows = [[n] for n in range(225)]
-    cursor.arraysize = 100
-    cursor.prepare("insert into TestTempTable (IntCol) values (:1)")
-    cursor.executemany(None, rows)
-    conn.commit()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == len(rows)
-
-
-def test_4003(conn, cursor, empty_tab):
-    "4003 - test executing a statement multiple times (with rebind)"
-    rows = [[n] for n in range(235)]
-    cursor.arraysize = 100
-    statement = "insert into TestTempTable (IntCol) values (:1)"
-    cursor.executemany(statement, rows[:50])
-    cursor.executemany(statement, rows[50:])
-    conn.commit()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == len(rows)
-
-
-def test_4004(conn):
-    "4004 - test executing multiple times (with input sizes wrong)"
-    cursor = conn.cursor()
-    cursor.setinputsizes(oracledb.NUMBER)
-    data = [[decimal.Decimal("25.8")], [decimal.Decimal("30.0")]]
-    cursor.executemany("declare t number; begin t := :1; end;", data)
-
-
-def test_4005(cursor, empty_tab):
-    "4005 - test executing multiple times (with multiple batches)"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    cursor.executemany(sql, [(1, None), (2, None)])
-    cursor.executemany(sql, [(3, None), (4, "Testing")])
-
-
-def test_4006(cursor, empty_tab):
-    "4006 - test executemany() with various numeric types"
-    data = [
-        (1, 5),
-        (2, 7.0),
-        (3, 6.5),
-        (4, 2**65),
-        (5, decimal.Decimal("24.5")),
-    ]
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, NumberCol) values (:1, :2)",
-        data,
-    )
-    cursor.execute(
-        "select IntCol, NumberCol from TestTempTable order by IntCol"
-    )
-    assert cursor.fetchall() == data
-
-
-def test_4007(cursor, empty_tab):
-    "4007 - test executing a statement multiple times (with resize)"
-    rows = [
-        (1, "First"),
-        (2, "Second"),
-        (3, "Third"),
-        (4, "Fourth"),
-        (5, "Fifth"),
-        (6, "Sixth"),
-        (7, "Seventh and the longest one"),
-    ]
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        rows,
-    )
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert cursor.fetchall() == rows
-
-
-def test_4008(cursor, empty_tab, test_env):
-    "4008 - test executing a statement multiple times (with exception)"
-    rows = [{"value": n} for n in (1, 2, 3, 2, 5)]
-    statement = "insert into TestTempTable (IntCol) values (:value)"
-    with test_env.assert_raises_full_code("ORA-00001"):
-        cursor.executemany(statement, rows)
-    assert cursor.rowcount == 3
-
-
-def test_4009(cursor, test_env):
-    "4009 - test calling executemany() with invalid parameters"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)"""
-    with test_env.assert_raises_full_code("DPY-2004"):
-        cursor.executemany(sql, "These are not valid parameters")
-
-
-def test_4010(cursor, empty_tab):
-    "4010 - test calling executemany() without any bind parameters"
-    num_rows = 5
-    cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id);
-        end;
-        """,
-        num_rows,
-    )
-    assert cursor.rowcount == 0
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == num_rows
-
-
-def test_4011(cursor, empty_tab):
-    "4011 - test calling executemany() with binds performed earlier"
-    num_rows = 9
-    var = cursor.var(int, arraysize=num_rows)
-    cursor.setinputsizes(var)
-    cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id);
-
-            select sum(IntCol) into :1
-            from TestTempTable;
-        end;
-        """,
-        num_rows,
-    )
-    assert cursor.rowcount == 0
-    expected_data = [1, 3, 6, 10, 15, 21, 28, 36, 45]
-    assert var.values == expected_data
-
-
-def test_4012(cursor):
-    "4012 - test executing plsql statements multiple times (with binds)"
-    var = cursor.var(int, arraysize=5)
-    cursor.setinputsizes(var)
-    data = [[25], [30], [None], [35], [None]]
-    exepected_data = [25, 30, None, 35, None]
-    cursor.executemany("declare t number; begin t := :1; end;", data)
-    assert var.values == exepected_data
-
-
-def test_4013(cursor, test_env):
-    "4013 - test executemany with incorrect parameters"
-    with test_env.assert_raises_full_code("DPY-2004"):
-        cursor.executemany("select :1 from dual", [1])
-
-
-def test_4014(cursor, test_env):
-    "4014 - test executemany with mixed binds (pos first)"
-    rows = [["test"], {"value": 1}]
-    with test_env.assert_raises_full_code("DPY-2006"):
-        cursor.executemany("select :1 from dual", rows)
-
-
-def test_4015(cursor, test_env):
-    "4015 - test executemany with mixed binds (name first)"
-    rows = [{"value": 1}, ["test"]]
-    with test_env.assert_raises_full_code("DPY-2006"):
-        cursor.executemany("select :value from dual", rows)
-
-
-def test_4016(cursor, empty_tab):
-    "4016 - test executemany() with a pl/sql statement with dml returning"
-    num_rows = 5
-    out_var = cursor.var(oracledb.NUMBER, arraysize=5)
-    cursor.setinputsizes(out_var)
-    cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id)
-            returning IntCol into :out_bind;
-        end;
-        """,
-        num_rows,
-    )
-    assert out_var.values == [1, 2, 3, 4, 5]
-
-
-def test_4017(cursor, empty_tab):
-    "4017 - test executemany() with pl/sql in binds and out binds"
-    values = [5, 8, 17, 24, 6]
-    data = [(i, f"Test {i}") for i in values]
-    out_bind = cursor.var(oracledb.NUMBER, arraysize=5)
-    cursor.setinputsizes(None, None, out_bind)
-    cursor.executemany(
-        """
-        begin
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol into :out_bind;
-        end;
-        """,
-        data,
-    )
-    assert out_bind.values == values
-
-
-def test_4018(cursor, empty_tab):
-    "4018 - test executemany() with pl/sql outbinds"
-    out_bind = cursor.var(oracledb.NUMBER, arraysize=5)
-    cursor.setinputsizes(out_bind)
-    cursor.executemany("begin :out_var := 5; end;", 5)
-    assert out_bind.values == [5, 5, 5, 5, 5]
-
-
-def test_4019(cursor):
-    "4019 - test re-executemany() with pl/sql in binds and out binds"
-    values = [5, 8, 17, 24, 6]
-    data = [(i, f"Test {i}") for i in values]
-    for i in range(2):
-        cursor.execute("truncate table TestTempTable")
-        out_bind = cursor.var(oracledb.NUMBER, arraysize=len(values))
-        cursor.setinputsizes(None, None, out_bind)
-        cursor.executemany(
-            """
-            begin
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:int_val, :str_val)
-                returning IntCol into :out_bind;
-            end;
-            """,
-            data,
-        )
-        assert out_bind.values == values
-
-
-def test_4020(cursor):
-    "4020 - test PL/SQL statement with single row bind"
-    value = 4020
-    var = cursor.var(int)
-    cursor.executemany("begin :1 := :2; end;", [[var, value]])
-    assert var.values == [value]
-
-
-def test_4021(conn, cursor, empty_tab):
-    "4021 - test deferral of type assignment"
-    data = [(1, None), (2, 25)]
-    cursor.executemany(
-        """
-        insert into TestTempTable
-        (IntCol, NumberCol)
-        values (:1, :2)
-        """,
-        data,
-    )
-    conn.commit()
-    cursor.execute(
-        """
-        select IntCol, NumberCol
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == data
-
-
-def test_4022(cursor):
-    "4022 - test PL/SQL with a lerge number of binds"
-    parts = []
-    bind_names = []
-    all_bind_values = []
-    out_binds = []
-    for i in range(5):
-        all_bind_values.append([])
-    for i in range(350):
-        n = len(parts) + 1
-        bind_names.extend([f"v_out_{n}_0", f"a_{n}", f"b_{n}", f"c_{n}"])
-        parts.append(f":v_out{n} := :a_{n} + :b_{n} + :c_{n};")
-        out_binds.append(cursor.var(int, arraysize=len(all_bind_values)))
-        for j, bind_values in enumerate(all_bind_values):
-            bind_values.extend(
-                [out_binds[-1], n * 1 + j, n * 2 + j, n * 3 + j]
-            )
-    lf = "\n"
-    sql = f"begin{lf}{lf.join(parts)}{lf}end;"
-    cursor.executemany(sql, all_bind_values)
-    init_val = 6
-    for var in out_binds:
-        expected_values = [
-            init_val,
-            init_val + 3,
-            init_val + 6,
-            init_val + 9,
-            init_val + 12,
-        ]
-        assert var.values == expected_values
-        init_val += 6
-
-
-def test_4023(cursor, test_env):
-    "3901 - test executing a None statement"
-    with test_env.assert_raises_full_code("DPY-2001"):
-        cursor.executemany(None, [(1,), (2,)])
-
-
-def test_4024(cursor):
-    """
-    4024 - test executemany with number of iterations
-    (previous bind values)
-    """
-    data = [(2,), (3,), (4,)]
-    for num_iterations in range(1, len(data) + 1):
-        cursor.execute("truncate table TestLongs")
-        cursor.executemany("insert into TestLongs (IntCol) values (:1)", data)
-        cursor.executemany(None, num_iterations)
-        cursor.execute("select IntCol from TestLongs")
-        expected_value = data + data[:num_iterations]
-        assert cursor.fetchall() == expected_value
-
-
-def test_4025(cursor):
-    "4025 - test executemany with empty lists and number of iterations"
-    values = [[] for _ in range(5)]
-    for num_iterations in (4, 6):
-        cursor.execute("truncate table TestLongs")
-        cursor.executemany(
-            "insert into TestLongs (IntCol) values (67)",
-            values,
-        )
-        cursor.executemany(None, num_iterations)
-        cursor.execute("select IntCol from TestLongs")
-        expected_value = [(67,)] * (len(values) + num_iterations)
-        assert cursor.fetchall() == expected_value
-
-
-def test_4026(cursor):
-    "4026 - test executemany error offset returned correctly"
-    data = [(i,) for i in range(1, 11)]
-    with pytest.raises(oracledb.Error) as excinfo:
-        cursor.executemany(
-            """
-            declare
-                t_Value     number;
-            begin
-                t_Value := 10 / (4 - :1);
-            end;
-            """,
-            data,
-        )
-    (error_obj,) = excinfo.value.args
-    assert error_obj.offset == 3
-
-
-def test_4027(cursor, empty_tab, test_env):
-    "4027 - test executemany with number of iterations too small"
-    data = [[1], [2], [3]]
-    cursor.executemany(
-        """
-        declare
-            t_Value         number;
-        begin
-            t_Value := :1;
-        end;
-        """,
-        data,
-    )
-    cursor.executemany(None, 2)
-    with test_env.assert_raises_full_code("DPY-2016"):
-        cursor.executemany(None, 4)
-
-
-def test_4028(cursor):
-    "4028 - test executemany with empty parameter set"
-    cursor.executemany("insert into TestTempTable values (:1)", [])
-
-
-def test_4029(cursor, test_env):
-    "4029 - test executemany with an empty statement"
-    with test_env.assert_raises_full_code("DPY-2066"):
-        cursor.executemany("", 5)
-    with test_env.assert_raises_full_code("DPY-2066"):
-        cursor.executemany("  ", 5)
-
-
-def test_4030(cursor):
-    "4030 - test executemany with batch size 0"
-    rows = [[1], [2]]
-    with pytest.raises(TypeError):
-        cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            rows,
-            batch_size=0,
-        )
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-def test_4031(batch_size, conn, cursor, empty_tab, round_trip_checker):
-    "4030 - test executemany with various batch sizes"
-    rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        rows,
-        batch_size=batch_size,
-    )
-    expected_round_trips = len(rows) // batch_size
-    if len(rows) % batch_size:
-        expected_round_trips += 1
-    assert round_trip_checker.get_value() == expected_round_trips
-    conn.commit()
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert cursor.fetchall() == rows
diff --git a/tests/test_4100_cursor_callproc.py b/tests/test_4100_cursor_callproc.py
deleted file mode 100644
index 5340886e..00000000
--- a/tests/test_4100_cursor_callproc.py
+++ /dev/null
@@ -1,454 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4100 - Module for testing the methods for calling stored procedures and
-functions (callproc() and callfunc())
-"""
-
-import oracledb
-
-
-def test_4100(cursor):
-    "4100 - test executing a stored procedure"
-    var = cursor.var(oracledb.NUMBER)
-    results = cursor.callproc("proc_Test", ("hi", 5, var))
-    assert results == ["hi", 10, 2.0]
-
-
-def test_4101(cursor):
-    "4101 - test executing a stored procedure with all args keyword args"
-    inout_value = cursor.var(oracledb.NUMBER)
-    inout_value.setvalue(0, 5)
-    out_value = cursor.var(oracledb.NUMBER)
-    kwargs = dict(
-        a_InOutValue=inout_value, a_InValue="hi", a_OutValue=out_value
-    )
-    results = cursor.callproc("proc_Test", [], kwargs)
-    assert results == []
-    assert inout_value.getvalue() == 10
-    assert out_value.getvalue() == 2.0
-
-
-def test_4102(cursor):
-    "4102 - test executing a stored procedure with last arg as keyword arg"
-    out_value = cursor.var(oracledb.NUMBER)
-    kwargs = dict(a_OutValue=out_value)
-    results = cursor.callproc("proc_Test", ("hi", 5), kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue() == 2.0
-
-
-def test_4103(cursor, test_env):
-    "4103 - test executing a stored procedure, repeated keyword arg"
-    kwargs = dict(a_InValue="hi", a_OutValue=cursor.var(oracledb.NUMBER))
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callproc("proc_Test", ("hi", 5), kwargs)
-
-
-def test_4104(cursor):
-    "4104 - test executing a stored procedure without any arguments"
-    results = cursor.callproc("proc_TestNoArgs")
-    assert results == []
-
-
-def test_4105(cursor):
-    "4105 - test executing a stored function"
-    results = cursor.callfunc("func_Test", oracledb.NUMBER, ("hi", 5))
-    assert results == 7
-
-
-def test_4106(cursor):
-    "4106 - test executing a stored function without any arguments"
-    results = cursor.callfunc("func_TestNoArgs", oracledb.NUMBER)
-    assert results == 712
-
-
-def test_4107(cursor, test_env):
-    "4107 - test executing a stored function with wrong parameters"
-    func_name = "func_Test"
-    with test_env.assert_raises_full_code("DPY-2007"):
-        cursor.callfunc(oracledb.NUMBER, func_name, ("hi", 5))
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callfunc(func_name, oracledb.NUMBER, ("hi", 5, 7))
-    with test_env.assert_raises_full_code("DPY-2012"):
-        cursor.callfunc(func_name, oracledb.NUMBER, "hi", 7)
-    with test_env.assert_raises_full_code("ORA-06502"):
-        cursor.callfunc(func_name, oracledb.NUMBER, [5, "hi"])
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callfunc(func_name, oracledb.NUMBER)
-    with test_env.assert_raises_full_code("DPY-2012"):
-        cursor.callfunc(func_name, oracledb.NUMBER, 5)
-
-
-def test_4108(cursor, test_env):
-    "4108 - test to verify keywordParameters is deprecated"
-    out_value = cursor.var(oracledb.NUMBER)
-    kwargs = dict(a_OutValue=out_value)
-    with test_env.assert_raises_full_code("DPY-2014"):
-        cursor.callproc(
-            "proc_Test", ("hi", 5), kwargs, keywordParameters=kwargs
-        )
-    extra_amount = cursor.var(oracledb.NUMBER)
-    extra_amount.setvalue(0, 5)
-    kwargs = dict(a_ExtraAmount=extra_amount, a_String="hi")
-    with test_env.assert_raises_full_code("DPY-2014"):
-        cursor.callfunc(
-            "func_Test",
-            oracledb.NUMBER,
-            [],
-            kwargs,
-            keywordParameters=kwargs,
-        )
-
-
-def test_4109(cursor, test_env):
-    "4109 - test error for keyword args with invalid type"
-    kwargs = [5]
-    with test_env.assert_raises_full_code("DPY-2013"):
-        cursor.callproc("proc_Test", [], kwargs)
-    with test_env.assert_raises_full_code("DPY-2013"):
-        cursor.callfunc("func_Test", oracledb.NUMBER, [], kwargs)
-
-
-def test_4110(cursor):
-    "4110 - test to verify that deprecated keywordParameters works"
-    extra_amount = cursor.var(oracledb.DB_TYPE_NUMBER)
-    extra_amount.setvalue(0, 5)
-    kwargs = dict(a_ExtraAmount=extra_amount, a_String="hi")
-    results = cursor.callfunc(
-        "func_Test", oracledb.DB_TYPE_NUMBER, keywordParameters=kwargs
-    )
-    assert results == 7
-
-    out_value = cursor.var(oracledb.DB_TYPE_NUMBER)
-    kwargs = dict(a_OutValue=out_value)
-    results = cursor.callproc("proc_Test", ("hi", 5), keywordParameters=kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue() == 2.0
-
-
-def test_4111(cursor, test_env):
-    "4111 - test callproc with setinputsizes"
-    test_env.skip_unless_server_version(12, 2)
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER, out_value
-    )
-    results = cursor.callproc("proc_Test2", ("hi", 5, out_value))
-    assert results == ["hi", 10, True]
-    assert out_value.getvalue()
-
-
-def test_4112(cursor):
-    "4112 - test callfunc with setinputsizes"
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BOOLEAN,
-    )
-    results = cursor.callfunc("func_Test2", oracledb.NUMBER, ("hi", 5, True))
-    assert results == 7
-
-
-def test_4113(cursor, test_env):
-    "4113 - test callproc with setinputsizes with kwargs"
-    test_env.skip_unless_server_version(12, 2)
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER, out_value
-    )
-    kwargs = dict(a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", ("hi", 5), kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue()
-
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER, out_value
-    )
-    kwargs = dict(a_InValue="hi", a_InOutValue=5, a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", [], kwargs)
-    assert results == []
-    assert out_value.getvalue()
-
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BOOLEAN,
-    )
-    kwargs = dict(a_InValue="hi", a_InOutValue=5, a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", [], kwargs)
-    assert results == []
-    assert out_value.getvalue()
-
-
-def test_4114(cursor, test_env):
-    "4114 - test callproc with setinputsizes with kwargs in mixed order"
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER, out_value
-    )
-    kwargs = dict(a_OutValue=out_value, a_InValue="hi", a_InOutValue=5)
-    with test_env.assert_raises_full_code("ORA-06550"):
-        results = cursor.callproc("proc_Test2", keyword_parameters=kwargs)
-        assert results == []
-        assert out_value.getvalue()
-
-    cursor.setinputsizes(
-        oracledb.DB_TYPE_VARCHAR,
-        oracledb.DB_TYPE_NUMBER,
-        oracledb.DB_TYPE_BOOLEAN,
-    )
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callproc("proc_Test2", keyword_parameters=kwargs)
-
-
-def test_4115(cursor):
-    "4115 - test callfunc with setinputsizes with kwargs"
-    extra_amount = cursor.var(oracledb.DB_TYPE_NUMBER)
-    extra_amount.setvalue(0, 5)
-    test_values = [
-        (["hi"], dict(a_ExtraAmount=extra_amount, a_Boolean=True)),
-        (
-            [],
-            dict(a_String="hi", a_ExtraAmount=extra_amount, a_Boolean=True),
-        ),
-    ]
-    for args, kwargs in test_values:
-        cursor.setinputsizes(
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_VARCHAR,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_BOOLEAN,
-        )
-        results = cursor.callfunc(
-            "func_Test2", oracledb.DB_TYPE_NUMBER, args, kwargs
-        )
-        assert results == 7
-
-
-def test_4116(cursor, test_env):
-    "4116 - test callproc with setinputsizes with extra arguments"
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    test_values = [
-        (("hi", 5, out_value), None),
-        (("hi",), dict(a_InOutValue=5, a_OutValue=out_value)),
-        ([], dict(a_InValue="hi", a_InOutValue=5, a_OutValue=out_value)),
-    ]
-    for args, kwargs in test_values:
-        cursor.setinputsizes(
-            oracledb.DB_TYPE_VARCHAR,
-            oracledb.NUMBER,
-            out_value,
-            oracledb.DB_TYPE_VARCHAR,  # extra argument
-        )
-        with test_env.assert_raises_full_code("ORA-01036", "DPY-4009"):
-            cursor.callproc("proc_Test2", args, kwargs)
-
-
-def test_4117(cursor, test_env):
-    "4117 - test callfunc with setinputsizes with extra arguments"
-    extra_amount = cursor.var(oracledb.DB_TYPE_NUMBER)
-    extra_amount.setvalue(0, 5)
-    test_values = [
-        (["hi", extra_amount], None),
-        (["hi"], dict(a_ExtraAmount=extra_amount)),
-        ([], dict(a_ExtraAmount=extra_amount, a_String="hi")),
-    ]
-    for args, kwargs in test_values:
-        cursor.setinputsizes(
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_VARCHAR,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_BOOLEAN,
-            oracledb.DB_TYPE_VARCHAR,  # extra argument
-        )
-        with test_env.assert_raises_full_code("ORA-01036", "DPY-4009"):
-            cursor.callfunc(
-                "func_Test2", oracledb.DB_TYPE_NUMBER, args, kwargs
-            )
-
-
-def test_4118(cursor, test_env):
-    "4118 - test callproc with setinputsizes with too few parameters"
-    test_env.skip_unless_server_version(12, 2)
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-
-    # setinputsizes for 2 args (missed 1 args)
-    cursor.setinputsizes(oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER)
-    results = cursor.callproc("proc_Test2", ("hi", 5, out_value))
-    assert results == ["hi", 10, out_value.getvalue()]
-    assert out_value.getvalue()
-
-    # setinputsizes for 2 args (missed 1 kwargs)
-    cursor.setinputsizes(oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER)
-    kwargs = dict(a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", ("hi", 5), kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue()
-
-    # setinputsizes for 1 args (missed 2 args)
-    cursor.setinputsizes(oracledb.DB_TYPE_VARCHAR)
-    results = cursor.callproc("proc_Test2", ("hi", 5, out_value))
-    assert results == ["hi", 10, out_value.getvalue()]
-    assert out_value.getvalue()
-
-    # setinputsizes for 1 args (missed 1 args and 1 kwargs)
-    cursor.setinputsizes(oracledb.DB_TYPE_VARCHAR)
-    kwargs = dict(a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", ("hi", 5), kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue()
-
-    # setinputsizes for 2 kwargs (missed 1 kwargs)
-    cursor.setinputsizes(oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_NUMBER)
-    kwargs = dict(a_InValue="hi", a_InOutValue=5, a_OutValue=out_value)
-    results = cursor.callproc("proc_Test2", [], kwargs)
-    assert results == []
-    assert out_value.getvalue()
-
-
-def test_4119(cursor, test_env):
-    """
-    4119 - test callproc with setinputsizes with wrong order of parameters
-    """
-    # setinputsizes for 2 args (missed 1 kwargs)
-    out_value = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    cursor.setinputsizes(bool, oracledb.DB_TYPE_VARCHAR)
-    kwargs = dict(a_OutValue=out_value)
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callproc("proc_Test2", ["hi", 5], kwargs)
-
-    # setinputsizes for 2 kwargs (missed 1 kwargs)
-    cursor.setinputsizes(bool, oracledb.DB_TYPE_VARCHAR)
-    kwargs = dict(a_InValue="hi", a_InOutValue=5, a_OutValue=out_value)
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callproc("proc_Test2", [], kwargs)
-
-
-def test_4120(cursor):
-    "4120 - test callfunc with setinputsizes with too few parameters"
-    # setinputsizes for return_type and 1 kwargs (missed 2 kwargs)
-    bool_var = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    bool_var.setvalue(0, False)
-    kwargs = dict(a_Boolean=bool_var, a_String="hi", a_ExtraAmount=3)
-    cursor.setinputsizes(oracledb.NUMBER, oracledb.DB_TYPE_VARCHAR)
-    results = cursor.callfunc("func_Test2", oracledb.NUMBER, [], kwargs)
-    assert results == -1
-
-    # setinputsizes for return_type (missed 3 kwargs)
-    bool_var.setvalue(0, False)
-    kwargs = dict(a_Boolean=bool_var, a_String="hi", a_ExtraAmount=1)
-    cursor.setinputsizes(oracledb.NUMBER)
-    results = cursor.callfunc("func_Test2", oracledb.NUMBER, [], kwargs)
-    assert results == 1
-
-    # setinputsizes for return_type (missed 3 args)
-    bool_var.setvalue(0, True)
-    cursor.setinputsizes(oracledb.NUMBER)
-    results = cursor.callfunc(
-        "func_Test2", oracledb.NUMBER, ["hi", 2, bool_var]
-    )
-    assert results == 4
-
-
-def test_4121(cursor, test_env):
-    "4121 - test callfunc with setinputsizes with wrong order of parameters"
-    # setinputsizes for 2 args (missed 2 kwargs)
-    bool_var = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    bool_var.setvalue(0, True)
-    cursor.setinputsizes(oracledb.NUMBER, oracledb.DB_TYPE_BOOLEAN)
-    kwargs = dict(a_Boolean=bool_var)
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callfunc(
-            "func_Test2", oracledb.NUMBER, ["hi", bool_var], kwargs
-        )
-
-
-def test_4122(cursor, test_env):
-    "4122 - test callfunc with setinputsizes without type for return_type"
-    # setinputsizes for 1 args and 1 kwargs
-    bool_var = cursor.var(oracledb.DB_TYPE_BOOLEAN)
-    bool_var.setvalue(0, False)
-    cursor.setinputsizes(oracledb.NUMBER, oracledb.DB_TYPE_BOOLEAN)
-    kwargs = dict(a_Boolean=bool_var)
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callfunc("func_Test2", oracledb.DB_TYPE_NUMBER, ["hi"], kwargs)
-
-    # setinputsizes for 2 kwargs (missed 1 kwargs)
-    bool_var.setvalue(0, False)
-    kwargs = dict(a_Boolean=bool_var, a_String="hi", a_ExtraAmount=0)
-    cursor.setinputsizes(oracledb.DB_TYPE_BOOLEAN, oracledb.DB_TYPE_VARCHAR)
-    results = cursor.callfunc(
-        "func_Test2", oracledb.DB_TYPE_NUMBER, [], kwargs
-    )
-    assert results == 2
-
-    # setinputsizes for 2 args and 1 kwargs
-    bool_var.setvalue(0, False)
-    cursor.setinputsizes(oracledb.DB_TYPE_BOOLEAN, oracledb.DB_TYPE_NUMBER)
-    kwargs = dict(a_Boolean=bool_var)
-    results = cursor.callfunc(
-        "func_Test2", oracledb.DB_TYPE_NUMBER, ["Bye", 2], kwargs
-    )
-    assert results == 1
-
-    # setinputsizes for 2 args (missed 1 args)
-    bool_var.setvalue(0, False)
-    cursor.setinputsizes(oracledb.DB_TYPE_BOOLEAN, oracledb.DB_TYPE_NUMBER)
-    kwargs = dict(a_Boolean=bool_var)
-    results = cursor.callfunc(
-        "func_Test2", oracledb.DB_TYPE_NUMBER, ["Light", -1, bool_var]
-    )
-    assert results == 6
-
-
-def test_4123(cursor, test_env):
-    "4123 - test executing a procedure with callfunc"
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callfunc("proc_Test2", oracledb.NUMBER, ("hello", 3, False))
-
-
-def test_4124(cursor, test_env):
-    "4124 - test executing a function with callproc"
-    with test_env.assert_raises_full_code("ORA-06550"):
-        cursor.callproc("func_Test2", ("hello", 5, True))
-
-
-def test_4125(cursor):
-    "4125 - test calling a procedure with a string > 32767 characters"
-    data = "4125" * 16000
-    size_var = cursor.var(int)
-    cursor.callproc("pkg_TestLobs.GetSize", [data, size_var])
-    assert size_var.getvalue() == len(data)
-
-
-def test_4126(cursor):
-    "4125 - test calling a procedure with raw data > 32767 bytes"
-    data = b"4126" * 16250
-    size_var = cursor.var(int)
-    cursor.callproc("pkg_TestLobs.GetSize", [data, size_var])
-    assert size_var.getvalue() == len(data)
diff --git a/tests/test_4200_cursor_scrollable.py b/tests/test_4200_cursor_scrollable.py
deleted file mode 100644
index dc34c50c..00000000
--- a/tests/test_4200_cursor_scrollable.py
+++ /dev/null
@@ -1,275 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4200 - Module for testing scrollable cursors
-"""
-
-
-def test_4200(conn):
-    "4200 - test creating a scrollable cursor"
-    cursor = conn.cursor()
-    assert not cursor.scrollable
-    cursor = conn.cursor(True)
-    assert cursor.scrollable
-    cursor = conn.cursor(scrollable=True)
-    assert cursor.scrollable
-    cursor.scrollable = False
-    assert not cursor.scrollable
-
-
-def test_4201(conn, test_env):
-    "4201 - test scrolling absolute yields an exception (after result set)"
-    test_env.skip_unless_server_version(12, 2)
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        cursor.scroll(12, "absolute")
-
-
-def test_4202(conn):
-    "4202 - test scrolling absolute (when in buffers)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    assert (
-        cursor.arraysize > 1
-    ), "array size must exceed 1 for this test to work correctly"
-    cursor.scroll(1, mode="absolute")
-    (value,) = cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-def test_4203(conn, test_env):
-    "4203 - test scrolling absolute (when not in buffers)"
-    test_env.skip_unless_server_version(12, 2)
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.scroll(6, mode="absolute")
-    (value,) = cursor.fetchone()
-    assert value == 7.5
-    assert cursor.rowcount == 6
-
-
-def test_4204(conn):
-    "4204 - test scrolling to first row in result set (in buffers)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    cursor.scroll(mode="first")
-    (value,) = cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-def test_4205(conn):
-    "4205 - test scrolling to first row in result set (not in buffers)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    cursor.fetchmany()
-    cursor.scroll(mode="first")
-    (value,) = cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-def test_4206(conn):
-    "4206 - test scrolling to last row in result set"
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.scroll(mode="last")
-    (value,) = cursor.fetchone()
-    assert value == 12.5
-    assert cursor.rowcount == 10
-
-
-def test_4207(conn, test_env):
-    "4207 - test scrolling relative yields an exception (after result set)"
-    test_env.skip_unless_server_version(12, 2)
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        cursor.scroll(15)
-
-
-def test_4208(conn, test_env):
-    "4208 - test scrolling relative yields exception (before result set)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        cursor.scroll(-5)
-
-
-def test_4209(conn):
-    "4209 - test scrolling relative (when in buffers)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    message = "array size must exceed 1 for this test to work correctly"
-    assert cursor.arraysize > 1, message
-    cursor.scroll(2 - cursor.rowcount)
-    (value,) = cursor.fetchone()
-    assert value == 2.5
-    assert cursor.rowcount == 2
-
-
-def test_4210(conn):
-    "4210 - test scrolling relative (when not in buffers)"
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    cursor.fetchmany()
-    message = "array size must exceed 1 for this test to work correctly"
-    assert cursor.arraysize > 1, message
-    cursor.scroll(3 - cursor.rowcount)
-    (value,) = cursor.fetchone()
-    assert value == 3.75
-    assert cursor.rowcount == 3
-
-
-def test_4211(conn, cursor, test_env):
-    "4211 - test scrolling when there are no rows"
-    test_env.skip_unless_server_version(12, 2)
-    cursor.execute("truncate table TestTempTable")
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select * from TestTempTable")
-    cursor.scroll(mode="last")
-    assert cursor.fetchall() == []
-    cursor.scroll(mode="first")
-    assert cursor.fetchall() == []
-    with test_env.assert_raises_full_code("DPY-2063"):
-        cursor.scroll(1, mode="absolute")
-
-
-def test_4212(conn, cursor, test_env):
-    "4212 - test scrolling with differing array and fetch array sizes"
-    test_env.skip_unless_server_version(12, 2)
-    cursor.execute("truncate table TestTempTable")
-    for i in range(30):
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, null)
-            """,
-            [i + 1],
-        )
-    conn.commit()
-    for arraysize in range(1, 6):
-        cursor = conn.cursor(scrollable=True)
-        cursor.arraysize = arraysize
-        cursor.execute("select IntCol from TestTempTable order by IntCol")
-        for num_rows in range(1, arraysize + 1):
-            cursor.scroll(15, "absolute")
-            rows = cursor.fetchmany(num_rows)
-            assert rows[0][0] == 15
-            assert cursor.rowcount == 15 + num_rows - 1
-            cursor.scroll(9)
-            rows = cursor.fetchmany(num_rows)
-            num_rows_fetched = len(rows)
-            assert rows[0][0] == 15 + num_rows + 8
-            assert cursor.rowcount == 15 + num_rows + num_rows_fetched + 7
-            cursor.scroll(-12)
-            rows = cursor.fetchmany(num_rows)
-            count = 15 + num_rows + num_rows_fetched - 5
-            assert rows[0][0] == count
-            count = 15 + num_rows + num_rows_fetched + num_rows - 6
-            assert cursor.rowcount == count
-
-
-def test_4213(conn, test_env):
-    "4213 - test calling scroll() with invalid mode"
-    cursor = conn.cursor(scrollable=True)
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchmany()
-    with test_env.assert_raises_full_code("DPY-2009"):
-        cursor.scroll(mode="middle")
-
-
-def test_4214(conn):
-    "4214 - test scroll after fetching all rows"
-    cursor = conn.cursor(scrollable=True)
-    cursor.arraysize = 5
-    cursor.prefetchrows = 0
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    cursor.fetchall()
-    cursor.scroll(5, mode="absolute")
-    (value,) = cursor.fetchone()
-    assert value == 6.25
-    assert cursor.rowcount == 5
-
-
-def test_4215(conn):
-    "4215 - test parse() on a scrollable cursor"
-    cursor = conn.cursor(scrollable=True)
-    statement = """
-        select 1 from dual
-        union all
-        select 2 from dual
-        union all
-        select 3 from dual
-        union all
-        select 4 from dual
-        union all
-        select 5 from dual
-    """
-    cursor.parse(statement)
-    cursor.execute(statement)
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == 1
-    cursor.scroll(mode="last")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == 5
-
-
-def test_4216(conn):
-    "4216 - test scroll operation with bind values"
-    cursor = conn.cursor(scrollable=True)
-    base_value = 4215
-    cursor.execute(
-        """
-        select :base_value + 1 from dual
-        union all
-        select :base_value + 2 from dual
-        union all
-        select :base_value + 3 from dual
-        """,
-        dict(base_value=base_value),
-    )
-    cursor.scroll(mode="last")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == base_value + 3
-
-
-def test_4217(conn, test_env):
-    "4217 - test calling scroll() on a non-scrollable cursor"
-    cursor = conn.cursor()
-    cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2068"):
-        cursor.scroll(mode="first")
diff --git a/tests/test_4300_cursor_other.py b/tests/test_4300_cursor_other.py
deleted file mode 100644
index 33474f41..00000000
--- a/tests/test_4300_cursor_other.py
+++ /dev/null
@@ -1,1068 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4300 - Module for testing other cursor methods and attributes.
-"""
-
-import decimal
-
-import oracledb
-
-
-def test_4300(cursor):
-    "4300 - test preparing a statement and executing it multiple times"
-    assert cursor.statement is None
-    statement = "begin :value := :value + 5; end;"
-    cursor.prepare(statement)
-    var = cursor.var(oracledb.NUMBER)
-    assert cursor.statement == statement
-    var.setvalue(0, 2)
-    cursor.execute(None, value=var)
-    assert var.getvalue() == 7
-    cursor.execute(None, value=var)
-    assert var.getvalue() == 12
-    cursor.execute("begin :value2 := 3; end;", value2=var)
-    assert var.getvalue() == 3
-
-
-def test_4301(conn, test_env):
-    "4301 - confirm an exception is raised after closing a cursor"
-    cursor = conn.cursor()
-    cursor.close()
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.execute("select 1 from dual")
-
-
-def test_4302(cursor):
-    "4302 - test iterators"
-    cursor.execute(
-        """
-        select IntCol
-        from TestNumbers
-        where IntCol between 1 and 3
-        order by IntCol
-        """
-    )
-    rows = [v for v, in cursor]
-    assert rows == [1, 2, 3]
-
-
-def test_4303(cursor, test_env):
-    "4303 - test iterators (with intermediate execute)"
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        select IntCol
-        from TestNumbers
-        where IntCol between 1 and 3
-        order by IntCol
-        """
-    )
-    test_iter = iter(cursor)
-    (value,) = next(test_iter)
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    with test_env.assert_raises_full_code("DPY-1003"):
-        next(test_iter)
-
-
-def test_4304(cursor, test_env):
-    "4304 - test that bindnames() works correctly."
-    with test_env.assert_raises_full_code("DPY-2002"):
-        cursor.bindnames()
-    cursor.prepare("begin null; end;")
-    assert cursor.bindnames() == []
-    cursor.prepare("begin :retval := :inval + 5; end;")
-    assert cursor.bindnames() == ["RETVAL", "INVAL"]
-    cursor.prepare("begin :retval := :a * :a + :b * :b; end;")
-    assert cursor.bindnames() == ["RETVAL", "A", "B"]
-    cursor.prepare(
-        """
-        begin
-            :a := :b + :c + :d + :e + :f + :g + :h + :i + :j + :k + :l;
-        end;
-        """
-    )
-    names = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"]
-    assert cursor.bindnames() == names
-    cursor.prepare("select :a * :a + :b * :b from dual")
-    assert cursor.bindnames() == ["A", "B"]
-    cursor.prepare("select :value1 + :VaLue_2 from dual")
-    assert cursor.bindnames() == ["VALUE1", "VALUE_2"]
-    cursor.prepare("select :élevé, :fenêtre from dual")
-    assert cursor.bindnames() == ["ÉLEVÉ", "FENÊTRE"]
-
-
-def test_4305(cursor, test_env):
-    "4305 - test cursor.setinputsizes() with invalid parameters"
-    val = decimal.Decimal(5)
-    with test_env.assert_raises_full_code("DPY-2005"):
-        cursor.setinputsizes(val, x=val)
-    with test_env.assert_raises_full_code("DPY-2007"):
-        cursor.setinputsizes(val)
-
-
-def test_4306(cursor):
-    "4306 - test setting input sizes without any parameters"
-    cursor.setinputsizes()
-    cursor.execute("select :val from dual", val="Test Value")
-    assert cursor.fetchall() == [("Test Value",)]
-
-
-def test_4307(cursor):
-    "4307 - test setting input sizes with an empty dictionary"
-    empty_dict = {}
-    cursor.prepare("select 236 from dual")
-    cursor.setinputsizes(**empty_dict)
-    cursor.execute(None, empty_dict)
-    assert cursor.fetchall() == [(236,)]
-
-
-def test_4308(cursor):
-    "4308 - test setting input sizes with an empty list"
-    empty_list = []
-    cursor.prepare("select 239 from dual")
-    cursor.setinputsizes(*empty_list)
-    cursor.execute(None, empty_list)
-    assert cursor.fetchall() == [(239,)]
-
-
-def test_4309(cursor):
-    "4309 - test setting input sizes with positional args"
-    var = cursor.var(oracledb.STRING, 100)
-    cursor.setinputsizes(None, 5, None, 10, None, oracledb.NUMBER)
-    cursor.execute(
-        """
-        begin
-          :1 := :2 || to_char(:3) || :4 || to_char(:5) || to_char(:6);
-        end;
-        """,
-        [var, "test_", 5, "_second_", 3, 7],
-    )
-    assert var.getvalue() == "test_5_second_37"
-
-
-def test_4310(conn, cursor):
-    "4310 - test Cursor repr()"
-    expected_value = f"<oracledb.Cursor on {conn}>"
-    assert str(cursor) == expected_value
-    assert repr(cursor) == expected_value
-
-
-def test_4311(cursor):
-    "4311 - test parsing query statements"
-    sql = "select LongIntCol from TestNumbers where IntCol = :val"
-    cursor.parse(sql)
-    assert cursor.statement == sql
-    assert cursor.description == [
-        ("LONGINTCOL", oracledb.DB_TYPE_NUMBER, 17, None, 16, 0, 0)
-    ]
-
-
-def test_4312(cursor):
-    "4312 - test cursor.setoutputsize() does not fail (but does nothing)"
-    cursor.setoutputsize(100, 2)
-
-
-def test_4313(cursor, test_env):
-    "4313 - test cursor.var() with invalid parameters"
-    with test_env.assert_raises_full_code("DPY-2007"):
-        cursor.var(5)
-
-
-def test_4314(cursor, test_env):
-    "4314 - test cursor.arrayvar() with invalid parameters"
-    with test_env.assert_raises_full_code("DPY-2007"):
-        cursor.arrayvar(5, 1)
-
-
-def test_4315(cursor):
-    "4315 - test binding boolean data without the use of PL/SQL"
-    cursor.execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    cursor.execute(sql, (False, "Value should be 0"))
-    cursor.execute(sql, (True, "Value should be 1"))
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    expected_value = [(0, "Value should be 0"), (1, "Value should be 1")]
-    assert cursor.fetchall() == expected_value
-
-
-def test_4316(conn, test_env):
-    "4316 - test using a cursor as a context manager"
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-        cursor.execute("select count(*) from TestTempTable")
-        (count,) = cursor.fetchone()
-        assert count == 0
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.close()
-
-
-def test_4317(cursor):
-    "4317 - test that rowcount attribute is reset to zero on query execute"
-    for num in [0, 1, 1, 0]:
-        cursor.execute("select * from dual where 1 = :s", [num])
-        cursor.fetchone()
-        assert cursor.rowcount == num
-
-
-def test_4318(cursor):
-    "4318 - test that the typename attribute can be passed a value of None"
-    value_to_set = 5
-    var = cursor.var(int, typename=None)
-    var.setvalue(0, value_to_set)
-    assert var.getvalue() == value_to_set
-
-
-def test_4319(conn, cursor):
-    "4319 - test that an object type can be used as type in cursor.var()"
-    obj_type = conn.gettype("UDT_OBJECT")
-    var = cursor.var(obj_type)
-    cursor.callproc(
-        "pkg_TestBindObject.BindObjectOut", (28, "Bind obj out", var)
-    )
-    obj = var.getvalue()
-    result = cursor.callfunc("pkg_TestBindObject.GetStringRep", str, (obj,))
-    exp = "udt_Object(28, 'Bind obj out', null, null, null, null, null)"
-    assert result == exp
-
-
-def test_4320(cursor):
-    "4320 - test that fetching an XMLType returns a string"
-    int_val = 5
-    label = "IntCol"
-    expected_result = f"<{label}>{int_val}</{label}>"
-    cursor.execute(
-        f"""
-        select XMLElement("{label}", IntCol)
-        from TestStrings
-        where IntCol = :int_val
-        """,
-        int_val=int_val,
-    )
-    (result,) = cursor.fetchone()
-    assert result == expected_result
-
-
-def test_4321(cursor):
-    "4321 - test last rowid"
-
-    # no statement executed: no rowid
-    assert cursor.lastrowid is None
-
-    # DDL statement executed: no rowid
-    cursor.execute("truncate table TestTempTable")
-    assert cursor.lastrowid is None
-
-    # statement prepared: no rowid
-    cursor.prepare("insert into TestTempTable (IntCol) values (:1)")
-    assert cursor.lastrowid is None
-
-    # multiple rows inserted: rowid of last row inserted
-    rows = [(n,) for n in range(225)]
-    cursor.executemany(None, rows)
-    rowid = cursor.lastrowid
-    cursor.execute(
-        """
-        select rowid
-        from TestTempTable
-        where IntCol = :1
-        """,
-        rows[-1],
-    )
-    assert cursor.fetchone()[0] == rowid
-
-    # statement executed but no rows updated: no rowid
-    cursor.execute("delete from TestTempTable where 1 = 0")
-    assert cursor.lastrowid is None
-
-    # stetement executed with one row updated: rowid of updated row
-    cursor.execute(
-        """
-        update TestTempTable set StringCol1 = 'Modified'
-        where IntCol = :1
-        """,
-        rows[-2],
-    )
-    rowid = cursor.lastrowid
-    cursor.execute(
-        "select rowid from TestTempTable where IntCol = :1",
-        rows[-2],
-    )
-    assert cursor.fetchone()[0] == rowid
-
-    # statement executed with many rows updated: rowid of last updated row
-    cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = 'Row ' || to_char(IntCol)
-        where IntCol = :1
-        """,
-        rows[-3],
-    )
-    rowid = cursor.lastrowid
-    cursor.execute(
-        "select StringCol1 from TestTempTable where rowid = :1",
-        [rowid],
-    )
-    assert cursor.fetchone()[0] == "Row %s" % rows[-3]
-
-
-def test_4322(conn, round_trip_checker):
-    "4322 - test prefetch rows"
-
-    # perform simple query and verify only one round trip is needed
-    with conn.cursor() as cursor:
-        cursor.execute("select sysdate from dual").fetchall()
-        assert round_trip_checker.get_value() == 1
-
-    # set prefetchrows to 1 and verify that two round trips are now needed
-    with conn.cursor() as cursor:
-        cursor.prefetchrows = 1
-        assert cursor.prefetchrows == 1
-        cursor.execute("select sysdate from dual").fetchall()
-        assert round_trip_checker.get_value() == 2
-
-    # simple DDL only requires a single round trip
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-        assert round_trip_checker.get_value() == 1
-
-    # array execution only requires a single round trip
-    num_rows = 590
-    with conn.cursor() as cursor:
-        data = [(n + 1,) for n in range(num_rows)]
-        cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            data,
-        )
-        assert round_trip_checker.get_value() == 1
-
-    # setting prefetch and array size to 1 requires a round-trip for each
-    # row
-    with conn.cursor() as cursor:
-        cursor.arraysize = 1
-        cursor.prefetchrows = 1
-        assert cursor.prefetchrows == 1
-        cursor.execute("select IntCol from TestTempTable").fetchall()
-        assert round_trip_checker.get_value() == num_rows + 1
-
-    # setting prefetch and array size to 300 requires 2 round-trips
-    with conn.cursor() as cursor:
-        cursor.arraysize = 300
-        cursor.prefetchrows = 300
-        assert cursor.prefetchrows == 300
-        cursor.execute("select IntCol from TestTempTable").fetchall()
-        assert round_trip_checker.get_value() == 2
-
-
-def test_4323(conn, round_trip_checker):
-    "4323 - test prefetch rows using existing cursor"
-
-    # Set prefetch rows on an existing cursor
-    num_rows = 590
-    with conn.cursor() as cursor:
-        cursor.execute("truncate table TestTempTable")
-        assert round_trip_checker.get_value() == 1
-        data = [(n + 1,) for n in range(num_rows)]
-        cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            data,
-        )
-        assert round_trip_checker.get_value() == 1
-        cursor.prefetchrows = 30
-        cursor.arraysize = 100
-        cursor.execute("select IntCol from TestTempTable").fetchall()
-        assert round_trip_checker.get_value() == 7
-
-
-def test_4324(cursor):
-    "4324 - test parsing plsql statements"
-    sql = "begin :value := 5; end;"
-    cursor.parse(sql)
-    assert cursor.statement == sql
-    assert cursor.description is None
-
-
-def test_4325(cursor):
-    "4325 - test parsing ddl statements"
-    sql = "truncate table TestTempTable"
-    cursor.parse(sql)
-    assert cursor.statement == sql
-    assert cursor.description is None
-
-
-def test_4326(cursor):
-    "4326 - test parsing dml statements"
-    sql = "insert into TestTempTable (IntCol) values (1)"
-    cursor.parse(sql)
-    assert cursor.statement == sql
-    assert cursor.description is None
-
-
-def test_4327(cursor, test_env):
-    "4327 - test to verify encodingErrors is deprecated"
-    errors = "strict"
-    with test_env.assert_raises_full_code("DPY-2014"):
-        cursor.var(
-            oracledb.NUMBER, encoding_errors=errors, encodingErrors=errors
-        )
-
-
-def test_4328(cursor, test_env):
-    "4328 - test arrays of arrays not supported"
-    simple_var = cursor.arrayvar(oracledb.NUMBER, 3)
-    with test_env.assert_raises_full_code("DPY-3005"):
-        simple_var.setvalue(1, [1, 2, 3])
-
-
-def test_4329(cursor, test_env):
-    "4329 - test cursor.setinputsizes() with invalid list parameters"
-    with test_env.assert_raises_full_code("DPY-2011"):
-        cursor.setinputsizes([int, 2, 10])
-
-
-def test_4330(cursor, test_env):
-    "4330 - test unsupported python type on cursor"
-    with test_env.assert_raises_full_code("DPY-3003"):
-        cursor.var(list)
-
-
-def test_4331(cursor):
-    "4331 - test binding by name with leading colon"
-    params = {":arg1": 5}
-    cursor.execute("select :arg1 from dual", params)
-    (result,) = cursor.fetchone()
-    assert result == params[":arg1"]
-
-
-def test_4332(cursor):
-    "4332 - test binding mixed null and not null values in a PL/SQL block"
-    out_vars = [cursor.var(str) for i in range(4)]
-    cursor.execute(
-        """
-        begin
-            :1 := null;
-            :2 := 'Value 1';
-            :3 := null;
-            :4 := 'Value 2';
-        end;
-        """,
-        out_vars,
-    )
-    values = [var.getvalue() for var in out_vars]
-    assert values == [None, "Value 1", None, "Value 2"]
-
-
-def test_4333(conn, parse_count_checker):
-    "4333 - test excluding statement from statement cache"
-    num_iters = 10
-    sql = "select user from dual"
-
-    # with statement cache enabled, only one parse should take place
-    for i in range(num_iters):
-        with conn.cursor() as cursor:
-            cursor.execute(sql)
-    assert parse_count_checker.get_value() == 1
-
-    # with statement cache disabled for the statement, parse count should
-    # be the same as the number of iterations
-    for i in range(num_iters):
-        with conn.cursor() as cursor:
-            cursor.prepare(sql, cache_statement=False)
-            cursor.execute(None)
-    assert parse_count_checker.get_value() == num_iters - 1
-
-
-def test_4334(cursor):
-    "4334 - test repeated DDL"
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute("insert into TestTempTable (IntCol) values (1)")
-
-
-def test_4335(cursor):
-    "4335 - test executing SQL with non-ASCII characters"
-    cursor.execute("select 'FÖÖ' from dual")
-    (result,) = cursor.fetchone()
-    assert result in ("FÖÖ", "F¿¿")
-
-
-def test_4336(cursor):
-    "4336 - test case sensitivity of unquoted bind names"
-    cursor.execute("select :test from dual", {"TEST": "a"})
-    (result,) = cursor.fetchone()
-    assert result == "a"
-
-
-def test_4337(cursor, test_env):
-    "4337 - test case sensitivity of quoted bind names"
-    with test_env.assert_raises_full_code("ORA-01036", "DPY-4008"):
-        cursor.execute('select :"test" from dual', {'"TEST"': "a"})
-
-
-def test_4338(cursor, test_env):
-    "4338 - test using a reserved keywords as a bind name"
-    sql = "select :ROWID from dual"
-    with test_env.assert_raises_full_code("ORA-01745"):
-        cursor.parse(sql)
-
-
-def test_4339(conn):
-    "4339 - test array size less than prefetch rows"
-    for i in range(2):
-        with conn.cursor() as cursor:
-            cursor.arraysize = 1
-            cursor.execute("select 1 from dual union select 2 from dual")
-            assert cursor.fetchall() == [(1,), (2,)]
-
-
-def test_4340(conn, cursor):
-    "4340 - test re-executing a query with blob as bytes"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_BLOB:
-            return cursor.var(bytes, arraysize=cursor.arraysize)
-
-    conn.outputtypehandler = type_handler
-    blob_data = b"An arbitrary set of blob data for test case 4348"
-    cursor.execute("delete from TestBLOBs")
-    cursor.execute(
-        "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
-        [blob_data],
-    )
-    cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    assert cursor.fetchall() == [(1, blob_data)]
-
-    cursor.execute("delete from TestBLOBs")
-    cursor.execute(
-        "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
-        [blob_data],
-    )
-    cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    assert cursor.fetchall() == [(1, blob_data)]
-
-
-def test_4341(cursor, test_env):
-    "4341 - test re-executing a statement after raising an error"
-    sql = "select * from TestFakeTable"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        cursor.execute(sql)
-    with test_env.assert_raises_full_code("ORA-00942"):
-        cursor.execute(sql)
-
-    sql = "insert into TestStrings (StringCol) values (NULL)"
-    with test_env.assert_raises_full_code("ORA-01400"):
-        cursor.execute(sql)
-    with test_env.assert_raises_full_code("ORA-01400"):
-        cursor.execute(sql)
-
-
-def test_4342(conn):
-    "4342 - test executing a statement that raises ORA-01007"
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            create or replace view ora_1007 as
-                select 1 as SampleNumber, 'String' as SampleString,
-                    'Another String' as AnotherString
-                from dual
-            """
-        )
-    with conn.cursor() as cursor:
-        cursor.execute("select * from ora_1007")
-        assert cursor.fetchone() == (1, "String", "Another String")
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            create or replace view ora_1007 as
-                select 1 as SampleNumber,
-                    'Another String' as AnotherString
-                from dual
-            """
-        )
-    with conn.cursor() as cursor:
-        cursor.execute("select * from ora_1007")
-        assert cursor.fetchone() == (1, "Another String")
-
-
-def test_4343(cursor):
-    "4343 - test updating an empty row"
-    int_var = cursor.var(int)
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        """
-        begin
-            update TestTempTable set IntCol = :1
-            where StringCol1 = :2
-            returning IntCol into :3;
-        end;
-        """,
-        [1, "test string 4352", int_var],
-    )
-    assert int_var.values == [None]
-
-
-def test_4344(conn):
-    "4344 - fetch duplicate data from query in statement cache"
-    sql = """
-            select 'A', 'B', 'C' from dual
-            union all
-            select 'A', 'B', 'C' from dual
-            union all
-            select 'A', 'B', 'C' from dual"""
-    expected_data = [("A", "B", "C")] * 3
-    with conn.cursor() as cursor:
-        cursor.prefetchrows = 0
-        cursor.execute(sql)
-        assert cursor.fetchall() == expected_data
-    with conn.cursor() as cursor:
-        cursor.prefetchrows = 0
-        cursor.execute(sql)
-        assert cursor.fetchall() == expected_data
-
-
-def test_4345(cursor):
-    "4345 - fetch duplicate data with outconverter"
-
-    def out_converter(value):
-        assert isinstance(value, str)
-        return int(value)
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "COL_3":
-            return cursor.var(
-                str, arraysize=cursor.arraysize, outconverter=out_converter
-            )
-
-    cursor.outputtypehandler = type_handler
-    cursor.execute(
-        """
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-            union all
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-            union all
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-        """
-    )
-    expected_data = [("A", 2, 3)] * 3
-    assert cursor.fetchall() == expected_data
-
-
-def test_4346(cursor):
-    "4346 - test setinputsizes() with defaults specified"
-    cursor.setinputsizes(None, str)
-    assert cursor.bindvars[0] is None
-    assert isinstance(cursor.bindvars[1], oracledb.Var)
-    cursor.setinputsizes(a=None, b=str)
-    assert cursor.bindvars.get("a") is None
-    assert isinstance(cursor.bindvars["b"], oracledb.Var)
-
-
-def test_4347(skip_if_drcp, test_env):
-    "4547 - kill connection with open cursor"
-    admin_conn = test_env.get_admin_connection()
-    conn = test_env.get_connection()
-    assert conn.is_healthy()
-    sid, serial = test_env.get_sid_serial(conn)
-    with admin_conn.cursor() as admin_cursor:
-        sql = f"alter system kill session '{sid},{serial}'"
-        admin_cursor.execute(sql)
-    with test_env.assert_raises_full_code("DPY-4011"):
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-    assert not conn.is_healthy()
-
-
-def test_4348(skip_if_drcp, test_env):
-    "4348 - kill connection in cursor context manager"
-    admin_conn = test_env.get_admin_connection()
-    conn = test_env.get_connection()
-    assert conn.is_healthy()
-    sid, serial = test_env.get_sid_serial(conn)
-    with admin_conn.cursor() as admin_cursor:
-        admin_cursor.execute(f"alter system kill session '{sid},{serial}'")
-    with test_env.assert_raises_full_code("DPY-4011"):
-        with conn.cursor() as cursor:
-            cursor.execute("select user from dual")
-    assert not conn.is_healthy()
-
-
-def test_4349(conn, test_env):
-    "4349 - fetchmany() with and without parameters"
-    sql_part = "select user from dual"
-    sql = " union all ".join([sql_part] * 10)
-    with conn.cursor() as cursor:
-        cursor.arraysize = 6
-        cursor.execute(sql)
-        rows = cursor.fetchmany()
-        assert len(rows) == cursor.arraysize
-        cursor.execute(sql)
-        rows = cursor.fetchmany(size=2)
-        assert len(rows) == 2
-        cursor.execute(sql)
-        rows = cursor.fetchmany(numRows=4)
-        assert len(rows) == 4
-        cursor.execute(sql)
-        with test_env.assert_raises_full_code("DPY-2014"):
-            cursor.fetchmany(size=2, numRows=4)
-
-
-def test_4350(conn):
-    "4350 - access cursor.rowcount after closing cursor"
-    with conn.cursor() as cursor:
-        cursor.execute("select user from dual")
-        cursor.fetchall()
-        assert cursor.rowcount == 1
-    assert cursor.rowcount == -1
-
-
-def test_4351(disable_fetch_lobs, cursor, test_env):
-    "4351 - changing bind type with define needed"
-    cursor.execute("delete from TestClobs")
-    row_for_1 = (1, "Short value 1")
-    row_for_56 = (56, "Short value 56")
-    for data in (row_for_1, row_for_56):
-        cursor.execute(
-            "insert into TestClobs (IntCol, ClobCol) values (:1, :2)",
-            data,
-        )
-    sql = "select IntCol, ClobCol from TestClobs where IntCol = :int_col"
-    cursor.execute(sql, int_col="1")
-    assert cursor.fetchone() == row_for_1
-    cursor.execute(sql, int_col="56")
-    assert cursor.fetchone() == row_for_56
-    cursor.execute(sql, int_col=1)
-    assert cursor.fetchone() == row_for_1
-
-
-def test_4352(cursor):
-    "4352 - test calling cursor.parse() twice with the same statement"
-    cursor.execute("truncate table TestTempTable")
-    data = (4363, "Value for test 4363")
-    cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        data,
-    )
-    sql = "update TestTempTable set StringCol1 = :v where IntCol = :i"
-    for i in range(2):
-        cursor.parse(sql)
-        cursor.execute(sql, ("Updated value", data[0]))
-
-
-def test_4353(conn, cursor):
-    "4353 - test addition of column to cached query"
-    table_name = "test_4365"
-    try:
-        cursor.execute(f"drop table {table_name}")
-    except oracledb.DatabaseError:
-        pass
-    data = ("val 1", "val 2")
-    cursor.execute(f"create table {table_name} (col1 varchar2(10))")
-    cursor.execute(f"insert into {table_name} values (:1)", [data[0]])
-    conn.commit()
-    cursor.execute(f"select * from {table_name}")
-    assert cursor.fetchall() == [(data[0],)]
-    cursor.execute(f"alter table {table_name} add col2 varchar2(10)")
-    cursor.execute(f"update {table_name} set col2 = :1", [data[1]])
-    conn.commit()
-    cursor.execute(f"select * from {table_name}")
-    assert cursor.fetchall() == [data]
-
-
-def test_4354(cursor, test_env):
-    "4354 - test population of array var with too many elements"
-    var = cursor.arrayvar(int, 3)
-    with test_env.assert_raises_full_code("DPY-2016"):
-        var.setvalue(0, [1, 2, 3, 4])
-
-
-def test_4355(cursor):
-    "4355 - test executemany() with PL/SQL and increasing data lengths"
-    sql = "begin :1 := length(:2); end;"
-    var = cursor.var(int, arraysize=3)
-    cursor.executemany(sql, [(var, "one"), (var, "two"), (var, "end")])
-    assert var.values == [3, 3, 3]
-    cursor.executemany(sql, [(var, "three"), (var, "four"), (var, "end")])
-    assert var.values == [5, 4, 3]
-    cursor.executemany(sql, [(var, "five"), (var, "six"), (var, "end")])
-    assert var.values == [4, 3, 3]
-
-
-def test_4356(cursor):
-    "4356 - test cursor.rowcount values for queries"
-    max_rows = 93
-    cursor.arraysize = 10
-    cursor.execute(
-        "select rownum as id from dual connect by rownum <= :1",
-        [max_rows],
-    )
-    assert cursor.rowcount == 0
-    batch_num = 1
-    while True:
-        rows = cursor.fetchmany()
-        if not rows:
-            break
-        expected_value = min(max_rows, batch_num * cursor.arraysize)
-        assert cursor.rowcount == expected_value
-        batch_num += 1
-    cursor.fetchall()
-    assert cursor.rowcount == max_rows
-
-
-def test_4357(disable_fetch_lobs, conn, cursor, test_env):
-    "4357 - test bind order for PL/SQL"
-    cursor.execute("delete from TestClobs")
-    sql = """
-        insert into TestClobs (IntCol, CLOBCol, ExtraNumCol1)
-        values (:1, :2, :3)"""
-    data = "x" * 9000
-    rows = [(1, data, 5), (2, data, 6)]
-    cursor.execute(sql, rows[0])
-    plsql = f"begin {sql}; end;"
-    cursor.execute(plsql, rows[1])
-    conn.commit()
-    cursor.execute(
-        """
-        select IntCol, CLOBCol, ExtraNumCol1
-        from TestCLOBs
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == rows
-
-
-def test_4358(disable_fetch_lobs, cursor, test_env):
-    "4358 - test rebuild of table with LOB in cached query (as string)"
-    table_name = "test_4370"
-    drop_sql = f"drop table {table_name} purge"
-    create_sql = f"""
-        create table {table_name} (
-            Col1 number(9) not null,
-            Col2 clob not null
-        )"""
-    insert_sql = f"insert into {table_name} values (:1, :2)"
-    query_sql = f"select * from {table_name} order by Col1"
-    data = [(1, "CLOB value 1"), (2, "CLOB value 2")]
-    try:
-        cursor.execute(drop_sql)
-    except oracledb.DatabaseError:
-        pass
-    cursor.execute(create_sql)
-    cursor.executemany(insert_sql, data)
-    cursor.execute(query_sql)
-    assert cursor.fetchall() == data
-    cursor.execute(query_sql)
-    assert cursor.fetchall() == data
-    cursor.execute(drop_sql)
-    cursor.execute(create_sql)
-    cursor.executemany(insert_sql, data)
-    cursor.execute(query_sql)
-    assert cursor.fetchall() == data
-
-
-def test_4359(cursor):
-    "4359 - test rebuild of table with LOB in cached query (as LOB)"
-    table_name = "test_4371"
-    drop_sql = f"drop table {table_name} purge"
-    create_sql = f"""
-        create table {table_name} (
-            Col1 number(9) not null,
-            Col2 clob not null)"""
-    insert_sql = f"insert into {table_name} values (:1, :2)"
-    query_sql = f"select * from {table_name} order by Col1"
-    data = [(1, "CLOB value 1"), (2, "CLOB value 2")]
-    try:
-        cursor.execute(drop_sql)
-    except oracledb.DatabaseError:
-        pass
-    cursor.execute(create_sql)
-    cursor.executemany(insert_sql, data)
-    cursor.execute(query_sql)
-    fetched_data = [(n, c.read()) for n, c in cursor]
-    assert fetched_data == data
-    cursor.execute(query_sql)
-    fetched_data = [(n, c.read()) for n, c in cursor]
-    assert fetched_data == data
-    cursor.execute(drop_sql)
-    cursor.execute(create_sql)
-    cursor.executemany(insert_sql, data)
-    cursor.execute(query_sql)
-    fetched_data = [(n, c.read()) for n, c in cursor]
-    assert fetched_data == data
-
-
-def test_4360(skip_unless_json_supported, cursor, test_env):
-    "4360 - fetch JSON columns as Python objects"
-    test_env.skip_unless_server_version(21)
-    expected_data = [
-        (1, [1, 2, 3], [4, 5, 6], [7, 8, 9]),
-        (2, None, None, None),
-    ]
-    cursor.execute("select * from TestJsonCols order by IntCol")
-    assert cursor.fetchall() == expected_data
-
-
-def test_4361(skip_unless_domains_supported, cursor, test_env):
-    "4361 - fetch table with domain and annotations"
-    cursor.execute("select * from TableWithDomainAndAnnotations")
-    assert cursor.fetchall() == [(1, 25)]
-    column_1 = cursor.description[0]
-    assert column_1.domain_schema is None
-    assert column_1.domain_name is None
-    assert column_1.annotations is None
-    column_2 = cursor.description[1]
-    assert column_2.domain_schema == test_env.main_user.upper()
-    assert column_2.domain_name == "SIMPLEDOMAIN"
-    expected_annotations = {
-        "ANNO_1": "first annotation",
-        "ANNO_2": "second annotation",
-        "ANNO_3": "",
-    }
-    assert column_2.annotations == expected_annotations
-
-
-def test_4362(cursor):
-    "4362 - test getting statement after it was executed"
-    sql = "select 1 from dual"
-    cursor.execute(sql)
-    assert cursor.statement == sql
-
-
-def test_4363(cursor):
-    "4363 - test getting cursor fetchvars"
-    assert cursor.fetchvars is None
-
-    cursor.execute("truncate table TestTempTable")
-    cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (1, '12')",
-    )
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    cursor.fetchall()
-    assert len(cursor.fetchvars) == 2
-    assert cursor.fetchvars[0].getvalue() == 1
-    assert cursor.fetchvars[1].getvalue() == "12"
-
-
-def test_4364(cursor):
-    "4364 - test fetchmany() with non-default cursor.arraysize"
-    cursor.arraysize = 20
-    values = [(i,) for i in range(30)]
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", values
-    )
-    cursor.execute("select IntCol from TestTempTable order by IntCol")
-    # fetch first 20 elements
-    fetched_values = cursor.fetchmany()
-    assert fetched_values == values[: cursor.arraysize]
-
-    # fetch missing elements
-    fetched_values = cursor.fetchmany()
-    assert fetched_values == values[cursor.arraysize :]
-
-
-def test_4365(cursor, test_env):
-    "4365 - negative tests for cursor.arraysize"
-    with test_env.assert_raises_full_code("DPY-2045"):
-        cursor.arraysize = 0
-    with test_env.assert_raises_full_code("DPY-2045"):
-        cursor.arraysize = -1
-    with test_env.assert_raises_full_code("DPY-2045"):
-        cursor.arraysize = "not valid"
-
-
-def test_4366(cursor, test_env):
-    "4366 - test fetching LOBs after an error"
-    sql = """
-        select
-            to_clob(:val),
-            1 / (dbms_lob.getlength(to_clob(:val)) - 1)
-        from dual"""
-    with test_env.assert_raises_full_code("ORA-01476"):
-        cursor.execute(sql, val="a")
-        cursor.fetchall()
-    cursor.execute(sql, val="bb")
-    lob, num_val = cursor.fetchone()
-    assert lob.read() == "bb"
-    assert num_val == 1
-
-
-def test_4367(conn):
-    "4367 - test parse() with autocommit enabled"
-    conn.autocommit = True
-    cursor = conn.cursor()
-    cursor.execute("truncate table TestTempTable")
-    cursor.parse("insert into TestTempTable (IntCol) values (:1)")
-    cursor.execute(None, [1])
-
-
-def test_4368(cursor, test_env):
-    "4368 - test cursor.setinputsizes() with early failed execute"
-    cursor.setinputsizes(a=int, b=str)
-    with test_env.assert_raises_full_code("DPY-2006"):
-        cursor.execute("select :c from dual", [5])
-    value = 4368
-    cursor.execute("select :d from dual", [value])
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == value
-
-
-def test_4369(test_env):
-    "4369 - access cursor.rowcount after closing connection"
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-    assert cursor.rowcount == -1
-
-
-def test_4370(conn, cursor):
-    "4370 - execute PL/SQL with out vars after query with duplicate data"
-    cursor.execute("truncate table TestTempTable")
-    cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        [(i + 1, "test_4370") for i in range(20)],
-    )
-    conn.commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    var = cursor.var(int)
-    cursor.execute("begin :1 := 4370; end;", [var])
-    assert var.getvalue() == 4370
-
-
-def test_4371(cursor):
-    "4371 - test cursor with fetch_decimals=True specified"
-    value = 4371
-    cursor.execute("select :1 from dual", [value], fetch_decimals=True)
-    rows = cursor.fetchall()
-    assert isinstance(rows[0][0], decimal.Decimal)
-
-
-def test_4372(cursor):
-    "4372 - test cursor.parse() uses oracledb.defaults.fetch_lobs"
-    cursor.parse("select to_clob('some_value') from dual")
-    fetch_info = cursor.description[0]
-    assert fetch_info.type is oracledb.DB_TYPE_CLOB
diff --git a/tests/test_4400_tpc.py b/tests/test_4400_tpc.py
deleted file mode 100644
index a08b4963..00000000
--- a/tests/test_4400_tpc.py
+++ /dev/null
@@ -1,362 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4400 - Module for testing TPC (two-phase commit) transactions.
-"""
-
-import oracledb
-import pytest
-
-
-def test_4400(conn, cursor):
-    "4400 - test begin, prepare, roll back global transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(3900, b"txn3900", b"branchId")
-    conn.tpc_begin(xid)
-    assert not conn.tpc_prepare()
-    conn.tpc_begin(xid)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    assert conn.tpc_prepare()
-    conn.tpc_rollback()
-    cursor.execute("select count(*) from TestTempTable")
-    (count,) = cursor.fetchone()
-    assert count == 0
-
-
-def test_4401(conn, cursor):
-    "4401 - test begin, prepare, commit global transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(3901, "txn3901", "branchId")
-    conn.tpc_begin(xid)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    assert conn.tpc_prepare()
-    conn.tpc_commit()
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor.fetchall() == [(1, "tesName")]
-
-
-def test_4402(conn, cursor):
-    "4402 - test multiple global transactions on the same connection"
-    cursor.execute("truncate table TestTempTable")
-    xid1 = conn.xid(3902, "txn3902", "branch1")
-    xid2 = conn.xid(3902, b"txn3902", b"branch2")
-    conn.tpc_begin(xid1)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    conn.tpc_end()
-    conn.tpc_begin(xid2)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'tesName')
-        """
-    )
-    conn.tpc_end()
-    needs_commit1 = conn.tpc_prepare(xid1)
-    needs_commit2 = conn.tpc_prepare(xid2)
-    if needs_commit1:
-        conn.tpc_commit(xid1)
-    if needs_commit2:
-        conn.tpc_commit(xid2)
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    expected_rows = [(1, "tesName"), (2, "tesName")]
-    assert cursor.fetchall() == expected_rows
-
-
-def test_4403(conn, cursor, test_env):
-    "4403 - test rollback with parameter xid"
-    cursor.execute("truncate table TestTempTable")
-    xid1 = conn.xid(3901, b"txn3901", b"branch1")
-    xid2 = conn.xid(3902, "txn3902", "branch2")
-    for count, xid in enumerate([xid1, xid2]):
-        conn.tpc_begin(xid)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:id, 'tesName')
-            """,
-            id=count,
-        )
-        conn.tpc_end()
-    conn.tpc_rollback(xid1)
-
-    with test_env.assert_raises_full_code("ORA-24756"):
-        conn.tpc_prepare(xid1)
-    needs_commit = conn.tpc_prepare(xid2)
-    if needs_commit:
-        conn.tpc_commit(xid2)
-    cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert cursor.fetchall() == [(1, "tesName")]
-
-
-def test_4404(conn, cursor):
-    "4404 - test resuming a transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid1 = conn.xid(3939, "txn3939", "branch39")
-    xid2 = conn.xid(3940, "txn3940", "branch40")
-    values = [[xid1, (1, "User Info")], [xid2, (2, "Other User Info")]]
-    for xid, data in values:
-        conn.tpc_begin(xid)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data,
-        )
-        conn.tpc_end()
-    for xid, data in values:
-        conn.tpc_begin(xid, oracledb.TPC_BEGIN_RESUME)
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        (res,) = cursor.fetchall()
-        assert res == data
-        conn.tpc_rollback(xid)
-
-
-def test_4405(conn, cursor, test_env):
-    "4405 - test promoting a local transaction to a tpc transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(3941, "txn3941", "branch41")
-    values = (1, "String 1")
-    cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        values,
-    )
-    with test_env.assert_raises_full_code("ORA-24776"):
-        conn.tpc_begin(xid)
-    conn.tpc_begin(xid, oracledb.TPC_BEGIN_PROMOTE)
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    (res,) = cursor.fetchall()
-    assert res == values
-    conn.tpc_rollback(xid)
-
-
-def test_4406(conn, cursor, test_env):
-    "4406 - test ending a transaction with parameter xid"
-    cursor.execute("truncate table TestTempTable")
-    xid1 = conn.xid(4406, "txn4406a", "branch3")
-    xid2 = conn.xid(4406, b"txn4406b", b"branch4")
-    conn.tpc_begin(xid1)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test4406a')
-        """
-    )
-    conn.tpc_begin(xid2)
-    with test_env.assert_raises_full_code("ORA-24758"):
-        conn.tpc_end(xid1)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'test4406b')
-        """
-    )
-    conn.tpc_end(xid2)
-    with test_env.assert_raises_full_code("ORA-25352"):
-        conn.tpc_end(xid1)
-    conn.tpc_rollback(xid1)
-    conn.tpc_rollback(xid2)
-
-
-def test_4407(conn, cursor):
-    "4407 - test tpc_recover()"
-    cursor.execute("truncate table TestTempTable")
-    n_xids = 10
-    for i in range(n_xids):
-        xid = conn.xid(4407 + i, f"txn4407{i}", f"branch{i}")
-        conn.tpc_begin(xid)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, 'test4407')
-            """,
-            [i + 1],
-        )
-        conn.tpc_prepare(xid)
-    recovers = conn.tpc_recover()
-    assert len(recovers) == n_xids
-
-    cursor.execute("select * from DBA_PENDING_TRANSACTIONS")
-    assert cursor.fetchall() == recovers
-
-    for xid in recovers:
-        if xid.format_id % 2 == 0:
-            conn.tpc_commit(xid)
-    recovers = conn.tpc_recover()
-    assert len(recovers) == n_xids // 2
-
-    for xid in recovers:
-        conn.tpc_rollback(xid)
-    recovers = conn.tpc_recover()
-    assert len(recovers) == 0
-
-
-def test_4408(conn, cursor):
-    "4408 - test tpc_recover() with read-only transaction"
-    cursor.execute("truncate table TestTempTable")
-    for i in range(4):
-        xid = conn.xid(4408 + i, f"txn4408{i}", f"branch{i}")
-        conn.tpc_begin(xid)
-        cursor.execute("select * from TestTempTable")
-        conn.tpc_prepare(xid)
-    recovers = conn.tpc_recover()
-    assert len(recovers) == 0
-
-
-def test_4409(conn, cursor):
-    "4409 - test tpc_commit() with one_phase parameter"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4409, "txn4409", "branch1")
-    conn.tpc_begin(xid)
-    values = (1, "test4409")
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        values,
-    )
-    cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    conn.tpc_commit(xid, one_phase=True)
-    assert cursor.fetchall() == [values]
-
-
-def test_4410(conn, cursor, test_env):
-    "4410 - test negative cases for tpc_commit()"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4410, "txn4410", "branch1")
-    conn.tpc_begin(xid)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test4410')
-        """
-    )
-    pytest.raises(TypeError, conn.tpc_commit, "invalid xid")
-    conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-02053"):
-        conn.tpc_commit(xid, one_phase=True)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        conn.tpc_commit(xid)
-
-
-def test_4411(conn, cursor, test_env):
-    "4411 - test starting an already created transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4411, "txn4411", "branch1")
-    conn.tpc_begin(xid)
-    with test_env.assert_raises_full_code("ORA-24757"):
-        conn.tpc_begin(xid, oracledb.TPC_BEGIN_NEW)
-    with test_env.assert_raises_full_code("ORA-24797"):
-        conn.tpc_begin(xid, oracledb.TPC_BEGIN_PROMOTE)
-    conn.tpc_end()
-    for flag in [oracledb.TPC_BEGIN_NEW, oracledb.TPC_BEGIN_PROMOTE]:
-        with test_env.assert_raises_full_code("ORA-24757"):
-            conn.tpc_begin(xid, flag)
-    conn.tpc_rollback(xid)
-
-
-def test_4412(conn, cursor, test_env):
-    "4412 - test resuming a prepared transaction"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4412, "txn4412", "branch1")
-    conn.tpc_begin(xid)
-    conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        conn.tpc_begin(xid, oracledb.TPC_BEGIN_RESUME)
-
-
-def test_4413(conn, cursor, test_env):
-    "4413 - test tpc_begin and tpc_end with invalid parameters"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4413, "txn4413", "branch1")
-    test_values = [
-        (conn.tpc_begin, "DPY-2050"),
-        (conn.tpc_end, "DPY-2051"),
-    ]
-    for tpc_function, error_code in test_values:
-        pytest.raises(TypeError, tpc_function, "invalid xid")
-        with test_env.assert_raises_full_code(error_code):
-            tpc_function(xid, "invalid flag")
-        with test_env.assert_raises_full_code(error_code):
-            tpc_function(xid, 70)
-
-
-def test_4414(conn, cursor, test_env):
-    "4414 - test commiting transaction without tpc_commit"
-    xid = conn.xid(4414, "txn4409", "branch1")
-    conn.tpc_begin(xid)
-    with test_env.assert_raises_full_code("ORA-02089"):
-        cursor.execute("truncate table TestTempTable")
-
-
-def test_4415(conn, cursor, test_env):
-    "4415 - test tpc_commit when a commit is not needed"
-    xid = conn.xid(4416, "txn4416", "branch1")
-    conn.tpc_begin(xid)
-    cursor.execute("select * from TestTempTable")
-    conn.tpc_end(xid)
-    conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        conn.tpc_commit(xid)
-
-
-def test_4416(conn, cursor):
-    "4416 - test transaction_in_progress"
-    cursor.execute("truncate table TestTempTable")
-    xid = conn.xid(4415, "txn4415", "branch1")
-    assert not conn.transaction_in_progress
-
-    conn.tpc_begin(xid)
-    assert conn.transaction_in_progress
-    cursor.execute("insert into TestTempTable (IntCol) values (2)")
-
-    conn.tpc_end(xid)
-    assert not conn.transaction_in_progress
-
-    conn.tpc_prepare(xid)
-    assert not conn.transaction_in_progress
-
-    conn.tpc_commit(xid)
-    assert not conn.transaction_in_progress
diff --git a/tests/test_4500_connect_params.py b/tests/test_4500_connect_params.py
deleted file mode 100644
index 69b85ff7..00000000
--- a/tests/test_4500_connect_params.py
+++ /dev/null
@@ -1,1753 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4500 - Module for testing connection parameters.
-"""
-
-import base64
-import random
-import ssl
-
-import oracledb
-import pytest
-
-
-def _test_writable_parameter(name, value):
-    """
-    Tests that a writable parameter can be written to and the modified
-    value read back successfully.
-    """
-    params = oracledb.ConnectParams()
-    orig_value = getattr(params, name)
-    copied_params = params.copy()
-    args = {}
-    args[name] = value
-    params.set(**args)
-    assert getattr(params, name) == value
-    assert getattr(copied_params, name) == orig_value
-    args[name] = None
-    params.set(**args)
-    assert getattr(params, name) == value
-
-
-def _verify_network_name_attr(test_env, name):
-    """
-    Verify that a network name attribute is handled properly in both valid
-    and invalid cases.
-    """
-    cp = oracledb.ConnectParams()
-    assert getattr(cp, name) == getattr(oracledb.defaults, name)
-    for value, ok in [
-        ("valid_value", True),
-        ("'contains_quotes'", False),
-        ('"contains_double_quotes"', False),
-        ("contains_opening_paren (", False),
-        ("contains_closing_paren )", False),
-        ("contains_equals =", False),
-        ("contains_trailing_slash\\", False),
-    ]:
-        args = {}
-        args[name] = value
-        if ok:
-            cp = oracledb.ConnectParams(**args)
-            assert getattr(cp, name) == value
-        else:
-            with test_env.assert_raises_full_code("DPY-3029"):
-                oracledb.ConnectParams(**args)
-
-
-def test_4500():
-    "4500 - test simple EasyConnect string parsing with port specified"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("my_host:1578/my_service_name")
-    assert params.host == "my_host"
-    assert params.port == 1578
-    assert params.service_name == "my_service_name"
-
-
-def test_4501():
-    "4501 - test simple Easy Connect string parsing with no port specified"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("my_host2/my_service_name2")
-    assert params.host == "my_host2"
-    assert params.port == 1521
-    assert params.service_name == "my_service_name2"
-
-
-def test_4502():
-    "4502 - test simple EasyConnect string parsing with DRCP enabled"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("my_host3.org/my_service_name3:pooled")
-    assert params.host == "my_host3.org"
-    assert params.service_name == "my_service_name3"
-    assert params.server_type == "pooled"
-    params.parse_connect_string("my_host3/my_service_name3:ShArEd")
-    assert params.server_type == "shared"
-
-
-def test_4503():
-    "4503 - test simple name-value pair format connect string"
-    connect_string = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host4)(PORT=1589))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name4)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == "my_host4"
-    assert params.port == 1589
-    assert params.service_name == "my_service_name4"
-
-
-def test_4504():
-    "4504 - test EasyConnect with protocol"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("tcps://my_host6/my_service_name6")
-    assert params.host == "my_host6"
-    assert params.service_name == "my_service_name6"
-    assert params.protocol == "tcps"
-
-
-def test_4505(test_env):
-    "4505 - test EasyConnect with invalid protocol"
-    params = oracledb.ConnectParams()
-    with test_env.assert_raises_full_code("DPY-4021"):
-        params.parse_connect_string(
-            "invalid_proto://my_host7/my_service_name7"
-        )
-
-
-def test_4506(test_env):
-    "4506 - confirm an exception is raised if using ipc protocol"
-    connect_string = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=ipc)(KEY=my_view8))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name8)))"""
-    params = oracledb.ConnectParams()
-    with test_env.assert_raises_full_code("DPY-4021"):
-        params.parse_connect_string(connect_string)
-
-
-def test_4507():
-    "4507 - connect descriptor with retry count and retry delay"
-    connect_string = """
-        (DESCRIPTION=(RETRY_COUNT=6)(RETRY_DELAY=5)
-        (ADDRESS=(PROTOCOL=TCP)(HOST=my_host9)(PORT=1593))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name9)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.retry_count == 6
-    assert params.retry_delay == 5
-
-
-def test_4508():
-    "4508 - connect descriptor with expire_time setting"
-    connect_string = """
-        (DESCRIPTION=(EXPIRE_TIME=12)
-        (ADDRESS=(PROTOCOL=TCP)(HOST=my_host11)(PORT=1594))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name11)))
-    """
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.expire_time == 12
-
-
-def test_4509():
-    "4509 - connect descriptor with purity parameters"
-    for purity in oracledb.Purity:
-        if purity is oracledb.Purity.DEFAULT:
-            continue
-        cclass = f"cclass_4510_{purity.name}"
-        connect_string = f"""
-            (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host12)(PORT=694))
-            (CONNECT_DATA=(SERVICE_NAME=service_4510)
-            (POOL_CONNECTION_CLASS={cclass})
-            (POOL_PURITY={purity.name})))"""
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.cclass == cclass
-        assert params.purity is purity
-        gen_connect_string = params.get_connect_string()
-        gen_params = oracledb.ConnectParams()
-        gen_params.parse_connect_string(gen_connect_string)
-        assert gen_params.cclass == cclass
-        assert gen_params.purity is purity
-
-
-def test_4510(test_env):
-    "4510 - connect descriptor with invalid pool purity"
-    connect_string = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host13)(PORT=695))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name13)
-        (POOL_CONNECTION_CLASS=cclass_13)(POOL_PURITY=INVALID)))"""
-    params = oracledb.ConnectParams()
-    with test_env.assert_raises_full_code("DPY-4022"):
-        params.parse_connect_string(connect_string)
-
-
-def test_4511():
-    "4511 - connect descriptor with transport connect timeout values"
-    connect_string = """
-        (DESCRIPTION=(TRANSPORT_CONNECT_TIMEOUT=500 ms)
-        (ADDRESS=(PROTOCOL=TCP)(HOST=my_host14)(PORT=695))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name14)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.tcp_connect_timeout == 0.5
-    connect_string = connect_string.replace("500 ms", "15 SEC")
-    params.parse_connect_string(connect_string)
-    assert params.tcp_connect_timeout == 15
-    connect_string = connect_string.replace("15 SEC", "5 min")
-    params.parse_connect_string(connect_string)
-    assert params.tcp_connect_timeout == 300
-    connect_string = connect_string.replace("5 min", "34")
-    params.parse_connect_string(connect_string)
-    assert params.tcp_connect_timeout == 34
-
-
-def test_4512():
-    "4512 - test EasyConnect string parsing with no service name specified"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("my_host15:1578/")
-    assert params.host == "my_host15"
-    assert params.port == 1578
-    assert params.service_name is None
-
-
-def test_4513():
-    "4513 - test EasyConnect string parsing with port value missing"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string("my_host17:/my_service_name17")
-    assert params.host == "my_host17"
-    assert params.port == 1521
-    assert params.service_name == "my_service_name17"
-
-
-def test_4514(test_env):
-    "4514 - test connect descriptor with invalid number"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=(RETRY_COUNT=wrong)(RETRY_DELAY=5)
-        (ADDRESS=(PROTOCOL=TCP)(HOST=my_host18)(PORT=1598))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name18)))"""
-    with test_env.assert_raises_full_code("DPY-4018"):
-        params.parse_connect_string(connect_string)
-
-
-def test_4515():
-    "4515 - test connect descriptor with security options"
-    options = [
-        ("CN=unknown19a", "/tmp/wallet_loc19a", "On", True),
-        ("CN=unknown19b", "/tmp/wallet_loc19b", "False", False),
-        ("CN=unknown19c", "/tmp/wallet_loc19c", "Off", False),
-        ("CN=unknown19d", "/tmp/wallet_loc19d", "True", True),
-        ("CN=unknown19e", "/tmp/wallet_loc19e", "yes", True),
-        ("CN=unknown19f", "/tmp/wallet_loc19f", "no", False),
-    ]
-    for dn, wallet_loc, match_option, match_value in options:
-        params = oracledb.ConnectParams()
-        connect_string = f"""
-            (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host19)(PORT=872))
-            (CONNECT_DATA=(SERVICE_NAME=my_service_name19))
-            (SECURITY=(SSL_SERVER_CERT_DN="{dn}")
-            (SSL_SERVER_DN_MATCH={match_option})
-            (MY_WALLET_DIRECTORY="{wallet_loc}")))"""
-        params.parse_connect_string(connect_string)
-        assert params.ssl_server_cert_dn == dn
-        assert params.wallet_location == wallet_loc
-        assert params.ssl_server_dn_match == match_value
-
-
-def test_4516():
-    "4516 - test easy connect string with security options"
-    options = [
-        ("CN=unknown20a", "/tmp/wallet_loc20a", "On", True),
-        ("CN=unknown20b", "/tmp/wallet_loc20b", "False", False),
-        ("CN=unknown20c", "/tmp/wallet_loc20c", "Off", False),
-        ("CN=unknown20d", "/tmp/wallet_loc20d", "True", True),
-        ("CN=unknown20e", "/tmp/wallet_loc20e", "yes", True),
-        ("CN=unknown20f", "/tmp/wallet_loc20f", "no", False),
-    ]
-    for dn, wallet_loc, match_option, match_value in options:
-        params = oracledb.ConnectParams()
-        connect_string = f"""
-            my_host20/my_server_name20?
-            ssl_server_cert_dn="{dn}"&
-            ssl_server_dn_match= {match_option} &
-            wallet_location = "{wallet_loc}" """
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.ssl_server_cert_dn == dn
-        assert params.ssl_server_dn_match == match_value
-        assert params.wallet_location == wallet_loc
-
-
-def test_4517():
-    "4517 - test easy connect string with description options"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        my_host21/my_server_name21?
-        expire_time=5&
-        retry_delay=10&
-        retry_count=12&
-        transport_connect_timeout=2.5"""
-    params.parse_connect_string(connect_string)
-    assert params.expire_time == 5
-    assert params.retry_delay == 10
-    assert params.retry_count == 12
-    assert params.tcp_connect_timeout == 2.5
-
-
-def test_4518(test_env):
-    "4518 - test easy connect string with invalid parameters"
-    params = oracledb.ConnectParams()
-    connect_string_prefix = "my_host22/my_server_name22?"
-    suffixes = ["expire_time=invalid", "expire_time"]
-    for suffix in suffixes:
-        with test_env.assert_raises_full_code("DPY-4018"):
-            params.parse_connect_string(connect_string_prefix + suffix)
-
-
-def test_4519():
-    "4519 - test connect string containing spaces and newlines"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP) \n(HOST=my_host23)\n
-        (PORT=1560))(CONNECT_DATA=  (SERVICE_NAME=my_service_name23))
-        (SECURITY=(MY_WALLET_DIRECTORY="my wallet dir 23")))"""
-    params.parse_connect_string(connect_string)
-    assert params.host == "my_host23"
-    assert params.port == 1560
-    assert params.service_name == "my_service_name23"
-    assert params.wallet_location == "my wallet dir 23"
-
-
-def test_4520(test_env):
-    "4520 - test missing configuration directory"
-    params = oracledb.ConnectParams(config_dir="/missing")
-    with test_env.assert_raises_full_code("DPY-4026"):
-        params.parse_connect_string("tns_alias")
-
-
-def test_4521():
-    "4521 - test connect string with an address list"
-    params = oracledb.ConnectParams()
-    connect_string = (
-        "(DESCRIPTION=(LOAD_BALANCE=ON)(RETRY_COUNT=5)(RETRY_DELAY=2)"
-        "(ADDRESS_LIST=(LOAD_BALANCE=ON)"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host25)(PORT=4521))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host26)(PORT=4522)))"
-        "(CONNECT_DATA=(SERVICE_NAME=my_service_name25)))"
-    )
-    params.parse_connect_string(connect_string)
-    assert params.host == ["my_host25", "my_host26"]
-    assert params.port == [4521, 4522]
-    assert params.protocol == ["tcp", "tcp"]
-    assert params.service_name == "my_service_name25"
-    assert params.retry_count == 5
-    assert params.retry_delay == 2
-    assert params.get_connect_string() == connect_string
-
-
-def test_4522():
-    "4522 - test connect string with multiple address lists"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=(LOAD_BALANCE=ON)(RETRY_COUNT=5)(RETRY_DELAY=2)
-        (ADDRESS_LIST=(LOAD_BALANCE=ON)
-        (ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=my_host26))
-        (ADDRESS=(PROTOCOL=tcp)(PORT=222)(HOST=my_host27)))
-        (ADDRESS_LIST=(LOAD_BALANCE=ON)
-        (ADDRESS=(PROTOCOL=tcps)(PORT=5555)(HOST=my_host28))
-        (ADDRESS=(PROTOCOL=tcps)(PORT=444)(HOST=my_host29)))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name26)))"""
-    params.parse_connect_string(connect_string)
-    hosts = ["my_host26", "my_host27", "my_host28", "my_host29"]
-    assert params.host == hosts
-    assert params.port == [1521, 222, 5555, 444]
-    assert params.protocol == ["tcp", "tcp", "tcps", "tcps"]
-    assert params.service_name == "my_service_name26"
-    assert params.retry_count == 5
-    assert params.retry_delay == 2
-
-
-def test_4523():
-    "4523 - test connect string with multiple descriptions"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION_LIST=(FAIL_OVER=ON)(LOAD_BALANCE=OFF)
-        (DESCRIPTION=(LOAD_BALANCE=OFF)(RETRY_COUNT=1)(RETRY_DELAY=1)
-        (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(PORT=5001)
-        (HOST=my_host30))
-        (ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=my_host31)))
-        (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(PORT=5002)
-        (HOST=my_host32))
-        (ADDRESS=(PROTOCOL=tcp)(PORT=5003)(HOST=my_host33)))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name27)))
-        (DESCRIPTION=(LOAD_BALANCE=OFF)(RETRY_COUNT=2)(RETRY_DELAY=3)
-        (ADDRESS_LIST = (ADDRESS=(PROTOCOL=tcp)(PORT=5001)
-        (HOST=my_host34))
-        (ADDRESS=(PROTOCOL=tcp)(PORT=5001)(HOST=my_host35)))
-        (ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(PORT=5001)
-        (HOST=my_host36))
-        (ADDRESS=(PROTOCOL=tcps)(HOST=my_host37)(PORT=1521)))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name28))))"""
-    params.parse_connect_string(connect_string)
-    hosts = [
-        "my_host30",
-        "my_host31",
-        "my_host32",
-        "my_host33",
-        "my_host34",
-        "my_host35",
-        "my_host36",
-        "my_host37",
-    ]
-    ports = [5001, 1521, 5002, 5003, 5001, 5001, 5001, 1521]
-    protocols = ["tcp", "tcp", "tcp", "tcp", "tcp", "tcp", "tcp", "tcps"]
-    service_names = ["my_service_name27", "my_service_name28"]
-    assert params.host == hosts
-    assert params.port == ports
-    assert params.protocol == protocols
-    assert params.service_name == service_names
-    assert params.retry_count == [1, 2]
-    assert params.retry_delay == [1, 3]
-
-
-def test_4524():
-    "4524 - test connect strings with https_proxy defined"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=
-        (ADDRESS=(HTTPS_PROXY=proxy_4528a)(HTTPS_PROXY_PORT=4528)
-        (PROTOCOL=TCP)(HOST=my_host4528a)(PORT=8528))
-        (CONNECT_DATA=(SERVICE_NAME=my_service_name4528a)))"""
-    params.parse_connect_string(connect_string)
-    assert params.https_proxy == "proxy_4528a"
-    assert params.https_proxy_port == 4528
-    connect_string = """
-        tcps://my_host_4528b/my_service_name_4528b?
-        https_proxy=proxy_4528b&https_proxy_port=9528"""
-    params.parse_connect_string(connect_string)
-    assert params.https_proxy == "proxy_4528b"
-    assert params.https_proxy_port == 9528
-
-
-def test_4525(test_env):
-    "4525 - test connect strings with server_type defined"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=my_host4529)(PORT=4529))
-        (CONNECT_DATA=(SERVER=DEDICATED)
-        (SERVICE_NAME=my_service_name4529)))"""
-    params.parse_connect_string(connect_string)
-    assert params.server_type == "dedicated"
-    connect_string = connect_string.replace("DEDICATED", "INVALID")
-    with test_env.assert_raises_full_code("DPY-4028"):
-        params.parse_connect_string(connect_string)
-
-
-def test_4526():
-    "4526 - test writable parameters"
-    _test_writable_parameter("appcontext", [("a", "b", "c")])
-    _test_writable_parameter("config_dir", "config_dir_4530")
-    _test_writable_parameter("disable_oob", True)
-    _test_writable_parameter("edition", "edition_4530")
-    _test_writable_parameter("events", True)
-    _test_writable_parameter("matchanytag", True)
-    _test_writable_parameter("mode", oracledb.AUTH_MODE_SYSDBA)
-    _test_writable_parameter("shardingkey", [1, 2, 3])
-    _test_writable_parameter("stmtcachesize", 25)
-    _test_writable_parameter("supershardingkey", [1, 2, 3])
-    _test_writable_parameter("tag", "tag_4530")
-    _test_writable_parameter("debug_jdwp", "host=host;port=4530")
-    _test_writable_parameter("externalauth", True)
-    _test_writable_parameter("user", "USER_1")
-    _test_writable_parameter("proxy_user", "PROXY_USER_1")
-
-
-def test_4527():
-    "4527 - test building connect string with TCP connect timeout"
-    host = "my_host4531"
-    service_name = "my_service4531"
-    options = [
-        (25, "25"),
-        (120, "2min"),
-        (2.5, "2500ms"),
-        (3.4328, "3432ms"),
-    ]
-    for in_val, out_val in options:
-        params = oracledb.ConnectParams(
-            host=host,
-            service_name=service_name,
-            tcp_connect_timeout=in_val,
-            retry_delay=0,
-        )
-        tcp_timeout_val = f"(TRANSPORT_CONNECT_TIMEOUT={out_val})"
-        connect_string = (
-            f"(DESCRIPTION={tcp_timeout_val}"
-            "(ADDRESS=(PROTOCOL=tcp)"
-            f"(HOST={host})(PORT=1521))(CONNECT_DATA="
-            f"(SERVICE_NAME={service_name})))"
-        )
-        assert params.get_connect_string() == connect_string
-
-
-def test_4528():
-    "4528 - test EasyConnect with pool parameters"
-    options = [
-        ("cclass_33a", "self", oracledb.PURITY_SELF),
-        ("cclass_33b", "new", oracledb.PURITY_NEW),
-    ]
-    for cclass, purity_str, purity_int in options:
-        connect_string = f"""
-            my_host_33/my_service_name_33:pooled?
-            pool_connection_class={cclass}&
-            pool_purity={purity_str}"""
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.host == "my_host_33"
-        assert params.service_name == "my_service_name_33"
-        assert params.port == 1521
-        assert params.server_type == "pooled"
-        assert params.cclass == cclass
-        assert params.purity == purity_int
-
-
-def test_4529():
-    "4529 - test connect descriptor with different containers (small 1st)"
-    connect_string = """
-        (DESCRIPTION=
-            (ADDRESS=(PROTOCOL=tcp)(HOST=host1)(PORT=1521))
-            (ADDRESS_LIST=
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host2a)(PORT=1522))
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host2b)(PORT=1523)))
-            (ADDRESS=(PROTOCOL=tcp)(HOST=host3)(PORT=1524))
-            (CONNECT_DATA=(SERVICE_NAME=my_service_34)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == ["host1", "host2a", "host2b", "host3"]
-
-
-def test_4530():
-    "4530 - test connect descriptor with different containers (small 2nd)"
-    connect_string = """
-        (DESCRIPTION=
-            (ADDRESS_LIST=
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host1a)(PORT=1532))
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host1b)(PORT=1533)))
-            (ADDRESS=(PROTOCOL=tcp)(HOST=host2)(PORT=1534))
-            (ADDRESS_LIST=
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host3a)(PORT=1535))
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host3b)(PORT=1536)))
-            (CONNECT_DATA=(SERVICE_NAME=my_service_34)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == ["host1a", "host1b", "host2", "host3a", "host3b"]
-
-
-def test_4531():
-    "4531 - test building connect string with source route designation"
-    options = [
-        ("on", True),
-        ("off", False),
-        ("true", True),
-        ("false", False),
-        ("yes", True),
-        ("no", False),
-    ]
-
-    for in_val, has_section in options:
-        connect_string = f"""
-            (DESCRIPTION=
-                (RETRY_DELAY=0)
-                (SOURCE_ROUTE={in_val})
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host1)(PORT=1521))
-                (ADDRESS=(PROTOCOL=tcp)(HOST=host2)(PORT=1522))
-                (CONNECT_DATA=(SERVICE_NAME=my_service_35)))"""
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        source_route_clause = "(SOURCE_ROUTE=ON)" if has_section else ""
-        connect_string = (
-            f"(DESCRIPTION=(ADDRESS_LIST={source_route_clause}"
-            "(ADDRESS=(PROTOCOL=tcp)(HOST=host1)(PORT=1521))"
-            "(ADDRESS=(PROTOCOL=tcp)(HOST=host2)(PORT=1522)))"
-            "(CONNECT_DATA=(SERVICE_NAME=my_service_35)))"
-        )
-        assert params.get_connect_string() == connect_string
-
-
-def test_4532():
-    "4532 - test connect parameters which generate no connect string"
-    params = oracledb.ConnectParams()
-    assert params.get_connect_string() is None
-    params.set(mode=oracledb.SYSDBA)
-    assert params.get_connect_string() is None
-
-
-def test_4533():
-    "4533 - test parsing a DSN with credentials and a connect string"
-    params = oracledb.ConnectParams()
-    dsn = "my_user4538/my_password4538@localhost:1525/my_service_name"
-    user, password, dsn = params.parse_dsn_with_credentials(dsn)
-    assert user == "my_user4538"
-    assert password == "my_password4538"
-    assert dsn == "localhost:1525/my_service_name"
-
-
-def test_4534():
-    "4534 - test parsing a DSN with only credentials"
-    params = oracledb.ConnectParams()
-    dsn = "my_user4539/my_password4539"
-    user, password, dsn = params.parse_dsn_with_credentials(dsn)
-    assert user == "my_user4539"
-    assert password == "my_password4539"
-    assert dsn is None
-
-
-def test_4535():
-    "4535 - test parsing a DSN with empty credentials"
-    for dsn in ("", "/"):
-        params = oracledb.ConnectParams()
-        user, password, dsn = params.parse_dsn_with_credentials(dsn)
-        assert user is None
-        assert password is None
-        assert dsn is None
-
-
-def test_4536():
-    "4536 - test parsing a DSN with no credentials"
-    dsn_in = "my_alias_4561"
-    params = oracledb.ConnectParams()
-    user, password, dsn_out = params.parse_dsn_with_credentials(dsn_in)
-    assert user is None
-    assert password is None
-    assert dsn_out == dsn_in
-
-
-def test_4537():
-    "4537 - test connect strings with connection_id_prefix defined"
-    params = oracledb.ConnectParams()
-    connect_string = """
-        (DESCRIPTION=
-            (ADDRESS=(PROTOCOL=TCP)(HOST=my_host4562a)(PORT=4562))
-            (CONNECT_DATA=(CONNECTION_ID_PREFIX=prefix4562a)
-            (SERVICE_NAME=my_service_name4562a)))"""
-    params.parse_connect_string(connect_string)
-    assert params.connection_id_prefix == "prefix4562a"
-    params = oracledb.ConnectParams()
-    params.set(connection_id_prefix="prefix4562b")
-    params.parse_connect_string("my_host4562b/my_service_name_4562b")
-    assert params.connection_id_prefix == "prefix4562b"
-
-
-def test_4538():
-    "4538 - test overriding parameters"
-    params = oracledb.ConnectParams()
-    host = "my_host_4538"
-    port = 3578
-    service_name = "my_service_name_4538"
-    connect_string = f"{host}:{port}/{service_name}"
-    params.parse_connect_string(connect_string)
-    assert params.service_name == service_name
-    assert params.port == port
-    new_service_name = "new_service_name_4538"
-    new_port = 613
-    params.set(service_name=new_service_name, port=new_port)
-    assert params.service_name == new_service_name
-    assert params.port == new_port
-
-
-def test_4539():
-    "4539 - test ConnectParams repr()"
-    values = [
-        ("user", "USER_1"),
-        ("proxy_user", "PROXY_USER_1"),
-        ("host", "my_host_1"),
-        ("port", 1521),
-        ("protocol", "tcp"),
-        ("https_proxy", "proxy_a"),
-        ("https_proxy_port", 4528),
-        ("service_name", "my_service_name1"),
-        ("instance_name", "my_instance_name"),
-        ("sid", "my_sid1"),
-        ("server_type", "dedicated"),
-        ("cclass", "cclass_1"),
-        ("purity", oracledb.PURITY_SELF),
-        ("expire_time", 60),
-        ("retry_count", 6),
-        ("retry_delay", 10),
-        ("tcp_connect_timeout", 40.0),
-        ("ssl_server_dn_match", False),
-        ("ssl_server_cert_dn", "CN=unknown19a"),
-        ("wallet_location", "/tmp/wallet_loc1a"),
-        ("events", True),
-        ("externalauth", True),
-        ("mode", oracledb.AUTH_MODE_SYSDBA),
-        ("disable_oob", True),
-        ("stmtcachesize", 25),
-        ("edition", "edition_4"),
-        ("tag", "tag4"),
-        ("matchanytag", True),
-        ("config_dir", "config_dir_4"),
-        ("appcontext", [("a", "b", "c")]),
-        ("shardingkey", [1, 2, 3]),
-        ("supershardingkey", [4]),
-        ("debug_jdwp", "host=host;port=4538"),
-        ("connection_id_prefix", "prefix4564"),
-        ("ssl_context", None),
-        ("sdu", 16384),
-        ("pool_boundary", "statement"),
-        ("use_tcp_fast_open", True),
-        ("ssl_version", ssl.TLSVersion.TLSv1_2),
-        ("program", "my_program"),
-        ("machine", "my_machine"),
-        ("terminal", "my_terminal"),
-        ("osuser", "me"),
-        ("driver_name", "custom_driver"),
-        ("use_sni", True),
-        ("thick_mode_dsn_passthrough", True),
-        ("extra_auth_params", dict(extra1="A", extra2="B")),
-        ("pool_name", "my_pool"),
-    ]
-    params = oracledb.ConnectParams(**dict(values))
-    parts = [f"{name}={value!r}" for name, value in values]
-    expected_value = f"ConnectParams({', '.join(parts)})"
-    assert repr(params) == expected_value
-    assert params.purity is oracledb.Purity.SELF
-    assert params.mode is oracledb.AuthMode.SYSDBA
-    new_values = [
-        ("user", "USER_NEW"),
-        ("proxy_user", "PROXY_USER_NEW"),
-        ("host", "my_host_new"),
-        ("port", 1621),
-        ("protocol", "tcps"),
-        ("https_proxy", "proxy_b"),
-        ("https_proxy_port", 4529),
-        ("service_name", "my_service_name_new"),
-        ("instance_name", "my_instance_name_new"),
-        ("sid", "my_sid_new"),
-        ("server_type", "pooled"),
-        ("cclass", "cclass_new"),
-        ("purity", oracledb.PURITY_NEW),
-        ("expire_time", 90),
-        ("retry_count", 8),
-        ("retry_delay", 15),
-        ("tcp_connect_timeout", 15.0),
-        ("ssl_server_dn_match", True),
-        ("ssl_server_cert_dn", "CN=unknown19_new"),
-        ("wallet_location", "/tmp/wallet_loc1_new"),
-        ("events", False),
-        ("externalauth", False),
-        ("mode", oracledb.AUTH_MODE_SYSDGD),
-        ("disable_oob", False),
-        ("stmtcachesize", 35),
-        ("edition", "edition_new"),
-        ("tag", "tag_new"),
-        ("matchanytag", False),
-        ("config_dir", "config_dir_new"),
-        ("appcontext", [("a", "b", "c"), ("d", "e", "f")]),
-        ("shardingkey", [1, 2, 3, 4]),
-        ("supershardingkey", [6]),
-        ("debug_jdwp", "host=host;port=4638"),
-        ("connection_id_prefix", "prefix4664"),
-        ("ssl_context", ssl.create_default_context()),
-        ("sdu", 32768),
-        ("pool_boundary", "transaction"),
-        ("use_tcp_fast_open", False),
-        ("ssl_version", ssl.TLSVersion.TLSv1_2),
-        ("program", "modified_program"),
-        ("machine", "modified_machine"),
-        ("terminal", "modified_terminal"),
-        ("osuser", "modified_osuser"),
-        ("driver_name", "modified_driver_name"),
-        ("use_sni", False),
-        ("thick_mode_dsn_passthrough", False),
-        ("extra_auth_params", dict(extra1="X", extra2="Y")),
-        ("pool_name", "my_second_pool"),
-    ]
-    params.set(**dict(new_values))
-    parts = [f"{name}={value!r}" for name, value in new_values]
-    expected_value = f"ConnectParams({', '.join(parts)})"
-    assert repr(params) == expected_value
-    cs_values = dict(
-        host="my_host_final",
-        service_name="my_service_final",
-    )
-    connect_string = f"{cs_values['host']}/{cs_values['service_name']}"
-    params.parse_connect_string(connect_string)
-    final_values = [(n, cs_values.get(n, v)) for n, v in new_values]
-    parts = [f"{name}={value!r}" for name, value in final_values]
-    expected_value = f"ConnectParams({', '.join(parts)})"
-    assert repr(params) == expected_value
-
-
-def test_4540():
-    "4540 - connect descriptor with SDU"
-    connect_string = """
-        (DESCRIPTION=(SDU=65535)(ADDRESS=(PROTOCOL=TCP)
-        (HOST=my_host1)(PORT=1589)))"""
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.sdu == 65535
-
-
-def test_4541():
-    "4541 - test that SDU is set correctly with invalid sizes"
-    params = oracledb.ConnectParams()
-    params.set(sdu=random.randint(0, 511))
-    assert params.sdu == 512
-    params.set(sdu=2097153)
-    assert params.sdu == 2097152
-
-
-def test_4542():
-    "4542 - test empty connection class"
-    params = oracledb.ConnectParams()
-    assert params.cclass is None
-    params.set(cclass="")
-    assert params.cclass is None
-
-
-def test_4543():
-    "4543 - test easy connect string with protocol specified"
-    protocol = "tcp"
-    host = "my_host_4568"
-    port = 1668
-    service_name = "my_service_4568"
-    connect_string = f"{protocol}://{host}:{port}/{service_name}"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.protocol == protocol
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-
-
-def test_4544():
-    "4544 - calling set() doesn't clear object parameters"
-    sharding_key = [1, 2, 3]
-    super_sharding_key = [4, 5, 6]
-    app_context = [("NAMESPACE", "KEY", "VALUE")]
-    ssl_context = ssl.create_default_context()
-    params = oracledb.ConnectParams(
-        shardingkey=sharding_key,
-        supershardingkey=super_sharding_key,
-        appcontext=app_context,
-        ssl_context=ssl_context,
-    )
-    assert params.appcontext == app_context
-    assert params.shardingkey == sharding_key
-    assert params.supershardingkey == super_sharding_key
-    assert params.ssl_context == ssl_context
-    user = "user_4571"
-    params.set(user=user)
-    assert params.user == user
-    assert params.appcontext == app_context
-    assert params.shardingkey == sharding_key
-    assert params.supershardingkey == super_sharding_key
-    assert params.ssl_context == ssl_context
-
-
-def test_4545():
-    "4545 - test that use_tcp_fast_open is set correctly"
-    params = oracledb.ConnectParams()
-    params.set(use_tcp_fast_open=True)
-    assert params.use_tcp_fast_open
-    params.set(use_tcp_fast_open=False)
-    assert not params.use_tcp_fast_open
-    params.set(use_tcp_fast_open="True")
-    assert params.use_tcp_fast_open
-    params.set(use_tcp_fast_open="False")
-    assert not params.use_tcp_fast_open
-    params.set(use_tcp_fast_open=None)
-    assert not params.use_tcp_fast_open
-    params.set(use_tcp_fast_open=1)
-    assert params.use_tcp_fast_open
-
-
-def test_4546(test_env):
-    "4546 - test connect descriptor without addresses defined"
-    params = oracledb.ConnectParams()
-    host = "host_4546"
-    port = 4546
-    service_name = "service_name_4546"
-    ok_container_names = ("DESCRIPTION", "ADDRESS")
-    options = [
-        ("DESRIPTION", "ADDRESS"),
-        ok_container_names,
-        ("DESCRIPTION", "ADRESS"),
-    ]
-    for option in options:
-        desc_name, addr_name = option
-        connect_string = (
-            f"({desc_name}=({addr_name}=(PROTOCOL=TCP)(HOST={host})"
-            f"(PORT={port}))(CONNECT_DATA=(SERVICE_NAME={service_name})))"
-        )
-        params = oracledb.ConnectParams()
-        if option == ok_container_names:
-            params.parse_connect_string(connect_string)
-            assert params.host == host
-            assert params.port == port
-            assert params.service_name == service_name
-        else:
-            with test_env.assert_raises_full_code("DPY-2049"):
-                params.parse_connect_string(connect_string)
-
-
-def test_4547():
-    "4547 - test simple EasyConnect string parsing with IPv6 address"
-    host = "::1"
-    port = 4547
-    service_name = "service_name_4547"
-    connect_string = f"[{host}]:{port}/{service_name}"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-
-
-def test_4548():
-    "4548 - test easy connect string with multiple hosts, different ports"
-    connect_string = (
-        "host4548a,host4548b:4548,host4548c,host4548d:4549/"
-        "service_name_4548"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == ["host4548a", "host4548b", "host4548c", "host4548d"]
-    assert params.port == [4548, 4548, 4549, 4549]
-    assert params.service_name == "service_name_4548"
-
-
-def test_4549():
-    "4549 - test easy connect string with multiple address lists"
-    connect_string = (
-        "host4549a;host4549b,host4549c:4549;host4549d/service_name_4549"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == ["host4549a", "host4549b", "host4549c", "host4549d"]
-    assert params.port == [1521, 4549, 4549, 1521]
-    assert params.service_name == "service_name_4549"
-    expected_conn_string = (
-        "(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=host4549a)(PORT=1521))"
-        "(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=host4549b)(PORT=4549))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=host4549c)(PORT=4549)))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=host4549d)(PORT=1521))"
-        "(CONNECT_DATA=(SERVICE_NAME=service_name_4549)))"
-    )
-    assert params.get_connect_string() == expected_conn_string
-
-
-def test_4550(test_env):
-    "4550 - test connect descriptor with mixed complex and simple data"
-    connect_string = (
-        "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))"
-        "(CONNECT_DATA=(SERVER=DEDICATED) SERVICE_NAME=orclpdb1))"
-    )
-    params = oracledb.ConnectParams()
-    with test_env.assert_raises_full_code("DPY-4017"):
-        params.parse_connect_string(connect_string)
-
-
-def test_4551(test_env):
-    "4551 - test connect descriptor with simple data for containers"
-    container_names = [
-        "address",
-        "address_list",
-        "connect_data",
-        "description",
-        "description_list",
-        "security",
-    ]
-    for name in container_names:
-        connect_string = f"({name}=5)"
-        params = oracledb.ConnectParams()
-        with test_env.assert_raises_full_code("DPY-4017"):
-            params.parse_connect_string(connect_string)
-
-
-def test_4552():
-    "4552 - test easy connect string with degenerate protocol"
-    host = "host_4552"
-    port = 4552
-    service_name = "service_name_4552"
-    connect_string = f"//{host}:{port}/{service_name}"
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-
-
-def test_4553():
-    "4553 - test easy connect string with registered protocol"
-    protocol = "proto-test"
-    protocol_arg = "args/for/proto4553"
-    host = "host_4553"
-    service_name = "service_name_4553"
-    connect_string = f"{protocol}://{protocol_arg}"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        assert passed_protocol == protocol
-        assert passed_protocol_arg == protocol_arg
-        new_connect_string = f"{host}/{service_name}"
-        passed_params.parse_connect_string(new_connect_string)
-
-    try:
-        oracledb.register_protocol(protocol, hook)
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.host == host
-        assert params.service_name == service_name
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_4554():
-    "4554 - test parsing a DSN with a protocol specified"
-    dsn_in = "my-protocol://some_arguments_to_protocol"
-    params = oracledb.ConnectParams()
-    user, password, dsn_out = params.parse_dsn_with_credentials(dsn_in)
-    assert user is None
-    assert password is None
-    assert dsn_out == dsn_in
-
-
-def test_4555(test_env):
-    "4555 - test program attribute"
-    _verify_network_name_attr(test_env, "program")
-
-
-def test_4556(test_env):
-    "4556 - test machine attribute"
-    _verify_network_name_attr(test_env, "machine")
-
-
-def test_4557(test_env):
-    "4557 - test osuser attribute"
-    _verify_network_name_attr(test_env, "osuser")
-
-
-def test_4558():
-    "4558 - test terminal attribute"
-    params = oracledb.ConnectParams()
-    assert params.terminal == oracledb.defaults.terminal
-    value = "myterminal"
-    params = oracledb.ConnectParams(terminal=value)
-    assert params.terminal == value
-
-
-def test_4559():
-    "4559 - test driver_name attribute"
-    params = oracledb.ConnectParams()
-    assert params.driver_name == oracledb.defaults.driver_name
-    value = "newdriver"
-    params = oracledb.ConnectParams(driver_name=value)
-    assert params.driver_name == value
-
-
-def test_4560(test_env):
-    "4560 - test register_protocol with invalid hook type"
-
-    def hook1(protocol, protocol_arg, params, extra_invalid_param):
-        pass
-
-    def hook2(passed_protocol):
-        pass
-
-    protocol = "proto-test"
-    try:
-        for hook in [hook1, hook2]:
-            oracledb.register_protocol(protocol, hook)
-            params = oracledb.ConnectParams()
-            with test_env.assert_raises_full_code("DPY-2056"):
-                params.parse_connect_string(f"{protocol}://args")
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-def test_4561():
-    "4561 - test register_protocol with invalid protocol type"
-    with pytest.raises(TypeError):
-        oracledb.register_protocol(1, lambda: None)
-    with pytest.raises(TypeError):
-        oracledb.register_protocol("proto", 5)
-
-
-def test_4562():
-    "4562 - test removing unregistered protocol"
-    with pytest.raises(KeyError):
-        oracledb.register_protocol("unregistered-protocol", None)
-
-
-def test_4563():
-    "4563 - test restoring pre-registered protocols (tcp and tcps)"
-
-    host = "host_4563"
-    port = 4563
-    service_name = "service_4563"
-    user = "user_4563"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        passed_params.set(user=user)
-
-    for protocol in ["tcp", "tcps"]:
-        try:
-            oracledb.register_protocol(protocol, hook)
-            connect_string = f"{protocol}://{host}:{port}/{service_name}"
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.user == user
-            assert params.service_name is None
-        finally:
-            oracledb.register_protocol(protocol, None)
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-
-
-def test_4564():
-    "4564 - test extended connect strings for ConnectParams"
-    test_scenarios = [
-        ("cclass", "test_cclass", "test_cclass"),
-        ("connection_id_prefix", "cid_prefix", "cid_prefix"),
-        ("disable_oob", "true", True),
-        ("disable_oob", "off", False),
-        ("driver_name", "test_driver_name", "test_driver_name"),
-        ("edition", "test_edition", "test_edition"),
-        ("events", "on", True),
-        ("events", "false", False),
-        ("expire_time", "10", 10),
-        ("externalauth", "yes", True),
-        ("externalauth", "no", False),
-        ("https_proxy", "test_proxy", "test_proxy"),
-        ("https_proxy_port", "80", 80),
-        ("machine", "test_machine", "test_machine"),
-        ("machine", "test_machine", "test_machine"),
-        ("mode", "SYSDBA", oracledb.AUTH_MODE_SYSDBA),
-        ("osuser", "test_osuser", "test_osuser"),
-        ("pool_boundary", "statement", "statement"),
-        ("program", "test_program", "test_program"),
-        ("purity", "NEW", oracledb.PURITY_NEW),
-        ("retry_count", "5", 5),
-        ("retry_delay", "3", 3),
-        ("sdu", "16384", 16384),
-        ("ssl_server_cert_dn", "test_dn", "test_dn"),
-        ("ssl_server_dn_match", "on", True),
-        ("ssl_server_dn_match", "false", False),
-        ("stmtcachesize", "25", 25),
-        ("tcp_connect_timeout", "15", 15),
-        ("terminal", "test_terminal", "test_terminal"),
-        ("use_tcp_fast_open", "true", True),
-        ("use_tcp_fast_open", "off", False),
-        ("wallet_location", "test_location", "test_location"),
-    ]
-    host = "host_4564"
-    service_name = "service_4564"
-    for name, str_value, actual_value in test_scenarios:
-        conn_string = f"{host}/{service_name}?pyo.{name}={str_value}"
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(conn_string)
-        assert params.host == host
-        assert params.service_name == service_name
-        assert getattr(params, name) == actual_value
-
-
-@pytest.mark.filterwarnings("ignore:base64 encoded")
-def test_4565(test_env):
-    "4565 - test set_from_config() with no user and password set"
-    user = "user_4565"
-    password = test_env.get_random_string()
-    options = [
-        ("a", user, password),
-        ("b", user, None),
-        ("c", None, None),
-    ]
-    for option, user, password in options:
-        host = f"host_4565{option}"
-        service_name = f"service_4565{option}"
-        connect_string = f"{host}/{service_name}"
-        config = dict(connect_descriptor=connect_string)
-        if user is not None:
-            config["user"] = user
-        if password is not None:
-            config["password"] = dict(
-                type="base64",
-                value=base64.b64encode(password.encode()).decode(),
-            )
-        params = oracledb.ConnectParams()
-        params.set_from_config(config)
-        assert params.host == host
-        assert params.service_name == service_name
-        if user is not None:
-            assert params.user == user
-
-
-def test_4566(test_env):
-    "4566 - test set_from_config() with user and password already set"
-    host = "host_4566"
-    service_name = "service_4566"
-    connect_string = f"{host}/{service_name}"
-    user = "user_4566"
-    password = test_env.get_random_string()
-    config_user = "user_4566_in_config"
-    config_password = test_env.get_random_string()
-    config = dict(
-        connect_descriptor=connect_string,
-        user=config_user,
-        password=dict(
-            type="base64",
-            value=base64.b64encode(config_password.encode()).decode(),
-        ),
-    )
-    params = oracledb.ConnectParams(user=user, password=password)
-    params.set_from_config(config)
-    assert params.host == host
-    assert params.service_name == service_name
-    assert params.user == user
-
-
-def test_4567(test_env):
-    "4567 - test set_from_config() without connect_descriptor"
-    params = oracledb.ConnectParams()
-    with test_env.assert_raises_full_code("DPY-2059"):
-        params.set_from_config(dict(connect_descriptor_missing="missing"))
-
-
-def test_4568(test_env):
-    "4568 - test set_from_config() with extended parameters"
-    host = "host_4566"
-    service_name = "service_4566"
-    connect_string = f"{host}/{service_name}"
-    stmtcachesize = 35
-    user = "user_4566"
-    password = test_env.get_random_string()
-    config = dict(
-        connect_descriptor=connect_string,
-        user=user,
-        password=dict(
-            type="base64",
-            value=base64.b64encode(password.encode()).decode(),
-        ),
-        pyo=dict(stmtcachesize=stmtcachesize),
-    )
-    params = oracledb.ConnectParams(user=user, password=password)
-    params.set_from_config(config)
-    assert params.host == host
-    assert params.service_name == service_name
-    assert params.user == user
-    assert params.stmtcachesize == stmtcachesize
-
-
-def test_4569():
-    "4569 - test USE_SNI in connect string"
-    options = [("on", True), ("off", False)]
-    service_name = "service_4569"
-    host = "host_4569"
-    port = 4569
-    for str_val, val in options:
-        easy_connect = f"{host}:{port}/{service_name}?use_sni={str_val}"
-        descriptor_part = f"(USE_SNI={str_val.upper()})" if val else ""
-        connect_descriptor = (
-            f"(DESCRIPTION={descriptor_part}"
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host})"
-            f"(PORT={port}))(CONNECT_DATA=(SERVICE_NAME={service_name})))"
-        )
-        for connect_string in (easy_connect, connect_descriptor):
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.host == host
-            assert params.port == port
-            assert params.service_name == service_name
-            assert params.use_sni == val
-        assert params.get_connect_string() == connect_descriptor
-
-
-def test_4570():
-    "4570 - test passing through unrecognized parameters in CONNECT_DATA"
-    options = [
-        "(SIMPLE_KEY=SIMPLE_VALUE)",
-        "(COMPLEX_KEY=(SUB_VALUE_A=5)(SUB_VALUE_B=6))",
-        "(COMPLEX_KEY=(SUB_VALUE_A=5)(SUB_VALUE_B=(SUB_SUB_A=6)))",
-    ]
-    for option in options:
-        connect_string = (
-            "(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=host4570)"
-            "(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=service4570)"
-            f"{option}))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.get_connect_string() == connect_string
-
-
-def test_4571():
-    "4571 - test INSTANCE_NAME in connect string"
-    service_name = "service_4571"
-    instance_name = "instance_4571"
-    host = "host_4571"
-    port = 4571
-    easy_connect = f"{host}:{port}/{service_name}/{instance_name}"
-    connect_descriptor = (
-        f"(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST={host})(PORT={port}))"
-        f"(CONNECT_DATA=(SERVICE_NAME={service_name})"
-        f"(INSTANCE_NAME={instance_name})))"
-    )
-    for connect_string in (easy_connect, connect_descriptor):
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.service_name == service_name
-        assert params.instance_name == instance_name
-        assert params.host == host
-        assert params.port == port
-        assert params.get_connect_string() == connect_descriptor
-
-
-def test_4572():
-    "4572 - test passing through unrecognized parameters in SECURITY"
-    options = [
-        "(SIMPLE_KEY=SIMPLE_VALUE)",
-        "(COMPLEX_KEY=(SUB_VALUE_A=23)(SUB_VALUE_B=27))",
-        "(COMPLEX_KEY=(SUB_VALUE_A=A)(SUB_VALUE_B=(SUB_SUB_A=B)))",
-    ]
-    for option in options:
-        connect_string = (
-            "(DESCRIPTION=(ADDRESS=(PROTOCOL=tcps)(HOST=host4572)"
-            "(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=service4572))"
-            f"(SECURITY=(SSL_SERVER_DN_MATCH=ON){option}))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.get_connect_string() == connect_string
-
-
-def test_4573():
-    "4573 - test passing through unrecognized parameters in DESCRIPTION"
-    options = [
-        "(SIMPLE_KEY=SIMPLE_VALUE)",
-        "(COMPLEX_KEY=(SUB_VALUE_1=1)(SUB_VALUE_B=2))",
-        "(COMPLEX_KEY=(SUB_VALUE_2=S)(SUB_VALUE_B=(SUB_SUB_A=T)))",
-    ]
-    for option in options:
-        connect_string = (
-            "(DESCRIPTION_LIST="
-            f"(DESCRIPTION={option}(ADDRESS=(PROTOCOL=tcp)"
-            "(HOST=host4573a)(PORT=1521))"
-            "(CONNECT_DATA=(SERVICE_NAME=service4573)))"
-            f"(DESCRIPTION={option}(ADDRESS=(PROTOCOL=tcp)"
-            "(HOST=host4573b)(PORT=1521))"
-            "(CONNECT_DATA=(SERVICE_NAME=service4573))))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_string)
-        assert params.get_connect_string() == connect_string
-
-
-def test_4574():
-    "4574 - test passing through specific unsupported parameters"
-    easy_connect = (
-        "host_4574/service_4574?"
-        "enable=broken&recv_buf_size=1024&send_buf_size=2048"
-    )
-    connect_descriptor = (
-        "(DESCRIPTION=(ENABLE=broken)(RECV_BUF_SIZE=1024)"
-        "(SEND_BUF_SIZE=2048)(ADDRESS=(PROTOCOL=tcp)(HOST=host_4574)"
-        "(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=service_4574)))"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(easy_connect)
-    assert params.get_connect_string() == connect_descriptor
-
-
-def test_4575(test_env):
-    "4575 - test syntax rule for keywords"
-    for value, ok in [
-        ("(SIMPLE_KEY=SIMPLE_VALUE)", True),
-        ("(KEY_CONTAINS SPACE=SIMPLE_VALUE)", False),
-        ("(∆KEY✓🚀=SIMPLE_VALUE)", False),
-        ("(§∞ホスト🔑=SIMPLE_VALUE)", False),
-        ("(^MY_KEY_NAME=SIMPLE_VALUE)", False),
-        ("(KEY_CONTAINS     TAB=SIMPLE_VALUE)", False),
-        ("(KEY_CONTAINS_QUOTES_''=SIMPLE_VALUE)", False),
-        ("(KEY_CONTAINS'\r'=SIMPLE_VALUE)", False),
-        ("(KEY_CONTAINS'\n'=SIMPLE_VALUE)", False),
-    ]:
-        connect_string = (
-            "(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=host4573)"
-            + "(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=service4573)"
-            + f"{value}))"
-        )
-        if ok:
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(connect_string)
-            assert params.get_connect_string() == connect_string
-        else:
-            with test_env.assert_raises_full_code("DPY-4017"):
-                params.parse_connect_string(connect_string)
-
-
-def test_4576(test_env):
-    "4576 - test syntax rule for keywords in easy connect string"
-    for value, ok in [
-        ("simple_key=simple_value", True),
-        ("key_contains space=simple_value", False),
-        ("∆key✓🚀=simple_value", False),
-        ("^my_key_name=simple_value", False),
-        ("key_contains      tab=simple_value", False),
-        ("key_contains_quotes_''=simple_value", False),
-        ("key_contains'r'=simple_value", False),
-        ("key_contains'\n'=simple_value", False),
-    ]:
-        easy_connect = f"""host4574:1589/service4574?{value}"""
-        connect_string_exp = (
-            "(DESCRIPTION="
-            + "(ADDRESS=(PROTOCOL=tcp)(HOST=host4574)(PORT=1589))"
-            + "(CONNECT_DATA=(SERVICE_NAME=service4574)))"
-        )
-        if ok:
-            params = oracledb.ConnectParams()
-            params.parse_connect_string(easy_connect)
-            assert params.host == "host4574"
-            assert params.port == 1589
-            assert params.service_name == "service4574"
-            assert params.get_connect_string() == connect_string_exp
-        else:
-            with test_env.assert_raises_full_code("DPY-4018"):
-                params.parse_connect_string(easy_connect)
-
-
-def test_4577():
-    "4577 - test for DESCRIPTION_LIST with FAILOVER"
-    connect_string = (
-        "(DESCRIPTION_LIST=(FAILOVER=OFF)(LOAD_BALANCE=ON)"
-        "(DESCRIPTION=(LOAD_BALANCE=ON)(RETRY_COUNT=1)(RETRY_DELAY=1)"
-        "(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=my_host30)(PORT=5001))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host31)(PORT=1521)))"
-        "(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=my_host32)(PORT=5002))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host32)(PORT=5003)))"
-        "(CONNECT_DATA=(SERVICE_NAME=my_service_name27)))"
-        "(DESCRIPTION=(LOAD_BALANCE=ON)(RETRY_COUNT=2)(RETRY_DELAY=3)"
-        "(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=my_host34)(PORT=5002))"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host35)(PORT=5001)))"
-        "(ADDRESS_LIST=(ADDRESS=(PROTOCOL=tcp)(HOST=my_host36)(PORT=5002))"
-        "(ADDRESS=(PROTOCOL=tcps)(HOST=my_host37)(PORT=1521)))"
-        "(SECURITY=(SSL_SERVER_DN_MATCH=ON))))"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.get_connect_string() == connect_string
-
-
-def test_4578():
-    "4578 - test for descriptor parameters in connect descriptor"
-    options = [
-        ("(FAILOVER=on)", ""),
-        ("(FAILOVER=off)", "(FAILOVER=OFF)"),
-        ("(FAILOVER=true)", ""),
-        ("(FAILOVER=false)", "(FAILOVER=OFF)"),
-        ("(FAILOVER=yes)", ""),
-        ("(FAILOVER=no)", "(FAILOVER=OFF)"),
-        ("(FAILOVER=unsupported_value)", "(FAILOVER=OFF)"),
-        ("(FAILOVER=1700)", "(FAILOVER=OFF)"),
-        ("(ENABLE=broken)", "(ENABLE=broken)"),
-        ("(LOAD_BALANCE=on)", "(LOAD_BALANCE=ON)"),
-        ("(LOAD_BALANCE=off)", ""),
-        ("(LOAD_BALANCE=true)", "(LOAD_BALANCE=ON)"),
-        ("(LOAD_BALANCE=false)", ""),
-        ("(LOAD_BALANCE=yes)", "(LOAD_BALANCE=ON)"),
-        ("(LOAD_BALANCE=no)", ""),
-        ("(LOAD_BALANCE=unsupported_value)", ""),
-        ("(LOAD_BALANCE=1700)", ""),
-        ("(RECV_BUF_SIZE=87300)", "(RECV_BUF_SIZE=87300)"),
-        ("(RECV_BUF_SIZE=11784)", "(RECV_BUF_SIZE=11784)"),
-        ("(SEND_BUF_SIZE=87300)", "(SEND_BUF_SIZE=87300)"),
-        ("(SEND_BUF_SIZE=11784)", "(SEND_BUF_SIZE=11784)"),
-        ("(RECV_TIMEOUT=10)", "(RECV_TIMEOUT=10)"),
-        ("(RECV_TIMEOUT=10ms)", "(RECV_TIMEOUT=10ms)"),
-        ("(RECV_TIMEOUT=10 ms)", "(RECV_TIMEOUT=10 ms)"),
-        ("(RECV_TIMEOUT=10 hr)", "(RECV_TIMEOUT=10 hr)"),
-        ("(RECV_TIMEOUT=10 min)", "(RECV_TIMEOUT=10 min)"),
-        ("(RECV_TIMEOUT=10 sec)", "(RECV_TIMEOUT=10 sec)"),
-        ("(COMPRESSION=on)", "(COMPRESSION=on)"),
-        ("(COMPRESSION=off)", "(COMPRESSION=off)"),
-        (
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=low))",
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=low))",
-        ),
-        (
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=high))",
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=high))",
-        ),
-        (
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=wrong))",
-            "(COMPRESSION=on)(COMPRESSION_LEVELS=(LEVEL=wrong))",
-        ),
-    ]
-
-    service_name = "service_4576"
-    host1 = "host_4576_1"
-    host2 = "host_4576_2"
-    port1 = 45761
-    port2 = 45762
-    for str_val, exp_val in options:
-        descriptor_part = str_val
-        descriptor_part_exp = exp_val
-        connect_descriptor = (
-            f"(DESCRIPTION={descriptor_part}(ADDRESS_LIST="
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host1})(PORT={port1}))"
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host2})(PORT={port2})))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name})))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_descriptor)
-
-        connect_descriptor_exp = (
-            f"(DESCRIPTION={descriptor_part_exp}(ADDRESS_LIST="
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host1})(PORT={port1}))"
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host2})(PORT={port2})))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name})))"
-        )
-
-        assert params.host == [host1, host2]
-        assert params.port == [port1, port2]
-        assert params.service_name == service_name
-        assert params.get_connect_string() == connect_descriptor_exp
-
-
-def test_4579():
-    "4579 - test for connect data parameters in connect descriptor"
-    options = [
-        "(COLOCATION_TAG=ColocationTag4577)",
-        "(COLOCATION_TAG=ColocationTag_4577)",
-        "(FAILOVER_MODE=(BACKUP=bhost)(TYPE=session)(METHOD=basic))",
-        "(FAILOVER_MODE=(BACKUP=bhost)(TYPE=select)(METHOD=preconnect))",
-        "(FAILOVER_MODE=(TYPE=select)(METHOD=basic)(RETRIES=2)(DELAY=15))",
-        "(HS=ok)",
-        "(TUNNEL_SERVICE_NAME=south)",
-        "(POOL_NAME=pool_name_4579)",
-    ]
-
-    service_name = "service_4577"
-    host = "host_4577"
-    port = 4577
-    for str_val in options:
-        connect_data_part = str_val
-        connect_descriptor = (
-            f"(DESCRIPTION="
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host})(PORT={port}))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name})"
-            f"{connect_data_part}))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_descriptor)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_connect_string() == connect_descriptor
-
-
-def test_4580():
-    "4580 - test for security parameters in connect descriptor"
-
-    security_options = {
-        # IGNORE_ANO_ENCRYPTION_FOR_TCPS variations
-        "(SECURITY=(IGNORE_ANO_ENCRYPTION_FOR_TCPS=TRUE))": (
-            "(SECURITY=(SSL_SERVER_DN_MATCH=ON)"
-            "(IGNORE_ANO_ENCRYPTION_FOR_TCPS=TRUE))"
-        ),
-        "(SECURITY=(IGNORE_ANO_ENCRYPTION_FOR_TCPS=FALSE))": (
-            "(SECURITY=(SSL_SERVER_DN_MATCH=ON)"
-            "(IGNORE_ANO_ENCRYPTION_FOR_TCPS=FALSE))"
-        ),
-        "(SECURITY=(SSL_SERVER_DN_MATCH=false)"
-        "(IGNORE_ANO_ENCRYPTION_FOR_TCPS=FALSE))": (
-            "(SECURITY=(IGNORE_ANO_ENCRYPTION_FOR_TCPS=FALSE))"
-        ),
-        # KERBEROS5_CC_NAME and KERBEROS5_PRINCIPAL variations
-        "(SECURITY=(KERBEROS5_CC_NAME=/tmp/krbuser2/krb.cc)"
-        "(KERBEROS5_PRINCIPAL=krbprinc2@example.com))": (
-            "(SECURITY=(SSL_SERVER_DN_MATCH=ON)"
-            "(KERBEROS5_CC_NAME=/tmp/krbuser2/krb.cc)"
-            "(KERBEROS5_PRINCIPAL=krbprinc2@example.com))"
-        ),
-        # SSL_SERVER_CERT_DN and SSL_SERVER_DN_MATCH variations
-        "(SECURITY=(SSL_SERVER_DN_MATCH=on)"
-        "(SSL_SERVER_CERT_DN=CN=unknown19a)"
-        "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))": (
-            "(SECURITY=(SSL_SERVER_DN_MATCH=ON)"
-            "(SSL_SERVER_CERT_DN=CN=unknown19a)"
-            "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))"
-        ),
-        "(SECURITY=(SSL_SERVER_DN_MATCH=false)"
-        "(SSL_SERVER_CERT_DN=CN=unknown19a)"
-        "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))": (
-            "(SECURITY=(SSL_SERVER_CERT_DN=CN=unknown19a)"
-            "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))"
-        ),
-        "(SECURITY=(SSL_SERVER_DN_MATCH=wrong)"
-        "(SSL_SERVER_CERT_DN=CN=unknown19a)"
-        "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))": (
-            "(SECURITY=(SSL_SERVER_CERT_DN=CN=unknown19a)"
-            "(MY_WALLET_DIRECTORY=/tmp/wallet_loc19a))"
-        ),
-    }
-
-    service_name = "service_4578"
-    host = "host_4578"
-    port = 4578
-    for str_val, exp_val in security_options.items():
-        security_part = str_val
-        security_part_exp = exp_val
-        connect_descriptor = (
-            f"(DESCRIPTION="
-            f"(ADDRESS=(PROTOCOL=tcps)(HOST={host})(PORT={port}))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name}))"
-            f"{security_part})"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(connect_descriptor)
-        connect_descriptor_exp = (
-            f"(DESCRIPTION="
-            f"(ADDRESS=(PROTOCOL=tcps)(HOST={host})(PORT={port}))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name}))"
-            f"{security_part_exp})"
-        )
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_connect_string() == connect_descriptor_exp
-
-
-def test_4581():
-    "4581 - test for parameters supported in easy connect descriptor"
-    options = [
-        ("retry_count=3&retry_delay=6", "(RETRY_COUNT=3)(RETRY_DELAY=6)"),
-        ("enable=broken", "(ENABLE=broken)"),
-        ("failover=on", ""),
-        ("failover=off", "(FAILOVER=OFF)"),
-        ("failover=true", ""),
-        ("failover=false", "(FAILOVER=OFF)"),
-        ("failover=yes", ""),
-        ("failover=no", "(FAILOVER=OFF)"),
-        ("failover=unsupported_value", "(FAILOVER=OFF)"),
-        ("failover=1700", "(FAILOVER=OFF)"),
-        ("load_balance=on", "(LOAD_BALANCE=ON)"),
-        ("load_balance=off", ""),
-        ("load_balance=true", "(LOAD_BALANCE=ON)"),
-        ("load_balance=false", ""),
-        ("load_balance=yes", "(LOAD_BALANCE=ON)"),
-        ("load_balance=no", ""),
-        ("load_balance=unsupported_value", ""),
-        ("load_balance=1700", ""),
-        ("recv_buf_size=87300", "(RECV_BUF_SIZE=87300)"),
-        ("send_buf_size=11786", "(SEND_BUF_SIZE=11786)"),
-        ("sdu=16384", "(SDU=16384)"),
-        ("retry_count=6", "(RETRY_COUNT=6)(RETRY_DELAY=1)"),
-        ("source_route=on", "(SOURCE_ROUTE=ON)"),
-        ("source_route=true", "(SOURCE_ROUTE=ON)"),
-        ("source_route=yes", "(SOURCE_ROUTE=ON)"),
-        ("source_route=off", ""),
-        ("source_route=false", ""),
-        ("source_route=no", ""),
-        ("source_route=wrong", ""),
-        (
-            "transport_connect_timeout=100",
-            "(TRANSPORT_CONNECT_TIMEOUT=100)",
-        ),
-        (
-            "transport_connect_timeout=500ms",
-            "(TRANSPORT_CONNECT_TIMEOUT=500ms)",
-        ),
-    ]
-
-    service_name = "service_4579"
-    host = "host_4579"
-    port = 4579
-    for str_val, exp_str in options:
-        descriptor_part = exp_str
-        easy_connect = f"""{host}:{port}/{service_name}?{str_val}"""
-        connect_descriptor_exp = (
-            f"(DESCRIPTION={descriptor_part}"
-            f"(ADDRESS=(PROTOCOL=tcp)(HOST={host})(PORT={port}))"
-            f"(CONNECT_DATA=(SERVICE_NAME={service_name})))"
-        )
-        params = oracledb.ConnectParams()
-        params.parse_connect_string(easy_connect)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_connect_string() == connect_descriptor_exp
-
-
-def test_4582():
-    "4582 - test for security parameters in easy connect descriptor"
-    service_name = "service_4580"
-    srvc_str = (
-        "ssl_server_dn_match=true"
-        "&ssl_server_cert_dn='cn=sales,cn=OracleContext,"
-        "dc=us,dc=example,dc=com'"
-        "&wallet_location='/tmp/oracle'"
-    )
-    host = "host_4580"
-    port = 4580
-    easy_connect = f"tcps://{host}:{port}/{service_name}?{srvc_str}"
-    connect_descriptor_exp = (
-        f"(DESCRIPTION="
-        f"(ADDRESS=(PROTOCOL=tcps)(HOST={host})"
-        f"(PORT={port}))"
-        f"(CONNECT_DATA=(SERVICE_NAME={service_name}))"
-        "(SECURITY=(SSL_SERVER_DN_MATCH=ON)"
-        "(SSL_SERVER_CERT_DN='cn=sales,cn=OracleContext,"
-        "dc=us,dc=example,dc=com')"
-        "(MY_WALLET_DIRECTORY='/tmp/oracle')))"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(easy_connect)
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-    assert params.get_connect_string() == connect_descriptor_exp
-
-
-def test_4583():
-    "4583 - test for TYPE_OF_SERVICE, RDB_DATABASE, GLOBAL_NAME parameters"
-    connect_string = (
-        "(DESCRIPTION_LIST="
-        "(DESCRIPTION=(TYPE_OF_SERVICE=rdb_database)"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host94_1)(PORT=5002))"
-        "(CONNECT_DATA="
-        "(SERVICE_NAME=generic)"
-        "(RDB_DATABASE=[.mf]mf_personal.rdb)"
-        "(GLOBAL_NAME=alpha5)))"
-        "(DESCRIPTION=(TYPE_OF_SERVICE=oracle11_database)"
-        "(ADDRESS=(PROTOCOL=tcp)(HOST=my_host94_2)(PORT=5003))"
-        "(CONNECT_DATA="
-        "(SERVICE_NAME=sales.us.example.com))))"
-    )
-    params = oracledb.ConnectParams()
-    params.parse_connect_string(connect_string)
-    assert params.get_connect_string() == connect_string
diff --git a/tests/test_4600_type_changes.py b/tests/test_4600_type_changes.py
deleted file mode 100644
index dd53b087..00000000
--- a/tests/test_4600_type_changes.py
+++ /dev/null
@@ -1,384 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4600 - Module for testing the handling of type changes in queries.
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-def _test_type_change(
-    conn,
-    test_env,
-    query_frag_1,
-    query_value_1,
-    query_frag_2,
-    query_value_2,
-    table_name="dual",
-    type_handler=None,
-):
-    if test_env.is_implicit_pooling:
-        pytest.skip("sessions can change with implicit pooling")
-    orig_type_handler = conn.outputtypehandler
-    conn.outputtypehandler = type_handler
-    cursor = conn.cursor()
-    try:
-        cursor.execute(
-            f"""
-            create or replace view TestTypesChanged as
-            select {query_frag_1} as value
-            from {table_name}
-            """
-        )
-        cursor.execute("select * from TestTypesChanged")
-        assert cursor.fetchall() == [(query_value_1,)]
-        cursor.execute(
-            f"""
-            create or replace view TestTypesChanged as
-                select {query_frag_2} as value
-                from dual
-            """
-        )
-        cursor.execute("select * from TestTypesChanged")
-        assert cursor.fetchall() == [(query_value_2,)]
-    finally:
-        conn.outputtypehandler = orig_type_handler
-
-
-def test_4600(skip_unless_thin_mode, conn, test_env):
-    "4600 - test data type changing from VARCHAR to CLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4600' as VARCHAR2(15))",
-        "string_4600",
-        "to_clob('clob_4600')",
-        "clob_4600",
-    )
-
-
-def test_4601(skip_unless_thin_mode, conn, test_env):
-    "4601 - test data type changing from CHAR to CLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4601' as CHAR(11))",
-        "string_4601",
-        "to_clob('clob_4601')",
-        "clob_4601",
-    )
-
-
-def test_4602(skip_unless_thin_mode, conn, cursor, test_env):
-    "4602 - test data type changing from LONG to CLOB"
-    cursor.execute("truncate table TestLongs")
-    cursor.execute("insert into TestLongs values (1, 'string_4602')")
-    _test_type_change(
-        conn,
-        test_env,
-        "LongCol",
-        "string_4602",
-        "to_clob('clob_4602')",
-        "clob_4602",
-        "TestLongs",
-    )
-
-
-def test_4603(skip_unless_thin_mode, conn, test_env):
-    "4603 - test data type changing from NVARCHAR to CLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4603' as NVARCHAR2(15))",
-        "string_4603",
-        "to_clob('clob_4603')",
-        "clob_4603",
-    )
-
-
-def test_4604(skip_unless_thin_mode, conn, test_env):
-    "4604 - test data type changing from NCHAR to CLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4604' as NCHAR(11))",
-        "string_4604",
-        "to_clob('clob_4604')",
-        "clob_4604",
-    )
-
-
-def test_4605(skip_unless_thin_mode, conn, test_env):
-    "4605 - test data type changing from RAW to BLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "utl_raw.cast_to_raw('string_4605')",
-        b"string_4605",
-        "to_blob(utl_raw.cast_to_raw('blob_4605'))",
-        b"blob_4605",
-    )
-
-
-def test_4606(skip_unless_thin_mode, conn, cursor, test_env):
-    "4606 - test data type changing from LONGRAW to BLOB"
-    cursor.execute("truncate table TestLongRaws")
-    data = [1, b"string_4606"]
-    cursor.execute("insert into TestLongRaws values (:1, :2)", data)
-    _test_type_change(
-        conn,
-        test_env,
-        "LongRawCol",
-        b"string_4606",
-        "to_blob(utl_raw.cast_to_raw('blob_4606'))",
-        b"blob_4606",
-        "TestLongRaws",
-    )
-
-
-def test_4607(skip_unless_thin_mode, conn, test_env):
-    "4607 - test data type changing from VARCHAR to NCLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4607' as VARCHAR2(15))",
-        "string_4607",
-        "to_nclob('nclob_4607')",
-        "nclob_4607",
-    )
-
-
-def test_4608(skip_unless_thin_mode, conn, test_env):
-    "4608 - test data type changing from CHAR to NCLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4608' as CHAR(11))",
-        "string_4608",
-        "to_nclob('nclob_4608')",
-        "nclob_4608",
-    )
-
-
-def test_4609(skip_unless_thin_mode, conn, cursor, test_env):
-    "4609 - test data type changing from LONG to NCLOB"
-    cursor.execute("truncate table TestLongs")
-    cursor.execute("insert into TestLongs values (1, 'string_4609')")
-    _test_type_change(
-        conn,
-        test_env,
-        "LongCol",
-        "string_4609",
-        "to_nclob('nclob_4609')",
-        "nclob_4609",
-        "TestLongs",
-    )
-
-
-def test_4610(skip_unless_thin_mode, conn, test_env):
-    "4610 - test data type changing from NVARCHAR to NCLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4610' as NVARCHAR2(15))",
-        "string_4610",
-        "to_nclob('nclob_4610')",
-        "nclob_4610",
-    )
-
-
-def test_4611(skip_unless_thin_mode, conn, test_env):
-    "4611 - test data type changing from NCHAR to NCLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4611' as NCHAR(11))",
-        "string_4611",
-        "to_nclob('nclob_4611')",
-        "nclob_4611",
-    )
-
-
-def test_4612(conn, test_env):
-    "4612 - test data type changing from VARCHAR to NUMBER"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4612' as VARCHAR2(15))",
-        "string_4612",
-        "to_number('4612')",
-        4612,
-    )
-
-
-def test_4613(conn, test_env):
-    "4613 - test data type changing from NUMBER to VARCHAR"
-    _test_type_change(
-        conn,
-        test_env,
-        "to_number('4613')",
-        4613,
-        "cast('string_4613' as VARCHAR2(15))",
-        "string_4613",
-    )
-
-
-def test_4614(conn, test_env):
-    "4614 - test data type changing from STRING to DATE"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4614' as VARCHAR2(15))",
-        "string_4614",
-        "to_date('04-JAN-2022')",
-        datetime.datetime(2022, 1, 4, 0, 0),
-    )
-
-
-def test_4615(conn, test_env):
-    "4615 - test data type changing from DATE to STRING"
-    _test_type_change(
-        conn,
-        test_env,
-        "to_date('04-JAN-2022')",
-        datetime.datetime(2022, 1, 4, 0, 0),
-        "cast('string_4615' as VARCHAR2(15))",
-        "string_4615",
-    )
-
-
-def test_4616(conn, test_env):
-    "4616 - test data type changing from NUMBER to DATE"
-    _test_type_change(
-        conn,
-        test_env,
-        "to_number('4616')",
-        4616,
-        "to_date('05-JAN-2022')",
-        datetime.datetime(2022, 1, 5, 0, 0),
-    )
-
-
-def test_4617(skip_unless_thin_mode, conn, test_env):
-    "4617 - test data type changing from CLOB to VARCHAR"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_VARCHAR,
-                size=32768,
-                arraysize=cursor.arraysize,
-            )
-
-    _test_type_change(
-        conn,
-        test_env,
-        "to_clob('clob_4617')",
-        "clob_4617",
-        "cast('string_4617' as VARCHAR2(15))",
-        "string_4617",
-        type_handler=type_handler,
-    )
-
-
-def test_4618(skip_unless_thin_mode, conn, test_env):
-    "4618 - test data type changing from NCLOB to NVARCHAR"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_NCLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_NVARCHAR,
-                size=32768,
-                arraysize=cursor.arraysize,
-            )
-
-    _test_type_change(
-        conn,
-        test_env,
-        "to_nclob('nclob_4618')",
-        "nclob_4618",
-        "cast('nstring_4618' as NVARCHAR2(15))",
-        "nstring_4618",
-        type_handler=type_handler,
-    )
-
-
-def test_4619(skip_unless_thin_mode, conn, test_env):
-    "4619 - test data type changing from CLOB to NVARCHAR"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_NVARCHAR,
-                size=32768,
-                arraysize=cursor.arraysize,
-            )
-
-    _test_type_change(
-        conn,
-        test_env,
-        "to_clob('clob_4619')",
-        "clob_4619",
-        "cast('string_4619' as VARCHAR2(15))",
-        "string_4619",
-        type_handler=type_handler,
-    )
-
-
-def test_4620(skip_unless_thin_mode, conn, test_env):
-    "4620 - test data type changing from BLOB to RAW"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_BLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_RAW,
-                size=32768,
-                arraysize=cursor.arraysize,
-            )
-
-    _test_type_change(
-        conn,
-        test_env,
-        "to_blob(utl_raw.cast_to_raw('blob_4620'))",
-        b"blob_4620",
-        "utl_raw.cast_to_raw('string_4620')",
-        b"string_4620",
-        type_handler=type_handler,
-    )
-
-
-def test_4621(skip_unless_thin_mode, conn, test_env):
-    "4621 - test data type changing from NVARCHAR to CLOB"
-    _test_type_change(
-        conn,
-        test_env,
-        "cast('string_4621' as NVARCHAR2(15))",
-        "string_4621",
-        "to_clob('clob_4621')",
-        "clob_4621",
-    )
diff --git a/tests/test_4700_pool_params.py b/tests/test_4700_pool_params.py
deleted file mode 100644
index 1c00832a..00000000
--- a/tests/test_4700_pool_params.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4700 - Module for testing pool parameters.
-"""
-
-import ssl
-
-import oracledb
-
-
-def _test_writable_parameter(name, value, params=None):
-    """
-    Tests that a writable parameter can be written to and the modified
-    value read back successfully.
-    """
-    if params is None:
-        params = oracledb.PoolParams()
-    orig_value = getattr(params, name)
-    copied_params = params.copy()
-    args = {}
-    args[name] = value
-    params.set(**args)
-    assert getattr(params, name) == value
-    assert getattr(copied_params, name) == orig_value
-    args[name] = None
-    params.set(**args)
-    assert getattr(params, name) == value
-
-
-def test_4700():
-    "4700 - test writable parameters"
-    _test_writable_parameter("min", 8, oracledb.PoolParams(max=10))
-    _test_writable_parameter("max", 12)
-    _test_writable_parameter("increment", 2)
-    _test_writable_parameter("connectiontype", oracledb.Connection)
-    _test_writable_parameter("getmode", oracledb.POOL_GETMODE_NOWAIT)
-    _test_writable_parameter("homogeneous", False)
-    _test_writable_parameter("timeout", 25)
-    _test_writable_parameter("wait_timeout", 45)
-    _test_writable_parameter("max_lifetime_session", 65)
-    _test_writable_parameter("session_callback", lambda c: None)
-    _test_writable_parameter("max_sessions_per_shard", 5)
-    _test_writable_parameter("soda_metadata_cache", True)
-    _test_writable_parameter("ping_interval", 20)
-    _test_writable_parameter("ping_timeout", 3000)
-
-
-def test_4701(test_env):
-    "4701 - test PoolParams repr()"
-    values = [
-        ("min", 3),
-        ("max", 10),
-        ("increment", 4),
-        ("connectiontype", oracledb.Connection),
-        ("getmode", oracledb.POOL_GETMODE_WAIT),
-        ("homogeneous", True),
-        ("timeout", 60),
-        ("wait_timeout", 20),
-        ("max_lifetime_session", 80),
-        ("session_callback", lambda c: None),
-        ("max_sessions_per_shard", 4),
-        ("soda_metadata_cache", False),
-        ("ping_interval", 50),
-        ("ping_timeout", 2500),
-        ("user", test_env.main_user),
-        ("proxy_user", test_env.proxy_user),
-        ("host", "my_host1"),
-        ("port", 1522),
-        ("protocol", "tcp"),
-        ("https_proxy", "proxy_4701"),
-        ("https_proxy_port", 4701),
-        ("service_name", "my_service_name1"),
-        ("instance_name", "my_instance_name"),
-        ("sid", "my_sid1"),
-        ("server_type", "dedicated"),
-        ("cclass", "cclass_1"),
-        ("purity", oracledb.PURITY_SELF),
-        ("expire_time", 60),
-        ("retry_count", 6),
-        ("retry_delay", 10),
-        ("tcp_connect_timeout", 40.0),
-        ("ssl_server_dn_match", False),
-        ("ssl_server_cert_dn", "CN=unknown4701a"),
-        ("wallet_location", "/tmp/wallet_loc1a"),
-        ("events", True),
-        ("externalauth", True),
-        ("mode", oracledb.AUTH_MODE_SYSDBA),
-        ("disable_oob", True),
-        ("stmtcachesize", 25),
-        ("edition", "edition_4701"),
-        ("tag", "tag4701"),
-        ("matchanytag", True),
-        ("config_dir", "config_dir_4701"),
-        ("appcontext", [("a", "b", "c")]),
-        ("shardingkey", [1, 2, 3]),
-        ("supershardingkey", [4]),
-        ("debug_jdwp", "host=host;port=1523"),
-        ("connection_id_prefix", "prefix4701"),
-        ("ssl_context", None),
-        ("sdu", 16384),
-        ("pool_boundary", "transaction"),
-        ("use_tcp_fast_open", True),
-        ("ssl_version", ssl.TLSVersion.TLSv1_2),
-        ("program", "my_program"),
-        ("machine", "my_machine"),
-        ("terminal", "my_terminal"),
-        ("osuser", "me"),
-        ("driver_name", "custom_driver"),
-        ("use_sni", True),
-        ("thick_mode_dsn_passthrough", True),
-        ("extra_auth_params", dict(extra1="A", extra2="B")),
-        ("pool_name", "my_pool"),
-    ]
-    params = oracledb.PoolParams(**dict(values))
-    parts = [f"{name}={value!r}" for name, value in values]
-    expected_value = f"PoolParams({', '.join(parts)})"
-    assert repr(params) == expected_value
-    assert params.getmode is oracledb.PoolGetMode.WAIT
-
-
-def test_4702():
-    "4702 - test extended connect strings for ConnectParams"
-    test_scenarios = [
-        ("getmode", "NOWAIT", oracledb.POOL_GETMODE_NOWAIT),
-        ("homogeneous", "true", True),
-        ("homogeneous", "false", False),
-        ("increment", "2", 2),
-        ("max", "50", 50),
-        ("max_lifetime_session", "6000", 6000),
-        ("max_sessions_per_shard", "5", 5),
-        ("min", "3", 3),
-        ("ping_interval", "-1", -1),
-        ("ping_timeout", "2500", 2500),
-        ("homogeneous", "on", True),
-        ("homogeneous", "off", False),
-        ("timeout", "3000", 3000),
-        ("wait_timeout", "300", 300),
-    ]
-    host = "host_4702"
-    service_name = "service_4702"
-    for name, str_value, actual_value in test_scenarios:
-        conn_string = f"{host}/{service_name}?pyo.{name}={str_value}"
-        params = oracledb.PoolParams()
-        if name == "min" and actual_value > params.max:
-            params.set(max=actual_value)
-        params.parse_connect_string(conn_string)
-        assert params.host == host
-        assert params.service_name == service_name
-        assert getattr(params, name) == actual_value
diff --git a/tests/test_4800_timestamp_ltz_var.py b/tests/test_4800_timestamp_ltz_var.py
deleted file mode 100644
index 867413e8..00000000
--- a/tests/test_4800_timestamp_ltz_var.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4800 - Module for testing timestamp with local time zone variables
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    base_date = datetime.datetime(2022, 6, 2)
-    for i in range(1, 11):
-        if i % 4 == 0:
-            tz_hours = i
-        elif i % 2 == 0:
-            tz_hours = i + 0.5
-        else:
-            tz_hours = -(i + 0.5)
-        tz_offset = datetime.timedelta(hours=tz_hours)
-        microseconds = int(str(i * 50).ljust(6, "0"))
-        offset = datetime.timedelta(
-            days=i, seconds=i * 2, microseconds=microseconds
-        )
-        col = base_date + tz_offset + offset
-        if i % 2:
-            tz_offset = datetime.timedelta(hours=6)
-            microseconds = int(str(i * 125).ljust(6, "0"))
-            offset = datetime.timedelta(
-                days=i + 1, seconds=i * 3, microseconds=microseconds
-            )
-            nullable_col = base_date + offset
-        else:
-            nullable_col = None
-        precision_col = datetime.datetime(2009, 12, 14)
-        data_tuple = (i, col, nullable_col, precision_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_4800(cursor, module_data_by_key):
-    "4800 - test binding in a timestamp"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampLTZs
-        where TimestampLTZCol = :value
-        """,
-        value=datetime.datetime(2022, 6, 6, 18, 30, 10, 250000),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_4801(cursor):
-    "4801 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampLTZs
-        where TimestampLTZCol = :value
-        """,
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_4802(cursor):
-    "4802 - test binding out with set input sizes defined"
-    bv = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        begin
-            :value := to_timestamp('20220603', 'YYYYMMDD');
-        end;
-        """
-    )
-    assert bv["value"].getvalue() == datetime.datetime(2022, 6, 3)
-
-
-def test_4803(cursor):
-    "4803 - test binding in/out with set input sizes defined"
-    bv = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=datetime.datetime(2022, 5, 10, 12, 0, 0),
-    )
-    assert bv["value"].getvalue() == datetime.datetime(2022, 5, 15, 18, 0, 0)
-
-
-def test_4804(cursor):
-    "4804 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        begin
-            :value := to_date('20220601 15:38:12', 'YYYYMMDD HH24:MI:SS');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2022, 6, 1, 15, 38, 12)
-
-
-def test_4805(cursor):
-    "4805 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    var.setvalue(0, datetime.datetime(2022, 5, 30, 6, 0, 0))
-    cursor.execute(
-        """
-        begin
-            :value := :value + 5.25;
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2022, 6, 4, 12, 0, 0)
-
-
-def test_4806(cursor):
-    "4806 - test cursor description is accurate"
-    cursor.execute("select * from TestTimestampLTZs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "TIMESTAMPLTZCOL",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            23,
-            None,
-            0,
-            6,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            23,
-            None,
-            0,
-            6,
-            True,
-        ),
-        (
-            "TIMESTAMPLTZPRECISIONCOL",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            23,
-            None,
-            0,
-            5,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_4807(cursor, module_data):
-    "4807 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestTimestampLTZs order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_4808(cursor, module_data):
-    "4808 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestTimestampLTZs order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_4809(cursor, module_data_by_key):
-    "4809 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestTimestampLTZs
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_4810(cursor, module_data_by_key):
-    "4810 - test binding a timestamp with zero fractional seconds"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampLTZs
-        where trunc(TimestampLTZCol) = :value
-        """,
-        value=datetime.datetime(2022, 6, 12),
-    )
-    assert cursor.fetchall() == [module_data_by_key[10]]
-
-
-def test_4811(cursor, module_data_by_key):
-    "4811 - test binding a timestamp with datetime.date as input"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_LTZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampLTZs
-        where trunc(TimestampLTZCol) = :value
-        """,
-        value=datetime.date(2022, 6, 12),
-    )
-    assert cursor.fetchall() == [module_data_by_key[10]]
diff --git a/tests/test_4900_timestamp_tz_var.py b/tests/test_4900_timestamp_tz_var.py
deleted file mode 100644
index b4ac7c67..00000000
--- a/tests/test_4900_timestamp_tz_var.py
+++ /dev/null
@@ -1,244 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-4900 - Module for testing timestamp with time zone variables
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    base_date = datetime.datetime(2022, 6, 3)
-    for i in range(1, 11):
-        microseconds = int(str(i * 50).ljust(6, "0"))
-        offset = datetime.timedelta(
-            days=i, seconds=i * 2, microseconds=microseconds
-        )
-        col = base_date + offset
-        if i % 2:
-            microseconds = int(str(i * 125).ljust(6, "0"))
-            offset = datetime.timedelta(
-                days=i + 1, seconds=i * 3, microseconds=microseconds
-            )
-            nullable_col = base_date + offset
-        else:
-            nullable_col = None
-        precision_col = datetime.datetime(2009, 12, 14)
-        data_tuple = (i, col, nullable_col, precision_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_4900(cursor, module_data_by_key):
-    "4900 - test binding in a timestamp"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampTZs
-        where TimestampTZCol = :value
-        """,
-        value=datetime.datetime(2022, 6, 7, 18, 30, 10, 250000),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_4901(cursor):
-    "4901 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampTZs
-        where TimestampTZCol = :value
-        """,
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_4902(cursor):
-    "4902 - test binding out with set input sizes defined"
-    bv = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        begin
-            :value := to_timestamp('20220603', 'YYYYMMDD');
-        end;
-        """
-    )
-    assert bv["value"].getvalue() == datetime.datetime(2022, 6, 3)
-
-
-def test_4903(cursor):
-    "4903 - test binding in/out with set input sizes defined"
-    bv = cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_dsinterval('5 06:00:00');
-        end;
-        """,
-        value=datetime.datetime(2022, 5, 25),
-    )
-    assert bv["value"].getvalue() == datetime.datetime(2022, 5, 30, 6, 0, 0)
-
-
-def test_4904(cursor):
-    "4904 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        begin
-            :value := to_date('20021231 12:31:00', 'YYYYMMDD HH24:MI:SS');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2002, 12, 31, 12, 31, 0)
-
-
-def test_4905(cursor):
-    "4905 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_TIMESTAMP_TZ)
-    var.setvalue(0, datetime.datetime(2022, 6, 3, 6, 0, 0))
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_dsinterval('5 06:00:00');
-        end;
-        """,
-        value=var,
-    )
-    assert var.getvalue() == datetime.datetime(2022, 6, 8, 12, 0, 0)
-
-
-def test_4906(cursor):
-    "4906 - test cursor description is accurate"
-    cursor.execute("select * from TestTimestampTZs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "TIMESTAMPTZCOL",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            23,
-            None,
-            0,
-            6,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            23,
-            None,
-            0,
-            6,
-            True,
-        ),
-        (
-            "TIMESTAMPTZPRECISIONCOL",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            23,
-            None,
-            0,
-            7,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_4907(cursor, module_data):
-    "4907 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestTimestampTZs order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_4908(cursor, module_data):
-    "4908 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestTimestampTZs order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_4909(cursor, module_data_by_key):
-    "4909 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestTimestampTZs
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_4910(cursor, module_data_by_key):
-    "4910 - test binding a timestamp with zero fractional seconds"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampTZs
-        where trunc(TimestampTZCol) = :value
-        """,
-        value=datetime.datetime(2022, 6, 8),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
-
-
-def test_4911(cursor, module_data_by_key):
-    "4911 - test binding a timestamp with datetime.date as input"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_TIMESTAMP_TZ)
-    cursor.execute(
-        """
-        select *
-        from TestTimestampTZs
-        where trunc(TimestampTZCol) = :value
-        """,
-        value=datetime.date(2022, 6, 8),
-    )
-    assert cursor.fetchall() == [module_data_by_key[5]]
diff --git a/tests/test_5000_externalauth.py b/tests/test_5000_externalauth.py
deleted file mode 100644
index 5f05bfd9..00000000
--- a/tests/test_5000_externalauth.py
+++ /dev/null
@@ -1,321 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5000 - Module for testing external authentication
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def skip_if_no_external_auth(test_env):
-    if not test_env.external_user:
-        pytest.skip("external authentication not configured")
-
-
-def _verify_connection(conn, expected_user, expected_proxy_user=None):
-    with conn.cursor() as cursor:
-        cursor.execute(
-            """
-            select
-                sys_context('userenv', 'session_user'),
-                sys_context('userenv', 'proxy_user')
-            from dual
-            """
-        )
-        actual_user, actual_proxy_user = cursor.fetchone()
-        assert actual_user == expected_user.upper()
-        assert (
-            actual_proxy_user == expected_proxy_user
-            and expected_proxy_user.upper()
-        )
-
-
-def test_5000(test_env):
-    """
-    5000 - test error on creating a pool with user and password specified
-    and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("DPI-1032"):
-        test_env.get_pool(
-            min=1,
-            max=2,
-            increment=1,
-            getmode=oracledb.POOL_GETMODE_WAIT,
-            externalauth=True,
-            homogeneous=False,
-        )
-
-
-def test_5001(test_env):
-    """
-    5001 - test error on creating a pool without password and with user
-    specified and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("DPI-1032"):
-        oracledb.create_pool(
-            user=test_env.main_user,
-            min=1,
-            max=2,
-            increment=1,
-            getmode=oracledb.POOL_GETMODE_WAIT,
-            externalauth=True,
-            homogeneous=False,
-        )
-
-
-def test_5002(test_env):
-    """
-    5002 - test error on creating a pool without user and with password
-    specified and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("DPI-1032"):
-        oracledb.create_pool(
-            password=test_env.main_password,
-            min=1,
-            max=2,
-            increment=1,
-            getmode=oracledb.POOL_GETMODE_WAIT,
-            externalauth=True,
-            homogeneous=False,
-        )
-
-
-def test_5003(test_env):
-    """
-    5003 - test creating a pool with user and password specified and
-    externalauth set to False
-    """
-    pool = test_env.get_pool(
-        min=1,
-        max=2,
-        increment=1,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        externalauth=False,
-        homogeneous=False,
-    )
-    with pool.acquire() as conn:
-        _verify_connection(conn, test_env.main_user)
-
-
-def test_5004(test_env):
-    """
-    5004 - test error when connecting with user and password specified
-    and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("DPI-1032"):
-        oracledb.connect(
-            user=test_env.main_user,
-            password=test_env.main_password,
-            dsn=test_env.connect_string,
-            externalauth=True,
-        )
-
-
-def test_5005(test_env):
-    """
-    5005 - test error when connecting without username and with password
-    specified and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("DPI-1032"):
-        oracledb.connect(
-            password=test_env.main_password,
-            dsn=test_env.connect_string,
-            externalauth=True,
-        )
-
-    # by default externalauth is False
-    with test_env.assert_raises_full_code("ORA-01017"):
-        oracledb.connect(
-            password=test_env.main_password,
-            dsn=test_env.connect_string,
-        )
-
-
-def test_5006(test_env):
-    """
-    5006 - test error when connecting without password and with user
-    specified and externalauth enabled
-    """
-    with test_env.assert_raises_full_code("ORA-01017"):
-        oracledb.connect(
-            user="[invalid_user]",
-            dsn=test_env.connect_string,
-            externalauth=True,
-        )
-
-    # by default externalauth is False
-    with test_env.assert_raises_full_code("ORA-01017"):
-        oracledb.connect(user="[invalid_user]", dsn=test_env.connect_string)
-
-
-def test_5007(test_env):
-    "5007 - test external authentication with invalid proxy user"
-    with test_env.assert_raises_full_code("DPI-1069"):
-        oracledb.connect(
-            user=test_env.main_user,
-            dsn=test_env.connect_string,
-            externalauth=True,
-        )
-
-    # by default externalauth is False
-    with test_env.assert_raises_full_code("DPY-4001"):
-        oracledb.connect(
-            user=test_env.main_user,
-            dsn=test_env.connect_string,
-        )
-
-
-def test_5008(test_env):
-    """
-    5008 - test creating a connection with user and password specified and
-    externalauth set to False
-    """
-    conn = oracledb.connect(
-        user=test_env.main_user,
-        password=test_env.main_password,
-        dsn=test_env.connect_string,
-        externalauth=False,
-    )
-    _verify_connection(conn, test_env.main_user)
-
-
-def test_5009(test_env):
-    """
-    5009 - test creating standalone connection with externalauth set to
-    True explicitly
-    """
-    conn = oracledb.connect(dsn=test_env.connect_string, externalauth=True)
-    _verify_connection(conn, test_env.external_user)
-
-
-def test_5010(test_env):
-    """
-    5010 - test creating standalone connection with no user and password
-    specified and externalauth not set
-    """
-    conn = oracledb.connect(dsn=test_env.connect_string)
-    _verify_connection(conn, test_env.external_user)
-
-
-def test_5011(test_env):
-    "5011 - test creating a pool with external authentication"
-    pool = oracledb.create_pool(
-        dsn=test_env.connect_string,
-        min=1,
-        max=2,
-        increment=1,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        externalauth=True,
-        homogeneous=False,
-    )
-    assert pool.opened == 0
-    with pool.acquire() as conn:
-        _verify_connection(conn, test_env.external_user)
-
-
-def test_5012(test_env):
-    """
-    5012 - test creating a pool without user and password specified and
-    externalauth not set
-    """
-    pool = oracledb.create_pool(
-        dsn=test_env.connect_string,
-        min=1,
-        max=2,
-        increment=1,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        homogeneous=False,
-    )
-    with test_env.assert_raises_full_code("ORA-24415"):
-        pool.acquire()
-
-
-def test_5013(test_env):
-    "5013 - test pool min is always 0 under external authentication"
-    pool = oracledb.create_pool(
-        dsn=test_env.connect_string,
-        min=5,
-        max=10,
-        increment=3,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        externalauth=True,
-        homogeneous=False,
-    )
-    assert pool.opened == 0
-
-
-def test_5014(test_env):
-    "5014 - test pool increment is always 1 under external authentication"
-    pool = oracledb.create_pool(
-        dsn=test_env.connect_string,
-        min=5,
-        max=10,
-        increment=3,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-        externalauth=True,
-        homogeneous=False,
-    )
-    conn1 = pool.acquire()
-    assert pool.opened == 1
-    conn2 = pool.acquire()
-    assert pool.opened == 2
-    conn1.close()
-    conn2.close()
-
-
-def test_5015(test_env):
-    "5015 - test external authentication with proxy"
-    proxy_user = test_env.external_user
-    schema_user = test_env.main_user
-    conn1 = oracledb.connect(
-        user=f"[{schema_user}]",
-        dsn=test_env.connect_string,
-        externalauth=True,
-    )
-    _verify_connection(conn1, schema_user, proxy_user)
-    conn2 = oracledb.connect(
-        user=f"[{schema_user}]", dsn=test_env.connect_string
-    )
-    _verify_connection(conn2, schema_user, proxy_user)
-
-
-def test_5016(test_env):
-    "5016 - test creating pool using external authentication with proxy"
-    proxy_user = test_env.external_user
-    schema_user = test_env.main_user
-    pool = oracledb.create_pool(
-        externalauth=True,
-        homogeneous=False,
-        dsn=test_env.connect_string,
-        min=1,
-        max=2,
-        increment=1,
-        getmode=oracledb.POOL_GETMODE_WAIT,
-    )
-    assert pool.opened == 0
-    conn = pool.acquire(user=f"[{schema_user}]")
-    _verify_connection(conn, schema_user, proxy_user)
diff --git a/tests/test_5100_arrayvar.py b/tests/test_5100_arrayvar.py
deleted file mode 100644
index 665e1fe4..00000000
--- a/tests/test_5100_arrayvar.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5100 - Module for testing array variables.
-"""
-
-import oracledb
-import pytest
-
-
-def test_5100(cursor):
-    "5100 - checking the attributes of an array variable"
-    var = cursor.arrayvar(oracledb.DB_TYPE_NUMBER, 1000)
-    assert var.size == 0
-    assert var.values == []
-    assert var.num_elements == 1000
-    assert var.actual_elements == 0
-
-    var = cursor.arrayvar(oracledb.DB_TYPE_NUMBER, [1, 2])
-    assert var.values == [1, 2]
-    assert var.num_elements == 2
-    assert var.actual_elements == 2
-
-
-def test_5101(cursor):
-    "5101 - setting values in an array variable"
-    var = cursor.arrayvar(oracledb.DB_TYPE_VARCHAR, 10, 2000)
-    assert var.values == []
-    assert var.actual_elements == 0
-    data = [str(i) for i in range(5)]
-    var.setvalue(0, data)
-    assert var.values == data
-    assert var.actual_elements == len(data)
-
-
-def test_5102(cursor):
-    "5102 - checking the default size of VARCHAR and RAW types"
-    types = [oracledb.DB_TYPE_VARCHAR, oracledb.DB_TYPE_RAW]
-    for typ in types:
-        var = cursor.arrayvar(typ, ["ab"])
-        assert var.size == 4000
-
-
-def test_5103(cursor):
-    "5103 - creating array variables with invalid parameters"
-    pytest.raises(
-        TypeError, cursor.arrayvar, oracledb.DB_TYPE_NUMBER, "10", 40
-    )
-    pytest.raises(
-        TypeError, cursor.arrayvar, oracledb.DB_TYPE_NUMBER, 10, "40"
-    )
-    pytest.raises(TypeError, cursor.arrayvar, oracledb.DB_TYPE_NUMBER, 10, [])
-
-
-def test_5104(cursor, test_env):
-    "5104 - declaring an array variable with an incorrect Python type"
-    with test_env.assert_raises_full_code("DPY-3013"):
-        cursor.arrayvar(oracledb.DB_TYPE_NUMBER, [3, "ab"])
-
-
-def test_5105(cursor, test_env):
-    "5105 - adding more elements than declared to an array variable"
-    var = cursor.arrayvar(oracledb.DB_TYPE_NUMBER, 4)
-    with test_env.assert_raises_full_code("DPY-2016"):
-        var.setvalue(0, [i for i in range(5)])
-
-
-def test_5106(cursor, test_env):
-    "5106 - creating an invalid array of arrays"
-    var = cursor.arrayvar(oracledb.DB_TYPE_NUMBER, 4)
-    with test_env.assert_raises_full_code("DPY-3005"):
-        var.setvalue(1, [1, 2])
diff --git a/tests/test_5200_sql_parser.py b/tests/test_5200_sql_parser.py
deleted file mode 100644
index 0628f8e4..00000000
--- a/tests/test_5200_sql_parser.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5200 - Module for testing the SQL parser.
-"""
-
-import pytest
-
-
-def test_5200(cursor):
-    "5200 - single line comment"
-    cursor.prepare(
-        "--begin :value2 := :a + :b + :c +:a +3; end;\n"
-        "begin :value2 := :a + :c +3; end; -- not a :bind_variable"
-    )
-    assert cursor.bindnames() == ["VALUE2", "A", "C"]
-
-
-def test_5201(cursor):
-    "5201 - multiple line comment"
-    cursor.prepare(
-        "/*--select * from :a where :a = 1\n"
-        "select * from table_names where :a = 1*/\n"
-        "select :table_name, :value from dual"
-    )
-    assert cursor.bindnames() == ["TABLE_NAME", "VALUE"]
-
-
-def test_5202(cursor):
-    "5202 - constant strings"
-    statement = """
-                begin
-                    :value := to_date('20021231 12:31:00', :format);
-                end;"""
-    cursor.prepare(statement)
-    assert cursor.bindnames() == ["VALUE", "FORMAT"]
-
-
-def test_5203(cursor):
-    "5203 - multiple division operators"
-    cursor.prepare(
-        """
-        select :a / :b, :c / :d
-        from dual
-        """
-    )
-    assert cursor.bindnames() == ["A", "B", "C", "D"]
-
-
-def test_5204(cursor):
-    "5204 - starting with parentheses"
-    sql = "(select :a from dual) union (select :b from dual)"
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["A", "B"]
-
-
-def test_5205(cursor):
-    "5205 - invalid quoted bind"
-    sql = 'select ":test", :a from dual'
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["A"]
-
-
-def test_5206(cursor):
-    "5206 - non-ascii character in the bind name"
-    sql = "select :méil$ from dual"
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["MÉIL$"]
-
-
-def test_5207(cursor):
-    "5207 - various quoted bind names"
-    tests = [
-        ('select :"percent%" from dual', ["percent%"]),
-        ('select : "q?marks" from dual', ["q?marks"]),
-        ('select :"percent%(ens)yah" from dual', ["percent%(ens)yah"]),
-        ('select :  "per % cent" from dual', ["per % cent"]),
-        ('select :"per cent" from dual', ["per cent"]),
-        ('select :"par(ens)" from dual', ["par(ens)"]),
-        ('select :"more/slashes" from dual', ["more/slashes"]),
-        ('select :"%percent" from dual', ["%percent"]),
-        ('select :"/slashes/" from dual', ["/slashes/"]),
-        ('select :"1col:on" from dual', ["1col:on"]),
-        ('select :"col:ons" from dual', ["col:ons"]),
-        ('select :"more :: %colons%" from dual', ["more :: %colons%"]),
-        ('select :"more/slashes" from dual', ["more/slashes"]),
-        ('select :"spaces % spaces" from dual', ["spaces % spaces"]),
-        ('select "col:nns", :"col:ons", :id from dual', ["col:ons", "ID"]),
-    ]
-    for sql, expected in tests:
-        cursor.prepare(sql)
-        assert cursor.bindnames() == expected
-
-
-def test_5208(cursor):
-    "5208 - sql containing quoted identifiers and strings"
-    sql = 'select "/*_value1" + : "VaLue_2" + :"*/3VALUE" from dual'
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["VaLue_2", "*/3VALUE"]
-
-
-def test_5209(cursor):
-    "5209 - statement containing simple strings"
-    sql = """select '"string_1"', :bind_1, ':string_2' from dual"""
-    cursor.prepare(sql)
-    assert cursor.bindnames() == ["BIND_1"]
-
-
-def test_5210(cursor):
-    "5210 - bind variables between comment blocks"
-    cursor.prepare(
-        """
-        select
-            /* comment 1 with /* */
-            :a,
-            /* comment 2 with another /* */
-            :b
-            /* comment 3 * * * / */,
-            :c
-        from dual
-        """
-    )
-    assert cursor.bindnames() == ["A", "B", "C"]
-
-
-def test_5211(cursor):
-    "5211 - bind variables between q-strings"
-    cursor.prepare(
-        """
-        select
-            :a,
-            q'{This contains ' and " and : just fine}',
-            :b,
-            q'[This contains ' and " and : just fine]',
-            :c,
-            q'<This contains ' and " and : just fine>',
-            :d,
-            q'(This contains ' and " and : just fine)',
-            :e,
-            q'$This contains ' and " and : just fine$',
-            :f
-        from dual
-        """
-    )
-    assert cursor.bindnames() == ["A", "B", "C", "D", "E", "F"]
-
-
-def test_5212(cursor, test_env):
-    "5212 - bind variables between JSON constants"
-    if not test_env.has_client_version(19):
-        pytest.skip("unsupported client")
-    cursor.prepare(
-        """
-        select
-            json_object('foo':dummy),
-            :bv1,
-            json_object('foo'::bv2),
-            :bv3,
-            json { 'key1': 57, 'key2' : 58 },
-            :bv4
-        from dual
-        """
-    )
-    assert cursor.bindnames() == ["BV1", "BV2", "BV3", "BV4"]
-
-
-def test_5213(cursor):
-    "5213 - multiple line comment with multiple asterisks"
-    cursor.prepare(
-        "/****--select * from :a where :a = 1\n"
-        "select * from table_names where :a = 1****/\n"
-        "select :table_name, :value from dual"
-    )
-    assert cursor.bindnames() == ["TABLE_NAME", "VALUE"]
-
-
-def test_5214(cursor, test_env):
-    "5214 - qstring without a closing quote"
-    with test_env.assert_raises_full_code("DPY-2041"):
-        cursor.prepare("select q'[something from dual")
-
-
-def test_5215(cursor):
-    "5215 - different space combinations with :="
-    cursor.prepare(
-        """
-        begin :value2 :=
-                           :a  + :b  +   :c +:a +3; end;
-                           begin :value2
-                           :=
-                           :a + :c +3; end;
-        """
-    )
-    assert cursor.bindnames() == ["VALUE2", "A", "B", "C"]
-
-
-def test_5216(cursor):
-    "5216 - bind variables between multiple comment blocks with quotes"
-    cursor.prepare(
-        """
-        select
-            /* ' comment 1 */
-            :a,
-            /* "comment " 2 ' */:b
-            /* comment 3 '*/,
-            :c
-            /* comment 4 ""*/
-        from dual
-        """
-    )
-    assert cursor.bindnames() == ["A", "B", "C"]
-
-
-def test_5217(cursor, test_env):
-    "5217 - query with a missing end quote"
-    with test_env.assert_raises_full_code("DPY-2041"):
-        cursor.prepare("select 'abc, :a from dual")
-
-
-def test_5218(cursor, test_env):
-    "5218 - q-string with wrong closing symbols"
-    with test_env.assert_raises_full_code("DPY-2041"):
-        cursor.prepare("select q'[abc'], 5 from dual")
diff --git a/tests/test_5300_connection_async.py b/tests/test_5300_connection_async.py
deleted file mode 100644
index 0ea2ab89..00000000
--- a/tests/test_5300_connection_async.py
+++ /dev/null
@@ -1,696 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5300 - Module for testing connections with asyncio
-"""
-
-import asyncio
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def _connect_and_drop(test_env):
-    """
-    Connect to the database, perform a query and drop the connection.
-    """
-    await asyncio.sleep(0.1)
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("select count(*) from TestNumbers")
-        (count,) = await cursor.fetchone()
-        assert count == 10
-
-
-async def _verify_fetched_data(conn):
-    expected_data = [f"String {i + 1}" for i in range(10)]
-    sql = "select StringCol from TestStrings order by IntCol"
-    for i in range(5):
-        with conn.cursor() as cursor:
-            await cursor.execute(sql)
-            fetched_data = [s async for s, in cursor]
-            assert fetched_data == expected_data
-
-
-async def _verify_attributes(conn, attr_name, value, sql):
-    setattr(conn, attr_name, value)
-    cursor = conn.cursor()
-    await cursor.execute(sql)
-    (result,) = await cursor.fetchone()
-    assert result == value, f"{attr_name} value mismatch"
-
-
-async def _verify_connect_arg(test_env, arg_name, arg_value, sql):
-    args = {}
-    args[arg_name] = arg_value
-    conn = await test_env.get_connection_async(**args)
-    cursor = conn.cursor()
-    await cursor.execute(sql)
-    (fetched_value,) = await cursor.fetchone()
-    assert fetched_value == arg_value
-
-
-async def test_5300(test_env):
-    "5300 - simple connection to database"
-    async with test_env.get_connection_async() as conn:
-        assert conn.username == test_env.main_user, "user name differs"
-        assert conn.dsn == test_env.connect_string, "dsn differs"
-        assert conn.thin
-
-
-async def test_5303(test_env):
-    "5303 - test connection end-to-end tracing attributes"
-    async with test_env.get_connection_async() as conn:
-        if not test_env.is_on_oracle_cloud:
-            sql = """select dbop_name from v$sql_monitor
-                     where sid = sys_context('userenv', 'sid')
-                     and status = 'EXECUTING'"""
-            await _verify_attributes(conn, "dbop", "oracledb_dbop", sql)
-        sql = "select sys_context('userenv', 'action') from dual"
-        await _verify_attributes(conn, "action", "oracledb_Action", sql)
-        await _verify_attributes(conn, "action", None, sql)
-        sql = "select sys_context('userenv', 'module') from dual"
-        await _verify_attributes(conn, "module", "oracledb_Module", sql)
-        await _verify_attributes(conn, "module", None, sql)
-        sql = "select sys_context('userenv', 'client_info') from dual"
-        await _verify_attributes(conn, "clientinfo", "oracledb_cinfo", sql)
-        await _verify_attributes(conn, "clientinfo", None, sql)
-        sql = "select sys_context('userenv', 'client_identifier') from dual"
-        await _verify_attributes(
-            conn, "client_identifier", "oracledb_cid", sql
-        )
-        await _verify_attributes(conn, "client_identifier", None, sql)
-
-
-async def test_5304(test_env):
-    "5304 - test use of autocommit"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        other_conn = await test_env.get_connection_async()
-        other_cursor = other_conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute("insert into TestTempTable (IntCol) values (1)")
-        await other_cursor.execute("select IntCol from TestTempTable")
-        assert await other_cursor.fetchall() == []
-        conn.autocommit = True
-        await cursor.execute("insert into TestTempTable (IntCol) values (2)")
-        await other_cursor.execute(
-            "select IntCol from TestTempTable order by IntCol"
-        )
-        assert await other_cursor.fetchall() == [(1,), (2,)]
-
-
-async def test_5305(test_env):
-    "5305 - connection to database with bad connect string"
-    with test_env.assert_raises_full_code(
-        "DPY-4000", "DPY-4026", "DPY-4027", "ORA-12154"
-    ):
-        await oracledb.connect_async("not a valid connect string!!")
-    with test_env.assert_raises_full_code("DPY-4000", "DPY-4001"):
-        await oracledb.connect(
-            test_env.main_user + "@" + test_env.connect_string
-        )
-
-
-async def test_5306(test_env):
-    "5306 - connection to database with bad password"
-    with test_env.assert_raises_full_code("ORA-01017"):
-        await test_env.get_connection_async(
-            password=test_env.main_password + "X",
-        )
-
-
-async def test_5307(skip_if_drcp, test_env):
-    "5307 - test changing password"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    async with test_env.get_connection_async() as conn:
-        new_password = test_env.get_random_string(20)
-        await conn.changepassword(test_env.main_password, new_password)
-        conn = await test_env.get_connection_async(password=new_password)
-        await conn.changepassword(new_password, test_env.main_password)
-
-
-async def test_5308(skip_if_drcp, test_env):
-    "5308 - test changing password to an invalid value"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    async with test_env.get_connection_async() as conn:
-        new_password = "1" * 1500
-        with test_env.assert_raises_full_code("ORA-01017", "ORA-00988"):
-            await conn.changepassword(test_env.main_password, new_password)
-        with test_env.assert_raises_full_code(
-            "ORA-01017", "ORA-28008", "ORA-00988"
-        ):
-            await conn.changepassword("incorrect old password", new_password)
-
-
-async def test_5309(skip_if_drcp, test_env):
-    "5309 - test connecting with password containing / and @ symbols"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    async with test_env.get_connection_async() as conn:
-        chars = list(test_env.get_random_string(20))
-        chars[4] = "/"
-        chars[8] = "@"
-        new_password = "".join(chars)
-        await conn.changepassword(test_env.main_password, new_password)
-        try:
-            async with test_env.get_connection_async(password=new_password):
-                pass
-        finally:
-            await conn.changepassword(new_password, test_env.main_password)
-
-
-async def test_5310(test_env):
-    "5310 - confirm an exception is raised after closing a connection"
-    async with await test_env.get_connection_async() as conn:
-        await conn.close()
-        with test_env.assert_raises_full_code("DPY-1001"):
-            await conn.rollback()
-
-
-async def test_5312(test_env):
-    "5312 - connection version is a string"
-    async with test_env.get_connection_async() as conn:
-        assert isinstance(conn.version, str)
-
-
-async def test_5313(test_env):
-    "5313 - connection rolls back before close"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        other_conn = await test_env.get_connection_async()
-        other_cursor = other_conn.cursor()
-        await other_cursor.execute(
-            "insert into TestTempTable (IntCol) values (1)"
-        )
-        other_cursor.close()
-        await other_conn.close()
-        await cursor.execute("select count(*) from TestTempTable")
-        (count,) = await cursor.fetchone()
-        assert count == 0
-
-
-async def test_5315(test_env):
-    "5315 - multiple connections to database with multiple threads"
-    coroutines = [_connect_and_drop(test_env) for i in range(20)]
-    await asyncio.gather(*coroutines)
-
-
-async def test_5316(test_env):
-    "5316 - test string format of connection"
-    async with test_env.get_connection_async() as conn:
-        expected_value = "<oracledb.AsyncConnection to %s@%s>" % (
-            test_env.main_user,
-            test_env.connect_string,
-        )
-        assert str(conn) == expected_value
-
-
-async def test_5317(test_env):
-    "5317 - test context manager - close"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute("insert into TestTempTable (IntCol) values (1)")
-        await conn.commit()
-        await cursor.execute("insert into TestTempTable (IntCol) values (2)")
-    with test_env.assert_raises_full_code("DPY-1001"):
-        await conn.ping()
-    conn = await test_env.get_connection_async()
-    cursor = conn.cursor()
-    await cursor.execute("select count(*) from TestTempTable")
-    (count,) = await cursor.fetchone()
-    assert count == 1
-
-
-async def test_5318(test_env):
-    "5318 - test connection attribute values"
-    async with test_env.get_connection_async() as conn:
-        assert conn.ltxid == b""
-        assert conn.current_schema is None
-        conn.current_schema = "test_schema"
-        assert conn.current_schema == "test_schema"
-        assert conn.edition is None
-        conn.external_name = "test_external"
-        assert conn.external_name == "test_external"
-        conn.internal_name = "test_internal"
-        assert conn.internal_name == "test_internal"
-        conn.stmtcachesize = 30
-        assert conn.stmtcachesize == 30
-        with pytest.raises(TypeError):
-            conn.stmtcachesize = "value"
-        assert conn.warning is None
-
-
-async def test_5319(test_env):
-    "5319 - test closed connection attribute values"
-    conn = await test_env.get_connection_async()
-    await conn.close()
-    attr_names = [
-        "current_schema",
-        "edition",
-        "external_name",
-        "internal_name",
-        "ltxid",
-        "stmtcachesize",
-        "warning",
-    ]
-    for name in attr_names:
-        with test_env.assert_raises_full_code("DPY-1001"):
-            getattr(conn, name)
-
-
-async def test_5320(test_env, async_conn, round_trip_checker_async):
-    "5320 - test connection ping makes a round trip"
-    await async_conn.ping()
-    assert (await round_trip_checker_async.get_value_async()) == 1
-
-
-async def test_5325(async_conn):
-    "5325 - single connection to database with multiple threads"
-    coroutines = [_verify_fetched_data(async_conn) for i in range(3)]
-    await asyncio.gather(*coroutines)
-
-
-async def test_5326(skip_if_implicit_pooling, async_conn, test_env):
-    "5326 - test connection cancel"
-
-    async def perform_cancel():
-        await asyncio.sleep(0.1)
-        async_conn.cancel()
-
-    async def perform_work():
-        with pytest.raises(oracledb.OperationalError):
-            with async_conn.cursor() as cursor:
-                await cursor.callproc(test_env.sleep_proc_name, [2])
-
-    await asyncio.gather(perform_work(), perform_cancel())
-
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select user from dual")
-        (user,) = await cursor.fetchone()
-        assert user == test_env.main_user.upper()
-
-
-async def test_5327(skip_if_drcp, test_env):
-    "5327 - test changing password during connect"
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    async with test_env.get_connection_async() as conn:
-        new_password = test_env.get_random_string(20)
-        conn = await test_env.get_connection_async(newpassword=new_password)
-        conn = await test_env.get_connection_async(password=new_password)
-        await conn.changepassword(new_password, test_env.main_password)
-
-
-async def test_5328(test_env):
-    "5328 - test use of autocommit during reexecute"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    data_to_insert = [(1, "Test String #1"), (2, "Test String #2")]
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        other_conn = await test_env.get_connection_async()
-        other_cursor = other_conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute(sql, data_to_insert[0])
-        await other_cursor.execute(
-            "select IntCol, StringCol1 from TestTempTable"
-        )
-        assert await other_cursor.fetchall() == []
-        conn.autocommit = True
-        await cursor.execute(sql, data_to_insert[1])
-        await other_cursor.execute(
-            "select IntCol, StringCol1 from TestTempTable"
-        )
-        assert await other_cursor.fetchall() == data_to_insert
-
-
-async def test_5329(test_env):
-    "5329 - test current_schema is set properly"
-    async with test_env.get_connection_async() as conn:
-        assert conn.current_schema is None
-
-        user = test_env.main_user.upper()
-        proxy_user = test_env.proxy_user.upper()
-        cursor = conn.cursor()
-        await cursor.execute(f"alter session set current_schema={proxy_user}")
-        assert conn.current_schema == proxy_user
-
-        conn.current_schema = user
-        assert conn.current_schema == user
-
-        await cursor.execute(
-            "select sys_context('userenv', 'current_schema') from dual"
-        )
-        (result,) = await cursor.fetchone()
-        assert result == user
-
-
-async def test_5330(test_env):
-    "5330 - test dbms_output package"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        test_string = "Testing DBMS_OUTPUT package"
-        await cursor.callproc("dbms_output.enable")
-        await cursor.callproc("dbms_output.put_line", [test_string])
-        string_var = cursor.var(str)
-        number_var = cursor.var(int)
-        await cursor.callproc("dbms_output.get_line", (string_var, number_var))
-        assert string_var.getvalue() == test_string
-
-
-async def test_5331(test_env):
-    "5331 - test connection call_timeout"
-    async with test_env.get_connection_async() as conn:
-        conn.call_timeout = 500  # milliseconds
-        assert conn.call_timeout == 500
-        with test_env.assert_raises_full_code("DPY-4011", "DPY-4024"):
-            with conn.cursor() as cursor:
-                await cursor.callproc(test_env.sleep_proc_name, [2])
-
-
-async def test_5332(test_env):
-    "5332 - test Connection repr()"
-
-    class MyConnection(oracledb.AsyncConnection):
-        pass
-
-    conn = await test_env.get_connection_async(conn_class=MyConnection)
-    qual_name = conn.__class__.__qualname__
-    expected_value = f"<{__name__}.{qual_name} to {conn.username}@{conn.dsn}>"
-    assert repr(conn) == expected_value
-
-    await conn.close()
-    expected_value = f"<{__name__}.{qual_name} disconnected>"
-    assert repr(conn) == expected_value
-
-
-async def test_5333(test_env):
-    "5333 - test getting write-only attributes"
-    async with test_env.get_connection_async() as conn:
-        with pytest.raises(AttributeError):
-            conn.action
-        with pytest.raises(AttributeError):
-            conn.dbop
-        with pytest.raises(AttributeError):
-            conn.clientinfo
-        with pytest.raises(AttributeError):
-            conn.econtext_id
-        with pytest.raises(AttributeError):
-            conn.module
-        with pytest.raises(AttributeError):
-            conn.client_identifier
-
-
-async def test_5334(test_env):
-    "5334 - test error for invalid type for params and pool"
-    pool = test_env.get_pool_async()
-    await pool.close()
-    with test_env.assert_raises_full_code("DPY-1002"):
-        await test_env.get_connection_async(pool=pool)
-    with pytest.raises(TypeError):
-        await test_env.get_connection_async(
-            pool="This isn't an instance of a pool"
-        )
-    with test_env.assert_raises_full_code("DPY-2025"):
-        await oracledb.connect_async(params={"number": 7})
-
-
-async def test_5335(test_env):
-    "5335 - test connection instance name"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            """
-            select upper(sys_context('userenv', 'instance_name'))
-            from dual
-            """
-        )
-        (instance_name,) = await cursor.fetchone()
-        assert conn.instance_name.upper() == instance_name
-
-
-async def test_5337(
-    skip_if_drcp, skip_unless_long_passwords_supported, test_env
-):
-    if test_env.is_on_oracle_cloud:
-        pytest.skip("passwords on Oracle Cloud are strictly controlled")
-    "5337 - test maximum allowed length for password"
-    async with test_env.get_connection_async() as conn:
-
-        original_password = test_env.main_password
-        new_password_32 = "a" * 32
-        await conn.changepassword(original_password, new_password_32)
-        conn = await test_env.get_connection_async(password=new_password_32)
-
-        new_password_1024 = "a" * 1024
-        await conn.changepassword(new_password_32, new_password_1024)
-        conn = await test_env.get_connection_async(password=new_password_1024)
-        await conn.changepassword(new_password_1024, original_password)
-
-        new_password_1025 = "a" * 1025
-        with test_env.assert_raises_full_code("ORA-28218", "ORA-00972"):
-            await conn.changepassword(original_password, new_password_1025)
-
-
-async def test_5338(test_env):
-    "5338 - test getting db_name"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("select name from V$DATABASE")
-        (db_name,) = await cursor.fetchone()
-        assert conn.db_name.upper() == db_name.upper()
-
-
-async def test_5339(test_env):
-    "5339 - test getting max_open_cursors"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            "select value from V$PARAMETER where name='open_cursors'"
-        )
-        (max_open_cursors,) = await cursor.fetchone()
-        assert conn.max_open_cursors == int(max_open_cursors)
-
-
-async def test_5340(test_env):
-    "5340 - test getting service_name"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            "select sys_context('userenv', 'service_name') from dual"
-        )
-        (service_name,) = await cursor.fetchone()
-        assert conn.service_name == service_name
-
-
-async def test_5341(test_env):
-    "5341 - test transaction_in_progress"
-    async with test_env.get_connection_async() as conn:
-        assert not conn.transaction_in_progress
-
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        assert not conn.transaction_in_progress
-
-        await cursor.execute("insert into TestTempTable (IntCol) values (1)")
-        assert conn.transaction_in_progress
-
-        await conn.commit()
-        assert not conn.transaction_in_progress
-
-
-async def test_5342(test_env):
-    "5342 - test getting db_domain"
-    async with test_env.get_connection_async() as conn:
-        (db_domain,) = await conn.fetchone(
-            "select value from V$PARAMETER where name='db_domain'"
-        )
-        assert conn.db_domain == db_domain
-
-
-async def test_5343(test_env):
-    "5343 - test connection with invalid conn_class"
-    with test_env.assert_raises_full_code("DPY-2023"):
-        await test_env.get_connection_async(conn_class=oracledb.ConnectionPool)
-
-
-async def test_5344(test_env):
-    "5344 - test connection with an invalid pool"
-    with pytest.raises(TypeError):
-        await oracledb.connect_async(pool="not a pool object")
-
-
-async def test_5346(test_env):
-    "5346 - test passing program when creating a connection"
-    sql = (
-        "select program from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_connect_arg(test_env, "program", "newprogram", sql)
-
-
-async def test_5347(test_env):
-    "5347 - test passing machine when creating a connection"
-    sql = (
-        "select machine from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_connect_arg(test_env, "machine", "newmachine", sql)
-
-
-async def test_5348(test_env):
-    "5348 - test passing terminal when creating a connection"
-    sql = (
-        "select terminal from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_connect_arg(test_env, "terminal", "newterminal", sql)
-
-
-async def test_5349(test_env):
-    "5349 - test passing osuser when creating a connection"
-    sql = (
-        "select osuser from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_connect_arg(test_env, "osuser", "newosuser", sql)
-
-
-async def test_5350(test_env):
-    "5350 - test passing driver_name when creating a connection"
-    sql = (
-        "select distinct client_driver from v$session_connect_info "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_connect_arg(test_env, "driver_name", "newdriver", sql)
-
-
-async def test_5351(test_env):
-    "5351 - test getting session id"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            "select dbms_debug_jdwp.current_session_id from dual"
-        )
-        (fetched_value,) = await cursor.fetchone()
-        assert conn.session_id == fetched_value
-
-
-async def test_5352(test_env):
-    "5352 - test getting session serial number"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            "select dbms_debug_jdwp.current_session_serial from dual"
-        )
-        (fetched_value,) = await cursor.fetchone()
-        assert conn.serial_num == fetched_value
-
-
-async def test_5353(test_env):
-    "5353 - test passed params in hook with standalone connection"
-    sdu = 4096
-    params = test_env.get_connect_params()
-    protocol = "proto-test"
-    orig_connect_string = test_env.connect_string
-    connect_string = f"{protocol}://{orig_connect_string}"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        assert passed_protocol == protocol
-        assert passed_protocol_arg == orig_connect_string
-        passed_params.parse_connect_string(passed_protocol_arg)
-        passed_params.set(sdu=sdu)
-
-    try:
-        oracledb.register_protocol(protocol, hook)
-        await oracledb.connect_async(dsn=connect_string, params=params)
-        assert params.sdu == sdu
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-async def test_5354(test_env):
-    "5354 - test altering connection edition"
-    conn = await test_env.get_admin_connection_async()
-    assert conn.edition is None
-    cursor = conn.cursor()
-    sql = "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"
-    default_edition = "ORA$BASE"
-    test_edition = test_env.edition_name
-    for edition in [test_edition, default_edition]:
-        await cursor.execute(f"alter session set edition = {edition}")
-        await cursor.execute(sql)
-        (fetched_edition,) = await cursor.fetchone()
-        assert fetched_edition == edition.upper()
-        assert conn.edition == edition.upper()
-
-
-async def test_5355(test_env):
-    "5355 - test connect() with edition"
-    edition = test_env.edition_name
-    conn = await test_env.get_connection_async(edition=edition)
-    cursor = conn.cursor()
-    await cursor.execute(
-        "select sys_context('USERENV', 'CURRENT_EDITION_NAME') from dual"
-    )
-    (fetched_edition,) = await cursor.fetchone()
-    assert fetched_edition == edition.upper()
-    assert conn.edition == edition
-
-
-async def test_5356(test_env):
-    "5356 - test error in the middle of a database response"
-    conn = await test_env.get_connection_async()
-    cursor = conn.cursor()
-    await cursor.execute("truncate table TestTempTable")
-    data = [(i + 1, 2 if i < 1499 else 0) for i in range(1500)]
-    await cursor.executemany(
-        "insert into TestTempTable (IntCol, NumberCol) values (:1, :2)",
-        data,
-    )
-    await conn.commit()
-    cursor.arraysize = 1500
-    with test_env.assert_raises_full_code("ORA-01476"):
-        await cursor.execute(
-            """
-            select IntCol, 1 / NumberCol
-            from TestTempTable
-            where IntCol < 1500
-            union all
-            select IntCol, 1 / NumberCol
-            from TestTempTable
-            where IntCol = 1500
-            """
-        )
-        await cursor.fetchall()
diff --git a/tests/test_5400_cursor_execute_async.py b/tests/test_5400_cursor_execute_async.py
deleted file mode 100644
index 5e2aeaaa..00000000
--- a/tests/test_5400_cursor_execute_async.py
+++ /dev/null
@@ -1,613 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5400 - Module for testing the cursor execute() method with asyncio
-"""
-
-import collections
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_5400(async_cursor):
-    "5400 - test executing a statement without any arguments"
-    result = await async_cursor.execute("begin null; end;")
-    assert result is None
-
-
-async def test_5401(async_cursor, test_env):
-    "5401 - test executing a None statement with bind variables"
-    with test_env.assert_raises_full_code("DPY-2001"):
-        await async_cursor.execute(None, x=5)
-
-
-async def test_5402(async_cursor):
-    "5402 - test executing a statement with args and empty keyword args"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    args = [simple_var]
-    kwargs = {}
-    result = await async_cursor.execute("begin :1 := 25; end;", args, **kwargs)
-    assert result is None
-    assert simple_var.getvalue() == 25
-
-
-async def test_5403(async_cursor):
-    "5403 - test executing a statement with keyword arguments"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    result = await async_cursor.execute(
-        "begin :value := 5; end;", value=simple_var
-    )
-    assert result is None
-    assert simple_var.getvalue() == 5
-
-
-async def test_5404(async_cursor):
-    "5404 - test executing a statement with a dictionary argument"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    dict_arg = dict(value=simple_var)
-    result = await async_cursor.execute("begin :value := 10; end;", dict_arg)
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-
-async def test_5405(async_cursor, test_env):
-    "5405 - test executing a statement with both a dict and keyword args"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    dict_arg = dict(value=simple_var)
-    with test_env.assert_raises_full_code("DPY-2005"):
-        await async_cursor.execute(
-            "begin :value := 15; end;", dict_arg, value=simple_var
-        )
-
-
-async def test_5406(async_cursor):
-    "5406 - test executing a statement and then changing the array size"
-    await async_cursor.execute("select IntCol from TestNumbers")
-    async_cursor.arraysize = 5
-    assert len(await async_cursor.fetchall()) == 10
-
-
-async def test_5407(async_cursor, test_env):
-    "5407 - test that subsequent executes succeed after bad execute"
-    sql = "begin raise_application_error(-20000, 'this); end;"
-    with test_env.assert_raises_full_code("DPY-2041"):
-        await async_cursor.execute(sql)
-    await async_cursor.execute("begin null; end;")
-
-
-async def test_5408(async_cursor, test_env):
-    "5408 - test that subsequent fetches fail after bad execute"
-    with test_env.assert_raises_full_code("ORA-00904"):
-        await async_cursor.execute("select y from dual")
-    with test_env.assert_raises_full_code("DPY-1003"):
-        await async_cursor.fetchall()
-
-
-async def test_5409(async_cursor, test_env):
-    "5409 - test executing a statement with an incorrect named bind"
-    sql = "select * from TestStrings where IntCol = :value"
-    with test_env.assert_raises_full_code("DPY-4008", "ORA-01036"):
-        await async_cursor.execute(sql, value2=3)
-
-
-async def test_5410(async_cursor):
-    "5410 - test executing a statement with named binds"
-    await async_cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where IntCol = :value1 and LongIntCol = :value2
-        """,
-        value1=1,
-        value2=38,
-    )
-    assert len(await async_cursor.fetchall()) == 1
-
-
-async def test_5411(async_cursor, test_env):
-    "5411 - test executing a statement with an incorrect positional bind"
-    sql = """
-            select *
-            from TestNumbers
-            where IntCol = :value and LongIntCol = :value2"""
-    with test_env.assert_raises_full_code("DPY-4009", "ORA-01008"):
-        await async_cursor.execute(sql, [3])
-
-
-async def test_5412(async_cursor):
-    "5412 - test executing a statement with positional binds"
-    await async_cursor.execute(
-        """
-        select *
-        from TestNumbers
-        where IntCol = :value and LongIntCol = :value2
-        """,
-        [1, 38],
-    )
-    assert len(await async_cursor.fetchall()) == 1
-
-
-async def test_5413(async_cursor):
-    "5413 - test executing a statement after rebinding a named bind"
-    statement = "begin :value := :value2 + 5; end;"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    simple_var2 = async_cursor.var(oracledb.NUMBER)
-    simple_var2.setvalue(0, 5)
-    result = await async_cursor.execute(
-        statement, value=simple_var, value2=simple_var2
-    )
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-    simple_var = async_cursor.var(oracledb.NATIVE_FLOAT)
-    simple_var2 = async_cursor.var(oracledb.NATIVE_FLOAT)
-    simple_var2.setvalue(0, 10)
-    result = await async_cursor.execute(
-        statement, value=simple_var, value2=simple_var2
-    )
-    assert result is None
-    assert simple_var.getvalue() == 15
-
-
-async def test_5414(async_cursor):
-    "5414 - test executing a PL/SQL statement with duplicate binds"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    simple_var.setvalue(0, 5)
-    result = await async_cursor.execute(
-        """
-        begin
-            :value := :value + 5;
-        end;
-        """,
-        value=simple_var,
-    )
-    assert result is None
-    assert simple_var.getvalue() == 10
-
-
-async def test_5415(async_cursor):
-    "5415 - test executing a PL/SQL statement with duplicate binds"
-    simple_var = async_cursor.var(oracledb.NUMBER)
-    simple_var.setvalue(0, 5)
-    await async_cursor.execute(
-        "begin :value := :value + 5; end;", [simple_var]
-    )
-    assert simple_var.getvalue() == 10
-
-
-async def test_5416(async_cursor, test_env):
-    "5416 - test executing a statement with an incorrect number of binds"
-    statement = "begin :value := :value2 + 5; end;"
-    var = async_cursor.var(oracledb.NUMBER)
-    var.setvalue(0, 5)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        await async_cursor.execute(statement)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        await async_cursor.execute(statement, value=var)
-    with test_env.assert_raises_full_code("DPY-4008", "ORA-01036"):
-        await async_cursor.execute(
-            statement, value=var, value2=var, value3=var
-        )
-
-
-async def test_5417(async_conn, async_cursor):
-    "5417 - change in size on subsequent binds does not use optimised path"
-    await async_cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test String #1"), (2, "ABC" * 100)]
-    for row in data:
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            row,
-        )
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await async_cursor.fetchall() == data
-
-
-async def test_5418(async_conn, async_cursor):
-    "5418 - test that dml can use optimised path"
-    data_to_insert = [(i + 1, f"Test String #{i + 1}") for i in range(3)]
-    await async_cursor.execute("truncate table TestTempTable")
-    for row in data_to_insert:
-        with async_conn.cursor() as cursor:
-            await cursor.execute(
-                """
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:1, :2)
-                """,
-                row,
-            )
-    await async_conn.commit()
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert await async_cursor.fetchall() == data_to_insert
-
-
-async def test_5419(async_cursor, test_env):
-    "5419 - test calling execute() with invalid parameters"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    with test_env.assert_raises_full_code("DPY-2003"):
-        await async_cursor.execute(sql, "These are not valid parameters")
-
-
-async def test_5420(async_cursor, test_env):
-    "5420 - test calling execute() with mixed binds"
-    await async_cursor.execute("truncate table TestTempTable")
-    async_cursor.setinputsizes(None, None, str)
-    data = dict(val1=1, val2="Test String 1")
-    with test_env.assert_raises_full_code("DPY-2006"):
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            returning StringCol1 into :out_var
-            """,
-            data,
-        )
-
-
-async def test_5421(async_cursor):
-    "5421 - test binding by name with double quotes"
-    data = {'"_value1"': 1, '"VaLue_2"': 2, '"3VALUE"': 3}
-    await async_cursor.execute(
-        'select :"_value1" + :"VaLue_2" + :"3VALUE" from dual',
-        data,
-    )
-    (result,) = await async_cursor.fetchone()
-    assert result == 6
-
-
-async def test_5422(async_cursor):
-    "5422 - test executing a statement with different input buffer sizes"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1, StringCol2)
-            values (:int_col, :str_val1, :str_val2) returning IntCol
-            into :ret_data"""
-    values1 = {"int_col": 1, "str_val1": '{"a", "b"}', "str_val2": None}
-    values2 = {"int_col": 2, "str_val1": None, "str_val2": '{"a", "b"}'}
-    values3 = {"int_col": 3, "str_val1": '{"a"}', "str_val2": None}
-
-    await async_cursor.execute("truncate table TestTempTable")
-    ret_bind = async_cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    async_cursor.setinputsizes(ret_data=ret_bind)
-    await async_cursor.execute(sql, values1)
-    assert ret_bind.values == [["1"]]
-
-    ret_bind = async_cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    async_cursor.setinputsizes(ret_data=ret_bind)
-    await async_cursor.execute(sql, values2)
-    assert ret_bind.values == [["2"]]
-
-    ret_bind = async_cursor.var(oracledb.DB_TYPE_VARCHAR, arraysize=1)
-    async_cursor.setinputsizes(ret_data=ret_bind)
-    await async_cursor.execute(sql, values3)
-    assert ret_bind.values == [["3"]]
-
-
-async def test_5423(async_conn, async_cursor):
-    "5423 - test using rowfactory"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Test 1')
-        """
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in async_cursor.description]
-
-    def rowfactory(*row):
-        return dict(zip(column_names, row))
-
-    async_cursor.rowfactory = rowfactory
-    assert async_cursor.rowfactory == rowfactory
-    assert await async_cursor.fetchall() == [
-        {"INTCOL": 1, "STRINGCOL1": "Test 1"}
-    ]
-
-
-async def test_5424(async_conn, async_cursor):
-    "5424 - test executing same query after setting rowfactory"
-    await async_cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test 1"), (2, "Test 2")]
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in async_cursor.description]
-    async_cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-    results1 = await async_cursor.fetchall()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    results2 = await async_cursor.fetchall()
-    assert results1 == results2
-
-
-async def test_5425(async_conn, async_cursor):
-    "5425 - test executing different query after setting rowfactory"
-    await async_cursor.execute("truncate table TestTempTable")
-    data = [(1, "Test 1"), (2, "Test 2")]
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    column_names = [col[0] for col in async_cursor.description]
-    async_cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol
-        from TestSTrings
-        where IntCol between 1 and 3 order by IntCol
-        """
-    )
-    expected_data = [(1, "String 1"), (2, "String 2"), (3, "String 3")]
-    assert await async_cursor.fetchall() == expected_data
-
-
-async def test_5426(async_conn):
-    "5426 - test setting rowfactory on a REF cursor"
-    with async_conn.cursor() as cursor:
-        sql_function = "pkg_TestRefCursors.TestReturnCursor"
-        ref_cursor = await cursor.callfunc(
-            sql_function, oracledb.DB_TYPE_CURSOR, [2]
-        )
-        column_names = [col[0] for col in ref_cursor.description]
-        ref_cursor.rowfactory = lambda *row: dict(zip(column_names, row))
-        expected_value = [
-            {"INTCOL": 1, "STRINGCOL": "String 1"},
-            {"INTCOL": 2, "STRINGCOL": "String 2"},
-        ]
-        assert await ref_cursor.fetchall() == expected_value
-
-
-async def test_5427(async_cursor):
-    "5427 - test using a subclassed string as bind parameter keys"
-
-    class my_str(str):
-        pass
-
-    await async_cursor.execute("truncate table TestTempTable")
-    keys = {my_str("str_val"): oracledb.DB_TYPE_VARCHAR}
-    async_cursor.setinputsizes(**keys)
-    values = {
-        my_str("int_val"): 5427,
-        my_str("str_val"): "5427 - String Value",
-    }
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        """,
-        values,
-    )
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await async_cursor.fetchall() == [(5427, "5427 - String Value")]
-
-
-async def test_5428(async_cursor):
-    "5428 - test using a sequence of parameters other than a list or tuple"
-
-    class MySeq(collections.abc.Sequence):
-        def __init__(self, *data):
-            self.data = data
-
-        def __len__(self):
-            return len(self.data)
-
-        def __getitem__(self, index):
-            return self.data[index]
-
-    values_to_insert = [MySeq(1, "String 1"), MySeq(2, "String 2")]
-    expected_data = [tuple(value) for value in values_to_insert]
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        """,
-        values_to_insert,
-    )
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert await async_cursor.fetchall() == expected_data
-
-
-async def test_5429(async_cursor):
-    "5429 - test an output type handler with prefetch > arraysize"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(metadata.type_code, arraysize=cursor.arraysize)
-
-    async_cursor.arraysize = 2
-    async_cursor.prefetchrows = 3
-    async_cursor.outputtypehandler = type_handler
-    await async_cursor.execute("select level from dual connect by level <= 5")
-    assert await async_cursor.fetchall() == [(1,), (2,), (3,), (4,), (5,)]
-
-
-async def test_5430(async_cursor, test_env):
-    "5430 - test setinputsizes() but without binding"
-    async_cursor.setinputsizes(None, int)
-    sql = "select :1, : 2 from dual"
-
-    with test_env.assert_raises_full_code("ORA-01008", "DPY-4010"):
-        await async_cursor.execute(sql, [])
-
-
-async def test_5431(async_conn, async_cursor, test_env):
-    "5431 - test getting FetchInfo attributes"
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    varchar_ratio, _ = test_env.charset_ratios
-    test_values = [
-        (
-            "select IntCol from TestObjects",
-            10,
-            None,
-            False,
-            "INTCOL",
-            False,
-            9,
-            0,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_NUMBER,
-        ),
-        (
-            "select ObjectCol from TestObjects",
-            None,
-            None,
-            False,
-            "OBJECTCOL",
-            True,
-            None,
-            None,
-            type_obj,
-            oracledb.DB_TYPE_OBJECT,
-        ),
-        (
-            "select JsonVarchar from TestJsonCols",
-            4000,
-            4000 * varchar_ratio,
-            True,
-            "JSONVARCHAR",
-            False,
-            None,
-            None,
-            oracledb.DB_TYPE_VARCHAR,
-            oracledb.DB_TYPE_VARCHAR,
-        ),
-        (
-            "select FLOATCOL from TestNumbers",
-            127,
-            None,
-            False,
-            "FLOATCOL",
-            False,
-            126,
-            -127,
-            oracledb.DB_TYPE_NUMBER,
-            oracledb.DB_TYPE_NUMBER,
-        ),
-    ]
-    for (
-        sql,
-        display_size,
-        internal_size,
-        is_json,
-        name,
-        null_ok,
-        precision,
-        scale,
-        typ,
-        type_code,
-    ) in test_values:
-        await async_cursor.execute(sql)
-        (fetch_info,) = async_cursor.description
-        assert isinstance(fetch_info, oracledb.FetchInfo)
-        assert fetch_info.display_size == display_size
-        assert fetch_info.internal_size == internal_size
-        if test_env.has_server_version(18):
-            assert fetch_info.is_json == is_json
-        assert fetch_info.name == name
-        assert fetch_info.null_ok == null_ok
-        assert fetch_info.precision == precision
-        assert fetch_info.scale == scale
-        assert fetch_info.type == typ
-        assert fetch_info.type_code == type_code
-
-
-async def test_5432(async_cursor):
-    "5432 - test FetchInfo repr() and str()"
-    await async_cursor.execute("select IntCol from TestObjects")
-    (fetch_info,) = async_cursor.description
-    expected = "('INTCOL', <DbType DB_TYPE_NUMBER>, 10, None, 9, 0, False)"
-    assert str(fetch_info) == expected
-    assert repr(fetch_info) == expected
-
-
-async def test_5433(async_cursor):
-    "5433 - test slicing FetchInfo"
-    await async_cursor.execute("select IntCol from TestObjects")
-    (fetch_info,) = async_cursor.description
-    assert fetch_info[1:3] == (oracledb.DB_TYPE_NUMBER, 10)
-
-
-async def test_5434(async_conn, test_env):
-    "5434 - test async context manager"
-    expected_value = test_env.main_user.upper()
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select user from dual")
-        assert await cursor.fetchone() == (expected_value,)
-    async with async_conn.cursor() as cursor:
-        await cursor.execute("select user from dual")
-        assert await cursor.fetchone() == (expected_value,)
-
-
-async def test_5435(async_cursor):
-    "5435 - test metadata requiring multiple packets"
-    values = [f"Test value 5435 - {i}" for i in range(1, 301)]
-    columns = ", ".join(f"'{v}'" for v in values)
-    query = f"select {columns} from dual"
-    await async_cursor.execute(query)
-    row = await async_cursor.fetchone()
-    assert row == tuple(values)
-
-
-async def test_5436(async_cursor, test_env):
-    "5436 - test raising no_data_found in PL/SQL"
-    with test_env.assert_raises_full_code("ORA-01403"):
-        await async_cursor.execute("begin raise no_data_found; end;")
-
-
-async def test_5437(async_cursor, test_env):
-    "5437 - test executing an empty statement"
-    with test_env.assert_raises_full_code("DPY-2066"):
-        await async_cursor.execute("")
-    with test_env.assert_raises_full_code("DPY-2066"):
-        await async_cursor.execute("  ")
diff --git a/tests/test_5500_pool_async.py b/tests/test_5500_pool_async.py
deleted file mode 100644
index bc8b2a93..00000000
--- a/tests/test_5500_pool_async.py
+++ /dev/null
@@ -1,686 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5500 - Module for testing pools with asyncio
-"""
-
-import asyncio
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def _connect_and_drop(pool):
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("select count(*) from TestNumbers")
-        (count,) = await cursor.fetchone()
-        assert count == 10
-
-
-async def _connect_and_generate_error(test_env, pool):
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        with test_env.assert_raises_full_code("ORA-01476"):
-            await cursor.execute("select 1 / 0 from dual")
-
-
-async def _verify_connection(
-    connection, expected_user, expected_proxy_user=None
-):
-    cursor = connection.cursor()
-    await cursor.execute(
-        """
-        select
-            sys_context('userenv', 'session_user'),
-            sys_context('userenv', 'proxy_user')
-        from dual
-        """
-    )
-    actual_user, actual_proxy_user = await cursor.fetchone()
-    assert actual_user == expected_user.upper()
-    if expected_proxy_user is not None:
-        expected_proxy_user = expected_proxy_user.upper()
-    assert actual_proxy_user == expected_proxy_user
-    await connection.close()
-
-
-async def _verify_create_arg(test_env, arg_name, arg_value, sql):
-    args = {}
-    args[arg_name] = arg_value
-    pool = test_env.get_pool_async(**args)
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(sql)
-        (fetched_value,) = await cursor.fetchone()
-        assert fetched_value == arg_value
-    await pool.close()
-
-
-async def test_5500(test_env):
-    "5500 - test getting default pool parameters"
-    pool = test_env.get_pool_async()
-    try:
-        assert pool.busy == 0
-        assert pool.dsn == test_env.connect_string
-        assert pool.getmode == oracledb.POOL_GETMODE_WAIT
-        assert pool.homogeneous
-        assert pool.increment == 1
-        assert pool.max == 2
-        assert pool.max_lifetime_session == 0
-        assert pool.min == 1
-        assert pool.ping_interval == 60
-        assert pool.stmtcachesize == oracledb.defaults.stmtcachesize
-        assert pool.thin
-        assert pool.timeout == 0
-        assert pool.username == test_env.main_user
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5501(test_env):
-    "5501 - test setting pool attributes"
-    pool = test_env.get_pool_async()
-    test_values = [
-        ((11, 2), "ping_interval", 30),
-        ((11, 2), "stmtcachesize", 100),
-        ((11, 2), "timeout", 10),
-        ((12, 2), "getmode", oracledb.POOL_GETMODE_TIMEDWAIT),
-        ((12, 1), "max_lifetime_session", 3),
-    ]
-    try:
-        for version, attr_name, value in test_values:
-            setattr(pool, attr_name, value)
-            assert getattr(pool, attr_name) == value
-            pytest.raises(TypeError, setattr, pool, attr_name, "invalid value")
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5502(test_env):
-    "5502 - connection rolls back before released back to the pool"
-    pool = test_env.get_pool_async()
-    conn = await pool.acquire()
-    cursor = conn.cursor()
-    await cursor.execute("truncate table TestTempTable")
-    await cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    cursor.close()
-    await pool.release(conn)
-    pool = test_env.get_pool_async()
-    conn = await pool.acquire()
-    cursor = conn.cursor()
-    await cursor.execute("select count(*) from TestTempTable")
-    (count,) = await cursor.fetchone()
-    assert count == 0
-    await conn.close()
-
-
-async def test_5503(test_env):
-    "5503 - test session pool with multiple coroutines"
-    pool = test_env.get_pool_async(min=5, max=20, increment=2)
-    try:
-        coroutines = [_connect_and_drop(pool) for i in range(20)]
-        await asyncio.gather(*coroutines)
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5504(test_env):
-    "5504 - test session pool with multiple coroutines (with errors)"
-    pool = test_env.get_pool_async(min=5, max=20, increment=2)
-    try:
-        coroutines = [
-            _connect_and_generate_error(test_env, pool) for i in range(20)
-        ]
-        await asyncio.gather(*coroutines)
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5505(skip_if_drcp, test_env):
-    "5505 - test session pool with various types of purity"
-    pool = test_env.get_pool_async(min=1, max=8, increment=1)
-
-    # get connection and set the action
-    action = "TEST_ACTION"
-    conn = await pool.acquire()
-    conn.action = action
-    cursor = conn.cursor()
-    await cursor.execute("select 1 from dual")
-    cursor.close()
-    await pool.release(conn)
-    assert pool.opened == 1, "opened (1)"
-
-    # verify that the connection still has the action set on it
-    conn = await pool.acquire()
-    cursor = conn.cursor()
-    await cursor.execute("select sys_context('userenv', 'action') from dual")
-    (result,) = await cursor.fetchone()
-    assert result == action
-    cursor.close()
-    await pool.release(conn)
-    assert pool.opened == 1, "opened (2)"
-
-    # get a new connection with new purity (should not have state)
-    conn = await pool.acquire(purity=oracledb.PURITY_NEW)
-    cursor = conn.cursor()
-    await cursor.execute("select sys_context('userenv', 'action') from dual")
-    (result,) = await cursor.fetchone()
-    assert result is None
-    cursor.close()
-    await pool.release(conn)
-
-
-async def test_5506(test_env):
-    "5506 - test dropping/closing a connection from the pool"
-    pool = test_env.get_pool_async(min=1, max=5, increment=2)
-    try:
-        conns1 = [await pool.acquire() for _ in range(2)]
-        conns2 = [await oracledb.connect_async(pool=pool) for _ in range(3)]
-        assert pool.busy == 5
-        assert pool.opened == 5
-
-        for conn in conns1:
-            await pool.drop(conn)
-        assert pool.busy == 3
-        assert pool.opened == 3
-
-        for conn in conns2:
-            await conn.close()
-        assert pool.busy == 0
-        assert pool.opened == 3
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5507(test_env):
-    "5507 - test to ensure pure connections are being created correctly"
-    pool = test_env.get_pool_async(min=1, max=2, increment=1)
-    try:
-        conn1 = await pool.acquire()
-        conn2 = await pool.acquire()
-        assert pool.opened == 2, "opened (1)"
-        await pool.release(conn1)
-        await pool.release(conn2)
-        conn3 = await pool.acquire(purity=oracledb.PURITY_NEW)
-        assert pool.opened == 2, "opened (2)"
-        await pool.release(conn3)
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5508(test_env):
-    "5508 - test closing a pool normally with no connections checked out"
-    pool = test_env.get_pool_async(min=1, max=8, increment=1)
-    await pool.close()
-
-
-async def test_5509(test_env):
-    "5509 - test closing a pool normally with connections checked out"
-    pool = test_env.get_pool_async(min=1, max=8, increment=1)
-    closed = False
-    try:
-        async with pool.acquire():
-            with test_env.assert_raises_full_code("DPY-1005"):
-                await pool.close()
-                closed = True
-    finally:
-        if not closed:
-            await pool.close(force=True)
-
-
-async def test_5510(test_env):
-    "5510 - test closing a pool forcibly"
-    pool = test_env.get_pool_async(min=1, max=8, increment=1)
-    async with pool.acquire():
-        await pool.close(force=True)
-
-
-async def test_5511(test_env):
-    "5511 - using the pool after it is closed raises an exception"
-    pool = test_env.get_pool_async(min=1, max=8, increment=1)
-    await pool.close()
-    with test_env.assert_raises_full_code("DPY-1002"):
-        await pool.acquire()
-
-
-async def test_5512(test_env):
-    "5512 - using the pool beyond max limit raises an error"
-    pool = test_env.get_pool_async(min=1, max=2, increment=1)
-    try:
-        async with pool.acquire(), pool.acquire():
-            pool.getmode = oracledb.POOL_GETMODE_NOWAIT
-            with test_env.assert_raises_full_code("DPY-4005"):
-                await pool.acquire()
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5513(test_env):
-    "5513 - callable session callback is executed for new connections"
-
-    class Counter:
-        num_calls = 0
-
-        @classmethod
-        async def session_callback(cls, conn, requested_tag):
-            cls.num_calls += 1
-
-    pool = test_env.get_pool_async(
-        min=1,
-        max=2,
-        increment=1,
-        session_callback=Counter.session_callback,
-    )
-    try:
-        async with pool.acquire(), pool.acquire():
-            pass
-        async with pool.acquire(), pool.acquire():
-            pass
-        assert Counter.num_calls == 2
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5514(skip_if_drcp, test_env):
-    "5514 - drop the pooled connection on receiving dead connection error"
-    admin_conn = await test_env.get_admin_connection_async()
-    pool = test_env.get_pool_async(min=2, max=2, increment=2)
-    try:
-
-        # acquire connections from the pool and kill all the sessions
-        with admin_conn.cursor() as admin_cursor:
-            for conn in [await pool.acquire() for i in range(2)]:
-                sid, serial = conn.session_id, conn.serial_num
-                sql = f"alter system kill session '{sid},{serial}'"
-                await admin_cursor.execute(sql)
-                await conn.close()
-        assert pool.opened == 2
-
-        # when try to re-use the killed sessions error will be raised;
-        # release all such connections
-        for conn in [await pool.acquire() for i in range(2)]:
-            with conn.cursor() as cursor:
-                with test_env.assert_raises_full_code("DPY-4011"):
-                    await cursor.execute("select user from dual")
-            await conn.close()
-
-        # if a free connection is available, it can be used; otherwise a
-        # new connection will be created
-        for conn in [await pool.acquire() for i in range(2)]:
-            with conn.cursor() as cursor:
-                await cursor.execute("select user from dual")
-                (user,) = await cursor.fetchone()
-                assert user == test_env.main_user.upper()
-            await conn.close()
-        assert pool.opened == 2
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5515(test_env):
-    "5515 - acquire a connection from an empty pool (min=0)"
-    pool = test_env.get_pool_async(min=0, max=2, increment=2)
-    try:
-        async with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                await cursor.execute("select user from dual")
-                (result,) = await cursor.fetchone()
-                assert result == test_env.main_user.upper()
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5516(test_env):
-    "5516 - get different object types from different connections"
-    pool = test_env.get_pool_async(min=1, max=2, increment=1)
-    try:
-        async with pool.acquire() as conn:
-            typ = await conn.gettype("UDT_SUBOBJECT")
-            assert typ.name == "UDT_SUBOBJECT"
-        async with pool.acquire() as conn:
-            typ = await conn.gettype("UDT_OBJECTARRAY")
-            assert typ.name == "UDT_OBJECTARRAY"
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5517(test_env):
-    "5517 - test creating a pool using a proxy user"
-    user_str = f"{test_env.main_user}[{test_env.proxy_user}]"
-    pool = test_env.get_pool_async(user=user_str)
-    try:
-        await _verify_connection(
-            await pool.acquire(),
-            test_env.proxy_user,
-            test_env.main_user,
-        )
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5518(skip_if_drcp, test_env):
-    "5518 - test acquiring conn from pool in LIFO order"
-    pool = test_env.get_pool_async(min=5, max=10, increment=1)
-    try:
-        sql = "select sys_context('userenv', 'sid') from dual"
-        conns = [await pool.acquire() for i in range(3)]
-        sids = []
-        for conn in conns:
-            with conn.cursor() as cursor:
-                await cursor.execute(sql)
-                (sid,) = await cursor.fetchone()
-                sids.append(sid)
-        await conns[1].close()
-        await conns[2].close()
-        await conns[0].close()
-
-        async with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                await cursor.execute(sql)
-                (sid,) = await cursor.fetchone()
-                assert sid == sids[0], "not LIFO"
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5519(test_env):
-    "5519 - verify that dynamic pool cannot have an increment of zero"
-    pool = test_env.get_pool_async(min=1, max=3, increment=0)
-    try:
-        assert pool.increment == 1
-        async with pool.acquire(), pool.acquire():
-            pass
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5520(test_env):
-    "5520 - verify that static pool can have an increment of zero"
-    pool = test_env.get_pool_async(min=1, max=1, increment=0)
-    try:
-        assert pool.increment == 0
-        async with pool.acquire():
-            pass
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5521(test_env):
-    "5521 - verify that connection with different cclass is reused"
-    cclass = "cclass2431"
-    pool = test_env.get_pool_async(min=1, max=1)
-    # ignore the first acquire which, depending on the speed with which the
-    # minimum connections are created, may create a connection that is
-    # discarded; instead, use the second acquire which should remain in the
-    # pool
-    try:
-        async with pool.acquire(cclass=cclass) as conn:
-            pass
-        async with pool.acquire(cclass=cclass) as conn:
-            sid_serial = (conn.session_id, conn.serial_num)
-        async with pool.acquire(cclass=cclass) as conn:
-            next_sid_serial = (conn.session_id, conn.serial_num)
-            assert next_sid_serial == sid_serial
-        assert pool.opened == 1
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5522(test_env):
-    "5522 - test creating a pool invalid params"
-    with test_env.assert_raises_full_code("DPY-2027"):
-        oracledb.create_pool_async(params="bad params")
-
-
-async def test_5523(test_env):
-    "5523 - test releasing and dropping an invalid connection"
-    pool = test_env.get_pool_async()
-    try:
-        with pytest.raises(TypeError):
-            await pool.release("invalid connection")
-        with pytest.raises(TypeError):
-            await pool.drop("invalid connection")
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5524(test_env):
-    "5524 - test creating a pool with invalid pool_class"
-    with test_env.assert_raises_full_code("DPY-2026"):
-        oracledb.create_pool_async(pool_class=int)
-
-
-async def test_5525(test_env):
-    "5525 - test creating a pool with a subclassed connection type"
-
-    class MyConnection(oracledb.AsyncConnection):
-        pass
-
-    pool = test_env.get_pool_async(connectiontype=MyConnection)
-    async with pool.acquire() as conn:
-        assert isinstance(conn, MyConnection)
-
-
-async def test_5526(test_env):
-    "5526 - test creating a pool with a subclassed pool type"
-
-    class MyPool(oracledb.AsyncConnectionPool):
-        pass
-
-    pool = test_env.get_pool_async(pool_class=MyPool)
-    try:
-        assert isinstance(pool, MyPool)
-    finally:
-        await pool.close(force=True)
-
-
-async def test_5527(test_env):
-    "5527 - test connectiontype with an invalid connection class"
-    with test_env.assert_raises_full_code("DPY-2023"):
-        test_env.get_pool_async(connectiontype=oracledb.Connection)
-    with test_env.assert_raises_full_code("DPY-2023"):
-        test_env.get_pool_async(connectiontype=int)
-
-
-async def test_5528(skip_unless_pool_timed_wait_supported, test_env):
-    "5528 - ensure that timed wait times out with appropriate exception"
-    pool = test_env.get_pool_async(
-        getmode=oracledb.POOL_GETMODE_TIMEDWAIT, min=0, wait_timeout=1
-    )
-    with test_env.assert_raises_full_code("DPY-4005"):
-        await pool.acquire()
-
-
-async def test_5529(test_env):
-    "5529 - ensure call timeout is reset on connections returned by pool"
-    pool = test_env.get_pool_async(ping_timeout=1000, ping_interval=0)
-    async with pool.acquire() as conn:
-        assert conn.call_timeout == 0
-    async with pool.acquire() as conn:
-        assert conn.call_timeout == 0
-
-
-async def test_5530(test_env):
-    "5530 - test passing program when creating a pool"
-    sql = (
-        "select program from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_create_arg(test_env, "program", "newprogram", sql)
-
-
-async def test_5531(test_env):
-    "5531 - test passing machine when creating a pool"
-    sql = (
-        "select machine from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_create_arg(test_env, "machine", "newmachine", sql)
-
-
-async def test_5532(test_env):
-    "5532 - test passing terminal when creating a pool"
-    sql = (
-        "select terminal from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_create_arg(test_env, "terminal", "newterminal", sql)
-
-
-async def test_5533(test_env):
-    "5533 - test passing osuser when creating a pool"
-    sql = (
-        "select osuser from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_create_arg(test_env, "osuser", "newosuser", sql)
-
-
-async def test_5534(test_env):
-    "5534 - test passing driver_name when creating a pool"
-    sql = (
-        "select distinct client_driver from v$session_connect_info "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    await _verify_create_arg(test_env, "driver_name", "newdriver", sql)
-
-
-async def test_5535(test_env):
-    "5535 - test register_parameter with pooled connection"
-    sdu = 4096
-    params = test_env.get_pool_params()
-    protocol = "proto-test"
-    orig_connect_string = test_env.connect_string
-    connect_string = f"{protocol}://{orig_connect_string}"
-
-    def hook(passed_protocol, passed_protocol_arg, passed_params):
-        assert passed_protocol == protocol
-        assert passed_protocol_arg == orig_connect_string
-        passed_params.parse_connect_string(passed_protocol_arg)
-        passed_params.set(sdu=sdu)
-
-    try:
-        oracledb.register_protocol(protocol, hook)
-        pool = oracledb.create_pool_async(dsn=connect_string, params=params)
-        assert params.sdu == sdu
-        async with pool.acquire():
-            pass
-        await pool.close()
-    finally:
-        oracledb.register_protocol(protocol, None)
-
-
-async def test_5536(test_env):
-    "5536 - test create_pool() with edition"
-    edition = test_env.edition_name
-    pool = test_env.get_pool_async(edition=edition)
-    async with pool.acquire() as conn:
-        assert conn.edition == edition
-    await pool.close()
-
-
-async def test_5537(test_env):
-    "5537 - test create_pool() and get_pool() with alias"
-    alias = "pool_alias_5537"
-    pool = test_env.get_pool_async(pool_alias=alias)
-    assert pool is oracledb.get_pool(alias)
-    await pool.close()
-
-
-async def test_5538(test_env):
-    "5538 - test create_pool() twice with the same alias"
-    alias = "pool_alias_5538"
-    pool = test_env.get_pool_async(pool_alias=alias)
-    with test_env.assert_raises_full_code("DPY-2055"):
-        test_env.get_pool_async(pool_alias=alias)
-    await pool.close()
-    assert oracledb.get_pool(alias) is None
-
-
-async def test_5539(test_env):
-    "5539 - test acquire() with pool alias and stmtcachesize"
-    alias = "pool_5539"
-    stmtcachesize = 35
-    test_env.get_pool_async(pool_alias=alias, stmtcachesize=stmtcachesize)
-    async with oracledb.connect_async(pool_alias=alias) as conn:
-        assert conn.stmtcachesize == stmtcachesize
-    await oracledb.get_pool(alias).close()
-
-
-async def test_5540(test_env):
-    "5540 - test pool alias is case sensitive"
-    alias = "pool_5540"
-    test_env.get_pool_async(pool_alias=alias)
-    assert oracledb.get_pool(alias.upper()) is None
-    with test_env.assert_raises_full_code("DPY-2054"):
-        await test_env.get_connection_async(pool_alias=alias.upper())
-    await oracledb.get_pool(alias).close()
-
-
-async def test_5541(test_env):
-    "5541 - test pool alias with invalid types"
-    aliases = [5, set(), dict(), bytearray(1)]
-    for alias in aliases:
-        with pytest.raises(TypeError):
-            test_env.get_pool_async(pool_alias=alias)
-
-
-async def test_5542(test_env):
-    "5542 - test creation of pool with min > max"
-    with test_env.assert_raises_full_code("DPY-2064"):
-        test_env.get_pool_async(min=3, max=2)
-
-
-async def test_5543(skip_if_drcp, test_env):
-    "5543 - ping pooled connection on receiving dead connection error"
-    admin_conn = await test_env.get_admin_connection_async()
-    pool = test_env.get_pool_async(min=1, max=1, ping_interval=0)
-
-    # kill connection in pool
-    with admin_conn.cursor() as admin_cursor:
-        async with pool.acquire() as conn:
-            sid, serial = (conn.session_id, conn.serial_num)
-            sql = f"alter system kill session '{sid},{serial}'"
-            await admin_cursor.execute(sql)
-
-    # acquire connection which should succeed without failure
-    async with pool.acquire() as conn:
-        with conn.cursor() as cursor:
-            await cursor.execute("select user from dual")
-            (user,) = await cursor.fetchone()
-            assert user == test_env.main_user.upper()
-
-
-async def test_5544(test_env):
-    "5544 - connection to database with bad password"
-    pool = test_env.get_pool_async(password=test_env.main_password + "X")
-    with test_env.assert_raises_full_code("ORA-01017"):
-        await pool.acquire()
diff --git a/tests/test_5600_dbobject_async.py b/tests/test_5600_dbobject_async.py
deleted file mode 100644
index 1745eb1f..00000000
--- a/tests/test_5600_dbobject_async.py
+++ /dev/null
@@ -1,669 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5600 - Module for testing object variables with asyncio
-"""
-
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def _test_data(
-    cursor,
-    test_env,
-    expected_int_value,
-    expected_obj_value,
-    expected_array_value,
-):
-    int_value, object_value, array_value = await cursor.fetchone()
-    if object_value is not None:
-        object_value = await test_env.get_db_object_as_plain_object_async(
-            object_value
-        )
-    if array_value is not None:
-        array_value = array_value.aslist()
-    assert int_value == expected_int_value
-    assert object_value == expected_obj_value
-    assert array_value == expected_array_value
-
-
-async def test_5600(async_conn, async_cursor):
-    "5600 - test binding an object (IN)"
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 13
-    obj.STRINGVALUE = "Test String"
-    result = await async_cursor.callfunc(
-        "pkg_TestBindObject.GetStringRep", str, [obj]
-    )
-    exp = "udt_Object(13, 'Test String', null, null, null, null, null)"
-    assert result == exp
-    obj.NUMBERVALUE = None
-    obj.STRINGVALUE = "Test With Dates"
-    obj.DATEVALUE = datetime.datetime(2016, 2, 10)
-    obj.TIMESTAMPVALUE = datetime.datetime(2016, 2, 10, 14, 13, 50)
-    result = await async_cursor.callfunc(
-        "pkg_TestBindObject.GetStringRep", str, [obj]
-    )
-    expected_value = (
-        "udt_Object(null, 'Test With Dates', null, "
-        "to_date('2016-02-10', 'YYYY-MM-DD'), "
-        "to_timestamp('2016-02-10 14:13:50', "
-        "'YYYY-MM-DD HH24:MI:SS'), "
-        "null, null)"
-    )
-    assert result == expected_value
-    obj.DATEVALUE = None
-    obj.TIMESTAMPVALUE = None
-    sub_type_obj = await async_conn.gettype("UDT_SUBOBJECT")
-    sub_obj = sub_type_obj.newobject()
-    sub_obj.SUBNUMBERVALUE = decimal.Decimal("18.25")
-    sub_obj.SUBSTRINGVALUE = "Sub String"
-    obj.SUBOBJECTVALUE = sub_obj
-    result = await async_cursor.callfunc(
-        "pkg_TestBindObject.GetStringRep", str, [obj]
-    )
-    expected_value = (
-        "udt_Object(null, 'Test With Dates', null, null, "
-        "null, udt_SubObject(18.25, 'Sub String'), null)"
-    )
-    assert result == expected_value
-
-
-async def test_5601(async_conn):
-    "5601 - test copying an object"
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    obj = type_obj()
-    obj.NUMBERVALUE = 5124
-    obj.STRINGVALUE = "A test string"
-    obj.DATEVALUE = datetime.datetime(2016, 2, 24)
-    obj.TIMESTAMPVALUE = datetime.datetime(2016, 2, 24, 13, 39, 10)
-    copied_obj = obj.copy()
-    assert obj.NUMBERVALUE == copied_obj.NUMBERVALUE
-    assert obj.STRINGVALUE == copied_obj.STRINGVALUE
-    assert obj.DATEVALUE == copied_obj.DATEVALUE
-    assert obj.TIMESTAMPVALUE == copied_obj.TIMESTAMPVALUE
-
-
-async def test_5602(async_cursor, test_env):
-    "5602 - test fetching objects"
-    await async_cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        order by IntCol
-        """
-    )
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "OBJECTCOL",
-            oracledb.DB_TYPE_OBJECT,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-        (
-            "ARRAYCOL",
-            oracledb.DB_TYPE_OBJECT,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert async_cursor.description == expected_value
-    expected_value = (
-        1,
-        "First row",
-        "First     ",
-        "N First Row",
-        "N First   ",
-        b"Raw Data 1",
-        2,
-        5,
-        12.125,
-        0.5,
-        12.5,
-        25.25,
-        50.125,
-        datetime.datetime(2007, 3, 6, 0, 0, 0),
-        datetime.datetime(2008, 9, 12, 16, 40),
-        datetime.datetime(2009, 10, 13, 17, 50),
-        oracledb.Timestamp(2010, 11, 14, 18, 55),
-        "Short CLOB value",
-        "Short NCLOB Value",
-        b"Short BLOB value",
-        (11, "Sub object 1"),
-        [(5, "first element"), (6, "second element")],
-    )
-    await _test_data(
-        async_cursor, test_env, 1, expected_value, [5, 10, None, 20]
-    )
-    await _test_data(async_cursor, test_env, 2, None, [3, None, 9, 12, 15])
-    expected_value = (
-        3,
-        "Third row",
-        "Third     ",
-        "N Third Row",
-        "N Third   ",
-        b"Raw Data 3",
-        4,
-        10,
-        6.5,
-        0.75,
-        43.25,
-        86.5,
-        192.125,
-        datetime.datetime(2007, 6, 21, 0, 0, 0),
-        datetime.datetime(2007, 12, 13, 7, 30, 45),
-        datetime.datetime(2017, 6, 21, 23, 18, 45),
-        oracledb.Timestamp(2017, 7, 21, 8, 27, 13),
-        "Another short CLOB value",
-        "Another short NCLOB Value",
-        b"Yet another short BLOB value",
-        (13, "Sub object 3"),
-        [
-            (10, "element #1"),
-            (20, "element #2"),
-            (30, "element #3"),
-            (40, "element #4"),
-        ],
-    )
-    await _test_data(async_cursor, test_env, 3, expected_value, None)
-
-
-async def test_5603(async_conn):
-    "5603 - test getting object type"
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    assert not type_obj.iscollection
-    assert type_obj.schema == async_conn.username.upper()
-    assert type_obj.name == "UDT_OBJECT"
-    sub_object_value_type = await async_conn.gettype("UDT_SUBOBJECT")
-    sub_object_array_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    expected_metadata = [
-        ("NUMBERVALUE", oracledb.DB_TYPE_NUMBER, 0, -127, None),
-        ("STRINGVALUE", oracledb.DB_TYPE_VARCHAR, None, None, 60),
-        ("FIXEDCHARVALUE", oracledb.DB_TYPE_CHAR, None, None, 10),
-        ("NSTRINGVALUE", oracledb.DB_TYPE_NVARCHAR, None, None, 120),
-        ("NFIXEDCHARVALUE", oracledb.DB_TYPE_NCHAR, None, None, 20),
-        ("RAWVALUE", oracledb.DB_TYPE_RAW, None, None, 16),
-        ("INTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("SMALLINTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("REALVALUE", oracledb.DB_TYPE_NUMBER, 63, -127, None),
-        ("DOUBLEPRECISIONVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        ("FLOATVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        (
-            "BINARYFLOATVALUE",
-            oracledb.DB_TYPE_BINARY_FLOAT,
-            None,
-            None,
-            None,
-        ),
-        (
-            "BINARYDOUBLEVALUE",
-            oracledb.DB_TYPE_BINARY_DOUBLE,
-            None,
-            None,
-            None,
-        ),
-        ("DATEVALUE", oracledb.DB_TYPE_DATE, None, None, None),
-        ("TIMESTAMPVALUE", oracledb.DB_TYPE_TIMESTAMP, None, None, None),
-        (
-            "TIMESTAMPTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            None,
-            None,
-            None,
-        ),
-        (
-            "TIMESTAMPLTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            None,
-            None,
-            None,
-        ),
-        ("CLOBVALUE", oracledb.DB_TYPE_CLOB, None, None, None),
-        ("NCLOBVALUE", oracledb.DB_TYPE_NCLOB, None, None, None),
-        ("BLOBVALUE", oracledb.DB_TYPE_BLOB, None, None, None),
-        ("SUBOBJECTVALUE", sub_object_value_type, None, None, None),
-        ("SUBOBJECTARRAY", sub_object_array_type, None, None, None),
-    ]
-    actual_metadata = [
-        (attr.name, attr.type, attr.precision, attr.scale, attr.max_size)
-        for attr in type_obj.attributes
-    ]
-    assert actual_metadata == expected_metadata
-    assert sub_object_array_type.iscollection
-    assert sub_object_array_type.attributes == []
-
-
-async def test_5604(async_conn, async_cursor):
-    "5604 - test object type data"
-    await async_cursor.execute(
-        """
-        select ObjectCol
-        from TestObjects
-        where ObjectCol is not null
-          and rownum <= 1
-        """
-    )
-    (obj,) = await async_cursor.fetchone()
-    assert obj.type.schema == async_conn.username.upper()
-    assert obj.type.name == "UDT_OBJECT"
-    assert obj.type.attributes[0].name == "NUMBERVALUE"
-
-
-async def test_5605(async_conn, async_cursor, test_env):
-    "5605 - test inserting and then querying object with all data types"
-    await async_cursor.execute("delete from TestClobs")
-    await async_cursor.execute("delete from TestNClobs")
-    await async_cursor.execute("delete from TestBlobs")
-    await async_cursor.execute("delete from TestObjects where IntCol > 3")
-    await async_cursor.execute(
-        """
-        insert into TestClobs (IntCol, ClobCol)
-        values (1, 'A short CLOB')
-        """
-    )
-    await async_cursor.execute(
-        """
-        insert into TestNClobs (IntCol, NClobCol)
-        values (1, 'A short NCLOB')
-        """
-    )
-    await async_cursor.execute(
-        """
-        insert into TestBlobs (IntCol, BlobCol)
-        values (1, utl_raw.cast_to_raw('A short BLOB'))
-        """
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select CLOBCol from TestClobs")
-    (clob,) = await async_cursor.fetchone()
-    await async_cursor.execute("select NCLOBCol from TestNClobs")
-    (nclob,) = await async_cursor.fetchone()
-    await async_cursor.execute("select BLOBCol from TestBlobs")
-    (blob,) = await async_cursor.fetchone()
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    obj = type_obj.newobject()
-    obj.NUMBERVALUE = 5
-    obj.STRINGVALUE = "A string"
-    obj.FIXEDCHARVALUE = "Fixed str"
-    obj.NSTRINGVALUE = "A NCHAR string"
-    obj.NFIXEDCHARVALUE = "Fixed N"
-    obj.RAWVALUE = b"Raw Value"
-    obj.INTVALUE = 27
-    obj.SMALLINTVALUE = 13
-    obj.REALVALUE = 184.875
-    obj.DOUBLEPRECISIONVALUE = 1.375
-    obj.FLOATVALUE = 23.75
-    obj.DATEVALUE = datetime.date(2017, 5, 9)
-    obj.TIMESTAMPVALUE = datetime.datetime(2017, 5, 9, 9, 41, 13)
-    obj.TIMESTAMPTZVALUE = datetime.datetime(1986, 8, 2, 15, 27, 38)
-    obj.TIMESTAMPLTZVALUE = datetime.datetime(1999, 11, 12, 23, 5, 2)
-    obj.BINARYFLOATVALUE = 14.25
-    obj.BINARYDOUBLEVALUE = 29.1625
-    obj.CLOBVALUE = clob
-    obj.NCLOBVALUE = nclob
-    obj.BLOBVALUE = blob
-    sub_type_obj = await async_conn.gettype("UDT_SUBOBJECT")
-    sub_obj = sub_type_obj.newobject()
-    sub_obj.SUBNUMBERVALUE = 23
-    sub_obj.SUBSTRINGVALUE = "Substring value"
-    obj.SUBOBJECTVALUE = sub_obj
-    await async_cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (4, :obj)
-        """,
-        obj=obj,
-    )
-    await async_cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        where IntCol = 4
-        """
-    )
-    expected_value = (
-        5,
-        "A string",
-        "Fixed str ",
-        "A NCHAR string",
-        "Fixed N   ",
-        b"Raw Value",
-        27,
-        13,
-        184.875,
-        1.375,
-        23.75,
-        14.25,
-        29.1625,
-        datetime.datetime(2017, 5, 9, 0, 0, 0),
-        datetime.datetime(2017, 5, 9, 9, 41, 13),
-        datetime.datetime(1986, 8, 2, 15, 27, 38),
-        oracledb.Timestamp(1999, 11, 12, 23, 5, 2),
-        "A short CLOB",
-        "A short NCLOB",
-        b"A short BLOB",
-        (23, "Substring value"),
-        None,
-    )
-    await _test_data(async_cursor, test_env, 4, expected_value, None)
-
-    obj.CLOBVALUE = await async_conn.createlob(oracledb.DB_TYPE_CLOB)
-    obj.NCLOBVALUE = await async_conn.createlob(oracledb.DB_TYPE_NCLOB)
-    obj.BLOBVALUE = await async_conn.createlob(oracledb.DB_TYPE_BLOB)
-    await obj.CLOBVALUE.write("A short CLOB (modified)")
-    await obj.NCLOBVALUE.write("A short NCLOB (modified)")
-    await obj.BLOBVALUE.write(b"A short BLOB (modified)")
-    await async_cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (5, :obj)
-        """,
-        obj=obj,
-    )
-    await async_cursor.execute(
-        """
-        select IntCol, ObjectCol, ArrayCol
-        from TestObjects
-        where IntCol = 5
-        """
-    )
-    expected_value = (
-        5,
-        "A string",
-        "Fixed str ",
-        "A NCHAR string",
-        "Fixed N   ",
-        b"Raw Value",
-        27,
-        13,
-        184.875,
-        1.375,
-        23.75,
-        14.25,
-        29.1625,
-        datetime.datetime(2017, 5, 9, 0, 0, 0),
-        datetime.datetime(2017, 5, 9, 9, 41, 13),
-        datetime.datetime(1986, 8, 2, 15, 27, 38),
-        oracledb.Timestamp(1999, 11, 12, 23, 5, 2),
-        "A short CLOB (modified)",
-        "A short NCLOB (modified)",
-        b"A short BLOB (modified)",
-        (23, "Substring value"),
-        None,
-    )
-    await _test_data(async_cursor, test_env, 5, expected_value, None)
-    await async_conn.rollback()
-
-
-async def test_5606(async_conn, test_env):
-    "5606 - test trying to find an object type that does not exist"
-    with pytest.raises(TypeError):
-        await async_conn.gettype(2)
-    with test_env.assert_raises_full_code("DPY-2035"):
-        await async_conn.gettype("A TYPE THAT DOES NOT EXIST")
-
-
-async def test_5607(async_conn, test_env):
-    "5607 - test appending an object of the wrong type to a collection"
-    collection_obj_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    collection_obj = collection_obj_type.newobject()
-    array_obj_type = await async_conn.gettype("UDT_ARRAY")
-    array_obj = array_obj_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2008"):
-        collection_obj.append(array_obj)
-
-
-async def test_5608(async_conn):
-    "5608 - test that referencing a sub object affects the parent object"
-    obj_type = await async_conn.gettype("UDT_OBJECT")
-    sub_obj_type = await async_conn.gettype("UDT_SUBOBJECT")
-    obj = obj_type.newobject()
-    obj.SUBOBJECTVALUE = sub_obj_type.newobject()
-    obj.SUBOBJECTVALUE.SUBNUMBERVALUE = 5
-    obj.SUBOBJECTVALUE.SUBSTRINGVALUE = "Substring"
-    assert obj.SUBOBJECTVALUE.SUBNUMBERVALUE == 5
-    assert obj.SUBOBJECTVALUE.SUBSTRINGVALUE == "Substring"
-
-
-async def test_5609(async_conn, test_env):
-    "5609 - test accessing sub object after parent object destroyed"
-    obj_type = await async_conn.gettype("UDT_OBJECT")
-    sub_obj_type = await async_conn.gettype("UDT_SUBOBJECT")
-    array_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    sub_obj1 = sub_obj_type.newobject()
-    sub_obj1.SUBNUMBERVALUE = 2
-    sub_obj1.SUBSTRINGVALUE = "AB"
-    sub_obj2 = sub_obj_type.newobject()
-    sub_obj2.SUBNUMBERVALUE = 3
-    sub_obj2.SUBSTRINGVALUE = "CDE"
-    obj = obj_type.newobject()
-    obj.SUBOBJECTARRAY = array_type.newobject([sub_obj1, sub_obj2])
-    sub_obj_array = obj.SUBOBJECTARRAY
-    del obj
-    val = await test_env.get_db_object_as_plain_object_async(sub_obj_array)
-    assert val == [(2, "AB"), (3, "CDE")]
-
-
-async def test_5610(async_conn, test_env):
-    "5610 - test assigning an object of wrong type to an object attribute"
-    obj_type = await async_conn.gettype("UDT_OBJECT")
-    obj = obj_type.newobject()
-    wrong_obj_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    wrong_obj = wrong_obj_type.newobject()
-    with test_env.assert_raises_full_code("DPY-2008"):
-        setattr(obj, "SUBOBJECTVALUE", wrong_obj)
-
-
-async def test_5611(async_conn, async_cursor, test_env):
-    "5611 - test setting value of object variable to wrong object type"
-    obj_type = await async_conn.gettype("UDT_OBJECT")
-    wrong_obj_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    wrong_obj = wrong_obj_type.newobject()
-    var = async_cursor.var(obj_type)
-    with test_env.assert_raises_full_code("DPY-2008"):
-        var.setvalue(0, wrong_obj)
-
-
-async def test_5612(async_conn, test_env):
-    "5612 - test trimming a number of elements from a collection"
-    sub_obj_type = await async_conn.gettype("UDT_SUBOBJECT")
-    array_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    data = [(1, "AB"), (2, "CDE"), (3, "FGH"), (4, "IJK"), (5, "LMN")]
-    array_obj = array_type()
-    for num_val, str_val in data:
-        subObj = sub_obj_type()
-        subObj.SUBNUMBERVALUE = num_val
-        subObj.SUBSTRINGVALUE = str_val
-        array_obj.append(subObj)
-    assert (
-        await test_env.get_db_object_as_plain_object_async(array_obj) == data
-    )
-    array_obj.trim(2)
-    assert (
-        await test_env.get_db_object_as_plain_object_async(array_obj)
-        == data[:3]
-    )
-    array_obj.trim(1)
-    assert (
-        await test_env.get_db_object_as_plain_object_async(array_obj)
-        == data[:2]
-    )
-    array_obj.trim(0)
-    assert (
-        await test_env.get_db_object_as_plain_object_async(array_obj)
-        == data[:2]
-    )
-    array_obj.trim(2)
-    assert await test_env.get_db_object_as_plain_object_async(array_obj) == []
-
-
-async def test_5613(async_conn, test_env):
-    "5613 - test the metadata of a SQL type"
-    user = test_env.main_user.upper()
-    typ = await async_conn.gettype("UDT_OBJECTARRAY")
-    assert typ.schema == user
-    assert typ.name == "UDT_OBJECTARRAY"
-    assert typ.package_name is None
-    assert typ.element_type.schema == user
-    assert typ.element_type.name == "UDT_SUBOBJECT"
-    assert typ.element_type.package_name is None
-
-
-async def test_5614(async_conn, test_env):
-    "5614 - test the metadata of a PL/SQL type"
-    typ = await async_conn.gettype("PKG_TESTSTRINGARRAYS.UDT_STRINGLIST")
-    assert typ.schema == test_env.main_user.upper()
-    assert typ.name == "UDT_STRINGLIST"
-    assert typ.package_name == "PKG_TESTSTRINGARRAYS"
-    assert typ.element_type == oracledb.DB_TYPE_VARCHAR
-
-
-async def test_5615(async_conn, async_cursor):
-    "5615 - test collection with thousands of entries"
-    typ = await async_conn.gettype("PKG_TESTNUMBERARRAYS.UDT_NUMBERLIST")
-    obj = typ.newobject()
-    obj.setelement(1, 1)
-    running_total = 1
-    for i in range(1, 35000):
-        running_total += i + 1
-        obj.append(running_total)
-    result = await async_cursor.callfunc(
-        "pkg_TestNumberArrays.TestInArrays", int, (2327, obj)
-    )
-    assert result == 7146445847327
-
-
-async def test_5616(async_conn):
-    "5616 - test %ROWTYPE with all types"
-    sub_obj_type = await async_conn.gettype("UDT_SUBOBJECT")
-    sub_arr_type = await async_conn.gettype("UDT_OBJECTARRAY")
-    expected_metadata = [
-        ("NUMBERVALUE", oracledb.DB_TYPE_NUMBER, 0, -127, None),
-        ("STRINGVALUE", oracledb.DB_TYPE_VARCHAR, None, None, 60),
-        ("FIXEDCHARVALUE", oracledb.DB_TYPE_CHAR, None, None, 10),
-        ("NSTRINGVALUE", oracledb.DB_TYPE_NVARCHAR, None, None, 120),
-        ("NFIXEDCHARVALUE", oracledb.DB_TYPE_NCHAR, None, None, 20),
-        ("RAWVALUE", oracledb.DB_TYPE_RAW, None, None, 16),
-        ("INTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("SMALLINTVALUE", oracledb.DB_TYPE_NUMBER, 38, 0, None),
-        ("REALVALUE", oracledb.DB_TYPE_NUMBER, 63, -127, None),
-        ("DECIMALVALUE", oracledb.DB_TYPE_NUMBER, 20, 6, None),
-        ("DOUBLEPRECISIONVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        ("FLOATVALUE", oracledb.DB_TYPE_NUMBER, 126, -127, None),
-        (
-            "BINARYFLOATVALUE",
-            oracledb.DB_TYPE_BINARY_FLOAT,
-            None,
-            None,
-            None,
-        ),
-        (
-            "BINARYDOUBLEVALUE",
-            oracledb.DB_TYPE_BINARY_DOUBLE,
-            None,
-            None,
-            None,
-        ),
-        ("DATEVALUE", oracledb.DB_TYPE_DATE, None, None, None),
-        ("TIMESTAMPVALUE", oracledb.DB_TYPE_TIMESTAMP, None, None, None),
-        (
-            "TIMESTAMPTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_TZ,
-            None,
-            None,
-            None,
-        ),
-        (
-            "TIMESTAMPLTZVALUE",
-            oracledb.DB_TYPE_TIMESTAMP_LTZ,
-            None,
-            None,
-            None,
-        ),
-        ("CLOBVALUE", oracledb.DB_TYPE_CLOB, None, None, None),
-        ("NCLOBVALUE", oracledb.DB_TYPE_NCLOB, None, None, None),
-        ("BLOBVALUE", oracledb.DB_TYPE_BLOB, None, None, None),
-        ("SUBOBJECTVALUE", sub_obj_type, None, None, None),
-        ("SUBOBJECTARRAY", sub_arr_type, None, None, None),
-    ]
-    obj_type = await async_conn.gettype("TESTALLTYPES%ROWTYPE")
-    actual_metadata = [
-        (attr.name, attr.type, attr.precision, attr.scale, attr.max_size)
-        for attr in obj_type.attributes
-    ]
-    assert actual_metadata == expected_metadata
-
-
-async def test_5617(async_cursor):
-    "5617 - test collection iteration"
-    await async_cursor.execute("select udt_array(5, 10, 15) from dual")
-    (obj,) = await async_cursor.fetchone()
-    result = [i for i in obj]
-    assert result == [5, 10, 15]
-
-
-async def test_5618(test_env):
-    "5618 - test insufficient privileges for gettype()"
-    user = test_env.proxy_user
-    password = test_env.proxy_password
-    main_user = test_env.main_user.upper()
-    async with await test_env.get_connection_async(
-        user=user, password=password
-    ) as conn:
-        with test_env.assert_raises_full_code("DPY-2035"):
-            await conn.gettype(f"{main_user}.UDT_OBJECTARRAY")
-
-
-async def test_5619(async_conn, async_cursor):
-    "5619 - test nested records"
-    options = [(None, None), (1, None), (None, 2), (1, 2)]
-    typ = await async_conn.gettype("PKG_TESTNESTEDRECORDS.UDT_OUTER")
-    for option in options:
-        value1, value2 = option
-        obj = await async_cursor.callfunc(
-            "pkg_TestNestedRecords.GetOuter", typ, (value1, value2)
-        )
-        assert obj.INNER1 is not None
-        assert obj.INNER1.ATTR1 is None
-        assert obj.INNER1.ATTR2 == value1
-        assert obj.INNER2 is not None
-        assert obj.INNER2.ATTR1 is None
-        assert obj.INNER2.ATTR2 == value2
diff --git a/tests/test_5700_lob_var_async.py b/tests/test_5700_lob_var_async.py
deleted file mode 100644
index 0e385f98..00000000
--- a/tests/test_5700_lob_var_async.py
+++ /dev/null
@@ -1,534 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5700 - Module for testing LOB (CLOB and BLOB) variables with asyncio
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def _get_temp_lobs(conn, sid):
-    cursor = conn.cursor()
-    await cursor.execute(
-        """
-        select cache_lobs + nocache_lobs + abstract_lobs
-        from v$temporary_lobs
-        where sid = :sid
-        """,
-        sid=sid,
-    )
-    row = await cursor.fetchone()
-    if row is None:
-        return 0
-    return int(row[0])
-
-
-async def _perform_test(conn, lob_type, input_type, arraysize=None):
-    long_string = ""
-    cursor = conn.cursor()
-    if arraysize is not None:
-        cursor.arraysize = arraysize
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    await cursor.execute(f"delete from Test{lob_type}s")
-    for i in range(11):
-        if i > 0:
-            char = chr(ord("A") + i - 1)
-            long_string += char * 25000
-        elif input_type is not db_type:
-            continue
-        cursor.setinputsizes(long_string=input_type)
-        if lob_type == "BLOB":
-            bind_value = long_string.encode()
-        else:
-            bind_value = long_string
-        await cursor.execute(
-            f"""
-            insert into Test{lob_type}s (IntCol, {lob_type}Col)
-            values (:integer_value, :long_string)
-            """,
-            integer_value=i,
-            long_string=bind_value,
-        )
-    await conn.commit()
-    await cursor.execute(
-        f"""
-        select IntCol, {lob_type}Col
-        from Test{lob_type}s
-        order by IntCol
-        """
-    )
-    await _validate_query(await cursor.fetchall(), lob_type)
-
-
-async def _test_bind_ordering(conn, lob_type):
-    cursor = conn.cursor()
-    main_col = "A" * 32768
-    extra_col_1 = "B" * 65536
-    extra_col_2 = "C" * 131072
-    if lob_type == "BLOB":
-        main_col = main_col.encode()
-        extra_col_1 = extra_col_1.encode()
-        extra_col_2 = extra_col_2.encode()
-    conn.stmtcachesize = 0
-    await cursor.execute(f"delete from Test{lob_type}s")
-    await conn.commit()
-    data = (1, main_col, 8, extra_col_1, 15, extra_col_2)
-    await cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col,
-            ExtraNumCol1, Extra{lob_type}Col1, ExtraNumCol2,
-            Extra{lob_type}Col2)
-        values (:1, :2, :3, :4, :5, :6)
-        """,
-        data,
-    )
-    await cursor.execute(f"select * from Test{lob_type}s")
-    assert await cursor.fetchone() == data
-
-
-async def _test_fetch_lobs_direct(conn, lob_type):
-    cursor = conn.cursor()
-    await cursor.execute(f"delete from Test{lob_type}s")
-    await conn.commit()
-    data = []
-    long_string = ""
-    for i in range(1, 11):
-        if i > 0:
-            char = chr(ord("A") + i - 1)
-            long_string += char * 25000
-        if lob_type == "BLOB":
-            data.append((i, long_string.encode()))
-        else:
-            data.append((i, long_string))
-    await cursor.executemany(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:1, :2)
-        """,
-        data,
-    )
-    await cursor.execute(
-        f"""
-        select IntCol, {lob_type}Col
-        from Test{lob_type}s
-        order by IntCol
-        """
-    )
-    assert await cursor.fetchall() == data
-
-
-async def _test_lob_operations(conn, test_env, lob_type):
-    cursor = conn.cursor()
-    await cursor.execute(f"delete from Test{lob_type}s")
-    await conn.commit()
-    cursor.setinputsizes(long_string=getattr(oracledb, lob_type))
-    long_string = "X" * 75000
-    write_value = "TEST"
-    if lob_type == "BLOB":
-        long_string = long_string.encode("ascii")
-        write_value = write_value.encode("ascii")
-    await cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:integer_value, :long_string)
-        """,
-        integer_value=1,
-        long_string=long_string,
-    )
-    await cursor.execute(
-        f"""
-        select {lob_type}Col
-        from Test{lob_type}s
-        where IntCol = 1
-        """
-    )
-    (lob,) = await cursor.fetchone()
-    assert not await lob.isopen()
-    await lob.open()
-    with test_env.assert_raises_full_code("ORA-22293"):
-        await lob.open()
-    assert await lob.isopen()
-    await lob.close()
-    with test_env.assert_raises_full_code("ORA-22289"):
-        await lob.close()
-    assert not await lob.isopen()
-    assert await lob.size() == 75000
-    await lob.write(write_value, 75001)
-    assert await lob.size() == 75000 + len(write_value)
-    with test_env.assert_raises_full_code("DPY-2030"):
-        await lob.read(0)
-    with test_env.assert_raises_full_code("DPY-2030"):
-        await lob.read(-25)
-    assert await lob.read() == long_string + write_value
-    await lob.write(write_value, 1)
-    assert await lob.read() == write_value + long_string[4:] + write_value
-    await lob.trim(25000)
-    assert await lob.size() == 25000
-    await lob.trim(newSize=10000)
-    assert await lob.size() == 10000
-    with test_env.assert_raises_full_code("DPY-2014"):
-        await lob.trim(new_size=50, newSize=60)
-    with pytest.raises(TypeError):
-        await lob.trim(new_size="10000")
-    await lob.trim(new_size=40)
-    assert await lob.size() == 40
-    await lob.trim()
-    assert await lob.size() == 0
-    assert isinstance(await lob.getchunksize(), int)
-
-
-async def _test_temporary_lob(conn, lob_type):
-    cursor = conn.cursor()
-    await cursor.execute(f"delete from Test{lob_type}s")
-    value = "A test string value"
-    if lob_type == "BLOB":
-        value = value.encode("ascii")
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    lob = await conn.createlob(db_type, value)
-    await cursor.execute(
-        f"""
-        insert into Test{lob_type}s (IntCol, {lob_type}Col)
-        values (:int_val, :lob_val)
-        """,
-        int_val=1,
-        lob_val=lob,
-    )
-    await conn.commit()
-    await cursor.execute(f"select {lob_type}Col from Test{lob_type}s")
-    (lob,) = await cursor.fetchone()
-    assert await lob.read() == value
-
-
-async def _validate_query(rows, lob_type):
-    long_string = ""
-    db_type = getattr(oracledb, f"DB_TYPE_{lob_type}")
-    for row in rows:
-        integer_value, lob = row
-        assert lob.type == db_type
-        if integer_value == 0:
-            assert await lob.size() == 0
-            expected_value = ""
-            if lob_type == "BLOB":
-                expected_value = expected_value.encode()
-            assert await lob.read() == expected_value
-        else:
-            char = chr(ord("A") + integer_value - 1)
-            prev_char = chr(ord("A") + integer_value - 2)
-            long_string += char * 25000
-            if lob_type == "BLOB":
-                expected_value = long_string.encode("ascii")
-                char = char.encode("ascii")
-                prev_char = prev_char.encode("ascii")
-            else:
-                expected_value = long_string
-            assert await lob.size() == len(expected_value)
-            assert await lob.read() == expected_value
-            assert await lob.read(len(expected_value)) == char
-        if integer_value > 1:
-            offset = (integer_value - 1) * 25000 - 4
-            string = prev_char * 5 + char * 5
-            assert await lob.read(offset, 10) == string
-
-
-async def test_5700(async_conn, async_cursor):
-    "5700 - test binding a LOB value directly"
-    await async_cursor.execute("delete from TestCLOBs")
-    await async_cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, 'Short value')
-        """
-    )
-    await async_cursor.execute("select ClobCol from TestCLOBs")
-    (lob,) = await async_cursor.fetchone()
-    await async_cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (2, :value)
-        """,
-        value=lob,
-    )
-    await async_conn.commit()
-
-
-async def test_5701(async_cursor):
-    "5701 - test cursor description is accurate for BLOBs"
-    await async_cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, 0),
-        ("BLOBCOL", oracledb.DB_TYPE_BLOB, None, None, None, None, 0),
-    ]
-    assert async_cursor.description == expected_value
-
-
-async def test_5702(async_conn):
-    "5703 - test binding and fetching BLOB data (indirectly)"
-    await _perform_test(async_conn, "BLOB", oracledb.DB_TYPE_LONG_RAW)
-
-
-async def test_5703(async_conn, test_env):
-    "5703 - test operations on BLOBs"
-    await _test_lob_operations(async_conn, test_env, "BLOB")
-
-
-async def test_5704(async_cursor):
-    "5704 - test cursor description is accurate for CLOBs"
-    await async_cursor.execute("select IntCol, ClobCol from TestCLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        ("CLOBCOL", oracledb.DB_TYPE_CLOB, None, None, None, None, False),
-    ]
-    assert async_cursor.description == expected_value
-
-
-async def test_5705(async_conn):
-    "5705 - test binding and fetching CLOB data (indirectly)"
-    await _perform_test(async_conn, "CLOB", oracledb.DB_TYPE_LONG)
-
-
-async def test_5706(async_conn, test_env):
-    "5706 - test operations on CLOBs"
-    await _test_lob_operations(async_conn, test_env, "CLOB")
-
-
-async def test_5707(async_conn):
-    "5707 - test creating a temporary BLOB"
-    await _test_temporary_lob(async_conn, "BLOB")
-
-
-async def test_5708(async_conn):
-    "5708 - test creating a temporary CLOB"
-    await _test_temporary_lob(async_conn, "CLOB")
-
-
-async def test_5709(async_conn):
-    "5709 - test creating a temporary NCLOB"
-    await _test_temporary_lob(async_conn, "NCLOB")
-
-
-async def test_5710(async_conn):
-    "5710 - test retrieving data from a CLOB after multiple fetches"
-    await _perform_test(async_conn, "CLOB", oracledb.DB_TYPE_LONG, arraysize=1)
-
-
-async def test_5711(async_cursor):
-    "5711 - test cursor description is accurate for NCLOBs"
-    await async_cursor.execute("select IntCol, NClobCol from TestNCLOBs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, 0),
-        ("NCLOBCOL", oracledb.DB_TYPE_NCLOB, None, None, None, None, 0),
-    ]
-    assert async_cursor.description == expected_value
-
-
-async def test_5712(async_conn, async_cursor):
-    "5712 - test binding and fetching NCLOB data (with non-ASCII chars)"
-    value = "\u03b4\u4e2a"
-    await async_cursor.execute("delete from TestNCLOBs")
-    async_cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
-    await async_cursor.execute(
-        """
-        insert into TestNCLOBs (IntCol, NClobCol)
-        values (1, :val)
-        """,
-        val=value,
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select NCLOBCol from TestNCLOBs")
-    (nclob,) = await async_cursor.fetchone()
-    async_cursor.setinputsizes(val=oracledb.DB_TYPE_NVARCHAR)
-    await async_cursor.execute(
-        "update TestNCLOBs set NCLOBCol = :val",
-        val=await nclob.read() + value,
-    )
-    await async_cursor.execute("select NCLOBCol from TestNCLOBs")
-    (nclob,) = await async_cursor.fetchone()
-    assert await nclob.read() == value + value
-
-
-async def test_5713(async_conn):
-    "5713 - test binding and fetching NCLOB data (indirectly)"
-    await _perform_test(async_conn, "NCLOB", oracledb.DB_TYPE_LONG)
-
-
-async def test_5714(async_conn, test_env):
-    "5714 - test operations on NCLOBs"
-    await _test_lob_operations(async_conn, test_env, "NCLOB")
-
-
-async def test_5715(skip_if_implicit_pooling, async_conn, async_cursor):
-    "5715 - test temporary LOBs"
-    await async_cursor.execute(
-        "select sys_context('USERENV', 'SID') from dual"
-    )
-    (sid,) = await async_cursor.fetchone()
-    temp_lobs = await _get_temp_lobs(async_conn, sid)
-    with async_conn.cursor() as cursor:
-        cursor.arraysize = 27
-        assert temp_lobs == 0
-        await cursor.execute(
-            "select extract(xmlcol, '/').getclobval() from TestXML"
-        )
-        async for (lob,) in cursor:
-            await lob.read()
-            del lob
-    temp_lobs = await _get_temp_lobs(async_conn, sid)
-    assert temp_lobs == 0
-
-
-async def test_5716(async_conn, async_cursor, test_env):
-    "5716 - test read/write temporary LOBs using supplemental characters"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-    supplemental_chars = (
-        "𠜎 𠜱 𠝹 𠱓 𠱸 𠲖 𠳏 𠳕 𠴕 𠵼 𠵿 𠸎 𠸏 𠹷 𠺝 𠺢 𠻗 𠻹 𠻺 𠼭 𠼮 "
-        "𠽌 𠾴 𠾼 𠿪 𡁜 𡁯 𡁵 𡁶 𡁻 𡃁 𡃉 𡇙 𢃇 𢞵 𢫕 𢭃 𢯊 𢱑 𢱕 𢳂 𢴈 "
-        "𢵌 𢵧 𢺳 𣲷 𤓓 𤶸 𤷪 𥄫 𦉘 𦟌 𦧲 𦧺 𧨾 𨅝 𨈇 𨋢 𨳊 𨳍 𨳒 𩶘"
-    )
-    await async_cursor.execute("delete from TestCLOBs")
-    lob = await async_conn.createlob(oracledb.DB_TYPE_CLOB, supplemental_chars)
-    await async_cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, :val)
-        """,
-        [lob],
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select ClobCol from TestCLOBs")
-    (lob,) = await async_cursor.fetchone()
-    assert await lob.read() == supplemental_chars
-
-
-async def test_5717(disable_fetch_lobs, async_conn):
-    "5717 - test fetching BLOB as bytes"
-    await _test_fetch_lobs_direct(async_conn, "BLOB")
-
-
-async def test_5718(disable_fetch_lobs, async_conn):
-    "5718 - test fetching CLOB as str"
-    await _test_fetch_lobs_direct(async_conn, "CLOB")
-
-
-async def test_5719(disable_fetch_lobs, async_conn):
-    "5719 - test fetching NCLOB as str"
-    await _test_fetch_lobs_direct(async_conn, "NCLOB")
-
-
-async def test_5720(disable_fetch_lobs, async_conn):
-    "5720 - test bind ordering with BLOB"
-    await _test_bind_ordering(async_conn, "BLOB")
-
-
-async def test_5721(disable_fetch_lobs, async_conn):
-    "5721 - test bind ordering with CLOB"
-    await _test_bind_ordering(async_conn, "CLOB")
-
-
-async def test_5722(disable_fetch_lobs, async_conn):
-    "5722 - test bind ordering with NCLOB"
-    await _test_bind_ordering(async_conn, "NCLOB")
-
-
-async def test_5723(async_conn):
-    "5723 - test creating a lob with an invalid type"
-    with pytest.raises(TypeError):
-        await async_conn.createlob(oracledb.DB_TYPE_NUMBER)
-    with pytest.raises(TypeError):
-        await async_conn.createlob(oracledb.DB_TYPE_BFILE)
-
-
-async def test_5724(async_conn):
-    "5724 - test creation of temporary LOBs with varying data"
-    cases = [
-        (oracledb.DB_TYPE_BLOB, b"test_5724A", b"!", b"test_5724A!"),
-        (oracledb.DB_TYPE_BLOB, "test_5724B", "!", b"test_5724B!"),
-        (oracledb.DB_TYPE_CLOB, b"test_5724C", b"!", "test_5724C!"),
-        (oracledb.DB_TYPE_CLOB, "test_5724D", "!", "test_5724D!"),
-        (oracledb.DB_TYPE_NCLOB, b"test_5724E", b"!", "test_5724E!"),
-        (oracledb.DB_TYPE_NCLOB, "test_5724F", "!", "test_5724F!"),
-    ]
-    for typ, initial_data, additional_data, expected_result in cases:
-        lob = await async_conn.createlob(typ, initial_data)
-        await lob.write(additional_data, len(initial_data) + 1)
-        assert await lob.read() == expected_result
-
-
-async def test_5725(test_env):
-    "5725 - test reading and writing a LOB with a closed connection"
-    types = [
-        oracledb.DB_TYPE_BLOB,
-        oracledb.DB_TYPE_CLOB,
-        oracledb.DB_TYPE_NCLOB,
-    ]
-    for typ in types:
-        conn = await test_env.get_connection(use_async=True)
-        lob = await conn.createlob(typ, "Temp LOB")
-        await conn.close()
-        with test_env.assert_raises_full_code("DPY-1001"):
-            await lob.read()
-        with test_env.assert_raises_full_code("DPY-1001"):
-            await lob.write("x")
-
-
-async def test_5726(async_cursor, test_env):
-    "5726 - test reading a non-existent directory"
-    directory_name = "TEST_5726_MISSING_DIR"
-    file_name = "test_5726_missing_file.txt"
-    await async_cursor.execute(
-        "select BFILENAME(:1, :2) from dual", [directory_name, file_name]
-    )
-    (bfile,) = await async_cursor.fetchone()
-    assert bfile.getfilename() == (directory_name, file_name)
-    with test_env.assert_raises_full_code("ORA-22285"):
-        await bfile.fileexists()
-    with test_env.assert_raises_full_code("ORA-22285"):
-        await bfile.read()
-
-
-async def test_5727(async_conn, test_env):
-    "5727 - test using BFILE methods on non-BFILE LOBs"
-    types = [
-        oracledb.DB_TYPE_BLOB,
-        oracledb.DB_TYPE_CLOB,
-        oracledb.DB_TYPE_NCLOB,
-    ]
-    for typ in types:
-        lob = await async_conn.createlob(typ)
-        with test_env.assert_raises_full_code("DPY-3026"):
-            lob.getfilename()
-        with test_env.assert_raises_full_code("DPY-3026"):
-            lob.setfilename("not_relevant", "not_relevant")
-        with test_env.assert_raises_full_code("DPY-3026"):
-            await lob.fileexists()
diff --git a/tests/test_5800_cursor_var_async.py b/tests/test_5800_cursor_var_async.py
deleted file mode 100644
index 73b530f1..00000000
--- a/tests/test_5800_cursor_var_async.py
+++ /dev/null
@@ -1,415 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5800 - Module for testing cursor variables with asyncio
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_5800(async_conn, async_cursor, test_env):
-    "5800 - test binding in a cursor"
-    ref_cursor = async_conn.cursor()
-    assert ref_cursor.description is None
-    await async_cursor.execute(
-        """
-        begin
-            open :cursor for select 'X' StringValue from dual;
-        end;
-        """,
-        cursor=ref_cursor,
-    )
-    varchar_ratio, _ = test_env.charset_ratios
-    expected_value = [
-        (
-            "STRINGVALUE",
-            oracledb.DB_TYPE_CHAR,
-            1,
-            varchar_ratio,
-            None,
-            None,
-            True,
-        )
-    ]
-    assert ref_cursor.description == expected_value
-    assert await ref_cursor.fetchall() == [("X",)]
-
-
-async def test_5801(async_conn, async_cursor, test_env):
-    "5801 - test binding in a cursor from a package"
-    ref_cursor = async_conn.cursor()
-    assert ref_cursor.description is None
-    await async_cursor.callproc(
-        "pkg_TestRefCursors.TestOutCursor", (2, ref_cursor)
-    )
-    varchar_ratio, _ = test_env.charset_ratios
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "STRINGCOL",
-            oracledb.DB_TYPE_VARCHAR,
-            20,
-            20 * varchar_ratio,
-            None,
-            None,
-            False,
-        ),
-    ]
-    assert ref_cursor.description == expected_value
-    assert await ref_cursor.fetchall() == [(1, "String 1"), (2, "String 2")]
-
-
-async def test_5802(async_cursor, test_env):
-    "5802 - test that binding the cursor itself is not supported"
-    sql = """
-            begin
-                open :pcursor for
-                    select 1 from dual;
-            end;"""
-    with test_env.assert_raises_full_code("DPY-3009"):
-        await async_cursor.execute(sql, pcursor=async_cursor)
-
-
-async def test_5803(async_conn, async_cursor):
-    "5803 - test returning a ref cursor after closing it"
-    out_cursor = async_conn.cursor()
-    sql = """
-            begin
-                open :pcursor for
-                    select IntCol
-                    from TestNumbers
-                    order by IntCol;
-            end;"""
-    await async_cursor.execute(sql, pcursor=out_cursor)
-    rows = await out_cursor.fetchall()
-    out_cursor.close()
-    out_cursor = async_conn.cursor()
-    await async_cursor.execute(sql, pcursor=out_cursor)
-    rows2 = await out_cursor.fetchall()
-    assert rows == rows2
-
-
-async def test_5804(async_cursor):
-    "5804 - test fetching a cursor"
-    await async_cursor.execute(
-        """
-        select IntCol, cursor(select IntCol + 1 from dual) CursorValue
-        from TestNumbers
-        order by IntCol
-        """
-    )
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "CURSORVALUE",
-            oracledb.DB_TYPE_CURSOR,
-            None,
-            None,
-            None,
-            None,
-            True,
-        ),
-    ]
-    assert async_cursor.description == expected_value
-    for i in range(1, 11):
-        number, cursor = await async_cursor.fetchone()
-        assert number == i
-        assert await cursor.fetchall() == [(i + 1,)]
-
-
-async def test_5805(async_conn, async_cursor):
-    "5805 - test that ref cursor binds cannot use optimised path"
-    ref_cursor = async_conn.cursor()
-    sql = """
-            begin
-                open :rcursor for
-                    select IntCol, StringCol
-                    from TestStrings where IntCol
-                    between :start_value and :end_value;
-            end;"""
-    expected_value = [(2, "String 2"), (3, "String 3"), (4, "String 4")]
-    await async_cursor.execute(
-        sql, rcursor=ref_cursor, start_value=2, end_value=4
-    )
-    assert await ref_cursor.fetchall() == expected_value
-    ref_cursor.close()
-
-    expected_value = [(5, "String 5"), (6, "String 6")]
-    ref_cursor = async_conn.cursor()
-    await async_cursor.execute(
-        sql, rcursor=ref_cursor, start_value=5, end_value=6
-    )
-    assert await ref_cursor.fetchall() == expected_value
-
-
-async def test_5806(async_conn, round_trip_checker_async):
-    "5806 - test round trips using a REF cursor"
-
-    # simple DDL only requires a single round trip
-    with async_conn.cursor() as cursor:
-        await cursor.execute("truncate table TestTempTable")
-        assert await round_trip_checker_async.get_value_async() == 1
-
-    # array execution only requires a single round trip
-    num_rows = 590
-    with async_conn.cursor() as cursor:
-        sql = "insert into TestTempTable (IntCol) values (:1)"
-        data = [(n + 1,) for n in range(num_rows)]
-        await cursor.executemany(sql, data)
-        assert await round_trip_checker_async.get_value_async() == 1
-
-    # create REF cursor and execute stored procedure
-    # (array size set before procedure is called)
-    with async_conn.cursor() as cursor:
-        refcursor = async_conn.cursor()
-        refcursor.arraysize = 150
-        await cursor.callproc("myrefcursorproc", [refcursor])
-        await refcursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 5
-
-    # create REF cursor and execute stored procedure
-    # (array size set after procedure is called)
-    with async_conn.cursor() as cursor:
-        refcursor = async_conn.cursor()
-        await cursor.callproc("myrefcursorproc", [refcursor])
-        refcursor.arraysize = 145
-        await refcursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 6
-
-
-async def test_5807(async_conn):
-    "5807 - test executing different SQL after getting a REF cursor"
-    with async_conn.cursor() as cursor:
-        refcursor = async_conn.cursor()
-        await cursor.callproc("myrefcursorproc", [refcursor])
-        var = cursor.var(int)
-        await refcursor.execute("begin :1 := 15; end;", [var])
-        assert var.getvalue() == 15
-
-
-async def test_5808(async_conn):
-    "5808 - test calling a function that returns a REF cursor"
-    with async_conn.cursor() as cursor:
-        ref_cursor = await cursor.callfunc(
-            "pkg_TestRefCursors.TestReturnCursor",
-            oracledb.DB_TYPE_CURSOR,
-            [2],
-        )
-        assert await ref_cursor.fetchall() == [
-            (1, "String 1"),
-            (2, "String 2"),
-        ]
-
-
-async def test_5809(async_conn, async_cursor):
-    "5809 - test using an output type handler with a REF cursor"
-
-    def type_handler(cursor, metadata):
-        return cursor.var(str, arraysize=cursor.arraysize)
-
-    async_conn.outputtypehandler = type_handler
-    var = async_cursor.var(oracledb.DB_TYPE_CURSOR)
-    string_val = "Test String - 5809"
-    with async_conn.cursor() as cursor:
-        await cursor.callproc(
-            "pkg_TestRefCursors.TestLobCursor", [string_val, var]
-        )
-    ref_cursor = var.getvalue()
-    assert await ref_cursor.fetchall() == [(string_val,)]
-
-
-async def test_5810(async_cursor, test_env):
-    "5810 - bind a REF cursor but never open it"
-    ref_cursor_var = async_cursor.var(oracledb.DB_TYPE_CURSOR)
-    await async_cursor.execute(
-        """
-        begin
-            if false then
-                open :cursor for
-                    select user
-                    from dual;
-            end if;
-        end;
-        """,
-        cursor=ref_cursor_var,
-    )
-    ref_cursor = ref_cursor_var.getvalue()
-    if ref_cursor is not None:
-        with test_env.assert_raises_full_code("DPY-4025"):
-            await ref_cursor.fetchall()
-
-
-async def test_5811(test_env):
-    "5811 - test fetching a cursor with a custom class"
-
-    class Counter:
-        num_cursors_created = 0
-
-        @classmethod
-        def cursor_created(cls):
-            cls.num_cursors_created += 1
-
-    class MyConnection(oracledb.AsyncConnection):
-        def cursor(self):
-            Counter.cursor_created()
-            return super().cursor()
-
-    conn = await test_env.get_connection_async(conn_class=MyConnection)
-    cursor = conn.cursor()
-    await cursor.execute(
-        """
-        select
-            cursor(select 1 from dual),
-            cursor(select 2 from dual)
-        from dual
-        """
-    )
-    await cursor.fetchall()
-    assert Counter.num_cursors_created == 3
-
-
-async def test_5812(async_cursor):
-    "5812 - test that nested cursors are fetched correctly"
-    sql = """
-        select
-        'Level 1 String',
-        cursor(
-            select
-            'Level 2 String',
-            cursor(
-                select
-                'Level 3 String',
-                cursor(
-                    select 1, 'Level 4 String A' from dual
-                    union all
-                    select 2, 'Level 4 String B' from dual
-                    union all
-                    select 3, 'Level 4 String C' from dual
-                ) as nc3
-                from dual
-            ) as nc2
-            from dual
-        ) as nc1
-        from dual"""
-    await async_cursor.execute(sql)
-
-    async def transform_row(r):
-        return tuple([await transform_fn(v) for v in r])
-
-    async def transform_fn(v):
-        if isinstance(v, oracledb.AsyncCursor):
-            return [await transform_row(r) async for r in v]
-        return v
-
-    rows = [await transform_row(r) async for r in async_cursor]
-    expected_value = [
-        (
-            "Level 1 String",
-            [
-                (
-                    "Level 2 String",
-                    [
-                        (
-                            "Level 3 String",
-                            [
-                                (1, "Level 4 String A"),
-                                (2, "Level 4 String B"),
-                                (3, "Level 4 String C"),
-                            ],
-                        ),
-                    ],
-                ),
-            ],
-        )
-    ]
-    assert rows == expected_value
-
-
-async def test_5813(async_cursor):
-    "5813 - test fetching nested cursors with more columns than parent"
-    sql = """
-        select
-            'Top Level String',
-            cursor(
-                select
-                    'Nested String 1',
-                    'Nested String 2',
-                    'Nested String 3'
-                from dual
-            )
-        from dual"""
-    await async_cursor.execute(sql)
-
-    async def transform_row(r):
-        return tuple([await transform_fn(v) for v in r])
-
-    async def transform_fn(v):
-        if isinstance(v, oracledb.AsyncCursor):
-            return [await transform_row(r) async for r in v]
-        return v
-
-    rows = [await transform_row(r) async for r in async_cursor]
-    expected_value = [
-        (
-            "Top Level String",
-            [("Nested String 1", "Nested String 2", "Nested String 3")],
-        )
-    ]
-    assert rows == expected_value
-
-
-async def test_5814(async_conn, async_cursor):
-    "5814 - test reusing a closed ref cursor for executing different sql"
-    sql = "select 58141, 'String 58141' from dual"
-    ref_cursor = async_conn.cursor()
-    ref_cursor.prefetchrows = 0
-    await ref_cursor.execute(sql)
-    plsql = "begin pkg_TestRefCursors.TestCloseCursor(:rcursor); end;"
-    await async_cursor.execute(plsql, rcursor=ref_cursor)
-    sql = "select 58142, 'String 58142' from dual"
-    await ref_cursor.execute(sql)
-    assert await ref_cursor.fetchall() == [
-        (58142, "String 58142"),
-    ]
-
-
-async def test_5815(async_conn, async_cursor):
-    "5815 - test reusing a closed ref cursor for executing same sql"
-    sql = "select 5815, 'String 5815' from dual"
-    ref_cursor = async_conn.cursor()
-    ref_cursor.prefetchrows = 0
-    await ref_cursor.execute(sql)
-    plsql = "begin pkg_TestRefCursors.TestCloseCursor(:rcursor); end;"
-    await async_cursor.execute(plsql, rcursor=ref_cursor)
-    await ref_cursor.execute(sql)
-    assert await ref_cursor.fetchall() == [
-        (5815, "String 5815"),
-    ]
diff --git a/tests/test_5900_dml_returning_async.py b/tests/test_5900_dml_returning_async.py
deleted file mode 100644
index 1bb4ea2b..00000000
--- a/tests/test_5900_dml_returning_async.py
+++ /dev/null
@@ -1,553 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-5900 - Module for testing DML returning clauses with asyncio
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_5900(async_cursor):
-    "5900 - test insert (single row) with DML returning"
-    await async_cursor.execute("truncate table TestTempTable")
-    int_val = 5
-    str_val = "A test string"
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[int_val]]
-    assert str_var.values == [[str_val]]
-
-
-async def test_5901(async_cursor):
-    "5901 - test insert (multiple rows) with DML returning"
-    await async_cursor.execute("truncate table TestTempTable")
-    int_values = [5, 8, 17, 24, 6]
-    str_values = ["Test 5", "Test 8", "Test 17", "Test 24", "Test 6"]
-    int_var = async_cursor.var(oracledb.NUMBER, arraysize=len(int_values))
-    str_var = async_cursor.var(str, arraysize=len(int_values))
-    async_cursor.setinputsizes(None, None, int_var, str_var)
-    data = list(zip(int_values, str_values))
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int_val, :str_val)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        data,
-    )
-    assert int_var.values == [[v] for v in int_values]
-    assert str_var.values == [[v] for v in str_values]
-
-
-async def test_5902(async_cursor, test_env):
-    "5902 - test insert with DML returning into too small a variable"
-    await async_cursor.execute("truncate table TestTempTable")
-    int_val = 6
-    str_val = "A different test string"
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str, 2)
-    parameters = dict(
-        int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
-    )
-    with test_env.assert_raises_full_code("DPY-4002", "DPI-1037"):
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :int_var, :str_var
-            """,
-            parameters,
-        )
-
-
-async def test_5903(async_cursor):
-    "5903 - test update single row with DML returning"
-    int_val = 7
-    str_val = "The updated value of the string"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        (int_val, "The initial value of the string"),
-    )
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str)
-    await async_cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = :str_val
-        where IntCol = :int_val
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[int_val]]
-    assert str_var.values == [[str_val]]
-
-
-async def test_5904(async_cursor):
-    "5904 - test update no rows with DML returning"
-    int_val = 8
-    str_val = "The updated value of the string"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        (int_val, "The initial value of the string"),
-    )
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str)
-    await async_cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = :str_val
-        where IntCol = :int_val
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_val=int_val + 1,
-        str_val=str_val,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert int_var.values == [[]]
-    assert str_var.values == [[]]
-    assert int_var.getvalue() == []
-    assert str_var.getvalue() == []
-
-
-async def test_5905(async_cursor):
-    "5905 - test update multiple rows with DML returning"
-    await async_cursor.execute("truncate table TestTempTable")
-    for i in (8, 9, 10):
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1) values (:1, :2)
-            """,
-            (i, f"The initial value of string {i}"),
-        )
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str)
-    await async_cursor.execute(
-        """
-        update TestTempTable set
-            IntCol = IntCol + 15,
-            StringCol1 = 'The final value of string ' || to_char(IntCol)
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        int_var=int_var,
-        str_var=str_var,
-    )
-    assert async_cursor.rowcount == 3
-    assert int_var.values == [[23, 24, 25]]
-    expected_values = [
-        [
-            "The final value of string 8",
-            "The final value of string 9",
-            "The final value of string 10",
-        ]
-    ]
-    assert str_var.values == expected_values
-
-
-async def test_5906(async_cursor):
-    "5906 - test update multiple rows with DML returning (executemany)"
-    data = [(i, f"The initial value of string {i}") for i in range(1, 11)]
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        data,
-    )
-    int_var = async_cursor.var(oracledb.NUMBER, arraysize=3)
-    str_var = async_cursor.var(str, arraysize=3)
-    async_cursor.setinputsizes(None, int_var, str_var)
-    await async_cursor.executemany(
-        """
-        update TestTempTable set
-            IntCol = IntCol + 25,
-            StringCol1 = 'Updated value of string ' || to_char(IntCol)
-        where IntCol < :inVal
-        returning IntCol, StringCol1 into :int_var, :str_var
-        """,
-        [[3], [8], [11]],
-    )
-    expected_values = [[26, 27], [28, 29, 30, 31, 32], [33, 34, 35]]
-    assert int_var.values == expected_values
-    expected_values = [
-        ["Updated value of string 1", "Updated value of string 2"],
-        [
-            "Updated value of string 3",
-            "Updated value of string 4",
-            "Updated value of string 5",
-            "Updated value of string 6",
-            "Updated value of string 7",
-        ],
-        [
-            "Updated value of string 8",
-            "Updated value of string 9",
-            "Updated value of string 10",
-        ],
-    ]
-    assert str_var.values == expected_values
-
-
-async def test_5907(async_conn, async_cursor):
-    "5907 - test inserting an object with DML returning"
-    type_obj = await async_conn.gettype("UDT_OBJECT")
-    string_value = "The string that will be verified"
-    obj = type_obj.newobject()
-    obj.STRINGVALUE = string_value
-    out_var = async_cursor.var(type_obj)
-    await async_cursor.execute(
-        """
-        insert into TestObjects (IntCol, ObjectCol)
-        values (4, :obj)returning ObjectCol into :outObj
-        """,
-        obj=obj,
-        outObj=out_var,
-    )
-    (result,) = out_var.getvalue()
-    assert result.STRINGVALUE == string_value
-    await async_conn.rollback()
-
-
-async def test_5908(async_cursor):
-    "5908 - test inserting a row and returning a rowid"
-    await async_cursor.execute("truncate table TestTempTable")
-    var = async_cursor.var(oracledb.ROWID)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (278, 'String 278')
-        returning rowid into :1
-        """,
-        [var],
-    )
-    (rowid,) = var.getvalue()
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        where rowid = :1
-        """,
-        [rowid],
-    )
-    assert await async_cursor.fetchall() == [(278, "String 278")]
-
-
-async def test_5909(async_conn, async_cursor):
-    "5909 - test inserting with a REF cursor and returning a rowid"
-    await async_cursor.execute("truncate table TestTempTable")
-    var = async_cursor.var(oracledb.ROWID)
-    in_cursor = async_conn.cursor()
-    await in_cursor.execute(
-        """
-        select StringCol
-        from TestStrings
-        where IntCol >= 5
-        order by IntCol
-        """
-    )
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (187, pkg_TestRefCursors.TestInCursor(:1))
-        returning rowid into :2
-        """,
-        (in_cursor, var),
-    )
-    (rowid,) = var.getvalue()
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        where rowid = :1
-        """,
-        [rowid],
-    )
-    assert await async_cursor.fetchall() == [(187, "String 7 (Modified)")]
-
-
-async def test_5910(async_cursor):
-    "5910 - test delete returning decreasing number of rows"
-    data = [(i, f"Test String {i}") for i in range(1, 11)]
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    results = []
-    int_var = async_cursor.var(int)
-    async_cursor.setinputsizes(None, int_var)
-    for int_val in (5, 8, 10):
-        await async_cursor.execute(
-            """
-            delete from TestTempTable
-            where IntCol < :1
-            returning IntCol into :2
-            """,
-            [int_val],
-        )
-        results.append(int_var.getvalue())
-    assert results == [[1, 2, 3, 4], [5, 6, 7], [8, 9]]
-
-
-async def test_5911(async_cursor):
-    "5911 - test delete returning no rows after returning many rows"
-    data = [(i, f"Test String {i}") for i in range(1, 11)]
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data,
-    )
-    int_var = async_cursor.var(int)
-    await async_cursor.execute(
-        """
-        delete from TestTempTable
-        where IntCol < :1
-        returning IntCol into :2
-        """,
-        [5, int_var],
-    )
-    assert int_var.getvalue() == [1, 2, 3, 4]
-    await async_cursor.execute(None, [4, int_var])
-    assert int_var.getvalue() == []
-
-
-async def test_5912(async_cursor, test_env):
-    "5912 - test DML returning when an error occurs"
-    await async_cursor.execute("truncate table TestTempTable")
-    int_val = 7
-    str_val = "A" * 401
-    int_var = async_cursor.var(oracledb.NUMBER)
-    str_var = async_cursor.var(str)
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :int_var, :str_var"""
-    parameters = dict(
-        int_val=int_val, str_val=str_val, int_var=int_var, str_var=str_var
-    )
-    with test_env.assert_raises_full_code("ORA-12899"):
-        await async_cursor.execute(sql, parameters)
-
-
-async def test_5913(async_cursor):
-    "5913 - test DML returning with no input variables, multiple iters"
-    await async_cursor.execute("truncate table TestTempTable")
-    sql = """
-            insert into TestTempTable (IntCol)
-            values ((select count(*) + 1 from TestTempTable))
-            returning IntCol into :1"""
-    var = async_cursor.var(int)
-    await async_cursor.execute(sql, [var])
-    assert var.getvalue() == [1]
-    await async_cursor.execute(sql, [var])
-    assert var.getvalue() == [2]
-
-
-async def test_5914(async_cursor):
-    "5914 - test DML returning with a quoted bind name"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol, StringCol1 into :"_val1" , :"VaL_2" """
-    await async_cursor.parse(sql)
-    expected_bind_names = ["INT_VAL", "STR_VAL", "_val1", "VaL_2"]
-    assert async_cursor.bindnames() == expected_bind_names
-
-
-async def test_5915(async_cursor, test_env):
-    "5915 - test DML returning with an invalid bind name"
-    sql = """
-            insert into TestTempTable (IntCol)
-            values (:int_val)
-            returning IntCol, StringCol1 into :ROWID"""
-    with test_env.assert_raises_full_code("ORA-01745"):
-        await async_cursor.parse(sql)
-
-
-async def test_5916(async_conn, async_cursor):
-    "5916 - test DML returning with input bind variable data"
-    await async_cursor.execute("truncate table TestTempTable")
-    out_var = async_cursor.var(int)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol)
-        values (:int_val)
-        returning IntCol + :add_val into :out_val
-        """,
-        int_val=5,
-        add_val=18,
-        out_val=out_var,
-    )
-    await async_conn.commit()
-    assert out_var.getvalue() == [23]
-
-
-async def test_5917(async_conn, async_cursor):
-    "5917 - test DML returning with LOBs and an output converter"
-    await async_cursor.execute("truncate table TestCLOBs")
-    out_var = async_cursor.var(
-        oracledb.DB_TYPE_CLOB, outconverter=lambda value: value.read()
-    )
-    lob_value = "A short CLOB - 1618"
-    await async_cursor.execute(
-        """
-        insert into TestCLOBs (IntCol, ClobCol)
-        values (1, :in_val)
-        returning CLOBCol into :out_val
-        """,
-        in_val=lob_value,
-        out_val=out_var,
-    )
-    await async_conn.commit()
-    assert out_var.getvalue() == [lob_value]
-
-
-async def test_5918(async_conn, async_cursor):
-    "5918 - test DML returning with CLOB converted to LONG"
-    await async_cursor.execute("truncate table TestCLOBs")
-    out_var = async_cursor.var(oracledb.DB_TYPE_LONG)
-    lob_value = "A short CLOB - 1619"
-    await async_cursor.execute(
-        """
-        insert into TestCLOBs
-        (IntCol, ClobCol)
-        values (1, :in_val)
-        returning CLOBCol into :out_val
-        """,
-        in_val=lob_value,
-        out_val=out_var,
-    )
-    await async_conn.commit()
-    assert out_var.getvalue() == [lob_value]
-
-
-async def test_5919(async_cursor):
-    "5919 - test dml returning with an index organized table"
-    await async_cursor.execute("truncate table TestUniversalRowids")
-    rowid_var = async_cursor.var(oracledb.ROWID)
-    data = (1, "ABC", datetime.datetime(2017, 4, 11), rowid_var)
-    sql = """
-            insert into TestUniversalRowids values (:1, :2, :3)
-            returning rowid into :4"""
-    await async_cursor.execute(sql, data)
-    (rowid_value,) = rowid_var.getvalue()
-    await async_cursor.execute(
-        """
-        select *
-        from TestUniversalRowids
-        where rowid = :1
-        """,
-        [rowid_value],
-    )
-    (row,) = await async_cursor.fetchall()
-    assert row == data[:3]
-
-
-async def test_5920(async_cursor):
-    "5920 - test plsql returning rowids with index organized table"
-    await async_cursor.execute("truncate table TestUniversalRowids")
-    rowid_var = async_cursor.var(oracledb.ROWID)
-    data = (1, "ABC", datetime.datetime(2017, 4, 11), rowid_var)
-    await async_cursor.execute(
-        """
-        begin
-            insert into TestUniversalRowids values (:1, :2, :3)
-            returning rowid into :4;
-        end;
-        """,
-        data,
-    )
-    rowid_value = rowid_var.values[0]
-    await async_cursor.execute(
-        """
-        select *
-        from TestUniversalRowids
-        where rowid = :1
-        """,
-        [rowid_value],
-    )
-    (row,) = await async_cursor.fetchall()
-    assert row == data[:3]
-
-
-async def test_5921(async_cursor):
-    "5921 - parse DML returning with no spaces"
-    await async_cursor.execute("truncate table TestTempTable")
-    sql = (
-        "insert into TestTempTable (IntCol) values (:in_val)"
-        "returning(IntCol)into :out_val"
-    )
-    out_val = async_cursor.var(int, arraysize=5)
-    await async_cursor.execute(sql, in_val=25, out_val=out_val)
-    assert out_val.getvalue() == [25]
-
-
-async def test_5922(async_cursor):
-    "5922 - use bind variable in new statement after RETURNING statement"
-    await async_cursor.execute("truncate table TestTempTable")
-    sql = (
-        "insert into TestTempTable (IntCol) values (:in_val)"
-        "returning IntCol + 15 into :out_val"
-    )
-    out_val = async_cursor.var(int, arraysize=5)
-    await async_cursor.execute(sql, in_val=25, out_val=out_val)
-    assert out_val.getvalue() == [40]
-    sql = "begin :out_val := :in_val + 35; end;"
-    await async_cursor.execute(sql, in_val=35, out_val=out_val)
-    assert out_val.getvalue() == 70
diff --git a/tests/test_6000_typehandler_async.py b/tests/test_6000_typehandler_async.py
deleted file mode 100644
index 366dc8fe..00000000
--- a/tests/test_6000_typehandler_async.py
+++ /dev/null
@@ -1,284 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6000 - Module for testing the input and output type handlers with asyncio.
-"""
-
-import datetime
-import json
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-class Building:
-    def __init__(self, building_id, description, num_floors):
-        self.building_id = building_id
-        self.description = description
-        self.num_floors = num_floors
-
-    def __repr__(self):
-        return f"<Building {self.building_id}: {self.description}>"
-
-    def __eq__(self, other):
-        if isinstance(other, Building):
-            return (
-                other.building_id == self.building_id
-                and other.description == self.description
-                and other.num_floors == self.num_floors
-            )
-        return NotImplemented
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-    @classmethod
-    def from_json(cls, value):
-        result = json.loads(value)
-        return cls(**result)
-
-
-def building_in_converter(value):
-    return value.to_json()
-
-
-def input_type_handler(cursor, value, num_elements):
-    if isinstance(value, Building):
-        return cursor.var(
-            oracledb.STRING,
-            arraysize=num_elements,
-            inconverter=building_in_converter,
-        )
-
-
-def output_type_handler(cursor, metadata):
-    if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-        return cursor.var(
-            metadata.type_code,
-            arraysize=cursor.arraysize,
-            outconverter=Building.from_json,
-        )
-
-
-async def test_6000(async_cursor, test_env):
-    "6000 - binding unsupported python object without input type handler"
-    await async_cursor.execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    building = Building(1, "The First Building", 5)
-    with test_env.assert_raises_full_code("DPY-3002"):
-        await async_cursor.execute(sql, [building.building_id, building])
-
-
-async def test_6001(async_conn, async_cursor):
-    "6001 - not callable input type handler"
-    await async_cursor.execute("truncate table TestTempTable")
-    building = Building(1, "The First Building", 5)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    async_cursor.inputtypehandler = 5
-    assert async_cursor.inputtypehandler == 5
-    with pytest.raises(TypeError):
-        await async_cursor.execute(sql, (building.building_id, building))
-
-
-async def test_6002(async_conn, async_cursor):
-    "6002 - binding unsupported python object with input type handler"
-    await async_cursor.execute("truncate table TestTempTable")
-    building = Building(1, "The First Building", 5)
-    async_cursor.inputtypehandler = input_type_handler
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        [building.building_id, building],
-    )
-    assert async_cursor.bindvars[1].inconverter == building_in_converter
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await async_cursor.fetchall() == [
-        (building.building_id, building.to_json())
-    ]
-
-
-async def test_6003(async_conn, async_cursor, test_env):
-    "6003 - input type handler and output type handler on cursor level"
-    await async_cursor.execute("truncate table TestTempTable")
-    building_one = Building(1, "The First Building", 5)
-    building_two = Building(2, "The Second Building", 87)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    cursor_one = async_conn.cursor()
-    cursor_two = async_conn.cursor()
-    cursor_one.inputtypehandler = input_type_handler
-    await cursor_one.execute(sql, [building_one.building_id, building_one])
-    await async_conn.commit()
-
-    await cursor_one.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await cursor_one.fetchall() == [
-        (building_one.building_id, building_one.to_json())
-    ]
-    with test_env.assert_raises_full_code("DPY-3002"):
-        await cursor_two.execute(sql, (building_two.building_id, building_two))
-
-    cursor_two.outputtypehandler = output_type_handler
-    await cursor_two.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await cursor_two.fetchall() == [
-        (building_one.building_id, building_one)
-    ]
-
-
-async def test_6004(async_conn, async_cursor, test_env):
-    "6004 - input type handler and output type handler on connection level"
-    await async_cursor.execute("truncate table TestTempTable")
-    building_one = Building(1, "The First Building", 5)
-    building_two = Building(2, "The Second Building", 87)
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    conn = await test_env.get_connection_async()
-    conn.inputtypehandler = input_type_handler
-    assert conn.inputtypehandler == input_type_handler
-
-    cursor_one = conn.cursor()
-    cursor_two = conn.cursor()
-    await cursor_one.execute(sql, [building_one.building_id, building_one])
-    await cursor_two.execute(sql, [building_two.building_id, building_two])
-    await conn.commit()
-
-    expected_data = [
-        (building_one.building_id, building_one),
-        (building_two.building_id, building_two),
-    ]
-    conn.outputtypehandler = output_type_handler
-    assert conn.outputtypehandler == output_type_handler
-    await cursor_one.execute("select IntCol, StringCol1 from TestTempTable")
-    assert cursor_one.fetchvars[1].outconverter == Building.from_json
-    assert await cursor_one.fetchall() == expected_data
-
-    await cursor_two.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await cursor_two.fetchall() == expected_data
-    other_cursor = async_conn.cursor()
-    with test_env.assert_raises_full_code("DPY-3002"):
-        await other_cursor.execute(
-            sql, (building_one.building_id, building_one)
-        )
-
-
-async def test_6005(async_conn, async_cursor):
-    "6005 - output type handler with outconvert and null values"
-    await async_cursor.execute("truncate table TestTempTable")
-    data_to_insert = [(1, "String 1"), (2, None), (3, "String 2")]
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data_to_insert,
-    )
-    await async_conn.commit()
-
-    def converter(value):
-        return "CONVERTED"
-
-    def output_type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_VARCHAR:
-            return cursor.var(
-                str, outconverter=converter, arraysize=cursor.arraysize
-            )
-
-    async_cursor.outputtypehandler = output_type_handler
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    expected_data = [(1, "CONVERTED"), (2, None), (3, "CONVERTED")]
-    assert await async_cursor.fetchall() == expected_data
-
-
-async def test_6006(skip_unless_native_json_supported, async_cursor):
-    "6006 - output type handler for fetching 21c JSON"
-
-    def output_type_handler(cursor, metadata):
-        # fetch 21c JSON datatype when using python-oracledb thin mode
-        if metadata.type_code is oracledb.DB_TYPE_JSON:
-            return cursor.var(
-                str, arraysize=cursor.arraysize, outconverter=json.loads
-            )
-
-    await async_cursor.execute("truncate table TestJson")
-    insert_sql = "insert into TestJson values (:1, :2)"
-    json_data = [
-        dict(name="John", city="Delhi"),
-        dict(name="George", city="Bangalore"),
-        dict(name="Sam", city="Mumbai"),
-    ]
-    data_to_insert = list(enumerate(json_data))
-    async_cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    await async_cursor.executemany(insert_sql, data_to_insert)
-    async_cursor.outputtypehandler = output_type_handler
-    await async_cursor.execute("select * from TestJson")
-    assert await async_cursor.fetchall() == data_to_insert
-
-
-async def test_6007(async_conn):
-    "6007 - output type handler with object implementing __call__()"
-
-    class TimestampOutputTypeHandler:
-
-        def __init__(self, unit="s"):
-            if unit == "ms":
-                self.factor = 1000
-            else:
-                self.factor = 1
-
-        def converter(self, d):
-            return int(d.timestamp() * self.factor)
-
-        def __call__(self, cursor, metadata):
-            if metadata.type_code is oracledb.DB_TYPE_TIMESTAMP:
-                return cursor.var(
-                    metadata.type_code,
-                    arraysize=cursor.arraysize,
-                    outconverter=self.converter,
-                )
-
-    d = datetime.datetime.today()
-    with async_conn.cursor() as cursor:
-        cursor.outputtypehandler = TimestampOutputTypeHandler("ms")
-        cursor.setinputsizes(oracledb.DB_TYPE_TIMESTAMP)
-        await cursor.execute("select :d from dual", [d])
-        (result,) = await cursor.fetchone()
-        assert result == int(d.timestamp() * 1000)
-    with async_conn.cursor() as cursor:
-        cursor.outputtypehandler = TimestampOutputTypeHandler("s")
-        cursor.setinputsizes(oracledb.DB_TYPE_TIMESTAMP)
-        await cursor.execute("select :d from dual", [d])
-        (result,) = await cursor.fetchone()
-        assert result == int(d.timestamp())
diff --git a/tests/test_6100_cursor_executemany_async.py b/tests/test_6100_cursor_executemany_async.py
deleted file mode 100644
index 5fe3983f..00000000
--- a/tests/test_6100_cursor_executemany_async.py
+++ /dev/null
@@ -1,438 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6100 - Module for testing the cursor executemany() method
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def empty_tab(async_cursor):
-    await async_cursor.execute("truncate table TestTempTable")
-
-
-async def test_6100(async_conn, async_cursor, empty_tab):
-    "6100 - test executing a statement multiple times (named args)"
-    rows = [{"value": n} for n in range(250)]
-    async_cursor.arraysize = 100
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol) values (:value)",
-        rows,
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == len(rows)
-
-
-async def test_6101(async_conn, async_cursor, empty_tab):
-    "6101 - test executing a statement multiple times (positional args)"
-    rows = [[n] for n in range(230)]
-    async_cursor.arraysize = 100
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol) values (:1)",
-        rows,
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == len(rows)
-
-
-async def test_6102(async_conn, async_cursor, empty_tab):
-    "6102 - test executing a statement multiple times (with prepare)"
-    rows = [[n] for n in range(225)]
-    async_cursor.arraysize = 100
-    async_cursor.prepare("insert into TestTempTable (IntCol) values (:1)")
-    await async_cursor.executemany(None, rows)
-    await async_conn.commit()
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == len(rows)
-
-
-async def test_6103(async_conn, async_cursor, empty_tab):
-    "6103 - test executing a statement multiple times (with rebind)"
-    rows = [[n] for n in range(235)]
-    async_cursor.arraysize = 100
-    statement = "insert into TestTempTable (IntCol) values (:1)"
-    await async_cursor.executemany(statement, rows[:50])
-    await async_cursor.executemany(statement, rows[50:])
-    await async_conn.commit()
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == len(rows)
-
-
-async def test_6104(async_conn):
-    "6104 - test executing multiple times (with input sizes wrong)"
-    cursor = async_conn.cursor()
-    cursor.setinputsizes(oracledb.NUMBER)
-    data = [[decimal.Decimal("25.8")], [decimal.Decimal("30.0")]]
-    await cursor.executemany("declare t number; begin t := :1; end;", data)
-
-
-async def test_6105(async_cursor, empty_tab):
-    "6105 - test executing multiple times (with multiple batches)"
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    await async_cursor.executemany(sql, [(1, None), (2, None)])
-    await async_cursor.executemany(sql, [(3, None), (4, "Testing")])
-
-
-async def test_6106(async_cursor, empty_tab):
-    "6106 - test executemany() with various numeric types"
-    data = [
-        (1, 5),
-        (2, 7.0),
-        (3, 6.5),
-        (4, 2**65),
-        (5, decimal.Decimal("24.5")),
-    ]
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol, NumberCol) values (:1, :2)",
-        data,
-    )
-    await async_cursor.execute(
-        "select IntCol, NumberCol from TestTempTable order by IntCol"
-    )
-    assert await async_cursor.fetchall() == data
-
-
-async def test_6107(async_cursor, empty_tab):
-    "6107 - test executing a statement multiple times (with resize)"
-    rows = [
-        (1, "First"),
-        (2, "Second"),
-        (3, "Third"),
-        (4, "Fourth"),
-        (5, "Fifth"),
-        (6, "Sixth"),
-        (7, "Seventh and the longest one"),
-    ]
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        rows,
-    )
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert await async_cursor.fetchall() == rows
-
-
-async def test_6108(async_cursor, empty_tab, test_env):
-    "6108 - test executing a statement multiple times (with exception)"
-    rows = [{"value": n} for n in (1, 2, 3, 2, 5)]
-    statement = "insert into TestTempTable (IntCol) values (:value)"
-    with test_env.assert_raises_full_code("ORA-00001"):
-        await async_cursor.executemany(statement, rows)
-    assert async_cursor.rowcount == 3
-
-
-async def test_6109(async_cursor, test_env):
-    "6109 - test calling executemany() with invalid parameters"
-    sql = """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)"""
-    with test_env.assert_raises_full_code("DPY-2004"):
-        await async_cursor.executemany(sql, "Not valid parameters")
-
-
-async def test_6110(async_cursor, empty_tab):
-    "6110 - test calling executemany() without any bind parameters"
-    num_rows = 5
-    await async_cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id);
-        end;
-        """,
-        num_rows,
-    )
-    assert async_cursor.rowcount == 0
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == num_rows
-
-
-async def test_6111(async_cursor, empty_tab):
-    "6111 - test calling executemany() with binds performed earlier"
-    num_rows = 9
-    var = async_cursor.var(int, arraysize=num_rows)
-    async_cursor.setinputsizes(var)
-    await async_cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id);
-
-            select sum(IntCol) into :1
-            from TestTempTable;
-        end;
-        """,
-        num_rows,
-    )
-    assert async_cursor.rowcount == 0
-    expected_data = [1, 3, 6, 10, 15, 21, 28, 36, 45]
-    assert var.values == expected_data
-
-
-async def test_6112(async_cursor):
-    "6112 - test executing plsql statements multiple times (with binds)"
-    var = async_cursor.var(int, arraysize=5)
-    async_cursor.setinputsizes(var)
-    data = [[25], [30], [None], [35], [None]]
-    exepected_data = [25, 30, None, 35, None]
-    await async_cursor.executemany(
-        "declare t number; begin t := :1; end;", data
-    )
-    assert var.values == exepected_data
-
-
-async def test_6113(async_cursor, test_env):
-    "6113 - test executemany with incorrect parameters"
-    with test_env.assert_raises_full_code("DPY-2004"):
-        await async_cursor.executemany("select :1 from dual", [1])
-
-
-async def test_6114(async_cursor, test_env):
-    "6114 - test executemany with mixed binds (pos first)"
-    rows = [["test"], {"value": 1}]
-    with test_env.assert_raises_full_code("DPY-2006"):
-        await async_cursor.executemany("select :1 from dual", rows)
-
-
-async def test_6115(async_cursor, test_env):
-    "6115 - test executemany with mixed binds (name first)"
-    rows = [{"value": 1}, ["test"]]
-    with test_env.assert_raises_full_code("DPY-2006"):
-        await async_cursor.executemany("select :value from dual", rows)
-
-
-async def test_6116(async_cursor, empty_tab):
-    "6116 - test executemany() with a pl/sql statement with dml returning"
-    num_rows = 5
-    out_var = async_cursor.var(oracledb.NUMBER, arraysize=5)
-    async_cursor.setinputsizes(out_var)
-    await async_cursor.executemany(
-        """
-        declare
-            t_Id          number;
-        begin
-            select nvl(count(*), 0) + 1 into t_Id
-            from TestTempTable;
-
-            insert into TestTempTable (IntCol, StringCol1)
-            values (t_Id, 'Test String ' || t_Id)
-            returning IntCol into :out_bind;
-        end;
-        """,
-        num_rows,
-    )
-    assert out_var.values == [1, 2, 3, 4, 5]
-
-
-async def test_6117(async_cursor, empty_tab):
-    "6117 - test executemany() with pl/sql in binds and out binds"
-    values = [5, 8, 17, 24, 6]
-    data = [(i, f"Test {i}") for i in values]
-    out_bind = async_cursor.var(oracledb.NUMBER, arraysize=5)
-    async_cursor.setinputsizes(None, None, out_bind)
-    await async_cursor.executemany(
-        """
-        begin
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol into :out_bind;
-        end;
-        """,
-        data,
-    )
-    assert out_bind.values == values
-
-
-async def test_6118(async_cursor, empty_tab):
-    "6118 - test executemany() with pl/sql outbinds"
-    out_bind = async_cursor.var(oracledb.NUMBER, arraysize=5)
-    async_cursor.setinputsizes(out_bind)
-    await async_cursor.executemany("begin :out_var := 5; end;", 5)
-    assert out_bind.values == [5, 5, 5, 5, 5]
-
-
-async def test_6119(async_cursor):
-    "6119 - test re-executemany() with pl/sql in binds and out binds"
-    values = [5, 8, 17, 24, 6]
-    data = [(i, f"Test {i}") for i in values]
-    for i in range(2):
-        await async_cursor.execute("truncate table TestTempTable")
-        out_bind = async_cursor.var(oracledb.NUMBER, arraysize=5)
-        async_cursor.setinputsizes(None, None, out_bind)
-        await async_cursor.executemany(
-            """
-            begin
-                insert into TestTempTable (IntCol, StringCol1)
-                values (:int_val, :str_val)
-                returning IntCol into :out_bind;
-            end;
-            """,
-            data,
-        )
-        assert out_bind.values == values
-
-
-async def test_6120(async_cursor):
-    "6120 - test PL/SQL statement with single row bind"
-    value = 4020
-    var = async_cursor.var(int)
-    await async_cursor.executemany("begin :1 := :2; end;", [[var, value]])
-    assert var.values == [value]
-
-
-async def test_6121(async_conn, async_cursor, empty_tab):
-    "6121 - test deferral of type assignment"
-    data = [(1, None), (2, 25)]
-    await async_cursor.executemany(
-        """
-        insert into TestTempTable
-        (IntCol, NumberCol)
-        values (:1, :2)
-        """,
-        data,
-    )
-    await async_conn.commit()
-    await async_cursor.execute(
-        """
-        select IntCol, NumberCol
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert await async_cursor.fetchall() == data
-
-
-async def test_6122(async_cursor):
-    "6122 - test PL/SQL with a lerge number of binds"
-    parts = []
-    bind_names = []
-    all_bind_values = []
-    out_binds = []
-    for i in range(5):
-        all_bind_values.append([])
-    for i in range(350):
-        n = len(parts) + 1
-        bind_names.extend([f"v_out_{n}_0", f"a_{n}", f"b_{n}", f"c_{n}"])
-        parts.append(f":v_out{n} := :a_{n} + :b_{n} + :c_{n};")
-        out_binds.append(async_cursor.var(int, arraysize=len(all_bind_values)))
-        for j, bind_values in enumerate(all_bind_values):
-            bind_values.extend(
-                [out_binds[-1], n * 1 + j, n * 2 + j, n * 3 + j]
-            )
-    lf = "\n"
-    sql = f"begin{lf}{lf.join(parts)}{lf}end;"
-    await async_cursor.executemany(sql, all_bind_values)
-    init_val = 6
-    for var in out_binds:
-        expected_values = [
-            init_val,
-            init_val + 3,
-            init_val + 6,
-            init_val + 9,
-            init_val + 12,
-        ]
-        assert var.values == expected_values
-        init_val += 6
-
-
-async def test_6123(async_conn, test_env):
-    "6123 - test executing no statement"
-    cursor = async_conn.cursor()
-    with test_env.assert_raises_full_code("DPY-2001"):
-        await cursor.executemany(None, [1, 2])
-
-
-async def test_6124(async_cursor):
-    "6124 - test executemany with empty parameter set"
-    sql = "insert into TestTempTable values (:1)"
-    await async_cursor.executemany(sql, [])
-
-
-async def test_6125(async_cursor, test_env):
-    "6125 - test executemany with an empty statement"
-    with test_env.assert_raises_full_code("DPY-2066"):
-        await async_cursor.executemany("", 5)
-    with test_env.assert_raises_full_code("DPY-2066"):
-        await async_cursor.executemany("  ", 5)
-
-
-async def test_6126(cursor):
-    "6126 - test executemany with batch size 0"
-    rows = [[1], [2]]
-    with pytest.raises(TypeError):
-        await cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            rows,
-            batch_size=0,
-        )
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-async def test_6127(
-    batch_size, async_conn, async_cursor, empty_tab, round_trip_checker_async
-):
-    "6127 - test executemany with various batch sizes"
-    rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        rows,
-        batch_size=batch_size,
-    )
-    num_round_trips = len(rows) // batch_size
-    if len(rows) % batch_size:
-        num_round_trips += 1
-    assert await round_trip_checker_async.get_value_async() == num_round_trips
-    await async_conn.commit()
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert await async_cursor.fetchall() == rows
diff --git a/tests/test_6200_cursor_callproc_async.py b/tests/test_6200_cursor_callproc_async.py
deleted file mode 100644
index a7788d3a..00000000
--- a/tests/test_6200_cursor_callproc_async.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6200 - Module for testing the methods for calling stored procedures and
-functions (callproc() and callfunc()) with asyncio
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_6200(async_cursor):
-    "6200 - test executing a stored procedure"
-    var = async_cursor.var(oracledb.NUMBER)
-    results = await async_cursor.callproc("proc_Test", ("hi", 5, var))
-    assert results == ["hi", 10, 2.0]
-
-
-async def test_6201(async_cursor):
-    "6201 - test executing a stored procedure with all args keyword args"
-    inout_value = async_cursor.var(oracledb.NUMBER)
-    inout_value.setvalue(0, 5)
-    out_value = async_cursor.var(oracledb.NUMBER)
-    kwargs = dict(
-        a_InOutValue=inout_value, a_InValue="hi", a_OutValue=out_value
-    )
-    results = await async_cursor.callproc("proc_Test", [], kwargs)
-    assert results == []
-    assert inout_value.getvalue() == 10
-    assert out_value.getvalue() == 2.0
-
-
-async def test_6202(async_cursor):
-    "6202 - test executing a stored procedure with last arg as keyword arg"
-    out_value = async_cursor.var(oracledb.NUMBER)
-    kwargs = dict(a_OutValue=out_value)
-    results = await async_cursor.callproc("proc_Test", ("hi", 5), kwargs)
-    assert results == ["hi", 10]
-    assert out_value.getvalue() == 2.0
-
-
-async def test_6203(async_cursor, test_env):
-    "6203 - test executing a stored procedure, repeated keyword arg"
-    kwargs = dict(a_InValue="hi", a_OutValue=async_cursor.var(oracledb.NUMBER))
-    with test_env.assert_raises_full_code("ORA-06550"):
-        await async_cursor.callproc("proc_Test", ("hi", 5), kwargs)
-
-
-async def test_6204(async_cursor):
-    "6204 - test executing a stored procedure without any arguments"
-    results = await async_cursor.callproc("proc_TestNoArgs")
-    assert results == []
-
-
-async def test_6205(async_cursor):
-    "6205 - test executing a stored function"
-    results = await async_cursor.callfunc(
-        "func_Test", oracledb.NUMBER, ("hi", 5)
-    )
-    assert results == 7
-
-
-async def test_6206(async_cursor):
-    "6206 - test executing a stored function without any arguments"
-    results = await async_cursor.callfunc("func_TestNoArgs", oracledb.NUMBER)
-    assert results == 712
-
-
-async def test_6207(async_cursor, test_env):
-    "6207 - test executing a stored function with wrong parameters"
-    func_name = "func_Test"
-    with test_env.assert_raises_full_code("DPY-2007"):
-        await async_cursor.callfunc(oracledb.NUMBER, func_name, ("hi", 5))
-    with test_env.assert_raises_full_code("ORA-06550"):
-        await async_cursor.callfunc(func_name, oracledb.NUMBER, ("hi", 5, 7))
-    with test_env.assert_raises_full_code("DPY-2012"):
-        await async_cursor.callfunc(func_name, oracledb.NUMBER, "hi", 7)
-    with test_env.assert_raises_full_code("ORA-06502"):
-        await async_cursor.callfunc(func_name, oracledb.NUMBER, [5, "hi"])
-    with test_env.assert_raises_full_code("ORA-06550"):
-        await async_cursor.callfunc(func_name, oracledb.NUMBER)
-    with test_env.assert_raises_full_code("DPY-2012"):
-        await async_cursor.callfunc(func_name, oracledb.NUMBER, 5)
-
-
-async def test_6208(async_cursor, test_env):
-    "6208 - test error for keyword args with invalid type"
-    kwargs = [5]
-    with test_env.assert_raises_full_code("DPY-2013"):
-        await async_cursor.callproc("proc_Test", [], kwargs)
-    with test_env.assert_raises_full_code("DPY-2013"):
-        await async_cursor.callfunc("func_Test", oracledb.NUMBER, [], kwargs)
-
-
-async def test_6209(async_cursor):
-    "6209 - test calling a procedure with a string > 32767 characters"
-    data = "6209" * 16000
-    size_var = async_cursor.var(int)
-    await async_cursor.callproc("pkg_TestLobs.GetSize", [data, size_var])
-    assert size_var.getvalue() == len(data)
-
-
-async def test_6210(async_cursor):
-    "6210 - test calling a procedure with raw data > 32767 bytes"
-    data = b"6210" * 16250
-    size_var = async_cursor.var(int)
-    await async_cursor.callproc("pkg_TestLobs.GetSize", [data, size_var])
-    assert size_var.getvalue() == len(data)
diff --git a/tests/test_6300_cursor_other_async.py b/tests/test_6300_cursor_other_async.py
deleted file mode 100644
index 14aa39f1..00000000
--- a/tests/test_6300_cursor_other_async.py
+++ /dev/null
@@ -1,970 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6300 - Module for testing other cursor methods and attributes with asyncio.
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_6300(async_cursor):
-    "6300 - test preparing a statement and executing it multiple times"
-    assert async_cursor.statement is None
-    statement = "begin :value := :value + 5; end;"
-    async_cursor.prepare(statement)
-    var = async_cursor.var(oracledb.NUMBER)
-    assert async_cursor.statement == statement
-    var.setvalue(0, 2)
-    await async_cursor.execute(None, value=var)
-    assert var.getvalue() == 7
-    await async_cursor.execute(None, value=var)
-    assert var.getvalue() == 12
-    await async_cursor.execute("begin :value2 := 3; end;", value2=var)
-    assert var.getvalue() == 3
-
-
-async def test_6301(async_conn, test_env):
-    "6301 - confirm an exception is raised after closing a cursor"
-    with async_conn.cursor() as cursor:
-        pass
-    with test_env.assert_raises_full_code("DPY-1006"):
-        await cursor.execute("select 1 from dual")
-
-
-async def test_6302(async_cursor):
-    "6302 - test iterators"
-    await async_cursor.execute(
-        """
-        select IntCol
-        from TestNumbers
-        where IntCol between 1 and 3
-        order by IntCol
-        """
-    )
-    rows = [v async for v, in async_cursor]
-    assert rows == [1, 2, 3]
-
-
-async def test_6303(async_cursor, test_env):
-    "6303 - test iterators (with intermediate execute)"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute(
-        """
-        select IntCol
-        from TestNumbers
-        where IntCol between 1 and 3
-        order by IntCol
-        """
-    )
-    test_iter = async_cursor.__aiter__()
-    (value,) = await test_iter.__anext__()
-    await async_cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    with test_env.assert_raises_full_code("DPY-1003"):
-        await test_iter.__anext__()
-
-
-async def test_6304(async_cursor):
-    "6304 - test setting input sizes without any parameters"
-    async_cursor.setinputsizes()
-    await async_cursor.execute("select :val from dual", val="Test Value")
-    assert await async_cursor.fetchall() == [("Test Value",)]
-
-
-async def test_6305(async_cursor):
-    "6305 - test setting input sizes with an empty dictionary"
-    empty_dict = {}
-    async_cursor.prepare("select 236 from dual")
-    async_cursor.setinputsizes(**empty_dict)
-    await async_cursor.execute(None, empty_dict)
-    assert await async_cursor.fetchall() == [(236,)]
-
-
-async def test_6306(async_cursor):
-    "6306 - test setting input sizes with an empty list"
-    empty_list = []
-    async_cursor.prepare("select 239 from dual")
-    async_cursor.setinputsizes(*empty_list)
-    await async_cursor.execute(None, empty_list)
-    assert await async_cursor.fetchall() == [(239,)]
-
-
-async def test_6307(async_cursor):
-    "6307 - test setting input sizes with positional args"
-    var = async_cursor.var(oracledb.STRING, 100)
-    async_cursor.setinputsizes(None, 5, None, 10, None, oracledb.NUMBER)
-    await async_cursor.execute(
-        """
-        begin
-          :1 := :2 || to_char(:3) || :4 || to_char(:5) || to_char(:6);
-        end;
-        """,
-        [var, "test_", 5, "_second_", 3, 7],
-    )
-    assert var.getvalue() == "test_5_second_37"
-
-
-async def test_6308(async_cursor):
-    "6308 - test parsing query statements"
-    sql = "select LongIntCol from TestNumbers where IntCol = :val"
-    await async_cursor.parse(sql)
-    assert async_cursor.statement == sql
-    assert async_cursor.description == [
-        ("LONGINTCOL", oracledb.DB_TYPE_NUMBER, 17, None, 16, 0, 0)
-    ]
-
-
-async def test_6309(async_cursor):
-    "6309 - test binding boolean data without the use of PL/SQL"
-    await async_cursor.execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-    await async_cursor.execute(sql, (False, "Value should be 0"))
-    await async_cursor.execute(sql, (True, "Value should be 1"))
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    expected_value = [(0, "Value should be 0"), (1, "Value should be 1")]
-    assert await async_cursor.fetchall() == expected_value
-
-
-async def test_6310(async_conn, test_env):
-    "6310 - test using a cursor as a context manager"
-    with async_conn.cursor() as cursor:
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.execute("select count(*) from TestTempTable")
-        (count,) = await cursor.fetchone()
-        assert count == 0
-    with test_env.assert_raises_full_code("DPY-1006"):
-        cursor.close()
-
-
-async def test_6311(async_cursor):
-    "6311 - test that rowcount attribute is reset to zero on query execute"
-    for num in [0, 1, 1, 0]:
-        await async_cursor.execute("select * from dual where 1 = :s", [num])
-        await async_cursor.fetchone()
-        assert async_cursor.rowcount == num
-
-
-async def test_6312(async_conn, async_cursor):
-    "6312 - test that an object type can be used as type in cursor.var()"
-    obj_type = await async_conn.gettype("UDT_OBJECT")
-    var = async_cursor.var(obj_type)
-    await async_cursor.callproc(
-        "pkg_TestBindObject.BindObjectOut", (28, "Bind obj out", var)
-    )
-    obj = var.getvalue()
-    result = await async_cursor.callfunc(
-        "pkg_TestBindObject.GetStringRep", str, (obj,)
-    )
-    exp = "udt_Object(28, 'Bind obj out', null, null, null, null, null)"
-    assert result == exp
-
-
-async def test_6313(async_cursor):
-    "6313 - test that fetching an XMLType returns a string"
-    int_val = 5
-    label = "IntCol"
-    expected_result = f"<{label}>{int_val}</{label}>"
-    await async_cursor.execute(
-        f"""
-        select XMLElement("{label}", IntCol)
-        from TestStrings
-        where IntCol = :int_val
-        """,
-        int_val=int_val,
-    )
-    (result,) = await async_cursor.fetchone()
-    assert result == expected_result
-
-
-async def test_6314(async_cursor):
-    "6314 - test last rowid"
-
-    # no statement executed: no rowid
-    assert async_cursor.lastrowid is None
-
-    # DDL statement executed: no rowid
-    await async_cursor.execute("truncate table TestTempTable")
-    assert async_cursor.lastrowid is None
-
-    # statement prepared: no rowid
-    async_cursor.prepare("insert into TestTempTable (IntCol) values (:1)")
-    assert async_cursor.lastrowid is None
-
-    # multiple rows inserted: rowid of last row inserted
-    rows = [(n,) for n in range(225)]
-    await async_cursor.executemany(None, rows)
-    rowid = async_cursor.lastrowid
-    await async_cursor.execute(
-        """
-        select rowid
-        from TestTempTable
-        where IntCol = :1
-        """,
-        rows[-1],
-    )
-    row = await async_cursor.fetchone()
-    assert row[0] == rowid
-
-    # statement executed but no rows updated: no rowid
-    await async_cursor.execute("delete from TestTempTable where 1 = 0")
-    assert async_cursor.lastrowid is None
-
-    # stetement executed with one row updated: rowid of updated row
-    await async_cursor.execute(
-        """
-        update TestTempTable set StringCol1 = 'Modified'
-        where IntCol = :1
-        """,
-        rows[-2],
-    )
-    rowid = async_cursor.lastrowid
-    await async_cursor.execute(
-        "select rowid from TestTempTable where IntCol = :1",
-        rows[-2],
-    )
-    row = await async_cursor.fetchone()
-    assert row[0] == rowid
-
-    # statement executed with many rows updated: rowid of last updated row
-    await async_cursor.execute(
-        """
-        update TestTempTable set
-            StringCol1 = 'Row ' || to_char(IntCol)
-        where IntCol = :1
-        """,
-        rows[-3],
-    )
-    rowid = async_cursor.lastrowid
-    await async_cursor.execute(
-        "select StringCol1 from TestTempTable where rowid = :1",
-        [rowid],
-    )
-    row = await async_cursor.fetchone()
-    assert row[0] == "Row %s" % rows[-3]
-
-
-async def test_6315(async_conn, round_trip_checker_async):
-    "6315 - test prefetch rows"
-
-    # perform simple query and verify only one round trip is needed
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select sysdate from dual")
-        await cursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 1
-
-    # set prefetchrows to 1 and verify that two round trips are now needed
-    with async_conn.cursor() as cursor:
-        cursor.prefetchrows = 1
-        assert cursor.prefetchrows == 1
-        await cursor.execute("select sysdate from dual")
-        await cursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 2
-
-    # simple DDL only requires a single round trip
-    with async_conn.cursor() as cursor:
-        await cursor.execute("truncate table TestTempTable")
-        assert await round_trip_checker_async.get_value_async() == 1
-
-    # array execution only requires a single round trip
-    num_rows = 590
-    with async_conn.cursor() as cursor:
-        data = [(n + 1,) for n in range(num_rows)]
-        await cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            data,
-        )
-        assert await round_trip_checker_async.get_value_async() == 1
-
-    # setting prefetch and array size to 1 requires a round-trip for each
-    # row
-    with async_conn.cursor() as cursor:
-        cursor.arraysize = 1
-        cursor.prefetchrows = 1
-        assert cursor.prefetchrows == 1
-        await cursor.execute("select IntCol from TestTempTable")
-        await cursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == num_rows + 1
-
-    # setting prefetch and array size to 300 requires 2 round-trips
-    with async_conn.cursor() as cursor:
-        cursor.arraysize = 300
-        cursor.prefetchrows = 300
-        assert cursor.prefetchrows == 300
-        await cursor.execute("select IntCol from TestTempTable")
-        await cursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 2
-
-
-async def test_6316(async_conn, round_trip_checker_async):
-    "6316 - test prefetch rows using existing cursor"
-
-    # Set prefetch rows on an existing cursor
-    num_rows = 590
-    with async_conn.cursor() as cursor:
-        await cursor.execute("truncate table TestTempTable")
-        assert await round_trip_checker_async.get_value_async() == 1
-        data = [(n + 1,) for n in range(num_rows)]
-        await cursor.executemany(
-            "insert into TestTempTable (IntCol) values (:1)",
-            data,
-        )
-        assert await round_trip_checker_async.get_value_async() == 1
-        cursor.prefetchrows = 30
-        cursor.arraysize = 100
-        await cursor.execute("select IntCol from TestTempTable")
-        await cursor.fetchall()
-        assert await round_trip_checker_async.get_value_async() == 7
-
-
-async def test_6317(async_cursor):
-    "6317 - test parsing plsql statements"
-    sql = "begin :value := 5; end;"
-    await async_cursor.parse(sql)
-    assert async_cursor.statement == sql
-    assert async_cursor.description is None
-
-
-async def test_6318(async_cursor):
-    "6318 - test parsing ddl statements"
-    sql = "truncate table TestTempTable"
-    await async_cursor.parse(sql)
-    assert async_cursor.statement == sql
-    assert async_cursor.description is None
-
-
-async def test_6319(async_cursor):
-    "6319 - test parsing dml statements"
-    sql = "insert into TestTempTable (IntCol) values (1)"
-    await async_cursor.parse(sql)
-    assert async_cursor.statement == sql
-    assert async_cursor.description is None
-
-
-async def test_6320(async_cursor):
-    "6320 - test binding by name with leading colon"
-    params = {":arg1": 5}
-    await async_cursor.execute("select :arg1 from dual", params)
-    (result,) = await async_cursor.fetchone()
-    assert result == params[":arg1"]
-
-
-async def test_6321(async_cursor):
-    "6321 - test binding mixed null and not null values in a PL/SQL block"
-    out_vars = [async_cursor.var(str) for i in range(4)]
-    await async_cursor.execute(
-        """
-        begin
-            :1 := null;
-            :2 := 'Value 1';
-            :3 := null;
-            :4 := 'Value 2';
-        end;
-        """,
-        out_vars,
-    )
-    values = [var.getvalue() for var in out_vars]
-    assert values == [None, "Value 1", None, "Value 2"]
-
-
-async def test_6322(async_conn, parse_count_checker_async):
-    "6322 - test excluding statement from statement cache"
-    num_iters = 10
-    sql = "select user from dual"
-
-    # with statement cache enabled, only one parse should take place
-    for i in range(num_iters):
-        with async_conn.cursor() as cursor:
-            await cursor.execute(sql)
-    assert await parse_count_checker_async.get_value_async() == 1
-
-    # with statement cache disabled for the statement, parse count should
-    # be the same as the number of iterations
-    for i in range(num_iters):
-        with async_conn.cursor() as cursor:
-            cursor.prepare(sql, cache_statement=False)
-            await cursor.execute(None)
-    assert await parse_count_checker_async.get_value_async() == num_iters - 1
-
-
-async def test_6323(async_cursor):
-    "6323 - test repeated DDL"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute("insert into TestTempTable (IntCol) values (1)")
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute("insert into TestTempTable (IntCol) values (1)")
-
-
-async def test_6324(async_cursor):
-    "6324 - test executing SQL with non-ASCII characters"
-    await async_cursor.execute("select 'FÖÖ' from dual")
-    (result,) = await async_cursor.fetchone()
-    assert result in ("FÖÖ", "F¿¿")
-
-
-async def test_6325(async_cursor):
-    "6325 - test case sensitivity of unquoted bind names"
-    await async_cursor.execute("select :test from dual", {"TEST": "a"})
-    (result,) = await async_cursor.fetchone()
-    assert result == "a"
-
-
-async def test_6326(async_cursor, test_env):
-    "6326 - test case sensitivity of quoted bind names"
-    with test_env.assert_raises_full_code("ORA-01036", "DPY-4008"):
-        await async_cursor.execute('select :"test" from dual', {'"TEST"': "a"})
-
-
-async def test_6327(async_cursor, test_env):
-    "6327 - test using a reserved keywords as a bind name"
-    sql = "select :ROWID from dual"
-    with test_env.assert_raises_full_code("ORA-01745"):
-        await async_cursor.parse(sql)
-
-
-async def test_6328(async_conn):
-    "6328 - test array size less than prefetch rows"
-    for i in range(2):
-        with async_conn.cursor() as cursor:
-            cursor.arraysize = 1
-            await cursor.execute("select 1 from dual union select 2 from dual")
-            assert await cursor.fetchall() == [(1,), (2,)]
-
-
-async def test_6329(async_conn, async_cursor):
-    "6329 - test re-executing a query with blob as bytes"
-
-    def type_handler(cursor, metadata):
-        if metadata.type_code is oracledb.DB_TYPE_BLOB:
-            return cursor.var(bytes, arraysize=cursor.arraysize)
-
-    async_conn.outputtypehandler = type_handler
-    blob_data = b"An arbitrary set of blob data for test case 4348"
-    await async_cursor.execute("truncate table TestBLOBs")
-    await async_cursor.execute(
-        "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
-        [blob_data],
-    )
-    await async_cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    assert await async_cursor.fetchall() == [(1, blob_data)]
-
-    await async_cursor.execute("truncate table TestBLOBs")
-    await async_cursor.execute(
-        "insert into TestBLOBs (IntCol, BlobCol) values (1, :data)",
-        [blob_data],
-    )
-    await async_cursor.execute("select IntCol, BlobCol from TestBLOBs")
-    assert await async_cursor.fetchall() == [(1, blob_data)]
-
-
-async def test_6330(async_cursor, test_env):
-    "6330 - test re-executing a statement after raising an error"
-    sql = "select * from TestFakeTable"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        await async_cursor.execute(sql)
-    with test_env.assert_raises_full_code("ORA-00942"):
-        await async_cursor.execute(sql)
-
-    sql = "insert into TestStrings (StringCol) values (NULL)"
-    with test_env.assert_raises_full_code("ORA-01400"):
-        await async_cursor.execute(sql)
-    with test_env.assert_raises_full_code("ORA-01400"):
-        await async_cursor.execute(sql)
-
-
-async def test_6331(async_conn):
-    "6331 - test executing a statement that raises ORA-01007"
-    with async_conn.cursor() as cursor:
-        await cursor.execute(
-            """
-            create or replace view ora_1007 as
-                select 1 as SampleNumber, 'String' as SampleString,
-                    'Another String' as AnotherString
-                from dual
-            """
-        )
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select * from ora_1007")
-        assert await cursor.fetchone() == (1, "String", "Another String")
-    with async_conn.cursor() as cursor:
-        await cursor.execute(
-            """
-            create or replace view ora_1007 as
-                select 1 as SampleNumber,
-                    'Another String' as AnotherString
-                from dual
-            """
-        )
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select * from ora_1007")
-        assert await cursor.fetchone() == (1, "Another String")
-
-
-async def test_6332(async_cursor):
-    "6332 - test updating an empty row"
-    int_var = async_cursor.var(int)
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.execute(
-        """
-        begin
-            update TestTempTable set IntCol = :1
-            where StringCol1 = :2
-            returning IntCol into :3;
-        end;
-        """,
-        [1, "test string 4352", int_var],
-    )
-    assert int_var.values == [None]
-
-
-async def test_6333(async_conn):
-    "6333 - fetch duplicate data from query in statement cache"
-    sql = """
-            select 'A', 'B', 'C' from dual
-            union all
-            select 'A', 'B', 'C' from dual
-            union all
-            select 'A', 'B', 'C' from dual"""
-    expected_data = [("A", "B", "C")] * 3
-    with async_conn.cursor() as cursor:
-        cursor.prefetchrows = 0
-        await cursor.execute(sql)
-        assert await cursor.fetchall() == expected_data
-    with async_conn.cursor() as cursor:
-        cursor.prefetchrows = 0
-        await cursor.execute(sql)
-        assert await cursor.fetchall() == expected_data
-
-
-async def test_6334(async_cursor):
-    "6334 - fetch duplicate data with outconverter"
-
-    def out_converter(value):
-        assert isinstance(value, str)
-        return int(value)
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "COL_3":
-            return cursor.var(
-                str, arraysize=cursor.arraysize, outconverter=out_converter
-            )
-
-    async_cursor.outputtypehandler = type_handler
-    await async_cursor.execute(
-        """
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-            union all
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-            union all
-        select 'A' as col_1, 2 as col_2, 3 as col_3 from dual
-        """
-    )
-    expected_data = [("A", 2, 3)] * 3
-    assert await async_cursor.fetchall() == expected_data
-
-
-async def test_6335(skip_if_drcp, test_env):
-    "6335 - kill connection with open cursor"
-    admin_conn = await test_env.get_admin_connection_async()
-    conn = await test_env.get_connection_async()
-    assert conn.is_healthy()
-    sid, serial = (conn.session_id, conn.serial_num)
-    with admin_conn.cursor() as admin_cursor:
-        sql = f"alter system kill session '{sid},{serial}'"
-        await admin_cursor.execute(sql)
-    with test_env.assert_raises_full_code("DPY-4011"):
-        with conn.cursor() as cursor:
-            await cursor.execute("select user from dual")
-    assert not conn.is_healthy()
-
-
-async def test_6336(skip_if_drcp, test_env):
-    "6336 - kill connection in cursor context manager"
-    admin_conn = await test_env.get_admin_connection_async()
-    conn = await test_env.get_connection_async()
-    assert conn.is_healthy()
-    sid, serial = (conn.session_id, conn.serial_num)
-    with admin_conn.cursor() as admin_cursor:
-        await admin_cursor.execute(
-            f"alter system kill session '{sid},{serial}'"
-        )
-    with test_env.assert_raises_full_code("DPY-4011"):
-        with conn.cursor() as cursor:
-            await cursor.execute("select user from dual")
-    assert not conn.is_healthy()
-
-
-async def test_6337(async_conn):
-    "6337 - fetchmany() with and without parameters"
-    sql_part = "select user from dual"
-    sql = " union all ".join([sql_part] * 10)
-    with async_conn.cursor() as cursor:
-        cursor.arraysize = 6
-        await cursor.execute(sql)
-        rows = await cursor.fetchmany()
-        assert len(rows) == cursor.arraysize
-        await cursor.execute(sql)
-        rows = await cursor.fetchmany(size=2)
-        assert len(rows) == 2
-        await cursor.execute(sql)
-
-
-async def test_6338(async_conn):
-    "6338 - access cursor.rowcount after closing cursor"
-    with async_conn.cursor() as cursor:
-        await cursor.execute("select user from dual")
-        await cursor.fetchall()
-        assert cursor.rowcount == 1
-    assert cursor.rowcount == -1
-
-
-async def test_6339(disable_fetch_lobs, async_cursor):
-    "6339 - changing bind type with define needed"
-    await async_cursor.execute("truncate table TestClobs")
-    row_for_1 = (1, "Short value 1")
-    row_for_56 = (56, "Short value 56")
-    for data in (row_for_1, row_for_56):
-        await async_cursor.execute(
-            "insert into TestClobs (IntCol, ClobCol) values (:1, :2)",
-            data,
-        )
-    sql = "select IntCol, ClobCol from TestClobs where IntCol = :int_col"
-    await async_cursor.execute(sql, int_col="1")
-    assert await async_cursor.fetchone() == row_for_1
-    await async_cursor.execute(sql, int_col="56")
-    assert await async_cursor.fetchone() == row_for_56
-    await async_cursor.execute(sql, int_col=1)
-    assert await async_cursor.fetchone() == row_for_1
-
-
-async def test_6340(async_cursor):
-    "6340 - test calling cursor.parse() twice with the same statement"
-    await async_cursor.execute("truncate table TestTempTable")
-    data = (4363, "Value for test 4363")
-    await async_cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        data,
-    )
-    sql = "update TestTempTable set StringCol1 = :v where IntCol = :i"
-    for i in range(2):
-        await async_cursor.parse(sql)
-        await async_cursor.execute(sql, ("Updated value", data[0]))
-
-
-async def test_6341(async_conn, async_cursor):
-    "6341 - test addition of column to cached query"
-    table_name = "test_4365"
-    try:
-        await async_cursor.execute(f"drop table {table_name}")
-    except oracledb.DatabaseError:
-        pass
-    data = ("val 1", "val 2")
-    await async_cursor.execute(
-        f"create table {table_name} (col1 varchar2(10))"
-    )
-    await async_cursor.execute(
-        f"insert into {table_name} values (:1)", [data[0]]
-    )
-    await async_conn.commit()
-    await async_cursor.execute(f"select * from {table_name}")
-    assert await async_cursor.fetchall() == [(data[0],)]
-    await async_cursor.execute(
-        f"alter table {table_name} add col2 varchar2(10)"
-    )
-    await async_cursor.execute(f"update {table_name} set col2 = :1", [data[1]])
-    await async_conn.commit()
-    await async_cursor.execute(f"select * from {table_name}")
-    assert await async_cursor.fetchall() == [data]
-
-
-async def test_6342(async_cursor):
-    "6342 - test executemany() with PL/SQL and increasing data lengths"
-    sql = "begin :1 := length(:2); end;"
-    var = async_cursor.var(int, arraysize=3)
-    await async_cursor.executemany(
-        sql, [(var, "one"), (var, "two"), (var, "end")]
-    )
-    assert var.values == [3, 3, 3]
-    await async_cursor.executemany(
-        sql, [(var, "three"), (var, "four"), (var, "end")]
-    )
-    assert var.values == [5, 4, 3]
-    await async_cursor.executemany(
-        sql, [(var, "five"), (var, "six"), (var, "end")]
-    )
-    assert var.values == [4, 3, 3]
-
-
-async def test_6343(async_cursor):
-    "6343 - test cursor.rowcount values for queries"
-    max_rows = 93
-    async_cursor.arraysize = 10
-    await async_cursor.execute(
-        "select rownum as id from dual connect by rownum <= :1",
-        [max_rows],
-    )
-    assert async_cursor.rowcount == 0
-    batch_num = 1
-    while True:
-        rows = await async_cursor.fetchmany()
-        if not rows:
-            break
-        expected_value = min(max_rows, batch_num * async_cursor.arraysize)
-        assert async_cursor.rowcount == expected_value
-        batch_num += 1
-    await async_cursor.fetchall()
-    assert async_cursor.rowcount == max_rows
-
-
-async def test_6344(disable_fetch_lobs, async_conn, async_cursor):
-    "6344 - test bind order for PL/SQL"
-    await async_cursor.execute("truncate table TestClobs")
-    sql = """
-        insert into TestClobs (IntCol, CLOBCol, ExtraNumCol1)
-        values (:1, :2, :3)"""
-    data = "x" * 9000
-    rows = [(1, data, 5), (2, data, 6)]
-    await async_cursor.execute(sql, rows[0])
-    plsql = f"begin {sql}; end;"
-    await async_cursor.execute(plsql, rows[1])
-    await async_conn.commit()
-    await async_cursor.execute(
-        """
-        select IntCol, CLOBCol, ExtraNumCol1
-        from TestCLOBs
-        order by IntCol
-        """
-    )
-    assert await async_cursor.fetchall() == rows
-
-
-async def test_6345(disable_fetch_lobs, async_cursor):
-    "6345 - test rebuild of table with LOB in cached query (as string)"
-    table_name = "test_4370"
-    drop_sql = f"drop table {table_name} purge"
-    create_sql = f"""
-        create table {table_name} (
-            Col1 number(9) not null,
-            Col2 clob not null
-        )"""
-    insert_sql = f"insert into {table_name} values (:1, :2)"
-    query_sql = f"select * from {table_name} order by Col1"
-    data = [(1, "CLOB value 1"), (2, "CLOB value 2")]
-    try:
-        await async_cursor.execute(drop_sql)
-    except oracledb.DatabaseError:
-        pass
-    await async_cursor.execute(create_sql)
-    await async_cursor.executemany(insert_sql, data)
-    await async_cursor.execute(query_sql)
-    assert await async_cursor.fetchall() == data
-    await async_cursor.execute(query_sql)
-    assert await async_cursor.fetchall() == data
-    await async_cursor.execute(drop_sql)
-    await async_cursor.execute(create_sql)
-    await async_cursor.executemany(insert_sql, data)
-    await async_cursor.execute(query_sql)
-    assert await async_cursor.fetchall() == data
-
-
-async def test_6346(async_cursor):
-    "6346 - test rebuild of table with LOB in cached query (as LOB)"
-    table_name = "test_4371"
-    drop_sql = f"drop table {table_name} purge"
-    create_sql = f"""
-        create table {table_name} (
-            Col1 number(9) not null,
-            Col2 clob not null)"""
-    insert_sql = f"insert into {table_name} values (:1, :2)"
-    query_sql = f"select * from {table_name} order by Col1"
-    data = [(1, "CLOB value 1"), (2, "CLOB value 2")]
-    try:
-        await async_cursor.execute(drop_sql)
-    except oracledb.DatabaseError:
-        pass
-    await async_cursor.execute(create_sql)
-    await async_cursor.executemany(insert_sql, data)
-    await async_cursor.execute(query_sql)
-    fetched_data = [(n, await c.read()) async for n, c in async_cursor]
-    assert fetched_data == data
-    await async_cursor.execute(query_sql)
-    fetched_data = [(n, await c.read()) async for n, c in async_cursor]
-    assert fetched_data == data
-    await async_cursor.execute(drop_sql)
-    await async_cursor.execute(create_sql)
-    await async_cursor.executemany(insert_sql, data)
-    await async_cursor.execute(query_sql)
-    fetched_data = [(n, await c.read()) async for n, c in async_cursor]
-    assert fetched_data == data
-
-
-async def test_6347(skip_unless_domains_supported, async_cursor, test_env):
-    "6347 - fetch table with domain and annotations"
-    await async_cursor.execute("select * from TableWithDomainAndAnnotations")
-    assert await async_cursor.fetchall() == [(1, 25)]
-    column_1 = async_cursor.description[0]
-    assert column_1.domain_schema is None
-    assert column_1.domain_name is None
-    assert column_1.annotations is None
-    column_2 = async_cursor.description[1]
-    assert column_2.domain_schema == test_env.main_user.upper()
-    assert column_2.domain_name == "SIMPLEDOMAIN"
-    expected_annotations = {
-        "ANNO_1": "first annotation",
-        "ANNO_2": "second annotation",
-        "ANNO_3": "",
-    }
-    assert column_2.annotations == expected_annotations
-
-
-async def test_6348(async_cursor, test_env):
-    "6348 - test fetching LOBs after an error"
-    sql = """
-        select
-            to_clob(:val),
-            1 / (dbms_lob.getlength(to_clob(:val)) - 1)
-        from dual"""
-    with test_env.assert_raises_full_code("ORA-01476"):
-        await async_cursor.execute(sql, val="a")
-    await async_cursor.execute(sql, val="bb")
-    lob, num_val = await async_cursor.fetchone()
-    assert await lob.read() == "bb"
-    assert num_val == 1
-
-
-async def test_6349(test_env):
-    "6349 - test parse() with autocommit enabled"
-    async with test_env.get_connection_async() as conn:
-        conn.autocommit = True
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        await cursor.parse("insert into TestTempTable (IntCol) values (:1)")
-        await cursor.execute(None, [1])
-
-
-async def test_6350(async_cursor, test_env):
-    "6350 - test cursor.setinputsizes() with early failed execute"
-    async_cursor.setinputsizes(a=int, b=str)
-    with test_env.assert_raises_full_code("DPY-2006"):
-        await async_cursor.execute("select :c from dual", [5])
-    value = 4368
-    await async_cursor.execute("select :d from dual", [value])
-    (fetched_value,) = await async_cursor.fetchone()
-    assert fetched_value == value
-
-
-async def test_6351(async_cursor, test_env):
-    "6351 - fetch JSON columns as Python objects"
-    test_env.skip_unless_server_version(21)
-    expected_data = [
-        (1, [1, 2, 3], [4, 5, 6], [7, 8, 9]),
-        (2, None, None, None),
-    ]
-    await async_cursor.execute("select * from TestJsonCols order by IntCol")
-    assert await async_cursor.fetchall() == expected_data
-
-
-async def test_6352(async_conn):
-    "6352 - test fetching nested cursors repeatedly"
-    sql = """
-        select
-            s.Description,
-            cursor(select 'Nested String for ' || s.Description from dual)
-        from
-            (
-                select 'Top Level String 1' as Description
-                from dual
-                union all
-                select 'Top Level String 2'
-                from dual
-                union all
-                select 'Top Level String 3'
-                from dual
-                union all
-                select 'Top Level String 4'
-                from dual
-                union all
-                select 'Top Level String 5'
-                from dual
-            ) s"""
-
-    for i in range(3):
-        with async_conn.cursor() as cursor:
-            cursor.arraysize = 10
-            await cursor.execute(sql)
-            desc, nested1 = await cursor.fetchone()
-            assert desc == "Top Level String 1"
-            nested_rows = await nested1.fetchall()
-            assert nested_rows == [("Nested String for Top Level String 1",)]
-            desc, nested2 = await cursor.fetchone()
-            assert desc == "Top Level String 2"
-            nested_rows = await nested2.fetchall()
-            assert nested_rows == [("Nested String for Top Level String 2",)]
-
-
-async def test_6353(test_env):
-    "6353 - access cursor.rowcount after closing connection"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-    assert cursor.rowcount == -1
-
-
-async def test_6354(async_conn, async_cursor):
-    "6354 - execute PL/SQL with out vars after query with duplicate data"
-    await async_cursor.execute("truncate table TestTempTable")
-    await async_cursor.executemany(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        [(i + 1, "test_4370") for i in range(20)],
-    )
-    await async_conn.commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    var = async_cursor.var(int)
-    await async_cursor.execute("begin :1 := 4370; end;", [var])
-    assert var.getvalue() == 4370
-
-
-async def test_6355(async_cursor):
-    "6355 - test cursor with fetch_decimals=True specified"
-    value = 4371
-    await async_cursor.execute(
-        "select :1 from dual", [value], fetch_decimals=True
-    )
-    rows = await async_cursor.fetchall()
-    assert isinstance(rows[0][0], decimal.Decimal)
-
-
-async def test_6356(async_cursor):
-    "6356 - test cursor.parse() uses oracledb.defaults.fetch_lobs"
-    await async_cursor.parse("select to_clob('some_value') from dual")
-    fetch_info = async_cursor.description[0]
-    assert fetch_info.type is oracledb.DB_TYPE_CLOB
diff --git a/tests/test_6400_vector_var.py b/tests/test_6400_vector_var.py
deleted file mode 100644
index 57642ea4..00000000
--- a/tests/test_6400_vector_var.py
+++ /dev/null
@@ -1,749 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6400 - Module for testing the VECTOR database type
-"""
-
-import array
-import json
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_vectors_supported):
-    pass
-
-
-def _test_insert_and_fetch(cursor, value, column_name, expected_typecode):
-    """
-    Test inserting and fetching a vector.
-    """
-    cursor.execute("delete from TestVectors")
-    if isinstance(value, list):
-        cursor.setinputsizes(value=oracledb.DB_TYPE_VECTOR)
-    cursor.execute(
-        f"""
-        insert into TestVectors (IntCol, {column_name})
-        values(1, :value)
-        """,
-        value=value,
-    )
-    cursor.connection.commit()
-    cursor.execute(f"select {column_name} from TestVectors")
-    (fetched_value,) = cursor.fetchone()
-    if expected_typecode == "b":
-        expected_value = array.array("b", [int(i) for i in value])
-    else:
-        expected_value = array.array(expected_typecode, value)
-    assert fetched_value == expected_value
-    assert fetched_value.typecode == expected_typecode
-
-
-def _test_plsql_insert_and_fetch(cursor, vec1, vec2, expected_distance):
-    in_out_vec = cursor.var(oracledb.DB_TYPE_VECTOR)
-    in_out_vec.setvalue(0, vec2)
-
-    distance = cursor.var(oracledb.DB_TYPE_BINARY_DOUBLE)
-    output_vec = cursor.var(oracledb.DB_TYPE_VECTOR)
-
-    plsql_block = """
-        BEGIN
-            select
-                vector_distance(:in_vec, :in_out_vec, euclidean)
-                into :distance;
-            :output_vec := :in_out_vec;
-            :in_out_vec := :in_vec;
-        END;
-        """
-
-    cursor.execute(
-        plsql_block,
-        in_vec=vec1,
-        in_out_vec=in_out_vec,
-        distance=distance,
-        output_vec=output_vec,
-    )
-    assert output_vec.getvalue() == vec2
-    assert in_out_vec.getvalue() == vec1
-    assert distance.getvalue() == pytest.approx(expected_distance, abs=0.01)
-
-
-def test_6400(cursor):
-    "6400 - test binding in a vector from a Python list"
-    value = [1, 2]
-    cursor.setinputsizes(oracledb.DB_TYPE_VECTOR)
-    cursor.execute("select :1 from dual", [value])
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == "d"
-    assert fetched_value == array.array("d", value)
-
-
-def test_6401(cursor):
-    "6401 - test binding in a vector from a Python array of type float64"
-    value = array.array("d", [3, 4, 5])
-    cursor.execute("select :1 from dual", [value])
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == "d"
-    assert fetched_value == value
-
-
-def test_6402(cursor):
-    "6402 - test binding in a vector from a Python array of type float32"
-    value = array.array("f", [6, 7, 8, 9])
-    cursor.execute("select :1 from dual", [value])
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == "f"
-    assert fetched_value == value
-
-
-def test_6403(cursor):
-    "6402 - test binding in a vector from a Python array of type int8"
-    value = array.array("b", [-10, 11, -12, 13, -14])
-    cursor.execute("select :1 from dual", [value])
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == "b"
-    assert fetched_value == value
-
-
-def test_6404(cursor, test_env):
-    "6404 - unspported array type for vector"
-    with test_env.assert_raises_full_code("DPY-3013"):
-        cursor.execute("select :1 from dual", [array.array("L", [4, 5])])
-
-
-def test_6405(cursor):
-    "6405 - insert a float32 vector into a float32 column"
-    value = array.array(
-        "f",
-        [
-            1.23,
-            4.56,
-            -7.89,
-            10.11,
-            -12.13,
-            14.15,
-            -16.17,
-            18.19,
-            -20.21,
-            9.23,
-            -2.54,
-            6.5,
-            4.21,
-            -1.96,
-            3.54,
-            2.6,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-
-
-def test_6406(cursor):
-    "6406 - insert a float32 vector into a float64 column"
-    value = array.array(
-        "f",
-        [
-            1.23,
-            4.56,
-            -7.89,
-            10.11,
-            -12.13,
-            14.15,
-            -16.17,
-            18.19,
-            -20.21,
-            9.23,
-            -2.54,
-            6.5,
-            4.21,
-            -1.96,
-            3.54,
-            2.6,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-
-
-def test_6407(cursor):
-    "6407 - insert a float32 vector into a flexible format column"
-    value = array.array(
-        "f",
-        [
-            1.23,
-            4.56,
-            -7.89,
-            10.11,
-            -12.13,
-            14.15,
-            -16.17,
-            18.19,
-            -20.21,
-            9.23,
-            -2.54,
-            6.5,
-            4.21,
-            -1.96,
-            3.54,
-            2.6,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "f")
-
-
-def test_6408(cursor):
-    "6408 - insert a float64 vector into a float64 column"
-    value = array.array(
-        "d",
-        [
-            -0.0375,
-            0.625,
-            -0.025,
-            0.125,
-            -0.75,
-            0.0,
-            -0.3625,
-            0.125,
-            -0.5,
-            0.03125,
-            -2.50,
-            -0.75,
-            1.625,
-            1.025,
-            0.125,
-            0.725,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-
-
-def test_6409(cursor):
-    "6409 - insert float64 vector into a float32 column"
-    value = array.array(
-        "d",
-        [
-            -0.0375,
-            0.625,
-            -0.025,
-            0.125,
-            -0.75,
-            0.0,
-            -0.3625,
-            0.125,
-            -0.5,
-            0.03125,
-            -2.50,
-            -0.75,
-            1.625,
-            1.025,
-            0.125,
-            0.725,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-
-
-def test_6410(cursor):
-    "6410 - insert float64 vector into a flexible type column"
-    value = array.array(
-        "d",
-        [
-            -0.0375,
-            0.625,
-            -0.025,
-            0.125,
-            -0.75,
-            0.0,
-            -0.3625,
-            0.125,
-            -0.5,
-            0.03125,
-            -2.50,
-            -0.75,
-            1.625,
-            1.025,
-            0.125,
-            0.725,
-        ],
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "d")
-
-
-def test_6411(cursor, test_env):
-    "6411 - insert a vector with an invalid size"
-    cursor.execute("truncate table TestVectors")
-    for num_elems in [4, 20]:
-        statement = """
-                insert into TestVectors (IntCol, Vector64Col)
-                values(2, :1)"""
-        vector = array.array("d", [i * 0.625 for i in range(num_elems)])
-        with test_env.assert_raises_full_code("ORA-51803"):
-            cursor.execute(statement, [vector])
-
-
-def test_6412(cursor):
-    "6412 - verify fetch info for vectors"
-    attr_names = [
-        "name",
-        "type_code",
-        "vector_dimensions",
-        "vector_format",
-        "vector_is_sparse",
-    ]
-    expected_values = [
-        ["INTCOL", oracledb.DB_TYPE_NUMBER, None, None, None],
-        ["VECTORFLEXALLCOL", oracledb.DB_TYPE_VECTOR, None, None, False],
-        ["VECTORFLEXTYPECOL", oracledb.DB_TYPE_VECTOR, 2, None, False],
-        [
-            "VECTORFLEX8COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_INT8,
-            False,
-        ],
-        [
-            "VECTORFLEX32COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_FLOAT32,
-            False,
-        ],
-        [
-            "VECTORFLEX64COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_FLOAT64,
-            False,
-        ],
-        [
-            "VECTOR8COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_INT8,
-            False,
-        ],
-        [
-            "VECTOR32COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_FLOAT32,
-            False,
-        ],
-        [
-            "VECTOR64COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_FLOAT64,
-            False,
-        ],
-    ]
-    cursor.execute("select * from TestVectors")
-    values = [[getattr(i, n) for n in attr_names] for i in cursor.description]
-    assert values == expected_values
-    assert cursor.description[3].vector_format is oracledb.VectorFormat.INT8
-
-
-def test_6413(cursor):
-    "6413 - insert an int8 vector into an int8 column"
-    value = array.array(
-        "b", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-
-
-def test_6414(cursor):
-    "6414 - insert an int8 vector into a float32 column"
-    value = array.array(
-        "b", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-
-
-def test_6415(cursor):
-    "6415 - insert an int8 vector into a float64 column"
-    value = array.array(
-        "b", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-
-
-def test_6416(cursor):
-    "6416 - insert an int8 vector into a flexible column"
-    value = array.array(
-        "b", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "b")
-
-
-def test_6417(cursor):
-    "6417 - insert a float32 vector into an int8 column"
-    value = array.array(
-        "f", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-
-
-def test_6418(cursor):
-    "6418 - insert a float64 vector into an int8 column"
-    value = array.array(
-        "d", [-5, 4, -7, 6, -9, 8, -127, 127, 0, -128, 1, 4, -3, 2, -8, 0]
-    )
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-
-
-def test_6419(conn, cursor):
-    "6419 - test dml returning vector type"
-    value = array.array("d", [6423.5, 6423.625])
-    out_var = cursor.var(oracledb.DB_TYPE_VECTOR)
-    cursor.execute("delete from TestVectors")
-    cursor.execute(
-        """
-        insert into TestVectors (IntCol, VectorFlexTypeCol)
-        values (1, :value)
-        returning VectorFlexTypeCol into :out_value
-        """,
-        [value, out_var],
-    )
-    conn.commit()
-    assert value == out_var.getvalue()[0]
-
-
-def test_6420(conn, cursor):
-    "6420 - test handling of NULL vector value"
-    cursor.execute("delete from TestVectors")
-    cursor.execute("insert into TestVectors (IntCol) values (1)")
-    conn.commit()
-    cursor.execute("select VectorFlexTypeCol from TestVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value is None
-
-
-def test_6421(cursor, test_env):
-    "6421 - insert a float32 vector into an int8 column (negative)"
-    value = array.array(
-        "f",
-        [-130, -129, 0, 1, 2, 3, 127, 128, 129, 348, 12, 49, 78, 12, 9, 2],
-    )
-    with test_env.assert_raises_full_code("ORA-51806"):
-        _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-
-
-def test_6422(cursor):
-    "6422 - insert a float64 vector with 65,533 dimensions"
-    value = array.array("d", [2.5] * 65533)
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "d")
-
-
-def test_6423(cursor):
-    "6423 - insert a float32 vector with 65,533 dimensions"
-    value = array.array("f", [2.5] * 65533)
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "f")
-
-
-def test_6424(cursor):
-    "6424 - insert an int8 vector with 65,533 dimensions"
-    value = array.array("b", [2] * 65533)
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "b")
-
-
-def test_6425(cursor):
-    "6425 - insert vectors with different dimensions"
-    for dim in [30, 70, 255, 256, 65534, 65535]:
-        for typ in ["f", "d", "b"]:
-            element_value = 3 if typ == "b" else 1.5
-            value = array.array(typ, [element_value] * dim)
-            _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", typ)
-
-
-@pytest.mark.skip("awaiting database support")
-def test_6426(conn, cursor):
-    "6426 - insert and fetch VECTOR data using CLOB"
-    value = [6426, -15.75, 283.125, -8.625]
-    clob = conn.createlob(oracledb.DB_TYPE_CLOB)
-    clob.write(json.dumps(value))
-    cursor.execute("delete from TestVectors")
-    cursor.execute(
-        """
-        insert into TestVectors (IntCol, VectorFlexAllCol)
-        values(1, :value)
-        """,
-        value=clob,
-    )
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "VECTORFLEXALLCOL":
-            return cursor.var(
-                oracledb.DB_TYPE_CLOB, arraysize=cursor.arraysize
-            )
-
-    cursor.outputtypehandler = type_handler
-
-    cursor.execute("select VectorFlexAllCol from TestVectors")
-    (clob_data,) = cursor.fetchone()
-    fetched_value = json.loads(clob_data.read())
-    assert fetched_value == value
-
-
-def test_6427(cursor):
-    "6427 - insert and fetch VECTOR data using strings"
-    value = [6427, -25.75, 383.125, -18.625]
-    cursor.execute("delete from TestVectors")
-    cursor.execute(
-        """
-        insert into TestVectors (IntCol, VectorFlexAllCol)
-        values(1, :value)
-        """,
-        value=json.dumps(value),
-    )
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "VECTORFLEXALLCOL":
-            return cursor.var(
-                oracledb.DB_TYPE_LONG, arraysize=cursor.arraysize
-            )
-
-    cursor.outputtypehandler = type_handler
-
-    cursor.execute("select VectorFlexAllCol from TestVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert json.loads(fetched_value) == value
-
-
-def test_6428(cursor):
-    "6428 - insert vectors with flexible dimensions and conversion"
-    for dim in [30, 255, 256, 257, 32768, 65535]:
-        for source_type in ["f", "d", "b"]:
-            for target_type in ["f", "d", "b"]:
-                if target_type == "f":
-                    target_col = "VectorFlex32Col"
-                elif target_type == "d":
-                    target_col = "VectorFlex64Col"
-                else:
-                    target_col = "VectorFlex8Col"
-                element_value = 4 if source_type == "b" else 2.5
-                value = array.array(source_type, [element_value] * dim)
-                _test_insert_and_fetch(cursor, value, target_col, target_type)
-
-
-@pytest.mark.skip("awaiting database support")
-def test_6429(cursor):
-    "6427 - insert and fetch large VECTOR data using strings"
-    value = [0.12345678925] * 35625
-    cursor.execute("delete from TestVectors")
-    cursor.execute(
-        """
-        insert into TestVectors (IntCol, VectorFlex64Col)
-        values(1, :value)
-        """,
-        value=json.dumps(value),
-    )
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "VECTORFLEX64COL":
-            return cursor.var(
-                oracledb.DB_TYPE_LONG, arraysize=cursor.arraysize
-            )
-
-    cursor.outputtypehandler = type_handler
-
-    cursor.execute("select VectorFlex64Col from TestVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert json.loads(fetched_value) == value
-
-
-def test_6430(cursor, test_env):
-    "6430 - test binding a vector with inf values (negative)"
-    value = array.array(
-        "d", [float("inf") if i % 2 else float("-inf") for i in range(16)]
-    )
-    with test_env.assert_raises_full_code("ORA-51805"):
-        cursor.execute("select :1 from dual", [value])
-
-
-def test_6431(cursor):
-    "6431 - test setting an invalid type to a vector"
-    var = cursor.var(oracledb.DB_TYPE_VECTOR)
-    pytest.raises(TypeError, var.setvalue, 0, [[i] for i in range(16)])
-
-
-def test_6432(cursor):
-    "6432 - fetch JSON value with an embedded vector"
-    cursor.execute(
-        """
-        select json_object(
-            'id' : 6432,
-            'vector' : to_vector('[1, 2, 3]')
-            returning json
-        ) from dual
-        """
-    )
-    (result,) = cursor.fetchone()
-    expected_val = dict(id=6432, vector=array.array("f", [1, 2, 3]))
-    assert result == expected_val
-
-
-def test_6433(conn, cursor):
-    "6433 - bind JSON value with an embedded vector"
-    value = dict(id=6433, vector=array.array("d", [6433, 6433.25, 6433.5]))
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(None, oracledb.DB_TYPE_JSON)
-    cursor.execute("insert into TestJson values (:1, :2)", [6433, value])
-    conn.commit()
-    cursor.execute("select JsonCol from TestJson")
-    (fetched_val,) = cursor.fetchone()
-    assert fetched_val == value
-
-
-def test_6434(cursor):
-    "6434 - executemany() without setinputsizes()"
-    cursor.execute("delete from TestVectors")
-    values = [array.array("f", [3.1416, 4]), [3.14159, 5]]
-    cursor.executemany(
-        """
-        insert into TestVectors (IntCol, VectorFlexTypeCol)
-        values (:1, :2)
-        """,
-        list(enumerate(values)),
-    )
-    cursor.execute("select VectorFlexTypeCol from TestVectors order by IntCol")
-    expected_value = [
-        (array.array("f", [3.1416, 4.0]),),
-        (array.array("d", [3.14159, 5.0]),),
-    ]
-    assert cursor.fetchall() == expected_value
-
-
-def test_6435(cursor):
-    "6435 - executemany() with setinputsizes()"
-    cursor.execute("delete from TestVectors")
-    values = [[144, 1000], array.array("d", [66.0, 7.14])]
-    cursor.setinputsizes(None, oracledb.DB_TYPE_VECTOR)
-    cursor.executemany(
-        """
-        insert into TestVectors (IntCol, VectorFlex64Col)
-        values (:1, :2)
-        """,
-        list(enumerate(values)),
-    )
-    cursor.execute("select VectorFlex64Col from TestVectors order by IntCol")
-    expected_value = [
-        (array.array("d", [144.0, 1000.0]),),
-        (array.array("d", [66.0, 7.14]),),
-    ]
-    assert cursor.fetchall() == expected_value
-
-
-def test_6436(cursor, test_env):
-    "6436 - vector with zero dimensions"
-    with test_env.assert_raises_full_code("DPY-4031"):
-        cursor.setinputsizes(oracledb.DB_TYPE_VECTOR)
-        cursor.execute("select :1", [[]])
-    with test_env.assert_raises_full_code("DPY-4031"):
-        cursor.execute("select :1", [array.array("d", [])])
-
-
-def test_6437(cursor):
-    "6437 - insert a list vector into a flexible format column"
-    value = [1.5, 9.9]
-    _test_insert_and_fetch(cursor, value, "VectorFlexTypeCol", "d")
-
-
-def test_6438(cursor):
-    "6438 - insert a list vector into a flexible size column"
-    value = [1.5, 9.9, 3, 8, 4.25, 7, 5, 6.125, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "d")
-
-
-def test_6439(cursor):
-    "6439 - insert a list vector into a flexible float32 column"
-    value = [1.5, 9.9, 3, 8, 4.25, 7, 5, 6.125, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "VectorFlex32Col", "f")
-
-
-def test_6440(cursor):
-    "6440 - insert a list vector into a flexible float64 column"
-    value = [1.5, 9.9, 3, 8, 4.25, 7, 5, 6.125, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "VectorFlex64Col", "d")
-
-
-def test_6441(cursor):
-    "6441 - insert a list vector into a float32 column"
-    value = [1.5, 9.9, 3, 8, 4.25, 7, 5, 6.125, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-
-
-def test_6442(cursor):
-    "6442 - insert a list vector into a float64 column"
-    value = [1.5, 9.9, 3, 8, 4.25, 7, 5, 6.125, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-
-
-def test_6443(cursor):
-    "6443 - insert a list vector into a flexible int8 column"
-    value = [1, 9, 3, 8, 4, 7, 5, 6, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "VectorFlex8Col", "b")
-
-
-def test_6444(cursor):
-    "6444 - insert a list vector into an int8 column"
-    value = [1, 9, 3, 8, 4, 7, 5, 6, 0, 2, 6, 4, 5, 6, 7, 8]
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-
-
-def test_6445(cursor):
-    "6445 - test setting a PL-SQL type to a float32 vector"
-    vec1 = array.array("f", [1, 1.5, 2, 2.5])
-    vec2 = array.array("f", [4, 4.5, 5, 5.5])
-    _test_plsql_insert_and_fetch(cursor, vec1, vec2, 6)
-
-    vec3 = array.array("f", [3.5] * 65535)
-    vec4 = array.array("f", [2.5] * 65535)
-    _test_plsql_insert_and_fetch(cursor, vec3, vec4, 256)
-
-
-def test_6446(cursor):
-    "6446 - test setting a PL-SQL type to a float64 vector"
-    vec1 = array.array("d", [1, 1.5, 2, 2.5])
-    vec2 = array.array("d", [4, 4.5, 5, 5.5])
-    _test_plsql_insert_and_fetch(cursor, vec1, vec2, 6)
-
-    vec3 = array.array("d", [3.5] * 65535)
-    vec4 = array.array("d", [2.5] * 65535)
-    _test_plsql_insert_and_fetch(cursor, vec3, vec4, 256)
-
-
-def test_6447(cursor):
-    "6447 - test setting a PL-SQL type to a int8 vector"
-    vec1 = array.array("b", [1, 2, 3, 4])
-    vec2 = array.array("b", [5, 6, 7, 8])
-    _test_plsql_insert_and_fetch(cursor, vec1, vec2, 8)
-
-    vec3 = array.array("b", [3] * 65535)
-    vec4 = array.array("b", [2] * 65535)
-    _test_plsql_insert_and_fetch(cursor, vec3, vec4, 256)
diff --git a/tests/test_6500_vector_interop.py b/tests/test_6500_vector_interop.py
deleted file mode 100644
index 9d291846..00000000
--- a/tests/test_6500_vector_interop.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6500 - Module for testing the VECTOR database type with older clients
-"""
-
-import json
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(test_env):
-    if test_env.has_client_version(23, 4):
-        pytest.skip("client supports vectors directly")
-    if not test_env.has_server_version(23, 4):
-        pytest.skip("unsupported server")
-
-
-def test_6500(cursor):
-    "6500 - verify fetch information for older clients"
-    attr_names = ["name", "type_code", "is_json"]
-    expected_values = [
-        ["INTCOL", oracledb.DB_TYPE_NUMBER, False],
-        ["VECTORFLEXALLCOL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTORFLEXTYPECOL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTORFLEX8COL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTORFLEX32COL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTORFLEX64COL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTOR32COL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTOR64COL", oracledb.DB_TYPE_CLOB, True],
-        ["VECTOR8COL", oracledb.DB_TYPE_CLOB, True],
-    ]
-    cursor.execute("select * from TestVectors")
-    values = [[getattr(i, n) for n in attr_names] for i in cursor.description]
-    assert values == expected_values
-
-
-def test_6501(conn, cursor):
-    "6501 - verify default fetched value is a Python list"
-    expected_data = (
-        1,
-        [6501, 25.25, 18.125, -3.5],
-        [11, -12.5],
-        [-5.25, -1.75, 0, 18.375],
-        [-1, 1, -2, 2, -3, 3, -4, 4, -5, 5],
-        [-10, 10, -20, 20, -30, 30, -40, 40, -50, 50],
-        [-5, 5, -10, 10, -15, 15, -20, 20, -25, 25],
-    )
-    cursor.execute("delete from TestVectors")
-    frag = ", ".join(f"'{d}'" for d in expected_data)
-    sql = f"""
-        insert into TestVectors
-        (IntCol, VectorFlexAllCol, VectorFlexTypeCol,
-         VectorFlex64Col, Vector32Col, Vector64Col, Vector8Col)
-         values ({frag})"""
-    cursor.execute(sql)
-    conn.commit()
-    cursor.execute(
-        """
-        select
-            IntCol,
-            VectorFlexAllCol,
-            VectorFlexTypeCol,
-            VectorFlex64Col,
-            Vector32Col,
-            Vector64Col,
-            Vector8Col
-        from TestVectors
-        """
-    )
-    fetched_data = cursor.fetchone()
-    assert fetched_data == expected_data
-
-
-def test_6502(conn, cursor):
-    "6502 - verify fetched value as intermediate long value"
-    expected_data = (
-        1,
-        [6501, 25.25, 18.125, -3.5],
-        [11, -12.5],
-        [-5.25, -1.75, 0, 18.375],
-        [-1, 1, -2, 2, -3, 3, -4, 4, -5, 5],
-        [-10, 10, -20, 20, -30, 30, -40, 40, -50, 50],
-        [-5, 5, -10, 10, -15, 15, -20, 20, -25, 25],
-    )
-    cursor.execute("delete from TestVectors")
-    frag = ", ".join(f"'{d}'" for d in expected_data)
-    sql = f"""
-        insert into TestVectors
-        (IntCol, VectorFlexAllCol, VectorFlexTypeCol,
-         VectorFlex64Col, Vector32Col, Vector64Col, Vector8Col)
-         values ({frag})"""
-    cursor.execute(sql)
-    conn.commit()
-    executions = [0]
-
-    def type_handler(cursor, fetch_info):
-        executions[0] += 1
-        if fetch_info.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_LONG,
-                arraysize=cursor.arraysize,
-                outconverter=lambda x: json.loads(x),
-            )
-
-    cursor.outputtypehandler = type_handler
-    cursor.execute(
-        """
-        select
-            IntCol,
-            VectorFlexAllCol,
-            VectorFlexTypeCol,
-            VectorFlex64Col,
-            Vector32Col,
-            Vector64Col,
-            Vector8Col
-        from TestVectors
-        """
-    )
-    fetched_data = cursor.fetchone()
-    assert fetched_data == expected_data
-    assert executions[0] == 7
-
-
-def test_6503(conn, cursor):
-    "6503 - verify fetched value as intermediate string value"
-    expected_data = (
-        1,
-        [6501, 25.25, 18.125, -3.5],
-        [11, -12.5],
-        [-5.25, -1.75, 0, 18.375],
-        [-1, 1, -2, 2, -3, 3, -4, 4, -5, 5],
-        [-10, 10, -20, 20, -30, 30, -40, 40, -50, 50],
-        [-5, 5, -10, 10, -15, 15, -20, 20, -25, 25],
-    )
-    cursor.execute("delete from TestVectors")
-    frag = ", ".join(f"'{d}'" for d in expected_data)
-    sql = f"""
-        insert into TestVectors
-        (IntCol, VectorFlexAllCol, VectorFlexTypeCol,
-         VectorFlex64Col, Vector32Col, Vector64Col, Vector8Col)
-         values ({frag})"""
-    cursor.execute(sql)
-    conn.commit()
-    executions = [0]
-
-    def type_handler(cursor, fetch_info):
-        executions[0] += 1
-        if fetch_info.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_VARCHAR,
-                arraysize=cursor.arraysize,
-                outconverter=lambda x: json.loads(x),
-            )
-
-    cursor.outputtypehandler = type_handler
-    cursor.execute(
-        """
-        select
-            IntCol,
-            VectorFlexAllCol,
-            VectorFlexTypeCol,
-            VectorFlex64Col,
-            Vector32Col,
-            Vector64Col,
-            Vector8Col
-        from TestVectors
-        """
-    )
-    fetched_data = cursor.fetchone()
-    assert fetched_data == expected_data
-    assert executions[0] == 7
-
-
-@pytest.mark.skip("awaiting database support")
-def test_6504(conn, cursor):
-    "6502 - verify fetching large vector as intermediate long value"
-    num_dimensions = 35655
-    expected_data = (
-        1,
-        [4] * num_dimensions,
-        [12.5] * num_dimensions,
-        [128.625] * num_dimensions,
-    )
-    cursor.execute("delete from TestVectors")
-    sql = """
-        insert into TestVectors
-        (IntCol, VectorFlex8Col, VectorFlex32Col, VectorFlex64Col)
-        values (:1, :2, :3, :4)"""
-    bind_data = [
-        expected_data[0],
-        json.dumps(expected_data[1]),
-        json.dumps(expected_data[2]),
-        json.dumps(expected_data[3]),
-    ]
-    cursor.execute(sql, bind_data)
-    conn.commit()
-    executions = [0]
-
-    def type_handler(cursor, fetch_info):
-        executions[0] += 1
-        if fetch_info.type_code is oracledb.DB_TYPE_CLOB:
-            return cursor.var(
-                oracledb.DB_TYPE_LONG,
-                arraysize=cursor.arraysize,
-                outconverter=lambda x: json.loads(x),
-            )
-
-    cursor.outputtypehandler = type_handler
-    cursor.execute(
-        """"
-        select
-            IntCol,
-            VectorFlex8Col,
-            VectorFlex32Col,
-            VectorFlex64Col
-        from TestVectors"""
-    )
-    fetched_data = cursor.fetchone()
-    assert fetched_data == expected_data
-    assert executions[0] == 7
diff --git a/tests/test_6600_defaults.py b/tests/test_6600_defaults.py
deleted file mode 100644
index f7c94cf2..00000000
--- a/tests/test_6600_defaults.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6600 - Module for testing oracledb.defaults
-"""
-
-import decimal
-import os
-import tempfile
-
-import oracledb
-
-
-def _verify_network_name_attr(test_env, name):
-    """
-    Verify that a default attribute is handled properly in both valid
-    and invalid cases.
-    """
-    for value, ok in [
-        ("valid_value", True),
-        ("'contains_quotes'", False),
-        ('"contains_double_quotes"', False),
-        ("contains_opening_paren (", False),
-        ("contains_closing_paren )", False),
-        ("contains_equals =", False),
-        ("contains_trailing_slash\\", False),
-    ]:
-        args = {}
-        args[name] = value
-        if ok:
-            with test_env.defaults_context_manager(name, value):
-                cp = oracledb.ConnectParams(**args)
-                assert getattr(cp, name) == value
-        else:
-            with test_env.assert_raises_full_code("DPY-3029"):
-                with test_env.defaults_context_manager(name, value):
-                    pass
-
-
-def test_6600(test_env):
-    "6600 - test setting defaults.arraysize"
-    with test_env.defaults_context_manager("arraysize", 50):
-        conn = test_env.get_connection()
-        cursor = conn.cursor()
-        assert cursor.arraysize == oracledb.defaults.arraysize
-
-
-def test_6601(cursor, test_env):
-    "6601 - test getting decimals with defaults.fetch_decimals=True"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        cursor.execute("select 9 from dual")
-        (result,) = cursor.fetchone()
-        assert isinstance(result, decimal.Decimal)
-
-
-def test_6602(cursor, test_env):
-    "6602 - test getting string lob with defaults.fetch_lobs=False"
-    with test_env.defaults_context_manager("fetch_lobs", False):
-        cursor.execute("select to_clob('Hello world') from dual")
-        (result,) = cursor.fetchone()
-        assert isinstance(result, str)
-
-
-def test_6603(test_env):
-    "6603 - test setting defaults.prefetchrows"
-    with test_env.defaults_context_manager("prefetchrows", 20):
-        conn = test_env.get_connection()
-        cursor = conn.cursor()
-        assert cursor.prefetchrows == oracledb.defaults.prefetchrows
-
-
-def test_6604(test_env):
-    "6604 - test setting defaults.stmtcachesize (pool)"
-    new_stmtcachesize = 15
-    with test_env.defaults_context_manager("stmtcachesize", 40):
-        pool = test_env.get_pool()
-        assert pool.stmtcachesize == oracledb.defaults.stmtcachesize
-        conn = pool.acquire()
-        assert conn.stmtcachesize == oracledb.defaults.stmtcachesize
-        pool = test_env.get_pool(stmtcachesize=new_stmtcachesize)
-        assert pool.stmtcachesize == new_stmtcachesize
-        conn = pool.acquire()
-        assert conn.stmtcachesize == new_stmtcachesize
-
-
-def test_6605(test_env):
-    "6605 - test setting defaults.stmtcachesize (standalone connection)"
-    new_stmtcachesize = 25
-    with test_env.defaults_context_manager("stmtcachesize", 50):
-        conn = test_env.get_connection()
-        assert conn.stmtcachesize == oracledb.defaults.stmtcachesize
-        conn = test_env.get_connection(stmtcachesize=new_stmtcachesize)
-        assert conn.stmtcachesize == new_stmtcachesize
-
-
-def test_6606(cursor, test_env):
-    "6606 - fetch_lobs does not affect LOBS returned as OUT binds"
-    with test_env.defaults_context_manager("fetch_lobs", False):
-        var = cursor.var(oracledb.DB_TYPE_CLOB)
-        cursor.execute(
-            "begin :value := to_clob('test clob'); end;",
-            value=var,
-        )
-        assert isinstance(var.getvalue(), oracledb.LOB)
-
-
-def test_6607(test_env):
-    "6607 - test setting defaults.config_dir"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        new_temp_dir = os.path.join(temp_dir, "subdir")
-        with test_env.defaults_context_manager("config_dir", temp_dir):
-            assert oracledb.defaults.config_dir == temp_dir
-            params = oracledb.ConnectParams()
-            assert params.config_dir == temp_dir
-            params = oracledb.ConnectParams(config_dir=new_temp_dir)
-            assert params.config_dir == new_temp_dir
-
-
-def test_6608(test_env):
-    "6608 - test setting defaults.stmtcachesize (ConnectParams)"
-    new_stmtcachesize = 35
-    with test_env.defaults_context_manager("stmtcachesize", 60):
-        params = oracledb.ConnectParams()
-        assert params.stmtcachesize == oracledb.defaults.stmtcachesize
-        params = oracledb.ConnectParams(stmtcachesize=new_stmtcachesize)
-        assert params.stmtcachesize == new_stmtcachesize
-
-
-def test_6609(test_env):
-    "6609 - test defaults.stmtcachesize persists after setting it again"
-    value = 50
-    new_value = 29
-    with test_env.defaults_context_manager("stmtcachesize", value):
-        pool = test_env.get_pool()
-        pooled_conn = pool.acquire()
-        params = oracledb.ConnectParams()
-        standalone_conn = test_env.get_connection()
-        with test_env.defaults_context_manager("stmtcachesize", new_value):
-            assert pool.stmtcachesize == value
-            assert pooled_conn.stmtcachesize == value
-            assert params.stmtcachesize == value
-            assert standalone_conn.stmtcachesize == value
-            pool = test_env.get_pool()
-            pooled_conn = pool.acquire()
-            params = oracledb.ConnectParams()
-            standalone_conn = test_env.get_connection()
-            assert pool.stmtcachesize == new_value
-            assert pooled_conn.stmtcachesize == new_value
-            assert params.stmtcachesize == new_value
-            assert standalone_conn.stmtcachesize == new_value
-
-
-def test_6610(test_env):
-    "6610 - test setting defaults.terminal"
-    with test_env.defaults_context_manager("terminal", "newterminal"):
-        params = oracledb.ConnectParams()
-        assert params.terminal == oracledb.defaults.terminal
-
-
-def test_6611(test_env):
-    "6611 - test setting defaults.driver_name"
-    with test_env.defaults_context_manager("driver_name", "newdriver"):
-        params = oracledb.ConnectParams()
-        assert params.driver_name == oracledb.defaults.driver_name
-
-
-def test_6612(test_env):
-    "6612 - test setting defaults.program attribute"
-    _verify_network_name_attr(test_env, "program")
-
-
-def test_6613(test_env):
-    "6613 - test setting defaults.machine attribute"
-    _verify_network_name_attr(test_env, "machine")
-
-
-def test_6614(test_env):
-    "6614 - test setting defaults.osuser attribute"
-    _verify_network_name_attr(test_env, "osuser")
-
-
-def test_6615(skip_unless_thin_mode, test_env):
-    "6615 - test program with two pools"
-    default_value = "defaultprogram"
-    new_value = "newprogram"
-    verify_sql = (
-        "select program from v$session "
-        "where sid = sys_context('userenv', 'sid')"
-    )
-    with test_env.defaults_context_manager("program", default_value):
-
-        # create pool using default value
-        pool = test_env.get_pool()
-        with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                cursor.execute(verify_sql)
-                (fetched_value,) = cursor.fetchone()
-                assert fetched_value == default_value
-        pool.close()
-
-        # create pool using new value
-        pool = test_env.get_pool(program=new_value)
-        with pool.acquire() as conn:
-            with conn.cursor() as cursor:
-                cursor.execute(verify_sql)
-                (fetched_value,) = cursor.fetchone()
-                assert fetched_value == new_value
-        pool.close()
diff --git a/tests/test_6700_json_23.py b/tests/test_6700_json_23.py
deleted file mode 100644
index 3e45e1a6..00000000
--- a/tests/test_6700_json_23.py
+++ /dev/null
@@ -1,193 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6700 - Module for testing the JSON data type extension in Oracle DB version 23.
-"""
-
-import json
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(test_env):
-    if not test_env.has_client_and_server_version(23):
-        pytest.skip("no native JSON extensions support")
-
-
-def _test_fetch_json(cursor, value, table_name="TestJson"):
-    """
-    Tests fetching JSON encoded by the database.
-    """
-    cursor.execute(f"delete from {table_name}")
-    cursor.execute(
-        f"insert into {table_name} values (1, :1)", [json.dumps(value)]
-    )
-    cursor.execute(f"select JsonCol from {table_name}")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == value
-
-
-def _test_round_trip_json(cursor, value):
-    """
-    Tests fetching JSON encoded by the driver.
-    """
-    cursor.execute("delete from TestJson")
-    cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-    cursor.execute("insert into TestJson values (1, :1)", [value])
-    cursor.execute("select JsonCol from TestJson")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value == value
-
-
-def test_6700(cursor):
-    "6700 - fetch JSON with a field name greater than 255 bytes"
-    fname_long = "A" * 256
-    value = {}
-    value[fname_long] = 6700
-    _test_fetch_json(cursor, value)
-
-
-def test_6701(cursor):
-    "6701 - fetch JSON with field names greater and less than 255 bytes"
-    fname_short = "short_name"
-    fname_long = "A" * 256
-    value = {}
-    value[fname_short] = "Short name"
-    value[fname_long] = 6701
-    _test_fetch_json(cursor, value)
-
-
-def test_6702(cursor):
-    "6702 - fetch JSON with many field names greater than 255 bytes"
-    value = {}
-    for i in range(26):
-        for j in range(26):
-            fname = chr(i + ord("A")) + chr(j + ord("A")) + "X" * 254
-            value[fname] = 12.25
-    _test_fetch_json(cursor, value)
-
-
-def test_6703(cursor):
-    "6703 - fetch JSON with many field names (large and small)"
-    value = {}
-    for i in range(26):
-        for j in range(26):
-            short_name = chr(i + ord("A")) + chr(j + ord("A"))
-            value[short_name] = 6.75
-            long_name = short_name + "X" * 254
-            value[long_name] = 12.25
-    _test_fetch_json(cursor, value)
-
-
-def test_6704(cursor):
-    "6704 - fetch JSON with many field names (one large and many small)"
-    value = {}
-    long_name = "B" * 256
-    value[long_name] = 6704
-    for i in range(26):
-        for j in range(26):
-            short_name = chr(i + ord("A")) + chr(j + ord("A"))
-            value[short_name] = 8.625
-    _test_fetch_json(cursor, value)
-
-
-def test_6705(cursor):
-    "6705 - round trip JSON with a field name greater than 255 bytes"
-    fname_long = "A" * 256
-    value = {}
-    value[fname_long] = 6705
-    _test_round_trip_json(cursor, value)
-
-
-def test_6706(cursor):
-    "6706 - round trip JSON with field names (small and large)"
-    fname_short = "short_name"
-    fname_long = "A" * 256
-    value = {}
-    value[fname_short] = "Short name"
-    value[fname_long] = 6706
-    _test_round_trip_json(cursor, value)
-
-
-def test_6707(cursor):
-    "6707 - round trip JSON with many field names greater than 255 bytes"
-    value = {}
-    for i in range(26):
-        for j in range(26):
-            fname = chr(i + ord("A")) + chr(j + ord("A")) + "X" * 254
-            value[fname] = 12.25
-    _test_round_trip_json(cursor, value)
-
-
-def test_6708(cursor):
-    "6708 - round trip JSON with many field names (large and small)"
-    value = {}
-    for i in range(26):
-        for j in range(26):
-            short_name = chr(i + ord("A")) + chr(j + ord("A"))
-            value[short_name] = 6.75
-            long_name = short_name + "X" * 254
-            value[long_name] = 12.25
-    _test_round_trip_json(cursor, value)
-
-
-def test_6709(cursor):
-    "6709 - round trip JSON with many field names (1 large and many small)"
-    value = {}
-    long_name = "B" * 256
-    value[long_name] = 6704
-    for i in range(26):
-        for j in range(26):
-            short_name = chr(i + ord("A")) + chr(j + ord("A"))
-            value[short_name] = 8.625
-    _test_round_trip_json(cursor, value)
-
-
-def test_6710(cursor):
-    "6710 - fetch JSON with relative offsets"
-    value = {}
-    fname_long = "C" * 256
-    value[fname_long] = 6710
-    value["num_list"] = [1.5, 2.25, 3.75, 5.5]
-    value["str_list"] = ["string 1", "string 2"]
-    _test_fetch_json(cursor, value, "TestCompressedJson")
-
-
-def test_6711(cursor):
-    "6711 - fetch JSON with relative offsets and shared fields and values"
-    value = []
-    for i in range(15):
-        value.append(dict(a=6711, b="String Value"))
-    _test_fetch_json(cursor, value, "TestCompressedJson")
-
-
-def test_6712(cursor):
-    "6712 - fetch JSON with relative offsets and shared fields, not values"
-    value = []
-    for i in range(15):
-        value.append(dict(a=6711 + i, b=f"String Value {i}"))
-    _test_fetch_json(cursor, value, "TestCompressedJson")
diff --git a/tests/test_6800_error_async.py b/tests/test_6800_error_async.py
deleted file mode 100644
index 79e8f904..00000000
--- a/tests/test_6800_error_async.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6800 - Module for testing error objects with asyncio
-"""
-
-import pickle
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_6800(async_cursor):
-    "6800 - test parse error returns offset correctly"
-    with pytest.raises(oracledb.Error) as excinfo:
-        await async_cursor.execute("begin t_Missing := 5; end;")
-    (error_obj,) = excinfo.value.args
-    assert error_obj.full_code == "ORA-06550"
-    assert error_obj.offset == 6
-
-
-async def test_6801(async_cursor):
-    "6801 - test picking/unpickling an error object"
-    with pytest.raises(oracledb.Error) as excinfo:
-        await async_cursor.execute(
-            """
-            begin
-                raise_application_error(-20101, 'Test!');
-            end;
-            """
-        )
-    (error_obj,) = excinfo.value.args
-    assert isinstance(error_obj, oracledb._Error)
-    assert "Test!" in error_obj.message
-    assert error_obj.code == 20101
-    assert error_obj.offset == 0
-    assert isinstance(error_obj.isrecoverable, bool)
-    assert not error_obj.isrecoverable
-    new_error_obj = pickle.loads(pickle.dumps(error_obj))
-    assert isinstance(new_error_obj, oracledb._Error)
-    assert new_error_obj.message == error_obj.message
-    assert new_error_obj.code == error_obj.code
-    assert new_error_obj.offset == error_obj.offset
-    assert new_error_obj.context == error_obj.context
-    assert new_error_obj.isrecoverable == error_obj.isrecoverable
-
-
-async def test_6802(async_cursor):
-    "6802 - test generation of full_code for ORA, DPI and DPY errors"
-    with pytest.raises(oracledb.Error) as excinfo:
-        await async_cursor.execute(None)
-    (error_obj,) = excinfo.value.args
-    assert error_obj.full_code == "DPY-2001"
-
-
-async def test_6803(async_cursor):
-    "6803 - test generation of error help portal URL"
-    with pytest.raises(oracledb.Error) as excinfo:
-        await async_cursor.execute("select 1 / 0 from dual")
-    (error_obj,) = excinfo.value.args
-    to_check = "Help: https://docs.oracle.com/error-help/db/ora-01476/"
-    assert to_check in error_obj.message
-
-
-async def test_6804(async_cursor):
-    "6804 - verify warning is generated when creating a procedure"
-    proc_name = "bad_proc_1704"
-    assert async_cursor.warning is None
-    await async_cursor.execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null
-        end;
-        """
-    )
-    assert async_cursor.warning.full_code == "DPY-7000"
-    await async_cursor.execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null;
-        end;
-        """
-    )
-    assert async_cursor.warning is None
-    await async_cursor.execute(f"drop procedure {proc_name}")
-
-
-async def test_6805(async_cursor):
-    "6805 - verify warning is generated when creating a function"
-    func_name = "bad_func_1705"
-    await async_cursor.execute(
-        f"""
-        create or replace function {func_name}
-        return number as
-        begin
-            return null
-        end;
-        """
-    )
-    assert async_cursor.warning.full_code == "DPY-7000"
-    await async_cursor.execute(f"drop function {func_name}")
-    assert async_cursor.warning is None
-
-
-async def test_6806(async_cursor):
-    "6806 - verify warning is generated when creating a type"
-    type_name = "bad_type_1706"
-    await async_cursor.execute(
-        f"""
-        create or replace type {type_name} as object (
-            x bad_type
-        );
-        """
-    )
-    assert async_cursor.warning.full_code == "DPY-7000"
-    await async_cursor.execute(f"drop type {type_name}")
-    assert async_cursor.warning is None
-
-
-async def test_6807(async_conn):
-    "6807 - verify warning is saved in a pipeline"
-    proc_name = "bad_proc_1704"
-    func_name = "bad_func_1705"
-    type_name = "bad_type_1706"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null
-        end;
-        """
-    )
-    pipeline.add_execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null;
-        end;
-        """
-    )
-    pipeline.add_execute(f"drop procedure {proc_name}")
-    pipeline.add_execute(
-        f"""
-        create or replace function {func_name}
-        return number as
-        begin
-            return null
-        end;
-        """
-    )
-    pipeline.add_execute(f"drop function {func_name}")
-    pipeline.add_execute(
-        f"""
-        create or replace type {type_name} as object (
-            x bad_type
-        );
-        """
-    )
-    pipeline.add_execute(f"drop type {type_name}")
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[0].warning.full_code == "DPY-7000"
-    assert results[1].warning is None
-    assert results[2].warning is None
-    assert results[3].warning.full_code == "DPY-7000"
-    assert results[4].warning is None
-    assert results[5].warning.full_code == "DPY-7000"
-    assert results[6].warning is None
-
-
-async def test_6808(async_conn, async_cursor):
-    "6808 - verify warning is saved in a pipeline with a single operation"
-    proc_name = "bad_proc_6808"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute(
-        f"""
-        create or replace procedure {proc_name} as
-        begin
-            null
-        end;
-        """
-    )
-    (result,) = await async_conn.run_pipeline(pipeline)
-    assert result.warning.full_code == "DPY-7000"
-    await async_cursor.execute(f"drop procedure {proc_name}")
-
-
-async def test_6809(skip_if_drcp, test_env):
-    "6809 - error from killed connection is deemed recoverable"
-    admin_conn = await test_env.get_admin_connection_async()
-    conn = await test_env.get_connection_async()
-    sid, serial = (conn.session_id, conn.serial_num)
-    with admin_conn.cursor() as admin_cursor:
-        sql = f"alter system kill session '{sid},{serial}'"
-        await admin_cursor.execute(sql)
-    with test_env.assert_raises_full_code("DPY-4011") as cm:
-        with conn.cursor() as cursor:
-            await cursor.execute("select user from dual")
-    assert cm.error_obj.isrecoverable
diff --git a/tests/test_6900_oson.py b/tests/test_6900_oson.py
deleted file mode 100644
index d773eb3c..00000000
--- a/tests/test_6900_oson.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-6900 - Module for testing OSON encoding and decoding.
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_native_json_supported):
-    pass
-
-
-def test_6900(cursor):
-    "6900 - test OSON metadata"
-    cursor.execute("select * from TestOsonCols")
-    int_col_metadata, oson_col_metadata = cursor.description
-    assert not int_col_metadata.is_oson
-    assert oson_col_metadata.is_oson
-
-
-def test_6901(conn, cursor):
-    "6901 - test simple query of OSON encoded bytes"
-    cursor.execute("delete from TestOsonCols")
-    cursor.execute(
-        """
-            insert into TestOsonCols (IntCol, OsonCol)
-            values (1, '{"id": 6901, "value" : "string 6901"}')"""
-    )
-    conn.commit()
-    cursor.execute("select OsonCol from TestOsonCols")
-    (oson_val,) = cursor.fetchone()
-    expected_val = dict(id=6901, value="string 6901")
-    assert oson_val == expected_val
-
-
-def test_6902(conn, cursor):
-    "6902 - test round trip of OSON encoded bytes"
-    value = dict(id=6902, value="string 6902")
-    cursor.execute("delete from TestOsonCols")
-    encoded_oson = conn.encode_oson(value)
-    cursor.execute(
-        "insert into TestOsonCols values (1, :data)", [encoded_oson]
-    )
-    conn.commit()
-    cursor.execute("select OsonCol from TestOsonCols")
-    (oson_val,) = cursor.fetchone()
-    assert oson_val == value
-
-
-def test_6903(conn):
-    "6903 - test encoding and decoding a value"
-    value = dict(id=6903, value="string 6903")
-    out_value = conn.decode_oson(conn.encode_oson(value))
-    assert out_value == value
-
-
-def test_6904(conn, test_env):
-    "6904 - test decoding a non encoded value"
-    value = b"{'not a previous encoded value': 3}"
-    with test_env.assert_raises_full_code("DPY-5004"):
-        conn.decode_oson(value)
-
-
-def test_6905(conn, cursor):
-    "6905 - test inserting oson inside a lob"
-    value = dict(id=6905, value="string 6905")
-    cursor.execute("delete from TestOsonCols")
-    encoded_oson = conn.encode_oson(value)
-    lob = conn.createlob(oracledb.DB_TYPE_BLOB, encoded_oson)
-    cursor.execute("insert into TestOsonCols values (1, :data)", [lob])
-    conn.commit()
-    cursor.execute("select OsonCol from TestOsonCols")
-    (oson_val,) = cursor.fetchone()
-    assert oson_val == value
-
-
-def test_6906(conn, cursor):
-    "6906 - test inserting oson as json"
-    cursor.execute("delete from TestOsonCols")
-    value = dict(id=6906, value="string 6906")
-    oson = conn.encode_oson(value)
-    cursor.setinputsizes(oracledb.DB_TYPE_JSON)
-    cursor.execute("insert into TestOsonCols values (1, :data)", [oson])
-    conn.commit()
-    cursor.execute("select OsonCol from TestOsonCols")
-    (oson_val,) = cursor.fetchone()
-    oson_val = conn.decode_oson(oson_val)
-    assert oson_val == value
diff --git a/tests/test_7000_connection_async_shortcut_methods.py b/tests/test_7000_connection_async_shortcut_methods.py
deleted file mode 100644
index 3b384f9a..00000000
--- a/tests/test_7000_connection_async_shortcut_methods.py
+++ /dev/null
@@ -1,371 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7000 - Module for testing async connections shortcut methods
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_7000(async_conn):
-    "7000 - test execute() and fetchall()"
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.execute(
-        "insert into TestTempTable (IntCol) values (:1)", [77]
-    )
-    await async_conn.execute(
-        "insert into TestTempTable (IntCol) values (:val)", dict(val=15)
-    )
-    await async_conn.commit()
-
-    res = await async_conn.fetchall(
-        "select IntCol from TestTempTable order by IntCol"
-    )
-    assert res == [(15,), (77,)]
-
-
-async def test_7001(async_conn):
-    "7001 - test executemany()"
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", [(2,), (3,)]
-    )
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:data)",
-        [{"data": 4}, {"data": 5}],
-    )
-    await async_conn.commit()
-    res = await async_conn.fetchall(
-        "select IntCol from TestTempTable order by IntCol"
-    )
-    assert res == [(2,), (3,), (4,), (5,)]
-
-
-async def test_7002(async_conn, round_trip_checker_async):
-    "7002 - test fetchall() with arraysize"
-    await async_conn.execute("truncate table TestTempTable")
-    data = [(1,), (2,), (3,), (4,)]
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:value)",
-        [{"value": i} for i, in data],
-    )
-    await async_conn.commit()
-
-    await round_trip_checker_async.get_value_async()
-    res = await async_conn.fetchall(
-        "select IntCol from TestTempTable order by IntCol", arraysize=1
-    )
-    assert res == data
-    assert await round_trip_checker_async.get_value_async() == 5
-
-    res = await async_conn.fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-        arraysize=len(data),
-    )
-    assert res == data
-    assert await round_trip_checker_async.get_value_async() == 2
-
-
-async def test_7003(async_conn):
-    "7003 - test fetchall() with rowfactory"
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test_7003')
-        """
-    )
-    await async_conn.commit()
-
-    column_names = ["INTCOL", "STRINGCOL1"]
-
-    def rowfactory(*row):
-        return dict(zip(column_names, row))
-
-    res = await async_conn.fetchall(
-        "select IntCol, StringCol1 from TestTempTable",
-        rowfactory=rowfactory,
-    )
-    expected_value = [{"INTCOL": 1, "STRINGCOL1": "test_7003"}]
-    assert res == expected_value
-
-
-async def test_7004(async_conn):
-    "7004 - test fetchone()"
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", [(9,), (10,)]
-    )
-    await async_conn.commit()
-
-    res = await async_conn.fetchone(
-        "select IntCol from TestTempTable order by IntCol"
-    )
-    assert res == (9,)
-
-    res = await async_conn.fetchone("select :1 from dual", [23])
-    assert res == (23,)
-
-    res = await async_conn.fetchone("select :val from dual", {"val": 5})
-    assert res == (5,)
-
-
-async def test_7005(async_conn):
-    "7005 - test fetchone() with rowfactory"
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int, :str)
-        """,
-        [{"int": 3, "str": "Mac"}, {"int": 4, "str": "Doc"}],
-    )
-    await async_conn.commit()
-
-    column_names = ["INT", "STRING"]
-
-    def rowfactory(*row):
-        return dict(zip(column_names, row))
-
-    res = await async_conn.fetchone(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        rowfactory=rowfactory,
-    )
-    assert res == {"INT": 3, "STRING": "Mac"}
-
-
-async def test_7006(async_conn):
-    "7006 - test fetchmany()"
-    data = [(i,) for i in range(10)]
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    await async_conn.commit()
-    res = await async_conn.fetchmany(
-        "select IntCol from TestTempTable order by IntCol"
-    )
-    assert res == data
-
-    res = await async_conn.fetchmany("select :1 from dual", [1099])
-    assert res == [(1099,)]
-
-    res = await async_conn.fetchmany("select :val from dual", {"val": 366})
-    assert res == [(366,)]
-
-
-async def test_7007(async_conn):
-    "7007 - test fetchmany() with num_rows"
-    data = [(i,) for i in range(10)]
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    num_rows = 7
-    res = await async_conn.fetchmany(
-        "select IntCol from TestTempTable order by IntCol",
-        num_rows=num_rows,
-    )
-    assert res == data[:num_rows]
-
-
-async def test_7008(test_env):
-    "7008 - test fetchmany() with rowfactory and num_rows"
-    conn = await test_env.get_connection_async()
-    await conn.execute("truncate table TestTempTable")
-    await conn.executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int, :str)
-        """,
-        [{"int": 29, "str": "Feb"}, {"int": 4, "str": "Monday"}],
-    )
-    await conn.commit()
-
-    column_names = ["INT", "STRING"]
-
-    def rowfactory(*row):
-        return dict(zip(column_names, row))
-
-    res = await conn.fetchmany(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        rowfactory=rowfactory,
-    )
-    expected_value = [
-        {"INT": 4, "STRING": "Monday"},
-        {"INT": 29, "STRING": "Feb"},
-    ]
-    assert res == expected_value
-
-    res = await conn.fetchmany(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        rowfactory=rowfactory,
-        num_rows=1,
-    )
-    assert res == [{"INT": 4, "STRING": "Monday"}]
-
-
-async def test_7009(async_conn):
-    "7009 - test callfunc()"
-    # parameters
-    res = await async_conn.callfunc("func_Test", oracledb.NUMBER, ("Yes", 7))
-    assert res == 10
-
-    # keyword parameters
-    kwargs = {"a_String": "Keyword", "a_ExtraAmount": 12}
-    res = await async_conn.callfunc(
-        "func_Test", oracledb.NUMBER, keyword_parameters=kwargs
-    )
-    assert res == 19
-
-    # paramters and keyword parameters
-    kwargs = {"a_ExtraAmount": 25}
-    res = await async_conn.callfunc(
-        "func_Test", oracledb.NUMBER, ["Mixed"], kwargs
-    )
-    assert res == 30
-
-
-async def test_7010(async_conn, async_cursor):
-    "7010 - test callproc() with parameters"
-    var = async_cursor.var(oracledb.NUMBER)
-    results = await async_conn.callproc("proc_Test", ("hi", 5, var))
-    assert results == ["hi", 10, 2.0]
-
-
-async def test_7011(async_conn, async_cursor):
-    "7011 - test callproc() with keyword_parameters"
-    in_out_value = async_cursor.var(oracledb.NUMBER)
-    in_out_value.setvalue(0, 7)
-    out_value = async_cursor.var(oracledb.NUMBER)
-    kwargs = dict(
-        a_InValue="Peace", a_InOutValue=in_out_value, a_OutValue=out_value
-    )
-    results = await async_conn.callproc("proc_Test", [], kwargs)
-    assert results == []
-    assert in_out_value.getvalue() == 35
-    assert out_value.getvalue() == 5
-
-
-async def test_7012(async_conn, async_cursor):
-    "7012 - test callproc() with parameters and keyword_parameters"
-    in_out_value = async_cursor.var(oracledb.NUMBER)
-    in_out_value.setvalue(0, 8)
-    out_value = async_cursor.var(oracledb.NUMBER)
-    kwargs = dict(a_InOutValue=in_out_value, a_OutValue=out_value)
-    results = await async_conn.callproc("proc_Test", ["Input_7712"], kwargs)
-    assert results == ["Input_7712"]
-    assert in_out_value.getvalue() == 80
-    assert out_value.getvalue() == 10
-
-
-async def test_7013(async_conn):
-    "7013 - test fetchmany() num_rows with 0 and negative values"
-    data = [(i,) for i in range(10)]
-    await async_conn.execute("truncate table TestTempTable")
-    await async_conn.executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    await async_conn.commit()
-    for num_rows in (0, -1, -10):
-        res = await async_conn.fetchmany(
-            "select IntCol from TestTempTable",
-            num_rows=num_rows,
-        )
-        assert res == []
-
-
-async def test_7014(async_conn):
-    "7014 - test shortcut methods with transaction_in_progress"
-    await async_conn.execute("truncate table TestTempTable")
-    assert not async_conn.transaction_in_progress
-    await async_conn.execute(
-        "insert into TestTempTable (IntCol) values (5)",
-    )
-    assert async_conn.transaction_in_progress
-    await async_conn.commit()
-    assert not async_conn.transaction_in_progress
-
-
-async def test_7015(async_conn):
-    "7015 - test fetchone() with fetch_lobs=False"
-    value = "test_7015"
-    (result,) = await async_conn.fetchone(
-        "select to_clob(:1) from dual", [value], fetch_lobs=False
-    )
-    assert result == value
-
-
-async def test_7016(async_conn):
-    "7016 - test fetchmany() with fetch_lobs=False"
-    value = "test_7016"
-    rows = await async_conn.fetchmany(
-        "select to_clob(:1) from dual", [value], fetch_lobs=False
-    )
-    assert rows == [(value,)]
-
-
-async def test_7017(async_conn):
-    "7017 - test fetchall() with fetch_lobs=False"
-    value = "test_7017"
-    rows = await async_conn.fetchall(
-        "select to_clob(:1) from dual", [value], fetch_lobs=False
-    )
-    assert rows == [(value,)]
-
-
-async def test_7018(async_conn):
-    "7018 - test fetchone() with fetch_decimals=True"
-    value = 7018
-    (result,) = await async_conn.fetchone(
-        "select :1 from dual", [value], fetch_decimals=True
-    )
-    assert isinstance(result, decimal.Decimal)
-
-
-async def test_7019(async_conn):
-    "7019 - test fetchmany() with fetch_decimals=True"
-    value = 7019
-    rows = await async_conn.fetchmany(
-        "select :1 from dual", [value], fetch_decimals=True
-    )
-    assert isinstance(rows[0][0], decimal.Decimal)
-
-
-async def test_7020(async_conn):
-    "7020 - test fetchall() with fetch_decimals=True"
-    value = 7020
-    rows = await async_conn.fetchall(
-        "select :1 from dual", [value], fetch_decimals=True
-    )
-    assert isinstance(rows[0][0], decimal.Decimal)
diff --git a/tests/test_7100_interval_ym_var.py b/tests/test_7100_interval_ym_var.py
deleted file mode 100644
index e6f0722e..00000000
--- a/tests/test_7100_interval_ym_var.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7100 - Module for testing interval year to month variables
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(scope="module")
-def module_data():
-    data = []
-    for i in range(1, 11):
-        delta = oracledb.IntervalYM(i - 5, -i if i - 5 < 0 else i)
-        if i % 2 == 0:
-            nullable_delta = None
-        else:
-            nullable_delta = oracledb.IntervalYM(i + 5, i + 2)
-        precision_col = oracledb.IntervalYM(3, 8)
-        data_tuple = (i, delta, nullable_delta, precision_col)
-        data.append(data_tuple)
-    return data
-
-
-@pytest.fixture(scope="module")
-def module_data_by_key(module_data):
-    data_by_key = {}
-    for row in module_data:
-        data_by_key[row[0]] = row
-    return data_by_key
-
-
-def test_7100(cursor, module_data_by_key):
-    "7100 - test binding in an interval"
-    value = oracledb.IntervalYM(1, 6)
-    cursor.execute(
-        "select * from TestIntervalYMs where IntervalCol = :value",
-        value=value,
-    )
-    assert cursor.fetchall() == [module_data_by_key[6]]
-
-
-def test_7101(cursor):
-    "7101 - test binding in a null"
-    cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_YM)
-    cursor.execute(
-        "select * from TestIntervalYMs where IntervalCol = :value",
-        value=None,
-    )
-    assert cursor.fetchall() == []
-
-
-def test_7102(cursor):
-    "7102 - test binding out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_YM)
-    cursor.execute(
-        """
-        begin
-            :value := to_yminterval('-25-7');
-        end;
-        """
-    )
-    expected_value = oracledb.IntervalYM(years=-25, months=-7)
-    assert bind_vars["value"].getvalue() == expected_value
-
-
-def test_7103(cursor):
-    "7103 - test binding in/out with set input sizes defined"
-    bind_vars = cursor.setinputsizes(value=oracledb.DB_TYPE_INTERVAL_YM)
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_yminterval('3-8');
-        end;
-        """,
-        value=oracledb.IntervalYM(years=8, months=4),
-    )
-    expected_value = oracledb.IntervalYM(years=12, months=0)
-    assert bind_vars["value"].getvalue() == expected_value
-
-
-def test_7104(cursor):
-    "7104 - test binding out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_INTERVAL_YM)
-    cursor.execute(
-        """
-        begin
-            :value := to_yminterval('1-9');
-        end;
-        """,
-        value=var,
-    )
-    expected_value = oracledb.IntervalYM(years=1, months=9)
-    assert var.getvalue() == expected_value
-
-
-def test_7105(cursor):
-    "7105 - test binding in/out with cursor.var() method"
-    var = cursor.var(oracledb.DB_TYPE_INTERVAL_YM)
-    var.setvalue(0, oracledb.IntervalYM(years=3, months=10))
-    cursor.execute(
-        """
-        begin
-            :value := :value + to_yminterval('2-5');
-        end;
-        """,
-        value=var,
-    )
-    expected_value = oracledb.IntervalYM(years=6, months=3)
-    assert var.getvalue() == expected_value
-
-
-def test_7106(cursor):
-    "7106 - test cursor description is accurate"
-    cursor.execute("select * from TestIntervalYMs")
-    expected_value = [
-        ("INTCOL", oracledb.DB_TYPE_NUMBER, 10, None, 9, 0, False),
-        (
-            "INTERVALCOL",
-            oracledb.DB_TYPE_INTERVAL_YM,
-            None,
-            None,
-            2,
-            0,
-            False,
-        ),
-        (
-            "NULLABLECOL",
-            oracledb.DB_TYPE_INTERVAL_YM,
-            None,
-            None,
-            2,
-            0,
-            True,
-        ),
-        (
-            "INTERVALPRECISIONCOL",
-            oracledb.DB_TYPE_INTERVAL_YM,
-            None,
-            None,
-            3,
-            0,
-            True,
-        ),
-    ]
-    assert cursor.description == expected_value
-
-
-def test_7107(cursor, module_data):
-    "7107 - test that fetching all of the data returns the correct results"
-    cursor.execute("select * From TestIntervalYMs order by IntCol")
-    assert cursor.fetchall() == module_data
-    assert cursor.fetchall() == []
-
-
-def test_7108(cursor, module_data):
-    "7108 - test that fetching data in chunks returns the correct results"
-    cursor.execute("select * From TestIntervalYMs order by IntCol")
-    assert cursor.fetchmany(3) == module_data[0:3]
-    assert cursor.fetchmany(2) == module_data[3:5]
-    assert cursor.fetchmany(4) == module_data[5:9]
-    assert cursor.fetchmany(3) == module_data[9:]
-    assert cursor.fetchmany(3) == []
-
-
-def test_7109(cursor, module_data_by_key):
-    "7109 - test that fetching a single row returns the correct results"
-    cursor.execute(
-        """
-        select *
-        from TestIntervalYMs
-        where IntCol in (3, 4)
-        order by IntCol
-        """
-    )
-    assert cursor.fetchone() == module_data_by_key[3]
-    assert cursor.fetchone() == module_data_by_key[4]
-    assert cursor.fetchone() is None
-
-
-def test_7110(cursor):
-    "7110 - test binding and fetching a negative interval"
-    value = oracledb.IntervalYM(years=-12, months=-5)
-    cursor.execute("select :1 from dual", [value])
-    (result,) = cursor.fetchone()
-    assert result == value
diff --git a/tests/test_7200_tnsnames.py b/tests/test_7200_tnsnames.py
deleted file mode 100644
index 7526bfbf..00000000
--- a/tests/test_7200_tnsnames.py
+++ /dev/null
@@ -1,552 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7200 - Module for testing parsing of tnsnames.ora files.
-"""
-
-import os
-import tempfile
-
-import oracledb
-
-
-def test_7200():
-    "7200 - test simple tnsnames.ora entry"
-    host = "host_7200"
-    port = 7200
-    service_name = "service_7200"
-    network_service_name = "nsn_7200"
-    connect_string = f"""
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port}))
-        (CONNECT_DATA=(SERVICE_NAME={service_name})))"""
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-
-
-def test_7201(test_env):
-    "7201 - test missing entry in tnsnames.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write("# no entries")
-        with test_env.assert_raises_full_code("DPY-4000"):
-            params.parse_connect_string("nsn_7201")
-        assert params.get_network_service_names() == []
-
-
-def test_7202(test_env):
-    "7202 - test missing tnsnames.ora in configuration directory"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        with test_env.assert_raises_full_code("DPY-4026"):
-            params.parse_connect_string("nsn_7202")
-        with test_env.assert_raises_full_code("DPY-4026"):
-            params.get_network_service_names()
-
-
-def test_7203():
-    "7203 - test tnsnames.ora with invalid entries"
-    host = "host_7203"
-    port = 7203
-    service_name = "service_7203"
-    connect_string = f"""
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port}))
-        (CONNECT_DATA=(SERVICE_NAME={service_name})))"""
-    network_service_name = "nsn_7203"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write("some garbage data which is not a valid entry\n")
-            f.write(f"{network_service_name} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-
-
-def test_7204():
-    "7204 - test tnsnames.ora with multiple aliases on one line"
-    host = "host_7204"
-    port = 7204
-    service_name = "service_7204"
-    connect_string = f"""
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port}))
-        (CONNECT_DATA=(SERVICE_NAME={service_name})))"""
-    network_service_names = "nsn_7204a,nsn_7204b"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_names} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        for name in network_service_names.split(","):
-            params.parse_connect_string(name)
-            assert params.host == host
-            assert params.port == port
-            assert params.service_name == service_name
-        assert (
-            params.get_network_service_names()
-            == network_service_names.upper().split(",")
-        )
-
-
-def test_7205():
-    "7205 - test easy connect string in tnsnames.ora"
-    host = "host_7205"
-    port = 7205
-    service_name = "service_7205"
-    connect_string = f"tcp://{host}:{port}/{service_name}"
-    network_service_name = "nsn_7205"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.get_network_service_names() == [
-            network_service_name.upper()
-        ]
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-
-
-def test_7206():
-    "7206 - parse connect descriptor with / character in tnsnames.ora"
-    host = "host_7206"
-    port = 7206
-    service_name = "service_7206"
-    wallet_location = "/some/dir/7206"
-    connect_string = f"""
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port}))
-        (CONNECT_DATA=(SERVICE_NAME={service_name}))
-        (SECURITY=(MY_WALLET_DIRECTORY={wallet_location})))"""
-    network_service_name = "nsn_7206"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-    assert params.host == host
-    assert params.port == port
-    assert params.service_name == service_name
-    assert params.wallet_location == wallet_location
-
-
-def test_7207():
-    "7207 - parse IFILE with files in same directory"
-    host_a = "host_7207a"
-    host_b = "host_7207b"
-    port_a = 72071
-    port_b = 72072
-    service_name_a = "service_7207a"
-    service_name_b = "service_7207b"
-    connect_string_a = f"{host_a}:{port_a}/{service_name_a}"
-    connect_string_b = f"{host_b}:{port_b}/{service_name_b}"
-    network_service_name_a = "nsn_7207a"
-    network_service_name_b = "nsn_7207b"
-    include_file_name = "inc_7207.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, include_file_name)
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name_b} = {connect_string_b}")
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name_a} = {connect_string_a}\n")
-            f.write(f"ifile = {include_file_name}")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name_a)
-        assert params.host == host_a
-        assert params.port == port_a
-        assert params.service_name == service_name_a
-        params.parse_connect_string(network_service_name_b)
-        assert params.host == host_b
-        assert params.port == port_b
-        assert params.service_name == service_name_b
-        assert params.get_network_service_names() == [
-            network_service_name_a.upper(),
-            network_service_name_b.upper(),
-        ]
-
-
-def test_7208():
-    "7208 - parse IFILE with files in different directories"
-    host_a = "host_7208a"
-    host_b = "host_7208b"
-    port_a = 72081
-    port_b = 72082
-    service_name_a = "service_7208a"
-    service_name_b = "service_7208b"
-    connect_string_a = f"{host_a}:{port_a}/{service_name_a}"
-    connect_string_b = f"{host_b}:{port_b}/{service_name_b}"
-    network_service_name_a = "nsn_7208a"
-    network_service_name_b = "nsn_7208b"
-    include_file_name = "inc_7208.ora"
-    dir_1 = tempfile.TemporaryDirectory()
-    dir_2 = tempfile.TemporaryDirectory()
-    with dir_1 as primary_temp_dir, dir_2 as included_temp_dir:
-        file_name = os.path.join(included_temp_dir, include_file_name)
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name_b} = {connect_string_b}")
-        primary_file_name = os.path.join(primary_temp_dir, "tnsnames.ora")
-        with open(primary_file_name, "w") as f:
-            f.write(f"{network_service_name_a} = {connect_string_a}\n")
-            f.write(f"ifile = {file_name}")
-        params = oracledb.ConnectParams(config_dir=primary_temp_dir)
-        params.parse_connect_string(network_service_name_a)
-        assert params.host == host_a
-        assert params.port == port_a
-        assert params.service_name == service_name_a
-        params.parse_connect_string(network_service_name_b)
-        assert params.host == host_b
-        assert params.port == port_b
-        assert params.service_name == service_name_b
-        assert params.get_network_service_names() == [
-            network_service_name_a.upper(),
-            network_service_name_b.upper(),
-        ]
-
-
-def test_7209(test_env):
-    "7209 - cycle detection in same file"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        network_service_name = "nsn_7209"
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = some_host/some_service\n")
-            f.write("IFILE = tnsnames.ora")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        with test_env.assert_raises_full_code("DPY-4030"):
-            params.parse_connect_string(network_service_name)
-
-
-def test_7210(test_env):
-    "7210 - cycle detection in directly included file"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        network_service_name = "nsn_7210"
-        include_name = "included_7210.ora"
-        primary_file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name = os.path.join(temp_dir, include_name)
-        with open(primary_file_name, "w") as f:
-            f.write(f"{network_service_name} = some_host/some_service\n")
-            f.write(f"IFILE = {include_name}")
-        with open(include_file_name, "w") as f:
-            f.write("IFILE = tnsnames.ora")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        with test_env.assert_raises_full_code("DPY-4030"):
-            params.parse_connect_string(network_service_name)
-
-
-def test_7211(test_env):
-    "7211 - cycle detection in indirectly included file"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        network_service_name = "nsn_7211"
-        include_name_a = "included_7211_a.ora"
-        include_name_b = "included_7211_b.ora"
-        primary_file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name_a = os.path.join(temp_dir, include_name_a)
-        include_file_name_b = os.path.join(temp_dir, include_name_b)
-        with open(primary_file_name, "w") as f:
-            f.write(f"{network_service_name} = some_host/some_service\n")
-            f.write(f"IFILE = {include_name_a}")
-        with open(include_file_name_a, "w") as f:
-            f.write(f"IFILE = {include_name_b}")
-        with open(include_file_name_b, "w") as f:
-            f.write("IFILE = tnsnames.ora")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        with test_env.assert_raises_full_code("DPY-4030"):
-            params.parse_connect_string(network_service_name)
-
-
-def test_7212():
-    "7212 - duplicate entry in same file, but identical connect strings"
-    host = "host_7212"
-    port = 7212
-    service_name = "service_7212"
-    connect_string = f"{host}:{port}/{service_name}"
-    network_service_name = "nsn_7212"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}\n")
-            f.write("some_other_nsn = some_host/some_service\n")
-            f.write(f"{network_service_name} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-
-
-def test_7213():
-    "7213 - duplicate entry in same file, but different connect strings"
-    host_a = "host_7213a"
-    port = 7213
-    service_name_a = "service_7213a"
-    host_b = "host_7213b"
-    service_name_b = "service_7213b"
-    connect_string_a = f"{host_a}:{port}/{service_name_a}"
-    connect_string_b = f"{host_b}:{port}/{service_name_b}"
-    network_service_name = "nsn_7213"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string_a}\n")
-            f.write("some_other_nsn = some_host/some_service\n")
-            f.write(f"{network_service_name} = {connect_string_b}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host_b
-        assert params.port == port
-        assert params.service_name == service_name_b
-
-
-def test_7214():
-    "7214 - duplicate entry in other file, but identical connect strings"
-    host = "host_7214"
-    port = 7214
-    service_name = "service_7214"
-    connect_string = f"{host}:{port}/{service_name}"
-    network_service_name = "nsn_7214"
-    include_name = "inc_7214.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name = os.path.join(temp_dir, include_name)
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}\n")
-            f.write(f"IFILE = {include_name}")
-        with open(include_file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-
-
-def test_7215():
-    "7215 - duplicate entry in other file, but different connect strings"
-    host_a = "host_7215a"
-    port = 7215
-    service_name_a = "service_7215a"
-    host_b = "host_7215b"
-    service_name_b = "service_7215b"
-    connect_string_a = f"{host_a}:{port}/{service_name_a}"
-    connect_string_b = f"{host_b}:{port}/{service_name_b}"
-    network_service_name = "nsn_7215"
-    include_name = "inc_7215.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name = os.path.join(temp_dir, include_name)
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string_a}\n")
-            f.write(f"IFILE = {include_name}")
-        with open(include_file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string_b}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host_b
-        assert params.port == port
-        assert params.service_name == service_name_b
-
-
-def test_7216(test_env):
-    "7216 - test missing IFILE in tnsnames.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write("IFILE = missing.ora\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        with test_env.assert_raises_full_code("DPY-4026"):
-            params.parse_connect_string("anything")
-
-
-def test_7217():
-    "7217 - test duplicate IFILE, same file"
-    host = "host_7217"
-    port = 7217
-    service_name = "service_7217"
-    connect_string = f"{host}:{port}/{service_name}"
-    network_service_name = "nsn_7217"
-    include_name = "inc_7217.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name = os.path.join(temp_dir, include_name)
-        with open(file_name, "w") as f:
-            f.write(f"IFILE = {include_name}\n")
-            f.write("another_nsn = some_host/some_service\n")
-            f.write(f"IFILE = {include_name}\n")
-        with open(include_file_name, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_network_service_names() == [
-            network_service_name.upper(),
-            "ANOTHER_NSN",
-        ]
-
-
-def test_7218():
-    "7218 - test duplicate IFILE, different files"
-    host = "host_7218"
-    port = 7218
-    service_name = "service_7218"
-    connect_string = f"{host}:{port}/{service_name}"
-    network_service_name = "nsn_7218"
-    include_name_a = "inc_7218_a.ora"
-    include_name_b = "inc_7218_b.ora"
-    include_name_c = "inc_7218_c.ora"
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        include_file_name_a = os.path.join(temp_dir, include_name_a)
-        include_file_name_b = os.path.join(temp_dir, include_name_b)
-        include_file_name_c = os.path.join(temp_dir, include_name_c)
-        with open(file_name, "w") as f:
-            f.write(f"IFILE = {include_name_a}\n")
-            f.write("another_nsn = some_host/some_service\n")
-            f.write(f"IFILE = {include_name_b}\n")
-        with open(include_file_name_a, "w") as f:
-            f.write("in_a = some_host/some_service\n")
-            f.write(f"IFILE = {include_name_c}\n")
-        with open(include_file_name_b, "w") as f:
-            f.write("in_b = some_host/some_service\n")
-            f.write(f"IFILE = {include_name_c}\n")
-        with open(include_file_name_c, "w") as f:
-            f.write(f"{network_service_name} = {connect_string}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_network_service_names() == [
-            "IN_A",
-            network_service_name.upper(),
-            "ANOTHER_NSN",
-            "IN_B",
-        ]
-
-
-def test_7219():
-    "7219 - test tnsnames.ora with multiple aliases on different lines"
-    host = "host_7219"
-    port = 7219
-    service_name = "service_7219"
-    connect_string = f"{host}:{port}/{service_name}"
-    network_service_names = ["nsn_7219a", "nsn_7219b", "nsn_7219c"]
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(",\n".join(network_service_names))
-            f.write(f" = {connect_string}")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        for name in network_service_names:
-            params.parse_connect_string(name)
-            assert params.host == host
-            assert params.port == port
-            assert params.service_name == service_name
-        assert params.get_network_service_names() == [
-            n.upper() for n in network_service_names
-        ]
-
-
-def test_7220():
-    "7220 - test tnsnames.ora with comment embedded in dsn"
-    host = "host_7220"
-    port = 7220
-    service_name = "service_7220"
-    network_service_name = "nsn_7220"
-    connect_string = f"""
-        (DESCRIPTION=
-            (ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port}))
-            (CONNECT_DATA=
-                (SERVICE_NAME={service_name})
-                # embedded comment
-            )
-        )"""
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            print(f"{network_service_name} = {connect_string}", file=f)
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        params.parse_connect_string(network_service_name)
-        assert params.host == host
-        assert params.port == port
-        assert params.service_name == service_name
-        assert params.get_network_service_names() == [
-            network_service_name.upper()
-        ]
-
-
-def test_7221():
-    "7221 - test tnsnames.ora with a comment between aliases"
-    test_values = [
-        ("nsn_7221_1", "tcp://host_7221:7221/service_7222_1"),
-        ("nsn_7221_2", "tcp://host_7222:7222/service_7222_2"),
-    ]
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        for i in range(3):
-            entries = [f"{n} = {c}\n" for n, c in test_values]
-            entries.insert(i, "# COMMENT \n")
-            with open(file_name, "w") as f:
-                f.writelines(entries)
-            params = oracledb.ConnectParams(config_dir=temp_dir)
-            assert params.get_network_service_names() == [
-                n.upper() for n, _ in test_values
-            ]
-
-
-def test_7222():
-    "7222 - test tnsnames.ora with easy connect and connect descriptors"
-    network_service_name1 = "nsn_7222_1"
-    connect_string1 = """
-        (DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=host_7220)(PORT=7222))
-        (CONNECT_DATA=(SERVICE_NAME=service_7222_1)))"""
-
-    network_service_name2 = "nsn_7222_2"
-    connect_string2 = "tcp://host_7222:7222/service_7222_2"
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        file_name = os.path.join(temp_dir, "tnsnames.ora")
-        with open(file_name, "w") as f:
-            f.write(f"{network_service_name1} = {connect_string1}\n")
-            f.write(f"{network_service_name2} = {connect_string2}\n")
-        params = oracledb.ConnectParams(config_dir=temp_dir)
-        assert params.get_network_service_names() == [
-            network_service_name1.upper(),
-            network_service_name2.upper(),
-        ]
diff --git a/tests/test_7300_unsupported_features_thin.py b/tests/test_7300_unsupported_features_thin.py
deleted file mode 100644
index 439bf70f..00000000
--- a/tests/test_7300_unsupported_features_thin.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7300 - Module for testing unsupported features in Thin mode
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_thin_mode):
-    pass
-
-
-def test_7300(test_env):
-    "7300 - test getting and setting thick attributes"
-    pool = test_env.get_pool()
-    with test_env.assert_raises_full_code("DPY-3001"):
-        pool.soda_metadata_cache
-    with test_env.assert_raises_full_code("DPY-3001"):
-        pool.soda_metadata_cache = True
-    with test_env.assert_raises_full_code("DPY-3001"):
-        pool.max_sessions_per_shard
-    with test_env.assert_raises_full_code("DPY-3001"):
-        pool.max_sessions_per_shard = 2
-
-
-def test_7302(test_env):
-    "7302 - test connection with sharding and supersharding keys"
-    with test_env.assert_raises_full_code("DPY-3001"):
-        test_env.get_connection(shardingkey=[27])
-    with test_env.assert_raises_full_code("DPY-3001"):
-        test_env.get_connection(supershardingkey=[17, 23])
-
-
-def test_7303(test_env):
-    "7303 - test connect() without a connect string (bequeath)"
-    with test_env.assert_raises_full_code("DPY-3001"):
-        oracledb.connect(
-            user=test_env.main_user,
-            password=test_env.main_password,
-        )
-
-
-def test_7304(test_env):
-    "7304 - test acquire() from a pool with a session tag"
-    pool = test_env.get_pool()
-    with test_env.assert_raises_full_code("DPY-3001"):
-        pool.acquire(tag="unimportant")
diff --git a/tests/test_7400_tpc_async.py b/tests/test_7400_tpc_async.py
deleted file mode 100644
index dc4933ef..00000000
--- a/tests/test_7400_tpc_async.py
+++ /dev/null
@@ -1,371 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7400 - Module for testing TPC (two-phase commit) transactions with asyncio.
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_7400(async_conn, async_cursor):
-    "7400 - test begin, prepare, roll back global transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(3900, b"txn3900", b"branchId")
-    await async_conn.tpc_begin(xid)
-    assert not await async_conn.tpc_prepare()
-    await async_conn.tpc_begin(xid)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    assert await async_conn.tpc_prepare()
-    await async_conn.tpc_rollback()
-    await async_cursor.execute("select count(*) from TestTempTable")
-    (count,) = await async_cursor.fetchone()
-    assert count == 0
-
-
-async def test_7401(async_conn, async_cursor):
-    "7401 - test begin, prepare, commit global transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(3901, "txn3901", "branchId")
-    await async_conn.tpc_begin(xid)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    assert await async_conn.tpc_prepare()
-    await async_conn.tpc_commit()
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    assert await async_cursor.fetchall() == [(1, "tesName")]
-
-
-async def test_7402(async_conn, async_cursor):
-    "7402 - test multiple global transactions on the same connection"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid1 = async_conn.xid(3902, "txn3902", "branch1")
-    xid2 = async_conn.xid(3902, b"txn3902", b"branch2")
-    await async_conn.tpc_begin(xid1)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'tesName')
-        """
-    )
-    await async_conn.tpc_end()
-    await async_conn.tpc_begin(xid2)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'tesName')
-        """
-    )
-    await async_conn.tpc_end()
-    needs_commit1 = await async_conn.tpc_prepare(xid1)
-    needs_commit2 = await async_conn.tpc_prepare(xid2)
-    if needs_commit1:
-        await async_conn.tpc_commit(xid1)
-    if needs_commit2:
-        await async_conn.tpc_commit(xid2)
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    expected_rows = [(1, "tesName"), (2, "tesName")]
-    assert await async_cursor.fetchall() == expected_rows
-
-
-async def test_7403(async_conn, async_cursor, test_env):
-    "7403 - test rollback with parameter xid"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid1 = async_conn.xid(3901, b"txn3901", b"branch1")
-    xid2 = async_conn.xid(3902, "txn3902", "branch2")
-    for count, xid in enumerate([xid1, xid2]):
-        await async_conn.tpc_begin(xid)
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:id, 'tesName')
-            """,
-            id=count,
-        )
-        await async_conn.tpc_end()
-    await async_conn.tpc_rollback(xid1)
-
-    with test_env.assert_raises_full_code("ORA-24756"):
-        await async_conn.tpc_prepare(xid1)
-    needs_commit = await async_conn.tpc_prepare(xid2)
-    if needs_commit:
-        await async_conn.tpc_commit(xid2)
-    await async_cursor.execute(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    assert await async_cursor.fetchall() == [(1, "tesName")]
-
-
-async def test_7404(async_conn, async_cursor):
-    "7404 - test resuming a transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid1 = async_conn.xid(3939, "txn3939", "branch39")
-    xid2 = async_conn.xid(3940, "txn3940", "branch40")
-    values = [[xid1, (1, "User Info")], [xid2, (2, "Other User Info")]]
-    for xid, data in values:
-        await async_conn.tpc_begin(xid)
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data,
-        )
-        await async_conn.tpc_end()
-    for xid, data in values:
-        await async_conn.tpc_begin(xid, oracledb.TPC_BEGIN_RESUME)
-        await async_cursor.execute(
-            "select IntCol, StringCol1 from TestTempTable"
-        )
-        (res,) = await async_cursor.fetchall()
-        assert res == data
-        await async_conn.tpc_rollback(xid)
-
-
-async def test_7405(async_conn, async_cursor, test_env):
-    "7405 - test promoting a local transaction to a tpc transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(3941, "txn3941", "branch41")
-    values = (1, "String 1")
-    await async_cursor.execute(
-        "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)",
-        values,
-    )
-    with test_env.assert_raises_full_code("ORA-24776"):
-        await async_conn.tpc_begin(xid)
-    await async_conn.tpc_begin(xid, oracledb.TPC_BEGIN_PROMOTE)
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    (res,) = await async_cursor.fetchall()
-    assert res == values
-    await async_conn.tpc_rollback(xid)
-
-
-async def test_7406(async_conn, async_cursor, test_env):
-    "7406 - test ending a transaction with parameter xid"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid1 = async_conn.xid(7406, "txn7406a", "branch3")
-    xid2 = async_conn.xid(7406, b"txn7406b", b"branch4")
-    await async_conn.tpc_begin(xid1)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test7406a')
-        """
-    )
-    await async_conn.tpc_begin(xid2)
-    with test_env.assert_raises_full_code("ORA-24758"):
-        await async_conn.tpc_end(xid1)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'test7406b')
-        """
-    )
-    await async_conn.tpc_end(xid2)
-    with test_env.assert_raises_full_code("ORA-25352"):
-        await async_conn.tpc_end(xid1)
-    await async_conn.tpc_rollback(xid1)
-    await async_conn.tpc_rollback(xid2)
-
-
-async def test_7407(async_conn, async_cursor):
-    "7407 - test tpc_recover()"
-    await async_cursor.execute("truncate table TestTempTable")
-    n_xids = 10
-    for i in range(n_xids):
-        xid = async_conn.xid(7407 + i, f"txn7407{i}", f"branch{i}")
-        await async_conn.tpc_begin(xid)
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, 'test7407')
-            """,
-            [i + 1],
-        )
-        await async_conn.tpc_prepare(xid)
-    recovers = await async_conn.tpc_recover()
-    assert len(recovers) == n_xids
-
-    await async_cursor.execute("select * from DBA_PENDING_TRANSACTIONS")
-    assert await async_cursor.fetchall() == recovers
-
-    for xid in recovers:
-        if xid.format_id % 2 == 0:
-            await async_conn.tpc_commit(xid)
-    recovers = await async_conn.tpc_recover()
-    assert len(recovers) == n_xids // 2
-
-    for xid in recovers:
-        await async_conn.tpc_rollback(xid)
-    recovers = await async_conn.tpc_recover()
-    assert len(recovers) == 0
-
-
-async def test_7408(async_conn, async_cursor):
-    "7408 - test tpc_recover() with read-only transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    for i in range(4):
-        xid = async_conn.xid(7408 + i, f"txn7408{i}", f"branch{i}")
-        await async_conn.tpc_begin(xid)
-        await async_cursor.execute("select * from TestTempTable")
-        await async_conn.tpc_prepare(xid)
-    recovers = await async_conn.tpc_recover()
-    assert len(recovers) == 0
-
-
-async def test_7409(async_conn, async_cursor):
-    "7409 - test tpc_commit() with one_phase parameter"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7409, "txn7409", "branch1")
-    await async_conn.tpc_begin(xid)
-    values = (1, "test7409")
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        values,
-    )
-    await async_cursor.execute("select IntCol, StringCol1 from TestTempTable")
-    await async_conn.tpc_commit(xid, one_phase=True)
-    assert await async_cursor.fetchall() == [values]
-
-
-async def test_7410(async_conn, async_cursor, test_env):
-    "7410 - test negative cases for tpc_commit()"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7410, "txn7410", "branch1")
-    await async_conn.tpc_begin(xid)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test7410')
-        """
-    )
-    with pytest.raises(TypeError):
-        await async_conn.tpc_commit("invalid xid")
-    await async_conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-02053"):
-        await async_conn.tpc_commit(xid, one_phase=True)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        await async_conn.tpc_commit(xid)
-
-
-async def test_7411(async_conn, async_cursor, test_env):
-    "7411 - test starting an already created transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7411, "txn7411", "branch1")
-    await async_conn.tpc_begin(xid)
-    with test_env.assert_raises_full_code("ORA-24757"):
-        await async_conn.tpc_begin(xid, oracledb.TPC_BEGIN_NEW)
-    with test_env.assert_raises_full_code("ORA-24797"):
-        await async_conn.tpc_begin(xid, oracledb.TPC_BEGIN_PROMOTE)
-    await async_conn.tpc_end()
-    for flag in [oracledb.TPC_BEGIN_NEW, oracledb.TPC_BEGIN_PROMOTE]:
-        with test_env.assert_raises_full_code("ORA-24757"):
-            await async_conn.tpc_begin(xid, flag)
-    await async_conn.tpc_rollback(xid)
-
-
-async def test_7412(async_conn, async_cursor, test_env):
-    "7412 - test resuming a prepared transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7412, "txn7412", "branch1")
-    await async_conn.tpc_begin(xid)
-    await async_conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        await async_conn.tpc_begin(xid, oracledb.TPC_BEGIN_RESUME)
-
-
-async def test_7413(async_conn, async_cursor, test_env):
-    "7413 - test tpc_begin and tpc_end with invalid parameters"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7413, "txn7413", "branch1")
-    test_values = [
-        (async_conn.tpc_begin, "DPY-2050"),
-        (async_conn.tpc_end, "DPY-2051"),
-    ]
-    for tpc_function, error_code in test_values:
-        with pytest.raises(TypeError):
-            await tpc_function("invalid xid")
-        with test_env.assert_raises_full_code(error_code):
-            await tpc_function(xid, "invalid flag")
-        with test_env.assert_raises_full_code(error_code):
-            await tpc_function(xid, 70)
-
-
-async def test_7414(async_conn, async_cursor, test_env):
-    "7414 - test commiting transaction without tpc_commit"
-    xid = async_conn.xid(7414, "txn7409", "branch1")
-    await async_conn.tpc_begin(xid)
-    with test_env.assert_raises_full_code("ORA-02089"):
-        await async_cursor.execute("truncate table TestTempTable")
-
-
-async def test_7415(async_conn, async_cursor, test_env):
-    "7415 - test tpc_commit when a commit is not needed"
-    xid = async_conn.xid(7416, "txn7416", "branch1")
-    await async_conn.tpc_begin(xid)
-    await async_cursor.execute("select * from TestTempTable")
-    await async_conn.tpc_end(xid)
-    await async_conn.tpc_prepare(xid)
-    with test_env.assert_raises_full_code("ORA-24756"):
-        await async_conn.tpc_commit(xid)
-
-
-async def test_7416(async_conn, async_cursor):
-    "7416 - test transaction_in_progress"
-    await async_cursor.execute("truncate table TestTempTable")
-    xid = async_conn.xid(7415, "txn7415", "branch1")
-    assert not async_conn.transaction_in_progress
-
-    await async_conn.tpc_begin(xid)
-    assert async_conn.transaction_in_progress
-    await async_cursor.execute("insert into TestTempTable (IntCol) values (2)")
-
-    await async_conn.tpc_end(xid)
-    assert not async_conn.transaction_in_progress
-
-    await async_conn.tpc_prepare(xid)
-    assert not async_conn.transaction_in_progress
-
-    await async_conn.tpc_commit(xid)
-    assert not async_conn.transaction_in_progress
diff --git a/tests/test_7500_binary_vector.py b/tests/test_7500_binary_vector.py
deleted file mode 100644
index 04905618..00000000
--- a/tests/test_7500_binary_vector.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7500 - Module for testing the VECTOR database type with storage format BINARY
-available in Oracle Database 23.5 and higher.
-"""
-
-import array
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_binary_vectors_supported):
-    pass
-
-
-def test_7500(conn, cursor):
-    "7500 - test binding and fetching a BINARY format vector."
-    value = array.array("B", [4, 8, 12, 4, 98, 127, 25, 78])
-    cursor.execute("delete from TestBinaryVectors")
-    cursor.execute(
-        """
-        insert into TestBinaryVectors (IntCol, VectorBinaryCol)
-        values(1, :value)
-        """,
-        value=value,
-    )
-    conn.commit()
-    cursor.execute("select VectorBinaryCol from TestBinaryVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == "B"
-    assert fetched_value == value
-
-
-def test_7501(cursor):
-    "7501 - verify fetch info contents"
-    attr_names = [
-        "name",
-        "type_code",
-        "vector_dimensions",
-        "vector_format",
-    ]
-    expected_values = [
-        ["INTCOL", oracledb.DB_TYPE_NUMBER, None, None],
-        [
-            "VECTORBINARYCOL",
-            oracledb.DB_TYPE_VECTOR,
-            64,
-            oracledb.VECTOR_FORMAT_BINARY,
-        ],
-    ]
-    cursor.execute("select * from TestBinaryVectors")
-    values = [[getattr(i, n) for n in attr_names] for i in cursor.description]
-    assert values == expected_values
-    assert cursor.description[1].vector_format is oracledb.VectorFormat.BINARY
-
-
-def test_7502(conn, cursor):
-    "7502 - test comparing BINARY vectors"
-    value = array.array("B", [20, 9, 15, 34, 108, 125, 35, 88])
-    cursor.execute("delete from TestBinaryVectors")
-    cursor.execute(
-        """
-        insert into TestBinaryVectors (IntCol, VectorBinaryCol)
-        values(1, :value)
-        """,
-        value=value,
-    )
-    conn.commit()
-    cursor.execute(
-        """
-        select vector_distance(VectorBinaryCol, :value)
-        from TestBinaryVectors
-        """,
-        value=value,
-    )
-    (result,) = cursor.fetchone()
-    assert result == pytest.approx(0)
diff --git a/tests/test_7600_pipelining_async.py b/tests/test_7600_pipelining_async.py
deleted file mode 100644
index d00489be..00000000
--- a/tests/test_7600_pipelining_async.py
+++ /dev/null
@@ -1,1028 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7600 - Module for testing async pipelining.
-"""
-
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-async def test_7600(async_conn):
-    "7600 - test execute() and fetchall()."
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (:1)", [1])
-    pipeline.add_execute(
-        "insert into TestTempTable (IntCol) values (:val)", dict(val=2)
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchall("select IntCol from TestTempTable order by IntCol")
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [(1,), (2,)]
-
-
-async def test_7601(async_conn):
-    "7601 - test executemany()"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)", [(2,), (3,)]
-    )
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:data)",
-        [{"data": 4}, {"data": 5}],
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchall("select IntCol from TestTempTable order by IntCol")
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [(2,), (3,), (4,), (5,)]
-
-
-async def test_7602(async_conn):
-    "7602 - test fetchall() with arraysize"
-    data = [(1,), (2,), (3,), (4,)]
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:value)",
-        [{"value": i} for i, in data],
-    )
-    pipeline.add_commit()
-    arraysize = 1
-    op = pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-        arraysize=arraysize,
-    )
-    assert op.arraysize == arraysize
-    arraysize = len(data)
-    op = pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-        arraysize=arraysize,
-    )
-    assert op.arraysize == arraysize
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == data
-    assert results[-2].rows == data
-
-
-async def test_7603(async_conn):
-    "7603 - test fetchall() with rowfactory"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'test_7003')
-        """
-    )
-    pipeline.add_commit()
-
-    def rowfactory(*row):
-        column_names = ["INTCOL", "STRINGCOL1"]
-        return dict(zip(column_names, row))
-
-    pipeline.add_fetchall(
-        "select IntCol, StringCol1 from TestTempTable",
-        rowfactory=rowfactory,
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    expected_value = [{"INTCOL": 1, "STRINGCOL1": "test_7003"}]
-    assert results[-1].rows == expected_value
-
-
-async def test_7604(async_conn):
-    "7604 - test fetchone()"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)", [(9,), (10,)]
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchone("select IntCol from TestTempTable order by IntCol")
-    pipeline.add_fetchone("select :1 from dual", [23])
-    pipeline.add_fetchone("select :val from dual", {"val": 5})
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-3].rows == [(9,)]
-    assert results[-2].rows == [(23,)]
-    assert results[-1].rows == [(5,)]
-
-
-async def test_7605(async_conn):
-    "7605 - test fetchone() with rowfactory"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int, :str)
-        """,
-        [{"int": 3, "str": "Mac"}, {"int": 4, "str": "Doc"}],
-    )
-    pipeline.add_commit()
-
-    def rowfactory(*row):
-        column_names = ["INT", "STRING"]
-        return dict(zip(column_names, row))
-
-    op = pipeline.add_fetchone(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        rowfactory=rowfactory,
-    )
-    assert op.rowfactory == rowfactory
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [{"INT": 3, "STRING": "Mac"}]
-
-
-async def test_7606(async_conn):
-    "7606 - test fetchmany()"
-    data = [(i,) for i in range(10)]
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchmany("select IntCol from TestTempTable order by IntCol")
-    pipeline.add_fetchmany("select :1 from dual", [1099])
-    pipeline.add_fetchmany("select :val from dual", {"val": 366})
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-3].rows == data
-    assert results[-2].rows == [(1099,)]
-    assert results[-1].rows == [(366,)]
-
-
-async def test_7607(async_conn):
-    "7607 - test fetchmany() with num_rows"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    data = [(i,) for i in range(10)]
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    pipeline.add_commit()
-    num_rows = 7
-    op = pipeline.add_fetchmany(
-        "select IntCol from TestTempTable order by IntCol",
-        num_rows=num_rows,
-    )
-    assert op.num_rows == num_rows
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == data[:num_rows]
-
-
-async def test_7608(async_conn):
-    "7608 - test fetchmany() with rowfactory and num_rows"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:int, :str)
-        """,
-        [{"int": 29, "str": "Feb"}, {"int": 4, "str": "Monday"}],
-    )
-    pipeline.add_commit()
-
-    def rowfactory(*row):
-        column_names = ["INT", "STRING"]
-        return dict(zip(column_names, row))
-
-    num_rows = 2
-    op = pipeline.add_fetchmany(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        num_rows=num_rows,
-        rowfactory=rowfactory,
-    )
-    assert op.num_rows == num_rows
-    assert op.rowfactory == rowfactory
-    expected_value = [
-        {"INT": 4, "STRING": "Monday"},
-        {"INT": 29, "STRING": "Feb"},
-    ]
-    num_rows = 1
-    op = pipeline.add_fetchmany(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-        rowfactory=rowfactory,
-        num_rows=num_rows,
-    )
-    assert op.num_rows == num_rows
-    assert op.rowfactory == rowfactory
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-2].rows == expected_value
-    assert results[-1].rows == [{"INT": 4, "STRING": "Monday"}]
-
-
-async def test_7609(async_conn):
-    "7609 - test callfunc(), return_value and return_type"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_callfunc("func_Test", oracledb.DB_TYPE_NUMBER, ("Yes", 7))
-    kwargs = {"a_String": "Keyword", "a_ExtraAmount": 12}
-    pipeline.add_callfunc(
-        "func_Test", oracledb.DB_TYPE_NUMBER, keyword_parameters=kwargs
-    )
-
-    # paramters and keyword parameters
-    kwargs = {"a_ExtraAmount": 25}
-    func_name = "func_Test"
-    op = pipeline.add_callfunc(
-        func_name, oracledb.DB_TYPE_NUMBER, ["Mixed"], kwargs
-    )
-    assert op.name == func_name
-    assert op.return_type == oracledb.DB_TYPE_NUMBER
-    assert op.statement is None
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[0].return_value == 10
-    assert results[1].return_value == 19
-    assert results[2].return_value == 30
-
-
-async def test_7610(async_conn, async_cursor):
-    "7610 - test callproc() with parameters"
-    pipeline = oracledb.create_pipeline()
-    var = async_cursor.var(oracledb.DB_TYPE_NUMBER)
-    proc_name = "proc_Test"
-    params = ("hi", 5, var)
-    op = pipeline.add_callproc(proc_name, params)
-    assert op.name == proc_name
-    assert op.parameters == params
-    assert op.keyword_parameters is None
-    assert op.statement is None
-    assert op.arraysize == 0
-    assert op.num_rows == 0
-    await async_conn.run_pipeline(pipeline)
-    assert var.getvalue() == 2
-
-
-async def test_7611(async_conn, async_cursor):
-    "7611 - test callproc() with keyword_parameters"
-    in_out_value = async_cursor.var(oracledb.DB_TYPE_NUMBER)
-    in_out_value.setvalue(0, 7)
-    out_value = async_cursor.var(oracledb.DB_TYPE_NUMBER)
-    params = []
-    kwargs = dict(
-        a_InValue="Peace", a_InOutValue=in_out_value, a_OutValue=out_value
-    )
-    pipeline = oracledb.create_pipeline()
-    op = pipeline.add_callproc("proc_Test", params, kwargs)
-    assert op.parameters == params
-    assert op.keyword_parameters == kwargs
-    await async_conn.run_pipeline(pipeline)
-    assert in_out_value.getvalue() == 35
-    assert out_value.getvalue() == 5
-
-
-async def test_7612(async_conn, async_cursor):
-    "7612 - test callproc() with parameters and keyword_parameters"
-    in_out_value = async_cursor.var(oracledb.DB_TYPE_NUMBER)
-    in_out_value.setvalue(0, 8)
-    out_value = async_cursor.var(oracledb.DB_TYPE_NUMBER)
-    params = ["Input_7612"]
-    kwargs = dict(a_InOutValue=in_out_value, a_OutValue=out_value)
-    pipeline = oracledb.create_pipeline()
-    op = pipeline.add_callproc("proc_Test", params, kwargs)
-    assert op.parameters == params
-    assert op.keyword_parameters == kwargs
-    await async_conn.run_pipeline(pipeline)
-    assert in_out_value.getvalue() == 80
-    assert out_value.getvalue() == 10
-
-
-async def test_7613(async_conn):
-    "7613 - test fetchmany() num_rows with 0 and negative values"
-    data = [(i,) for i in range(10)]
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)", data
-    )
-    sql = "select IntCol from TestTempTable"
-    op = pipeline.add_fetchmany(sql, num_rows=0)
-    assert op.statement == sql
-    with pytest.raises(OverflowError):
-        pipeline.add_fetchmany(sql, num_rows=-1)
-    with pytest.raises(OverflowError):
-        pipeline.add_fetchmany(sql, num_rows=-10)
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == []
-
-
-async def test_7614(async_conn):
-    "7614 - test add_commit with transaction_in_progress"
-    assert not async_conn.transaction_in_progress
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        "insert into TestTempTable (IntCol) values (5)",
-    )
-    await async_conn.run_pipeline(pipeline)
-    assert async_conn.transaction_in_progress
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_commit()
-    await async_conn.run_pipeline(pipeline)
-    assert not async_conn.transaction_in_progress
-
-
-async def test_7615(async_conn):
-    "7615 - test getting an error in the middle of pipeline"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (:1)", [5])
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    pipeline.add_execute(
-        "insert into TestTempTable (IntCol) values (9, 'too many values')"
-    )
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline, continue_on_error=True)
-    expected_value = [(5,)]
-    assert results[-3].rows == expected_value
-    assert results[-2].error.full_code == "ORA-00913"
-    assert results[-1].rows == expected_value
-
-
-async def test_7617(async_conn):
-    "7617 - test insert and update the inserted row"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (5)")
-    pipeline.add_execute("update TestTempTable set IntCol=25 where IntCol=5")
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [(25,)]
-
-
-async def test_7618(async_conn):
-    "7618 - test insert and update inserted rows"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)",
-        [(i,) for i in range(100)],
-    )
-    pipeline.add_execute("update TestTempTable set StringCol1 = 'UPD'")
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [(i, "UPD") for i in range(100)]
-
-
-async def test_7619(async_conn):
-    "7619 - test insert many rows twice"
-    values1 = [(i,) for i in range(100)]
-    values2 = [(i,) for i in range(200, 205)]
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    sql = "insert into TestTempTable (IntCol) values (:1)"
-    pipeline.add_executemany(sql, values1)
-    pipeline.add_executemany(sql, values2)
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == values1 + values2
-
-
-async def test_7620(async_conn):
-    "7620 - test insert and delete value"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)",
-        [(i,) for i in range(100)],
-    )
-    pipeline.add_execute("delete TestTempTable")
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == []
-
-
-async def test_7621(async_conn):
-    "7621 - test PipelineOp op_type"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable (IntCol) values (:1)",
-        [(1,), (2,)],
-    )
-    pipeline.add_commit()
-    sql = "select IntCol from TestTempTable"
-    pipeline.add_fetchone(sql)
-    pipeline.add_fetchall(sql)
-    pipeline.add_fetchmany(sql)
-    pipeline.add_callproc("proc_Test", ("hi", 5, 2))
-    pipeline.add_callfunc("func_Test", oracledb.DB_TYPE_NUMBER, ("Yes", 7))
-    results = await async_conn.run_pipeline(pipeline)
-    expected_values = [
-        oracledb.PIPELINE_OP_TYPE_EXECUTE,
-        oracledb.PIPELINE_OP_TYPE_EXECUTE_MANY,
-        oracledb.PIPELINE_OP_TYPE_COMMIT,
-        oracledb.PIPELINE_OP_TYPE_FETCH_ONE,
-        oracledb.PIPELINE_OP_TYPE_FETCH_ALL,
-        oracledb.PIPELINE_OP_TYPE_FETCH_MANY,
-        oracledb.PIPELINE_OP_TYPE_CALL_PROC,
-        oracledb.PIPELINE_OP_TYPE_CALL_FUNC,
-    ]
-    for result, expected_value in zip(results, expected_values):
-        assert result.operation.op_type == expected_value
-
-
-async def test_7622(async_conn):
-    "7622 - test Pipeline, PipelineOp and PipelineOpResult repr()"
-    pipeline = oracledb.create_pipeline()
-    assert repr(pipeline) == "<oracledb.Pipeline with 0 operations>"
-    op = pipeline.add_commit()
-    assert repr(pipeline) == "<oracledb.Pipeline with 1 operations>"
-    assert repr(op) == "<oracledb.PipelineOp of type COMMIT>"
-    results = await async_conn.run_pipeline(pipeline)
-    assert (
-        repr(results[0])
-        == "<oracledb.PipelineOpResult for operation of type COMMIT>"
-    )
-
-
-async def test_7623(async_conn):
-    "7623 - test getting an error at the beginning of a pipeline"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table NonExistentTable")
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (:1)", [5])
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline, continue_on_error=True)
-    expected_value = [(5,)]
-    assert results[0].error.full_code == "ORA-00942"
-    assert results[-1].rows == expected_value
-
-
-async def test_7624(async_conn):
-    "7624 - test getting an error at the end of pipeline"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (:1)", [5])
-    pipeline.add_fetchall(
-        "select IntCol from TestTempTable order by IntCol",
-    )
-    pipeline.add_execute("insert into TestTempTable (IntCol) values (:1)", [5])
-    results = await async_conn.run_pipeline(pipeline, continue_on_error=True)
-    expected_value = [(5,)]
-    assert results[-2].rows == expected_value
-    assert results[-1].error.full_code == "ORA-00001"
-
-
-async def test_7625(async_conn):
-    "7625 - test pipeline with clobs"
-    clob = await async_conn.createlob(oracledb.DB_TYPE_CLOB, "Temp CLOB")
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestCLOBs")
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (1, :1)", ["CLOB"]
-    )
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (2, :1)", [clob]
-    )
-    pipeline.add_fetchall(
-        "select CLOBCol from TestCLOBs order by IntCol",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    rows = results[-1].rows
-
-    assert [await lob.read() for lob, in rows] == ["CLOB", "Temp CLOB"]
-
-
-async def test_7626(async_conn):
-    "7626 - test nested cursors"
-    sql = """
-        select 'Level 1 String',
-            cursor(
-                select 'Level 2 String',
-                    cursor(
-                        select 'Level3 String' from dual
-                    ) from dual
-            ) from dual
-    """
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_fetchone(sql)
-    pipeline.add_fetchone("select user from dual")
-    results = await async_conn.run_pipeline(pipeline)
-    rows = results[0].rows
-
-    async def transform_row(r):
-        return tuple([await transform_fn(v) for v in r])
-
-    async def transform_fn(v):
-        if isinstance(v, oracledb.AsyncCursor):
-            return [await transform_row(r) async for r in v]
-        return v
-
-    rows = [await transform_row(r) async for r in rows[0][1]]
-    assert rows == [("Level 2 String", [("Level3 String",)])]
-
-
-async def test_7627(async_conn):
-    "7627 - test executemany with number of iterations"
-    num_iterations = 4
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestAllTypes")
-    pipeline.add_executemany(
-        "insert into TestAllTypes (NumberValue) values (1)", num_iterations
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select NumberValue from TestAllTypes order by NumberValue",
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    expected_value = [(1,) for _ in range(num_iterations)]
-    assert results[-1].rows == expected_value
-
-
-async def test_7628(async_conn, async_cursor):
-    "7628 - test anonymous PL/SQL"
-    var = async_cursor.var(int)
-    pipeline = oracledb.create_pipeline()
-    sql = "begin :var := :value; end;"
-    pipeline.add_execute(sql, [var, 5])
-    pipeline.add_execute(sql, [var, 10])
-    pipeline.add_execute(sql, [var, 15])
-    await async_conn.run_pipeline(pipeline)
-    assert var.getvalue() == 15
-
-
-async def test_7629(async_conn, async_cursor):
-    "7629 - test executemany() with PL/SQL"
-    values = [31, 6, 21, 17, 43]
-    out_bind = async_cursor.var(oracledb.DB_TYPE_NUMBER, arraysize=len(values))
-    data = [(i, f"Test {i}", out_bind) for i in values]
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        """
-        begin
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:int_val, :str_val)
-            returning IntCol into :out_bind;
-        end;
-        """,
-        data,
-    )
-    pipeline.add_commit()
-    await async_conn.run_pipeline(pipeline)
-    assert out_bind.values == values
-
-
-async def test_7630(disable_fetch_lobs, async_conn):
-    "7630 - test fetch_lobs with add_fetchone()"
-    clob_value = "CLOB Data 7630"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestCLOBs")
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (1, :1)",
-        [clob_value],
-    )
-    pipeline.add_fetchone("select CLOBCol from TestCLOBs order by IntCol")
-    pipeline.add_fetchone(
-        "select CLOBCol from TestCLOBs order by IntCol", fetch_lobs=False
-    )
-    res = await async_conn.run_pipeline(pipeline)
-    assert [res[-2].rows] == [[(clob_value,)]]
-    assert [res[-1].rows] == [[(clob_value,)]]
-
-
-async def test_7631(async_conn):
-    "7631 - test pipeline with lobs > 32K"
-    blob_1_data = b"T" * 33000
-    blob_2_data = b"B" * 33000
-    blob = await async_conn.createlob(oracledb.DB_TYPE_BLOB, blob_1_data)
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestBLOBs")
-    pipeline.add_execute(
-        "insert into TestBLOBs (IntCol, BLOBCol) values (1, :1)", [blob]
-    )
-    pipeline.add_execute(
-        "insert into TestBLOBs (IntCol, BLOBCol) values (2, :1)",
-        [blob_2_data],
-    )
-    pipeline.add_fetchall(
-        "select BLOBCol from TestBLOBs order by IntCol",
-    )
-    res = await async_conn.run_pipeline(pipeline)
-    expected_value = [blob_1_data, blob_2_data]
-    fetched_value = [await lob.read() for lob, in res[-1].rows]
-    assert fetched_value == expected_value
-
-
-async def test_7632(async_conn):
-    "7632 - test ref cursor"
-    ref_cursor1 = async_conn.cursor()
-    ref_cursor2 = async_conn.cursor()
-    sql = """
-            begin
-                open :pcursor for
-                    select IntCol
-                    from TestNumbers
-                    order by IntCol;
-            end;"""
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute(sql, [ref_cursor1])
-    pipeline.add_execute(sql, [ref_cursor2])
-    await async_conn.run_pipeline(pipeline)
-    assert await ref_cursor1.fetchall() == await ref_cursor2.fetchall()
-
-
-async def test_7633(async_conn):
-    "7633 - test add_callproc() with ref cursor"
-    values = [(2, None, None, None), (3, None, None, None)]
-    ref_cursor = async_conn.cursor()
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_executemany(
-        "insert into TestTempTable values (:1, :2, :3, :4)", values
-    )
-    pipeline.add_callproc("myrefcursorproc", [ref_cursor])
-    await async_conn.run_pipeline(pipeline)
-    assert await ref_cursor.fetchall() == values
-
-
-async def test_7634(async_conn):
-    "7634 - test empty pipeline"
-    pipeline = oracledb.create_pipeline()
-    results = await async_conn.run_pipeline(pipeline)
-    assert results == []
-
-
-async def test_7635(async_conn):
-    "7635 - test alter session"
-    sql = """
-        select value FROM nls_session_parameters
-        WHERE parameter = 'NLS_DATE_FORMAT'
-    """
-    (default_date_format,) = await async_conn.fetchone(sql)
-    date = datetime.datetime(2000, 12, 15, 7, 3)
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_fetchone("select to_char(:1) from dual", [date])
-    pipeline.add_execute(
-        "alter session set NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI'"
-    )
-    pipeline.add_fetchone("select to_char(:1) from dual", [date])
-    pipeline.add_execute(
-        f"alter session set NLS_DATE_FORMAT='{default_date_format}'"
-    )
-    pipeline.add_fetchone("select to_char(:1) from dual", [date])
-    pipeline.add_fetchone(sql)
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[2].rows == [("2000-12-15 07:03",)]
-    assert results[4].rows == results[0].rows
-    assert results[-1].rows == [(default_date_format,)]
-
-
-async def test_7636(async_conn):
-    "7636 - test connection inputtypehandler"
-
-    def input_type_handler(cursor, value, num_elements):
-        if isinstance(value, str):
-            return cursor.var(
-                oracledb.DB_TYPE_NUMBER,
-                arraysize=num_elements,
-                inconverter=lambda x: int(x),
-            )
-
-    async_conn.inputtypehandler = input_type_handler
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        "insert into TestTempTable (IntCol) values (:1)", ["12"]
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchall("select IntCol from TestTempTable")
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[-1].rows == [(12,)]
-
-
-async def test_7637(async_conn, test_env):
-    "7637 - test fetch_decimals with add_fetchone()"
-    value = 7637
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_execute("truncate table TestTempTable")
-        pipeline.add_execute(
-            "insert into TestTempTable (IntCol) values (:1)", [value]
-        )
-        pipeline.add_fetchone("select IntCol from TestTempTable")
-        pipeline.add_fetchone(
-            "select IntCol from TestTempTable", fetch_decimals=False
-        )
-    res = await async_conn.run_pipeline(pipeline)
-    assert isinstance(res[-2].rows[0][0], decimal.Decimal)
-    assert isinstance(res[-1].rows[0][0], int)
-
-
-async def test_7638(async_conn, test_env):
-    "7638 - test oracledb.defaults.arraysize"
-    arraysize = 1
-    with test_env.defaults_context_manager("arraysize", arraysize):
-        data = [(1,), (2,), (3,), (4,)]
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_execute("truncate table TestTempTable")
-        pipeline.add_executemany(
-            "insert into TestTempTable (IntCol) values (:value)",
-            [{"value": i} for i, in data],
-        )
-        pipeline.add_commit()
-        op = pipeline.add_fetchall(
-            "select IntCol from TestTempTable order by IntCol",
-        )
-        assert op.arraysize == arraysize
-        new_arraysize = 4
-        oracledb.defaults.arraysize = new_arraysize
-        op = pipeline.add_fetchall(
-            "select IntCol from TestTempTable order by IntCol",
-        )
-        assert op.arraysize == new_arraysize
-        results = await async_conn.run_pipeline(pipeline)
-        assert results[-1].rows == data
-        assert results[-2].rows == data
-
-
-async def test_7639(test_env):
-    "7639 - test autocommit"
-    conn1 = await test_env.get_connection_async()
-    conn1.autocommit = True
-    conn2 = await test_env.get_connection_async()
-
-    pipeline1 = oracledb.create_pipeline()
-    pipeline1.add_execute("truncate table TestTempTable")
-    pipeline1.add_execute("insert into TestTempTable (IntCol) values (1)")
-
-    pipeline2 = oracledb.create_pipeline()
-    pipeline2.add_execute("insert into TestTempTable (IntCol) values (2)")
-    pipeline2.add_commit()
-    pipeline2.add_fetchall("select IntCol from TestTempTable order by IntCol")
-
-    await conn1.run_pipeline(pipeline1)
-    results = await conn2.run_pipeline(pipeline2)
-    assert results[-1].rows == [(1,), (2,)]
-
-
-async def test_7640(async_conn, async_cursor):
-    "7640 - test DML returning"
-    out_value = async_cursor.var(str, arraysize=2)
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Value for first row')
-        """
-    )
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (2, 'Value for second row')
-        """
-    )
-    pipeline.add_execute(
-        """
-        update TestTempTable set
-            StringCol1 = StringCol1 || ' (Modified)'
-        returning StringCol1 into :1
-        """,
-        [out_value],
-    )
-    pipeline.add_execute("update TestTempTable set StringCol1 = 'Fixed'")
-    pipeline.add_commit()
-    pipeline.add_fetchall(
-        "select IntCol, StringCol1 from TestTempTable order by IntCol"
-    )
-    results = await async_conn.run_pipeline(pipeline)
-    expected_data = [(1, "Fixed"), (2, "Fixed")]
-    assert results[-1].rows == expected_data
-    assert out_value.getvalue() == [
-        "Value for first row (Modified)",
-        "Value for second row (Modified)",
-    ]
-
-
-async def test_7641(async_conn):
-    "7641 - test the columns attribute on results"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Value for first row')
-        """
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchone("select IntCol, StringCol1 from TestTempTable")
-    results = await async_conn.run_pipeline(pipeline)
-    assert results[0].columns is None
-    assert results[1].columns is None
-    assert results[2].columns is None
-    names = [i.name for i in results[3].columns]
-    assert names == ["INTCOL", "STRINGCOL1"]
-
-
-async def test_7642(async_conn):
-    "7642 - test the columns attribute on single operation"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_fetchone("select user from dual")
-    results = await async_conn.run_pipeline(pipeline)
-    names = [i.name for i in results[0].columns]
-    assert names == ["USER"]
-
-
-async def test_7643(async_conn, async_cursor, test_env):
-    "7643 - test DML returning with error - pipeline error"
-    out_value = async_cursor.var(oracledb.DB_TYPE_RAW)
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Value for first row')
-        returning StringCol1 into :1
-        """,
-        [out_value],
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchone("select user from dual")
-    with test_env.assert_raises_full_code("ORA-01465"):
-        await async_conn.run_pipeline(pipeline)
-    await async_cursor.execute("select user from dual")
-    (fetched_value,) = await async_cursor.fetchone()
-    assert fetched_value == test_env.main_user.upper()
-
-
-async def test_7644(async_conn, async_cursor, test_env):
-    "7644 - test DML returning with error - pipeline continue"
-    out_value = async_cursor.var(oracledb.DB_TYPE_RAW)
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("truncate table TestTempTable")
-    pipeline.add_execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (1, 'Value for first row')
-        returning StringCol1 into :1
-        """,
-        [out_value],
-    )
-    pipeline.add_commit()
-    pipeline.add_fetchone("select user from dual")
-    results = await async_conn.run_pipeline(pipeline, continue_on_error=True)
-    assert results[1].error.full_code == "ORA-01465"
-    user = test_env.main_user.upper()
-    assert results[3].rows == [(user,)]
-    await async_cursor.execute("select user from dual")
-    (fetched_value,) = await async_cursor.fetchone()
-    assert fetched_value == test_env.main_user.upper()
-
-
-async def test_7645(async_conn, test_env):
-    "7645 - test fetch_decimals with add_fetchmany()"
-    value = 7645
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_execute("truncate table TestTempTable")
-        pipeline.add_execute(
-            "insert into TestTempTable (IntCol) values (:1)", [value]
-        )
-        pipeline.add_fetchmany("select IntCol from TestTempTable")
-        pipeline.add_fetchmany(
-            "select IntCol from TestTempTable", fetch_decimals=False
-        )
-    res = await async_conn.run_pipeline(pipeline)
-    assert isinstance(res[-2].rows[0][0], decimal.Decimal)
-    assert isinstance(res[-1].rows[0][0], int)
-
-
-async def test_7646(async_conn, test_env):
-    "7646 - test fetch_decimals with add_fetchall()"
-    value = 7646
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        pipeline = oracledb.create_pipeline()
-        pipeline.add_execute("truncate table TestTempTable")
-        pipeline.add_execute(
-            "insert into TestTempTable (IntCol) values (:1)", [value]
-        )
-        pipeline.add_fetchall("select IntCol from TestTempTable")
-        pipeline.add_fetchall(
-            "select IntCol from TestTempTable", fetch_decimals=False
-        )
-    res = await async_conn.run_pipeline(pipeline)
-    assert isinstance(res[-2].rows[0][0], decimal.Decimal)
-    assert isinstance(res[-1].rows[0][0], int)
-
-
-async def test_7647(async_conn, test_env):
-    "7647 - test fetch_lobs with add_fetchmany()"
-    clob_1_value = "CLOB Data 7647 - One"
-    clob_2_value = "CLOB Data 7647 - Two"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestCLOBs")
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (1, :1)",
-        [clob_1_value],
-    )
-    clob = await async_conn.createlob(oracledb.DB_TYPE_CLOB, clob_2_value)
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (2, :1)", [clob]
-    )
-    with test_env.defaults_context_manager("fetch_lobs", False):
-        pipeline.add_fetchmany(
-            "select CLOBCol from TestCLOBs order by IntCol",
-        )
-    pipeline.add_fetchmany(
-        "select CLOBCol from TestCLOBs order by IntCol", fetch_lobs=False
-    )
-
-    res = await async_conn.run_pipeline(pipeline)
-    assert [res[-1].rows] == [[(clob_1_value,), (clob_2_value,)]]
-    assert [res[-2].rows] == [[(clob_1_value,), (clob_2_value,)]]
-
-
-async def test_7648(async_conn, test_env):
-    "7648 - test fetch_lobs with add_fetchall()"
-    clob_1_value = "CLOB Data 7648 - One"
-    clob_2_value = "CLOB Data 7648 - Two"
-    pipeline = oracledb.create_pipeline()
-    pipeline.add_execute("delete from TestCLOBs")
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (1, :1)",
-        [clob_1_value],
-    )
-    clob = await async_conn.createlob(oracledb.DB_TYPE_CLOB, clob_2_value)
-    pipeline.add_execute(
-        "insert into TestCLOBs (IntCol, CLOBCol) values (2, :1)", [clob]
-    )
-    with test_env.defaults_context_manager("fetch_lobs", False):
-        pipeline.add_fetchall(
-            "select CLOBCol from TestCLOBs order by IntCol",
-        )
-    pipeline.add_fetchall(
-        "select CLOBCol from TestCLOBs order by IntCol", fetch_lobs=False
-    )
-
-    res = await async_conn.run_pipeline(pipeline)
-    assert [res[-1].rows] == [[(clob_1_value,), (clob_2_value,)]]
-    assert [res[-2].rows] == [[(clob_1_value,), (clob_2_value,)]]
-
-
-async def test_7649(async_conn, test_env):
-    "7649 - test PL/SQL returning LOB data from a function"
-    clob_format = "Sample data for test 7649 - {}"
-    num_values = [5, 38, 1549]
-    pipeline = oracledb.create_pipeline()
-    for num in num_values:
-        pipeline.add_callfunc(
-            "pkg_TestLOBs.GetLOB",
-            return_type=oracledb.DB_TYPE_CLOB,
-            parameters=[num, clob_format],
-        )
-    res = await async_conn.run_pipeline(pipeline)
-    for result, num in zip(res, num_values):
-        expected_value = clob_format.replace("{}", str(num))
-        assert await result.return_value.read() == expected_value
diff --git a/tests/test_7700_sparse_vector.py b/tests/test_7700_sparse_vector.py
deleted file mode 100644
index 41481155..00000000
--- a/tests/test_7700_sparse_vector.py
+++ /dev/null
@@ -1,765 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7700 - Module for testing the VECTOR database type with storage type SPARSE
-available in Oracle Database 23.7 and higher.
-"""
-
-import array
-import json
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_sparse_vectors_supported):
-    pass
-
-
-def _test_insert_and_fetch(cursor, vector, column_name, expected_typecode):
-    """
-    Test inserting sparse and fetching from a dense vector column.
-    """
-    cursor.execute("delete from TestVectors")
-    cursor.execute(
-        f"""
-        insert into TestVectors (IntCol, {column_name})
-        values(1, :vector)
-        """,
-        vector=vector,
-    )
-    cursor.connection.commit()
-    cursor.execute(f"select {column_name} from TestVectors")
-    (fetched_value,) = cursor.fetchone()
-    dense_values = [0 for _ in range(vector.num_dimensions)]
-    for i, index in enumerate(vector.indices):
-        if expected_typecode == "b":
-            dense_values[index] = int(vector.values[i])
-        else:
-            dense_values[index] = vector.values[i]
-    expected_value = array.array(expected_typecode, dense_values)
-    assert fetched_value == expected_value
-    assert fetched_value.typecode == expected_typecode
-
-
-def _test_insert_and_fetch_sparse(
-    cursor, vector, column_name, expected_typecode
-):
-    """
-    Test inserting and fetching from a sparse vector column.
-    """
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute(
-        f"""
-        insert into TestSparseVectors (IntCol, {column_name})
-        values(1, :vector)
-        """,
-        vector=vector,
-    )
-    cursor.connection.commit()
-    cursor.execute(f"select {column_name} from TestSparseVectors")
-    (fetched_value,) = cursor.fetchone()
-    expected_value = vector.values
-    if fetched_value.values.typecode == "b":
-        expected_value = array.array("b", [int(i) for i in vector.values])
-    expected_indices = vector.indices
-    expected_num_dimensions = vector.num_dimensions
-    assert fetched_value.values == expected_value
-    assert fetched_value.indices == expected_indices
-    assert fetched_value.num_dimensions == expected_num_dimensions
-
-
-def _fetch_with_vector(
-    cursor,
-    vector,
-    column_name,
-    dimensions,
-    vector_format,
-    expected_typecode,
-):
-    """
-    Test fetching a vector with vector() function.
-    """
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute(
-        f"""
-        insert into TestSparseVectors (IntCol, {column_name})
-        values(1, :vector)
-        """,
-        vector=vector,
-    )
-    cursor.execute(
-        f"""
-        select
-        vector({column_name}, {dimensions}, {vector_format}, DENSE)
-        from TestSparseVectors
-        """
-    )
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, array.array)
-    assert fetched_value.typecode == expected_typecode
-
-    cursor.execute(
-        f"""
-        select
-        vector({column_name}, {dimensions}, {vector_format}, SPARSE)
-        from TestSparseVectors
-        """
-    )
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, oracledb.SparseVector)
-    assert fetched_value.values.typecode == expected_typecode
-
-
-def test_7700(cursor):
-    "7700 - test binding in a sparse vector with oracledb.SparseVector"
-    vector = oracledb.SparseVector(3, [1], [9])
-    cursor.execute("select :1 from dual", [vector])
-    (fetched_value,) = cursor.fetchone()
-    assert isinstance(fetched_value, oracledb.SparseVector)
-    assert fetched_value.num_dimensions == vector.num_dimensions
-    assert fetched_value.indices == vector.indices
-    assert fetched_value.values == vector.values
-
-
-def test_7701(cursor):
-    "7701 - test binding in a sparse vector of type float32"
-    vector = oracledb.SparseVector(3, [1], array.array("f", [0.5]))
-    cursor.execute("select :1 from dual", [vector])
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value.values == vector.values
-    assert fetched_value.indices == vector.indices
-    assert fetched_value.num_dimensions == vector.num_dimensions
-    assert fetched_value.values.typecode == "f"
-
-
-def test_7702(cursor):
-    "7702 - test binding in a sparse vector of type float64"
-    vector = oracledb.SparseVector(3, [1], array.array("d", [0.25]))
-    cursor.execute("select :1 from dual", [vector])
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value.values == vector.values
-    assert fetched_value.indices == vector.indices
-    assert fetched_value.num_dimensions == vector.num_dimensions
-    assert fetched_value.values.typecode == "d"
-    assert isinstance(fetched_value, oracledb.SparseVector)
-
-
-def test_7703(cursor):
-    "7703 - test binding in a sparse vector of type int8"
-    vector = oracledb.SparseVector(3, [1], array.array("b", [3]))
-    cursor.execute("select :1 from dual", [vector])
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value.values == vector.values
-    assert fetched_value.indices == vector.indices
-    assert fetched_value.num_dimensions == vector.num_dimensions
-    assert fetched_value.values.typecode == "b"
-    assert isinstance(fetched_value, oracledb.SparseVector)
-
-
-def test_7704(cursor):
-    "7704 - insert a float32 sparse vector into a float32 column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("f", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector32Col", "f")
-
-
-def test_7705(cursor):
-    "7705 - insert a float32 vector into a float64 column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("d", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector64Col", "d")
-
-
-def test_7706(cursor):
-    "7706 - insert a float32 vector into a flexible format column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("f", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "f")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVectorFlexAllCol", "f")
-
-
-def test_7707(cursor):
-    "7707 - insert a float64 vector into a float64 column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("d", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector64Col", "d")
-
-
-def test_7708(cursor):
-    "7708 - insert float64 vector into a float32 column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("f", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector32Col", "f")
-
-
-def test_7709(cursor):
-    "7709 - insert float64 vector into a flexible type column"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("d", [1.5, 0.25, 0.5])
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "d")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVectorFlexAllCol", "d")
-
-
-def test_7710(cursor, test_env):
-    "7710 - insert a vector with an invalid size"
-    cursor.execute("delete from TestVectors")
-    cursor.execute("delete from TestSparseVectors")
-    statements = [
-        """
-        insert into TestVectors (IntCol, Vector64Col)
-        values(1, :1)
-        """,
-        """
-        insert into TestSparseVectors (IntCol, SparseVector64Col)
-        values(2, :1)
-        """,
-    ]
-    for statement in statements:
-        for num_elems in [4, 20]:
-            vector = oracledb.SparseVector(
-                num_elems, [2, 3], array.array("f", [6.54, 9.6])
-            )
-            with test_env.assert_raises_full_code("ORA-51803"):
-                cursor.execute(statement, [vector])
-
-
-def test_7711(cursor):
-    "7711 - verify fetch info for vectors"
-    attr_names = [
-        "name",
-        "type_code",
-        "vector_dimensions",
-        "vector_format",
-        "vector_is_sparse",
-    ]
-    expected_values = [
-        ["INTCOL", oracledb.DB_TYPE_NUMBER, None, None, None],
-        [
-            "SPARSEVECTORFLEXALLCOL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            None,
-            True,
-        ],
-        [
-            "SPARSEVECTORFLEXTYPECOL",
-            oracledb.DB_TYPE_VECTOR,
-            2,
-            None,
-            True,
-        ],
-        [
-            "SPARSEVECTORFLEX8COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_INT8,
-            True,
-        ],
-        [
-            "SPARSEVECTORFLEX32COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_FLOAT32,
-            True,
-        ],
-        [
-            "SPARSEVECTORFLEX64COL",
-            oracledb.DB_TYPE_VECTOR,
-            None,
-            oracledb.VECTOR_FORMAT_FLOAT64,
-            True,
-        ],
-        [
-            "SPARSEVECTOR8COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_INT8,
-            True,
-        ],
-        [
-            "SPARSEVECTOR32COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_FLOAT32,
-            True,
-        ],
-        [
-            "SPARSEVECTOR64COL",
-            oracledb.DB_TYPE_VECTOR,
-            16,
-            oracledb.VECTOR_FORMAT_FLOAT64,
-            True,
-        ],
-    ]
-    cursor.execute("select * from TestSparseVectors")
-    values = [[getattr(i, n) for n in attr_names] for i in cursor.description]
-    assert values == expected_values
-    assert cursor.description[6].vector_format is oracledb.VectorFormat.INT8
-
-
-def test_7712(cursor):
-    "7712 - insert an int8 vector into an int8 column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector8Col", "b")
-
-
-def test_7713(cursor):
-    "7713 - insert an int8 vector into a float32 column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "Vector32Col", "f")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector32Col", "f")
-
-
-def test_7714(cursor):
-    "7714 - insert an int8 vector into a float64 column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("b", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "Vector64Col", "d")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector64Col", "d")
-
-
-def test_7715(cursor):
-    "7715 - insert an int8 vector into a flexible column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("b", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "b")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVectorFlexAllCol", "b")
-
-
-def test_7716(cursor):
-    "7716 - insert a float32 vector into an int8 column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector8Col", "b")
-
-
-def test_7717(cursor):
-    "7717 - insert a float64 vector into an int8 column"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("d", [1, 0, 5]))
-    _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVector8Col", "b")
-
-
-def test_7718(conn, cursor):
-    "7718 - test dml returning vector type"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    out_var = cursor.var(oracledb.DB_TYPE_VECTOR)
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute(
-        """
-        insert into TestSparseVectors (IntCol, SparseVectorFlex32Col)
-        values (1, :value)
-        returning SparseVectorFlex32Col into :out_value
-        """,
-        [value, out_var],
-    )
-    conn.commit()
-    vector = out_var.getvalue()[0]
-    assert vector.values == value.values
-    assert vector.indices == value.indices
-    assert vector.num_dimensions == value.num_dimensions
-
-
-def test_7719(conn, cursor):
-    "7719 - test handling of NULL vector value"
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute("insert into TestSparseVectors (IntCol) values (1)")
-    conn.commit()
-    cursor.execute("select SparseVectorFlexTypeCol from TestSparseVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert fetched_value is None
-
-
-def test_7720(cursor, test_env):
-    "7720 - insert a float32 vector into an int8 column (negative)"
-    value = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("f", [-130, 400, 5])
-    )
-    with test_env.assert_raises_full_code("ORA-51806"):
-        _test_insert_and_fetch(cursor, value, "Vector8Col", "b")
-    with test_env.assert_raises_full_code("ORA-51806"):
-        _test_insert_and_fetch_sparse(cursor, value, "SparseVector8Col", "b")
-
-
-def test_7721(cursor):
-    "7721 - insert a float32 vector with 65,533 dimensions"
-    value = oracledb.SparseVector(
-        65533, [1, 3, 5], array.array("f", [1, 0, 5])
-    )
-    _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "f")
-    _test_insert_and_fetch_sparse(cursor, value, "SparseVectorFlexAllCol", "f")
-
-
-def test_7722(cursor):
-    "7722 - insert vectors with different dimensions"
-    for dim in [30, 70, 255, 256, 65534, 65535]:
-        for typ in ["f", "d", "b"]:
-            element_value = 3 if typ == "b" else 1.5
-            value = oracledb.SparseVector(
-                dim, [1, 3, 5], array.array(typ, [element_value] * 3)
-            )
-            _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", typ)
-            _test_insert_and_fetch_sparse(
-                cursor, value, "SparseVectorFlexAllCol", typ
-            )
-
-
-def test_7723(cursor):
-    "7723 - insert and fetch VECTOR data using strings"
-    values = [16, [1, 3, 5], [1, 0, 5]]
-    vector = oracledb.SparseVector(*values)
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute(
-        """
-        insert into TestSparseVectors (IntCol, SparseVectorFlexAllCol)
-        values(1, :value)
-        """,
-        value=str(vector),
-    )
-
-    def type_handler(cursor, metadata):
-        if metadata.name == "SPARSEVECTORFLEXALLCOL":
-            return cursor.var(
-                oracledb.DB_TYPE_LONG, arraysize=cursor.arraysize
-            )
-
-    cursor.outputtypehandler = type_handler
-
-    cursor.execute("select SparseVectorFlexAllCol from TestSparseVectors")
-    (fetched_value,) = cursor.fetchone()
-    assert json.loads(fetched_value) == values
-
-
-def test_7724(cursor):
-    "7724 - insert vectors with flexible dimensions and conversion"
-    for dim in [30, 255, 256, 257, 32768, 65535]:
-        for source_type in ["f", "d", "b"]:
-            for target_type in ["f", "d", "b"]:
-                if target_type == "f":
-                    target_col = "VectorFlex32Col"
-                elif target_type == "d":
-                    target_col = "VectorFlex64Col"
-                else:
-                    target_col = "VectorFlex8Col"
-                element_value = 4 if source_type == "b" else 2.25
-                value = oracledb.SparseVector(
-                    dim,
-                    [1, 3, 7, 9],
-                    array.array(source_type, [element_value] * 4),
-                )
-                _test_insert_and_fetch(cursor, value, target_col, target_type)
-                _test_insert_and_fetch_sparse(
-                    cursor, value, f"Sparse{target_col}", target_type
-                )
-
-
-def test_7725(cursor, test_env):
-    "7725 - test binding a vector with inf values (negative)"
-    value = oracledb.SparseVector(
-        16,
-        [1, 3, 5],
-        array.array("d", [float("inf"), float("-inf"), float("-inf")]),
-    )
-    with test_env.assert_raises_full_code("ORA-51805", "ORA-51831"):
-        cursor.execute("select :1 from dual", [value])
-
-
-def test_7726(cursor):
-    "7726 - test setting a sparse vector to a vector variable"
-    value = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    var = cursor.var(oracledb.DB_TYPE_VECTOR)
-    var.setvalue(0, value)
-    vector = var.getvalue()
-    assert vector.values == value.values
-    assert vector.indices == value.indices
-    assert vector.num_dimensions == value.num_dimensions
-
-
-def test_7727(cursor):
-    "7727 - fetch JSON value with an embedded vector"
-    cursor.execute("delete from TestSparseVectors")
-    vector = oracledb.SparseVector(
-        16, [1, 3, 5], array.array("d", [1.5, 0.25, 0.5])
-    )
-    cursor.execute(
-        """
-        insert into TestSparseVectors (IntCol, SparseVector64Col)
-        values (1, :1)
-        """,
-        [vector],
-    )
-    cursor.execute(
-        """
-        select json_object(
-            'id': 7732,
-            'vector' : vector(SparseVector64Col, 16, float64, sparse)
-            returning json
-        ) from TestSparseVectors
-        """
-    )
-    (result,) = cursor.fetchone()
-    fetched_vector = result["vector"]
-    assert isinstance(fetched_vector, oracledb.SparseVector)
-    assert fetched_vector.indices == vector.indices
-    assert fetched_vector.values == vector.values
-    assert fetched_vector.num_dimensions == vector.num_dimensions
-
-
-def test_7728(cursor):
-    "7728 - executemany() without setinputsizes()"
-    cursor.execute("delete from TestSparseVectors")
-    vector = oracledb.SparseVector(16, [1, 3, 5], array.array("f", [1, 0, 5]))
-    values = [vector, [0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 4, 0, 0, 0, 0]]
-    cursor.executemany(
-        """
-        insert into TestSparseVectors (IntCol, SparseVector32Col)
-        values (:1, :2)
-        """,
-        list(enumerate(values)),
-    )
-    cursor.execute(
-        "select SparseVector32Col from TestSparseVectors order by IntCol"
-    )
-    (fetched_vector1,), (fetched_vector2,) = cursor.fetchall()
-    assert fetched_vector1.values == vector.values
-    assert fetched_vector1.indices == vector.indices
-    assert fetched_vector1.num_dimensions == vector.num_dimensions
-    assert fetched_vector2.values == array.array("f", [2.0, 1.0, 4.0])
-    assert fetched_vector2.indices == array.array("I", [3, 9, 11])
-    assert fetched_vector2.num_dimensions == 16
-
-
-def test_7729(cursor):
-    "7729 - executemany() with setinputsizes()"
-    cursor.execute("delete from TestSparseVectors")
-    vector = oracledb.SparseVector(16, [1, 3, 5], array.array("d", [1, 0, 5]))
-    values = [[144, 0, 1000], vector]
-    cursor.setinputsizes(None, oracledb.DB_TYPE_VECTOR)
-    cursor.executemany(
-        """
-        insert into TestSparseVectors (IntCol, SparseVectorFlex64Col)
-        values (:1, :2)
-        """,
-        list(enumerate(values)),
-    )
-    cursor.execute(
-        """
-        select SparseVectorFlex64Col
-        from TestSparseVectors order by IntCol
-        """
-    )
-    (fetched_vector1,), (fetched_vector2,) = cursor.fetchall()
-    assert fetched_vector1.values == array.array("d", [144.0, 1000.0])
-    assert fetched_vector1.indices == array.array("I", [0, 2])
-    assert fetched_vector1.num_dimensions == 3
-    assert fetched_vector2.values == vector.values
-    assert fetched_vector2.indices == vector.indices
-    assert fetched_vector2.num_dimensions == vector.num_dimensions
-
-
-def test_7730(cursor, test_env):
-    "7730 - vector with zero dimensions"
-    cursor.setinputsizes(oracledb.DB_TYPE_VECTOR)
-    vector = oracledb.SparseVector(4, [], [])
-    with test_env.assert_raises_full_code("ORA-51803", "ORA-21560"):
-        cursor.execute("select :1", [vector])
-
-
-def test_7731(cursor):
-    "7731 - test inserting a vector as a string and fetching it"
-    cursor.execute("delete from TestSparseVectors")
-    cursor.execute(
-        """
-        insert into TestSparseVectors (IntCol, SparseVectorFlexAllCol)
-        values (1, '[4, [1, 3], [1.0, 2.0]]')
-        """
-    )
-    cursor.execute("select SparseVectorFlexAllCol from TestSparseVectors")
-    vector = cursor.fetchone()[0]
-    assert vector.values == array.array("f", [1, 2])
-    assert vector.num_dimensions == 4
-    assert vector.indices == array.array("I", [1, 3])
-
-
-def test_7732():
-    "7732 - SparseVector() with invalid values"
-    # pass strings instead of number or list/array.array
-    with pytest.raises(TypeError):
-        oracledb.SparseVector("10", [1, 2], [1.5, 3.5])
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, "[1, 2]", [1.5, 3.5])
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [1, 2], "[1.5, 3.5]")
-
-    # insert matrix
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [[1, 2]], [1.5, 3.5])
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [1, 2], [[1.5, 3.5]])
-    # use num_dimensions as a list
-    with pytest.raises(TypeError):
-        oracledb.SparseVector([10], [1, 2], [1.5, 3.5])
-    # use num_dimensions as a float
-    value = oracledb.SparseVector(10.4, [1, 2], [1.5, 3.5])
-    assert value.num_dimensions == 10
-
-    # negative index
-    with pytest.raises(OverflowError):
-        oracledb.SparseVector(10, [-1], [1.5])
-    # negative num_dimensions
-    with pytest.raises(OverflowError):
-        oracledb.SparseVector(-10, [1], [3.5])
-    # use float index
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [2.4], [3.5])
-
-
-def test_7733():
-    "7733 - SparseVector() with indices and values of different length"
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [1], [1.5, 3.5])
-    with pytest.raises(TypeError):
-        oracledb.SparseVector(10, [1, 2, 3, 4], [6.75])
-
-
-def test_7734(cursor, test_env):
-    "7734 - declare and insert an empty SparseVector"
-    value = oracledb.SparseVector(0, [], [])
-    assert value.values == array.array("d")
-    assert value.indices == array.array("I")
-    assert value.num_dimensions == 0
-    with test_env.assert_raises_full_code(
-        "ORA-51803", "ORA-21560", "ORA-51862"
-    ):
-        _test_insert_and_fetch(cursor, value, "VectorFlexAllCol", "d")
-    with test_env.assert_raises_full_code(
-        "ORA-51803", "ORA-21560", "ORA-51862"
-    ):
-        _test_insert_and_fetch_sparse(
-            cursor, value, "SparseVectorFlexAllCol", "d"
-        )
-
-
-def test_7735(cursor):
-    "7735 - select with vector()"
-    dense_vector = array.array(
-        "f", [1, 2, 3, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0]
-    )
-    sparse_vector = oracledb.SparseVector(16, [1], array.array("f", [9]))
-    column_names = [
-        "SparseVector8Col",
-        "SparseVector32Col",
-        "SparseVector64Col",
-        "SparseVectorFlex8Col",
-        "SparseVectorFlex32Col",
-        "SparseVectorFlex64Col",
-        "SparseVectorFlexAllCol",
-    ]
-    for vector in [dense_vector, sparse_vector]:
-        for column_name in column_names:
-            _fetch_with_vector(cursor, vector, column_name, 16, "INT8", "b")
-            _fetch_with_vector(cursor, vector, column_name, 16, "FLOAT32", "f")
-            _fetch_with_vector(cursor, vector, column_name, 16, "FLOAT64", "d")
-
-    # fixed dimension columns
-    dense_vector = array.array("f", [1, 2])
-    sparse_vector = oracledb.SparseVector(2, [1], array.array("f", [1]))
-    for vector in [dense_vector, sparse_vector]:
-        for column_name in column_names[3:]:
-            _fetch_with_vector(cursor, vector, column_name, 2, "INT8", "b")
-            _fetch_with_vector(cursor, vector, column_name, 2, "FLOAT32", "f")
-            _fetch_with_vector(cursor, vector, column_name, 2, "FLOAT64", "d")
-
-
-def test_7736(cursor):
-    "7736 - test from_vector() with returning and vector storage format"
-    cursor.execute("delete from TestSparseVectors")
-    values = [16, [1, 2, 15], [2, 45.5, 73.25]]
-    vector = oracledb.SparseVector(*values)
-    dense_vector = [0, 2, 45.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73.25]
-    column_name = "SparseVector64Col"
-    cursor.execute(
-        f"""
-        insert into TestSparseVectors (IntCol, {column_name})
-        values(1, :vector)
-        """,
-        vector=vector,
-    )
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning clob format sparse)
-        from TestSparseVectors
-        """
-    )
-    (lob,) = cursor.fetchone()
-    assert json.loads(lob.read()) == values
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning clob format dense)
-        from TestSparseVectors
-        """
-    )
-    (lob,) = cursor.fetchone()
-    assert json.loads(lob.read()) == dense_vector
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning clob)
-        from TestSparseVectors
-        """
-    )
-    (lob,) = cursor.fetchone()
-    assert json.loads(lob.read()) == values
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning varchar2 format sparse)
-        from TestSparseVectors
-        """
-    )
-    assert json.loads(cursor.fetchone()[0]) == values
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning varchar2 format dense)
-        from TestSparseVectors
-        """
-    )
-    assert json.loads(cursor.fetchone()[0]) == dense_vector
-    cursor.execute(
-        f"""
-        select from_vector({column_name} returning varchar2)
-        from TestSparseVectors
-        """
-    )
-    assert json.loads(cursor.fetchone()[0]) == values
diff --git a/tests/test_7800_aq_raw.py b/tests/test_7800_aq_raw.py
deleted file mode 100644
index dded8fe4..00000000
--- a/tests/test_7800_aq_raw.py
+++ /dev/null
@@ -1,504 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7800 - Module for testing AQ with raw queues
-"""
-
-import threading
-
-import oracledb
-import pytest
-
-
-RAW_DATA = [
-    b"sample raw data 1",
-    b"sample raw data 2",
-    b"sample raw data 3",
-    b"sample raw data 4",
-    b"sample raw data 5",
-    b"sample raw data 6",
-]
-
-
-@pytest.fixture
-def queue(conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return test_env.get_and_clear_queue(conn, "TEST_RAW_QUEUE")
-
-
-def _deq_in_thread(test_env, results):
-    with test_env.get_connection() as conn:
-        queue = conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.wait = 10
-        props = queue.deqone()
-        if props is not None:
-            results.append(props.payload)
-        conn.commit()
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-def test_7800(queue):
-    "7800 - test dequeuing an empty RAW queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-
-
-def test_7801(queue, conn):
-    "7801 - test enqueuing and dequeuing multiple RAW messages"
-    props = conn.msgproperties()
-    for value in RAW_DATA:
-        props.payload = value
-        queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        value = props.payload
-        results.append(value)
-    conn.commit()
-    assert results == RAW_DATA
-
-
-def test_7802(queue, conn):
-    "7802 - test dequeuing with DEQ_REMOVE_NODATA in RAW queue"
-    value = RAW_DATA[1]
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = queue.deqone()
-    assert props is not None
-    assert props.payload == b""
-
-
-def test_7803(queue):
-    "7803 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-def test_7804(queue):
-    "7804 - test enqueue options attributes RAW queue"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-def test_7805(queue, conn, test_env):
-    "7805 - test waiting for dequeue"
-    results = []
-    thread = threading.Thread(target=_deq_in_thread, args=(test_env, results))
-    thread.start()
-    value = RAW_DATA[0]
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-    conn.commit()
-    thread.join()
-    assert results == [value]
-
-
-def test_7806(conn):
-    "7806 - test getting/setting message properties attributes"
-    props = conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-    assert props.enqtime is None
-
-
-def test_7807(queue, conn, test_env):
-    "7807 - test enqueue visibility option - ENQ_ON_COMMIT"
-    value = RAW_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-    conn.commit()
-    props = queue.deqone()
-    assert props is not None
-
-
-def test_7808(queue, conn, test_env):
-    "7808 - test enqueue visibility option - ENQ_IMMEDIATE"
-    value = RAW_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    value = props.payload
-    results = value
-    other_conn.commit()
-    assert results == RAW_DATA[0]
-
-
-def test_7809(queue, conn, test_env):
-    "7809 - test enqueue/dequeue delivery modes identical - buffered"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    value = props.payload
-    results = value
-    other_conn.commit()
-    assert results == RAW_DATA[0]
-    assert props.deliverymode == oracledb.MSG_BUFFERED
-
-
-def test_7810(queue, conn, test_env):
-    "7810 - test enqueue/dequeue delivery modes identical - persistent"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    value = props.payload
-    results = value
-    other_conn.commit()
-    assert results == RAW_DATA[0]
-    assert props.deliverymode == oracledb.MSG_PERSISTENT
-
-
-def test_7811(queue, conn, test_env):
-    "7811 - test enqueue/dequeue delivery modes the same"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    value = props.payload
-    results = value
-    other_conn.commit()
-    assert results == RAW_DATA[0]
-
-
-def test_7812(queue, conn, test_env):
-    "7812 - test enqueue/dequeue delivery modes different"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue("TEST_RAW_QUEUE")
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-
-
-def test_7813(queue, conn, test_env):
-    "7813 - test error for message with no payload"
-    props = conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        queue.enqone(props)
-
-
-def test_7814(queue, conn, cursor):
-    "7814 - verify that the msgid property is returned correctly"
-    value = RAW_DATA[0]
-    props = conn.msgproperties(payload=value)
-    assert props.msgid is None
-    queue.enqone(props)
-    cursor.execute("select msgid from RAW_QUEUE_TAB")
-    (actual_msgid,) = cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-def test_7815(queue, conn, cursor):
-    "7815 - test message props enqtime"
-    value = RAW_DATA[0]
-    cursor.execute("select current_timestamp from dual")
-    (start_date,) = cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-    props = queue.deqone()
-    cursor.execute("select current_timestamp from dual")
-    (end_date,) = cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-def test_7816(queue, conn):
-    "7816 - test message props declared attributes"
-    value = RAW_DATA[0]
-    values = dict(
-        payload=value,
-        correlation="TEST_CORRELATION",
-        delay=0,
-        exceptionq="PYTHONTEST.TEST_EXCEPTIONQ",
-        expiration=15,
-        priority=1,
-    )
-    props = conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-    queue.enqone(props)
-    conn.commit()
-    prop = queue.deqone()
-    for attr_name in values:
-        assert getattr(prop, attr_name) == values[attr_name]
-
-
-def test_7817(queue, conn):
-    "7817 - test getting queue attributes"
-    assert queue.name == "TEST_RAW_QUEUE"
-    assert queue.connection is conn
-
-
-def test_7818(queue):
-    "7818 - test getting write-only attributes"
-    for options in (queue.enqoptions, queue.deqoptions):
-        with pytest.raises(AttributeError):
-            options.deliverymode
-
-
-def test_7819(queue, conn):
-    "7819 - test deqoption condition with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    priorities = [5, 5, 5, 5, 10, 9, 9, 10, 9]
-    for priority in priorities:
-        value = RAW_DATA[0]
-        props = conn.msgproperties(payload=value, priority=priority)
-        queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    conn.commit()
-    assert len(results) == 3
-
-
-def test_7820(queue, conn):
-    "7820 - test deqoption correlation"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    correlations = [
-        "sample",
-        "sample correlation",
-        "sample",
-        "sample",
-        "sample correlation",
-    ]
-    for correlation in correlations:
-        value = RAW_DATA[0]
-        props = conn.msgproperties(payload=value, correlation=correlation)
-        queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.correlation = "sample correlation"
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    conn.commit()
-    assert len(results) == 2
-
-
-def test_7821(queue, conn):
-    "7821 - test deqoption msgid"
-    value = RAW_DATA[0]
-    props = conn.msgproperties(payload=value)
-    queue.enqone(props)
-    queue.enqone(props)
-    conn.commit()
-    msgid = props.msgid
-    queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.msgid = msgid
-    prop = queue.deqone()
-    conn.commit()
-    assert prop.msgid == msgid
-
-
-def test_7822(queue):
-    "7822 - test payload_type returns the correct value"
-    assert queue.payload_type is None
-
-
-def test_7823(queue):
-    "7823 - test deprecated attributes (enqOptions, deqOptions)"
-    assert queue.enqOptions is queue.enqoptions
-    assert queue.deqOptions is queue.deqoptions
-
-
-def test_7824(queue, conn):
-    "7824 - test deprecated AQ methods (enqOne, deqOne)"
-    value = b"Test 7823"
-    queue.enqOne(conn.msgproperties(value))
-    props = queue.deqOne()
-    assert props.payload == value
-
-
-def test_7825(queue, conn, test_env):
-    "7825 - test wrong payload type"
-    typ = conn.gettype("UDT_BOOK")
-    obj = typ.newobject()
-    props = conn.msgproperties(payload=obj)
-    with test_env.assert_raises_full_code("DPY-2062"):
-        queue.enqone(props)
-
-
-def test_7826(queue):
-    "7826 - test providing null values on queue dequeue options"
-    str_value = "test - 7826"
-    bytes_value = str_value.encode()
-    for name in [
-        "condition",
-        "consumername",
-        "correlation",
-        "msgid",
-        "transformation",
-    ]:
-        value = bytes_value if name == "msgid" else str_value
-        setattr(queue.deqoptions, name, value)
-        assert getattr(queue.deqoptions, name) == value
-        setattr(queue.deqoptions, name, None)
-        assert getattr(queue.deqoptions, name) is None
-
-
-def test_7827(queue):
-    "7827 - test providing null values on queue enqueue options"
-    value = "test - 7827"
-    for name in ["transformation"]:
-        setattr(queue.enqoptions, name, value)
-        assert getattr(queue.enqoptions, name) == value
-        setattr(queue.enqoptions, name, None)
-        assert getattr(queue.enqoptions, name) is None
-
-
-def test_7828(conn):
-    "7828 - test providing null correlation on message properties"
-    props = conn.msgproperties()
-    value = "test - 7828"
-    for name in ["correlation", "exceptionq"]:
-        setattr(props, name, value)
-        assert getattr(props, name) == value
-        setattr(props, name, None)
-        assert getattr(props, name) is None
-
-
-def test_7829(queue, conn):
-    "7829 - test deq options correlation with buffered messages"
-    value = RAW_DATA[0]
-    props = conn.msgproperties(payload=value, correlation="sample")
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = "sample"
-    msg = queue.deqone()
-    conn.commit()
-    assert msg.payload == value
-
-
-def test_7830(queue, test_env):
-    "7830 - test deq options with msgid > 16 bytes"
-    queue.deqoptions.msgid = b"invalid_msgid_123456789"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    with test_env.assert_raises_full_code("ORA-25263"):
-        queue.deqone()
-
-
-def test_7831(queue, test_env):
-    "7831 - test deq options with msgid < 16 bytes"
-    queue.deqoptions.msgid = b"short_msgid"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    with test_env.assert_raises_full_code("ORA-25263"):
-        queue.deqone()
diff --git a/tests/test_7900_aq_raw_async.py b/tests/test_7900_aq_raw_async.py
deleted file mode 100644
index 0e4be60b..00000000
--- a/tests/test_7900_aq_raw_async.py
+++ /dev/null
@@ -1,448 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-7900 - Module for testing AQ with raw queues with asyncio
-"""
-
-import oracledb
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def queue(async_conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return await test_env.get_and_clear_queue_async(
-        async_conn, "TEST_RAW_QUEUE"
-    )
-
-
-RAW_DATA = [
-    b"sample raw data 1",
-    b"sample raw data 2",
-    b"sample raw data 3",
-    b"sample raw data 4",
-    b"sample raw data 5",
-    b"sample raw data 6",
-]
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-async def test_7900(queue):
-    "7900 - test dequeuing an empty RAW queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = await queue.deqone()
-    assert props is None
-
-
-async def test_7901(async_conn, queue):
-    "7901 - test enqueuing and dequeuing multiple RAW messages"
-    props = async_conn.msgproperties()
-    for value in RAW_DATA:
-        props.payload = value
-        await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        value = props.payload
-        results.append(value)
-    await async_conn.commit()
-    assert results == RAW_DATA
-
-
-async def test_7902(async_conn, queue):
-    "7902 - test dequeuing with DEQ_REMOVE_NODATA in RAW queue"
-    value = RAW_DATA[1]
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = await queue.deqone()
-    assert props is not None
-    assert props.payload == b""
-
-
-async def test_7903(queue):
-    "7903 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-async def test_7904(queue):
-    "7904 - test enqueue options attributes RAW queue"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-async def test_7905(queue):
-    "7905 - test errors for invalid values for enqueue"
-    value = RAW_DATA[0]
-    with pytest.raises(TypeError):
-        await queue.enqone(value)
-
-
-async def test_7906(async_conn):
-    "7906 - test getting/setting message properties attributes"
-    props = async_conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-
-
-async def test_7907(async_conn, queue, test_env):
-    "7907 - test enqueue visibility option - ENQ_ON_COMMIT"
-    value = RAW_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props is None
-        await async_conn.commit()
-        props = await queue.deqone()
-        assert props is not None
-
-
-async def test_7908(queue, async_conn, test_env):
-    "7908 - test enqueue visibility option - ENQ_IMMEDIATE"
-    value = RAW_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        value = props.payload
-        results = value
-        await other_conn.commit()
-        assert results == RAW_DATA[0]
-
-
-async def test_7909(queue, async_conn, test_env):
-    "7909 - test enqueue/dequeue delivery modes identical - buffered"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        value = props.payload
-        results = value
-        await other_conn.commit()
-        assert results == RAW_DATA[0]
-        assert props.deliverymode == oracledb.MSG_BUFFERED
-
-
-async def test_7910(queue, async_conn, test_env):
-    "7910 - test enqueue/dequeue delivery modes identical - persistent"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        value = props.payload
-        results = value
-        await other_conn.commit()
-        assert results == RAW_DATA[0]
-        assert props.deliverymode == oracledb.MSG_PERSISTENT
-
-
-async def test_7911(queue, async_conn, test_env):
-    "7911 - test enqueue/dequeue delivery modes the same"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        value = props.payload
-        results = value
-        await other_conn.commit()
-        assert results == RAW_DATA[0]
-
-
-async def test_7912(queue, async_conn, test_env):
-    "7912 - test enqueue/dequeue delivery modes different"
-    value = RAW_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue("TEST_RAW_QUEUE")
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props is None
-
-
-async def test_7913(async_conn, test_env):
-    "7913 - test error for message with no payload"
-    queue = async_conn.queue("TEST_RAW_QUEUE")
-    props = async_conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        await queue.enqone(props)
-
-
-async def test_7914(async_conn, async_cursor, queue):
-    "7914 - verify that the msgid property is returned correctly"
-    value = RAW_DATA[0]
-    props = async_conn.msgproperties(payload=value)
-    assert props.msgid is None
-    await queue.enqone(props)
-    await async_cursor.execute("select msgid from RAW_QUEUE_TAB")
-    (actual_msgid,) = await async_cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = await queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-async def test_7915(async_conn, async_cursor, queue):
-    "7915 - test message props enqtime"
-    value = RAW_DATA[0]
-    await async_cursor.execute("select current_timestamp from dual")
-    (start_date,) = await async_cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-    props = await queue.deqone()
-    await async_cursor.execute("select current_timestamp from dual")
-    (end_date,) = await async_cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-async def test_7916(async_conn, queue):
-    "7916 - test message props declared attributes"
-    value = RAW_DATA[0]
-    values = dict(
-        payload=value,
-        correlation="TEST_CORRELATION",
-        delay=0,
-        exceptionq="PYTHONTEST.TEST_EXCEPTIONQ",
-        expiration=15,
-        priority=1,
-    )
-    props = async_conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-    await queue.enqone(props)
-    await async_conn.commit()
-    prop = await queue.deqone()
-    for attr_name in values:
-        assert getattr(prop, attr_name) == values[attr_name]
-
-
-async def test_7917(async_conn, queue):
-    "7917 - test getting queue attributes"
-    assert queue.name == "TEST_RAW_QUEUE"
-    assert queue.connection is async_conn
-
-
-async def test_7918(queue):
-    "7918 - test getting write-only attributes"
-    for options in (queue.enqoptions, queue.deqoptions):
-        with pytest.raises(AttributeError):
-            options.deliverymode
-
-
-async def test_7919(async_conn, queue):
-    "7919 - test deqoption condition with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    priorities = [5, 5, 5, 5, 10, 9, 9, 10, 9]
-    for priority in priorities:
-        value = RAW_DATA[0]
-        props = async_conn.msgproperties(payload=value, priority=priority)
-        await queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    await async_conn.commit()
-    assert len(results) == 3
-
-
-async def test_7920(async_conn, queue):
-    "7920 - test deqoption correlation"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    correlations = [
-        "sample",
-        "sample correlation",
-        "sample",
-        "sample",
-        "sample correlation",
-    ]
-    for correlation in correlations:
-        value = RAW_DATA[0]
-        props = async_conn.msgproperties(
-            payload=value, correlation=correlation
-        )
-        await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.correlation = "sample correlation"
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    await async_conn.commit()
-    assert len(results) == 2
-
-
-async def test_7921(async_conn, queue):
-    "7921 - test deqoption msgid"
-    value = RAW_DATA[0]
-    props = async_conn.msgproperties(payload=value)
-    await queue.enqone(props)
-    await queue.enqone(props)
-    await async_conn.commit()
-    msgid = props.msgid
-    await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.msgid = msgid
-    prop = await queue.deqone()
-    await async_conn.commit()
-    assert prop.msgid == msgid
-
-
-async def test_7922(queue):
-    "7922 - test payload_type returns the correct value"
-    assert queue.payload_type is None
-
-
-async def test_7923(queue):
-    "7923 - test deprecated attributes (enqOptions, deqOptions)"
-    assert queue.enqOptions is queue.enqoptions
-    assert queue.deqOptions is queue.deqoptions
-
-
-async def test_7924(async_conn, queue, test_env):
-    "7924 - test wrong payload type"
-    typ = await async_conn.gettype("UDT_BOOK")
-    obj = typ.newobject()
-    props = async_conn.msgproperties(payload=obj)
-    with test_env.assert_raises_full_code("DPY-2062"):
-        await queue.enqone(props)
-
-
-async def test_7925(async_conn, queue):
-    "7925 - test deq options correlation with buffered messages"
-    value = RAW_DATA[0]
-    props = async_conn.msgproperties(payload=value, correlation="sample")
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = "sample"
-    msg = await queue.deqone()
-    await async_conn.commit()
-    assert msg.payload == value
-
-
-async def test_7926(queue, test_env):
-    "7926 - test deq options with msgid > 16 bytes"
-    queue.deqoptions.msgid = b"invalid_msgid_123456789"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    with test_env.assert_raises_full_code("ORA-25263"):
-        await queue.deqone()
-
-
-async def test_7927(queue, test_env):
-    "7927 - test deq options with msgid < 16 bytes"
-    queue.deqoptions.msgid = b"short_msgid"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    with test_env.assert_raises_full_code("ORA-25263"):
-        await queue.deqone()
diff --git a/tests/test_8000_dataframe.py b/tests/test_8000_dataframe.py
deleted file mode 100644
index 4f48419b..00000000
--- a/tests/test_8000_dataframe.py
+++ /dev/null
@@ -1,1939 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing dataframes
-"""
-
-import array
-import datetime
-import decimal
-
-import oracledb
-import pyarrow
-import pytest
-
-# basic
-DATASET_1 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1955, 7, 1),  # summer(before 1970)
-        12132.40,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        "Japansa",
-        datetime.date(1955, 1, 1),  # winter(before 1970)
-        234234.32,
-        400,
-        datetime.datetime.now(),
-    ),
-]
-
-# None, -ve
-DATASET_2 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(2000, 7, 1),  # summer(between)
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(2000, 1, 1),  # winter(between)
-        -12312.1,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "Johns",
-        "Does",
-        "San Franciscos",
-        "USAs",
-        datetime.date(2040, 7, 1),  # summer(after)
-        None,
-        500,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "Bigs",
-        "Heros",
-        "San Fransokyos",
-        None,
-        datetime.date(2040, 1, 1),  # winter(after)
-        -12312.1,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-# None, +/- 0.XXX
-DATASET_3 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(1988, 8, 22),
-        0.12,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-# Duplicates
-DATASET_4 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        5,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        6,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-QUERY_SQL_WITH_WHERE_CLAUSE = """
-    select
-        Id,
-        FirstName,
-        LastName,
-        City,
-        Country,
-        DateOfBirth,
-        Salary,
-        CreditScore,
-        LastUpdated
-    from TestDataFrame
-    {where_clause}
-    order by id
-"""
-
-QUERY_SQL = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause="")
-
-
-def _convert_date(typ, value):
-    """
-    Converts a date to the format required by Arrow.
-    """
-    if value is not None:
-        if typ.unit == "s":
-            value = datetime.datetime(value.year, value.month, value.day)
-        ts = (value - datetime.datetime(1970, 1, 1)).total_seconds()
-        if typ.unit != "s":
-            ts *= 1_000_000
-        return ts
-
-
-def _convert_to_array(data, typ):
-    """
-    Convert raw data to an Arrow array using pyarrow.
-    """
-    if isinstance(typ, pyarrow.Decimal128Type):
-        data = [
-            decimal.Decimal(str(value)) if value is not None else value
-            for value in data
-        ]
-    elif isinstance(typ, pyarrow.TimestampType):
-        data = [_convert_date(typ, v) for v in data]
-    mask = [value is None for value in data]
-    return pyarrow.array(data, typ, mask=mask)
-
-
-def _convert_to_df(data):
-    """
-    Converts the data set to a Pandas data frame for comparison to what is
-    returned from the database.
-    """
-    data_by_col = [[row[i] for row in data] for i in range(len(data[0]))]
-    fetch_decimals = oracledb.defaults.fetch_decimals
-    types = [
-        pyarrow.decimal128(9) if fetch_decimals else pyarrow.int64(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.timestamp("s"),
-        pyarrow.decimal128(9, 2) if fetch_decimals else pyarrow.float64(),
-        pyarrow.decimal128(3) if fetch_decimals else pyarrow.int64(),
-        pyarrow.timestamp("us"),
-    ]
-    arrays = [_convert_to_array(d, t) for d, t in zip(data_by_col, types)]
-    names = [
-        "ID",
-        "FIRSTNAME",
-        "LASTNAME",
-        "CITY",
-        "COUNTRY",
-        "DATEOFBIRTH",
-        "SALARY",
-        "CREDITSCORE",
-        "LASTUPDATED",
-    ]
-    pa_tab = pyarrow.Table.from_arrays(arrays, names=names)
-    pa_tab.validate(full=True)
-    return pa_tab.to_pandas()
-
-
-def _populate_table(cursor, data):
-    """
-    Populate the test table with the given data.
-    """
-    cursor.execute("delete from TestDataframe")
-    types = [None] * len(data[0])
-    types[8] = oracledb.DB_TYPE_TIMESTAMP
-    cursor.setinputsizes(*types)
-    cursor.executemany(
-        """
-        insert into TestDataframe (
-            Id, FirstName, LastName, City, Country,
-            DateOfBirth, Salary, CreditScore, LastUpdated
-        ) values (
-            :id, :first_name, :last_name, :city, :country,
-            :dob, :salary, :credit_score, :last_updated
-        )
-        """,
-        data,
-    )
-    cursor.connection.commit()
-
-
-def _test_df_interop(test_env, cursor, data):
-    """
-    Tests interoperability with external data frames using the data set
-    provided.
-    """
-    _populate_table(cursor, data)
-    ora_df = cursor.connection.fetch_df_all(QUERY_SQL)
-    _validate_df(ora_df, data, test_env)
-
-
-def _test_df_batches_interop(test_env, cursor, data, batch_size, num_batches):
-    """
-    Tests interoperability with external data frames using the data set
-    provided.
-    """
-    _populate_table(cursor, data)
-    conn = cursor.connection
-    batches = list(conn.fetch_df_batches(QUERY_SQL, size=batch_size))
-    assert len(batches) == num_batches
-    if num_batches == 1:
-        _validate_df(batches[0], data, test_env)
-    else:
-        offset = 0
-        for batch in batches:
-            _validate_df(batch, data[offset : offset + batch_size], test_env)
-            offset += batch_size
-
-
-def _validate_df(ora_df, data, test_env):
-    """
-    Validates the data frame by converting it to Pandas and comparing it
-    with the original data set that was used.
-    """
-    raw_df = _convert_to_df(data)
-    raw_data = test_env.get_data_from_df(raw_df)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == raw_data
-
-
-def test_8000(conn, cursor):
-    "8000 - test basic fetch of data frame"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    assert ora_df.num_rows() == len(DATASET_1)
-    assert ora_df.num_columns() == len(DATASET_1[0])
-
-
-def test_8001(cursor, test_env):
-    "8001 - test conversion to external dataframe"
-    _test_df_interop(test_env, cursor, DATASET_1)
-
-
-def test_8002(cursor, test_env):
-    "8001 - test null and negative values"
-    _test_df_interop(test_env, cursor, DATASET_2)
-
-
-def test_8003(cursor, test_env):
-    "8002 - test with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        _test_df_interop(test_env, cursor, DATASET_1)
-
-
-def test_8004(cursor, test_env):
-    "8003 - test null and negative values with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        _test_df_interop(test_env, cursor, DATASET_2)
-
-
-def test_8005(cursor, test_env):
-    "8005 - test null and values with leading zeros"
-    _test_df_interop(test_env, cursor, DATASET_3)
-
-
-def test_8006(cursor, test_env):
-    "8005 - test null and values with leading zeros with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        _test_df_interop(test_env, cursor, DATASET_3)
-
-
-def test_8007(cursor, test_env):
-    "8007 - duplicate values in the rows"
-    _test_df_interop(test_env, cursor, DATASET_4)
-
-
-def test_8008(cursor, test_env):
-    "8008 - batches without specification of size"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_4, batch_size=None, num_batches=1
-    )
-
-
-def test_8009(cursor, test_env):
-    "8009 - batches with specification of size"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_4, batch_size=5, num_batches=2
-    )
-
-
-def test_8010(conn, cursor, test_env):
-    "8010 - verify passing Arrow arrays twice works"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    _validate_df(ora_df, DATASET_1, test_env)
-    _validate_df(ora_df, DATASET_1, test_env)
-
-
-def test_8011(conn, cursor):
-    "8011 - verify empty data set"
-    _populate_table(cursor, DATASET_1)
-    statement = "select * from TestDataFrame where Id = 4"
-    ora_df = conn.fetch_df_all(statement)
-    assert ora_df.num_rows() == 0
-
-
-def test_8012(conn, cursor):
-    "8012 - verify empty data set with batches"
-    _populate_table(cursor, DATASET_1)
-    statement = "select * from TestDataFrame where Id = 4"
-    for ora_df in conn.fetch_df_batches(statement):
-        assert ora_df.num_rows() == 0
-
-
-def test_8013(conn, cursor):
-    "8013 - negative checks on attributes"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    with pytest.raises(IndexError):
-        ora_df.get_column(121)
-    with pytest.raises(IndexError):
-        ora_df.get_column(-1)
-    with pytest.raises(KeyError):
-        ora_df.get_column_by_name("missing_column")
-
-
-def test_8014(conn, test_env):
-    "8014 - check unsupported error"
-    statement = "select cursor(select user from dual) from dual"
-    with test_env.assert_raises_full_code("DPY-3030"):
-        conn.fetch_df_all(statement)
-
-
-def test_8015(cursor, test_env):
-    "8015 - batches with specification of size matching number of rows"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_2, batch_size=len(DATASET_2), num_batches=1
-    )
-
-
-def test_8016(conn, cursor):
-    "8016 - verify get_column() returns the correct value"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    array = pyarrow.array(ora_df.get_column(1))
-    assert array.to_pylist() == ["John", "Big"]
-
-
-def test_8017(cursor, test_env):
-    "8017 - batches with size that has duplicate rows across batches"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_4, batch_size=3, num_batches=2
-    )
-
-
-def test_8018(conn, test_env):
-    "8018 - fetch_decimals without precision and scale specified"
-    data = [(1.0,)]
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        ora_df = conn.fetch_df_all("select 1.0 from dual")
-        fetched_tab = pyarrow.Table.from_arrays(
-            ora_df.column_arrays(), names=ora_df.column_names()
-        )
-        fetched_df = fetched_tab.to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data
-
-
-def test_8019(conn, test_env):
-    "8019 - fetch clob"
-    data = [("test_8023",)]
-    ora_df = conn.fetch_df_all("select to_clob('test_8023') from dual")
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8020(conn, test_env):
-    "8020 - fetch blob"
-    data = [(b"test_8024",)]
-    ora_df = conn.fetch_df_all(
-        "select to_blob(utl_raw.cast_to_raw('test_8024')) from dual"
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8021(conn, test_env):
-    "8021 - fetch raw"
-    data = [(b"test_8025",)]
-    ora_df = conn.fetch_df_all(
-        "select utl_raw.cast_to_raw('test_8025') from dual"
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8022(skip_unless_native_boolean_supported, conn, test_env):
-    "8022 - fetch boolean"
-    data = [(True,), (False,), (False,), (True,), (True,)]
-    ora_df = conn.fetch_df_all(
-        """
-        select true
-        union all
-        select false
-        union all
-        select false
-        union all
-        select true
-        union all
-        select true
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8023(conn, test_env):
-    "8023 - fetch data with multiple rows containing null values"
-    ora_df = conn.fetch_df_all(
-        """
-        select to_date('2025-06-12', 'YYYY-MM-DD') as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date('2025-06-11', 'YYYY-MM-DD') as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        """
-    )
-    data = [
-        (datetime.datetime(2025, 6, 12),),
-        (None,),
-        (None,),
-        (None,),
-        (datetime.datetime(2025, 6, 11),),
-        (None,),
-        (None,),
-        (None,),
-        (None,),
-    ]
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8024(skip_unless_vectors_supported, conn, test_env):
-    "8024 - fetch float32 vector"
-
-    # float32 is a special case while comparing dataframe values
-    # Converting Dataframe cell value of type numpy.ndarray[float32]
-    # using .tolist() converts each value to Python float. Python
-    # float uses 64-bit precision causing mismatches in assertEqual.
-    # As a workaround we use array.array('f', src).tolist() on the
-    # source data
-    data = [
-        (array.array("f", [34.6, 77.8]).tolist(),),
-        (array.array("f", [34.6, 77.8, 55.9]).tolist(),),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT32)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8, 55.9]', 3, FLOAT32)
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8025(skip_unless_vectors_supported, conn, test_env):
-    "8025 - fetch float64 vector"
-    data = [
-        ([34.6, 77.8],),
-        ([34.6, 77.8, 55.9],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8, 55.9]', 3, FLOAT64)
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8026(skip_unless_vectors_supported, conn, test_env):
-    "8026 - fetch int8 vector"
-    data = [
-        ([34, -77],),
-        ([34, 77, 55],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34, -77]', 2, INT8)
-        union all
-        SELECT TO_VECTOR('[34, 77, 55]', 3, INT8)
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8027(skip_unless_vectors_supported, conn, test_env):
-    "8027 - fetch binary vector"
-    data = [
-        ([3, 2, 3],),
-        ([3, 2],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[3, 2, 3]', 24, BINARY)
-        union all
-        SELECT TO_VECTOR('[3, 2]', 16, BINARY)
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8028(skip_unless_vectors_supported, conn, test_env):
-    "8028 - fetch float32 vectors with None"
-    data = [
-        (array.array("f", [34.6, 77.8]).tolist(),),
-        (array.array("f", [34.6, 77.8, 55.9]).tolist(),),
-        (None,),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT32)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8, 55.9]', 3, FLOAT32)
-        union all
-        select NULL
-        """
-    )
-    assert ora_df.num_rows() == 3
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8029(skip_unless_vectors_supported, conn, test_env):
-    "8029 - fetch duplicate float64 vectors"
-    data = [
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT64)
-        """
-    )
-    assert ora_df.num_rows() == 12
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8030(skip_unless_sparse_vectors_supported, conn, test_env):
-    "8030 - fetch float32 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 77.8]).tolist(),
-            },
-        ),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 9.1]).tolist(),
-            },
-        ),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 77.8]', 8, FLOAT32),
-            8,
-            FLOAT32,
-            SPARSE
-            )
-        union all
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 9.1]', 8, FLOAT32),
-            8,
-            FLOAT32,
-            SPARSE
-            )
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8031(skip_unless_sparse_vectors_supported, conn, test_env):
-    "8031 - fetch float64 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 77.8],
-            },
-        ),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 9.1],
-            },
-        ),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 77.8]', 8, FLOAT64),
-            8,
-            FLOAT64,
-            SPARSE
-            )
-        union all
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 9.1]', 8, FLOAT64),
-            8,
-            FLOAT64,
-            SPARSE
-            )
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8032(skip_unless_vectors_supported, conn, test_env):
-    "8032 - DPY-3031 - Unsupported flexible vector formats"
-    with test_env.assert_raises_full_code("DPY-3031"):
-        conn.fetch_df_all(
-            """
-            SELECT TO_VECTOR('[44, 55, 89]', 3, INT8) as flex_col
-            union all
-            SELECT TO_VECTOR('[34.6, 77.8, 55.9]', 3, FLOAT32) as flex_col
-            """
-        )
-
-
-def test_8033(skip_unless_sparse_vectors_supported, conn, test_env):
-    "8033 - DPY-4007 -fetch sparse vectors with flexible dimensions"
-    with test_env.assert_raises_full_code("DPY-2065"):
-        conn.fetch_df_all(
-            """
-            SELECT TO_VECTOR(
-                TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 77.8]', 7, FLOAT64),
-                7,
-                FLOAT64,
-                SPARSE
-                )
-            union all
-            SELECT TO_VECTOR(
-                TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 9.1]', 8, FLOAT64),
-                8,
-                FLOAT64,
-                SPARSE
-                )
-            """
-        )
-
-
-def test_8034(conn, cursor, test_env):
-    "8034 - test expressions on numeric columns"
-    # fill only the numeric column - credit score
-    dataset = [
-        (1, None, None, None, None, None, None, 225, None),
-        (2, None, None, None, None, None, None, 365, None),
-    ]
-
-    data = [
-        (56.25,),
-        (91.25,),
-    ]
-    _populate_table(cursor, dataset)
-
-    # Use numeric expression involving a column
-    statement = "select CreditScore/4 from TestDataFrame order by Id"
-    ora_df = conn.fetch_df_all(statement)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_8035(conn, cursor):
-    "8035 - test metadata of all data types"
-    now = datetime.datetime.now()
-    data = [
-        ("NUMBERVALUE", 5, pyarrow.float64()),
-        ("STRINGVALUE", "String Val", pyarrow.large_string()),
-        ("FIXEDCHARVALUE", "Fixed Char", pyarrow.large_string()),
-        ("NSTRINGVALUE", "NString Val", pyarrow.large_string()),
-        ("NFIXEDCHARVALUE", "NFixedChar", pyarrow.large_string()),
-        ("RAWVALUE", b"Raw Data", pyarrow.large_binary()),
-        ("INTVALUE", 25_387_923, pyarrow.float64()),
-        ("SMALLINTVALUE", 127, pyarrow.float64()),
-        ("REALVALUE", 125.25, pyarrow.float64()),
-        ("DECIMALVALUE", 91.1025, pyarrow.float64()),
-        ("DOUBLEPRECISIONVALUE", 87.625, pyarrow.float64()),
-        ("FLOATVALUE", 125.375, pyarrow.float64()),
-        ("BINARYFLOATVALUE", -25, pyarrow.float32()),
-        ("BINARYDOUBLEVALUE", -175.5, pyarrow.float64()),
-        ("DATEVALUE", now, pyarrow.timestamp("s")),
-        ("TIMESTAMPVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPTZVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPLTZVALUE", now, pyarrow.timestamp("us")),
-        ("CLOBVALUE", "CLOB Value", pyarrow.large_string()),
-        ("NCLOBVALUE", "NCLOB Value", pyarrow.large_string()),
-        ("BLOBVALUE", b"BLOB Value", pyarrow.large_binary()),
-    ]
-    cursor.execute("delete from TestAllTypes")
-    column_names = ",".join(n for n, v, t in data)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(data)))
-    data_to_insert = tuple(v for n, v, t in data)
-    cursor.execute(
-        f"""
-        insert into TestAllTypes ({column_names})
-        values ({bind_values})
-        """,
-        data_to_insert,
-    )
-    conn.commit()
-    sql = f"select {column_names} from TestAllTypes"
-    ora_df = conn.fetch_df_all(sql)
-    expected_types = [t for n, v, t in data]
-    actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-    assert actual_types == expected_types
-
-
-def test_8036(conn, cursor, test_env):
-    "8036 - test metadata of all data types with fetch_decimals = True"
-    now = datetime.datetime.now()
-    data = [
-        ("NUMBERVALUE", 5, pyarrow.float64()),
-        ("STRINGVALUE", "String Val", pyarrow.large_string()),
-        ("FIXEDCHARVALUE", "Fixed Char", pyarrow.large_string()),
-        ("NSTRINGVALUE", "NString Val", pyarrow.large_string()),
-        ("NFIXEDCHARVALUE", "NFixedChar", pyarrow.large_string()),
-        ("RAWVALUE", b"Raw Data", pyarrow.large_binary()),
-        ("INTVALUE", 25_387_923, pyarrow.decimal128(38, 0)),
-        ("SMALLINTVALUE", 127, pyarrow.decimal128(38, 0)),
-        ("REALVALUE", 125.25, pyarrow.float64()),
-        ("DECIMALVALUE", 91.1025, pyarrow.decimal128(20, 6)),
-        ("DOUBLEPRECISIONVALUE", 87.625, pyarrow.float64()),
-        ("FLOATVALUE", 125.375, pyarrow.float64()),
-        ("BINARYFLOATVALUE", -25, pyarrow.float32()),
-        ("BINARYDOUBLEVALUE", -175.5, pyarrow.float64()),
-        ("DATEVALUE", now, pyarrow.timestamp("s")),
-        ("TIMESTAMPVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPTZVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPLTZVALUE", now, pyarrow.timestamp("us")),
-        ("CLOBVALUE", "CLOB Value", pyarrow.large_string()),
-        ("NCLOBVALUE", "NCLOB Value", pyarrow.large_string()),
-        ("BLOBVALUE", b"BLOB Value", pyarrow.large_binary()),
-    ]
-    cursor.execute("delete from TestAllTypes")
-    column_names = ",".join(n for n, v, t in data)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(data)))
-    data_to_insert = tuple(v for n, v, t in data)
-    cursor.execute(
-        f"""
-        insert into TestAllTypes ({column_names})
-        values ({bind_values})
-        """,
-        data_to_insert,
-    )
-    conn.commit()
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        sql = f"select {column_names} from TestAllTypes"
-        ora_df = conn.fetch_df_all(sql)
-        expected_types = [t for n, v, t in data]
-        actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-        assert actual_types == expected_types
-
-
-def test_8037(skip_unless_native_boolean_supported, conn, cursor):
-    "8037 - test metadata with boolean type"
-    cursor.execute("delete from TestBooleans")
-    data = [(1, True, False, None), (2, False, True, True)]
-    cursor.executemany(
-        """
-        insert into TestBooleans
-        (IntCol, BooleanCol1, BooleanCol2, BooleanCol3)
-        values (:1, :2, :3, :4)
-        """,
-        data,
-    )
-    conn.commit()
-
-    sql = "select * from TestBooleans order by IntCol"
-    ora_df = conn.fetch_df_all(sql)
-    expected_types = [
-        pyarrow.int64(),
-        pyarrow.bool_(),
-        pyarrow.bool_(),
-        pyarrow.bool_(),
-    ]
-    actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-    assert actual_types == expected_types
-
-
-def test_8038(cursor, test_env):
-    "8038 - test NULL rows with all null values"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, None, None, None, None, None, None, None, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8039(conn, cursor):
-    "8039 - test repeated pyarrow table construction"
-    data = [
-        (
-            1,
-            "John",
-            "Doe",
-            "SF",
-            "USA",
-            datetime.date(1990, 1, 1),
-            5000.50,
-            100,
-            datetime.datetime.now(),
-        )
-    ]
-    _populate_table(cursor, data)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    table1 = pyarrow.table(ora_df)
-    table2 = pyarrow.table(ora_df)
-    assert table1.schema == table2.schema
-    assert table1.to_pydict() == table2.to_pydict()
-
-
-def test_8040(conn, cursor, test_env):
-    "8040 - test dataframe query with multiple bind variables"
-    _populate_table(cursor, DATASET_2)
-    statement = QUERY_SQL_WITH_WHERE_CLAUSE.format(
-        where_clause="where Id between :min_id and :max_id"
-    )
-    ora_df = conn.fetch_df_all(statement, {"min_id": 2, "max_id": 3})
-    assert ora_df.num_rows() == 2
-
-    expected_data = [row for row in DATASET_2 if row[0] in (2, 3)]
-    raw_df = _convert_to_df(expected_data)
-    raw_data = test_env.get_data_from_df(raw_df)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == raw_data
-
-
-def test_8041(conn, test_env):
-    "8041 - test error handling with invalid SQL in fetch_df_batches()"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        for batch in conn.fetch_df_batches("select * from NonExistentTable"):
-            pass
-
-
-def test_8042(cursor, test_env):
-    "8042 - test partial batch (last batch smaller than batch size)"
-    test_data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            datetime.date(2000, 1, 1),
-            i * 100,
-            i % 800,
-            datetime.datetime.now(),
-        )
-        for i in range(1, 8)  # 7 rows
-    ]
-    _test_df_batches_interop(
-        test_env, cursor, test_data, batch_size=3, num_batches=3
-    )
-
-
-def test_8043(conn, cursor):
-    "8043 - test with date functions"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(
-        """
-        select
-            Id,
-            extract(year from DateOfBirth) as birth_year,
-            to_char(DateOfBirth, 'YYYY-MM') as birth_month
-        from TestDataFrame
-        order by Id
-        """
-    )
-    assert ora_df.num_rows() == len(DATASET_1)
-    year_col = ora_df.get_column_by_name("BIRTH_YEAR")
-    array = pyarrow.array(year_col)
-    assert array.to_pylist() == [1955, 1955]
-
-
-def test_8044(conn, cursor):
-    "8044 - test column access by index bounds"
-    _populate_table(cursor, DATASET_1)
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    with pytest.raises(IndexError):
-        ora_df.get_column(ora_df.num_columns())
-
-
-def test_8045(cursor, test_env):
-    "8045 - test with different batch sizes"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_4, batch_size=1, num_batches=6
-    )
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_4, batch_size=2, num_batches=3
-    )
-
-
-def test_8046(cursor, test_env):
-    "8046 - test with very large batch size"
-    _test_df_batches_interop(
-        test_env, cursor, DATASET_1, batch_size=1000, num_batches=1
-    )
-
-
-def test_8047(conn, test_env):
-    "8047 - test error handling with invalid SQL"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        conn.fetch_df_all("select * from NonExistentTable")
-
-
-def test_8048(conn, cursor, test_env):
-    "8048 - test error handling with invalid bind variable"
-    _populate_table(cursor, DATASET_1)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        conn.fetch_df_all(
-            "select * from TestDataFrame where Id = :missing_bind"
-        )
-
-
-def test_8049(conn, cursor, test_env):
-    "8049 - test with single row result"
-    _populate_table(cursor, DATASET_1)
-    statement = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause="where Id = 1")
-    ora_df = conn.fetch_df_all(statement)
-    assert ora_df.num_rows() == 1
-    _validate_df(ora_df, [DATASET_1[0]], test_env)
-
-
-def test_8050(conn, cursor, test_env):
-    "8050 - test with calculated columns"
-    _populate_table(cursor, DATASET_1)
-    now = datetime.datetime.now().replace(microsecond=0)
-    ora_df = conn.fetch_df_all(
-        """
-        select
-            Id,
-            FirstName || ' ' || LastName as full_name,
-            Salary * 12 as annual_salary,
-            :now as current_date
-        from TestDataFrame
-        order by Id
-        """,
-        [now],
-    )
-    assert ora_df.num_rows() == len(DATASET_1)
-    assert ora_df.num_columns() == 4
-
-    expected_data = []
-    for row in DATASET_1:
-        expected_row = (
-            row[0],  # Id
-            f"{row[1]} {row[2]}",  # full_name
-            float(str(row[6] * 12)),  # annual_salary
-            now,
-        )
-        expected_data.append(expected_row)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == expected_data
-
-
-def test_8051(conn, cursor, test_env):
-    "8051 - test fetch_df_batches with bind variables"
-    batch_size = 2
-    _populate_table(cursor, DATASET_4)
-    where_clause = "where Id >= :min_id"
-    sql = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause=where_clause)
-    batches = conn.fetch_df_batches(sql, {"min_id": 3}, size=batch_size)
-    expected_data = [row for row in DATASET_4 if row[0] >= 3]
-    offset = 0
-    for batch in batches:
-        _validate_df(
-            batch, expected_data[offset : offset + batch_size], test_env
-        )
-        offset += batch_size
-
-
-def test_8052(conn, cursor, test_env):
-    "8052 - test with large data"
-    data = [
-        (1, "A" * 41_000, b"Very long description " * 5_000),
-        (2, "B" * 35_000, b"Another long text " * 10_000),
-        (3, "C" * 72_000, b"Even longer content " * 20_000),
-    ]
-
-    cursor.execute("delete from TestDataFrame")
-    cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        data,
-    )
-    conn.commit()
-
-    ora_df = conn.fetch_df_all(
-        """
-        select Id, LongData, LongRawData
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-def test_8053(conn, cursor):
-    "8053 - test fetching from an empty table with fetch_df_batches"
-    cursor.execute("delete from TestDataFrame")
-    batches = list(conn.fetch_df_batches(QUERY_SQL, size=10))
-    assert len(batches) == 1
-    assert batches[0].num_rows() == 0
-
-
-def test_8054(conn, cursor, test_env):
-    "8054 - fetch clob in batches"
-    cursor.execute("delete from TestDataFrame")
-    test_string = "A" * 10000
-    data = [(test_string,)] * 3
-    cursor.executemany(
-        """
-        insert into TestDataFrame (LongData)
-        values (:1)
-        """,
-        data,
-    )
-    conn.commit()
-
-    offset = 0
-    batch_size = 2
-    sql = "select LongData from TestDataFrame"
-    for batch in conn.fetch_df_batches(sql, size=batch_size):
-        fetched_df = pyarrow.table(batch).to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data[offset : offset + batch_size]
-        offset += batch_size
-
-
-def test_8055(conn, cursor, test_env):
-    "8055 - fetch blob in batches"
-    cursor.execute("delete from TestDataFrame")
-    test_string = b"B" * 10000
-    data = [(test_string,)] * 4
-    cursor.executemany(
-        """
-        insert into TestDataFrame (LongRawData)
-        values (:1)
-        """,
-        data,
-    )
-    conn.commit()
-
-    offset = 0
-    batch_size = 3
-    sql = "select LongRawData from TestDataFrame"
-    for batch in conn.fetch_df_batches(sql, size=batch_size):
-        fetched_df = pyarrow.table(batch).to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data[offset : offset + batch_size]
-        offset += batch_size
-
-
-def test_8056(conn, cursor, test_env):
-    "8056 - test with empty strings"
-    data = [
-        (
-            1,
-            "",
-            "",
-            "City",
-            "Country",
-            datetime.datetime(2000, 1, 1),
-            1000.0,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First",
-            "Last",
-            "",
-            "",
-            datetime.datetime(2000, 1, 1),
-            2000.0,
-            200,
-            datetime.datetime.now(),
-        ),
-    ]
-    _populate_table(cursor, data)
-    expected_data = [
-        tuple(None if v == "" else v for v in row) for row in data
-    ]
-    ora_df = conn.fetch_df_all(QUERY_SQL)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == expected_data
-
-
-def test_8057(cursor, test_env):
-    "8057 - test with unicode characters"
-    data = [
-        (
-            1,
-            "Jöhn",
-            "Döe",
-            "München",
-            "Deutschland",
-            datetime.date(1980, 5, 15),
-            5000,
-            300,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "?",
-            "?",
-            "??",
-            "??",
-            datetime.date(1990, 8, 20),
-            8000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8058(cursor, test_env):
-    "8072 - test with very old dates"
-    data = [
-        (
-            1,
-            "Ancient",
-            "One",
-            "Babylon",
-            "Mesopotamia",
-            datetime.date(1, 1, 1),
-            0,
-            0,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "Medieval",
-            "Person",
-            "London",
-            "England",
-            datetime.date(1200, 6, 15),
-            10,
-            50,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8059(cursor, test_env):
-    "8059 - test with future dates"
-    data = [
-        (
-            1,
-            "Future",
-            "Person",
-            "Mars",
-            "Solar System",
-            datetime.date(3000, 1, 1),
-            100000,
-            900,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "Distant",
-            "Future",
-            "Andromeda",
-            "Galaxy",
-            datetime.date(9999, 12, 31),
-            999999,
-            999,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8060(cursor, test_env):
-    "8060 - test with exactly arraysize rows"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, cursor.arraysize + 1)
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8061(cursor, test_env):
-    "8061 - test with arraysize+1 rows"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, cursor.arraysize + 2)
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8062(cursor, test_env):
-    "8062 - test with odd arraysize"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, 48)
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8063(cursor, test_env):
-    "8063 - test with single row"
-    data = [
-        (
-            1,
-            "John",
-            "Doe",
-            "SF",
-            "USA",
-            datetime.date(1990, 1, 1),
-            5000,
-            100,
-            datetime.datetime.now(),
-        )
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8064(cursor, test_env):
-    "8064 - test multiple rows with NULL values in different columns"
-    now = datetime.datetime.now()
-    test_date = datetime.datetime(2000, 1, 1)
-    data = [
-        (1, None, "Last1", "City1", "Country1", None, None, 100, None),
-        (2, "First2", None, None, "Country2", test_date, 2000, None, None),
-        (3, "First3", "Last3", None, None, None, 3000, 300, now),
-        (4, None, None, None, None, None, None, None, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8065(cursor, test_env):
-    "8065 - test single column with all NULL values"
-    data = [
-        (
-            1,
-            None,
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            1000,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            None,
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            None,
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            3000,
-            300,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8066(cursor, test_env):
-    "8066 - test last column NULL in each row"
-    data = [
-        (
-            1,
-            "First1",
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            1000,
-            100,
-            None,
-        ),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            None,
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            3000,
-            300,
-            None,
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8067(cursor, test_env):
-    "8067 - test alternating NULL/non-NULL values in a column"
-    data = [
-        (
-            1,
-            "First1",
-            None,
-            "City1",
-            None,
-            datetime.date(2000, 1, 1),
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (2, "First2", "Last2", None, "Country2", None, 2000, None, None),
-        (
-            3,
-            "First3",
-            None,
-            "City3",
-            None,
-            datetime.date(2002, 1, 1),
-            None,
-            300,
-            datetime.datetime.now(),
-        ),
-        (4, "First4", "Last4", None, "Country4", None, 4000, None, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8068(cursor, test_env):
-    "8068 - test all columns NULL except one"
-    now = datetime.datetime.now()
-    test_date = datetime.date(2001, 1, 1)
-    data = [
-        (1, None, None, None, None, None, None, None, now),
-        (2, None, None, None, None, test_date, None, None, None),
-        (3, "First3", None, None, None, None, None, None, None),
-        (4, None, None, None, "Country4", None, None, None, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8069(cursor, test_env):
-    "8069 - test all date columns with all NULL values"
-    data = [
-        (1, "First1", "Last1", "City1", "Country1", None, 1000, 100, None),
-        (2, "First2", "Last2", "City2", "Country2", None, 2000, 200, None),
-        (3, "First3", "Last3", "City3", "Country3", None, 3000, 300, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8070(cursor, test_env):
-    "8070 - test NULL values in numeric columns"
-    data = [
-        (
-            1,
-            "First1",
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            None,
-            None,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8071(cursor, test_env):
-    "8071 - test multiple consecutive NULL rows"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, None, None, None, None, None, None, None, None),
-        (3, None, None, None, None, None, None, None, None),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            datetime.date(2000, 1, 1),
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8072(cursor, test_env):
-    "8072 - test NULL rows interspersed with data rows"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            datetime.datetime.now(),
-        ),
-        (3, None, None, None, None, None, None, None, None),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            datetime.date(2003, 1, 1),
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-        (5, None, None, None, None, None, None, None, None),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8073(cursor, test_env):
-    "8073 - test multiple NULL rows with different NULL columns"
-    data = [
-        (1, None, "Last1", "City1", "Country1", None, 1000, 100, None),
-        (
-            2,
-            "First2",
-            None,
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            None,
-            200,
-            None,
-        ),
-        (
-            3,
-            None,
-            None,
-            "City3",
-            "Country3",
-            None,
-            None,
-            300,
-            datetime.datetime.now(),
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            None,
-            None,
-            datetime.date(2003, 1, 1),
-            4000,
-            None,
-            None,
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8074(cursor, test_env):
-    "8074 - test NULL rows with alternating NULL patterns"
-    data = [
-        (
-            1,
-            None,
-            "Last1",
-            None,
-            "Country1",
-            None,
-            1000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First2",
-            None,
-            "City2",
-            None,
-            datetime.date(2001, 1, 1),
-            None,
-            200,
-            None,
-        ),
-        (
-            3,
-            None,
-            "Last3",
-            None,
-            "Country3",
-            None,
-            3000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            4,
-            "First4",
-            None,
-            "City4",
-            None,
-            datetime.date(2003, 1, 1),
-            None,
-            400,
-            None,
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8075(cursor, test_env):
-    "8075 - test multiple NULL rows with partial NULL groups"
-    data = [
-        (
-            1,
-            None,
-            None,
-            "City1",
-            "Country1",
-            None,
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            None,
-            None,
-            "City2",
-            "Country2",
-            None,
-            None,
-            200,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            None,
-            None,
-            datetime.date(2002, 1, 1),
-            3000,
-            None,
-            None,
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            None,
-            None,
-            datetime.date(2003, 1, 1),
-            4000,
-            None,
-            None,
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8076(cursor, test_env):
-    "8076 - test multiple NULL rows with varying NULL counts"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, "First2", None, "City2", None, None, 2000, None, None),
-        (
-            3,
-            None,
-            "Last3",
-            None,
-            "Country3",
-            datetime.date(2002, 1, 1),
-            None,
-            300,
-            None,
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            None,
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    _test_df_interop(test_env, cursor, data)
-
-
-def test_8077(conn, test_env):
-    "8077 - test fetching large integers"
-    data = (-(2**40), 2**41)
-    ora_df = conn.fetch_df_all(
-        """
-        select
-            cast(:1 as number(15)),
-            cast(:2 as number(15))
-        from dual
-        """,
-        data,
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert [data] == test_env.get_data_from_df(fetched_df)
-
-
-def test_8078(conn, test_env):
-    "8078 - test fetching NCHAR and NVARCHAR data"
-    value = "test_8078"
-    value_len = len(value)
-    ora_df = conn.fetch_df_all(
-        f"""
-        select
-            cast('{value}' as nchar({value_len})),
-            cast('{value}' as nvarchar2({value_len}))
-        from dual
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert test_env.get_data_from_df(fetched_df) == [(value, value)]
diff --git a/tests/test_8100_dataframe_async.py b/tests/test_8100_dataframe_async.py
deleted file mode 100644
index d84b58d3..00000000
--- a/tests/test_8100_dataframe_async.py
+++ /dev/null
@@ -1,1714 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing dataframes using asyncio.
-"""
-
-import array
-import datetime
-import decimal
-
-import oracledb
-import pyarrow
-import pytest
-
-# basic
-DATASET_1 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1955, 7, 1),  # summer(before 1970)
-        12132.40,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        "Japansa",
-        datetime.date(1955, 1, 1),  # winter(before 1970)
-        234234.32,
-        400,
-        datetime.datetime.now(),
-    ),
-]
-
-# None, -ve
-DATASET_2 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(2000, 7, 1),  # summer(between)
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(2000, 1, 1),  # winter(between)
-        -12312.1,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "Johns",
-        "Does",
-        "San Franciscos",
-        "USAs",
-        datetime.date(2040, 7, 1),  # summer(after)
-        None,
-        500,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "Bigs",
-        "Heros",
-        "San Fransokyos",
-        None,
-        datetime.date(2040, 1, 1),  # winter(after)
-        -12312.1,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-# None, +/- 0.XXX
-DATASET_3 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(1988, 8, 22),
-        0.12,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        None,
-        400,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "Big",
-        "Hero",
-        "San Fransokyo",
-        None,
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-# Duplicates
-DATASET_4 = [
-    (
-        1,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1989, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        2,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        3,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        4,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        5,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-    (
-        6,
-        "John",
-        "Doe",
-        "San Francisco",
-        "USA",
-        datetime.date(1988, 8, 22),
-        -0.01,
-        0,
-        datetime.datetime.now(),
-    ),
-]
-
-QUERY_SQL_WITH_WHERE_CLAUSE = """
-    select
-        Id,
-        FirstName,
-        LastName,
-        City,
-        Country,
-        DateOfBirth,
-        Salary,
-        CreditScore,
-        LastUpdated
-    from TestDataFrame
-    {where_clause}
-    order by id
-"""
-
-QUERY_SQL = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause="")
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-def _convert_date(typ, value):
-    """
-    Converts a date to the format required by Arrow.
-    """
-    if value is not None:
-        if typ.unit == "s":
-            value = datetime.datetime(value.year, value.month, value.day)
-        ts = (value - datetime.datetime(1970, 1, 1)).total_seconds()
-        if typ.unit != "s":
-            ts *= 1_000_000
-        return ts
-
-
-def _convert_to_array(data, typ):
-    """
-    Convert raw data to an Arrow array using pyarrow.
-    """
-    if isinstance(typ, pyarrow.Decimal128Type):
-        data = [
-            decimal.Decimal(str(value)) if value is not None else value
-            for value in data
-        ]
-    elif isinstance(typ, pyarrow.TimestampType):
-        data = [_convert_date(typ, v) for v in data]
-    mask = [value is None for value in data]
-    return pyarrow.array(data, typ, mask=mask)
-
-
-def _convert_to_df(data):
-    """
-    Converts the data set to a Pandas data frame for comparison to what is
-    returned from the database.
-    """
-    data_by_col = [[row[i] for row in data] for i in range(len(data[0]))]
-    fetch_decimals = oracledb.defaults.fetch_decimals
-    types = [
-        pyarrow.decimal128(9) if fetch_decimals else pyarrow.int64(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.large_string(),
-        pyarrow.timestamp("s"),
-        pyarrow.decimal128(9, 2) if fetch_decimals else pyarrow.float64(),
-        pyarrow.decimal128(3) if fetch_decimals else pyarrow.int64(),
-        pyarrow.timestamp("us"),
-    ]
-    arrays = [_convert_to_array(d, t) for d, t in zip(data_by_col, types)]
-    names = [
-        "ID",
-        "FIRSTNAME",
-        "LASTNAME",
-        "CITY",
-        "COUNTRY",
-        "DATEOFBIRTH",
-        "SALARY",
-        "CREDITSCORE",
-        "LASTUPDATED",
-    ]
-    pa_tab = pyarrow.Table.from_arrays(arrays, names=names)
-    pa_tab.validate(full=True)
-    return pa_tab.to_pandas()
-
-
-async def _populate_table(cursor, data):
-    """
-    Populate the test table with the given data.
-    """
-    await cursor.execute("delete from TestDataframe")
-    types = [None] * len(data[0])
-    types[8] = oracledb.DB_TYPE_TIMESTAMP
-    cursor.setinputsizes(*types)
-    await cursor.executemany(
-        """
-        insert into TestDataframe (
-            Id, FirstName, LastName, City, Country,
-            DateOfBirth, Salary, CreditScore, LastUpdated
-        ) values (
-            :id, :first_name, :last_name, :city, :country,
-            :dob, :salary, :credit_score, :last_updated
-        )
-        """,
-        data,
-    )
-    await cursor.connection.commit()
-
-
-async def _test_df_interop(test_env, cursor, data):
-    """
-    Tests interoperability with external data frames using the data set
-    provided.
-    """
-    await _populate_table(cursor, data)
-    ora_df = await cursor.connection.fetch_df_all(QUERY_SQL)
-    _validate_df(ora_df, data, test_env)
-
-
-async def _test_df_batches_interop(
-    test_env, cursor, data, batch_size, num_batches
-):
-    """
-    Tests interoperability with external data frames using the data set
-    provided.
-    """
-    await _populate_table(cursor, data)
-    batches = [
-        df
-        async for df in cursor.connection.fetch_df_batches(
-            QUERY_SQL, size=batch_size
-        )
-    ]
-    assert len(batches) == num_batches
-    if num_batches == 1:
-        _validate_df(batches[0], data, test_env)
-    else:
-        offset = 0
-        for batch in batches:
-            _validate_df(batch, data[offset : offset + batch_size], test_env)
-            offset += batch_size
-
-
-def _validate_df(ora_df, data, test_env):
-    """
-    Validates the data frame by converting it to Pandas and comparing it
-    with the original data set that was used.
-    """
-    raw_df = _convert_to_df(data)
-    raw_data = test_env.get_data_from_df(raw_df)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == raw_data
-
-
-async def test_8100(async_conn, async_cursor):
-    "8100 - test basic fetch of data frame"
-    await _populate_table(async_cursor, DATASET_1)
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    assert ora_df.num_rows() == len(DATASET_1)
-    assert ora_df.num_columns() == len(DATASET_1[0])
-
-
-async def test_8101(async_cursor, test_env):
-    "8101 - test conversion to external dataframe"
-    await _test_df_interop(test_env, async_cursor, DATASET_1)
-
-
-async def test_8102(async_cursor, test_env):
-    "8101 - test null and negative values"
-    await _test_df_interop(test_env, async_cursor, DATASET_2)
-
-
-async def test_8103(async_cursor, test_env):
-    "8102 - test with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        await _test_df_interop(test_env, async_cursor, DATASET_1)
-
-
-async def test_8104(async_cursor, test_env):
-    "8103 - test null and negative values with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        await _test_df_interop(test_env, async_cursor, DATASET_2)
-
-
-async def test_8105(async_cursor, test_env):
-    "8105 - test null and values with leading zeros"
-    await _test_df_interop(test_env, async_cursor, DATASET_3)
-
-
-async def test_8106(async_cursor, test_env):
-    "8105 - test null and values with leading zeros with fetch_decimals"
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        await _test_df_interop(test_env, async_cursor, DATASET_3)
-
-
-async def test_8107(async_cursor, test_env):
-    "8107 - duplicate values in the rows"
-    await _test_df_interop(test_env, async_cursor, DATASET_4)
-
-
-async def test_8108(async_cursor, test_env):
-    "8108 - batches without specification of size"
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_4, batch_size=None, num_batches=1
-    )
-
-
-async def test_8109(async_cursor, test_env):
-    "8109 - batches with specification of size"
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_4, batch_size=5, num_batches=2
-    )
-
-
-async def test_8110(async_conn, async_cursor, test_env):
-    "8110 - verify passing Arrow arrays twice works"
-    await _populate_table(async_cursor, DATASET_1)
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    _validate_df(ora_df, DATASET_1, test_env)
-    _validate_df(ora_df, DATASET_1, test_env)
-
-
-async def test_8111(async_conn, async_cursor):
-    "8111 - verify empty data set"
-    await _populate_table(async_cursor, DATASET_1)
-    statement = "select * from TestDataFrame where Id = 4"
-    ora_df = await async_conn.fetch_df_all(statement)
-    assert ora_df.num_rows() == 0
-
-
-async def test_8112(async_conn, async_cursor):
-    "8112 - verify empty data set with batches"
-    await _populate_table(async_cursor, DATASET_1)
-    statement = "select * from TestDataFrame where Id = 4"
-    async for ora_df in async_conn.fetch_df_batches(statement):
-        assert ora_df.num_rows() == 0
-
-
-async def test_8113(async_conn, async_cursor):
-    "8113 - negative checks on attributes"
-    await _populate_table(async_cursor, DATASET_1)
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    with pytest.raises(IndexError):
-        ora_df.get_column(121)
-    with pytest.raises(IndexError):
-        ora_df.get_column(-1)
-    with pytest.raises(KeyError):
-        ora_df.get_column_by_name("missing_column")
-
-
-async def test_8114(async_conn, test_env):
-    "8114 - check unsupported error"
-    statement = "select cursor(select user from dual) from dual"
-    with test_env.assert_raises_full_code("DPY-3030"):
-        await async_conn.fetch_df_all(statement)
-
-
-async def test_8115(async_cursor, test_env):
-    "8115 - batches with specification of size matching number of rows"
-    await _test_df_batches_interop(
-        test_env,
-        async_cursor,
-        DATASET_2,
-        batch_size=len(DATASET_2),
-        num_batches=1,
-    )
-
-
-async def test_8116(async_cursor, test_env):
-    "8116 - batches with size that has duplicate rows across batches"
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_4, batch_size=3, num_batches=2
-    )
-
-
-async def test_8117(async_conn, test_env):
-    "8117 - fetch_decimals without precision and scale specified"
-    data = [(1.0,)]
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        ora_df = await async_conn.fetch_df_all("select 1.0 from dual")
-        fetched_df = pyarrow.table(ora_df).to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data
-
-
-async def test_8118(async_conn, test_env):
-    "8118 - fetch clob"
-    data = [("test_8123",)]
-    ora_df = await async_conn.fetch_df_all(
-        "select to_clob('test_8123') from dual"
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-async def test_8119(async_conn, test_env):
-    "8119 - fetch blob"
-    data = [(b"test_8124",)]
-    ora_df = await async_conn.fetch_df_all(
-        "select to_blob(utl_raw.cast_to_raw('test_8124')) from dual"
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-async def test_8120(
-    skip_unless_native_boolean_supported, async_conn, test_env
-):
-    "8120 - fetch boolean"
-    data = [(True,), (False,), (False,), (True,), (True,)]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select true
-        union all
-        select false
-        union all
-        select false
-        union all
-        select true
-        union all
-        select true
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-async def test_8121(skip_unless_vectors_supported, async_conn, test_env):
-    "8121 - fetch float32 vector"
-    data = [
-        (array.array("f", [34.6, 77.8]).tolist(),),
-        (array.array("f", [34.6, 77.8, 55.9]).tolist(),),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR('[34.6, 77.8]', 2, FLOAT32)
-        union all
-        SELECT TO_VECTOR('[34.6, 77.8, 55.9]', 3, FLOAT32)
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_8122(
-    skip_unless_sparse_vectors_supported, async_conn, test_env
-):
-    "8122 - fetch float64 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 77.8],
-            },
-        ),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 9.1],
-            },
-        ),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 77.8]', 8, FLOAT64),
-            8,
-            FLOAT64,
-            SPARSE
-            )
-        union all
-        SELECT TO_VECTOR(
-            TO_VECTOR('[34.6, 0, 0, 0, 0, 0, 0, 9.1]', 8, FLOAT64),
-            8,
-            FLOAT64,
-            SPARSE
-            )
-        """
-    )
-    assert ora_df.num_rows() == 2
-    assert ora_df.num_columns() == 1
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_8123(async_conn, test_env):
-    "8123 - fetch data with multiple rows containing null values"
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_date('2025-06-12', 'YYYY-MM-DD') as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date('2025-06-11', 'YYYY-MM-DD') as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        union all
-        select to_date(null) as data from dual
-        """
-    )
-    data = [
-        (datetime.datetime(2025, 6, 12),),
-        (None,),
-        (None,),
-        (None,),
-        (datetime.datetime(2025, 6, 11),),
-        (None,),
-        (None,),
-        (None,),
-        (None,),
-    ]
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-async def test_8124(async_conn, async_cursor):
-    "8124 - test metadata of all data types"
-    now = datetime.datetime.now()
-    data = [
-        ("NUMBERVALUE", 5, pyarrow.float64()),
-        ("STRINGVALUE", "String Val", pyarrow.large_string()),
-        ("FIXEDCHARVALUE", "Fixed Char", pyarrow.large_string()),
-        ("NSTRINGVALUE", "NString Val", pyarrow.large_string()),
-        ("NFIXEDCHARVALUE", "NFixedChar", pyarrow.large_string()),
-        ("RAWVALUE", b"Raw Data", pyarrow.large_binary()),
-        ("INTVALUE", 25_387_923, pyarrow.float64()),
-        ("SMALLINTVALUE", 127, pyarrow.float64()),
-        ("REALVALUE", 125.25, pyarrow.float64()),
-        ("DECIMALVALUE", 91.1025, pyarrow.float64()),
-        ("DOUBLEPRECISIONVALUE", 87.625, pyarrow.float64()),
-        ("FLOATVALUE", 125.375, pyarrow.float64()),
-        ("BINARYFLOATVALUE", -25, pyarrow.float32()),
-        ("BINARYDOUBLEVALUE", -175.5, pyarrow.float64()),
-        ("DATEVALUE", now, pyarrow.timestamp("s")),
-        ("TIMESTAMPVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPTZVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPLTZVALUE", now, pyarrow.timestamp("us")),
-        ("CLOBVALUE", "CLOB Value", pyarrow.large_string()),
-        ("NCLOBVALUE", "NCLOB Value", pyarrow.large_string()),
-        ("BLOBVALUE", b"BLOB Value", pyarrow.large_binary()),
-    ]
-    await async_cursor.execute("delete from TestAllTypes")
-    column_names = ",".join(n for n, v, t in data)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(data)))
-    data_to_insert = tuple(v for n, v, t in data)
-    await async_cursor.execute(
-        f"""
-        insert into TestAllTypes ({column_names})
-        values ({bind_values})
-        """,
-        data_to_insert,
-    )
-    await async_conn.commit()
-    sql = f"select {column_names} from TestAllTypes"
-    ora_df = await async_conn.fetch_df_all(sql)
-    expected_types = [t for n, v, t in data]
-    actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-    assert actual_types == expected_types
-
-
-async def test_8125(async_conn, async_cursor, test_env):
-    "8125 - test metadata of all data types with fetch_decimals = True"
-    now = datetime.datetime.now()
-    data = [
-        ("NUMBERVALUE", 5, pyarrow.float64()),
-        ("STRINGVALUE", "String Val", pyarrow.large_string()),
-        ("FIXEDCHARVALUE", "Fixed Char", pyarrow.large_string()),
-        ("NSTRINGVALUE", "NString Val", pyarrow.large_string()),
-        ("NFIXEDCHARVALUE", "NFixedChar", pyarrow.large_string()),
-        ("RAWVALUE", b"Raw Data", pyarrow.large_binary()),
-        ("INTVALUE", 25_387_923, pyarrow.decimal128(38, 0)),
-        ("SMALLINTVALUE", 127, pyarrow.decimal128(38, 0)),
-        ("REALVALUE", 125.25, pyarrow.float64()),
-        ("DECIMALVALUE", 91.1025, pyarrow.decimal128(20, 6)),
-        ("DOUBLEPRECISIONVALUE", 87.625, pyarrow.float64()),
-        ("FLOATVALUE", 125.375, pyarrow.float64()),
-        ("BINARYFLOATVALUE", -25, pyarrow.float32()),
-        ("BINARYDOUBLEVALUE", -175.5, pyarrow.float64()),
-        ("DATEVALUE", now, pyarrow.timestamp("s")),
-        ("TIMESTAMPVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPTZVALUE", now, pyarrow.timestamp("us")),
-        ("TIMESTAMPLTZVALUE", now, pyarrow.timestamp("us")),
-        ("CLOBVALUE", "CLOB Value", pyarrow.large_string()),
-        ("NCLOBVALUE", "NCLOB Value", pyarrow.large_string()),
-        ("BLOBVALUE", b"BLOB Value", pyarrow.large_binary()),
-    ]
-    await async_cursor.execute("delete from TestAllTypes")
-    column_names = ",".join(n for n, v, t in data)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(data)))
-    data_to_insert = tuple(v for n, v, t in data)
-    await async_cursor.execute(
-        f"""
-        insert into TestAllTypes ({column_names})
-        values ({bind_values})
-        """,
-        data_to_insert,
-    )
-    await async_conn.commit()
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        sql = f"select {column_names} from TestAllTypes"
-        ora_df = await async_conn.fetch_df_all(sql)
-        expected_types = [t for n, v, t in data]
-        actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-        assert actual_types == expected_types
-
-
-async def test_8126(skip_unless_native_boolean_supported, async_cursor):
-    "8126 - test metadata with boolean type"
-    await async_cursor.execute("delete from TestBooleans")
-    data = [(1, True, False, None), (2, False, True, True)]
-    await async_cursor.executemany(
-        """
-        insert into TestBooleans
-        (IntCol, BooleanCol1, BooleanCol2, BooleanCol3)
-        values (:1, :2, :3, :4)
-        """,
-        data,
-    )
-    await async_cursor.connection.commit()
-
-    sql = "select * from TestBooleans order by IntCol"
-    ora_df = await async_cursor.connection.fetch_df_all(sql)
-    expected_types = [
-        pyarrow.int64(),
-        pyarrow.bool_(),
-        pyarrow.bool_(),
-        pyarrow.bool_(),
-    ]
-    actual_types = [pyarrow.array(a).type for a in ora_df.column_arrays()]
-    assert actual_types == expected_types
-
-
-async def test_8127(async_conn, async_cursor, test_env):
-    "8127 - test NULL rows with all null values"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, None, None, None, None, None, None, None, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8128(async_conn, async_cursor):
-    "8128 - test repeated pyarrow table construction"
-    data = [
-        (
-            1,
-            "John",
-            "Doe",
-            "SF",
-            "USA",
-            datetime.date(1990, 1, 1),
-            5000.50,
-            100,
-            datetime.datetime.now(),
-        )
-    ]
-    await _populate_table(async_cursor, data)
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    table1 = pyarrow.table(ora_df)
-    table2 = pyarrow.table(ora_df)
-    assert table1.schema == table2.schema
-    assert table1.to_pydict() == table2.to_pydict()
-
-
-async def test_8129(async_conn, async_cursor, test_env):
-    "8129 - test dataframe query with multiple bind variables"
-    await _populate_table(async_cursor, DATASET_2)
-    statement = QUERY_SQL_WITH_WHERE_CLAUSE.format(
-        where_clause="where Id between :min_id and :max_id"
-    )
-    ora_df = await async_conn.fetch_df_all(
-        statement, {"min_id": 2, "max_id": 3}
-    )
-    assert ora_df.num_rows() == 2
-
-    expected_data = [row for row in DATASET_2 if row[0] in (2, 3)]
-    raw_df = _convert_to_df(expected_data)
-    raw_data = test_env.get_data_from_df(raw_df)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == raw_data
-
-
-async def test_8130(async_conn, test_env):
-    "8130 - test error handling with invalid SQL in fetch_df_batches()"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        async for batch in async_conn.fetch_df_batches(
-            "select * from NonExistentTable"
-        ):
-            pass
-
-
-async def test_8131(async_cursor, test_env):
-    "8131 - test partial batch (last batch smaller than batch size)"
-    test_data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            datetime.date(2000, 1, 1),
-            i * 100,
-            i % 800,
-            datetime.datetime.now(),
-        )
-        for i in range(1, 8)  # 7 rows
-    ]
-    await _test_df_batches_interop(
-        test_env, async_cursor, test_data, batch_size=3, num_batches=3
-    )
-
-
-async def test_8132(async_conn, async_cursor):
-    "8132 - test with date functions"
-    await _populate_table(async_cursor, DATASET_1)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select
-            Id,
-            extract(year from DateOfBirth) as birth_year,
-            to_char(DateOfBirth, 'YYYY-MM') as birth_month
-        from TestDataFrame
-        order by Id
-        """
-    )
-    assert ora_df.num_rows() == len(DATASET_1)
-    year_col = ora_df.get_column_by_name("BIRTH_YEAR")
-    array = pyarrow.array(year_col)
-    assert array.to_pylist() == [1955, 1955]
-
-
-async def test_8133(async_conn, async_cursor):
-    "8133 - test column access by index bounds"
-    await _populate_table(async_cursor, DATASET_1)
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    with pytest.raises(IndexError):
-        ora_df.get_column(ora_df.num_columns())
-
-
-async def test_8134(async_cursor, test_env):
-    "8134 - test with different batch sizes"
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_4, batch_size=1, num_batches=6
-    )
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_4, batch_size=2, num_batches=3
-    )
-
-
-async def test_8135(async_cursor, test_env):
-    "8135 - test with very large batch size"
-    await _test_df_batches_interop(
-        test_env, async_cursor, DATASET_1, batch_size=1000, num_batches=1
-    )
-
-
-async def test_8136(async_conn, test_env):
-    "8136 - test error handling with invalid SQL"
-    with test_env.assert_raises_full_code("ORA-00942"):
-        await async_conn.fetch_df_all("select * from NonExistentTable")
-
-
-async def test_8137(async_conn, async_cursor, test_env):
-    "8137 - test error handling with invalid bind variable"
-    await _populate_table(async_cursor, DATASET_1)
-    with test_env.assert_raises_full_code("DPY-4010", "ORA-01008"):
-        await async_conn.fetch_df_all(
-            "select * from TestDataFrame where Id = :missing_bind"
-        )
-
-
-async def test_8138(async_conn, async_cursor, test_env):
-    "8138 - test with single row result"
-    await _populate_table(async_cursor, DATASET_1)
-    statement = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause="where Id = 1")
-    ora_df = await async_conn.fetch_df_all(statement)
-    assert ora_df.num_rows() == 1
-    _validate_df(ora_df, [DATASET_1[0]], test_env)
-
-
-async def test_8139(async_conn, async_cursor, test_env):
-    "8139 - test with calculated columns"
-    await _populate_table(async_cursor, DATASET_1)
-    now = datetime.datetime.now().replace(microsecond=0)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select
-            Id,
-            FirstName || ' ' || LastName as full_name,
-            Salary * 12 as annual_salary,
-            :now as current_date
-        from TestDataFrame
-        order by Id
-        """,
-        [now],
-    )
-    assert ora_df.num_rows() == len(DATASET_1)
-    assert ora_df.num_columns() == 4
-
-    expected_data = []
-    for row in DATASET_1:
-        expected_row = (
-            row[0],  # Id
-            f"{row[1]} {row[2]}",  # full_name
-            float(str(row[6] * 12)),  # annual_salary
-            now,
-        )
-        expected_data.append(expected_row)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == expected_data
-
-
-async def test_8140(async_conn, async_cursor, test_env):
-    "8140 - test fetch_df_batches with bind variables"
-    batch_size = 2
-    await _populate_table(async_cursor, DATASET_4)
-    where_clause = "where Id >= :min_id"
-    sql = QUERY_SQL_WITH_WHERE_CLAUSE.format(where_clause=where_clause)
-    expected_data = [row for row in DATASET_4 if row[0] >= 3]
-    offset = 0
-    async for batch in async_conn.fetch_df_batches(
-        sql, {"min_id": 3}, size=batch_size
-    ):
-        _validate_df(
-            batch, expected_data[offset : offset + batch_size], test_env
-        )
-        offset += batch_size
-
-
-async def test_8141(async_conn, async_cursor, test_env):
-    "8141 - test with large data"
-    data = [
-        (1, "A" * 41_000, b"Very long description " * 5_000),
-        (2, "B" * 35_000, b"Another long text " * 10_000),
-        (3, "C" * 72_000, b"Even longer content " * 20_000),
-    ]
-
-    await async_cursor.execute("delete from TestDataFrame")
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        data,
-    )
-    await async_conn.commit()
-
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select Id, LongData, LongRawData
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == data
-
-
-async def test_8142(async_conn, async_cursor):
-    "8142 - test fetching from an empty table with fetch_df_batches"
-    await async_cursor.execute("delete from TestDataFrame")
-    batches = [
-        b async for b in async_conn.fetch_df_batches(QUERY_SQL, size=10)
-    ]
-    assert len(batches) == 1
-    assert batches[0].num_rows() == 0
-
-
-async def test_8143(async_conn, async_cursor, test_env):
-    "8143 - fetch clob in batches"
-    await async_cursor.execute("delete from TestDataFrame")
-    test_string = "A" * 10000
-    data = [(test_string,)] * 3
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (LongData)
-        values (:1)
-        """,
-        data,
-    )
-    await async_conn.commit()
-
-    offset = 0
-    batch_size = 2
-    sql = "select LongData from TestDataFrame"
-    async for batch in async_conn.fetch_df_batches(sql, size=batch_size):
-        fetched_df = pyarrow.table(batch).to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data[offset : offset + batch_size]
-        offset += batch_size
-
-
-async def test_8144(async_conn, async_cursor, test_env):
-    "8144 - fetch blob in batches"
-    await async_cursor.execute("delete from TestDataFrame")
-    test_string = b"B" * 10000
-    data = [(test_string,)] * 4
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (LongRawData)
-        values (:1)
-        """,
-        data,
-    )
-    await async_conn.commit()
-
-    offset = 0
-    batch_size = 3
-    sql = "select LongRawData from TestDataFrame"
-    async for batch in async_conn.fetch_df_batches(sql, size=batch_size):
-        fetched_df = pyarrow.table(batch).to_pandas()
-        fetched_data = test_env.get_data_from_df(fetched_df)
-        assert fetched_data == data[offset : offset + batch_size]
-        offset += batch_size
-
-
-async def test_8145(async_conn, async_cursor, test_env):
-    "8145 - test with empty strings"
-    data = [
-        (
-            1,
-            "",
-            "",
-            "City",
-            "Country",
-            datetime.datetime(2000, 1, 1),
-            1000.0,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First",
-            "Last",
-            "",
-            "",
-            datetime.datetime(2000, 1, 1),
-            2000.0,
-            200,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _populate_table(async_cursor, data)
-    expected_data = [
-        tuple(None if v == "" else v for v in row) for row in data
-    ]
-    ora_df = await async_conn.fetch_df_all(QUERY_SQL)
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    fetched_data = test_env.get_data_from_df(fetched_df)
-    assert fetched_data == expected_data
-
-
-async def test_8146(async_cursor, test_env):
-    "8146 - test with unicode characters"
-    data = [
-        (
-            1,
-            "Jöhn",
-            "Döe",
-            "München",
-            "Deutschland",
-            datetime.date(1980, 5, 15),
-            5000,
-            300,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "?",
-            "?",
-            "??",
-            "??",
-            datetime.date(1990, 8, 20),
-            8000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8147(async_cursor, test_env):
-    "8147 - test with very old dates"
-    data = [
-        (
-            1,
-            "Ancient",
-            "One",
-            "Babylon",
-            "Mesopotamia",
-            datetime.date(1, 1, 1),
-            0,
-            0,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "Medieval",
-            "Person",
-            "London",
-            "England",
-            datetime.date(1200, 6, 15),
-            10,
-            50,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8148(async_cursor, test_env):
-    "8148 - test with future dates"
-    data = [
-        (
-            1,
-            "Future",
-            "Person",
-            "Mars",
-            "Solar System",
-            datetime.date(3000, 1, 1),
-            100000,
-            900,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "Distant",
-            "Future",
-            "Andromeda",
-            "Galaxy",
-            datetime.date(9999, 12, 31),
-            999999,
-            999,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8149(async_cursor, test_env):
-    "8149 - test with exactly arraysize rows"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, async_cursor.arraysize + 1)
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8150(async_cursor, test_env):
-    "8150 - test with arraysize+1 rows"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, async_cursor.arraysize + 2)
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8151(async_cursor, test_env):
-    "8151 - test with odd arraysize"
-    test_date = datetime.date(2000, 1, 1)
-    now = datetime.datetime.now()
-    data = [
-        (
-            i,
-            f"Name{i}",
-            f"Last{i}",
-            "City",
-            "Country",
-            test_date,
-            i * 100,
-            i % 800,
-            now,
-        )
-        for i in range(1, 48)
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8152(async_cursor, test_env):
-    "8152 - test with single row"
-    data = [
-        (
-            1,
-            "John",
-            "Doe",
-            "SF",
-            "USA",
-            datetime.date(1990, 1, 1),
-            5000,
-            100,
-            datetime.datetime.now(),
-        )
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8153(async_cursor, test_env):
-    "8153 - test multiple rows with NULL values in different columns"
-    now = datetime.datetime.now()
-    test_date = datetime.datetime(2000, 1, 1)
-    data = [
-        (1, None, "Last1", "City1", "Country1", None, None, 100, None),
-        (2, "First2", None, None, "Country2", test_date, 2000, None, None),
-        (3, "First3", "Last3", None, None, None, 3000, 300, now),
-        (4, None, None, None, None, None, None, None, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8154(async_cursor, test_env):
-    "8154 - test single column with all NULL values"
-    data = [
-        (
-            1,
-            None,
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            1000,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            None,
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            None,
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            3000,
-            300,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8155(async_cursor, test_env):
-    "8155 - test last column NULL in each row"
-    data = [
-        (
-            1,
-            "First1",
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            1000,
-            100,
-            None,
-        ),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            None,
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            3000,
-            300,
-            None,
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8156(async_cursor, test_env):
-    "8156 - test alternating NULL/non-NULL values in a column"
-    data = [
-        (
-            1,
-            "First1",
-            None,
-            "City1",
-            None,
-            datetime.date(2000, 1, 1),
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (2, "First2", "Last2", None, "Country2", None, 2000, None, None),
-        (
-            3,
-            "First3",
-            None,
-            "City3",
-            None,
-            datetime.date(2002, 1, 1),
-            None,
-            300,
-            datetime.datetime.now(),
-        ),
-        (4, "First4", "Last4", None, "Country4", None, 4000, None, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8157(async_cursor, test_env):
-    "8157 - test all columns NULL except one"
-    now = datetime.datetime.now()
-    test_date = datetime.date(2001, 1, 1)
-    data = [
-        (1, None, None, None, None, None, None, None, now),
-        (2, None, None, None, None, test_date, None, None, None),
-        (3, "First3", None, None, None, None, None, None, None),
-        (4, None, None, None, "Country4", None, None, None, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8158(async_cursor, test_env):
-    "8158 - test all date columns with all NULL values"
-    data = [
-        (1, "First1", "Last1", "City1", "Country1", None, 1000, 100, None),
-        (2, "First2", "Last2", "City2", "Country2", None, 2000, 200, None),
-        (3, "First3", "Last3", "City3", "Country3", None, 3000, 300, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8159(async_cursor, test_env):
-    "8159 - test NULL values in numeric columns"
-    data = [
-        (
-            1,
-            "First1",
-            "Last1",
-            "City1",
-            "Country1",
-            datetime.date(2000, 1, 1),
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            "City3",
-            "Country3",
-            datetime.date(2002, 1, 1),
-            None,
-            None,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8160(async_cursor, test_env):
-    "8160 - test multiple consecutive NULL rows"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, None, None, None, None, None, None, None, None),
-        (3, None, None, None, None, None, None, None, None),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            datetime.date(2000, 1, 1),
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8161(async_cursor, test_env):
-    "8161 - test NULL rows interspersed with data rows"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (
-            2,
-            "First2",
-            "Last2",
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            2000,
-            200,
-            datetime.datetime.now(),
-        ),
-        (3, None, None, None, None, None, None, None, None),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            datetime.date(2003, 1, 1),
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-        (5, None, None, None, None, None, None, None, None),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8162(async_cursor, test_env):
-    "8162 - test multiple NULL rows with different NULL columns"
-    data = [
-        (1, None, "Last1", "City1", "Country1", None, 1000, 100, None),
-        (
-            2,
-            "First2",
-            None,
-            "City2",
-            "Country2",
-            datetime.date(2001, 1, 1),
-            None,
-            200,
-            None,
-        ),
-        (
-            3,
-            None,
-            None,
-            "City3",
-            "Country3",
-            None,
-            None,
-            300,
-            datetime.datetime.now(),
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            None,
-            None,
-            datetime.date(2003, 1, 1),
-            4000,
-            None,
-            None,
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8163(async_cursor, test_env):
-    "8163 - test NULL rows with alternating NULL patterns"
-    data = [
-        (
-            1,
-            None,
-            "Last1",
-            None,
-            "Country1",
-            None,
-            1000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            "First2",
-            None,
-            "City2",
-            None,
-            datetime.date(2001, 1, 1),
-            None,
-            200,
-            None,
-        ),
-        (
-            3,
-            None,
-            "Last3",
-            None,
-            "Country3",
-            None,
-            3000,
-            None,
-            datetime.datetime.now(),
-        ),
-        (
-            4,
-            "First4",
-            None,
-            "City4",
-            None,
-            datetime.date(2003, 1, 1),
-            None,
-            400,
-            None,
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8164(async_cursor, test_env):
-    "8164 - test multiple NULL rows with partial NULL groups"
-    data = [
-        (
-            1,
-            None,
-            None,
-            "City1",
-            "Country1",
-            None,
-            None,
-            100,
-            datetime.datetime.now(),
-        ),
-        (
-            2,
-            None,
-            None,
-            "City2",
-            "Country2",
-            None,
-            None,
-            200,
-            datetime.datetime.now(),
-        ),
-        (
-            3,
-            "First3",
-            "Last3",
-            None,
-            None,
-            datetime.date(2002, 1, 1),
-            3000,
-            None,
-            None,
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            None,
-            None,
-            datetime.date(2003, 1, 1),
-            4000,
-            None,
-            None,
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8165(async_cursor, test_env):
-    "8165 - test multiple NULL rows with varying NULL counts"
-    data = [
-        (1, None, None, None, None, None, None, None, None),
-        (2, "First2", None, "City2", None, None, 2000, None, None),
-        (
-            3,
-            None,
-            "Last3",
-            None,
-            "Country3",
-            datetime.date(2002, 1, 1),
-            None,
-            300,
-            None,
-        ),
-        (
-            4,
-            "First4",
-            "Last4",
-            "City4",
-            "Country4",
-            None,
-            4000,
-            400,
-            datetime.datetime.now(),
-        ),
-    ]
-    await _test_df_interop(test_env, async_cursor, data)
-
-
-async def test_8166(async_conn, test_env):
-    "8166 - test fetching large integers"
-    data = (-(2**40), 2**41)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select
-            cast(:1 as number(15)),
-            cast(:2 as number(15))
-        from dual
-        """,
-        data,
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert [data] == test_env.get_data_from_df(fetched_df)
-
-
-async def test_8167(conn, test_env):
-    "8167 - test fetching NCHAR and NVARCHAR data"
-    value = "test_8167"
-    value_len = len(value)
-    ora_df = conn.fetch_df_all(
-        f"""
-        select
-            cast('{value}' as nchar({value_len})),
-            cast('{value}' as nvarchar2({value_len}))
-        from dual
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert test_env.get_data_from_df(fetched_df) == [(value, value)]
diff --git a/tests/test_8200_aq_bulk_async.py b/tests/test_8200_aq_bulk_async.py
deleted file mode 100644
index 86d6c098..00000000
--- a/tests/test_8200_aq_bulk_async.py
+++ /dev/null
@@ -1,190 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-8200 - Module for testing AQ Bulk enqueue/dequeue with asyncio
-"""
-
-import datetime
-
-import oracledb
-import pytest
-
-RAW_QUEUE_NAME = "TEST_RAW_QUEUE"
-JSON_QUEUE_NAME = "TEST_JSON_QUEUE"
-RAW_PAYLOAD_DATA = [
-    "The first message",
-    "The second message",
-    "The third message",
-    "The fourth message",
-    "The fifth message",
-    "The sixth message",
-    "The seventh message",
-    "The eighth message",
-    "The ninth message",
-    "The tenth message",
-    "The eleventh message",
-    "The twelfth and final message",
-]
-
-JSON_DATA_PAYLOAD = [
-    [
-        2.75,
-        True,
-        "Ocean Beach",
-        b"Some bytes",
-        {"keyA": 1.0, "KeyB": "Melbourne"},
-        datetime.datetime(2022, 8, 1, 0, 0),
-    ],
-    dict(name="John", age=30, city="New York"),
-]
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def queue(async_conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return await test_env.get_and_clear_queue_async(async_conn, RAW_QUEUE_NAME)
-
-
-@pytest.fixture
-async def json_queue(async_conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return await test_env.get_and_clear_queue_async(
-        async_conn, JSON_QUEUE_NAME, "JSON"
-    )
-
-
-async def _deq_in_thread(test_env, results):
-    async with test_env.get_connection_async() as conn:
-        queue = conn.queue(RAW_QUEUE_NAME)
-        queue.deqoptions.wait = 10
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        while len(results) < len(RAW_PAYLOAD_DATA):
-            messages = await queue.deqmany(5)
-            if not messages:
-                break
-            for message in messages:
-                results.append(message.payload.decode())
-        await conn.commit()
-
-
-async def test_8200(queue, async_conn):
-    "8200 - test bulk enqueue and dequeue"
-    messages = [
-        async_conn.msgproperties(payload=data) for data in RAW_PAYLOAD_DATA
-    ]
-    await queue.enqmany(messages)
-    messages = await queue.deqmany(len(RAW_PAYLOAD_DATA))
-    data = [message.payload.decode() for message in messages]
-    await async_conn.commit()
-    assert data == RAW_PAYLOAD_DATA
-
-
-async def test_8201(queue, async_conn):
-    "8201 - test empty bulk dequeue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    messages = await queue.deqmany(5)
-    await async_conn.commit()
-    assert messages == []
-
-
-async def test_8202(queue, async_conn):
-    "8202 - test enqueue and dequeue multiple times"
-    data_to_enqueue = RAW_PAYLOAD_DATA
-    for num in (2, 6, 4):
-        messages = [
-            async_conn.msgproperties(payload=data)
-            for data in data_to_enqueue[:num]
-        ]
-        data_to_enqueue = data_to_enqueue[num:]
-        await queue.enqmany(messages)
-    await async_conn.commit()
-    all_data = []
-    for num in (3, 5, 10):
-        messages = await queue.deqmany(num)
-        all_data.extend(message.payload.decode() for message in messages)
-    await async_conn.commit()
-    assert all_data == RAW_PAYLOAD_DATA
-
-
-async def test_8203(queue, async_conn, test_env):
-    "8203 - test error for messages with no payload"
-    messages = [async_conn.msgproperties() for _ in RAW_PAYLOAD_DATA]
-    with test_env.assert_raises_full_code("DPY-2000"):
-        await queue.enqmany(messages)
-
-
-async def test_8204(queue, async_conn, async_cursor):
-    "8204 - verify that the msgid property is returned correctly"
-    messages = [
-        async_conn.msgproperties(payload=data) for data in RAW_PAYLOAD_DATA
-    ]
-    await queue.enqmany(messages)
-    await async_cursor.execute("select msgid from raw_queue_tab")
-    actual_msgids = set(m for m, in await async_cursor.fetchall())
-    msgids = set(message.msgid for message in messages)
-    assert msgids == actual_msgids
-    messages = await queue.deqmany(len(RAW_PAYLOAD_DATA))
-    msgids = set(message.msgid for message in messages)
-    assert msgids == actual_msgids
-
-
-async def test_8205(json_queue, async_conn):
-    "8205 - test enqueuing and dequeuing JSON message"
-    props = [
-        async_conn.msgproperties(payload=data) for data in JSON_DATA_PAYLOAD
-    ]
-    await json_queue.enqmany(props)
-    await async_conn.commit()
-    json_queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    messages = await json_queue.deqmany(5)
-    actual_data = [message.payload for message in messages]
-    assert actual_data == JSON_DATA_PAYLOAD
-
-
-async def test_8206(json_queue, async_conn, test_env):
-    "8206 - test enqueuing to a JSON queue without a JSON payload"
-    props = async_conn.msgproperties(payload="string message")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        await json_queue.enqmany([props, props])
-
-
-async def test_8207(json_queue, async_conn):
-    "8207 - test errors for invalid values for enqmany and deqmany"
-    props = async_conn.msgproperties(payload="string message")
-    with pytest.raises(TypeError):
-        await json_queue.enqmany(props)
-    with pytest.raises(TypeError):
-        await json_queue.enqmany(["Not", "msgproperties"])
-    with pytest.raises(TypeError):
-        await json_queue.deqmany("5")
diff --git a/tests/test_8300_aq_json.py b/tests/test_8300_aq_json.py
deleted file mode 100644
index a66ec107..00000000
--- a/tests/test_8300_aq_json.py
+++ /dev/null
@@ -1,419 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-8300 - Module for testing AQ with JSON queues
-"""
-
-import datetime
-import decimal
-import threading
-
-import oracledb
-import pytest
-
-
-JSON_QUEUE_NAME = "TEST_JSON_QUEUE"
-JSON_DATA = [
-    [
-        2.75,
-        True,
-        "Ocean Beach",
-        b"Some bytes",
-        {"keyA": 1.0, "KeyB": "Melbourne"},
-        datetime.datetime(2022, 8, 1, 0, 0),
-    ],
-    [
-        True,
-        False,
-        "String",
-        b"Some Bytes",
-        {},
-        {"name": None},
-        {"name": "John"},
-        {"age": 30},
-        {"Permanent": True},
-        {
-            "employee": {
-                "name": "John",
-                "age": 30,
-                "city": "Delhi",
-                "Parmanent": True,
-            }
-        },
-        {"employees": ["John", "Matthew", "James"]},
-        {
-            "employees": [
-                {"employee1": {"name": "John", "city": "Delhi"}},
-                {"employee2": {"name": "Matthew", "city": "Mumbai"}},
-                {"employee3": {"name": "James", "city": "Bangalore"}},
-            ]
-        },
-    ],
-    [
-        datetime.datetime.today(),
-        datetime.datetime(2004, 2, 1, 3, 4, 5),
-        datetime.datetime(2020, 12, 2, 13, 29, 14),
-        datetime.timedelta(8.5),
-        datetime.datetime(2002, 12, 13, 9, 36, 0),
-        oracledb.Timestamp(2002, 12, 13, 9, 36, 0),
-        datetime.datetime(2002, 12, 13),
-    ],
-    dict(name="John", age=30, city="New York"),
-    [
-        0,
-        1,
-        25.25,
-        6088343244,
-        -9999999999999999999,
-        decimal.Decimal("0.25"),
-        decimal.Decimal("10.25"),
-        decimal.Decimal("319438950232418390.273596"),
-    ],
-]
-
-
-@pytest.fixture
-def queue(conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return test_env.get_and_clear_queue(conn, JSON_QUEUE_NAME, "JSON")
-
-
-def _deq_in_thread(test_env, results):
-    with test_env.get_connection() as conn:
-        queue = conn.queue(JSON_QUEUE_NAME, "JSON")
-        queue.deqoptions.wait = 10
-        props = queue.deqone()
-        if props is not None:
-            results.append(props.payload)
-        conn.commit()
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-def test_8300(queue):
-    "8300 - test dequeuing an empty JSON queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-
-
-def test_8301(queue, conn):
-    "8301 - test enqueuing and dequeuing multiple JSON messages"
-    props = conn.msgproperties()
-    for data in JSON_DATA:
-        props.payload = data
-        queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    conn.commit()
-    assert results == JSON_DATA
-
-
-@pytest.mark.skip("awaiting fix for bug 37746852")
-def test_8302(queue, conn):
-    "8302 - test dequeuing with DEQ_REMOVE_NODATA option"
-    data = JSON_DATA[1]
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = queue.deqone()
-    assert props is not None
-    assert props.payload is None
-
-
-def test_8303(queue):
-    "8303 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-def test_8304(queue, conn, test_env):
-    "8304 - test waiting for dequeue"
-    results = []
-    thread = threading.Thread(target=_deq_in_thread, args=(test_env, results))
-    thread.start()
-    data = JSON_DATA[0]
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-    conn.commit()
-    thread.join()
-    assert results == [data]
-
-
-def test_8305(queue):
-    "8305 - test getting/setting enqueue options attributes"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-def test_8306(conn):
-    "8306 - test getting/setting message properties attributes"
-    props = conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-
-
-def test_8307(queue, conn, test_env):
-    "8307 - test enqueue visibility options - ENQ_ON_COMMIT"
-    data = JSON_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    assert props is None
-    conn.commit()
-    props = queue.deqone()
-    assert props is not None
-
-
-def test_8308(queue, conn, test_env):
-    "8308 - test enqueue visibility option - ENQ_IMMEDIATE"
-    data = JSON_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    data = props.payload
-    results = data
-    other_conn.commit()
-    assert results == JSON_DATA[0]
-
-
-def test_8309(queue, conn, test_env):
-    "8309 - test enqueue/dequeue delivery modes identical - persistent"
-    data = JSON_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-
-    other_conn = test_env.get_connection()
-    queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-    queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = queue.deqone()
-    data = props.payload
-    results = data
-    other_conn.commit()
-    assert results == JSON_DATA[0]
-
-
-def test_8310(queue, conn, test_env):
-    "8310 - test error for message with no payload"
-    props = conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        queue.enqone(props)
-
-
-def test_8311(queue, conn, cursor):
-    "8311 - verify that the msgid property is returned correctly"
-    data = JSON_DATA[0]
-    props = conn.msgproperties(payload=data)
-    assert props.msgid is None
-    queue.enqone(props)
-    cursor.execute("select msgid from JSON_QUEUE_TAB")
-    (actual_msgid,) = cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-def test_8312(queue, conn, cursor):
-    "8312 - test message props enqtime"
-    data = JSON_DATA[0]
-    cursor.execute("select current_timestamp from dual")
-    (start_date,) = cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-    props = queue.deqone()
-    cursor.execute("select current_timestamp from dual")
-    (end_date,) = cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-def test_8313(queue, conn):
-    "8313 - test message props declared attributes"
-    data = JSON_DATA[0]
-    values = dict(
-        payload=data,
-        correlation="TEST_CORRELATION",
-        delay=0,
-        exceptionq="PYTHONTEST.TEST_EXCEPTIONQ",
-        expiration=15,
-        priority=1,
-    )
-    props = conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-    queue.enqone(props)
-    conn.commit()
-    prop = queue.deqone()
-    for attr_name in values:
-        assert getattr(prop, attr_name) == values[attr_name]
-
-
-def test_8314(queue, conn):
-    "8314 - test getting queue attributes"
-    assert queue.name == "TEST_JSON_QUEUE"
-    assert queue.connection is conn
-
-
-def test_8315(queue):
-    "8315 - test getting write-only attributes"
-    for options in (queue.enqoptions, queue.deqoptions):
-        with pytest.raises(AttributeError):
-            options.deliverymode
-
-
-def test_8316(queue, conn):
-    "8316 - test deqoption condition with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    priorities = [5, 5, 5, 5, 10, 9, 9, 10, 9]
-    for priority in priorities:
-        data = JSON_DATA[0]
-        props = conn.msgproperties(payload=data, priority=priority)
-        queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    conn.commit()
-    assert len(results) == 3
-
-
-def test_8317(queue, conn):
-    "8317 - test deqoption correlation"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    correlations = [
-        "sample",
-        "sample correlation",
-        "sample",
-        "sample",
-        "sample correlation",
-    ]
-    for correlation in correlations:
-        data = JSON_DATA[0]
-        props = conn.msgproperties(payload=data, correlation=correlation)
-        queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.correlation = "sample correlation"
-    results = []
-    while True:
-        props = queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    conn.commit()
-    assert len(results) == 2
-
-
-def test_8318(queue, conn):
-    "8318 - test deqoption msgid"
-    data = JSON_DATA[0]
-    props = conn.msgproperties(payload=data)
-    queue.enqone(props)
-    queue.enqone(props)
-    conn.commit()
-    msgid = props.msgid
-    queue.enqone(props)
-    conn.commit()
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.msgid = msgid
-    prop = queue.deqone()
-    conn.commit()
-    assert prop.msgid == msgid
-
-
-def test_8319(queue):
-    "8319 - test payload_type returns the correct value"
-    assert queue.payload_type == "JSON"
-
-
-def test_8320(queue):
-    "8320 - test deprecated attributes (enqOptions, deqOptions)"
-    assert queue.enqOptions is queue.enqoptions
-    assert queue.deqOptions is queue.deqoptions
-
-
-def test_8321(queue, conn):
-    "8321 - test deprecated AQ methods (enqOne, deqOne)"
-    data = JSON_DATA[0]
-    queue.enqOne(conn.msgproperties(payload=data))
-    props = queue.deqOne()
-    assert props.payload == data
-
-
-def test_8322(queue, conn, test_env):
-    "8322 - test wrong payload type"
-    props = conn.msgproperties(payload="A string")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        queue.enqone(props)
diff --git a/tests/test_8400_aq_dbobject_async.py b/tests/test_8400_aq_dbobject_async.py
deleted file mode 100644
index 3a280ca3..00000000
--- a/tests/test_8400_aq_dbobject_async.py
+++ /dev/null
@@ -1,445 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-8400 - Module for testing AQ with DbObject payloads with asyncio.
-"""
-
-import decimal
-
-import oracledb
-import pytest
-
-BOOK_TYPE_NAME = "UDT_BOOK"
-BOOK_QUEUE_NAME = "TEST_BOOK_QUEUE"
-BOOK_DATA = [
-    ("Wings of Fire", "A.P.J. Abdul Kalam", decimal.Decimal("15.75")),
-    ("The Story of My Life", "Hellen Keller", decimal.Decimal("10.50")),
-    ("The Chronicles of Narnia", "C.S. Lewis", decimal.Decimal("25.25")),
-]
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def queue(async_conn, test_env):
-    return await test_env.get_and_clear_queue_async(
-        async_conn, BOOK_QUEUE_NAME, BOOK_TYPE_NAME
-    )
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-async def test_8400(queue):
-    "8400 - test dequeuing an empty queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = await queue.deqone()
-    assert props is None
-
-
-async def test_8401(queue, async_conn):
-    "8401 - test enqueuing and dequeuing multiple messages"
-    props = async_conn.msgproperties()
-    for title, authors, price in BOOK_DATA:
-        props.payload = book = queue.payload_type.newobject()
-        book.TITLE = title
-        book.AUTHORS = authors
-        book.PRICE = price
-        await queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        book = props.payload
-        row = (book.TITLE, book.AUTHORS, book.PRICE)
-        results.append(row)
-    await async_conn.commit()
-    assert results == BOOK_DATA
-
-
-async def test_8402(queue, async_conn):
-    "8402 - test dequeuing with DEQ_REMOVE_NODATA option"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[1]
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = await queue.deqone()
-    assert props is not None
-    assert props.payload.TITLE is None
-
-
-async def test_8403(queue):
-    "8403 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-async def test_8404(queue):
-    "8404 - test getting/setting enqueue options attributes"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-async def test_8405(queue):
-    "8405 - test errors for invalid values for enqueue"
-    book = queue.payload_type.newobject()
-    with pytest.raises(TypeError):
-        await queue.enqone(book)
-
-
-async def test_8406(async_conn):
-    "8406 - test getting/setting message properties attributes"
-    props = async_conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-
-
-async def test_8407(queue, async_conn, test_env):
-    "8407 - test enqueue visibility option - ENQ_ON_COMMIT"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props is None
-        await async_conn.commit()
-        props = await queue.deqone()
-        await other_conn.commit()
-        assert props is not None
-
-
-async def test_8408(queue, async_conn, test_env):
-    "8408 - test enqueue visibility option - ENQ_IMMEDIATE"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        book = props.payload
-        results = (book.TITLE, book.AUTHORS, book.PRICE)
-        await other_conn.commit()
-        assert results == BOOK_DATA[0]
-
-
-async def test_8409(queue, async_conn, test_env):
-    "8409 - test enqueue/dequeue delivery modes identical - buffered"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.deliverymode = oracledb.MSG_BUFFERED
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props.deliverymode == oracledb.MSG_BUFFERED
-        book = props.payload
-        results = (book.TITLE, book.AUTHORS, book.PRICE)
-        await other_conn.commit()
-        assert results == BOOK_DATA[0]
-
-
-async def test_8410(queue, async_conn, test_env):
-    "8410 - test enqueue/dequeue delivery modes identical - persistent"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props.deliverymode == oracledb.MSG_PERSISTENT
-        book = props.payload
-        results = (book.TITLE, book.AUTHORS, book.PRICE)
-        await other_conn.commit()
-        assert results == BOOK_DATA[0]
-
-
-async def test_8411(queue, async_conn, test_env):
-    "8411 - test enqueue/dequeue delivery modes the same"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT_OR_BUFFERED
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props.deliverymode == oracledb.MSG_PERSISTENT
-        book = props.payload
-        results = (book.TITLE, book.AUTHORS, book.PRICE)
-        await other_conn.commit()
-        assert results == BOOK_DATA[0]
-
-
-async def test_8412(queue, async_conn, test_env):
-    "8412 - test enqueue/dequeue delivery modes different"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_BUFFERED
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        books_type = await other_conn.gettype(BOOK_TYPE_NAME)
-        queue = other_conn.queue(BOOK_QUEUE_NAME, books_type)
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props is None
-
-
-async def test_8413(async_conn, test_env):
-    "8413 - test error for message with no payload"
-    books_type = await async_conn.gettype(BOOK_TYPE_NAME)
-    queue = async_conn.queue(BOOK_QUEUE_NAME, books_type)
-    props = async_conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        await queue.enqone(props)
-
-
-async def test_8414(queue, async_conn, async_cursor):
-    "8414 - verify that the msgid property is returned correctly"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    props = async_conn.msgproperties(payload=book)
-    assert props.msgid is None
-    await queue.enqone(props)
-    await async_cursor.execute("select msgid from book_queue_tab")
-    (actual_msgid,) = await async_cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = await queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-async def test_8415(queue, async_conn, async_cursor):
-    "8415 - test message props enqtime"
-    book = queue.payload_type.newobject()
-    await async_cursor.execute("select current_timestamp from dual")
-    (start_date,) = await async_cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = async_conn.msgproperties(payload=book)
-    await queue.enqone(props)
-    props = await queue.deqone()
-    await async_cursor.execute("select current_timestamp from dual")
-    (end_date,) = await async_cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-async def test_8416(queue, async_conn):
-    "8416 - test message props declared attributes"
-    book = queue.payload_type.newobject()
-    values = dict(
-        payload=book,
-        correlation="TEST_CORRELATION",
-        delay=7,
-        exceptionq="TEST_EXCEPTIONQ",
-        expiration=10,
-        priority=1,
-    )
-    props = async_conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-
-
-async def test_8417(async_conn):
-    "8417 - test error for invalid type for payload_type"
-    with pytest.raises(TypeError):
-        await async_conn.queue("THE QUEUE", payload_type=4)
-
-
-async def test_8418(queue, async_conn):
-    "8418 - test getting queue attributes"
-    assert queue.name == BOOK_QUEUE_NAME
-    assert queue.connection is async_conn
-
-
-async def test_8419(queue):
-    "8419 - test getting write-only attributes"
-    with pytest.raises(AttributeError):
-        queue.enqoptions.deliverymode
-    with pytest.raises(AttributeError):
-        queue.deqoptions.deliverymode
-
-
-async def test_8420(queue, async_conn, test_env):
-    "8420 - test correlation deqoption"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    correlations = ["Math", "Programming"]
-    num_messages = 3
-    messages = [
-        async_conn.msgproperties(payload=book, correlation=c)
-        for c in correlations
-        for i in range(num_messages)
-    ]
-    await queue.enqmany(messages)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = correlations[0]
-    correlated_messages = await queue.deqmany(num_messages + 1)
-    assert len(correlated_messages) == num_messages
-
-    queue.deqoptions.correlation = correlations[1]
-    with test_env.assert_raises_full_code("ORA-25241"):
-        await queue.deqone()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    correlated_messages = await queue.deqmany(num_messages + 1)
-    assert len(correlated_messages) == num_messages
-
-
-async def test_8421(queue, async_conn):
-    "8421 - test correlation deqoption with pattern-matching characters"
-    book = queue.payload_type.newobject()
-    book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[0]
-    for correlation in ("PreCalculus-math1", "Calculus-Math2"):
-        props = async_conn.msgproperties(payload=book, correlation=correlation)
-        await queue.enqone(props)
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.correlation = "%Calculus-%ath_"
-    messages = await queue.deqmany(5)
-    assert len(messages) == 2
-
-
-async def test_8422(queue, async_conn):
-    "8422 - test condition deqoption with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-
-    priorities = [5, 10]
-    indexes = [0, 1]
-    for priority, ix in zip(priorities, indexes):
-        book = queue.payload_type.newobject()
-        book.TITLE, book.AUTHORS, book.PRICE = BOOK_DATA[ix]
-        props = async_conn.msgproperties(payload=book, priority=priority)
-        await queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    messages = await queue.deqmany(3)
-    assert len(messages) == 0
-
-    for priority, ix in zip(priorities, indexes):
-        queue.deqoptions.condition = f"priority = {priority}"
-        messages = await queue.deqmany(3)
-        assert len(messages) == 1
-        book = messages[0].payload
-        data = book.TITLE, book.AUTHORS, book.PRICE
-        assert data == BOOK_DATA[ix]
-
-
-async def test_8423(queue, async_conn):
-    "8423 - test mode deqoption with DEQ_REMOVE_NODATA"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-
-    book = queue.payload_type.newobject()
-    for data in BOOK_DATA:
-        book.TITLE, book.AUTHORS, book.PRICE = data
-        props = async_conn.msgproperties(payload=book)
-        await queue.enqone(props)
-
-    messages = await queue.deqmany(5)
-    assert len(messages) == 3
-    for message in messages:
-        assert message.payload.TITLE is None
-        assert message.payload.AUTHORS is None
-        assert message.payload.PRICE is None
-
-
-async def test_8424(async_conn):
-    "8424 - test payload_type returns the correct value"
-    books_type = await async_conn.gettype(BOOK_TYPE_NAME)
-    queue = async_conn.queue(BOOK_QUEUE_NAME, books_type)
-    assert queue.payload_type == books_type
-
-
-async def test_8425(queue, async_conn, test_env):
-    "8425 - test enqueuing to an object queue with the wrong payload"
-    props = async_conn.msgproperties(payload="A string")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        await queue.enqone(props)
diff --git a/tests/test_8500_aq_json_async.py b/tests/test_8500_aq_json_async.py
deleted file mode 100644
index 087c22bb..00000000
--- a/tests/test_8500_aq_json_async.py
+++ /dev/null
@@ -1,416 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-8500 - Module for testing AQ with JSON queues with asyncio
-"""
-
-import asyncio
-import datetime
-import decimal
-
-import oracledb
-import pytest
-
-JSON_QUEUE_NAME = "TEST_JSON_QUEUE"
-JSON_DATA = [
-    [
-        2.75,
-        True,
-        "Ocean Beach",
-        b"Some bytes",
-        {"keyA": 1.0, "KeyB": "Melbourne"},
-        datetime.datetime(2022, 8, 1, 0, 0),
-    ],
-    [
-        True,
-        False,
-        "String",
-        b"Some Bytes",
-        {},
-        {"name": None},
-        {"name": "John"},
-        {"age": 30},
-        {"Permanent": True},
-        {
-            "employee": {
-                "name": "John",
-                "age": 30,
-                "city": "Delhi",
-                "Parmanent": True,
-            }
-        },
-        {"employees": ["John", "Matthew", "James"]},
-        {
-            "employees": [
-                {"employee1": {"name": "John", "city": "Delhi"}},
-                {"employee2": {"name": "Matthew", "city": "Mumbai"}},
-                {"employee3": {"name": "James", "city": "Bangalore"}},
-            ]
-        },
-    ],
-    [
-        datetime.datetime.today(),
-        datetime.datetime(2004, 2, 1, 3, 4, 5),
-        datetime.datetime(2020, 12, 2, 13, 29, 14),
-        datetime.timedelta(8.5),
-        datetime.datetime(2002, 12, 13, 9, 36, 0),
-        oracledb.Timestamp(2002, 12, 13, 9, 36, 0),
-        datetime.datetime(2002, 12, 13),
-    ],
-    dict(name="John", age=30, city="New York"),
-    [
-        0,
-        1,
-        25.25,
-        6088343244,
-        -9999999999999999999,
-        decimal.Decimal("0.25"),
-        decimal.Decimal("10.25"),
-        decimal.Decimal("319438950232418390.273596"),
-    ],
-]
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def queue(async_conn, test_env):
-    """
-    Creates the queue used by the tests in this file.
-    """
-    return await test_env.get_and_clear_queue_async(
-        async_conn, JSON_QUEUE_NAME, "JSON"
-    )
-
-
-async def _deq_in_task(test_env, results):
-    async with test_env.get_connection_async() as conn:
-        queue = conn.queue(JSON_QUEUE_NAME, "JSON")
-        queue.deqoptions.wait = 10
-        props = await queue.deqone()
-        if props is not None:
-            results.append(props.payload)
-        await conn.commit()
-
-
-def _verify_attr(obj, attrName, value):
-    setattr(obj, attrName, value)
-    assert getattr(obj, attrName) == value
-
-
-async def test_8500(queue):
-    "8500 - test dequeuing an empty JSON queue"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    props = await queue.deqone()
-    assert props is None
-
-
-async def test_8501(queue, async_conn):
-    "8501 - test enqueuing and dequeuing multiple JSON messages"
-    props = async_conn.msgproperties()
-    for data in JSON_DATA:
-        props.payload = data
-        await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    await async_conn.commit()
-    assert results == JSON_DATA
-
-
-@pytest.mark.skip("awaiting fix for bug 37746852")
-async def test_8502(queue, async_conn):
-    "8502 - test dequeuing with DEQ_REMOVE_NODATA option"
-    data = JSON_DATA[1]
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-    queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.mode = oracledb.DEQ_REMOVE_NODATA
-    props = await queue.deqone()
-    assert props is not None
-    assert props.payload is None
-
-
-async def test_8503(queue):
-    "8503 - test getting/setting dequeue options attributes"
-    options = queue.deqoptions
-    _verify_attr(options, "condition", "TEST_CONDITION")
-    _verify_attr(options, "consumername", "TEST_CONSUMERNAME")
-    _verify_attr(options, "correlation", "TEST_CORRELATION")
-    _verify_attr(options, "mode", oracledb.DEQ_LOCKED)
-    _verify_attr(options, "navigation", oracledb.DEQ_NEXT_TRANSACTION)
-    _verify_attr(options, "transformation", "TEST_TRANSFORMATION")
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-    _verify_attr(options, "wait", 1287)
-    _verify_attr(options, "msgid", b"mID")
-
-
-async def test_8504(queue, async_conn, test_env):
-    "8504 - test waiting for dequeue"
-    results = []
-    task = asyncio.create_task(_deq_in_task(test_env, results))
-    data = JSON_DATA[0]
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-    await async_conn.commit()
-    await task
-    assert results == [data]
-
-
-async def test_8505(queue):
-    "8505 - test getting/setting enqueue options attributes"
-    options = queue.enqoptions
-    _verify_attr(options, "visibility", oracledb.ENQ_IMMEDIATE)
-
-
-async def test_8506(async_conn):
-    "8506 - test getting/setting message properties attributes"
-    props = async_conn.msgproperties()
-    _verify_attr(props, "correlation", "TEST_CORRELATION")
-    _verify_attr(props, "delay", 60)
-    _verify_attr(props, "exceptionq", "TEST_EXCEPTIONQ")
-    _verify_attr(props, "expiration", 30)
-    assert props.attempts == 0
-    _verify_attr(props, "priority", 1)
-    assert props.state == oracledb.MSG_READY
-    assert props.deliverymode == 0
-
-
-async def test_8507(queue, async_conn, test_env):
-    "8507 - test enqueue visibility options - ENQ_ON_COMMIT"
-    data = JSON_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_ON_COMMIT
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        assert props is None
-        await async_conn.commit()
-        props = await queue.deqone()
-        assert props is not None
-
-
-async def test_8508(queue, async_conn, test_env):
-    "8508 - test enqueue visibility option - ENQ_IMMEDIATE"
-    data = JSON_DATA[0]
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_ON_COMMIT
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        data = props.payload
-        results = data
-        await other_conn.commit()
-        assert results == JSON_DATA[0]
-
-
-async def test_8509(queue, async_conn, test_env):
-    "8509 - test enqueue/dequeue delivery modes identical - persistent"
-    data = JSON_DATA[0]
-    queue.enqoptions.deliverymode = oracledb.MSG_PERSISTENT
-    queue.enqoptions.visibility = oracledb.ENQ_IMMEDIATE
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-
-    async with test_env.get_connection_async() as other_conn:
-        queue = other_conn.queue(JSON_QUEUE_NAME, "JSON")
-        queue.deqoptions.deliverymode = oracledb.MSG_PERSISTENT
-        queue.deqoptions.navigation = oracledb.DEQ_FIRST_MSG
-        queue.deqoptions.visibility = oracledb.DEQ_IMMEDIATE
-        queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-        props = await queue.deqone()
-        data = props.payload
-        results = data
-        await other_conn.commit()
-        assert results == JSON_DATA[0]
-
-
-async def test_8510(queue, async_conn, test_env):
-    "8510 - test error for message with no payload"
-    props = async_conn.msgproperties()
-    with test_env.assert_raises_full_code("DPY-2000"):
-        await queue.enqone(props)
-
-
-async def test_8511(queue, async_conn, async_cursor):
-    "8511 - verify that the msgid property is returned correctly"
-    data = JSON_DATA[0]
-    props = async_conn.msgproperties(payload=data)
-    assert props.msgid is None
-    await queue.enqone(props)
-    await async_cursor.execute("select msgid from JSON_QUEUE_TAB")
-    (actual_msgid,) = await async_cursor.fetchone()
-    assert props.msgid == actual_msgid
-    props = await queue.deqone()
-    assert props.msgid == actual_msgid
-
-
-async def test_8512(queue, async_conn, async_cursor):
-    "8512 - test message props enqtime"
-    data = JSON_DATA[0]
-    await async_cursor.execute("select current_timestamp from dual")
-    (start_date,) = await async_cursor.fetchone()
-    start_date = start_date.replace(microsecond=0)
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-    props = await queue.deqone()
-    await async_cursor.execute("select current_timestamp from dual")
-    (end_date,) = await async_cursor.fetchone()
-    end_date = end_date.replace(microsecond=0)
-    assert start_date <= props.enqtime <= end_date
-
-
-async def test_8513(queue, async_conn):
-    "8513 - test message props declared attributes"
-    data = JSON_DATA[0]
-    values = dict(
-        payload=data,
-        correlation="TEST_CORRELATION",
-        delay=0,
-        exceptionq="PYTHONTEST.TEST_EXCEPTIONQ",
-        expiration=15,
-        priority=1,
-    )
-    props = async_conn.msgproperties(**values)
-    for attr_name in values:
-        assert getattr(props, attr_name) == values[attr_name]
-    await queue.enqone(props)
-    await async_conn.commit()
-    prop = await queue.deqone()
-    for attr_name in values:
-        assert getattr(prop, attr_name) == values[attr_name]
-
-
-async def test_8514(queue, async_conn):
-    "8514 - test getting queue attributes"
-    assert queue.name == "TEST_JSON_QUEUE"
-    assert queue.connection is async_conn
-
-
-async def test_8515(queue):
-    "8515 - test getting write-only attributes"
-    for options in (queue.enqoptions, queue.deqoptions):
-        with pytest.raises(AttributeError):
-            options.deliverymode
-
-
-async def test_8516(queue, async_conn):
-    "8516 - test deqoption condition with priority"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    priorities = [5, 5, 5, 5, 10, 9, 9, 10, 9]
-    for priority in priorities:
-        data = JSON_DATA[0]
-        props = async_conn.msgproperties(payload=data, priority=priority)
-        await queue.enqone(props)
-
-    queue.deqoptions.condition = "priority = 9"
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    await async_conn.commit()
-    assert len(results) == 3
-
-
-async def test_8517(queue, async_conn):
-    "8517 - test deqoption correlation"
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    correlations = [
-        "sample",
-        "sample correlation",
-        "sample",
-        "sample",
-        "sample correlation",
-    ]
-    for correlation in correlations:
-        data = JSON_DATA[0]
-        props = async_conn.msgproperties(payload=data, correlation=correlation)
-        await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.correlation = "sample correlation"
-    results = []
-    while True:
-        props = await queue.deqone()
-        if props is None:
-            break
-        results.append(props.payload)
-    await async_conn.commit()
-    assert len(results) == 2
-
-
-async def test_8518(queue, async_conn):
-    "8518 - test deqoption msgid"
-    data = JSON_DATA[0]
-    props = async_conn.msgproperties(payload=data)
-    await queue.enqone(props)
-    await queue.enqone(props)
-    await async_conn.commit()
-    msgid = props.msgid
-    await queue.enqone(props)
-    await async_conn.commit()
-    queue.deqoptions.wait = oracledb.DEQ_NO_WAIT
-    queue.deqoptions.msgid = msgid
-    prop = await queue.deqone()
-    await async_conn.commit()
-    assert prop.msgid == msgid
-
-
-async def test_8519(queue):
-    "8519 - test payload_type returns the correct value"
-    assert queue.payload_type == "JSON"
-
-
-async def test_8520(queue):
-    "8520 - test deprecated attributes (enqOptions, deqOptions)"
-    assert queue.enqOptions is queue.enqoptions
-    assert queue.deqOptions is queue.deqoptions
-
-
-async def test_8521(queue, async_conn, test_env):
-    "8521 - test wrong payload type"
-    props = async_conn.msgproperties(payload="A string")
-    with test_env.assert_raises_full_code("DPY-2062"):
-        await queue.enqone(props)
diff --git a/tests/test_8600_cursor_scrollable_async.py b/tests/test_8600_cursor_scrollable_async.py
deleted file mode 100644
index 5bd47140..00000000
--- a/tests/test_8600_cursor_scrollable_async.py
+++ /dev/null
@@ -1,278 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-8600 - Module for testing scrollable cursors with asyncio
-"""
-
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode, test_env):
-    test_env.skip_unless_server_version(12, 2)
-
-
-async def test_8600(async_conn):
-    "8600 - test creating a scrollable cursor"
-    cursor = async_conn.cursor()
-    assert not cursor.scrollable
-    cursor = async_conn.cursor(True)
-    assert cursor.scrollable
-    cursor = async_conn.cursor(scrollable=True)
-    assert cursor.scrollable
-    cursor.scrollable = False
-    assert not cursor.scrollable
-
-
-async def test_8601(async_conn, test_env):
-    "8601 - test scrolling absolute yields an exception (after result set)"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        await cursor.scroll(12, "absolute")
-
-
-async def test_8602(async_conn):
-    "8602 - test scrolling absolute (when in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    assert (
-        cursor.arraysize > 1
-    ), "array size must exceed 1 for this test to work correctly"
-    await cursor.scroll(1, mode="absolute")
-    (value,) = await cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-async def test_8603(async_conn):
-    "8603 - test scrolling absolute (when not in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.scroll(6, mode="absolute")
-    (value,) = await cursor.fetchone()
-    assert value == 7.5
-    assert cursor.rowcount == 6
-
-
-async def test_8604(async_conn):
-    "8604 - test scrolling to first row in result set (in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    await cursor.scroll(mode="first")
-    (value,) = await cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-async def test_8605(async_conn):
-    "8605 - test scrolling to first row in result set (not in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    await cursor.fetchmany()
-    await cursor.scroll(mode="first")
-    (value,) = await cursor.fetchone()
-    assert value == 1.25
-    assert cursor.rowcount == 1
-
-
-async def test_8606(async_conn):
-    "8606 - test scrolling to last row in result set"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.scroll(mode="last")
-    (value,) = await cursor.fetchone()
-    assert value == 12.5
-    assert cursor.rowcount == 10
-
-
-async def test_8607(async_conn, test_env):
-    "8607 - test scrolling relative yields an exception (after result set)"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        await cursor.scroll(15)
-
-
-async def test_8608(async_conn, test_env):
-    "8608 - test scrolling relative yields exception (before result set)"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2063"):
-        await cursor.scroll(-5)
-
-
-async def test_8609(async_conn):
-    "8609 - test scrolling relative (when in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    cursor.prefetchrows = 0
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    message = "array size must exceed 1 for this test to work correctly"
-    assert cursor.arraysize > 1, message
-    await cursor.scroll(2 - cursor.rowcount)
-    (value,) = await cursor.fetchone()
-    assert value == 2.5
-    assert cursor.rowcount == 2
-
-
-async def test_8610(async_conn):
-    "8610 - test scrolling relative (when not in buffers)"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    await cursor.fetchmany()
-    message = "array size must exceed 1 for this test to work correctly"
-    assert cursor.arraysize > 1, message
-    await cursor.scroll(3 - cursor.rowcount)
-    (value,) = await cursor.fetchone()
-    assert value == 3.75
-    assert cursor.rowcount == 3
-
-
-async def test_8611(async_conn, async_cursor, test_env):
-    "8611 - test scrolling when there are no rows"
-    await async_cursor.execute("truncate table TestTempTable")
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select * from TestTempTable")
-    await cursor.scroll(mode="last")
-    assert await cursor.fetchall() == []
-    await cursor.scroll(mode="first")
-    assert await cursor.fetchall() == []
-    with test_env.assert_raises_full_code("DPY-2063"):
-        await cursor.scroll(1, mode="absolute")
-
-
-async def test_8612(async_conn, async_cursor):
-    "8612 - test scrolling with differing array and fetch array sizes"
-    await async_cursor.execute("truncate table TestTempTable")
-    for i in range(30):
-        await async_cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, null)
-            """,
-            [i + 1],
-        )
-    for arraysize in range(1, 6):
-        cursor = async_conn.cursor(scrollable=True)
-        cursor.arraysize = arraysize
-        await cursor.execute(
-            "select IntCol from TestTempTable order by IntCol"
-        )
-        for num_rows in range(1, arraysize + 1):
-            await cursor.scroll(15, "absolute")
-            rows = await cursor.fetchmany(num_rows)
-            assert rows[0][0] == 15
-            assert cursor.rowcount == 15 + num_rows - 1
-            await cursor.scroll(9)
-            rows = await cursor.fetchmany(num_rows)
-            num_rows_fetched = len(rows)
-            assert rows[0][0] == 15 + num_rows + 8
-            assert cursor.rowcount == 15 + num_rows + num_rows_fetched + 7
-            await cursor.scroll(-12)
-            rows = await cursor.fetchmany(num_rows)
-            count = 15 + num_rows + num_rows_fetched - 5
-            assert rows[0][0] == count
-            count = 15 + num_rows + num_rows_fetched + num_rows - 6
-            assert cursor.rowcount == count
-
-
-async def test_8613(async_conn, test_env):
-    "8613 - test calling scroll() with invalid mode"
-    cursor = async_conn.cursor(scrollable=True)
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchmany()
-    with test_env.assert_raises_full_code("DPY-2009"):
-        await cursor.scroll(mode="middle")
-
-
-async def test_8614(async_conn):
-    "8614 - test scroll after fetching all rows"
-    cursor = async_conn.cursor(scrollable=True)
-    cursor.arraysize = 5
-    cursor.prefetchrows = 0
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    await cursor.fetchall()
-    await cursor.scroll(5, mode="absolute")
-    (value,) = await cursor.fetchone()
-    assert value == 6.25
-    assert cursor.rowcount == 5
-
-
-async def test_8615(async_conn):
-    "8615 - test parse() on a scrollable cursor"
-    cursor = async_conn.cursor(scrollable=True)
-    statement = """
-        select 1 from dual
-        union all
-        select 2 from dual
-        union all
-        select 3 from dual
-        union all
-        select 4 from dual
-        union all
-        select 5 from dual
-    """
-    await cursor.parse(statement)
-    await cursor.execute(statement)
-    (fetched_value,) = await cursor.fetchone()
-    assert fetched_value == 1
-    await cursor.scroll(mode="last")
-    (fetched_value,) = await cursor.fetchone()
-    assert fetched_value == 5
-
-
-async def test_8616(async_conn):
-    "8616 - test scroll operation with bind values"
-    cursor = async_conn.cursor(scrollable=True)
-    base_value = 4215
-    await cursor.execute(
-        """
-        select :base_value + 1 from dual
-        union all
-        select :base_value + 2 from dual
-        union all
-        select :base_value + 3 from dual
-        """,
-        dict(base_value=base_value),
-    )
-    await cursor.scroll(mode="last")
-    (fetched_value,) = await cursor.fetchone()
-    assert fetched_value == base_value + 3
-
-
-async def test_8617(async_conn, test_env):
-    "8717 - test calling scroll() on a non-scrollable cursor"
-    cursor = async_conn.cursor()
-    await cursor.execute("select NumberCol from TestNumbers order by IntCol")
-    with test_env.assert_raises_full_code("DPY-2068"):
-        await cursor.scroll(mode="first")
diff --git a/tests/test_8700_sessionless_transaction.py b/tests/test_8700_sessionless_transaction.py
deleted file mode 100644
index 6126d31c..00000000
--- a/tests/test_8700_sessionless_transaction.py
+++ /dev/null
@@ -1,693 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-#  test_8700_sessionless_transaction.py
-#
-# Tests for sessionless transactions using both client API and server-side
-# procedures with DBMS_TRANSACTION package.
-# -----------------------------------------------------------------------------
-
-import pytest
-
-TRANSACTION_ID_CLIENT = b"test_8700_client"
-TRANSACTION_ID_SERVER = b"test_8700_server"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_sessionless_transactions_supported):
-    pass
-
-
-def _get_server_start_stmt(mode):
-    "Generate server-side transaction start statement"
-    return f"""
-    DECLARE
-        transaction_id RAW(128);
-    BEGIN
-        transaction_id := DBMS_TRANSACTION.START_TRANSACTION(
-            :transaction_id,
-            DBMS_TRANSACTION.TRANSACTION_TYPE_SESSIONLESS,
-            :timeout,
-            DBMS_TRANSACTION.TRANSACTION_{mode}
-        );
-    END;"""
-
-
-def test_8700(cursor, test_env):
-    "8700 - test sessionless transaction using client API"
-    cursor.execute("truncate table TestTempTable")
-
-    # create sessionless transaction in one connection
-    with test_env.get_connection() as conn:
-
-        cursor = conn.cursor()
-
-        # start sessionless transaction
-        conn.begin_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=15,
-            defer_round_trip=True,
-        )
-
-        # insert data within transaction
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "row1"),
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "row2"),
-        )
-
-        # suspend the sessionless transaction
-        conn.suspend_sessionless_transaction()
-
-        # ensure data is not visible outside transaction
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == []
-
-    # resume the transaction in another connection
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-
-        conn.resume_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=5,
-            defer_round_trip=True,
-        )
-
-        # suspend using suspend_on_success flag with executemany
-        cursor.executemany(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            [(3, "row3")],
-            suspend_on_success=True,
-        )
-
-        # ensure data is not visible as the transaction is suspended
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == []
-
-        # resume the transaction and commit the changes
-        conn.resume_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT
-        )
-        conn.commit()
-
-        # verify data after commit
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert len(cursor.fetchall()) == 3
-
-
-def test_8701(conn, test_env):
-    "8701 - test sessionless transaction using server-side procedures"
-    base_cursor = conn.cursor()
-    base_cursor.execute("truncate table TestTempTable")
-
-    # create sessionless transaction in one connection
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            _get_server_start_stmt("NEW"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-
-        # insert data within transaction
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "row1"),
-        )
-
-        # Suspend on server
-        cursor.callproc("dbms_transaction.suspend_transaction")
-
-        # verify data is not visible after suspend
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == []
-
-    # resume the transaction in another connection
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            _get_server_start_stmt("RESUME"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "row2"),
-        )
-        conn.commit()
-
-    # verify data after commit in original connection
-    base_cursor.execute("SELECT IntCol, StringCol1 FROM TestTempTable")
-    assert len(base_cursor.fetchall()) == 2
-
-
-def test_8702(cursor, test_env):
-    "8702 - test error conditions with server API sessionless transactions"
-    cursor.execute("truncate table TestTempTable")
-
-    # start a transaction via the server; verify that suspension via the
-    # client fails but suspension via the server succeeds
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            _get_server_start_stmt("NEW"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "server_row"),
-        )
-        with test_env.assert_raises_full_code("DPY-3034"):
-            conn.suspend_sessionless_transaction()
-        cursor.callproc("dbms_transaction.suspend_transaction")
-
-    # resume on a second connection
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            _get_server_start_stmt("RESUME"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "server_row2"),
-        )
-
-        # resuming on a different session should fail
-        with test_env.get_connection() as other_conn:
-            other_cursor = other_conn.cursor()
-            with test_env.assert_raises_full_code("ORA-25351"):
-                other_cursor.execute(
-                    _get_server_start_stmt("RESUME"),
-                    {
-                        "transaction_id": TRANSACTION_ID_SERVER,
-                        "timeout": 2,
-                    },
-                )
-
-
-def test_8703(cursor, test_env):
-    "8703 - test rollback of sessionless transaction"
-    cursor.execute("truncate table TestTempTable")
-
-    # start and work with sessionless transaction
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.begin_sessionless_transaction(
-            transaction_id=b"rollback_test", timeout=15
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "rollback_row"),
-            suspend_on_success=True,
-        )
-
-    # resume in new connection and rollback
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(
-            transaction_id=b"rollback_test", timeout=5
-        )
-        conn.rollback()
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == []
-
-
-def test_8704(cursor, test_env):
-    "8704 - test multiple operations within same sessionless transaction"
-    cursor.execute("truncate table TestTempTable")
-
-    # start transaction and perform multiple operations
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.begin_sessionless_transaction(
-            transaction_id=b"multi_ops_test", timeout=15
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "original"),
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "second"),
-        )
-        cursor.execute(
-            """
-            update TestTempTable set StringCol1 = :v1 where IntCol = 1
-            """,
-            v1="updated",
-        )
-        cursor.execute("delete from TestTempTable where IntCol = 2")
-        conn.suspend_sessionless_transaction()
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == []
-
-    # resume and commit
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(
-            transaction_id=b"multi_ops_test", timeout=5
-        )
-        conn.commit()
-        cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert cursor.fetchall() == [(1, "updated")]
-
-
-def test_8705(cursor, test_env):
-    "8705 - test concurrent sessionless transactions"
-    cursor.execute("truncate table TestTempTable")
-
-    # start first sessionless transaction
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.begin_sessionless_transaction(
-            transaction_id=b"concurrent_1", timeout=15
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "concurrent_1"),
-            suspend_on_success=True,
-        )
-
-    # start second sessionless transaction in another connection
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.begin_sessionless_transaction(
-            transaction_id=b"concurrent_2", timeout=15
-        )
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "concurrent_2"),
-            suspend_on_success=True,
-        )
-
-    # resume and commit both transactions
-    with test_env.get_connection() as conn:
-        conn.resume_sessionless_transaction(transaction_id=b"concurrent_1")
-        conn.commit()
-        conn.resume_sessionless_transaction(transaction_id=b"concurrent_2")
-        conn.commit()
-
-    # verify data from both transactions is present
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            """
-            select IntCol, StringCol1
-            from TestTempTable
-            order by IntCol
-            """
-        )
-        expected_data = [(1, "concurrent_1"), (2, "concurrent_2")]
-        assert cursor.fetchall() == expected_data
-
-
-def test_8706(conn, cursor, test_env):
-    "8706 - test sessionless transaction with large data"
-    cursor.execute("delete from TestAllTypes")
-    conn.commit()
-
-    # start sessionless transaction and insert large data
-    large_string = "X" * 250_000
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        transaction_id = conn.begin_sessionless_transaction()
-        cursor.execute(
-            """
-            insert into TestAllTypes (IntValue, ClobValue)
-            values (:1, :2)
-            """,
-            (1, large_string),
-            suspend_on_success=True,
-        )
-
-    # resume transaction and commit
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(transaction_id)
-        conn.commit()
-        cursor.execute("select ClobValue from TestAllTypes", fetch_lobs=False)
-        (result,) = cursor.fetchone()
-        assert result == large_string
-
-
-def test_8707(conn, test_env):
-    "8707 - test sessionless transaction with multiple suspends/resumes"
-    base_cursor = conn.cursor()
-    base_cursor.execute("truncate table TestTempTable")
-
-    # define data to insert
-    data = [
-        (1, "first_insert"),
-        (2, "second_insert"),
-        (3, "third_insert"),
-    ]
-
-    # start sessionless transaction and suspend
-    transaction_id = conn.begin_sessionless_transaction()
-    base_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[0],
-        suspend_on_success=True,
-    )
-
-    # resume and insert second row
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(transaction_id)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[1],
-            suspend_on_success=True,
-        )
-
-    # resume and insert third row, then commit
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(transaction_id)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[2],
-        )
-        conn.commit()
-
-    # verify all data is present
-    base_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert base_cursor.fetchall() == data
-
-
-def test_8708(conn, cursor, test_env):
-    "8708 - Test sessionless transaction with invalid resume attempts"
-    cursor.execute("truncate table TestTempTable")
-
-    # start a sessionless transaction
-    transaction_id = conn.begin_sessionless_transaction()
-
-    # try to resume with the wrong transaction id
-    if conn.thin:
-        with test_env.assert_raises_full_code("DPY-3035"):
-            conn.resume_sessionless_transaction("wrong_id")
-
-    # try to resume before suspend
-    if conn.thin:
-        with test_env.assert_raises_full_code("DPY-3035"):
-            conn.resume_sessionless_transaction(transaction_id)
-
-    # suspend and resume correctly
-    conn.suspend_sessionless_transaction()
-    with test_env.get_connection() as other_conn:
-        other_conn.resume_sessionless_transaction(transaction_id)
-
-
-def test_8709(conn, cursor):
-    "8709 - test getting transaction ID of active sessionless transaction"
-    transaction_id = conn.begin_sessionless_transaction()
-    cursor.execute("select dbms_transaction.get_transaction_id()")
-    (server_transaction_id,) = cursor.fetchone()
-    assert server_transaction_id == transaction_id.hex().upper()
-    conn.commit()
-
-
-def test_8710(conn, test_env):
-    "8710 - test auto-generated transaction ID uniqueness"
-
-    # start first transaction
-    transaction_id_1 = conn.begin_sessionless_transaction()
-    conn.suspend_sessionless_transaction()
-
-    # start second transaction
-    with test_env.get_connection() as other_conn:
-        transaction_id_2 = other_conn.begin_sessionless_transaction()
-        other_conn.suspend_sessionless_transaction()
-        assert transaction_id_1 != transaction_id_2
-        other_conn.resume_sessionless_transaction(transaction_id_2)
-        other_conn.rollback()
-
-    # cleanup
-    conn.resume_sessionless_transaction(transaction_id_1)
-    conn.rollback()
-
-
-def test_8711(cursor, test_env):
-    "8711 - test sessionless transactions with connection pool"
-    cursor.execute("truncate table TestTempTable")
-
-    # initialization
-    data = [(1, "value 1"), (2, "value 2")]
-    pool = test_env.get_pool(min=2, max=5)
-
-    # start transaction on first connection
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        transaction_id = conn.begin_sessionless_transaction()
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[0],
-            suspend_on_success=True,
-        )
-
-    # resume on second connection
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        conn.resume_sessionless_transaction(transaction_id)
-        cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[1],
-        )
-        conn.commit()
-
-    # verify data
-    with pool.acquire() as conn:
-        cursor = conn.cursor()
-        cursor.execute(
-            """
-            select IntCol, StringCol1
-            from TestTempTable
-            order by IntCol
-            """
-        )
-        assert cursor.fetchall() == data
-
-    pool.close()
-
-
-def test_8712(conn, cursor, test_env):
-    "8712 - Test sessionless transaction with special transaction ids"
-    cursor.execute("truncate table TestTempTable")
-
-    # define data to insert
-    data = [(1, "long_transaction_id"), (2, "special_chars")]
-
-    # test with long transaction id
-    long_transaction_id = b"X" * 64
-    conn.begin_sessionless_transaction(long_transaction_id)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[0],
-        suspend_on_success=True,
-    )
-
-    # resume and commit in different connection
-    with test_env.get_connection() as other_conn:
-        other_conn.resume_sessionless_transaction(long_transaction_id)
-        other_conn.commit()
-
-    # test with special characters in transaction id
-    special_transaction_id = b"SPECIAL@#$%^&*()_+"
-    conn.begin_sessionless_transaction(special_transaction_id)
-    cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[1],
-        suspend_on_success=True,
-    )
-
-    # resume and commit in different connection
-    with test_env.get_connection() as other_conn:
-        other_conn.resume_sessionless_transaction(special_transaction_id)
-        other_conn.commit()
-
-    # verify both transactions committed
-    cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert cursor.fetchall() == data
-
-
-def test_8713(conn, test_env):
-    "8713 - duplicate transaction id across different connections"
-    transaction_id = "test_8713_transaction_id"
-    conn.begin_sessionless_transaction(transaction_id)
-    with test_env.get_connection() as conn:
-        with test_env.assert_raises_full_code("ORA-26217"):
-            conn.begin_sessionless_transaction(transaction_id)
-
-
-def test_8714(conn, test_env):
-    "8714 - zero timeout behaviour in resume"
-    transaction_id = conn.begin_sessionless_transaction()
-    with test_env.get_connection() as other_conn:
-        with test_env.assert_raises_full_code("ORA-25351"):
-            other_conn.resume_sessionless_transaction(
-                transaction_id, timeout=0
-            )
-
-    # suspend transaction on first session, and resume will now succeed
-    conn.suspend_sessionless_transaction()
-    with test_env.get_connection() as conn:
-        conn.resume_sessionless_transaction(transaction_id, timeout=0)
-        conn.rollback()
-
-
-def test_8715(conn, cursor, test_env):
-    "8715 - transaction behaviour with DDL operations"
-
-    # create temp table
-    temp_table_name = "temp_test_8715"
-    cursor.execute(f"drop table if exists {temp_table_name}")
-    cursor.execute(
-        f"""
-        create table {temp_table_name} (
-            id number,
-            data varchar2(50)
-        )"""
-    )
-
-    # beging sessionless transaction and perform DDL which performs an
-    # implicit commit
-    conn.begin_sessionless_transaction()
-    cursor.execute(f"alter table {temp_table_name} add temp_col varchar2(20)")
-
-    # further DML operations are part of a local transaction
-    local_data = (1, "LOCAL_TRANSACTION", "abc")
-    cursor.execute(
-        f"insert into {temp_table_name} values (:1, :2, :3)",
-        local_data,
-    )
-
-    # suspend will fail now as a local transaction is active and only
-    # sessionless transactions are suspendable
-    with test_env.assert_raises_full_code("DPY-3036"):
-        cursor.execute(
-            f"""
-            insert into {temp_table_name}
-            values (2, 'LOCAL_TRANSACTION', 'def')
-            """,
-            suspend_on_success=True,
-        )
-
-    # verify data from local transaction is all that is present
-    cursor.execute(f"select * from {temp_table_name}")
-    assert cursor.fetchall() == [local_data]
-
-    # drop temp table
-    cursor.execute(f"drop table {temp_table_name} purge")
-
-
-def test_8716(test_env):
-    "8716 - test suspend_on_success with batch_size < total rows inserted"
-    with test_env.get_connection() as conn:
-        cursor = conn.cursor()
-        cursor.execute("truncate table TestTempTable")
-        rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-        conn.begin_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=5,
-            defer_round_trip=True,
-        )
-        sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-        with test_env.assert_raises_full_code("DPY-3036"):
-            cursor.executemany(
-                sql, rows, batch_size=75, suspend_on_success=True
-            )
-    with test_env.get_connection() as conn:
-        conn.resume_sessionless_transaction(TRANSACTION_ID_CLIENT)
diff --git a/tests/test_8800_sessionless_transaction_async.py b/tests/test_8800_sessionless_transaction_async.py
deleted file mode 100644
index c9ee15c4..00000000
--- a/tests/test_8800_sessionless_transaction_async.py
+++ /dev/null
@@ -1,701 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-#  test_8800_sessionless_transaction_async.py
-#
-# Tests for async sessionless transactions using both client API and
-# server-side procedures with the DBMS_TRANSACTION package.
-# -----------------------------------------------------------------------------
-
-import pytest
-
-TRANSACTION_ID_CLIENT = b"test_8800_client"
-TRANSACTION_ID_SERVER = b"test_8800_server"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend,
-    skip_unless_thin_mode,
-    skip_unless_sessionless_transactions_supported,
-):
-    pass
-
-
-def _get_server_start_stmt(mode):
-    "Generate server-side transaction start statement"
-    return f"""
-    DECLARE
-        transaction_id RAW(128);
-    BEGIN
-        transaction_id := DBMS_TRANSACTION.START_TRANSACTION(
-            :transaction_id,
-            DBMS_TRANSACTION.TRANSACTION_TYPE_SESSIONLESS,
-            :timeout,
-            DBMS_TRANSACTION.TRANSACTION_{mode}
-        );
-    END;"""
-
-
-async def test_8800(async_cursor, test_env):
-    "8800 - test sessionless transaction using client API"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # create sessionless transaction in one connection
-    async with test_env.get_connection_async() as conn:
-
-        cursor = conn.cursor()
-
-        # start sessionless transaction
-        await conn.begin_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=15,
-            defer_round_trip=True,
-        )
-
-        # insert data within transaction
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "row1"),
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "row2"),
-        )
-
-        # suspend the sessionless transaction
-        await conn.suspend_sessionless_transaction()
-
-        # ensure data is not visible outside transaction
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == []
-
-    # resume the transaction in another connection
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-
-        await conn.resume_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=5,
-            defer_round_trip=True,
-        )
-
-        # suspend using suspend_on_success flag with executemany
-        await cursor.executemany(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            [(3, "row3")],
-            suspend_on_success=True,
-        )
-
-        # ensure data is not visible as the transaction is suspended
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == []
-
-        # resume the transaction and commit the changes
-        await conn.resume_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT
-        )
-        await conn.commit()
-
-        # verify data after commit
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert len(await cursor.fetchall()) == 3
-
-
-async def test_8801(async_cursor, test_env):
-    "8801 - test sessionless transaction using server-side procedures"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # create sessionless transaction in one connection
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            _get_server_start_stmt("NEW"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-
-        # insert data within transaction
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "row1"),
-        )
-
-        # Suspend on server
-        await cursor.callproc("dbms_transaction.suspend_transaction")
-
-        # verify data is not visible after suspend
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == []
-
-    # resume the transaction in another connection
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            _get_server_start_stmt("RESUME"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "row2"),
-        )
-        await conn.commit()
-
-    # verify data after commit in original connection
-    await async_cursor.execute("SELECT IntCol, StringCol1 FROM TestTempTable")
-    assert len(await async_cursor.fetchall()) == 2
-
-
-async def test_8802(async_cursor, test_env):
-    "8802 - test error conditions with server API sessionless transactions"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # start a transaction via the server; verify that suspension via the
-    # client fails but suspension via the server succeeds
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            _get_server_start_stmt("NEW"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "server_row"),
-        )
-        with test_env.assert_raises_full_code("DPY-3034"):
-            await conn.suspend_sessionless_transaction()
-        await cursor.callproc("dbms_transaction.suspend_transaction")
-
-    # resume on a second connection
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            _get_server_start_stmt("RESUME"),
-            {"transaction_id": TRANSACTION_ID_SERVER, "timeout": 5},
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "server_row2"),
-        )
-
-        # resuming on a different session should fail
-        async with test_env.get_connection_async() as other_conn:
-            other_cursor = other_conn.cursor()
-            with test_env.assert_raises_full_code("ORA-25351"):
-                await other_cursor.execute(
-                    _get_server_start_stmt("RESUME"),
-                    {
-                        "transaction_id": TRANSACTION_ID_SERVER,
-                        "timeout": 2,
-                    },
-                )
-
-
-async def test_8803(async_cursor, test_env):
-    "8803 - test rollback of sessionless transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # start and work with sessionless transaction
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.begin_sessionless_transaction(
-            transaction_id=b"rollback_test", timeout=15
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "rollback_row"),
-            suspend_on_success=True,
-        )
-
-    # resume in new connection and rollback
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(
-            transaction_id=b"rollback_test", timeout=5
-        )
-        await conn.rollback()
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == []
-
-
-async def test_8804(async_cursor, test_env):
-    "8804 - test multiple operations within same sessionless transaction"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # start transaction and perform multiple operations
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.begin_sessionless_transaction(
-            transaction_id=b"multi_ops_test", timeout=15
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "original"),
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "second"),
-        )
-        await cursor.execute(
-            """
-            update TestTempTable set StringCol1 = :v1 where IntCol = 1
-            """,
-            v1="updated",
-        )
-        await cursor.execute("delete from TestTempTable where IntCol = 2")
-        await conn.suspend_sessionless_transaction()
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == []
-
-    # resume and commit
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(
-            transaction_id=b"multi_ops_test", timeout=5
-        )
-        await conn.commit()
-        await cursor.execute("select IntCol, StringCol1 from TestTempTable")
-        assert await cursor.fetchall() == [(1, "updated")]
-
-
-async def test_8805(async_cursor, test_env):
-    "8805 - test concurrent sessionless transactions"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # start first sessionless transaction
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.begin_sessionless_transaction(
-            transaction_id=b"concurrent_1", timeout=15
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (1, "concurrent_1"),
-            suspend_on_success=True,
-        )
-
-    # start second sessionless transaction in another connection
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.begin_sessionless_transaction(
-            transaction_id=b"concurrent_2", timeout=15
-        )
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            (2, "concurrent_2"),
-            suspend_on_success=True,
-        )
-
-    # resume and commit both transactions
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(
-            transaction_id=b"concurrent_1"
-        )
-        await conn.commit()
-        await conn.resume_sessionless_transaction(
-            transaction_id=b"concurrent_2"
-        )
-        await conn.commit()
-
-    # verify data from both transactions is present
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            """
-            select IntCol, StringCol1
-            from TestTempTable
-            order by IntCol
-            """
-        )
-        expected_data = [(1, "concurrent_1"), (2, "concurrent_2")]
-        assert await cursor.fetchall() == expected_data
-
-
-async def test_8806(async_conn, async_cursor, test_env):
-    "8806 - test sessionless transaction with large data"
-    await async_cursor.execute("delete from TestAllTypes")
-    await async_conn.commit()
-
-    # start sessionless transaction and insert large data
-    large_string = "X" * 250_000
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        transaction_id = await conn.begin_sessionless_transaction()
-        await cursor.execute(
-            """
-            insert into TestAllTypes (IntValue, ClobValue)
-            values (:1, :2)
-            """,
-            (1, large_string),
-            suspend_on_success=True,
-        )
-
-    # resume transaction and commit
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(transaction_id)
-        await conn.commit()
-        await cursor.execute(
-            "select ClobValue from TestAllTypes", fetch_lobs=False
-        )
-        (result,) = await cursor.fetchone()
-        assert result == large_string
-
-
-async def test_8807(async_conn, async_cursor, test_env):
-    "8807 - test sessionless transaction with multiple suspends/resumes"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # define data to insert
-    data = [
-        (1, "first_insert"),
-        (2, "second_insert"),
-        (3, "third_insert"),
-    ]
-
-    # start sessionless transaction and suspend
-    transaction_id = await async_conn.begin_sessionless_transaction()
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[0],
-        suspend_on_success=True,
-    )
-
-    # resume and insert second row
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(transaction_id)
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[1],
-            suspend_on_success=True,
-        )
-
-    # resume and insert third row, then commit
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(transaction_id)
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[2],
-        )
-        await conn.commit()
-
-    # verify all data is present
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert await async_cursor.fetchall() == data
-
-
-async def test_8808(async_conn, async_cursor, test_env):
-    "8808 - Test sessionless transaction with invalid resume attempts"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # start a sessionless transaction
-    transaction_id = await async_conn.begin_sessionless_transaction()
-
-    # try to resume with the wrong transaction id
-    with test_env.assert_raises_full_code("DPY-3035"):
-        await async_conn.resume_sessionless_transaction("wrong_id")
-
-    # try to resume before suspend
-    with test_env.assert_raises_full_code("DPY-3035"):
-        await async_conn.resume_sessionless_transaction(transaction_id)
-
-    # suspend and resume correctly
-    await async_conn.suspend_sessionless_transaction()
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(transaction_id)
-
-
-async def test_8809(async_conn, async_cursor):
-    "8809 - test getting transaction ID of active sessionless transaction"
-    transaction_id = await async_conn.begin_sessionless_transaction()
-    await async_cursor.execute("select dbms_transaction.get_transaction_id()")
-    (server_transaction_id,) = await async_cursor.fetchone()
-    assert server_transaction_id == transaction_id.hex().upper()
-    await async_conn.commit()
-
-
-async def test_8810(async_conn, test_env):
-    "8810 - test auto-generated transaction ID uniqueness"
-
-    # start first transaction
-    transaction_id_1 = await async_conn.begin_sessionless_transaction()
-    await async_conn.suspend_sessionless_transaction()
-
-    # start second transaction
-    async with test_env.get_connection_async() as conn:
-        transaction_id_2 = await conn.begin_sessionless_transaction()
-        await conn.suspend_sessionless_transaction()
-        assert transaction_id_1 != transaction_id_2
-        await conn.resume_sessionless_transaction(transaction_id_2)
-        await conn.rollback()
-
-    # cleanup
-    await async_conn.resume_sessionless_transaction(transaction_id_1)
-    await async_conn.rollback()
-
-
-async def test_8811(async_cursor, test_env):
-    "8811 - test sessionless transactions with connection pool"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # initialization
-    data = [(1, "value 1"), (2, "value 2")]
-    pool = test_env.get_pool_async(min=2, max=5)
-
-    # start transaction on first connection
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        transaction_id = await conn.begin_sessionless_transaction()
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[0],
-            suspend_on_success=True,
-        )
-
-    # resume on second connection
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        await conn.resume_sessionless_transaction(transaction_id)
-        await cursor.execute(
-            """
-            insert into TestTempTable (IntCol, StringCol1)
-            values (:1, :2)
-            """,
-            data[1],
-        )
-        await conn.commit()
-
-    # verify data
-    async with pool.acquire() as conn:
-        cursor = conn.cursor()
-        await cursor.execute(
-            """
-            select IntCol, StringCol1
-            from TestTempTable
-            order by IntCol
-            """
-        )
-        assert await cursor.fetchall() == data
-
-    await pool.close()
-
-
-async def test_8812(async_conn, async_cursor, test_env):
-    "8812 - Test sessionless transaction with special transaction ids"
-    await async_cursor.execute("truncate table TestTempTable")
-
-    # define data to insert
-    data = [(1, "long_transaction_id"), (2, "special_chars")]
-
-    # test with long transaction id
-    long_transaction_id = b"X" * 64
-    await async_conn.begin_sessionless_transaction(long_transaction_id)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[0],
-        suspend_on_success=True,
-    )
-
-    # resume and commit in different connection
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(long_transaction_id)
-        await conn.commit()
-
-    # test with special characters in transaction id
-    special_transaction_id = b"SPECIAL@#$%^&*()_+"
-    await async_conn.begin_sessionless_transaction(special_transaction_id)
-    await async_cursor.execute(
-        """
-        insert into TestTempTable (IntCol, StringCol1)
-        values (:1, :2)
-        """,
-        data[1],
-        suspend_on_success=True,
-    )
-
-    # resume and commit in different connection
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(special_transaction_id)
-        await conn.commit()
-
-    # verify both transactions committed
-    await async_cursor.execute(
-        """
-        select IntCol, StringCol1
-        from TestTempTable
-        order by IntCol
-        """
-    )
-    assert await async_cursor.fetchall() == data
-
-
-async def test_8813(async_conn, test_env):
-    "8813 - duplicate transaction id across different connections"
-    transaction_id = "test_8813_transaction_id"
-    await async_conn.begin_sessionless_transaction(transaction_id)
-    async with test_env.get_connection_async() as conn:
-        with test_env.assert_raises_full_code("ORA-26217"):
-            await conn.begin_sessionless_transaction(transaction_id)
-
-
-async def test_8814(async_conn, test_env):
-    "8814 - zero timeout behaviour in resume"
-    transaction_id = await async_conn.begin_sessionless_transaction()
-    async with test_env.get_connection_async() as conn:
-        with test_env.assert_raises_full_code("ORA-25351"):
-            await conn.resume_sessionless_transaction(
-                transaction_id, timeout=0
-            )
-
-    # suspend transaction on first session, and resume will now succeed
-    await async_conn.suspend_sessionless_transaction()
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(transaction_id, timeout=0)
-        await conn.rollback()
-
-
-async def test_8815(async_conn, async_cursor, test_env):
-    "8815 - transaction behaviour with DDL operations"
-
-    # create temp table
-    temp_table_name = "temp_test_8815"
-    await async_cursor.execute(f"drop table if exists {temp_table_name}")
-    await async_cursor.execute(
-        f"""
-        create table {temp_table_name} (
-            id number,
-            data varchar2(50)
-        )"""
-    )
-
-    # beging sessionless transaction and perform DDL which performs an
-    # implicit commit
-    await async_conn.begin_sessionless_transaction()
-    await async_cursor.execute(
-        f"alter table {temp_table_name} add temp_col varchar2(20)"
-    )
-
-    # further DML operations are part of a local transaction
-    local_data = (1, "LOCAL_TRANSACTION", "abc")
-    await async_cursor.execute(
-        f"insert into {temp_table_name} values (:1, :2, :3)",
-        local_data,
-    )
-
-    # suspend will fail now as a local transaction is active and only
-    # sessionless transactions are suspendable
-    with test_env.assert_raises_full_code("DPY-3036"):
-        await async_cursor.execute(
-            f"""
-            insert into {temp_table_name}
-            values (2, 'LOCAL_TRANSACTION', 'def')
-            """,
-            suspend_on_success=True,
-        )
-
-    # verify data from local transaction is all that is present
-    await async_cursor.execute(f"select * from {temp_table_name}")
-    assert await async_cursor.fetchall() == [local_data]
-
-    # drop temp table
-    await async_cursor.execute(f"drop table {temp_table_name} purge")
-
-
-async def test_8816(test_env):
-    "8816 - test suspend_on_success with batch_size < total rows inserted"
-    async with test_env.get_connection_async() as conn:
-        cursor = conn.cursor()
-        await cursor.execute("truncate table TestTempTable")
-        rows = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-        await conn.begin_sessionless_transaction(
-            transaction_id=TRANSACTION_ID_CLIENT,
-            timeout=5,
-            defer_round_trip=True,
-        )
-        sql = "insert into TestTempTable (IntCol, StringCol1) values (:1, :2)"
-        with test_env.assert_raises_full_code("DPY-3036"):
-            await cursor.executemany(
-                sql, rows, batch_size=75, suspend_on_success=True
-            )
-    async with test_env.get_connection_async() as conn:
-        await conn.resume_sessionless_transaction(TRANSACTION_ID_CLIENT)
diff --git a/tests/test_8900_dataframe_ingestion.py b/tests/test_8900_dataframe_ingestion.py
deleted file mode 100644
index eccce667..00000000
--- a/tests/test_8900_dataframe_ingestion.py
+++ /dev/null
@@ -1,1003 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing DataFrame ingestion
-"""
-
-import datetime
-import decimal
-
-import pyarrow
-import pytest
-
-SPARSE_VECTOR_FIELDS_FLOAT32 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.float32())),
-]
-
-SPARSE_VECTOR_FIELDS_FLOAT64 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.float64())),
-]
-
-SPARSE_VECTOR_FIELDS_INT8 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.int8())),
-]
-
-
-@pytest.fixture
-def empty_tab(cursor):
-    cursor.execute("delete from TestDataFrame")
-
-
-def test_8900(conn, cursor, empty_tab):
-    "8900 - test basic ingestion of data frame"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-        pyarrow.array([1000.50, 2000.75, 3000.25], pyarrow.float64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1),
-                datetime.datetime(2021, 2, 2),
-                datetime.datetime(2022, 3, 3),
-            ],
-            pyarrow.timestamp("s"),
-        ),
-    ]
-    names = ["Id", "FirstName", "Salary", "DateOfBirth"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, FirstName, Salary, DateOfBirth)
-        values (:1, :2, :3, :4)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary",
-            DateOfBirth as "DateOfBirth"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8901(conn, cursor, empty_tab):
-    "8901 - test ingestion with null values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", None, "Bob"], pyarrow.large_string()),
-        pyarrow.array([None, 2000.75, 3000.25], pyarrow.float64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1),
-                None,
-                datetime.datetime(2022, 3, 3),
-            ],
-            pyarrow.timestamp("s"),
-        ),
-    ]
-    names = ["Id", "FirstName", "Salary", "DateOfBirth"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, FirstName, Salary, DateOfBirth)
-        values (:1, :2, :3, :4)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary",
-            DateOfBirth as "DateOfBirth"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8902(conn, cursor, empty_tab):
-    "8902 - test ingestion with single column"
-    arrays = [pyarrow.array([1, 2, 3], pyarrow.int64())]
-    names = ["Id"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany("insert into TestDataFrame (Id) values (:1)", df)
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select Id as "Id"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8903(conn, cursor, empty_tab):
-    "8903 - test ingestion with large data types"
-    long_str = "X" * 32_768
-    long_raw = b"Y" * 32_768
-    arrays = [
-        pyarrow.array([1], pyarrow.int64()),
-        pyarrow.array([long_str], pyarrow.large_string()),
-        pyarrow.array([long_raw], pyarrow.large_binary()),
-    ]
-    names = ["Id", "LongData", "LongRawData"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LongData as "LongData",
-            LongRawData as "LongRawData"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8904(conn, cursor, empty_tab):
-    "8904 - test ingestion with decimal values"
-    arrays = [
-        pyarrow.array(
-            [
-                decimal.Decimal("1"),
-                decimal.Decimal("2"),
-                decimal.Decimal("3"),
-            ],
-            pyarrow.decimal128(9, 0),
-        ),
-        pyarrow.array(
-            [
-                decimal.Decimal("1234567890.1234"),
-                decimal.Decimal("-9876543210.9876"),
-                decimal.Decimal("0.0001"),
-            ],
-            pyarrow.decimal128(15, 4),
-        ),
-    ]
-    names = ["Id", "DecimalData"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, DecimalData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            DecimalData as "DecimalData"
-        from TestDataFrame
-        order by Id
-        """,
-        fetch_decimals=True,
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8905(skip_unless_native_boolean_supported, conn, cursor):
-    "8905 - test ingestion with boolean values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array([True, False, True], pyarrow.bool_()),
-        pyarrow.array([False, True, None], pyarrow.bool_()),
-    ]
-    names = ["IntCol", "BooleanCol1", "BooleanCol2"]
-    df = pyarrow.table(arrays, names)
-    cursor.execute("truncate table TestBooleans")
-    cursor.executemany(
-        """
-        insert into TestBooleans
-        (IntCol, BooleanCol1, BooleanCol2)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            IntCol as "IntCol",
-            BooleanCol1 as "BooleanCol1",
-            BooleanCol2 as "BooleanCol2"
-        from TestBooleans
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8906(conn, cursor, empty_tab):
-    "8906 - test ingestion with timestamp values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1, 0, 0, 0),
-                datetime.datetime(2021, 2, 2, 12, 34, 56),
-                datetime.datetime(2022, 3, 3, 23, 59, 59),
-            ],
-            pyarrow.timestamp("us"),
-        ),
-    ]
-    names = ["Id", "LastUpdated"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, LastUpdated)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LastUpdated as "LastUpdated"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8907(cursor, test_env):
-    "8907 - test ingestion with mismatched column count"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-    ]
-    names = ["ID", "NAME"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-4009", "ORA-01008"):
-        cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName, Salary)
-            values (:1, :2, :3)
-            """,
-            df,
-        )
-
-
-def test_8908(cursor, test_env):
-    "8908 - test ingestion with invalid data type"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [["a", "b"], ["c"], ["d", "e", "f"]],
-            pyarrow.list_(pyarrow.large_string()),
-        ),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-3033"):
-        cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName)
-            values (:1, :2)
-            """,
-            df,
-        )
-
-
-def test_8909(cursor, test_env):
-    "8909 - test execute() with DataFrame"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Sue"], pyarrow.large_string()),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-2003"):
-        cursor.execute(
-            """
-            insert into TestDataFrame (Id, FirstName)
-            values (:1, :2)
-            """,
-            df,
-        )
-
-
-def test_8910(conn, cursor):
-    "8910 - test consecutive executemany() calls with same dataframe"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-        pyarrow.array([1000.50, 2000.75, 3000.25], pyarrow.float64()),
-    ]
-    names = ["Id", "FirstName", "Salary"]
-    df = pyarrow.table(arrays, names)
-    for i in range(3):
-        cursor.execute("delete from TestDataFrame")
-        cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName, Salary)
-            values (:1, :2, :3)
-            """,
-            df,
-        )
-        conn.commit()
-        odf = conn.fetch_df_all(
-            """
-            select
-                Id as "Id",
-                FirstName as "FirstName",
-                Salary as "Salary"
-            from TestDataFrame
-            order by Id
-            """
-        )
-        fetched_df = pyarrow.table(odf)
-        assert fetched_df.equals(df)
-
-
-def test_8911(conn, cursor, empty_tab):
-    "8911 - test nulls/None for all datatypes"
-    arrays = [
-        pyarrow.array([1], pyarrow.int64()),
-        pyarrow.array([None], pyarrow.float32()),
-        pyarrow.array([None], pyarrow.float64()),
-        pyarrow.array([None], pyarrow.large_string()),
-        pyarrow.array([None], pyarrow.timestamp("s")),
-        pyarrow.array([None], pyarrow.large_binary()),
-    ]
-    names = [
-        "Id",
-        "FloatData",
-        "DoubleData",
-        "FirstName",
-        "DateOfBirth",
-        "RawData",
-    ]
-    df = pyarrow.table(arrays, names)
-    bind_names = ",".join(names)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(names)))
-    cursor.executemany(
-        f"""
-        insert into TestDataFrame ({bind_names})
-        values ({bind_values})
-        """,
-        df,
-    )
-    conn.commit()
-    query_values = ",".join(f'{name} as "{name}"' for name in names)
-    odf = conn.fetch_df_all(
-        f"""
-        select {query_values}
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8912(conn, cursor, empty_tab):
-    "8912 - test LOB sizes around 32K boundary using DataFrame ingestion"
-    test_sizes = [32766, 32767, 32768, 32769, 32770]
-    arrays = [
-        pyarrow.array(range(1, len(test_sizes) + 1), pyarrow.int64()),
-        pyarrow.array(["X" * s for s in test_sizes], pyarrow.large_string()),
-        pyarrow.array([b"Y" * s for s in test_sizes], pyarrow.large_binary()),
-    ]
-    names = ["Id", "LongData", "LongRawData"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LongData as "LongData",
-            LongRawData as "LongRawData"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8913(conn, cursor, empty_tab, test_env):
-    "8913 - test ingestion with mixed characters using DataFrame"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-
-    test_data = [
-        "ASCII: Hello World",  # Pure ASCII
-        "Latin: café España",  # Latin-1 Supplement
-        "Cyrillic: русский текст",  # Actual Cyrillic
-        "Chinese: 中文测试",  # Actual Chinese
-        "Emoji: 👍😊❤️",  # Emojis
-        "Special: ~!@#$%^&*()_+{}|:\"<>?`-=[]\\;',./",  # ASCII symbols
-        "Mixed: 你好, world! café? 123@# русский 👍",  # Mixed characters
-    ]
-    arrays = [
-        pyarrow.array(range(1, len(test_data) + 1), pyarrow.int64()),
-        pyarrow.array(test_data, pyarrow.large_string()),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, FirstName)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8914(conn, cursor, empty_tab):
-    "8914 - test various numeric values"
-    test_data = [
-        decimal.Decimal(0),
-        decimal.Decimal(1),
-        decimal.Decimal(-1),
-        decimal.Decimal("99999999999.9999"),
-        decimal.Decimal("-99999999999.9999"),
-        decimal.Decimal("10000000000.0001"),
-        decimal.Decimal("-10000000000.0001"),
-        decimal.Decimal(".0001"),
-        decimal.Decimal("-.0001"),
-        decimal.Decimal(".9"),
-        decimal.Decimal("-.9"),
-        decimal.Decimal(".09"),
-        decimal.Decimal("-.09"),
-        decimal.Decimal(".009"),
-        decimal.Decimal("-.009"),
-    ]
-    ids = [decimal.Decimal(i) for i in range(len(test_data))]
-    arrays = [
-        pyarrow.array(ids, pyarrow.decimal128(9, 0)),
-        pyarrow.array(test_data, pyarrow.decimal128(15, 4)),
-    ]
-    names = ["Id", "DecimalData"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, DecimalData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            DecimalData as "DecimalData"
-        from TestDataFrame
-        order by Id
-        """,
-        fetch_decimals=True,
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8915(conn, cursor, empty_tab):
-    "8915 - test various timestamp values"
-    test_data = [
-        datetime.datetime(2056, 2, 29),
-        datetime.datetime(2020, 2, 29),
-        datetime.datetime(1900, 1, 1),
-        datetime.datetime(2000, 1, 1),
-        datetime.datetime(1970, 1, 1),
-        datetime.datetime(2020, 2, 29, 23, 59, 59, 123456),
-        datetime.datetime(2023, 12, 31, 23, 59, 59, 567890),
-        datetime.datetime(2024, 1, 1, 0, 0, 0, 789012),
-    ]
-    ids = list(range(len(test_data)))
-    arrays = [
-        pyarrow.array(ids, pyarrow.int64()),
-        pyarrow.array(test_data, pyarrow.timestamp("us")),
-    ]
-    names = ["Id", "LastUpdated"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LastUpdated)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LastUpdated as "LastUpdated"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8916(conn, cursor, empty_tab):
-    "8916 - test insertion with large data volumes"
-    num_rows = 10_000
-    ids = list(range(1, num_rows + 1))
-    names = [f"Employee-{i}" for i in ids]
-    salaries = [i * 100.25 for i in ids]
-    arrays = [
-        pyarrow.array(ids, pyarrow.int64()),
-        pyarrow.array(names, pyarrow.large_string()),
-        pyarrow.array(salaries, pyarrow.float64()),
-    ]
-    names = ["Id", "FirstName", "Salary"]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, FirstName, Salary)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    conn.commit()
-    odf = conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8917(skip_unless_sparse_vectors_supported, conn, cursor):
-    "8917 - test ingestion of sparse vectors"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                None,
-                dict(num_dimensions=16, indices=[1, 3], values=[1, -1]),
-                dict(num_dimensions=16, indices=[5, 10], values=[2, -2]),
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_INT8),
-        ),
-        pyarrow.array(
-            [
-                dict(num_dimensions=16, indices=[1, 3], values=[1.1, -1.1]),
-                None,
-                dict(num_dimensions=16, indices=[5, 10], values=[2.2, -2.2]),
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_FLOAT32),
-        ),
-        pyarrow.array(
-            [
-                dict(num_dimensions=16, indices=[1, 3], values=[1.25, -1.25]),
-                dict(num_dimensions=16, indices=[5, 10], values=[2.5, -2.5]),
-                None,
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_FLOAT64),
-        ),
-    ]
-    names = [
-        "IntCol",
-        "SparseVector8Col",
-        "SparseVector32Col",
-        "SparseVector64Col",
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor.execute("delete from TestSparseVectors")
-    column_names = ",".join(names)
-    bind_names = ",".join(f":{i + 1}" for i in range(len(names)))
-    cursor.executemany(
-        f"""
-        insert into TestSparseVectors ({column_names})
-        values ({bind_names})
-        """,
-        df,
-    )
-    conn.commit()
-    query_names = ",".join(f'{name} as "{name}"' for name in names)
-    odf = conn.fetch_df_all(
-        f"""
-        select {query_names}
-        from TestSparseVectors
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-def test_8918(skip_unless_vectors_supported, conn, cursor):
-    "8918 - test ingestion of dense vectors"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -127,
-                    -100,
-                    -5,
-                    -1,
-                    0,
-                    0,
-                    0,
-                    0,
-                    1,
-                    5,
-                    7,
-                    25,
-                    13,
-                    0,
-                    10,
-                    127,
-                ],
-                [
-                    -25,
-                    25,
-                    -15,
-                    15,
-                    -5,
-                    5,
-                    0,
-                    0,
-                    -127,
-                    127,
-                    -25,
-                    25,
-                    -105,
-                    105,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.int8()),
-        ),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -12.5,
-                    -578.625,
-                    -100.25,
-                    -87.5,
-                    0,
-                    25,
-                    0,
-                    0,
-                    1,
-                    1.25,
-                    1.75,
-                    2.5,
-                    1.75,
-                    0,
-                    5889.125,
-                    6500.375,
-                ],
-                [
-                    -25.5,
-                    25.5,
-                    -15.25,
-                    15.25,
-                    -5.3,
-                    5.3,
-                    0,
-                    0,
-                    -127.8,
-                    127.8,
-                    -15.222,
-                    15.222,
-                    -105.333,
-                    105.333,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.float32()),
-        ),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -22.5,
-                    -278.625,
-                    -200.25,
-                    -77.5,
-                    0,
-                    35,
-                    0,
-                    0,
-                    1,
-                    8.25,
-                    9.75,
-                    3.5,
-                    4.75,
-                    0,
-                    6889.125,
-                    7500.375,
-                ],
-                [
-                    -35.5,
-                    35.5,
-                    -25.25,
-                    25.25,
-                    -8.3,
-                    8.3,
-                    0,
-                    0,
-                    -227.8,
-                    227.8,
-                    -215.222,
-                    415.222,
-                    -505.333,
-                    605.333,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.float64()),
-        ),
-    ]
-    names = [
-        "IntCol",
-        "Vector8Col",
-        "Vector32Col",
-        "Vector64Col",
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor.execute("delete from TestVectors")
-    column_names = ",".join(names)
-    bind_names = ",".join(f":{i + 1}" for i in range(len(names)))
-    cursor.executemany(
-        f"""
-        insert into TestVectors ({column_names})
-        values ({bind_names})
-        """,
-        df,
-    )
-    conn.commit()
-    query_names = ",".join(f'{name} as "{name}"' for name in names)
-    odf = conn.fetch_df_all(
-        f"""
-        select {query_names}
-        from TestVectors
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-@pytest.mark.parametrize(
-    "values, dtype",
-    [
-        ([-(2**7), 0, 2**7 - 1], pyarrow.int8()),
-        ([-(2**15), 0, 2**15 - 1], pyarrow.int16()),
-        ([-(2**31), 0, 2**31 - 1], pyarrow.int32()),
-        ([-(2**63), 0, 2**63 - 1], pyarrow.int64()),
-        ([0, 2**7, 2**8 - 1], pyarrow.uint8()),
-        ([0, 2**15, 2**16 - 1], pyarrow.uint16()),
-        ([0, 2**31, 2**32 - 1], pyarrow.uint32()),
-        ([0, 2**63, 2**64 - 1], pyarrow.uint64()),
-    ],
-)
-def test_8919(values, dtype, conn, cursor, empty_tab):
-    "8919 - test ingestion with various integer data types"
-    names = ["Id", "LongIntegerData"]
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int8()),
-        pyarrow.array(values, dtype),
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongIntegerData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    cursor.execute(
-        """
-        select to_char(LongIntegerData)
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_values = [int(s) for s, in cursor]
-    assert fetched_values == values
-
-
-@pytest.mark.parametrize(
-    "values, dtype",
-    [
-        (
-            [
-                datetime.datetime(1915, 9, 11),
-                None,
-                datetime.datetime(2045, 2, 28),
-            ],
-            pyarrow.date32(),
-        ),
-        (
-            [
-                datetime.datetime(1905, 3, 30),
-                None,
-                datetime.datetime(2060, 10, 5),
-            ],
-            pyarrow.date64(),
-        ),
-    ],
-)
-def test_8920(values, dtype, conn, cursor, empty_tab):
-    "8920 - test ingestion with alternative date types"
-    names = ["Id", "DateOfBirth"]
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int8()),
-        pyarrow.array(values, dtype),
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        """
-        insert into TestDataFrame (Id, DateOfBirth)
-        values (:1, :2)
-        """,
-        df,
-    )
-    conn.commit()
-    cursor.execute(
-        """
-        select DateOfBirth
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_values = [d for d, in cursor]
-    assert fetched_values == values
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-def test_8921(batch_size, conn, cursor, empty_tab, round_trip_checker):
-    "8921 - test ingestion with various batch sizes"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    arrays = [
-        pyarrow.array([i for i, _ in rows], pyarrow.int16()),
-        pyarrow.array([s for _, s in rows], pyarrow.large_string()),
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor.executemany(
-        "insert into TestDataFrame (Id, FirstName) values (:1, :2)",
-        df,
-        batch_size=batch_size,
-    )
-    expected_round_trips = len(rows) // batch_size
-    if len(rows) % batch_size:
-        expected_round_trips += 1
-    assert round_trip_checker.get_value() == expected_round_trips
-    conn.commit()
-    cursor.execute("select Id, FirstName from TestDataFrame order by Id")
-    assert cursor.fetchall() == rows
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-def test_8922(batch_size, conn, cursor, empty_tab, round_trip_checker):
-    "8922 - test ingestion of multi chunk data frames with various batch sizes"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    int_arrays = [
-        pyarrow.array([i for i, _ in rows[:25]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[25:59]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[59:75]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[75:190]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[190:]], pyarrow.int16()),
-    ]
-    str_arrays = [
-        pyarrow.array([s for _, s in rows[:25]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[25:59]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[59:75]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[75:190]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[190:]], pyarrow.large_string()),
-    ]
-    chunked_arrays = [
-        pyarrow.chunked_array(int_arrays),
-        pyarrow.chunked_array(str_arrays),
-    ]
-    df = pyarrow.table(chunked_arrays, names)
-    cursor.executemany(
-        "insert into TestDataFrame (Id, FirstName) values (:1, :2)",
-        df,
-        batch_size=batch_size,
-    )
-    num_round_trips = 0
-    for array in int_arrays:
-        num_round_trips += len(array) // batch_size
-        if len(array) % batch_size:
-            num_round_trips += 1
-    assert round_trip_checker.get_value() == num_round_trips
-    conn.commit()
-    cursor.execute("select Id, FirstName from TestDataFrame order by Id")
-    assert cursor.fetchall() == rows
diff --git a/tests/test_9000_dataframe_ingestion_async.py b/tests/test_9000_dataframe_ingestion_async.py
deleted file mode 100644
index 43d4277b..00000000
--- a/tests/test_9000_dataframe_ingestion_async.py
+++ /dev/null
@@ -1,1021 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing DataFrame ingestion with asyncio
-"""
-
-import pytest
-import datetime
-import decimal
-
-import pyarrow
-
-SPARSE_VECTOR_FIELDS_FLOAT32 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.float32())),
-]
-
-SPARSE_VECTOR_FIELDS_FLOAT64 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.float64())),
-]
-
-SPARSE_VECTOR_FIELDS_INT8 = [
-    ("num_dimensions", pyarrow.int64()),
-    ("indices", pyarrow.list_(pyarrow.uint32())),
-    ("values", pyarrow.list_(pyarrow.int8())),
-]
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def empty_tab(async_cursor):
-    await async_cursor.execute("delete from TestDataFrame")
-
-
-async def test_9000(async_conn, async_cursor, empty_tab):
-    "9000 - test basic ingestion of data frame"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-        pyarrow.array([1000.50, 2000.75, 3000.25], pyarrow.float64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1),
-                datetime.datetime(2021, 2, 2),
-                datetime.datetime(2022, 3, 3),
-            ],
-            pyarrow.timestamp("s"),
-        ),
-    ]
-    names = ["Id", "FirstName", "Salary", "DateOfBirth"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, FirstName, Salary, DateOfBirth)
-        values (:1, :2, :3, :4)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary",
-            DateOfBirth as "DateOfBirth"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9001(async_conn, async_cursor, empty_tab):
-    "9001 - test ingestion with null values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", None, "Bob"], pyarrow.large_string()),
-        pyarrow.array([None, 2000.75, 3000.25], pyarrow.float64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1),
-                None,
-                datetime.datetime(2022, 3, 3),
-            ],
-            pyarrow.timestamp("s"),
-        ),
-    ]
-    names = ["Id", "FirstName", "Salary", "DateOfBirth"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, FirstName, Salary, DateOfBirth)
-        values (:1, :2, :3, :4)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary",
-            DateOfBirth as "DateOfBirth"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9002(async_conn, async_cursor, empty_tab):
-    "9002 - test ingestion with single column"
-    arrays = [pyarrow.array([1, 2, 3], pyarrow.int64())]
-    names = ["Id"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        "insert into TestDataFrame (Id) values (:1)", df
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select Id as "Id"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9003(async_conn, async_cursor, empty_tab):
-    "9003 - test ingestion with large data types"
-    long_str = "X" * 32_768
-    long_raw = b"Y" * 32_768
-    arrays = [
-        pyarrow.array([1], pyarrow.int64()),
-        pyarrow.array([long_str], pyarrow.large_string()),
-        pyarrow.array([long_raw], pyarrow.large_binary()),
-    ]
-    names = ["Id", "LongData", "LongRawData"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LongData as "LongData",
-            LongRawData as "LongRawData"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9004(async_conn, async_cursor, empty_tab):
-    "9004 - test ingestion with decimal values"
-    arrays = [
-        pyarrow.array(
-            [
-                decimal.Decimal("1"),
-                decimal.Decimal("2"),
-                decimal.Decimal("3"),
-            ],
-            pyarrow.decimal128(9, 0),
-        ),
-        pyarrow.array(
-            [
-                decimal.Decimal("1234567890.1234"),
-                decimal.Decimal("-9876543210.9876"),
-                decimal.Decimal("0.0001"),
-            ],
-            pyarrow.decimal128(15, 4),
-        ),
-    ]
-    names = ["Id", "DecimalData"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, DecimalData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            DecimalData as "DecimalData"
-        from TestDataFrame
-        order by Id
-        """,
-        fetch_decimals=True,
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9005(skip_unless_native_boolean_supported, async_conn):
-    "9005 - test ingestion with boolean values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array([True, False, True], pyarrow.bool_()),
-        pyarrow.array([False, True, None], pyarrow.bool_()),
-    ]
-    names = ["IntCol", "BooleanCol1", "BooleanCol2"]
-    cursor = async_conn.cursor()
-    df = pyarrow.table(arrays, names)
-    await cursor.execute("truncate table TestBooleans")
-    await cursor.executemany(
-        """
-        insert into TestBooleans
-        (IntCol, BooleanCol1, BooleanCol2)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            IntCol as "IntCol",
-            BooleanCol1 as "BooleanCol1",
-            BooleanCol2 as "BooleanCol2"
-        from TestBooleans
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9006(async_conn, async_cursor, empty_tab):
-    "9006 - test ingestion with timestamp values"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                datetime.datetime(2020, 1, 1, 0, 0, 0),
-                datetime.datetime(2021, 2, 2, 12, 34, 56),
-                datetime.datetime(2022, 3, 3, 23, 59, 59),
-            ],
-            pyarrow.timestamp("us"),
-        ),
-    ]
-    names = ["Id", "LastUpdated"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame
-        (Id, LastUpdated)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LastUpdated as "LastUpdated"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9007(async_cursor, test_env):
-    "9007 - test ingestion with mismatched column count"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-    ]
-    names = ["ID", "NAME"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-4009", "ORA-01008"):
-        await async_cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName, Salary)
-            values (:1, :2, :3)
-            """,
-            df,
-        )
-
-
-async def test_9008(async_cursor, test_env):
-    "9008 - test ingestion with invalid data type"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [["a", "b"], ["c"], ["d", "e", "f"]],
-            pyarrow.list_(pyarrow.large_string()),
-        ),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-3033"):
-        await async_cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName)
-            values (:1, :2)
-            """,
-            df,
-        )
-
-
-async def test_9009(async_cursor, test_env):
-    "9009 - test execute() with DataFrame"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Sue"], pyarrow.large_string()),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    with test_env.assert_raises_full_code("DPY-2003"):
-        await async_cursor.execute(
-            """
-            insert into TestDataFrame (Id, FirstName)
-            values (:1, :2)
-            """,
-            df,
-        )
-
-
-async def test_9010(async_conn, async_cursor):
-    "9010 - test consecutive executemany() calls with same dataframe"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(["John", "Jane", "Bob"], pyarrow.large_string()),
-        pyarrow.array([1000.50, 2000.75, 3000.25], pyarrow.float64()),
-    ]
-    names = ["Id", "FirstName", "Salary"]
-    df = pyarrow.table(arrays, names)
-    for i in range(3):
-        await async_cursor.execute("delete from TestDataFrame")
-        await async_cursor.executemany(
-            """
-            insert into TestDataFrame (Id, FirstName, Salary)
-            values (:1, :2, :3)
-            """,
-            df,
-        )
-        await async_conn.commit()
-        odf = await async_conn.fetch_df_all(
-            """
-            select
-                Id as "Id",
-                FirstName as "FirstName",
-                Salary as "Salary"
-            from TestDataFrame
-            order by Id
-            """
-        )
-        fetched_df = pyarrow.table(odf)
-        assert fetched_df.equals(df)
-
-
-async def test_9011(async_conn, async_cursor, empty_tab):
-    "9011 - test nulls/None for all datatypes"
-    arrays = [
-        pyarrow.array([1], pyarrow.int64()),
-        pyarrow.array([None], pyarrow.float32()),
-        pyarrow.array([None], pyarrow.float64()),
-        pyarrow.array([None], pyarrow.large_string()),
-        pyarrow.array([None], pyarrow.timestamp("s")),
-        pyarrow.array([None], pyarrow.large_binary()),
-    ]
-    names = [
-        "Id",
-        "FloatData",
-        "DoubleData",
-        "FirstName",
-        "DateOfBirth",
-        "RawData",
-    ]
-    df = pyarrow.table(arrays, names)
-    bind_names = ",".join(names)
-    bind_values = ",".join(f":{i + 1}" for i in range(len(names)))
-    await async_cursor.executemany(
-        f"""
-        insert into TestDataFrame ({bind_names})
-        values ({bind_values})
-        """,
-        df,
-    )
-    await async_conn.commit()
-    query_values = ",".join(f'{name} as "{name}"' for name in names)
-    odf = await async_conn.fetch_df_all(
-        f"""
-        select {query_values}
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9012(async_conn, async_cursor, empty_tab):
-    "9012 - test LOB sizes around 32K boundary using DataFrame ingestion"
-    test_sizes = [32766, 32767, 32768, 32769, 32770]
-    arrays = [
-        pyarrow.array(range(1, len(test_sizes) + 1), pyarrow.int64()),
-        pyarrow.array(["X" * s for s in test_sizes], pyarrow.large_string()),
-        pyarrow.array([b"Y" * s for s in test_sizes], pyarrow.large_binary()),
-    ]
-    names = ["Id", "LongData", "LongRawData"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongData, LongRawData)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LongData as "LongData",
-            LongRawData as "LongRawData"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9013(async_conn, async_cursor, empty_tab, test_env):
-    "9013 - test ingestion with mixed characters using DataFrame"
-    if test_env.charset != "AL32UTF8":
-        pytest.skip("Database character set must be AL32UTF8")
-
-    test_data = [
-        "ASCII: Hello World",  # Pure ASCII
-        "Latin: café España",  # Latin-1 Supplement
-        "Cyrillic: русский текст",  # Actual Cyrillic
-        "Chinese: 中文测试",  # Actual Chinese
-        "Emoji: 👍😊❤️",  # Emojis
-        "Special: ~!@#$%^&*()_+{}|:\"<>?`-=[]\\;',./",  # ASCII symbols
-        "Mixed: 你好, world! café? 123@# русский 👍",  # Mixed characters
-    ]
-    arrays = [
-        pyarrow.array(range(1, len(test_data) + 1), pyarrow.int64()),
-        pyarrow.array(test_data, pyarrow.large_string()),
-    ]
-    names = ["Id", "FirstName"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, FirstName)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9014(async_conn, async_cursor, empty_tab):
-    "9014 - test various numeric values"
-    test_data = [
-        decimal.Decimal(0),
-        decimal.Decimal(1),
-        decimal.Decimal(-1),
-        decimal.Decimal("99999999999.9999"),
-        decimal.Decimal("-99999999999.9999"),
-        decimal.Decimal("10000000000.0001"),
-        decimal.Decimal("-10000000000.0001"),
-        decimal.Decimal(".0001"),
-        decimal.Decimal("-.0001"),
-        decimal.Decimal(".9"),
-        decimal.Decimal("-.9"),
-        decimal.Decimal(".09"),
-        decimal.Decimal("-.09"),
-        decimal.Decimal(".009"),
-        decimal.Decimal("-.009"),
-    ]
-    ids = [decimal.Decimal(i) for i in range(len(test_data))]
-    arrays = [
-        pyarrow.array(ids, pyarrow.decimal128(9, 0)),
-        pyarrow.array(test_data, pyarrow.decimal128(15, 4)),
-    ]
-    names = ["Id", "DecimalData"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, DecimalData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            DecimalData as "DecimalData"
-        from TestDataFrame
-        order by Id
-        """,
-        fetch_decimals=True,
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9015(async_conn, async_cursor, empty_tab):
-    "9015 - test various timestamp values"
-    test_data = [
-        datetime.datetime(2056, 2, 29),
-        datetime.datetime(2020, 2, 29),
-        datetime.datetime(1900, 1, 1),
-        datetime.datetime(2000, 1, 1),
-        datetime.datetime(1970, 1, 1),
-        datetime.datetime(2020, 2, 29, 23, 59, 59, 123456),
-        datetime.datetime(2023, 12, 31, 23, 59, 59, 567890),
-        datetime.datetime(2024, 1, 1, 0, 0, 0, 789012),
-    ]
-    ids = list(range(len(test_data)))
-    arrays = [
-        pyarrow.array(ids, pyarrow.int64()),
-        pyarrow.array(test_data, pyarrow.timestamp("us")),
-    ]
-    names = ["Id", "LastUpdated"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LastUpdated)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            LastUpdated as "LastUpdated"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9016(async_conn, async_cursor, empty_tab):
-    "9016 - test insertion with large data volumes"
-    num_rows = 10_000
-    ids = list(range(1, num_rows + 1))
-    names = [f"Employee-{i}" for i in ids]
-    salaries = [i * 100.25 for i in ids]
-    arrays = [
-        pyarrow.array(ids, pyarrow.int64()),
-        pyarrow.array(names, pyarrow.large_string()),
-        pyarrow.array(salaries, pyarrow.float64()),
-    ]
-    names = ["Id", "FirstName", "Salary"]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, FirstName, Salary)
-        values (:1, :2, :3)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    odf = await async_conn.fetch_df_all(
-        """
-        select
-            Id as "Id",
-            FirstName as "FirstName",
-            Salary as "Salary"
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9017(skip_unless_sparse_vectors_supported, async_conn):
-    "9017 - test ingestion of sparse vectors"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                None,
-                dict(num_dimensions=16, indices=[1, 3], values=[1, -1]),
-                dict(num_dimensions=16, indices=[5, 10], values=[2, -2]),
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_INT8),
-        ),
-        pyarrow.array(
-            [
-                dict(num_dimensions=16, indices=[1, 3], values=[1.1, -1.1]),
-                None,
-                dict(num_dimensions=16, indices=[5, 10], values=[2.2, -2.2]),
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_FLOAT32),
-        ),
-        pyarrow.array(
-            [
-                dict(num_dimensions=16, indices=[1, 3], values=[1.25, -1.25]),
-                dict(num_dimensions=16, indices=[5, 10], values=[2.5, -2.5]),
-                None,
-            ],
-            pyarrow.struct(SPARSE_VECTOR_FIELDS_FLOAT64),
-        ),
-    ]
-    names = [
-        "IntCol",
-        "SparseVector8Col",
-        "SparseVector32Col",
-        "SparseVector64Col",
-    ]
-    df = pyarrow.table(arrays, names)
-    cursor = async_conn.cursor()
-    await cursor.execute("delete from TestSparseVectors")
-    column_names = ",".join(names)
-    bind_names = ",".join(f":{i + 1}" for i in range(len(names)))
-    await cursor.executemany(
-        f"""
-        insert into TestSparseVectors ({column_names})
-        values ({bind_names})
-        """,
-        df,
-    )
-    await async_conn.commit()
-    query_names = ",".join(f'{name} as "{name}"' for name in names)
-    odf = await async_conn.fetch_df_all(
-        f"""
-        select {query_names}
-        from TestSparseVectors
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-async def test_9018(skip_unless_vectors_supported, async_conn, async_cursor):
-    "9018 - test ingestion of dense vectors"
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int64()),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -127,
-                    -100,
-                    -5,
-                    -1,
-                    0,
-                    0,
-                    0,
-                    0,
-                    1,
-                    5,
-                    7,
-                    25,
-                    13,
-                    0,
-                    10,
-                    127,
-                ],
-                [
-                    -25,
-                    25,
-                    -15,
-                    15,
-                    -5,
-                    5,
-                    0,
-                    0,
-                    -127,
-                    127,
-                    -25,
-                    25,
-                    -105,
-                    105,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.int8()),
-        ),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -12.5,
-                    -578.625,
-                    -100.25,
-                    -87.5,
-                    0,
-                    25,
-                    0,
-                    0,
-                    1,
-                    1.25,
-                    1.75,
-                    2.5,
-                    1.75,
-                    0,
-                    5889.125,
-                    6500.375,
-                ],
-                [
-                    -25.5,
-                    25.5,
-                    -15.25,
-                    15.25,
-                    -5.3,
-                    5.3,
-                    0,
-                    0,
-                    -127.8,
-                    127.8,
-                    -15.222,
-                    15.222,
-                    -105.333,
-                    105.333,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.float32()),
-        ),
-        pyarrow.array(
-            [
-                None,
-                [
-                    -22.5,
-                    -278.625,
-                    -200.25,
-                    -77.5,
-                    0,
-                    35,
-                    0,
-                    0,
-                    1,
-                    8.25,
-                    9.75,
-                    3.5,
-                    4.75,
-                    0,
-                    6889.125,
-                    7500.375,
-                ],
-                [
-                    -35.5,
-                    35.5,
-                    -25.25,
-                    25.25,
-                    -8.3,
-                    8.3,
-                    0,
-                    0,
-                    -227.8,
-                    227.8,
-                    -215.222,
-                    415.222,
-                    -505.333,
-                    605.333,
-                    -1,
-                    1,
-                ],
-            ],
-            pyarrow.list_(pyarrow.float64()),
-        ),
-    ]
-    names = [
-        "IntCol",
-        "Vector8Col",
-        "Vector32Col",
-        "Vector64Col",
-    ]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.execute("delete from TestVectors")
-    column_names = ",".join(names)
-    bind_names = ",".join(f":{i + 1}" for i in range(len(names)))
-    await async_cursor.executemany(
-        f"""
-        insert into TestVectors ({column_names})
-        values ({bind_names})
-        """,
-        df,
-    )
-    await async_conn.commit()
-    query_names = ",".join(f'{name} as "{name}"' for name in names)
-    odf = await async_conn.fetch_df_all(
-        f"""
-        select {query_names}
-        from TestVectors
-        order by IntCol
-        """
-    )
-    fetched_df = pyarrow.table(odf)
-    assert fetched_df.equals(df)
-
-
-@pytest.mark.parametrize(
-    "values, dtype",
-    [
-        ([-(2**7), 0, 2**7 - 1], pyarrow.int8()),
-        ([-(2**15), 0, 2**15 - 1], pyarrow.int16()),
-        ([-(2**31), 0, 2**31 - 1], pyarrow.int32()),
-        ([-(2**63), 0, 2**63 - 1], pyarrow.int64()),
-        ([0, 2**7, 2**8 - 1], pyarrow.uint8()),
-        ([0, 2**15, 2**16 - 1], pyarrow.uint16()),
-        ([0, 2**31, 2**32 - 1], pyarrow.uint32()),
-        ([0, 2**63, 2**64 - 1], pyarrow.uint64()),
-    ],
-)
-async def test_9019(values, dtype, async_conn, async_cursor, empty_tab):
-    "9019 - test ingestion with various integer data types"
-    names = ["Id", "LongIntegerData"]
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int8()),
-        pyarrow.array(values, dtype),
-    ]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.execute("delete from TestDataFrame")
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, LongIntegerData)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    await async_cursor.execute(
-        """
-        select to_char(LongIntegerData)
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_values = [int(s) async for s, in async_cursor]
-    assert fetched_values == values
-
-
-@pytest.mark.parametrize(
-    "values, dtype",
-    [
-        (
-            [
-                datetime.datetime(1915, 9, 11),
-                None,
-                datetime.datetime(2045, 2, 28),
-            ],
-            pyarrow.date32(),
-        ),
-        (
-            [
-                datetime.datetime(1905, 3, 30),
-                None,
-                datetime.datetime(2060, 10, 5),
-            ],
-            pyarrow.date64(),
-        ),
-    ],
-)
-async def test_9020(values, dtype, async_conn, async_cursor, empty_tab):
-    "9020 - test ingestion with alternative date types"
-    names = ["Id", "DateOfBirth"]
-    arrays = [
-        pyarrow.array([1, 2, 3], pyarrow.int8()),
-        pyarrow.array(values, dtype),
-    ]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        """
-        insert into TestDataFrame (Id, DateOfBirth)
-        values (:1, :2)
-        """,
-        df,
-    )
-    await async_conn.commit()
-    await async_cursor.execute(
-        """
-        select DateOfBirth
-        from TestDataFrame
-        order by Id
-        """
-    )
-    fetched_values = [d async for d, in async_cursor]
-    assert fetched_values == values
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-async def test_9021(
-    batch_size, async_conn, async_cursor, empty_tab, round_trip_checker_async
-):
-    "8921 - test ingestion with various batch sizes"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    arrays = [
-        pyarrow.array([i for i, _ in rows], pyarrow.int16()),
-        pyarrow.array([s for _, s in rows], pyarrow.large_string()),
-    ]
-    df = pyarrow.table(arrays, names)
-    await async_cursor.executemany(
-        "insert into TestDataFrame (Id, FirstName) values (:1, :2)",
-        df,
-        batch_size=batch_size,
-    )
-    num_round_trips = len(rows) // batch_size
-    if len(rows) % batch_size:
-        num_round_trips += 1
-    assert await round_trip_checker_async.get_value_async() == num_round_trips
-    await async_conn.commit()
-    await async_cursor.execute(
-        "select Id, FirstName from TestDataFrame order by Id"
-    )
-    assert await async_cursor.fetchall() == rows
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-async def test_9022(
-    batch_size, async_conn, async_cursor, empty_tab, round_trip_checker_async
-):
-    "9022 - test ingestion of multi chunk data frames with various batch sizes"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    int_arrays = [
-        pyarrow.array([i for i, _ in rows[:25]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[25:59]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[59:75]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[75:190]], pyarrow.int16()),
-        pyarrow.array([i for i, _ in rows[190:]], pyarrow.int16()),
-    ]
-    str_arrays = [
-        pyarrow.array([s for _, s in rows[:25]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[25:59]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[59:75]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[75:190]], pyarrow.large_string()),
-        pyarrow.array([s for _, s in rows[190:]], pyarrow.large_string()),
-    ]
-    chunked_arrays = [
-        pyarrow.chunked_array(int_arrays),
-        pyarrow.chunked_array(str_arrays),
-    ]
-    df = pyarrow.table(chunked_arrays, names)
-    await async_cursor.executemany(
-        "insert into TestDataFrame (Id, FirstName) values (:1, :2)",
-        df,
-        batch_size=batch_size,
-    )
-    num_round_trips = 0
-    for array in int_arrays:
-        num_round_trips += len(array) // batch_size
-        if len(array) % batch_size:
-            num_round_trips += 1
-    assert await round_trip_checker_async.get_value_async() == num_round_trips
-    await async_conn.commit()
-    await async_cursor.execute(
-        "select Id, FirstName from TestDataFrame order by Id"
-    )
-    assert await async_cursor.fetchall() == rows
diff --git a/tests/test_9100_dataframe_vector.py b/tests/test_9100_dataframe_vector.py
deleted file mode 100644
index 241c71e3..00000000
--- a/tests/test_9100_dataframe_vector.py
+++ /dev/null
@@ -1,344 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing dataframe with vector support
-"""
-
-import array
-
-import pyarrow
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_vectors_supported):
-    pass
-
-
-def test_9100(conn, test_env):
-    "9100 - fetch float32 vector"
-
-    # float32 is a special case while comparing dataframe values
-    # Converting Dataframe cell value of type numpy.ndarray[float32]
-    # using .tolist() converts each value to Python float. Python
-    # float uses 64-bit precision causing mismatches in assertEqual.
-    # As a workaround we use array.array('f', src).tolist() on the
-    # source data
-    data = [
-        (array.array("f", [34.6, 77.8]).tolist(),),
-        (None,),
-        (array.array("f", [34.6, 77.8, 55.9]).tolist(),),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float32)
-        union all
-        select null
-        union all
-        select to_vector('[34.6, 77.8, 55.9]', 3, float32)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9101(conn, test_env):
-    "9101 - fetch float64 vector"
-    data = [
-        ([34.6, 77.8],),
-        (None,),
-        ([34.6, 77.8, 55.9],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select null
-        union all
-        select to_vector('[34.6, 77.8, 55.9]', 3, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9102(conn, test_env):
-    "9102 - fetch int8 vector"
-    data = [
-        ([34, -77],),
-        (None,),
-        ([34, 77, 55],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[34, -77]', 2, int8)
-        union all
-        select null
-        union all
-        select to_vector('[34, 77, 55]', 3, int8)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9103(skip_unless_binary_vectors_supported, conn, test_env):
-    "9103 - fetch binary vector"
-    data = [
-        ([3, 2, 3],),
-        (None,),
-        ([3, 2],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[3, 2, 3]', 24, binary)
-        union all
-        select null
-        union all
-        select to_vector('[3, 2]', 16, binary)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9104(conn, test_env):
-    "9104 - fetch duplicate float64 vectors"
-    data = [
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9105(skip_unless_sparse_vectors_supported, conn, test_env):
-    "9105 - fetch float32 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 77.8]).tolist(),
-            },
-        ),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 9.1]).tolist(),
-            },
-        ),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[8, [0, 7], [34.6, 77.8]]', 8, float32, sparse)
-        union all
-        select to_vector('[8, [0, 7], [34.6, 9.1]]', 8, float32, sparse)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9106(skip_unless_sparse_vectors_supported, conn, test_env):
-    "9106 - fetch float64 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 77.8],
-            },
-        ),
-        (None,),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 9.1],
-            },
-        ),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[8, [0, 7], [34.6, 77.8]]', 8, float64, sparse)
-        union all
-        select null
-        union all
-        select to_vector('[8, [0, 7], [34.6, 9.1]]', 8, float64, sparse)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9107(conn, test_env):
-    "9107 - DPY-3031 - Unsupported flexible vector formats"
-    with test_env.assert_raises_full_code("DPY-3031"):
-        conn.fetch_df_all(
-            """
-            select to_vector('[44, 55, 89]', 3, int8) as flex_col
-            union all
-            select to_vector('[34.6, 77.8, 55.9]', 3, float32)
-            """
-        )
-
-
-def test_9108(conn, test_env):
-    "9108 - test vector operations with different dimensions"
-    data = [([1, 0, 3],), ([0, 5, -12.25, 0],), ([5.5, -6.25, 7, 8, 9],)]
-
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[1, 0, 3]', 3, float64) from dual
-        union all
-        select to_vector('[0, 5, -12.25, 0]', 4, float64) from dual
-        union all
-        select to_vector('[5.5, -6.25, 7, 8, 9]', 5, float64) from dual
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9109(conn, test_env):
-    "9109 - test vector operations with large arrays"
-    large_array = list(range(1, 1001))
-    data = [(large_array,), (large_array,)]
-    str_value = ",".join(str(i) for i in large_array)
-    ora_df = conn.fetch_df_all(
-        f"""
-        select to_vector('[{str_value}]', {len(large_array)}, float64)
-        union all
-        select to_vector('[{str_value}]', {len(large_array)}, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9110(skip_unless_sparse_vectors_supported, conn, test_env):
-    "9110 - test sparse vector operations with different dimensions"
-    with test_env.assert_raises_full_code("DPY-2065"):
-        conn.fetch_df_all(
-            """
-            select to_vector('[10, [1, 3], [2, 4]]', 10, float64, sparse)
-            union all
-            select to_vector('[5, [1, 3], [2, 4]]', 5, float64, sparse)
-            """
-        )
-
-
-def test_9111(conn, test_env):
-    "9111 - test mixed vector types in a single dataframe"
-    data = [
-        ([1.5, 2.5, 3.5], [1, 2, 3]),
-        ([4.25, 5.25, 6.25], [4, 5, 6]),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select
-            to_vector('[1.5, 2.5, 3.5]', 3, float64) as float_vec,
-            to_vector('[1, 2, 3]', 3, int8) as int_vec
-        union all
-        select
-            to_vector('[4.25, 5.25, 6.25]', 3, float64),
-            to_vector('[4, 5, 6]', 3, int8)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9112(conn, test_env):
-    "9112 - test vectors with very large dimensions"
-    large_dim = 800
-    large_vector = [2.25] * large_dim
-    large_vector[12] = 1.5
-    large_vector[-25] = 8.5
-    data = [(large_vector,)]
-    vector_str = ",".join(str(i) for i in large_vector)
-    ora_df = conn.fetch_df_all(
-        f"""
-        select to_vector('[{vector_str}]', {large_dim}, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-def test_9113(skip_unless_binary_vectors_supported, conn, test_env):
-    "9113 - test binary vector edge case - max value"
-    data = [
-        ([255, 255, 255],),
-        ([255, 0, 255],),
-    ]
-    ora_df = conn.fetch_df_all(
-        """
-        select to_vector('[255, 255, 255]', 24, binary)
-        union all
-        select to_vector('[255, 0, 255]', 24, binary)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
diff --git a/tests/test_9200_dataframe_vector_async.py b/tests/test_9200_dataframe_vector_async.py
deleted file mode 100644
index 596585ec..00000000
--- a/tests/test_9200_dataframe_vector_async.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing dataframe with vector support with asyncio
-"""
-
-import array
-
-import pyarrow
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(
-    anyio_backend, skip_unless_thin_mode, skip_unless_vectors_supported
-):
-    pass
-
-
-async def test_9200(async_conn, test_env):
-    "9200 - fetch float32 vector"
-
-    # float32 is a special case while comparing dataframe values
-    # Converting Dataframe cell value of type numpy.ndarray[float32]
-    # using .tolist() converts each value to Python float. Python
-    # float uses 64-bit precision causing mismatches in assertEqual.
-    # As a workaround we use array.array('f', src).tolist() on the
-    # source data
-    data = [
-        (array.array("f", [34.6, 77.8]).tolist(),),
-        (None,),
-        (array.array("f", [34.6, 77.8, 55.9]).tolist(),),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float32)
-        union all
-        select null
-        union all
-        select to_vector('[34.6, 77.8, 55.9]', 3, float32)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9201(async_conn, test_env):
-    "9201 - fetch float64 vector"
-    data = [
-        ([34.6, 77.8],),
-        (None,),
-        ([34.6, 77.8, 55.9],),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select null
-        union all
-        select to_vector('[34.6, 77.8, 55.9]', 3, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9202(async_conn, test_env):
-    "9202 - fetch int8 vector"
-    data = [
-        ([34, -77],),
-        (None,),
-        ([34, 77, 55],),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[34, -77]', 2, int8)
-        union all
-        select null
-        union all
-        select to_vector('[34, 77, 55]', 3, int8)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9203(
-    skip_unless_binary_vectors_supported, async_conn, test_env
-):
-    "9203 - fetch binary vector"
-    data = [
-        ([3, 2, 3],),
-        (None,),
-        ([3, 2],),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[3, 2, 3]', 24, binary)
-        union all
-        select null
-        union all
-        select to_vector('[3, 2]', 16, binary)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9204(async_conn, test_env):
-    "9204 - fetch duplicate float64 vectors"
-    data = [
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-        ([34.6, 77.8],),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        union all
-        select to_vector('[34.6, 77.8]', 2, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9205(
-    skip_unless_sparse_vectors_supported, async_conn, test_env
-):
-    "9205 - fetch float32 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 77.8]).tolist(),
-            },
-        ),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": array.array("f", [34.6, 9.1]).tolist(),
-            },
-        ),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[8, [0, 7], [34.6, 77.8]]', 8, float32, sparse)
-        union all
-        select to_vector('[8, [0, 7], [34.6, 9.1]]', 8, float32, sparse)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9206(
-    skip_unless_sparse_vectors_supported, async_conn, test_env
-):
-    "9206 - fetch float64 sparse vectors"
-    data = [
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 77.8],
-            },
-        ),
-        (None,),
-        (
-            {
-                "num_dimensions": 8,
-                "indices": [0, 7],
-                "values": [34.6, 9.1],
-            },
-        ),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[8, [0, 7], [34.6, 77.8]]', 8, float64, sparse)
-        union all
-        select null
-        union all
-        select to_vector('[8, [0, 7], [34.6, 9.1]]', 8, float64, sparse)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9207(async_conn, test_env):
-    "9207 - DPY-3031 - Unsupported flexible vector formats"
-    with test_env.assert_raises_full_code("DPY-3031"):
-        await async_conn.fetch_df_all(
-            """
-            select to_vector('[44, 55, 89]', 3, int8) as flex_col
-            union all
-            select to_vector('[34.6, 77.8, 55.9]', 3, float32)
-            """
-        )
-
-
-async def test_9208(async_conn, test_env):
-    "9208 - test vector operations with different dimensions"
-    data = [([1, 0, 3],), ([0, 5, -12.25, 0],), ([5.5, -6.25, 7, 8, 9],)]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[1, 0, 3]', 3, float64) from dual
-        union all
-        select to_vector('[0, 5, -12.25, 0]', 4, float64) from dual
-        union all
-        select to_vector('[5.5, -6.25, 7, 8, 9]', 5, float64) from dual
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9209(async_conn, test_env):
-    "9209 - test vector operations with large arrays"
-    large_array = list(range(1, 1001))
-    data = [(large_array,), (large_array,)]
-    str_value = ",".join(str(i) for i in large_array)
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select to_vector('[{str_value}]', {len(large_array)}, float64)
-        union all
-        select to_vector('[{str_value}]', {len(large_array)}, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9210(
-    skip_unless_sparse_vectors_supported, async_conn, test_env
-):
-    "9210 - test sparse vector operations with different dimensions"
-    with test_env.assert_raises_full_code("DPY-2065"):
-        await async_conn.fetch_df_all(
-            """
-            select to_vector('[10, [1, 3], [2, 4]]', 10, float64, sparse)
-            union all
-            select to_vector('[5, [1, 3], [2, 4]]', 5, float64, sparse)
-            """
-        )
-
-
-async def test_9211(async_conn, test_env):
-    "9211 - test mixed vector types in a single dataframe"
-    data = [
-        ([1.5, 2.5, 3.5], [1, 2, 3]),
-        ([4.25, 5.25, 6.25], [4, 5, 6]),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select
-            to_vector('[1.5, 2.5, 3.5]', 3, float64) as float_vec,
-            to_vector('[1, 2, 3]', 3, int8) as int_vec
-        union all
-        select
-            to_vector('[4.25, 5.25, 6.25]', 3, float64),
-            to_vector('[4, 5, 6]', 3, int8)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9212(async_conn, test_env):
-    "9212 - test vectors with very large dimensions"
-    large_dim = 800
-    large_vector = [2.25] * large_dim
-    large_vector[12] = 1.5
-    large_vector[-25] = 8.5
-    data = [(large_vector,)]
-    vector_str = ",".join(str(i) for i in large_vector)
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select to_vector('[{vector_str}]', {large_dim}, float64)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
-
-
-async def test_9213(
-    skip_unless_binary_vectors_supported, async_conn, test_env
-):
-    "9213 - test binary vector edge case - max value"
-    data = [
-        ([255, 255, 255],),
-        ([255, 0, 255],),
-    ]
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select to_vector('[255, 255, 255]', 24, binary)
-        union all
-        select to_vector('[255, 0, 255]', 24, binary)
-        """
-    )
-    fetched_df = pyarrow.table(ora_df).to_pandas()
-    assert data == test_env.get_data_from_df(fetched_df)
diff --git a/tests/test_9300_dataframe_requested_schema.py b/tests/test_9300_dataframe_requested_schema.py
deleted file mode 100644
index d93627b3..00000000
--- a/tests/test_9300_dataframe_requested_schema.py
+++ /dev/null
@@ -1,789 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing user requested schema in fetch_df APIs
-"""
-
-import datetime
-
-import oracledb
-import pyarrow
-import pytest
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-def test_9300(dtype, conn):
-    "9300 - fetch_df_all() with fixed width integer types"
-    statement = "select 1 from dual"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == dtype
-    assert tab["INT_COL"][0].as_py() == 1
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-def test_9301(dtype, conn):
-    "9301 - fetch_df_all() with duplicate fixed width integer types"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        """
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert len(tab) == 6
-    assert tab.field("INT_COL").type == dtype
-    for value in tab["INT_COL"]:
-        assert value.as_py() == 99
-
-
-def test_9302(conn):
-    "9302 - fetch_df_all() requested_schema honored for repeated execution"
-    statement = "select 1 as int_col from dual"
-    ora_df = conn.fetch_df_all(statement)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.float64()
-    requested_schema = pyarrow.schema([("INT_COL", pyarrow.int8())])
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.int8()
-    ora_df = conn.fetch_df_all(statement)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.float64()
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-def test_9303(dtype, conn):
-    "9303 - fetch_df_batches() with fixed width integer types"
-    statement = "select 1 from dual"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    for ora_df in conn.fetch_df_batches(
-        statement, requested_schema=requested_schema
-    ):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == dtype
-        assert tab["INT_COL"][0].as_py() == 1
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-def test_9304(dtype, conn):
-    "9304 - fetch_df_batches() with duplicate fixed width integer types"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    for ora_df in conn.fetch_df_batches(
-        """
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        """,
-        requested_schema=requested_schema,
-    ):
-        tab = pyarrow.table(ora_df)
-        assert len(tab) == 6
-        assert tab.field("INT_COL").type == dtype
-        for value in tab["INT_COL"]:
-            assert value.as_py() == 99
-
-
-def test_9305(conn):
-    "9305 - fetch_df_batches() requested_schema honored for repeated execution"
-    statement = "select 1 as int_col from dual"
-    for ora_df in conn.fetch_df_batches(statement):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.float64()
-    requested_schema = pyarrow.schema([("INT_COL", pyarrow.int8())])
-    for ora_df in conn.fetch_df_batches(
-        statement, requested_schema=requested_schema
-    ):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.int8()
-    for ora_df in conn.fetch_df_batches(statement):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.float64()
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.decimal128(precision=3, scale=2),
-        pyarrow.float32(),
-        pyarrow.float64(),
-    ],
-)
-def test_9306(dtype, conn):
-    "9306 - fetch_df_all() for NUMBER"
-    value = 2.75
-    requested_schema = pyarrow.schema([("DECIMAL_COL", dtype)])
-    statement = f"select {value} from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DECIMAL_COL").type == dtype
-    assert tab["DECIMAL_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-def test_9307(dtype, conn):
-    "9307 - fetch_df_all() for BINARY_DOUBLE"
-    value = 123.25
-    requested_schema = pyarrow.schema([("BINARY_DOUBLE_COL", dtype)])
-    statement = f"select to_binary_double({value}) from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_DOUBLE_COL").type == dtype
-    assert tab["BINARY_DOUBLE_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-def test_9308(dtype, conn):
-    "9308 - fetch_df_all() for BINARY_FLOAT"
-    value = 123.625
-    requested_schema = pyarrow.schema([("BINARY_FLOAT_COL", dtype)])
-    statement = f"select to_binary_float({value}) from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_FLOAT_COL").type == dtype
-    assert tab["BINARY_FLOAT_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-def test_9309(dtype, conn):
-    "9309 - fetch_df_all() for RAW"
-    value = "ABCDEF"
-    requested_schema = pyarrow.schema([("RAW_COL", dtype)])
-    statement = f"select utl_raw.cast_to_raw('{value}') as raw_col from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("RAW_COL").type == dtype
-    assert tab["RAW_COL"][0].as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9310(dtype, value_is_date, conn):
-    "9310 - fetch_df_all() for DATE"
-    requested_schema = pyarrow.schema([("DATE_COL", dtype)])
-    value = datetime.datetime(2025, 2, 18)
-    statement = "select cast(:1 as date) from dual"
-    ora_df = conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DATE_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["DATE_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.date32(),
-        pyarrow.date64(),
-        pyarrow.timestamp("s"),
-        pyarrow.timestamp("us"),
-        pyarrow.timestamp("ms"),
-        pyarrow.timestamp("ns"),
-    ],
-)
-def test_9311(dtype, conn):
-    "9311 - fetch_df_all() for TIMESTAMP"
-    requested_schema = pyarrow.schema([("TIMESTAMP_COL", dtype)])
-    value = datetime.datetime(1974, 4, 4, 0, 57, 54, 15079)
-    var = conn.cursor().var(oracledb.DB_TYPE_TIMESTAMP)
-    var.setvalue(0, value)
-    statement = "select :1 from dual"
-    ora_df = conn.fetch_df_all(
-        statement, [var], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_COL").type == dtype
-    if not isinstance(dtype, pyarrow.TimestampType):
-        value = value.date()
-    elif dtype.unit == "s":
-        value = value.replace(microsecond=0)
-    elif dtype.unit == "ms":
-        value = value.replace(microsecond=(value.microsecond // 1000) * 1000)
-    assert tab["TIMESTAMP_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9312(dtype, value_is_date, conn):
-    "9312 - fetch_df_all() for TIMESTAMP WITH LOCAL TIME ZONE"
-    requested_schema = pyarrow.schema([("TIMESTAMP_LTZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 4)
-    statement = "select cast(:1 as timestamp with local time zone) from dual"
-    ora_df = conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_LTZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["TIMESTAMP_LTZ_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9313(dtype, value_is_date, conn):
-    "9313 - fetch_df_all() for TIMESTAMP WITH TIME ZONE"
-    requested_schema = pyarrow.schema([("TIMESTAMP_TZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 4)
-    statement = "select cast(:1 as timestamp with time zone) from dual"
-    ora_df = conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_TZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["TIMESTAMP_TZ_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-def test_9314(dtype, conn):
-    "9314 - fetch_df_all() for BLOB"
-    value = "GHIJKL"
-    requested_schema = pyarrow.schema([("BLOB_COL", dtype)])
-    statement = f"select to_blob(utl_raw.cast_to_raw('{value}')) from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BLOB_COL").type == dtype
-    assert tab["BLOB_COL"][0].as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "db_type_name",
-    ["CHAR", "NCHAR", "VARCHAR2", "NVARCHAR2"],
-)
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-def test_9315(db_type_name, dtype, conn):
-    "9315 - fetch_df_all() for string types"
-    value = "test_9315"
-    requested_schema = pyarrow.schema([("STRING_COL", dtype)])
-    statement = f"select cast('{value}' as {db_type_name}(9)) from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("STRING_COL").type == dtype
-    assert tab["STRING_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize("db_type_name", ["CLOB", "NCLOB"])
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-def test_9316(db_type_name, dtype, conn):
-    "9316 - fetch_df_all() for CLOB types"
-    value = "test_9316"
-    requested_schema = pyarrow.schema([("CLOB_COL", dtype)])
-    statement = f"select to_{db_type_name.lower()}('{value}') from dual"
-    ora_df = conn.fetch_df_all(statement, requested_schema=requested_schema)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("CLOB_COL").type == dtype
-    assert tab["CLOB_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.decimal128(precision=3, scale=2),
-        pyarrow.float32(),
-        pyarrow.float64(),
-    ],
-)
-def test_9317(dtype, conn):
-    "9317 - fetch_df_all() for NUMBER duplicate values"
-    value = 93.25
-    requested_schema = pyarrow.schema([("DECIMAL_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        f"""
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DECIMAL_COL").type == dtype
-    for fetched_value in tab["DECIMAL_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-def test_9318(dtype, conn):
-    "9318 - fetch_df_all() for BINARY_DOUBLE duplicate values"
-    value = 523.75
-    requested_schema = pyarrow.schema([("BINARY_DOUBLE_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        f"""
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_DOUBLE_COL").type == dtype
-    for fetched_value in tab["BINARY_DOUBLE_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-def test_9319(dtype, conn):
-    "9319 - fetch_df_all() for BINARY_FLOAT duplicate values"
-    value = 9308.125
-    requested_schema = pyarrow.schema([("BINARY_FLOAT_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        f"""
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_FLOAT_COL").type == dtype
-    for fetched_value in tab["BINARY_FLOAT_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-def test_9320(dtype, conn):
-    "9320 - fetch_df_all() for RAW duplicate values"
-    value = "A23456"
-    requested_schema = pyarrow.schema([("RAW_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        f"""
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("RAW_COL").type == dtype
-    for fetched_value in tab["RAW_COL"]:
-        assert fetched_value.as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9321(dtype, value_is_date, conn):
-    "9321 - fetch_df_all() for DATE duplicate values"
-    requested_schema = pyarrow.schema([("DATE_COL", dtype)])
-    value = datetime.datetime(2025, 3, 1)
-    parameters = dict(value=value)
-    ora_df = conn.fetch_df_all(
-        """
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DATE_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["DATE_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9322(dtype, value_is_date, conn):
-    "9322 - fetch_df_all() for TIMESTAMP duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_COL", dtype)])
-    value = datetime.datetime(2025, 1, 14)
-    parameters = dict(value=value)
-    ora_df = conn.fetch_df_all(
-        """
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9323(dtype, value_is_date, conn):
-    "9323 - fetch_df_all() for TIMESTAMP WITH LOCAL TIME ZONE duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_LTZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 6)
-    parameters = dict(value=value)
-    ora_df = conn.fetch_df_all(
-        """
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_LTZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_LTZ_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-def test_9324(dtype, value_is_date, conn):
-    "9324 - fetch_df_all() for TIMESTAMP WITH TIME ZONE duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_TZ_COL", dtype)])
-    value = datetime.datetime(2025, 2, 28)
-    parameters = dict(value=value)
-    ora_df = conn.fetch_df_all(
-        """
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_TZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_TZ_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "db_type_name",
-    ["CHAR", "NCHAR", "VARCHAR2", "NVARCHAR2"],
-)
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-def test_9325(db_type_name, dtype, conn):
-    "9325 - fetch_df_all() for string types duplicate values"
-    value = "test_9325"
-    requested_schema = pyarrow.schema([("STRING_COL", dtype)])
-    ora_df = conn.fetch_df_all(
-        f"""
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("STRING_COL").type == dtype
-    for fetched_value in tab["STRING_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value",
-    [
-        (pyarrow.int8(), -129),
-        (pyarrow.int8(), 128),
-        (pyarrow.int16(), -32769),
-        (pyarrow.int16(), 32768),
-        (pyarrow.int32(), -2147483649),
-        (pyarrow.int32(), 2147483648),
-        (pyarrow.uint8(), -1),
-        (pyarrow.uint8(), 256),
-        (pyarrow.uint16(), -1),
-        (pyarrow.uint16(), 65536),
-        (pyarrow.uint32(), -1),
-        (pyarrow.uint32(), 4294967296),
-    ],
-)
-def test_9326(dtype, value, conn, test_env):
-    "9326 - fetch_df_all() for out of range integer values"
-    requested_schema = pyarrow.schema([("VALUE", dtype)])
-    with test_env.assert_raises_full_code("DPY-4038"):
-        conn.fetch_df_all(
-            "select :1 from dual", [value], requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("value", [b"Too short", b"Much too long"])
-def test_9327(value, conn, test_env):
-    "9327 - fetch_df_all() with fixed width binary violations"
-    requested_schema = pyarrow.schema([("VALUE", pyarrow.binary(length=10))])
-    with test_env.assert_raises_full_code("DPY-4040"):
-        conn.fetch_df_all(
-            "select :1 from dual", [value], requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("num_elements", [1, 3])
-def test_9328(num_elements, conn, test_env):
-    "9328 - fetch_df_all() with wrong requested_schema size"
-    elements = [(f"COL_{i}", pyarrow.string()) for i in range(num_elements)]
-    requested_schema = pyarrow.schema(elements)
-    with test_env.assert_raises_full_code("DPY-2069"):
-        conn.fetch_df_all(
-            "select user, user from dual", requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("num_elements", [1, 3])
-def test_9329(num_elements, conn, test_env):
-    "9329 - fetch_df_batches() with wrong requested_schema size"
-    elements = [(f"COL_{i}", pyarrow.string()) for i in range(num_elements)]
-    requested_schema = pyarrow.schema(elements)
-    with test_env.assert_raises_full_code("DPY-2069"):
-        list(
-            conn.fetch_df_batches(
-                "select user, user from dual",
-                requested_schema=requested_schema,
-            )
-        )
diff --git a/tests/test_9400_dataframe_requested_schema_async.py b/tests/test_9400_dataframe_requested_schema_async.py
deleted file mode 100644
index aa69cfdf..00000000
--- a/tests/test_9400_dataframe_requested_schema_async.py
+++ /dev/null
@@ -1,810 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing user requested schema in fetch_df APIs using asyncio.
-"""
-
-import datetime
-
-import oracledb
-import pyarrow
-import pytest
-
-
-@pytest.fixture(autouse=True)
-def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-async def test_9400(dtype, async_conn):
-    "9400 - fetch_df_all() with fixed width integer types"
-    statement = "select 1 from dual"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == dtype
-    assert tab["INT_COL"][0].as_py() == 1
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-async def test_9401(dtype, async_conn):
-    "9401 - fetch_df_all() with duplicate fixed width integer types"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert len(tab) == 6
-    assert tab.field("INT_COL").type == dtype
-    for value in tab["INT_COL"]:
-        assert value.as_py() == 99
-
-
-async def test_9402(async_conn):
-    "9402 - fetch_df_all() requested_schema honored for repeated execution"
-    statement = "select 1 as int_col from dual"
-    ora_df = await async_conn.fetch_df_all(statement)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.float64()
-    requested_schema = pyarrow.schema([("INT_COL", pyarrow.int8())])
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.int8()
-    ora_df = await async_conn.fetch_df_all(statement)
-    tab = pyarrow.table(ora_df)
-    assert tab.field("INT_COL").type == pyarrow.float64()
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-async def test_9403(dtype, async_conn):
-    "9403 - fetch_df_batches() with fixed width integer types"
-    statement = "select 1 from dual"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    async for ora_df in async_conn.fetch_df_batches(
-        statement, requested_schema=requested_schema
-    ):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == dtype
-        assert tab["INT_COL"][0].as_py() == 1
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.int8(),
-        pyarrow.int16(),
-        pyarrow.int32(),
-        pyarrow.int64(),
-        pyarrow.uint8(),
-        pyarrow.uint16(),
-        pyarrow.uint32(),
-        pyarrow.uint64(),
-    ],
-)
-async def test_9404(dtype, async_conn):
-    "9404 - fetch_df_batches() with duplicate fixed width integer types"
-    requested_schema = pyarrow.schema([("INT_COL", dtype)])
-    async for ora_df in async_conn.fetch_df_batches(
-        """
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        union all
-        select 99 from dual
-        """,
-        requested_schema=requested_schema,
-    ):
-        tab = pyarrow.table(ora_df)
-        assert len(tab) == 6
-        assert tab.field("INT_COL").type == dtype
-        for value in tab["INT_COL"]:
-            assert value.as_py() == 99
-
-
-async def test_9405(async_conn):
-    "9405 - fetch_df_batches() requested_schema honored for repeated execution"
-    statement = "select 1 as int_col from dual"
-    async for ora_df in async_conn.fetch_df_batches(statement):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.float64()
-    requested_schema = pyarrow.schema([("INT_COL", pyarrow.int8())])
-    async for ora_df in async_conn.fetch_df_batches(
-        statement, requested_schema=requested_schema
-    ):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.int8()
-    async for ora_df in async_conn.fetch_df_batches(statement):
-        tab = pyarrow.table(ora_df)
-        assert tab.field("INT_COL").type == pyarrow.float64()
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.decimal128(precision=3, scale=2),
-        pyarrow.float32(),
-        pyarrow.float64(),
-    ],
-)
-async def test_9406(dtype, async_conn):
-    "9406 - fetch_df_all() for NUMBER"
-    value = 2.75
-    requested_schema = pyarrow.schema([("DECIMAL_COL", dtype)])
-    statement = f"select {value} from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DECIMAL_COL").type == dtype
-    assert tab["DECIMAL_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-async def test_9407(dtype, async_conn):
-    "9407 - fetch_df_all() for BINARY_DOUBLE"
-    value = 123.25
-    requested_schema = pyarrow.schema([("BINARY_DOUBLE_COL", dtype)])
-    statement = f"select to_binary_double({value}) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_DOUBLE_COL").type == dtype
-    assert tab["BINARY_DOUBLE_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-async def test_9408(dtype, async_conn):
-    "9408 - fetch_df_all() for BINARY_FLOAT"
-    value = 123.625
-    requested_schema = pyarrow.schema([("BINARY_FLOAT_COL", dtype)])
-    statement = f"select to_binary_float({value}) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_FLOAT_COL").type == dtype
-    assert tab["BINARY_FLOAT_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-async def test_9409(dtype, async_conn):
-    "9409 - fetch_df_all() for RAW"
-    value = "ABCDEF"
-    requested_schema = pyarrow.schema([("RAW_COL", dtype)])
-    statement = f"select utl_raw.cast_to_raw('{value}') as raw_col from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("RAW_COL").type == dtype
-    assert tab["RAW_COL"][0].as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9410(dtype, value_is_date, async_conn):
-    "9410 - fetch_df_all() for DATE"
-    requested_schema = pyarrow.schema([("DATE_COL", dtype)])
-    value = datetime.datetime(2025, 2, 18)
-    statement = "select cast(:1 as date) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DATE_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["DATE_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.date32(),
-        pyarrow.date64(),
-        pyarrow.timestamp("s"),
-        pyarrow.timestamp("us"),
-        pyarrow.timestamp("ms"),
-        pyarrow.timestamp("ns"),
-    ],
-)
-async def test_9411(dtype, async_conn):
-    "9411 - fetch_df_all() for TIMESTAMP"
-    requested_schema = pyarrow.schema([("TIMESTAMP_COL", dtype)])
-    value = datetime.datetime(1974, 4, 4, 0, 57, 54, 15079)
-    var = async_conn.cursor().var(oracledb.DB_TYPE_TIMESTAMP)
-    var.setvalue(0, value)
-    statement = "select :1 from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, [var], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_COL").type == dtype
-    if not isinstance(dtype, pyarrow.TimestampType):
-        value = value.date()
-    elif dtype.unit == "s":
-        value = value.replace(microsecond=0)
-    elif dtype.unit == "ms":
-        value = value.replace(microsecond=(value.microsecond // 1000) * 1000)
-    assert tab["TIMESTAMP_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9412(dtype, value_is_date, async_conn):
-    "9412 - fetch_df_all() for TIMESTAMP WITH LOCAL TIME ZONE"
-    requested_schema = pyarrow.schema([("TIMESTAMP_LTZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 4)
-    statement = "select cast(:1 as timestamp with local time zone) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_LTZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["TIMESTAMP_LTZ_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9413(dtype, value_is_date, async_conn):
-    "9413 - fetch_df_all() for TIMESTAMP WITH TIME ZONE"
-    requested_schema = pyarrow.schema([("TIMESTAMP_TZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 4)
-    statement = "select cast(:1 as timestamp with time zone) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, [value], requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_TZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    assert tab["TIMESTAMP_TZ_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-async def test_9414(dtype, async_conn):
-    "9414 - fetch_df_all() for BLOB"
-    value = "GHIJKL"
-    requested_schema = pyarrow.schema([("BLOB_COL", dtype)])
-    statement = f"select to_blob(utl_raw.cast_to_raw('{value}')) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BLOB_COL").type == dtype
-    assert tab["BLOB_COL"][0].as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "db_type_name",
-    ["CHAR", "NCHAR", "VARCHAR2", "NVARCHAR2"],
-)
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-async def test_9415(db_type_name, dtype, async_conn):
-    "9415 - fetch_df_all() for string types"
-    value = "test_9415"
-    requested_schema = pyarrow.schema([("STRING_COL", dtype)])
-    statement = f"select cast('{value}' as {db_type_name}(9)) from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("STRING_COL").type == dtype
-    assert tab["STRING_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize("db_type_name", ["CLOB", "NCLOB"])
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-async def test_9416(db_type_name, dtype, async_conn):
-    "9416 - fetch_df_all() for CLOB types"
-    value = "test_9416"
-    requested_schema = pyarrow.schema([("CLOB_COL", dtype)])
-    statement = f"select to_{db_type_name.lower()}('{value}') from dual"
-    ora_df = await async_conn.fetch_df_all(
-        statement, requested_schema=requested_schema
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("CLOB_COL").type == dtype
-    assert tab["CLOB_COL"][0].as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [
-        pyarrow.decimal128(precision=3, scale=2),
-        pyarrow.float32(),
-        pyarrow.float64(),
-    ],
-)
-async def test_9417(dtype, async_conn):
-    "9417 - fetch_df_all() for NUMBER duplicate values"
-    value = 93.25
-    requested_schema = pyarrow.schema([("DECIMAL_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        union all
-        select {value} from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DECIMAL_COL").type == dtype
-    for fetched_value in tab["DECIMAL_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-async def test_9418(dtype, async_conn):
-    "9418 - fetch_df_all() for BINARY_DOUBLE duplicate values"
-    value = 523.75
-    requested_schema = pyarrow.schema([("BINARY_DOUBLE_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        union all
-        select to_binary_double({value}) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_DOUBLE_COL").type == dtype
-    for fetched_value in tab["BINARY_DOUBLE_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.float32(), pyarrow.float64()],
-)
-async def test_9419(dtype, async_conn):
-    "9419 - fetch_df_all() for BINARY_FLOAT duplicate values"
-    value = 9308.125
-    requested_schema = pyarrow.schema([("BINARY_FLOAT_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        union all
-        select to_binary_float({value}) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("BINARY_FLOAT_COL").type == dtype
-    for fetched_value in tab["BINARY_FLOAT_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype",
-    [pyarrow.binary(length=6), pyarrow.binary(), pyarrow.large_binary()],
-)
-async def test_9420(dtype, async_conn):
-    "9420 - fetch_df_all() for RAW duplicate values"
-    value = "A23456"
-    requested_schema = pyarrow.schema([("RAW_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        union all
-        select utl_raw.cast_to_raw('{value}') from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("RAW_COL").type == dtype
-    for fetched_value in tab["RAW_COL"]:
-        assert fetched_value.as_py() == value.encode()
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9421(dtype, value_is_date, async_conn):
-    "9421 - fetch_df_all() for DATE duplicate values"
-    requested_schema = pyarrow.schema([("DATE_COL", dtype)])
-    value = datetime.datetime(2025, 3, 1)
-    parameters = dict(value=value)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        union all
-        select cast(:value as date) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("DATE_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["DATE_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9422(dtype, value_is_date, async_conn):
-    "9422 - fetch_df_all() for TIMESTAMP duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_COL", dtype)])
-    value = datetime.datetime(2025, 1, 14)
-    parameters = dict(value=value)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        union all
-        select cast(:value as timestamp) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9423(dtype, value_is_date, async_conn):
-    "9423 - fetch_df_all() for TIMESTAMP WITH LOCAL TIME ZONE duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_LTZ_COL", dtype)])
-    value = datetime.datetime(2025, 3, 6)
-    parameters = dict(value=value)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        union all
-        select cast(:value as timestamp with local time zone) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_LTZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_LTZ_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value_is_date",
-    [
-        (pyarrow.date32(), True),
-        (pyarrow.date64(), True),
-        (pyarrow.timestamp("s"), False),
-        (pyarrow.timestamp("us"), False),
-        (pyarrow.timestamp("ms"), False),
-        (pyarrow.timestamp("ns"), False),
-    ],
-)
-async def test_9424(dtype, value_is_date, async_conn):
-    "9424 - fetch_df_all() for TIMESTAMP WITH TIME ZONE duplicate values"
-    requested_schema = pyarrow.schema([("TIMESTAMP_TZ_COL", dtype)])
-    value = datetime.datetime(2025, 2, 28)
-    parameters = dict(value=value)
-    ora_df = await async_conn.fetch_df_all(
-        """
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        union all
-        select cast(:value as timestamp with time zone) from dual
-        """,
-        parameters,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("TIMESTAMP_TZ_COL").type == dtype
-    if value_is_date:
-        value = value.date()
-    for fetched_value in tab["TIMESTAMP_TZ_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "db_type_name",
-    ["CHAR", "NCHAR", "VARCHAR2", "NVARCHAR2"],
-)
-@pytest.mark.parametrize("dtype", [pyarrow.string(), pyarrow.large_string()])
-async def test_9425(db_type_name, dtype, async_conn):
-    "9425 - fetch_df_all() for string types duplicate values"
-    value = "test_9425"
-    requested_schema = pyarrow.schema([("STRING_COL", dtype)])
-    ora_df = await async_conn.fetch_df_all(
-        f"""
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        union all
-        select cast('{value}' as {db_type_name}(9)) from dual
-        """,
-        requested_schema=requested_schema,
-    )
-    tab = pyarrow.table(ora_df)
-    assert tab.field("STRING_COL").type == dtype
-    for fetched_value in tab["STRING_COL"]:
-        assert fetched_value.as_py() == value
-
-
-@pytest.mark.parametrize(
-    "dtype,value",
-    [
-        (pyarrow.int8(), -129),
-        (pyarrow.int8(), 128),
-        (pyarrow.int16(), -32769),
-        (pyarrow.int16(), 32768),
-        (pyarrow.int32(), -2147483649),
-        (pyarrow.int32(), 2147483648),
-        (pyarrow.uint8(), -1),
-        (pyarrow.uint8(), 256),
-        (pyarrow.uint16(), -1),
-        (pyarrow.uint16(), 65536),
-        (pyarrow.uint32(), -1),
-        (pyarrow.uint32(), 4294967296),
-    ],
-)
-async def test_9426(dtype, value, async_conn, test_env):
-    "9426 - fetch_df_all() for out of range integer values"
-    requested_schema = pyarrow.schema([("VALUE", dtype)])
-    with test_env.assert_raises_full_code("DPY-4038"):
-        await async_conn.fetch_df_all(
-            "select :1 from dual", [value], requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("value", [b"Too short", b"Much too long"])
-async def test_9427(value, async_conn, test_env):
-    "9427 - fetch_df_all() with fixed width binary violations"
-    requested_schema = pyarrow.schema([("VALUE", pyarrow.binary(length=10))])
-    with test_env.assert_raises_full_code("DPY-4040"):
-        await async_conn.fetch_df_all(
-            "select :1 from dual", [value], requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("num_elements", [1, 3])
-async def test_9428(num_elements, async_conn, test_env):
-    "9428 - fetch_df_all() with wrong requested_schema size"
-    elements = [(f"COL_{i}", pyarrow.string()) for i in range(num_elements)]
-    requested_schema = pyarrow.schema(elements)
-    with test_env.assert_raises_full_code("DPY-2069"):
-        await async_conn.fetch_df_all(
-            "select user, user from dual", requested_schema=requested_schema
-        )
-
-
-@pytest.mark.parametrize("num_elements", [1, 3])
-async def test_9429(num_elements, async_conn, test_env):
-    "9429 - fetch_df_batches() with wrong requested_schema size"
-    elements = [(f"COL_{i}", pyarrow.string()) for i in range(num_elements)]
-    requested_schema = pyarrow.schema(elements)
-    with test_env.assert_raises_full_code("DPY-2069"):
-        async for df in async_conn.fetch_df_batches(
-            "select user, user from dual", requested_schema=requested_schema
-        ):
-            pass
diff --git a/tests/test_9600_direct_path_load.py b/tests/test_9600_direct_path_load.py
deleted file mode 100644
index c437b5f9..00000000
--- a/tests/test_9600_direct_path_load.py
+++ /dev/null
@@ -1,614 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing the Direct Path Load interface.
-"""
-
-import datetime
-import decimal
-
-import pandas
-import pyarrow
-import pytest
-
-TABLE_NAME = "TestDataFrame"
-
-
-@pytest.fixture(autouse=True)
-def module_checks(skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-def empty_tab(cursor):
-    cursor.execute(f"delete from {TABLE_NAME}")
-    cursor.connection.commit()
-
-
-def _verify_data(conn, data, column_names):
-    """
-    Verifies that the data matches what is stored in the table.
-    """
-    select_items = ",".join(column_names)
-    sql = f"select {select_items} from {TABLE_NAME} order by Id"
-    with conn.cursor() as cursor:
-        cursor.execute(sql)
-        assert cursor.fetchall() == data
-
-
-def _verify_data_frame(conn, df, column_names, test_env):
-    """
-    Verifies that the contents of the data frame matches what is stored in the
-    table.
-    """
-    data = test_env.get_data_from_df(df)
-    _verify_data(conn, data, column_names)
-
-
-def test_9600(empty_tab, conn, test_env):
-    "9600 - test basic direct path load with list of tuples"
-    data = [
-        (
-            1,
-            "Alice",
-            "Smith",
-            "New York",
-            "USA",
-            datetime.datetime(1990, 1, 15),
-            50000.50,
-            750,
-        ),
-        (
-            2,
-            "Bob",
-            "Johnson",
-            "London",
-            "UK",
-            datetime.datetime(1985, 6, 20),
-            60000.75,
-            680,
-        ),
-        (
-            3,
-            "Charlie",
-            "Brown",
-            "Paris",
-            "France",
-            datetime.datetime(1992, 3, 10),
-            70000.25,
-            720,
-        ),
-    ]
-    column_names = [
-        "Id",
-        "FirstName",
-        "LastName",
-        "City",
-        "Country",
-        "DateOfBirth",
-        "Salary",
-        "CreditScore",
-    ]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-    )
-    _verify_data(conn, data, column_names)
-
-
-def test_9601(empty_tab, conn, test_env):
-    "9601 - test basic direct path load with dataframe"
-    data = {
-        "Id": [1, 2, 3, 4, 5],
-        "FirstName": ["Alice", "Bob", "Charlie", "David", "Eve"],
-        "LastName": ["Smith", "Johnson", "Brown", "Wilson", "Davis"],
-        "City": ["New York", "London", "Paris", "Tokyo", "Sydney"],
-        "Country": ["USA", "UK", "France", "Japan", "Australia"],
-        "DateOfBirth": [
-            datetime.datetime(1990, 1, 15),
-            datetime.datetime(1985, 6, 20),
-            datetime.datetime(1992, 3, 10),
-            datetime.datetime(1988, 12, 1),
-            datetime.datetime(1995, 5, 5),
-        ],
-        "Salary": [50000.50, 60000.75, 70000.25, 80000.00, 90000.50],
-        "CreditScore": [750, 680, 720, 810, 690],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    _verify_data_frame(conn, df, column_names, test_env)
-
-
-def test_9602(empty_tab, conn, test_env):
-    "960f - test with empty data"
-    data = []
-    column_names = ["Id", "FirstName"]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-    )
-    _verify_data(conn, data, column_names)
-
-
-def test_9603(empty_tab, conn, test_env):
-    "9603 - test with empty data frame"
-    data = {
-        "Id": [],
-        "FirstName": [],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    _verify_data_frame(conn, df, column_names, test_env)
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-def test_9604(batch_size, conn, empty_tab, round_trip_checker, test_env):
-    "9604 - test with various batch sizes"
-    data = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    column_names = ["Id", "FirstName"]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-        batch_size=batch_size,
-    )
-    num_round_trips = 2 + len(data) // batch_size
-    if len(data) % batch_size:
-        num_round_trips += 1
-    assert round_trip_checker.get_value() == num_round_trips
-    _verify_data(conn, data, column_names)
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-def test_9605(batch_size, conn, empty_tab, round_trip_checker, test_env):
-    "9605 - test with various batch sizes with a data frame"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    arrays = [
-        pyarrow.array([i for i, _ in rows], pyarrow.int16()),
-        pyarrow.array([s for _, s in rows], pyarrow.string()),
-    ]
-    df = pyarrow.table(arrays, names).to_pandas()
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=names,
-        data=df,
-        batch_size=batch_size,
-    )
-    num_round_trips = 2 + len(rows) // batch_size
-    if len(rows) % batch_size:
-        num_round_trips += 1
-    assert round_trip_checker.get_value() == num_round_trips
-    _verify_data_frame(conn, df, names, test_env)
-
-
-def test_9606(empty_tab, disable_fetch_lobs, conn, test_env):
-    "9607 - test with all basic data types"
-    column_names = [
-        "Id",
-        "FirstName",
-        "DateOfBirth",
-        "LastUpdated",
-        "Salary",
-        "CreditScore",
-        "IntegerData",
-        "LongIntegerData",
-        "FloatData",
-        "DoubleData",
-        "RawData",
-        "LongData",
-        "LongRawData",
-    ]
-    current_time = datetime.datetime.now()
-    rows = [
-        (
-            1,
-            "Test1",
-            datetime.datetime(1990, 1, 1),
-            current_time,
-            12345.50,
-            700,
-            123456789,
-            123456789012345,
-            1.625,
-            9.87654321,
-            b"\x01\x02\x03\x04\x05",
-            "This is a long text description",
-            b"blob_data_1",
-        ),
-        (
-            2,
-            "Test2",
-            datetime.datetime(1991, 2, 2),
-            current_time,
-            23456.75,
-            750,
-            987654321,
-            987654321098765,
-            5.5,
-            1.23456789,
-            b"\xff\xfe\xfd\xfc\xfb",
-            "Another long description here",
-            b"blob_data_2",
-        ),
-    ]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    _verify_data(conn, rows, column_names)
-
-
-def test_9607(empty_tab, disable_fetch_lobs, conn, test_env):
-    "9607 - test with all basic data types with a data frame"
-    current_time = datetime.datetime.now()
-    column_names = [
-        "Id",
-        "FirstName",
-        "DateOfBirth",
-        "LastUpdated",
-        "Salary",
-        "CreditScore",
-        "IntegerData",
-        "LongIntegerData",
-        "FloatData",
-        "DoubleData",
-        "RawData",
-        "LongData",
-        "LongRawData",
-    ]
-    arrays = [
-        pyarrow.array([1, 2], pyarrow.int8()),
-        pyarrow.array(["Test1", "Test2"], pyarrow.string()),
-        pyarrow.array(
-            [datetime.datetime(1990, 1, 1), datetime.datetime(1991, 2, 2)],
-            pyarrow.timestamp("s"),
-        ),
-        pyarrow.array(
-            [current_time, current_time],
-            pyarrow.timestamp("us"),
-        ),
-        pyarrow.array([12345.50, 23456.75], pyarrow.float32()),
-        pyarrow.array([700, 750], pyarrow.int16()),
-        pyarrow.array([123456789, 987654321], pyarrow.uint32()),
-        pyarrow.array([123456789012345, 987654321098765], pyarrow.uint64()),
-        pyarrow.array([1.625, 5.675], pyarrow.float32()),
-        pyarrow.array([9.87654321, 1.23456789], pyarrow.float64()),
-        pyarrow.array(
-            [b"\x01\x02\x03\x04\x05", b"\xff\xfe\xfd\xfc\xfb"],
-            pyarrow.binary(),
-        ),
-        pyarrow.array(
-            [
-                "This is a long text description",
-                "Another long description here",
-            ],
-            pyarrow.string(),
-        ),
-        pyarrow.array([b"blob_data_1", b"blob_data_2"], pyarrow.binary()),
-    ]
-    df = pyarrow.table(arrays, column_names).to_pandas()
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    _verify_data_frame(conn, df, column_names, test_env)
-
-
-def test_9608(empty_tab, conn, test_env):
-    "9608 - test with null values"
-    column_names = [
-        "Id",
-        "FirstName",
-        "LastName",
-        "City",
-        "Country",
-        "DateOfBirth",
-        "Salary",
-        "CreditScore",
-    ]
-    rows = [
-        (
-            1,
-            "Alice",
-            "Smith",
-            "New York",
-            None,
-            datetime.datetime(1990, 1, 15),
-            50_000.50,
-            750,
-        ),
-        (2, None, "Johnson", None, "UK", None, None, 680),
-        (3, "Charlie", None, "Paris", "France", None, 70_000.25, None),
-        (
-            4,
-            None,
-            None,
-            "Tokyo",
-            None,
-            datetime.datetime(1995, 5, 5),
-            80_000.00,
-            690,
-        ),
-    ]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    _verify_data(conn, rows, column_names)
-
-
-def test_9609(empty_tab, conn, test_env):
-    "9609 - test with null values using a data frame"
-    data = {
-        "Id": [1, 2, 3, 4],
-        "FirstName": ["Alice", None, "Charlie", None],
-        "LastName": ["Smith", "Johnson", None, None],
-        "City": ["New York", None, "Paris", "Tokyo"],
-        "Country": [None, "UK", "France", None],
-        "DateOfBirth": [
-            datetime.datetime(1990, 1, 15),
-            None,
-            None,
-            datetime.datetime(1995, 5, 5),
-        ],
-        "Salary": [50000.50, None, 70000.25, 80000.00],
-        "CreditScore": [750, 680, None, 690],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    _verify_data_frame(conn, df, column_names, test_env)
-
-
-def test_9610(empty_tab, conn, test_env):
-    "9610 - test with the wrong number of columns"
-    column_names = ["Id", "FirstName", "LastName"]
-    rows = [(1, "Alice"), (2, "Joe")]
-    with test_env.assert_raises_full_code("DPY-4009"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-
-
-def test_9611(empty_tab, conn, test_env):
-    "9611 - test with the wrong number of columns using a data frame"
-    column_names = ["Id", "FirstName"]
-    data = {
-        "Id": [1, 2],
-        "FirstName": ["Alice", "Joe"],
-        "LastName": ["Smith", "Johnson"],
-    }
-    df = pandas.DataFrame(data)
-    with test_env.assert_raises_full_code("DPY-4009"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-
-
-def test_9612(empty_tab, conn, test_env):
-    "9612 - test with decimal data"
-    column_names = ["Id", "FirstName", "DecimalData"]
-    rows = [
-        (decimal.Decimal("1"), "Sally", decimal.Decimal("1234567.8910")),
-        (decimal.Decimal("2"), "Jill", decimal.Decimal("9876543.2109")),
-        (decimal.Decimal("3"), "John", decimal.Decimal("5555555.5555")),
-    ]
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        _verify_data(conn, rows, column_names)
-
-
-def test_9613(empty_tab, conn, test_env):
-    "9613 - test with decimal data using a data frame"
-    data = {
-        "Id": [
-            decimal.Decimal("1"),
-            decimal.Decimal("2"),
-            decimal.Decimal("3"),
-        ],
-        "FirstName": ["Sally", "Jill", "John"],
-        "DecimalData": [
-            decimal.Decimal("1234567.8910"),
-            decimal.Decimal("9876543.2109"),
-            decimal.Decimal("5555555.5555"),
-        ],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        _verify_data_frame(conn, df, column_names, test_env)
-
-
-def test_9614(empty_tab, conn, test_env):
-    "9614 - test string data that exceeds the maximum length"
-    column_names = ["Id", "FirstName"]
-    rows = [(1, "Sally"), (2, "Jill" * 26)]
-    with test_env.assert_raises_full_code("DPY-8000"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-
-
-def test_9615(empty_tab, conn, test_env):
-    "9615 - test string data that exceeds the maximum length with a data frame"
-    data = {
-        "Id": [1, 2, 3],
-        "FirstName": ["Sally", "Jill", "John" * 26],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8000"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-
-
-def test_9616(conn, test_env):
-    "9616 - test data that is null"
-    column_names = ["IntCol", "StringCol", "RawCol", "FixedCharCol"]
-    rows = [(100, "String 100", b"Raw", "Fixed"), (2, None, b"Raw", "Fixed")]
-    with test_env.assert_raises_full_code("DPY-8001"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=rows,
-        )
-
-
-def test_9617(conn, test_env):
-    "9617 - test data that is null in a data frame"
-    data = {
-        "IntCol": [100, 200, 300],
-        "StringCol": ["String 100", None, "String 300"],
-        "RawCol": [b"Raw", b"Raw", b"Raw"],
-        "FixedCharCol": ["Fixed", "Fixed", "Fixed"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8001"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=df,
-        )
-
-
-def test_9618(conn, test_env):
-    "9618 - test data containing empty string"
-    column_names = ["IntCol", "StringCol", "RawCol", "FixedCharCol"]
-    rows = [(100, "String 100", b"Raw", "Fixed"), (2, "", b"Raw", "Fixed")]
-    with test_env.assert_raises_full_code("DPY-8001"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=rows,
-        )
-
-
-def test_9619(conn, test_env):
-    "9619 - test data containing empty string in a data frame"
-    data = {
-        "IntCol": [100, 200, 300],
-        "StringCol": ["String 100", "", "String 300"],
-        "RawCol": [b"Raw", b"Raw", b"Raw"],
-        "FixedCharCol": ["Fixed", "Fixed", "Fixed"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8001"):
-        conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=df,
-        )
-
-
-def test_9620(empty_tab, conn, test_env):
-    "9620 - test data is committed on success"
-    column_names = ["Id", "FirstName"]
-    rows = [(1, "Sally"), (2, "Jill")]
-    with test_env.get_connection() as other_conn:
-        other_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-    _verify_data(conn, rows, column_names)
-
-
-def test_9621(empty_tab, conn, test_env):
-    "9621 - test data is committed on success using a data frame"
-    data = {
-        "Id": [1, 2, 3],
-        "FirstName": ["Sally", "Jill", "John"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.get_connection() as other_conn:
-        other_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-    _verify_data_frame(conn, df, column_names, test_env)
diff --git a/tests/test_9700_direct_path_load_async.py b/tests/test_9700_direct_path_load_async.py
deleted file mode 100644
index 812c455d..00000000
--- a/tests/test_9700_direct_path_load_async.py
+++ /dev/null
@@ -1,618 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-"""
-Module for testing the Direct Path Load interface with asyncio.
-"""
-
-import datetime
-import decimal
-
-import pandas
-import pyarrow
-import pytest
-
-TABLE_NAME = "TestDataFrame"
-
-
-@pytest.fixture(autouse=True)
-async def module_checks(anyio_backend, skip_unless_thin_mode):
-    pass
-
-
-@pytest.fixture
-async def empty_tab(async_cursor):
-    await async_cursor.execute(f"delete from {TABLE_NAME}")
-    await async_cursor.connection.commit()
-
-
-async def _verify_data(conn, data, column_names):
-    """
-    Verifies that the data matches what is stored in the table.
-    """
-    select_items = ",".join(column_names)
-    sql = f"select {select_items} from {TABLE_NAME} order by Id"
-    with conn.cursor() as cursor:
-        await cursor.execute(sql)
-        assert await cursor.fetchall() == data
-
-
-async def _verify_data_frame(conn, df, column_names, test_env):
-    """
-    Verifies that the contents of the data frame matches what is stored in the
-    table.
-    """
-    data = test_env.get_data_from_df(df)
-    await _verify_data(conn, data, column_names)
-
-
-async def test_9700(empty_tab, async_conn, test_env):
-    "9700 - test basic direct path load with list of tuples"
-    data = [
-        (
-            1,
-            "Alice",
-            "Smith",
-            "New York",
-            "USA",
-            datetime.datetime(1990, 1, 15),
-            50000.50,
-            750,
-        ),
-        (
-            2,
-            "Bob",
-            "Johnson",
-            "London",
-            "UK",
-            datetime.datetime(1985, 6, 20),
-            60000.75,
-            680,
-        ),
-        (
-            3,
-            "Charlie",
-            "Brown",
-            "Paris",
-            "France",
-            datetime.datetime(1992, 3, 10),
-            70000.25,
-            720,
-        ),
-    ]
-    column_names = [
-        "Id",
-        "FirstName",
-        "LastName",
-        "City",
-        "Country",
-        "DateOfBirth",
-        "Salary",
-        "CreditScore",
-    ]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-    )
-    await _verify_data(async_conn, data, column_names)
-
-
-async def test_9701(empty_tab, async_conn, test_env):
-    "9701 - test basic direct path load with Pandas dataframe"
-    data = {
-        "Id": [1, 2, 3, 4, 5],
-        "FirstName": ["Alice", "Bob", "Charlie", "David", "Eve"],
-        "LastName": ["Smith", "Johnson", "Brown", "Wilson", "Davis"],
-        "City": ["New York", "London", "Paris", "Tokyo", "Sydney"],
-        "Country": ["USA", "UK", "France", "Japan", "Australia"],
-        "DateOfBirth": [
-            datetime.datetime(1990, 1, 15),
-            datetime.datetime(1985, 6, 20),
-            datetime.datetime(1992, 3, 10),
-            datetime.datetime(1988, 12, 1),
-            datetime.datetime(1995, 5, 5),
-        ],
-        "Salary": [50000.50, 60000.75, 70000.25, 80000.00, 90000.50],
-        "CreditScore": [750, 680, 720, 810, 690],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    await _verify_data_frame(async_conn, df, column_names, test_env)
-
-
-async def test_9702(empty_tab, async_conn, test_env):
-    "9702 - test with empty data"
-    data = []
-    column_names = ["Id", "FirstName"]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-    )
-    await _verify_data(async_conn, data, column_names)
-
-
-async def test_9703(empty_tab, async_conn, test_env):
-    "9703 - test with empty data frame"
-    data = {
-        "Id": [],
-        "FirstName": [],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    await _verify_data_frame(async_conn, df, column_names, test_env)
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-async def test_9704(
-    batch_size, async_conn, empty_tab, round_trip_checker_async, test_env
-):
-    "9704 - test with various batch sizes"
-    data = [(i + 1, f"String for row {i + 1}") for i in range(200)]
-    column_names = ["Id", "FirstName"]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=data,
-        batch_size=batch_size,
-    )
-    num_round_trips = 2 + len(data) // batch_size
-    if len(data) % batch_size:
-        num_round_trips += 1
-    assert await round_trip_checker_async.get_value_async() == num_round_trips
-    await _verify_data(async_conn, data, column_names)
-
-
-@pytest.mark.parametrize("batch_size", [1, 5, 99, 199, 200])
-async def test_9705(
-    batch_size, async_conn, empty_tab, round_trip_checker_async, test_env
-):
-    "9705 - test with various batch sizes with a data frame"
-    names = ["Id", "FirstName"]
-    rows = [(i + 1, f"Name {i + 1}") for i in range(200)]
-    arrays = [
-        pyarrow.array([i for i, _ in rows], pyarrow.int16()),
-        pyarrow.array([s for _, s in rows], pyarrow.string()),
-    ]
-    df = pyarrow.table(arrays, names).to_pandas()
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=names,
-        data=df,
-        batch_size=batch_size,
-    )
-    num_round_trips = 2 + len(rows) // batch_size
-    if len(rows) % batch_size:
-        num_round_trips += 1
-    assert await round_trip_checker_async.get_value_async() == num_round_trips
-    await _verify_data_frame(async_conn, df, names, test_env)
-
-
-async def test_9706(empty_tab, disable_fetch_lobs, async_conn, test_env):
-    "9707 - test with all basic data types"
-    column_names = [
-        "Id",
-        "FirstName",
-        "DateOfBirth",
-        "LastUpdated",
-        "Salary",
-        "CreditScore",
-        "IntegerData",
-        "LongIntegerData",
-        "FloatData",
-        "DoubleData",
-        "RawData",
-        "LongData",
-        "LongRawData",
-    ]
-    current_time = datetime.datetime.now()
-    rows = [
-        (
-            1,
-            "Test1",
-            datetime.datetime(1990, 1, 1),
-            current_time,
-            12345.50,
-            700,
-            123456789,
-            123456789012345,
-            1.625,
-            9.87654321,
-            b"\x01\x02\x03\x04\x05",
-            "This is a long text description",
-            b"blob_data_1",
-        ),
-        (
-            2,
-            "Test2",
-            datetime.datetime(1991, 2, 2),
-            current_time,
-            23456.75,
-            750,
-            987654321,
-            987654321098765,
-            5.5,
-            1.23456789,
-            b"\xff\xfe\xfd\xfc\xfb",
-            "Another long description here",
-            b"blob_data_2",
-        ),
-    ]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    await _verify_data(async_conn, rows, column_names)
-
-
-async def test_9707(empty_tab, disable_fetch_lobs, async_conn, test_env):
-    "9707 - test with all basic data types with a data frame"
-    current_time = datetime.datetime.now()
-    column_names = [
-        "Id",
-        "FirstName",
-        "DateOfBirth",
-        "LastUpdated",
-        "Salary",
-        "CreditScore",
-        "IntegerData",
-        "LongIntegerData",
-        "FloatData",
-        "DoubleData",
-        "RawData",
-        "LongData",
-        "LongRawData",
-    ]
-    arrays = [
-        pyarrow.array([1, 2], pyarrow.int8()),
-        pyarrow.array(["Test1", "Test2"], pyarrow.string()),
-        pyarrow.array(
-            [datetime.datetime(1990, 1, 1), datetime.datetime(1991, 2, 2)],
-            pyarrow.timestamp("s"),
-        ),
-        pyarrow.array(
-            [current_time, current_time],
-            pyarrow.timestamp("us"),
-        ),
-        pyarrow.array([12345.50, 23456.75], pyarrow.float32()),
-        pyarrow.array([700, 750], pyarrow.int16()),
-        pyarrow.array([123456789, 987654321], pyarrow.uint32()),
-        pyarrow.array([123456789012345, 987654321098765], pyarrow.uint64()),
-        pyarrow.array([1.625, 5.675], pyarrow.float32()),
-        pyarrow.array([9.87654321, 1.23456789], pyarrow.float64()),
-        pyarrow.array(
-            [b"\x01\x02\x03\x04\x05", b"\xff\xfe\xfd\xfc\xfb"],
-            pyarrow.binary(),
-        ),
-        pyarrow.array(
-            [
-                "This is a long text description",
-                "Another long description here",
-            ],
-            pyarrow.string(),
-        ),
-        pyarrow.array([b"blob_data_1", b"blob_data_2"], pyarrow.binary()),
-    ]
-    df = pyarrow.table(arrays, column_names).to_pandas()
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    await _verify_data_frame(async_conn, df, column_names, test_env)
-
-
-async def test_9708(empty_tab, async_conn, test_env):
-    "9708 - test with null values"
-    column_names = [
-        "Id",
-        "FirstName",
-        "LastName",
-        "City",
-        "Country",
-        "DateOfBirth",
-        "Salary",
-        "CreditScore",
-    ]
-    rows = [
-        (
-            1,
-            "Alice",
-            "Smith",
-            "New York",
-            None,
-            datetime.datetime(1990, 1, 15),
-            50_000.50,
-            750,
-        ),
-        (2, None, "Johnson", None, "UK", None, None, 680),
-        (3, "Charlie", None, "Paris", "France", None, 70_000.25, None),
-        (
-            4,
-            None,
-            None,
-            "Tokyo",
-            None,
-            datetime.datetime(1995, 5, 5),
-            80_000.00,
-            690,
-        ),
-    ]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    await _verify_data(async_conn, rows, column_names)
-
-
-async def test_9709(empty_tab, async_conn, test_env):
-    "9709 - test with null values using a data frame"
-    data = {
-        "Id": [1, 2, 3, 4],
-        "FirstName": ["Alice", None, "Charlie", None],
-        "LastName": ["Smith", "Johnson", None, None],
-        "City": ["New York", None, "Paris", "Tokyo"],
-        "Country": [None, "UK", "France", None],
-        "DateOfBirth": [
-            datetime.datetime(1990, 1, 15),
-            None,
-            None,
-            datetime.datetime(1995, 5, 5),
-        ],
-        "Salary": [50000.50, None, 70000.25, 80000.00],
-        "CreditScore": [750, 680, None, 690],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    await _verify_data_frame(async_conn, df, column_names, test_env)
-
-
-async def test_9710(empty_tab, async_conn, test_env):
-    "9710 - test with the wrong number of columns"
-    column_names = ["Id", "FirstName", "LastName"]
-    rows = [(1, "Alice"), (2, "Joe")]
-    with test_env.assert_raises_full_code("DPY-4009"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-
-
-async def test_9711(empty_tab, async_conn, test_env):
-    "9711 - test with the wrong number of columns using a data frame"
-    column_names = ["Id", "FirstName"]
-    data = {
-        "Id": [1, 2],
-        "FirstName": ["Alice", "Joe"],
-        "LastName": ["Smith", "Johnson"],
-    }
-    df = pandas.DataFrame(data)
-    with test_env.assert_raises_full_code("DPY-4009"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-
-
-async def test_9712(empty_tab, async_conn, test_env):
-    "9712 - test with decimal data"
-    column_names = ["Id", "FirstName", "DecimalData"]
-    rows = [
-        (decimal.Decimal("1"), "Sally", decimal.Decimal("1234567.8910")),
-        (decimal.Decimal("2"), "Jill", decimal.Decimal("9876543.2109")),
-        (decimal.Decimal("3"), "John", decimal.Decimal("5555555.5555")),
-    ]
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=rows,
-    )
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        await _verify_data(async_conn, rows, column_names)
-
-
-async def test_9713(empty_tab, async_conn, test_env):
-    "9713 - test with decimal data using a data frame"
-    data = {
-        "Id": [
-            decimal.Decimal("1"),
-            decimal.Decimal("2"),
-            decimal.Decimal("3"),
-        ],
-        "FirstName": ["Sally", "Jill", "John"],
-        "DecimalData": [
-            decimal.Decimal("1234567.8910"),
-            decimal.Decimal("9876543.2109"),
-            decimal.Decimal("5555555.5555"),
-        ],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    await async_conn.direct_path_load(
-        schema_name=test_env.main_user,
-        table_name=TABLE_NAME,
-        column_names=column_names,
-        data=df,
-    )
-    with test_env.defaults_context_manager("fetch_decimals", True):
-        await _verify_data_frame(async_conn, df, column_names, test_env)
-
-
-async def test_9714(empty_tab, async_conn, test_env):
-    "9714 - test string data that exceeds the maximum length"
-    column_names = ["Id", "FirstName"]
-    rows = [(1, "Sally"), (2, "Jill" * 26)]
-    with test_env.assert_raises_full_code("DPY-8000"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-
-
-async def test_9715(empty_tab, async_conn, test_env):
-    "9715 - test string data that exceeds the maximum length with a data frame"
-    data = {
-        "Id": [1, 2, 3],
-        "FirstName": ["Sally", "Jill", "John" * 26],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8000"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-
-
-async def test_9716(async_conn, test_env):
-    "9716 - test data that is null"
-    column_names = ["IntCol", "StringCol", "RawCol", "FixedCharCol"]
-    rows = [(100, "String 100", b"Raw", "Fixed"), (2, None, b"Raw", "Fixed")]
-    with test_env.assert_raises_full_code("DPY-8001"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=rows,
-        )
-
-
-async def test_9717(async_conn, test_env):
-    "9717 - test data that is null in a data frame"
-    data = {
-        "IntCol": [100, 200, 300],
-        "StringCol": ["String 100", None, "String 300"],
-        "RawCol": [b"Raw", b"Raw", b"Raw"],
-        "FixedCharCol": ["Fixed", "Fixed", "Fixed"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8001"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=df,
-        )
-
-
-async def test_9718(async_conn, test_env):
-    "9718 - test data containing empty string"
-    column_names = ["IntCol", "StringCol", "RawCol", "FixedCharCol"]
-    rows = [(100, "String 100", b"Raw", "Fixed"), (2, "", b"Raw", "Fixed")]
-    with test_env.assert_raises_full_code("DPY-8001"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=rows,
-        )
-
-
-async def test_9719(async_conn, test_env):
-    "9719 - test data containing empty string in a data frame"
-    data = {
-        "IntCol": [100, 200, 300],
-        "StringCol": ["String 100", "", "String 300"],
-        "RawCol": [b"Raw", b"Raw", b"Raw"],
-        "FixedCharCol": ["Fixed", "Fixed", "Fixed"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    with test_env.assert_raises_full_code("DPY-8001"):
-        await async_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name="TestStrings",
-            column_names=column_names,
-            data=df,
-        )
-
-
-async def test_9720(empty_tab, async_conn, test_env):
-    "9720 - test data is committed on success"
-    column_names = ["Id", "FirstName"]
-    rows = [(1, "Sally"), (2, "Jill")]
-    async with test_env.get_connection_async() as other_conn:
-        await other_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=rows,
-        )
-    await _verify_data(async_conn, rows, column_names)
-
-
-async def test_9721(empty_tab, async_conn, test_env):
-    "9721 - test data is committed on success using a data frame"
-    data = {
-        "Id": [1, 2, 3],
-        "FirstName": ["Sally", "Jill", "John"],
-    }
-    df = pandas.DataFrame(data)
-    column_names = list(df.columns.tolist())
-    async with test_env.get_connection_async() as other_conn:
-        await other_conn.direct_path_load(
-            schema_name=test_env.main_user,
-            table_name=TABLE_NAME,
-            column_names=column_names,
-            data=df,
-        )
-    await _verify_data_frame(async_conn, df, column_names, test_env)
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index cda48460..00000000
--- a/tox.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[tox]
-envlist = py{39,310,311,312,313,314}-{thin,thick}
-
-[testenv]
-extras = test
-passenv =
-    PYO_TEST_MAIN_USER
-    PYO_TEST_MAIN_PASSWORD
-    PYO_TEST_PROXY_USER
-    PYO_TEST_PROXY_PASSWORD
-    PYO_TEST_CONNECT_STRING
-    PYO_TEST_ADMIN_USER
-    PYO_TEST_ADMIN_PASSWORD
-    PYO_TEST_WALLET_LOCATION
-    PYO_TEST_WALLET_PASSWORD
-    PYO_TEST_EXTERNAL_USER
-    PYO_TEST_EDITION_NAME
-    PYO_TEST_ORACLE_CLIENT_PATH
-    DPI_DEBUG_LEVEL
-    ORACLE_HOME
-
-[testenv:py{39,310,311,312,313,314}-thick]
-commands = {envpython} -m pytest --use-thick-mode
-
-[testenv:py{39,310,311,312,313,314}-thin]
-commands = {envpython} -m pytest
diff --git a/utils/Makefile b/utils/Makefile
deleted file mode 100644
index 420358ab..00000000
--- a/utils/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# Makefile to generate parameter files from templates
-#------------------------------------------------------------------------------
-
-
-SOURCE_DIR = ../src/oracledb
-TEMPLATE_DIR = templates
-
-all: $(SOURCE_DIR)/connect_params.py $(SOURCE_DIR)/pool_params.py \
-		$(SOURCE_DIR)/connection.py $(SOURCE_DIR)/pool.py
-
-BASE_DEPS = fields.cfg build_from_template.py
-
-$(SOURCE_DIR)/connection.py: $(BASE_DEPS) $(TEMPLATE_DIR)/connection.py
-	python build_from_template.py connection
-
-$(SOURCE_DIR)/connect_params.py: $(BASE_DEPS) $(TEMPLATE_DIR)/connect_params.py
-	python build_from_template.py connect_params
-
-$(SOURCE_DIR)/pool.py: $(BASE_DEPS) $(TEMPLATE_DIR)/pool.py
-	python build_from_template.py pool
-
-$(SOURCE_DIR)/pool_params.py: $(BASE_DEPS) $(TEMPLATE_DIR)/pool_params.py
-	python build_from_template.py pool_params
diff --git a/utils/README.md b/utils/README.md
deleted file mode 100644
index aedbe10a..00000000
--- a/utils/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory contains utility scripts for generating parameter files from
-templates using the configuration stored in fields.cfg.
-
-Generation is used instead of dynamic runtime equivalents in order to allow
-static analyzers (such as those used in Visual Studio Code) to benefit.
diff --git a/utils/build_from_template.py b/utils/build_from_template.py
deleted file mode 100644
index a0603c59..00000000
--- a/utils/build_from_template.py
+++ /dev/null
@@ -1,358 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# build_from_template.py
-#
-# Builds the parameter file from the template supplied on the command line.
-# The generated file is written to the src/oracledb directory. The following
-# template keys are recognized:
-#
-#   # {{ args_help_with_defaults }}
-#       is replaced by the arguments help string with field defaults
-#   # {{ async_args_help_with_defaults }}
-#       is replaced by the arguments help string with field defaults (async)
-#   # {{ args_help_without_defaults }}
-#       is replaced by the arguments help string without field defaults
-#   # {{ args_with_defaults }}
-#       is replaced by the arguments with field defaults included
-#   # {{ async_args_with_defaults }}
-#       is replaced by the arguments with field defaults included (async)
-#   # {{ generated_notice }}
-#       is replaced by a notice that the file is generated and should not be
-#       modified directly
-#   # {{ params_constructor_args }}
-#       is replaced by the constructor arguments for parameters
-#   # {{ params_properties }}
-#       is replaced by generated property getter and setter methods
-#   # {{ params_repr }}
-#       is replaced by a generated repr() for parameters
-#   # {{ params_setter_args }}
-#       is replaced by the arguments for the parameter set() method
-#
-# All of these could be accomplished by decorators, but doing so would
-# eliminate the usefulness of static analyzers such as those used within Visual
-# Studio Code.
-# -----------------------------------------------------------------------------
-
-import argparse
-import configparser
-import dataclasses
-import os
-import subprocess
-import sys
-import textwrap
-
-TEXT_WIDTH = 79
-
-
-@dataclasses.dataclass
-class Field:
-    name: str = ""
-    typ: str = ""
-    default: str = ""
-    hidden: bool = False
-    pool_only: bool = False
-    description: str = ""
-    source: str = None
-
-    def get_arg_string(self, with_async: bool = False) -> str:
-        """
-        Returns the string defining the argument when used in a function
-        definition.
-        """
-        typ = self.typ
-        if with_async:
-            typ = typ.replace(
-                "oracledb.Connection", "oracledb.AsyncConnection"
-            )
-        return f"{self.name}: Optional[{typ}] = None,"
-
-    def get_help_string(
-        self, indent: str, with_default: bool = False, with_async: bool = False
-    ) -> str:
-        """
-        Returns the help string to use for the field with the given
-        indentation.
-        """
-        description = self.description
-        if with_async:
-            description = description.replace(
-                "oracledb.Connection", "oracledb.AsyncConnection"
-            )
-        raw_help_string = f"- ``{self.name}``: {description}"
-        help_string = textwrap.fill(
-            raw_help_string,
-            initial_indent=indent,
-            subsequent_indent=indent + "  ",
-            width=TEXT_WIDTH,
-        )
-        if with_default:
-            if self.default.startswith("oracledb.defaults"):
-                default_attr_name = self.default.split(".")[-1]
-                help_string += (
-                    f"\n{indent}  (default: :attr:`{self.default}"
-                    f"\n{indent}  <Defaults.{default_attr_name}>`)"
-                )
-            elif self.default.startswith("oracledb."):
-                help_string += f"\n{indent}  (default: :attr:`{self.default}`)"
-            else:
-                help_string += f"\n{indent}  (default: {self.default})"
-        return help_string
-
-
-# parse command line
-parser = argparse.ArgumentParser(description="build module from template")
-parser.add_argument("name", help="the name of the module to generate")
-args = parser.parse_args()
-
-# determine location of template and source and validate template
-base_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-target_dir = os.path.join(os.path.dirname(base_dir), "src", "oracledb")
-template_name = os.path.join(base_dir, "templates", f"{args.name}.py")
-config_name = os.path.join(base_dir, "fields.cfg")
-target_name = os.path.join(target_dir, f"{args.name}.py")
-if not os.path.exists(template_name):
-    raise Exception(f"template {template_name} does not exist!")
-if not os.path.exists(config_name):
-    raise Exception(f"configuration {config_name} does not exist!")
-code = open(template_name).read()
-pool_only = "pool" in args.name
-
-# acquire the fields from the configuration file
-fields = []
-config = configparser.ConfigParser()
-config.read(config_name)
-for section in config.sections():
-    field = Field()
-    field.name = section
-    field.typ = config.get(section, "type")
-    field.default = config.get(section, "default", fallback="None")
-    field.hidden = config.getboolean(section, "hidden", fallback=False)
-    field.pool_only = config.getboolean(section, "pool_only", fallback=False)
-    field.description = config.get(section, "description", fallback="").strip()
-    field.source = config.get(section, "source", fallback=None)
-    if not field.pool_only or pool_only:
-        fields.append(field)
-
-
-def replace_tag(tag, content_generator):
-    """
-    Replaces a template tag with content generated by a function. The content
-    found before the tag is passed to the generator function.
-    """
-    global code
-    search_value = "# {{ " + tag + " }}"
-    while True:
-        pos = code.find(search_value)
-        if pos < 0:
-            break
-        prev_line_pos = code[:pos].rfind("\n")
-        indent = code[prev_line_pos + 1 : pos]
-        content = content_generator(indent)
-        code = code[:pos] + content + code[pos + len(search_value) :]
-
-
-def args_help_with_defaults_content(indent):
-    """
-    Generates the content for the args_help_with_defaults template tag.
-    """
-    descriptions = [
-        f.get_help_string(indent, with_default=True) for f in fields
-    ]
-    return "\n\n".join(descriptions).strip()
-
-
-def args_help_without_defaults_content(indent):
-    """
-    Generates the content for the args_help_without_defaults template tag.
-    """
-    descriptions = [f.get_help_string(indent) for f in fields]
-    return "\n\n".join(descriptions).strip()
-
-
-def args_with_defaults_content(indent):
-    """
-    Generates the content for the args_with_defaults template tag.
-    """
-    args_joiner = "\n" + indent
-    args = [f.get_arg_string() for f in fields]
-    return args_joiner.join(args)
-
-
-def async_args_help_with_defaults_content(indent):
-    """
-    Generates the content for the async_args_help_with_defaults template tag.
-    """
-    descriptions = [
-        f.get_help_string(indent, with_default=True, with_async=True)
-        for f in fields
-    ]
-    return "\n\n".join(descriptions).strip()
-
-
-def async_args_with_defaults_content(indent):
-    """
-    Generates the content for the async_args_with_defaults template tag.
-    """
-    args_joiner = "\n" + indent
-    args = [f.get_arg_string(with_async=True) for f in fields]
-    return args_joiner.join(args)
-
-
-def generated_notice_content(indent):
-    """
-    Generates the content for the generated_notice template tag.
-    """
-    notice = """
-            *** NOTICE *** This file is generated from a template and should
-            not be modified directly. See build_from_template.py in the utils
-            subdirectory for more information."""
-    return textwrap.fill(
-        textwrap.dedent(notice).strip(),
-        subsequent_indent=indent,
-        width=TEXT_WIDTH,
-    )
-
-
-def params_constructor_args_content(indent):
-    """
-    Generates the content for the params_constructor_args template tag.
-    """
-    args_joiner = f"\n{indent}"
-    args = ["self,", "*,"] + [
-        f"{f.name}: Optional[{f.typ}] = None," for f in fields
-    ]
-    return args_joiner.join(args)
-
-
-def params_properties_content(indent):
-    """
-    Generates the content for the params_properties template tag.
-    """
-    functions = []
-    for field in sorted(fields, key=lambda f: f.name.upper()):
-        if field.hidden:
-            continue
-        if field.pool_only != pool_only:
-            continue
-        description = f"{field.description[0].upper()}{field.description[1:]}."
-        doc_string = textwrap.fill(
-            description,
-            initial_indent="    ",
-            subsequent_indent="    ",
-            width=TEXT_WIDTH - len(indent),
-        )
-        return_type = (
-            f"Union[list, {field.typ}]" if field.source else field.typ
-        )
-
-        if field.source is None:
-            source = "self._impl"
-        else:
-            source = field.source[0]
-        fragment = f"{source}.{field.name}"
-        if field.typ.startswith("oracledb"):
-            fragment = f"{field.typ}({fragment})"
-        if field.source is None:
-            body_lines = [f"    return {fragment}"]
-        elif field.source == "address":
-            body_lines = [
-                "    return [",
-                "        " + fragment,
-                "        for a in self._impl._get_addresses()",
-                "    ]",
-            ]
-        else:
-            body_lines = [
-                "    return [",
-                "        " + fragment,
-                "        for d in self._impl.description_list.children" "]",
-            ]
-        body_lines = (
-            [
-                "@property",
-                "@_flatten_value" if field.source is not None else "",
-                f"def {field.name}(self) -> {return_type}:",
-                '    """',
-            ]
-            + doc_string.splitlines()
-            + ['    """']
-            + body_lines
-        )
-        joiner = "\n" + indent
-        functions.append(joiner.join(s for s in body_lines if s))
-    joiner = "\n\n" + indent
-    return joiner.join(functions)
-
-
-def params_repr_content(indent):
-    """
-    Generates the content for the params_repr template tag.
-    """
-    parts = [
-        f'\n{indent}        f"{field.name}={{self.{field.name}!r}}, "'
-        for field in fields
-        if not field.hidden
-    ]
-    parts[-1] = parts[-1][:-3] + '"'
-    func_def = "def __repr__(self):"
-    return (
-        func_def
-        + f"\n{indent}    return ("
-        + f'\n{indent}        self.__class__.__qualname__ + "("'
-        + "".join(parts)
-        + f'\n{indent}        ")"'
-        + f"\n{indent}    )"
-    )
-
-
-def params_setter_args_content(indent):
-    """
-    Generates the content for the params_setter_args template tag.
-    """
-    args_joiner = f"\n{indent}"
-    args = ["self,", "*,"] + [
-        f"{f.name}: Optional[{f.typ}] = None," for f in fields
-    ]
-    return args_joiner.join(args)
-
-
-# replace generated_notice template tag
-replace_tag("args_help_with_defaults", args_help_with_defaults_content)
-replace_tag(
-    "async_args_help_with_defaults", async_args_help_with_defaults_content
-)
-replace_tag("args_help_without_defaults", args_help_without_defaults_content)
-replace_tag("args_with_defaults", args_with_defaults_content)
-replace_tag("async_args_with_defaults", async_args_with_defaults_content)
-replace_tag("generated_notice", generated_notice_content)
-replace_tag("params_constructor_args", params_constructor_args_content)
-replace_tag("params_properties", params_properties_content)
-replace_tag("params_repr", params_repr_content)
-replace_tag("params_setter_args", params_setter_args_content)
-
-# write the final code to the target location
-open(target_name, "w").write(code)
-subprocess.call([sys.executable, "-m", "black", target_name])
diff --git a/utils/fields.cfg b/utils/fields.cfg
deleted file mode 100644
index 281735eb..00000000
--- a/utils/fields.cfg
+++ /dev/null
@@ -1,556 +0,0 @@
-#------------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# fields.cfg
-#
-# Contains the fields found on the ConnectParams and PoolParams classes.
-#------------------------------------------------------------------------------
-
-# pool only parameters
-
-[min]
-type = int
-default: 1
-pool_only: True
-description =
-    the minimum number of connections the pool should contain
-
-[max]
-type = int
-default: 2
-pool_only: True
-description =
-    the maximum number of connections the pool should contain
-
-[increment]
-type = int
-default: 1
-pool_only: True
-description =
-    the number of connections that should be added to the pool whenever the
-    pool needs to grow
-
-[connectiontype]
-type = Type["oracledb.Connection"]
-pool_only: True
-description =
-    the class of the connection that should be returned during calls to
-    pool.acquire(). It must be oracledb.Connection or a subclass of
-    oracledb.Connection
-
-[getmode]
-type = oracledb.PoolGetMode
-default = oracledb.POOL_GETMODE_WAIT
-pool_only: True
-description =
-    how pool.acquire() will behave. One of the constants
-    :data:`oracledb.POOL_GETMODE_WAIT`, :data:`oracledb.POOL_GETMODE_NOWAIT`,
-    :data:`oracledb.POOL_GETMODE_FORCEGET`, or
-    :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-
-[homogeneous]
-type = bool
-default = True
-pool_only: True
-description =
-    a boolean indicating whether the connections in the pool are homogeneous
-    (same user) or heterogeneous (multiple users)
-
-[timeout]
-type = int
-default = 0
-pool_only: True
-description =
-    the length of time (in seconds) that a connection may remain idle in the
-    pool before it is terminated. If it is 0 then connections are never
-    terminated
-
-[wait_timeout]
-type = int
-default = 0
-pool_only: True
-description =
-    the length of time (in milliseconds) that a caller should wait when
-    acquiring a connection from the pool with getmode set to
-    :data:`oracledb.POOL_GETMODE_TIMEDWAIT`
-
-[max_lifetime_session]
-type = int
-default = 0
-pool_only: True
-description =
-    the length of time (in seconds) that connections can remain in the pool. If
-    it is 0 then connections may remain in the pool indefinitely
-
-[session_callback]
-type = Callable
-pool_only: True
-description =
-    a callable that is invoked when a connection is returned from the pool for
-    the first time, or when the connection tag differs from the one requested
-
-[max_sessions_per_shard]
-type = int
-default = 0
-pool_only: True
-description =
-    the maximum number of connections that may be associated with a particular
-    shard
-
-[soda_metadata_cache]
-type = bool
-default = False
-pool_only: True
-description =
-    a boolean indicating whether or not the SODA metadata cache should be enabled
-
-[ping_interval]
-type = int
-default = 60
-pool_only: True
-description =
-    the length of time (in seconds) after which an unused connection in the
-    pool will be a candidate for pinging when pool.acquire() is called. If the
-    ping to the database indicates the connection is not alive a replacement
-    connection will be returned by pool.acquire(). If ping_interval is a
-    negative value the ping functionality will be disabled
-
-[ping_timeout]
-type = int
-default = 5000
-pool_only: True
-description =
-    the maximum length of time (in milliseconds) to wait for a connection in
-    the pool to respond to an internal ping to the database before being
-    discarded and replaced during a call to acquire()
-
-
-# common parameters
-
-[user]
-type = str
-description =
-    the name of the database user to connect to
-
-[proxy_user]
-type = str
-description =
-    the name of the proxy user to connect to. If this value is not specified,
-    it will be parsed out of user if user is in the form "user[proxy_user]"
-
-[password]
-type = str
-hidden = True
-description =
-    the password for the database user
-
-[newpassword]
-type = str
-hidden = True
-description =
-    a new password for the database user. The new password will take effect
-    immediately upon a successful connection to the database
-
-[wallet_password]
-type = str
-hidden = True
-description =
-    the password to use to decrypt the wallet, if it is encrypted. This is not
-    the database password. For Oracle Autonomous Database this is the password
-    created when downloading the wallet. This value is only used in
-    python-oracledb Thin mode.
-
-[access_token]
-type = Union[str, tuple, Callable]
-hidden = True
-description =
-    a string, or a 2-tuple, or a callable. If it is a string, it specifies an
-    Entra ID OAuth2 token used for Open Authorization (OAuth 2.0) token based
-    authentication. If it is a 2-tuple, it specifies the token and private key
-    strings used for Oracle Cloud Infrastructure (OCI) Identity and Access
-    Management (IAM) token based authentication. If it is a callable, it
-    returns either a string or a 2-tuple used for OAuth 2.0 or OCI IAM token
-    based authentication and is useful when the pool needs to expand and create
-    new connections but the current authentication token has expired
-
-[host]
-type = str
-source = address
-description =
-    the hostname or IP address of the machine hosting the database or the
-    database listener
-
-[port]
-type = int
-default = 1521
-source = address
-description =
-    the port number on which the database listener is listening
-
-[protocol]
-type = str
-default = "tcp"
-source = address
-description =
-    one of the strings "tcp" or "tcps" indicating whether to use unencrypted
-    network traffic or encrypted network traffic (TLS)
-
-[https_proxy]
-type = str
-source = address
-description =
-    the hostname or IP address of a proxy host to use for tunneling secure
-    connections
-
-[https_proxy_port]
-type = int
-default = 0
-source = address
-description =
-    the port on which to communicate with the proxy host
-
-[service_name]
-type = str
-source = description
-description =
-    the service name of the database
-
-[instance_name]
-type = str
-source = description
-description =
-    the instance name of the database
-
-[sid]
-type = str
-source = description
-description =
-    the system identifier (SID) of the database.
-    Note using a service_name instead is recommended
-
-[server_type]
-type = str
-source = description
-description =
-    the type of server connection that should be established. If specified, it
-    should be one of strings "dedicated", "shared" or "pooled"
-
-[cclass]
-type = str
-source = description
-description =
-    the connection class to use for Database Resident Connection Pooling (DRCP)
-
-[purity]
-type = oracledb.Purity
-default = oracledb.PURITY_DEFAULT
-source = description
-description =
-    the connection purity to use for Database Resident Connection Pooling
-    (DRCP)
-
-[expire_time]
-type = int
-default = 0
-source = description
-description =
-    the number of minutes between the sending of keepalive probes. If this
-    parameter is set to a value greater than zero it enables keepalive
-
-[retry_count]
-type = int
-default = 0
-source = description
-description =
-    the number of times that initial connection establishment should be retried
-    before the connection attempt is terminated
-
-[retry_delay]
-type = int
-default = 1
-source = description
-description =
-    the number of seconds to wait before retrying to establish a connection
-
-[tcp_connect_timeout]
-type = float
-default = 20.0
-source = description
-description =
-    a float indicating the maximum number of seconds to wait when establishing
-    a connection to the database host
-
-[ssl_server_dn_match]
-type = bool
-default = True
-source = description
-description =
-    a boolean indicating whether the server certificate distinguished name (DN)
-    should be matched in addition to the regular certificate verification that
-    is performed. Note that if the ssl_server_cert_dn parameter is not
-    privided, host name matching is performed instead
-
-[ssl_server_cert_dn]
-type = str
-source = description
-description =
-    the distinguished name (DN) which should be matched with the server. This
-    value is ignored if the ssl_server_dn_match parameter is not set to the
-    value True. If specified this value is used for any verfication.
-    Otherwise the hostname will be used
-
-[wallet_location]
-type = str
-source = description
-description =
-    the directory where the wallet can be found. In python-oracledb Thin mode
-    this must be the directory containing the PEM-encoded wallet file
-    ewallet.pem. In python-oracledb Thick mode this must be the directory
-    containing the file cwallet.sso
-
-[events]
-type = bool
-default = False
-description =
-    a boolean specifying whether events mode should be enabled. This value is
-    only used in python-oracledb Thick mode and is needed for continuous query
-    notification and high availability event notifications
-
-[externalauth]
-type = bool
-default = False
-description =
-    a boolean indicating whether to use external authentication
-
-[mode]
-type = oracledb.AuthMode
-default = oracledb.AUTH_MODE_DEFAULT
-description =
-    the authorization mode to use. One of the constants
-    :data:`oracledb.AUTH_MODE_DEFAULT`, :data:`oracledb.AUTH_MODE_PRELIM`,
-    :data:`oracledb.AUTH_MODE_SYSASM`, :data:`oracledb.AUTH_MODE_SYSBKP`,
-    :data:`oracledb.AUTH_MODE_SYSDBA`, :data:`oracledb.AUTH_MODE_SYSDGD`,
-    :data:`oracledb.AUTH_MODE_SYSKMT`, :data:`oracledb.AUTH_MODE_SYSOPER`, or
-    :data:`oracledb.AUTH_MODE_SYSRAC`
-
-[disable_oob]
-type = bool
-default = False
-description =
-    a boolean indicating whether out-of-band breaks should be disabled. This
-    value is only used in python-oracledb Thin mode. It has no effect on
-    Windows which does not support this functionality
-
-[stmtcachesize]
-type = int
-default = oracledb.defaults.stmtcachesize
-description =
-    the size of the statement cache
-
-[edition]
-type = str
-description =
-    edition to use for the connection. This parameter cannot be used
-    simultaneously with the cclass parameter
-
-[tag]
-type = str
-description =
-    identifies the type of connection that should be returned from a pool.
-    This value is only used in python-oracledb Thick mode
-
-[matchanytag]
-type = bool
-default: False
-description =
-    a boolean specifying whether any tag can be used when acquiring a
-    connection from the pool. This value is only used in python-oracledb Thick
-    mode
-
-[config_dir]
-type = str
-default: oracledb.defaults.config_dir
-description =
-    a directory in which the optional tnsnames.ora configuration file is
-    located. This value is only used in python-oracledb Thin mode. For
-    python-oracledb Thick mode, it is used if
-    :attr:`oracledb.defaults.thick_mode_dsn_passthrough
-    <Defaults.thick_mode_dsn_passthrough>` is *False*. Otherwise in Thick mode
-    use the ``config_dir`` parameter of :meth:`oracledb.init_oracle_client()`
-
-[appcontext]
-type = list
-description =
-    application context used by the connection. It should be a list of
-    3-tuples (namespace, name, value) and each entry in the tuple should be
-    a string
-
-[shardingkey]
-type = list
-description =
-    a list of strings, numbers, bytes or dates that identify the database shard
-    to connect to. This value is only used in python-oracledb Thick mode
-
-[supershardingkey]
-type = list
-description =
-    a list of strings, numbers, bytes or dates that identify the database
-    shard to connect to. This value is only used in python-oracledb Thick mode
-
-[debug_jdwp]
-type = str
-description =
-    a string with the format "host=<host>;port=<port>" that specifies the host
-    and port of the PL/SQL debugger. This value is only used in python-oracledb
-    Thin mode.  For python-oracledb Thick mode set the ORA_DEBUG_JDWP
-    environment variable
-
-[connection_id_prefix]
-type = str
-source = description
-description =
-    an application specific prefix that is added to the connection identifier
-    used for tracing
-
-[ssl_context]
-type = Any
-description =
-    an SSLContext object used for connecting to the database using TLS.  This
-    SSL context will be modified to include the private key or any certificates
-    found in a separately supplied wallet. This parameter should only be
-    specified if the default SSLContext object cannot be used
-
-[sdu]
-type = int
-source = description
-default = 8192
-description =
-    the requested size of the Session Data Unit (SDU), in bytes. The value
-    tunes internal buffers used for communication to the database. Bigger
-    values can increase throughput for large queries or bulk data loads, but at
-    the cost of higher memory use. The SDU size that will actually be used is
-    negotiated down to the lower of this value and the database network SDU
-    configuration value
-
-[pool_boundary]
-type = str
-source = description
-description =
-    one of the values "statement" or "transaction" indicating when pooled DRCP
-    connections can be returned to the pool. This requires the use of DRCP with
-    Oracle Database 23.4 or higher
-
-[use_tcp_fast_open]
-type = bool
-default = False
-source = description
-description =
-    a boolean indicating whether to use TCP fast open. This is an Oracle
-    Autonomous Database Serverless (ADB-S) specific property for clients
-    connecting from within OCI Cloud network. Please refer to the ADB-S
-    documentation for more information
-
-[ssl_version]
-type = ssl.TLSVersion
-source = description
-description =
-    one of the values ssl.TLSVersion.TLSv1_2 or ssl.TLSVersion.TLSv1_3
-    indicating which TLS version to use
-
-[program]
-type = str
-default: oracledb.defaults.program
-description =
-   a string recorded by Oracle Database as the program from which the
-   connection originates
-
-[machine]
-type = str
-default: oracledb.defaults.machine
-description =
-   a string recorded by Oracle Database as the name of the machine from which
-   the connection originates
-
-[terminal]
-type = str
-default: oracledb.defaults.terminal
-description =
-   a string recorded by Oracle Database as the terminal identifier from which
-   the connection originates
-
-[osuser]
-type = str
-default: oracledb.defaults.osuser
-description =
-   a string recorded by Oracle Database as the operating system user who
-   originated the connection
-
-[driver_name]
-type = str
-default: oracledb.defaults.driver_name
-description =
-   a string recorded by Oracle Database as the name of the driver which
-   originated the connection
-
-[use_sni]
-type = bool
-default = False
-source = description
-description =
-    a boolean indicating whether to use the TLS SNI extension to bypass the
-    second TLS neogiation that would otherwise be required
-
-[thick_mode_dsn_passthrough]
-type = bool
-default = oracledb.defaults.thick_mode_dsn_passthrough
-description =
-    a boolean indicating whether to pass the connect string to the Oracle
-    Client libraries unchanged without parsing by the driver. Setting this to
-    False makes python-oracledb Thick and Thin mode applications behave
-    similarly regarding connection string parameter handling and locating any
-    optional tnsnames.ora configuration file
-
-[extra_auth_params]
-type = dict
-description =
-    a dictionary containing configuration parameters necessary for Oracle
-    Database authentication using plugins, such as the Azure and OCI
-    cloud-native authentication plugins
-
-[pool_name]
-type = str
-source = description
-description =
-    the name of the DRCP pool when using multi-pool DRCP with Oracle Database
-    23.4, or higher
-
-[handle]
-type = int
-default = 0
-hidden = True
-description =
-    an integer representing a pointer to a valid service context handle. This
-    value is only used in python-oracledb Thick mode. It should be used with
-    extreme caution
diff --git a/utils/templates/connect_params.py b/utils/templates/connect_params.py
deleted file mode 100644
index 35f7aeae..00000000
--- a/utils/templates/connect_params.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2021, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# connect_params.py
-#
-# Contains the ConnectParams class used for managing the parameters required to
-# establish a connection to the database.
-#
-# # {{ generated_notice }}
-# -----------------------------------------------------------------------------
-
-import functools
-import ssl
-from typing import Union, Callable, Any, Optional
-
-import oracledb
-
-from .base import BaseMetaClass
-from . import base_impl, utils
-
-
-class ConnectParams(metaclass=BaseMetaClass):
-    """
-    Contains all parameters used for establishing a connection to the
-    database.
-    """
-
-    __slots__ = ["_impl"]
-    _impl_class = base_impl.ConnectParamsImpl
-
-    @utils.params_initer
-    def __init__(
-        # {{ params_constructor_args }}
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        # {{ args_help_with_defaults }}
-        """
-        pass
-
-    # {{ params_repr }}
-
-    def _flatten_value(f):
-        """
-        Helper function used to flatten arrays of values if they only contain a
-        single item.
-        """
-
-        @functools.wraps(f)
-        def wrapped(self):
-            values = f(self)
-            return values if len(values) > 1 else values[0]
-
-        return wrapped
-
-    # {{ params_properties }}
-
-    def copy(self) -> "ConnectParams":
-        """
-        Creates a copy of the ConnectParams instance and returns it.
-        """
-        params = ConnectParams.__new__(ConnectParams)
-        params._impl = self._impl.copy()
-        return params
-
-    def get_connect_string(self) -> str:
-        """
-        Returns the connection string associated with the instance.
-        """
-        return self._impl.get_connect_string()
-
-    def get_network_service_names(self) -> list:
-        """
-        Returns a list of the network service names found in the
-        :ref:`tnsnames.ora <optnetfiles>` file which is inside the directory
-        that can be identified by the attribute
-        :attr:`~ConnectParams.config_dir`.  If a tnsnames.ora file does not
-        exist, then an exception is raised.
-        """
-        return self._impl.get_network_service_names()
-
-    def parse_connect_string(self, connect_string: str) -> None:
-        """
-        Parses the connect string into its components and stores the
-        parameters.
-
-        The ``connect string`` parameter can be an Easy Connect string,
-        name-value pairs, or a simple alias which is looked up in
-        ``tnsnames.ora``. Parameters that are found in the connect string
-        override any currently stored values.
-        """
-        self._impl.parse_connect_string(connect_string)
-
-    def parse_dsn_with_credentials(self, dsn: str) -> tuple:
-        """
-        Parses a DSN in the form <user>/<password>@<connect_string> or in the
-        form <user>/<password> and returns a 3-tuple containing the parsed
-        user, password and connect string. Empty strings are returned as the
-        value *None*.
-        """
-        return self._impl.parse_dsn_with_credentials(dsn)
-
-    @utils.params_setter
-    def set(
-        # {{ params_setter_args }}
-    ):
-        """
-        Sets the values for one or more of the parameters of a ConnectParams
-        object.  All parameters are optional. A brief description of each
-        parameter follows:
-
-        # {{ args_help_without_defaults }}
-        """
-        pass
-
-    def set_from_config(self, config: dict) -> None:
-        """
-        Sets the property values based on the specified configuration. This
-        method is intended for use with Centralized Configuration Providers.
-
-        The ``config`` parameter is a dictionary which consists of the
-        following optional keys: "connect_descriptor", "user", "password", and
-        "pyo".
-
-        If the key "connect_descriptor" is specified, it is expected to be a
-        string, which will be parsed and the properties found within it are
-        stored in the ConnectParams instance.
-
-        If the keys "user" or "password" are specified, and the parameters do
-        not already have a user or password set, these values will be stored;
-        otherwise, they will be ignored. The key "user" is expected to be a
-        string. The "key" password may be a string or it may be a dictionary
-        which will be examined by a :ref:`registered password type handler
-        <registerpasswordtype>` to determine the actual password.
-
-        If the key "pyo" is specified, it is expected to be a dictionary
-        containing keys corresponding to property names. Any property names
-        accepted by the ConnectParams class will be stored in the ConnectParams
-        instance; all other values will be ignored.
-        """
-        self._impl.set_from_config(config)
diff --git a/utils/templates/connection.py b/utils/templates/connection.py
deleted file mode 100644
index 68a4509b..00000000
--- a/utils/templates/connection.py
+++ /dev/null
@@ -1,2688 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# connection.py
-#
-# Contains the Connection class and the factory method connect() used for
-# establishing connections to the database.
-#
-# # {{ generated_notice }}
-# -----------------------------------------------------------------------------
-
-import collections
-import functools
-import ssl
-from typing import Any, Callable, Iterator, Type, Optional, Union
-
-import oracledb
-
-from . import base_impl, driver_mode, errors, thick_impl, thin_impl
-from . import pool as pool_module
-from .aq import AsyncQueue, Queue, MessageProperties
-from .arrow_impl import ArrowSchemaImpl
-from .base import BaseMetaClass
-from .base_impl import DB_TYPE_BLOB, DB_TYPE_CLOB, DB_TYPE_NCLOB, DbType
-from .connect_params import ConnectParams
-from .cursor import AsyncCursor, Cursor
-from .dataframe import DataFrame
-from .dbobject import DbObjectType, DbObject
-from .lob import AsyncLOB, LOB
-from .pipeline import Pipeline, PipelineOpResult
-from .soda import SodaDatabase
-from .subscr import Subscription
-from .utils import normalize_sessionless_transaction_id
-
-# named tuple used for representing global transactions
-Xid = collections.namedtuple(
-    "Xid", ["format_id", "global_transaction_id", "branch_qualifier"]
-)
-
-
-class BaseConnection(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(self):
-        self._version = None
-
-    def __repr__(self):
-        cls_name = self.__class__._public_name
-        if self._impl is None:
-            return f"<{cls_name} disconnected>"
-        elif self.username is None:
-            return f"<{cls_name} to externally identified user>"
-        return f"<{cls_name} to {self.username}@{self.dsn}>"
-
-    def _verify_connected(self) -> None:
-        """
-        Verifies that the connection is connected to the database. If it is
-        not, an exception is raised.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_NOT_CONNECTED)
-
-    def _verify_xid(self, xid: Xid) -> None:
-        """
-        Verifies that the supplied xid is of the correct type.
-        """
-        if not isinstance(xid, Xid):
-            message = "expecting transaction id created with xid()"
-            raise TypeError(message)
-
-    @property
-    def action(self) -> str:
-        """
-        This write-only attribute sets the ACTION column in the V$SESSION view.
-        It is a string attribute but the value *None* is accepted and treated
-        as an empty string.
-        """
-        raise AttributeError("action is not readable")
-
-    @action.setter
-    def action(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_action(value)
-
-    @property
-    def autocommit(self) -> bool:
-        """
-        This read-write attribute determines whether autocommit mode is on or
-        off.  When autocommit mode is on, all statements are committed as soon
-        as they have completed executing.
-        """
-        self._verify_connected()
-        return self._impl.autocommit
-
-    @autocommit.setter
-    def autocommit(self, value: bool) -> None:
-        self._verify_connected()
-        self._impl.autocommit = value
-
-    def begin_sessionless_transaction(
-        self,
-        transaction_id: Optional[Union[str, bytes]] = None,
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Begins a new sessionless transaction. This method returns the
-        transaction identifier specified by the user or generated by
-        python-oracledb.
-
-        The ``transaction_id`` parameter should be of type string or bytes. If
-        specified, it represents a unique identifier for the transaction. If a
-        string is passed, then it will be UTF-8 encoded to bytes. If this value
-        is not specified, then python-oracledb generates a a random
-        `universally-unique identifier (UUID)
-        <https://www.rfc-editor.org/rfc/rfc4122.txt>`__ value.  An example is
-        "36b8f84d-df4e-4d49-b662-bcde71a8764f". Any user-chosen value cannot
-        exceed 64 bytes in length.
-
-        The ``timeout`` parameter is the number of seconds that this
-        transaction can stay suspended when
-        :meth:`suspend_sessionless_transaction()` is later called,
-        or if the transaction is automatically suspended when the
-        ``suspend_on_success`` parameter is set to to *True* in
-        :meth:`Cursor.execute()` or :meth:`Cursor.executemany()`. The default
-        value is *60* seconds. If a transaction is not resumed within this
-        specified duration, the transaction will be rolled back.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to start a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not isinstance(timeout, int) or timeout <= 0:
-            raise TypeError("timeout must be a positive integer")
-
-        self._impl.begin_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    @property
-    def call_timeout(self) -> int:
-        """
-        This read-write attribute specifies the amount of time (in
-        milliseconds) that a single round-trip to the database may take before
-        a timeout will occur. A value of *0* means that no timeout will take
-        place.
-
-        In python-oracledb Thick mode, this attribute is only available in
-        Oracle Client 18c or later.
-
-        If a timeout occurs, the error ``DPI-1067`` will be returned if the
-        connection is still usable.  Alternatively the error ``DPI-1080`` will
-        be returned if the connection has become invalid and can no longer be
-        used.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        attribute ``callTimeout`` was renamed to ``call_timeout``. The old name
-        will continue to work for a period of time.  The error ``DPI-1080`` was
-        also introduced in this release.
-        """
-        self._verify_connected()
-        return self._impl.get_call_timeout()
-
-    @call_timeout.setter
-    def call_timeout(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_call_timeout(value)
-
-    def cancel(self) -> None:
-        """
-        Breaks a long-running statement.
-        """
-        self._verify_connected()
-        self._impl.cancel()
-
-    @property
-    def client_identifier(self) -> str:
-        """
-        This write-only attribute sets the CLIENT_IDENTIFIER column in the
-        V$SESSION view.
-        """
-        raise AttributeError("client_identifier is not readable")
-
-    @client_identifier.setter
-    def client_identifier(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_client_identifier(value)
-
-    @property
-    def clientinfo(self) -> str:
-        """
-        This write-only attribute sets the CLIENT_INFO column in the V$SESSION
-        view.
-        """
-        raise AttributeError("clientinfo is not readable")
-
-    @clientinfo.setter
-    def clientinfo(self, value: str) -> None:
-        """
-        Specifies the client_info column in the v$session table.
-        """
-        self._verify_connected()
-        self._impl.set_client_info(value)
-
-    @property
-    def current_schema(self) -> str:
-        """
-        This read-write attribute sets the current schema attribute for the
-        session. Setting this value is the same as executing the SQL statement
-        ``ALTER SESSION SET CURRENT_SCHEMA``. The attribute is set (and
-        verified) on the next call that does a round trip to the server. The
-        value is placed before unqualified database objects in SQL statements
-        you then execute.
-        """
-        self._verify_connected()
-        return self._impl.get_current_schema()
-
-    @current_schema.setter
-    def current_schema(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_current_schema(value)
-
-    @property
-    def db_domain(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database domain name
-        associated with the connection. It is the same value returned by the
-        SQL ``SELECT value FROM V$PARAMETER WHERE NAME = 'db_domain'``.
-        """
-        self._verify_connected()
-        return self._impl.get_db_domain()
-
-    @property
-    def db_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database name associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        NAME FROM V$DATABASE``.
-        """
-        self._verify_connected()
-        return self._impl.get_db_name()
-
-    @property
-    def dbop(self) -> str:
-        """
-        This write-only attribute sets the database operation that is to be
-        monitored. This can be viewed in the DBOP_NAME column of the
-        V$SQL_MONITOR view.
-        """
-        raise AttributeError("dbop is not readable")
-
-    @dbop.setter
-    def dbop(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_dbop(value)
-
-    def decode_oson(self, data: bytes) -> Any:
-        """
-        Decodes `OSON-encoded
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-        &id=GUID-911D302C-CFAF-406B-B6A5-4E99DD38ABAD>`__ bytes and returns the
-        object encoded in those bytes.  This is useful for fetching columns
-        which have the check constraint ``IS JSON FORMAT OSON`` enabled.
-        """
-        self._verify_connected()
-        return self._impl.decode_oson(data)
-
-    @property
-    def dsn(self) -> str:
-        """
-        This read-only attribute returns the TNS entry of the database to which
-        a connection has been established.
-        """
-        self._verify_connected()
-        return self._impl.dsn
-
-    @property
-    def econtext_id(self) -> str:
-        """
-        This write-only attribute specifies the execution context id. This
-        value can be found as the ECID column in the V$SESSION view and
-        ECONTEXT_ID in the auditing tables. The maximum length is 64 bytes.
-        """
-        raise AttributeError("econtext_id is not readable")
-
-    @econtext_id.setter
-    def econtext_id(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_econtext_id(value)
-
-    @property
-    def edition(self) -> str:
-        """
-        This read-only attribute gets the session edition and is only available
-        with Oracle Database 11.2, or later.
-        """
-        self._verify_connected()
-        return self._impl.get_edition()
-
-    def encode_oson(self, value: Any) -> bytes:
-        """
-        Encodes a Python value into `OSON-encoded
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest
-        &id=GUID-911D302C-CFAF-406B-B6A5-4E99DD38ABAD>`__ bytes and returns
-        them. This is useful for inserting into columns which have the check
-        constraint ``IS JSON FORMAT OSON`` enabled.
-        """
-        self._verify_connected()
-        return self._impl.encode_oson(value)
-
-    @property
-    def external_name(self) -> str:
-        """
-        This read-write attribute specifies the external name that is used by
-        the connection when logging distributed transactions.
-        """
-        self._verify_connected()
-        return self._impl.get_external_name()
-
-    @external_name.setter
-    def external_name(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_external_name(value)
-
-    @property
-    def inputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each value that
-        is bound to a statement executed on any cursor associated with this
-        connection.  The method signature is handler(cursor, value, arraysize)
-        and the return value is expected to be a variable object or *None* in
-        which case a default variable object will be created. If this attribute
-        is *None*, the default behavior will take place for all values bound to
-        statements.
-        """
-        self._verify_connected()
-        return self._impl.inputtypehandler
-
-    @inputtypehandler.setter
-    def inputtypehandler(self, value: Callable) -> None:
-        self._verify_connected()
-        self._impl.inputtypehandler = value
-
-    @property
-    def instance_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database instance name
-        associated with the connection. It is the same value as the SQL
-        expression ``sys_context('userenv', 'instance_name')``.
-        """
-        self._verify_connected()
-        return self._impl.get_instance_name()
-
-    @property
-    def internal_name(self) -> str:
-        """
-        This read-write attribute specifies the internal name that is used by
-        the connection when logging distributed transactions.
-        """
-        self._verify_connected()
-        return self._impl.get_internal_name()
-
-    @internal_name.setter
-    def internal_name(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_internal_name(value)
-
-    def is_healthy(self) -> bool:
-        """
-        This function returns a boolean indicating the health status of a
-        connection.
-
-        Connections may become unusable in several cases, such as, if the
-        network socket is broken, if an Oracle error indicates the connection
-        is unusable, or, after receiving a planned down notification from the
-        database.
-
-        This function is best used before starting a new database request on an
-        existing :ref:`standalone connections <standaloneconnection>`. For
-        pooled connections, the :meth:`ConnectionPool.acquire()` method
-        internally performs this check before returning a connection to the
-        application, see :ref:`poolhealth`.
-
-        If this function returns *False*, the connection should be not be used
-        by the application and a new connection should be established instead.
-
-        This function performs a local check. To fully check a connection's
-        health, use :meth:`ping()` which performs a round-trip to
-        the database.
-        """
-        return self._impl is not None and self._impl.get_is_healthy()
-
-    @property
-    def ltxid(self) -> bytes:
-        """
-        This read-only attribute returns the logical transaction id for the
-        connection. It is used within Oracle Transaction Guard as a means of
-        ensuring that transactions are not duplicated. See :ref:`tg` for more
-        information.
-
-        This is only available with Oracle Database 12.1 or later. In
-        python-oracledb Thick mode, it also requires Oracle Client libraries
-        12.1 or later.
-        """
-        self._verify_connected()
-        return self._impl.get_ltxid()
-
-    @property
-    def max_identifier_length(self) -> int:
-        """
-        This read-only attribute specifies the maximum database identifier
-        length in bytes supported by the database to which the connection has
-        been established.  See `Database Object Naming Rules
-        <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&
-        id=GUID-75337742-67FD-4EC0-985F-741C93D918DA>`__. The value may be
-        *None*, *30*, or *128*. The value *None* indicates the size cannot be
-        reliably determined by python-oracledb, which occurs when using Thick
-        mode with Oracle Client libraries 12.1 (or older) to connect to Oracle
-        Database 12.2, or later.
-        """
-        self._verify_connected()
-        return self._impl.get_max_identifier_length()
-
-    @property
-    def max_open_cursors(self) -> int:
-        """
-        This read-only attribute specifies the maximum number of cursors that
-        the database can have open concurrently. It is the same value returned
-        by the SQL ``SELECT VALUE FROM V$PARAMETER WHERE NAME =
-        'open_cursors'``. When using python-oracledb Thick mode, Oracle Client
-        libraries 12.1 (or later) are required.
-        """
-        self._verify_connected()
-        return self._impl.get_max_open_cursors()
-
-    @property
-    def module(self) -> str:
-        """
-        This write-only attribute sets the MODULE column in the V$SESSION view.
-        The maximum length for this string is 48 and if you exceed this length
-        you will get ``ORA-24960``.
-        """
-        raise AttributeError("module is not readable")
-
-    @module.setter
-    def module(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.set_module(value)
-
-    def msgproperties(
-        self,
-        payload: Optional[Union[bytes, str, DbObject]] = None,
-        correlation: Optional[str] = None,
-        delay: Optional[int] = None,
-        exceptionq: Optional[str] = None,
-        expiration: Optional[int] = None,
-        priority: Optional[int] = None,
-        recipients: Optional[list] = None,
-    ) -> MessageProperties:
-        """
-        Returns an object specifying the properties of messages used in
-        advanced queuing.
-
-        Each of the parameters are optional. If specified, they act as a
-        shortcut for setting each of the equivalently named properties.
-        """
-        impl = self._impl.create_msg_props_impl()
-        props = MessageProperties._from_impl(impl)
-        if payload is not None:
-            props.payload = payload
-        if correlation is not None:
-            props.correlation = correlation
-        if delay is not None:
-            props.delay = delay
-        if exceptionq is not None:
-            props.exceptionq = exceptionq
-        if expiration is not None:
-            props.expiration = expiration
-        if priority is not None:
-            props.priority = priority
-        if recipients is not None:
-            props.recipients = recipients
-        return props
-
-    def queue(
-        self,
-        name: str,
-        payload_type: Optional[Union[DbObjectType, str]] = None,
-        *,
-        payloadType: Optional[DbObjectType] = None,
-    ) -> Union[Queue, AsyncQueue]:
-        """
-        Creates a queue which is used to enqueue and dequeue messages in
-        Advanced Queuing.
-
-        The ``name`` parameter is expected to be a string identifying the queue
-        in which messages are to be enqueued or dequeued.
-
-        The ``payload_type`` parameter, if specified, is expected to be an
-        :ref:`object type <dbobjecttype>` that identifies the type of payload
-        the queue expects. If the string "JSON" is specified, JSON data is
-        enqueued and dequeued. If not specified, RAW data is enqueued and
-        dequeued.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``payloadType`` was renamed to ``payload_type``. The old name
-        will continue to work as a keyword parameter for a period of time.
-        """
-        self._verify_connected()
-        payload_type_impl = None
-        is_json = False
-        if payloadType is not None:
-            if payload_type is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="payloadType",
-                    new_name="payload_type",
-                )
-            payload_type = payloadType
-        if payload_type is not None:
-            if payload_type == "JSON":
-                is_json = True
-            elif not isinstance(payload_type, DbObjectType):
-                raise TypeError("expecting DbObjectType")
-            else:
-                payload_type_impl = payload_type._impl
-        impl = self._impl.create_queue_impl()
-        impl.initialize(self._impl, name, payload_type_impl, is_json)
-        return self._create_queue(impl)
-
-    @property
-    def outputtypehandler(self) -> Callable:
-        """
-        This read-write attribute specifies a method called for each column
-        that is going to be fetched from any cursor associated with this
-        connection. The method signature is ``handler(cursor, metadata)`` and
-        the return value is expected to be a :ref:`variable object<varobj>` or
-        *None* in which case a default variable object will be created. If this
-        attribute is *None*, the default behavior will take place for all
-        columns fetched from cursors.
-        """
-        self._verify_connected()
-        return self._impl.outputtypehandler
-
-    @outputtypehandler.setter
-    def outputtypehandler(self, value: Callable) -> None:
-        self._verify_connected()
-        self._impl.outputtypehandler = value
-
-    @property
-    def proxy_user(self) -> Union[str, None]:
-        """
-        This read-only attribute returns the name of the user which was used as
-        a proxy when creating the connection to the database.
-        """
-        self._verify_connected()
-        return self._impl.proxy_user
-
-    def resume_sessionless_transaction(
-        self,
-        transaction_id: Union[str, bytes],
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Resumes an existing sessionless transaction using the specified
-        transaction identifier. This method returns the transaction identifier
-        used to resume the sessionless transaction.
-
-        The ``transaction_id`` parameter should be a string or bytes value that
-        uniquely identifies an existing sessionless transaction that is to be
-        resumed.
-
-        The ``timeout`` parameter is the number of seconds that the current
-        connection waits to resume a transaction if another connection is using
-        it.  When ``defer_round_trip`` is set to *False*, the wait happens in
-        the ``resume_sessionless_transaction()`` call itself, and the function
-        blocks until the transaction becomes available or the timeout expires.
-        When ``defer_round_trip`` is set to *True*, the resume is deferred and
-        the wait occurs at the time of the next database operation instead. At
-        the start of the wait period, if the transaction is not in use by any
-        other connection, the resume happens immediately. If the transaction
-        remains in use by the other connection after the timeout period, the
-        error `ORA-25351
-        <https://docs.oracle.com/en/error-help/db/ora-25351>`__ is raised. If
-        another connection completes the transaction, the error `ORA-24756
-        <https://docs.oracle.com/en/error-help/db/ora-24756>`__ is raised.
-        These error messages are only thrown for non-RAC instances. For
-        information on using Oracle RAC, see :ref:`Sessionless Transactions
-        with Oracle RAC <sessionlesstxnswithrac>`.  The default value is *60*
-        seconds.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to resume a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        if transaction_id is None:
-            raise ValueError("transaction_id is required for resuming")
-
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not (isinstance(timeout, int) and timeout >= 0):
-            raise TypeError("timeout must be a non-negative integer")
-
-        self._impl.resume_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    @property
-    def sdu(self) -> int:
-        """
-        This read-only attribute specifies the size of the Session Data Unit
-        (SDU) that is being used by the connection. The value will be the
-        lesser of the requested python-oracledb size and the maximum size
-        allowed by the database network configuration. It is available only in
-        python-oracledb Thin mode. To set the SDU in Thick mode, use a
-        connection string SDU parameter or set a value for DEFAULT_SDU_SIZE in
-        a sqlnet.ora configuration file.
-        """
-        self._verify_connected()
-        return self._impl.get_sdu()
-
-    @property
-    def serial_num(self) -> int:
-        """
-        This read-only attribute specifies the session serial number associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        SERIAL# FROM V$SESSION WHERE SID=SYS_CONTEXT('USERENV', 'SID')``.  It
-        is available only in python-oracledb Thin mode.
-
-        For applications using :ref:`drcp`, the ``serial_num`` attribute may
-        not contain the current session state until a round-trip is made to the
-        database after acquiring a session.  It is recommended to not use this
-        attribute if your application uses DRCP but may not perform a
-        round-trip.
-        """
-        self._verify_connected()
-        return self._impl.get_serial_num()
-
-    @property
-    def service_name(self) -> str:
-        """
-        This read-only attribute specifies the Oracle Database service name
-        associated with the connection.  This is the same value returned by the
-        SQL ``SELECT SYS_CONTEXT('USERENV', 'SERVICE_NAME') FROM DUAL``.
-        """
-        self._verify_connected()
-        return self._impl.get_service_name()
-
-    @property
-    def session_id(self) -> int:
-        """
-        This read-only attribute specifies the session identifier associated
-        with the connection. It is the same value returned by the SQL ``SELECT
-        SYS_CONTEXT('USERENV', 'SID') FROM DUAL``. It is available only in
-        python-oracledb Thin mode.
-
-        For applications using :ref:`drcp`, the ``session_id`` attribute may
-        not contain the current session state until a round-trip is made to the
-        database after acquiring a session.  It is recommended to not use this
-        attribute if your application uses DRCP but may not perform a
-        round-trip.
-        """
-        self._verify_connected()
-        return self._impl.get_session_id()
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        This read-write attribute specifies the size of the statement cache.
-        This value can make a significant difference in performance if you have
-        a small number of statements that you execute repeatedly.
-
-        The default value is *20*.
-        """
-        self._verify_connected()
-        return self._impl.get_stmt_cache_size()
-
-    @stmtcachesize.setter
-    def stmtcachesize(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_stmt_cache_size(value)
-
-    @property
-    def tag(self) -> str:
-        """
-        This read-write attribute initially contains the actual tag of the
-        session that was acquired from a pool by
-        :meth:`ConnectionPool.acquire()`. If the connection was not acquired
-        from a pool or no tagging parameters were specified (``tag`` and
-        ``matchanytag``) when the connection was acquired from the pool, this
-        value will be None. If the value is changed, it must be a string
-        containing name=value pairs like "k1=v1;k2=v2".
-
-        If this value is not *None* when the connection is released back to the
-        pool it will be used to retag the session. This value can be overridden
-        in the call to :meth:`ConnectionPool.release()`.
-        """
-        self._verify_connected()
-        return self._impl.tag
-
-    @tag.setter
-    def tag(self, value: str) -> None:
-        self._verify_connected()
-        self._impl.tag = value
-
-    @property
-    def thin(self) -> bool:
-        """
-        This read-only attribute returns a boolean indicating if
-        python-oracledb is in Thin mode (*True*) or Thick mode (*False*).
-        """
-        self._verify_connected()
-        return self._impl.thin
-
-    @property
-    def transaction_in_progress(self) -> bool:
-        """
-        This read-only attribute specifies whether a transaction is currently
-        in progress on the database associated with the connection.
-        """
-        self._verify_connected()
-        return self._impl.get_transaction_in_progress()
-
-    @property
-    def username(self) -> str:
-        """
-        This read-only attribute returns the name of the user which established
-        the connection to the database.
-        """
-        self._verify_connected()
-        return self._impl.username
-
-    @property
-    def version(self) -> str:
-        """
-        This read-only attribute returns the version of the database to which a
-        connection has been established.
-        """
-        if self._version is None:
-            self._verify_connected()
-            self._version = ".".join(str(c) for c in self._impl.server_version)
-        return self._version
-
-    @property
-    def warning(self) -> Union[errors._Error, None]:
-        """
-        This read-only attribute provides an
-        :ref:`oracledb._Error<exchandling>` object giving information about any
-        database warnings (such as the password being in the grace period, or
-        the pool being created with a smaller than requested size due to
-        database resource restrictions) that were generated during connection
-        establishment or by :meth:`oracledb.create_pool()`. The attribute will
-        be present if there was a warning, but creation otherwise completed
-        successfully. The connection will be usable despite the warning.
-
-        For :ref:`standalone connections <standaloneconnection>`,
-        ``Connection.warning`` will be present for the lifetime of the
-        connection.
-
-        For :ref:`pooled connections <connpooling>`, ``Connection.warning``
-        will be cleared when a connection is released to the pool such as with
-        :meth:`ConnectionPool.release()`.
-
-        In python-oracledb Thick mode, warnings may be generated during pool
-        creation itself.  These warnings will be placed on new connections
-        created by the pool, provided no warnings were generated by the
-        individual connection creations, in which case those connection
-        warnings will be returned.
-
-        If no warning was generated the value *None* is returned.
-        """
-        self._verify_connected()
-        return self._impl.warning
-
-    def xid(
-        self,
-        format_id: int,
-        global_transaction_id: Union[bytes, str],
-        branch_qualifier: Union[bytes, str],
-    ) -> Xid:
-        """
-        Returns a global transaction identifier (xid) that can be used with the
-        Two-Phase Commit (TPC) functions.
-
-        The ``xid`` contains a format identifier, a global transaction
-        identifier, and a branch identifier. There are no checks performed at
-        the Python level. The values are checked by ODPI-C when they are passed
-        to the relevant functions.  .. When this functionality is also
-        supported in the thin driver the checks will be performed at the Python
-        level as well.
-
-        The ``format_id`` parameter should be a positive 32-bit integer. This
-        value identifies the format of the ``global_transaction_id`` and
-        ``branch_qualifier`` parameters and the value is determined by the
-        Transaction Manager (TM), if one is in use.
-
-        The ``global_transaction_id`` and ``branch_qualifier`` parameters
-        should be of type bytes or string. If a value of type string is passed,
-        then this value will be UTF-8 encoded to bytes. The values cannot
-        exceed 64 bytes in length.
-        """
-        return Xid(format_id, global_transaction_id, branch_qualifier)
-
-
-class Connection(BaseConnection):
-
-    def __init__(
-        self,
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.ConnectionPool"] = None,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> None:
-        """
-        Constructor for creating a connection to the database.
-        """
-
-        super().__init__()
-        self._pool = pool
-
-        # determine if thin mode is being used
-        with driver_mode.get_manager() as mode_mgr:
-            thin = mode_mgr.thin
-
-            # determine which connection parameters to use
-            if params is None:
-                params_impl = base_impl.ConnectParamsImpl()
-            elif not isinstance(params, ConnectParams):
-                errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-            else:
-                params_impl = params._impl.copy()
-            dsn = params_impl.process_args(dsn, kwargs, thin)
-
-            # see if connection is being acquired from a pool
-            if pool is None:
-                pool_impl = None
-            else:
-                pool._verify_open()
-                pool_impl = pool._impl
-
-            # create thin or thick implementation object
-            if thin:
-                if (
-                    params_impl.shardingkey is not None
-                    or params_impl.supershardingkey is not None
-                ):
-                    errors._raise_err(
-                        errors.ERR_FEATURE_NOT_SUPPORTED,
-                        feature="sharding",
-                        driver_type="thick",
-                    )
-                if pool is not None:
-                    impl = pool_impl.acquire(params_impl)
-                else:
-                    impl = thin_impl.ThinConnImpl(dsn, params_impl)
-                    impl.connect(params_impl)
-            else:
-                impl = thick_impl.ThickConnImpl(dsn, params_impl)
-                impl.connect(params_impl, pool_impl)
-            self._impl = impl
-
-            # invoke callback, if applicable
-            if (
-                impl.invoke_session_callback
-                and pool is not None
-                and pool.session_callback is not None
-                and callable(pool.session_callback)
-            ):
-                pool.session_callback(self, params_impl.tag)
-                impl.invoke_session_callback = False
-
-    def __del__(self):
-        if self._impl is not None:
-            self._close(in_del=True)
-
-    def __enter__(self):
-        """
-        The entry point for the connection as a context manager. It returns
-        itself.
-        """
-        self._verify_connected()
-        return self
-
-    def __exit__(self, exc_type, exc_value, exc_tb):
-        """
-        The exit point for the connection as a context manager. This will close
-        the connection and roll back any uncommitted transaction.
-        """
-        if self._impl is not None:
-            self._close()
-
-    def _close(self, in_del=False):
-        """
-        Closes the connection and makes it unusable for further operations. An
-        Error exception will be raised if any operation is attempted with this
-        connection after this method completes successfully.
-        """
-        if self._pool is not None:
-            pool_impl = self._pool._impl
-            if pool_impl is not None:
-                pool_impl.return_connection(self._impl, in_del)
-        else:
-            self._impl.close(in_del)
-        self._impl = None
-
-    def _create_queue(self, impl):
-        """
-        Returns a queue object that the user can use to dequeue and enqueue
-        messages.
-        """
-        return Queue._from_impl(self, impl)
-
-    def _get_oci_attr(
-        self, handle_type: int, attr_num: int, attr_type: int
-    ) -> Any:
-        """
-        Returns the value of the specified OCI attribute from the internal
-        handle. This is only supported in python-oracledb thick mode and should
-        only be used as directed by Oracle.
-        """
-        self._verify_connected()
-        return self._impl._get_oci_attr(handle_type, attr_num, attr_type)
-
-    def _set_oci_attr(
-        self, handle_type: int, attr_num: int, attr_type: int, value: Any
-    ) -> None:
-        """
-        Sets the value of the specified OCI attribute on the internal handle.
-        This is only supported in python-oracledb thick mode and should only
-        be used as directed by Oracle.
-        """
-        self._verify_connected()
-        self._impl._set_oci_attr(handle_type, attr_num, attr_type, value)
-
-    def begin(
-        self,
-        format_id: int = -1,
-        transaction_id: str = "",
-        branch_id: str = "",
-    ) -> None:
-        """
-        Explicitly begins a new transaction. Without parameters, this
-        explicitly begins a local transaction; otherwise, this explicitly
-        begins a distributed (global) transaction with the given parameters.
-        See the Oracle documentation for more details.
-
-        Note that in order to make use of global (distributed) transactions,
-        the :attr:`~Connection.internal_name` and
-        :attr:`~Connection.external_name` attributes must be set.
-        """
-        if format_id != -1:
-            self.tpc_begin(self.xid(format_id, transaction_id, branch_id))
-
-    @property
-    def callTimeout(self) -> int:
-        """
-        Deprecated. Use property call_timeout instead.
-        """
-        return self.call_timeout
-
-    @callTimeout.setter
-    def callTimeout(self, value: int) -> None:
-        self._verify_connected()
-        self._impl.set_call_timeout(value)
-
-    def changepassword(self, old_password: str, new_password: str) -> None:
-        """
-        Changes the password for the user to which the connection is connected.
-        """
-        self._verify_connected()
-        self._impl.change_password(old_password, new_password)
-
-    def close(self) -> None:
-        """
-        Closes the connection now and makes it unusable for further operations.
-        An Error exception will be raised if any operation is attempted with
-        this connection after this method is completed successfully.
-
-        All open cursors and LOBs created by the connection will be closed and
-        will also no longer be usable.
-
-        Internally, references to the connection are held by cursor objects,
-        LOB objects, subscription objects, etc. Once all of these references
-        are released, the connection itself will be closed automatically.
-        Either control references to these related objects carefully or
-        explicitly close connections in order to ensure sufficient resources
-        are available.
-        """
-        self._verify_connected()
-        self._close()
-
-    def commit(self) -> None:
-        """
-        Commits any pending transactions to the database.
-        """
-        self._verify_connected()
-        self._impl.commit()
-
-    def createlob(
-        self, lob_type: DbType, data: Optional[Union[str, bytes]] = None
-    ) -> LOB:
-        """
-        Creates and returns a new temporary LOB object of the specified type.
-        The ``lob_type`` parameter should be one of
-        :data:`oracledb.DB_TYPE_CLOB`, :data:`oracledb.DB_TYPE_BLOB`, or
-        :data:`oracledb.DB_TYPE_NCLOB`.
-
-        If data is supplied, it will be written to the temporary LOB before it
-        is returned.
-        """
-        self._verify_connected()
-        if lob_type not in (DB_TYPE_CLOB, DB_TYPE_NCLOB, DB_TYPE_BLOB):
-            message = (
-                "parameter should be one of oracledb.DB_TYPE_CLOB, "
-                "oracledb.DB_TYPE_BLOB or oracledb.DB_TYPE_NCLOB"
-            )
-            raise TypeError(message)
-        impl = self._impl.create_temp_lob_impl(lob_type)
-        lob = LOB._from_impl(impl)
-        if data:
-            lob.write(data)
-        return lob
-
-    def cursor(self, scrollable: bool = False) -> Cursor:
-        """
-        Returns a new :ref:`cursor object <cursorobj>` using the connection.
-        """
-        self._verify_connected()
-        return Cursor(self, scrollable)
-
-    def direct_path_load(
-        self,
-        schema_name: str,
-        table_name: str,
-        column_names: list[str],
-        data: Any,
-        *,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Load data into Oracle Database using the Direct Path Load interface.
-        It is available only in python-oracledb Thin mode.
-
-        The ``data`` parameter can be a list of sequences, a DataFrame, or a
-        third-party DataFrame instance that supports the Apache Arrow PyCapsule
-        Interface.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance.
-        """
-        self._verify_connected()
-        self._impl.direct_path_load(
-            schema_name, table_name, column_names, data, batch_size
-        )
-
-    def fetch_df_all(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> DataFrame:
-        """
-        Fetches all rows of the SQL query ``statement``, returning them in a
-        :ref:`DataFrame <oracledataframeobj>` object. An empty DataFrame is
-        returned if there are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``arraysize`` parameter can be specified to tune performance of
-        fetching data across the network. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_all()``'s :attr:`Cursor.prefetchrows` size is always set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-
-        Any LOB fetched must be less than 1 GB.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if arraysize is not None:
-            cursor.arraysize = arraysize
-        cursor.prefetchrows = cursor.arraysize
-        cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        return cursor._impl.fetch_df_all(cursor)
-
-    def fetch_df_batches(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        size: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> Iterator[DataFrame]:
-        """
-        This returns an iterator yielding the next ``size`` rows of the SQL
-        query ``statement`` in each iteration as a :ref:`DataFrame
-        <oracledataframeobj>` object. An empty DataFrame is returned if there
-        are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``size`` parameter controls the number of records fetched in each
-        batch. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_batches()``'s :attr:`Cursor.arraysize` and
-        :attr:`Cursor.prefetchrows` sizes are always set to the value of the
-        explicit or default ``size`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-
-        Any LOB fetched must be less than 1 GB.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if size is not None:
-            cursor.arraysize = size
-        cursor.prefetchrows = cursor.arraysize
-        cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        if size is None:
-            yield cursor._impl.fetch_df_all(cursor)
-        else:
-            yield from cursor._impl.fetch_df_batches(cursor, batch_size=size)
-
-    def getSodaDatabase(self) -> SodaDatabase:
-        """
-        Returns a SodaDatabase object for Simple Oracle Document Access (SODA).
-        All SODA operations are performed either on the returned SodaDatabase
-        object or from objects created by the returned SodaDatabase object. See
-        `here <https://www.oracle.com/pls/topic/lookup?
-        ctx=dblatest&id=GUID-BE42F8D3-B86B-43B4-B2A3-5760A4DF79FB>`__ for
-        additional information on SODA.
-        """
-        self._verify_connected()
-        db_impl = self._impl.create_soda_database_impl(self)
-        return SodaDatabase._from_impl(self, db_impl)
-
-    def gettype(self, name: str) -> DbObjectType:
-        """
-        Returns a type object given its name. This can then be used to create
-        objects which can be bound to cursors created by this connection.
-        """
-        self._verify_connected()
-        obj_type_impl = self._impl.get_type(self, name)
-        return DbObjectType._from_impl(obj_type_impl)
-
-    @property
-    def handle(self) -> int:
-        """
-        This read-only attribute returns the Oracle Call Interface (OCI)
-        service context handle for the connection. It is primarily provided to
-        facilitate testing the creation of a connection using the OCI service
-        context handle.
-
-        This property is only relevant to python-oracledb's thick mode.
-        """
-        self._verify_connected()
-        return self._impl.get_handle()
-
-    @property
-    def maxBytesPerCharacter(self) -> int:
-        """
-        Deprecated. Use the constant value 4 instead.
-        """
-        return 4
-
-    def ping(self) -> None:
-        """
-        Pings the database to verify if the connection is valid. An exception
-        is thrown if it is not, in which case the connection should not be used
-        by the application and a new connection should be established instead.
-
-        This function performs a :ref:`round-trip <roundtrips>` to the
-        database, so it should not be used unnecessarily.
-
-        Note connection pools will perform the same health check automatically,
-        based on configuration settings. See :ref:`poolhealth`.
-
-        Also, see :meth:`is_healthy()` for a lightweight alternative.
-        """
-        self._verify_connected()
-        self._impl.ping()
-
-    def prepare(self) -> bool:
-        """
-        Prepares the distributed (global) transaction for commit. Returns a
-        boolean indicating if a transaction was actually prepared in order to
-        avoid the error ``ORA-24756 (transaction does not exist)``.
-        """
-        return self.tpc_prepare()
-
-    def rollback(self) -> None:
-        """
-        Rolls back any pending transactions.
-        """
-        self._verify_connected()
-        self._impl.rollback()
-
-    def shutdown(self, mode: int = 0) -> None:
-        """
-        Shuts down the database. In order to do this the connection must be
-        connected as :data:`~oracledb.SYSDBA` or :data:`~oracledb.SYSOPER`. Two
-        calls must be made unless the mode specified is
-        :data:`~oracledb.DBSHUTDOWN_ABORT`.
-        """
-        self._verify_connected()
-        self._impl.shutdown(mode)
-
-    def startup(
-        self,
-        force: bool = False,
-        restrict: bool = False,
-        pfile: Optional[str] = None,
-    ) -> None:
-        """
-        Starts up the database. This is equivalent to the SQL*Plus command
-        ``startup nomount``. The connection must be connected as
-        :data:`~oracledb.SYSDBA` or :data:`~oracledb.SYSOPER` with the
-        :data:`~oracledb.PRELIM_AUTH` option specified for this to work.
-
-        The ``pfile`` parameter, if specified, is expected to be a string
-        identifying the location of the parameter file (PFILE) which will be
-        used instead of the stored parameter file (SPFILE).
-        """
-        self._verify_connected()
-        self._impl.startup(force, restrict, pfile)
-
-    def subscribe(
-        self,
-        namespace: int = oracledb.SUBSCR_NAMESPACE_DBCHANGE,
-        protocol: int = oracledb.SUBSCR_PROTO_CALLBACK,
-        callback: Optional[Callable] = None,
-        timeout: int = 0,
-        operations: int = oracledb.OPCODE_ALLOPS,
-        port: int = 0,
-        qos: int = oracledb.SUBSCR_QOS_DEFAULT,
-        ip_address: Optional[str] = None,
-        grouping_class: int = oracledb.SUBSCR_GROUPING_CLASS_NONE,
-        grouping_value: int = 0,
-        grouping_type: int = oracledb.SUBSCR_GROUPING_TYPE_SUMMARY,
-        name: Optional[str] = None,
-        client_initiated: bool = False,
-        *,
-        ipAddress: Optional[str] = None,
-        groupingClass: int = oracledb.SUBSCR_GROUPING_CLASS_NONE,
-        groupingValue: int = 0,
-        groupingType: int = oracledb.SUBSCR_GROUPING_TYPE_SUMMARY,
-        clientInitiated: bool = False,
-    ) -> Subscription:
-        """
-        Returns a new subscription object that receives notifications for
-        events that take place in the database that match the given parameters.
-
-        The ``namespace`` parameter specifies the namespace the subscription
-        uses.  It can be one of :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE` or
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ`.
-
-        The ``protocol`` parameter specifies the protocol to use when
-        notifications are sent. Currently the only valid value is
-        :data:`oracledb.SUBSCR_PROTO_OCI`.
-
-        The ``callback`` is expected to be a callable that accepts a single
-        parameter. A :ref:`message object <msgobjects>` is passed to this
-        callback whenever a notification is received.
-
-        The ``timeout`` value specifies that the subscription expires after the
-        given time in seconds. The default value of *0* indicates that the
-        subscription never expires.
-
-        The ``operations`` parameter enables filtering of the messages that are
-        sent (insert, update, delete). The default value will send
-        notifications for all operations. This parameter is only used when the
-        namespace is set to :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE`.
-
-        The ``port`` parameter specifies the listening port for callback
-        notifications from the database server. If not specified, an unused
-        port will be selected by the Oracle Client libraries.
-
-        The ``qos`` parameter specifies quality of service options. It should
-        be one or more of the following flags, OR'ed together:
-        :data:`oracledb.SUBSCR_QOS_RELIABLE`,
-        :data:`oracledb.SUBSCR_QOS_DEREG_NFY`,
-        :data:`oracledb.SUBSCR_QOS_ROWIDS`, :data:`oracledb.SUBSCR_QOS_QUERY`,
-        :data:`oracledb.SUBSCR_QOS_BEST_EFFORT`.
-
-        The ``ip_address`` parameter specifies the IP address (*IPv4* or
-        *IPv6*) in standard string notation to bind for callback notifications
-        from the database server. If not specified, the client IP address will
-        be determined by the Oracle Client libraries.
-
-        The ``grouping_class`` parameter specifies what type of grouping of
-        notifications should take place. Currently, if set, this value can only
-        be set to the value :data:`oracledb.SUBSCR_GROUPING_CLASS_TIME`, which
-        will group notifications by the number of seconds specified in the
-        ``grouping_value`` parameter. The ``grouping_type`` parameter should be
-        one of the values :data:`oracledb.SUBSCR_GROUPING_TYPE_SUMMARY` (the
-        default) or :data:`oracledb.SUBSCR_GROUPING_TYPE_LAST`.
-
-        The ``name`` parameter is used to identify the subscription and is
-        specific to the selected namespace. If the namespace parameter is
-        :data:`oracledb.SUBSCR_NAMESPACE_DBCHANGE` then the name is optional
-        and can be any value. If the namespace parameter is
-        :data:`oracledb.SUBSCR_NAMESPACE_AQ`, however, the name must be in the
-        format '<QUEUE_NAME>' for single consumer queues and
-        '<QUEUE_NAME>:<CONSUMER_NAME>' for multiple consumer queues, and
-        identifies the queue that will be monitored for messages. The queue
-        name may include the schema, if needed.
-
-        The ``client_initiated`` parameter is used to determine if client
-        initiated connections or server initiated connections (the default)
-        will be established. Client initiated connections are only available in
-        Oracle Client 19.4 and Oracle Database 19.4 and higher.
-
-        For consistency and compliance with the PEP 8 naming style, the
-        parameter ``ipAddress`` was renamed to ``ip_address``, the parameter
-        ``groupingClass`` was renamed to ``grouping_class``, the parameter
-        ``groupingValue`` was renamed to ``grouping_value``, the parameter
-        ``groupingType`` was renamed to ``grouping_type`` and the parameter
-        ``clientInitiated`` was renamed to ``client_initiated``. The old names
-        will continue to work as keyword parameters for a period of time.
-        """
-        self._verify_connected()
-        if ipAddress is not None:
-            if ip_address is not None:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="ipAddress",
-                    new_name="ip_address",
-                )
-            ip_address = ipAddress
-        if groupingClass != oracledb.SUBSCR_GROUPING_CLASS_NONE:
-            if grouping_class != oracledb.SUBSCR_GROUPING_CLASS_NONE:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingClass",
-                    new_name="grouping_class",
-                )
-            grouping_class = groupingClass
-        if groupingValue != 0:
-            if grouping_value != 0:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingValue",
-                    new_name="grouping_value",
-                )
-            grouping_value = groupingValue
-        if groupingType != oracledb.SUBSCR_GROUPING_TYPE_SUMMARY:
-            if grouping_type != oracledb.SUBSCR_GROUPING_TYPE_SUMMARY:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="groupingType",
-                    new_name="grouping_type",
-                )
-            grouping_type = groupingType
-        if clientInitiated:
-            if client_initiated:
-                errors._raise_err(
-                    errors.ERR_DUPLICATED_PARAMETER,
-                    deprecated_name="clientInitiated",
-                    new_name="client_initiated",
-                )
-            client_initiated = clientInitiated
-        impl = self._impl.create_subscr_impl(
-            self,
-            callback,
-            namespace,
-            name,
-            protocol,
-            ip_address,
-            port,
-            timeout,
-            operations,
-            qos,
-            grouping_class,
-            grouping_value,
-            grouping_type,
-            client_initiated,
-        )
-        subscr = Subscription._from_impl(impl)
-        impl.subscribe(subscr, self._impl)
-        return subscr
-
-    def suspend_sessionless_transaction(self) -> None:
-        """
-        Suspends the currently active sessionless transaction immediately.
-
-        This detaches the transaction from the connection, allowing it to be
-        resumed later with the transaction identifier that was specified during
-        creation of the sessionless transaction. The ``timeout`` previously
-        passed to :meth:`begin_sessionless_transaction()` determines how long
-        the transaction can stay suspended before it is automatically rolled
-        back.
-        """
-        self._verify_connected()
-        self._impl.suspend_sessionless_transaction()
-
-    def tpc_begin(
-        self, xid: Xid, flags: int = oracledb.TPC_BEGIN_NEW, timeout: int = 0
-    ) -> None:
-        """
-        Begins a Two-Phase Commit (TPC) on a global transaction using the
-        specified transaction identifier (xid).
-
-        The ``xid`` parameter should be an object returned by the
-        :meth:`xid()` method.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_BEGIN_JOIN`, :data:`oracledb.TPC_BEGIN_NEW`,
-        :data:`oracledb.TPC_BEGIN_PROMOTE`, or
-        :data:`oracledb.TPC_BEGIN_RESUME`.  The default is
-        :data:`oracledb.TPC_BEGIN_NEW`.
-
-        The ``timeout`` parameter is the number of seconds to wait for a
-        transaction to become available for resumption when
-        :data:`~oracledb.TPC_BEGIN_RESUME` is specified in the ``flags``
-        parameter.  When :data:`~oracledb.TPC_BEGIN_NEW` is specified in the
-        ``flags`` parameter, the ``timeout`` parameter indicates the number of
-        seconds the transaction can be inactive before it is automatically
-        terminated by the system. A transaction is inactive between the time it
-        is detached with :meth:`tpc_end()` and the time it is resumed with
-        :meth:`tpc_begin()`.The default is *0* seconds.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        if flags not in (
-            oracledb.TPC_BEGIN_NEW,
-            oracledb.TPC_BEGIN_JOIN,
-            oracledb.TPC_BEGIN_RESUME,
-            oracledb.TPC_BEGIN_PROMOTE,
-        ):
-            errors._raise_err(errors.ERR_INVALID_TPC_BEGIN_FLAGS)
-        self._impl.tpc_begin(xid, flags, timeout)
-
-    def tpc_commit(
-        self, xid: Optional[Xid] = None, one_phase: bool = False
-    ) -> None:
-        """
-        Commits a global transaction. When called with no arguments, this
-        method commits a transaction previously prepared with
-        :meth:`tpc_begin()` and optionally prepared with :meth:`tpc_prepare()`.
-        If :meth:`tpc_prepare()` is not called, a single phase commit is
-        performed. A transaction manager may choose to do this if only a single
-        resource is participating in the global transaction.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. This form should be called outside of a
-        transaction and is intended for use in recovery.
-
-        The ``one_phase`` parameter is a boolean identifying whether to perform
-        a one-phase or two-phase commit. If ``one_phase`` parameter is *True*,
-        a single-phase commit is performed. The default value is *False*. This
-        parameter is only examined if a value is provided for the ``xid``
-        parameter. Otherwise, the driver already knows whether
-        :meth:`tpc_prepare()` was called for the transaction and whether a
-        one-phase or two-phase commit is required.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        self._impl.tpc_commit(xid, one_phase)
-
-    def tpc_end(
-        self, xid: Optional[Xid] = None, flags: int = oracledb.TPC_END_NORMAL
-    ) -> None:
-        """
-        Ends or suspends work on a global transaction. This function is only
-        intended for use by transaction managers.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If no xid parameter is passed, then the
-        transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_END_NORMAL` or :data:`oracledb.TPC_END_SUSPEND`.
-        The default is :data:`oracledb.TPC_END_NORMAL`.
-
-        If the flag is :data:`oracledb.TPC_END_SUSPEND` then the transaction
-        may be resumed later by calling :meth:`tpc_begin()` with the flag
-        :data:`oracledb.TPC_BEGIN_RESUME`.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        if flags not in (oracledb.TPC_END_NORMAL, oracledb.TPC_END_SUSPEND):
-            errors._raise_err(errors.ERR_INVALID_TPC_END_FLAGS)
-        self._impl.tpc_end(xid, flags)
-
-    def tpc_forget(self, xid: Xid) -> None:
-        """
-        Causes the database to forget a heuristically completed TPC
-        transaction.  This function is only intended to be called by
-        transaction managers.
-
-        The ``xid`` parameter is mandatory and should be an object should be
-        returned by the :meth:`xid()` function.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        self._impl.tpc_forget(xid)
-
-    def tpc_prepare(self, xid: Optional[Xid] = None) -> bool:
-        """
-        Prepares a two-phase transaction for commit. After this function is
-        called, no further activity should take place on this connection until
-        either :meth:`tpc_commit()` or :meth:`tpc_rollback()` have been called.
-
-        Returns a boolean indicating whether a commit is needed or not. If you
-        attempt to commit when not needed, then it results in the error
-        ``ORA-24756: transaction does not exist``.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If an ``xid`` parameter is not passed, then
-        the transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        return self._impl.tpc_prepare(xid)
-
-    def tpc_recover(self) -> list:
-        """
-        Returns a list of pending transaction identifiers that require
-        recovery.  Objects of type ``Xid`` (as returned by the
-        :meth:`xid()` function) are returned and these can be passed to
-        :meth:`tpc_commit()` or :meth:`tpc_rollback()` as needed.
-
-        This function queries the DBA_PENDING_TRANSACTIONS view and requires
-        "SELECT" privilege on that view.
-        """
-        with self.cursor() as cursor:
-            cursor.execute(
-                """
-                    select
-                        formatid,
-                        globalid,
-                        branchid
-                    from dba_pending_transactions"""
-            )
-            cursor.rowfactory = Xid
-            return cursor.fetchall()
-
-    def tpc_rollback(self, xid: Optional[Xid] = None) -> None:
-        """
-        If an ``xid`` parameter is not passed, then it rolls back the
-        transaction that was previously started with
-        :meth:`tpc_begin()`.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        :meth:`xid()` and the specified transaction is rolled back.  This form
-        should be called outside of a transaction and is intended for use in
-        recovery.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        self._impl.tpc_rollback(xid)
-
-    def unsubscribe(self, subscr: Subscription) -> None:
-        """
-        Unsubscribe from events in the database that were originally subscribed
-        to using :meth:`subscribe()`. The connection used to unsubscribe should
-        be the same one used to create the subscription, or should access the
-        same database and be connected as the same user name.
-        """
-        self._verify_connected()
-        if not isinstance(subscr, Subscription):
-            raise TypeError("expecting subscription")
-        subscr._impl.unsubscribe(self._impl)
-
-
-def _connection_factory(
-    f: Callable[..., Connection],
-) -> Callable[..., Connection]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested Connection class. The base Connection
-    class constructor does not check the validity of the supplied keyword
-    parameters.
-    """
-
-    @functools.wraps(f)
-    def connect(
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.ConnectionPool"] = None,
-        pool_alias: Optional[str] = None,
-        conn_class: Type[Connection] = Connection,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> Connection:
-        f(
-            dsn=dsn,
-            pool=pool,
-            pool_alias=pool_alias,
-            conn_class=conn_class,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(conn_class, Connection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        if pool is not None and pool_alias is not None:
-            errors._raise_err(
-                errors.ERR_DUPLICATED_PARAMETER,
-                deprecated_name="pool",
-                new_name="pool_alias",
-            )
-        if pool_alias is not None:
-            pool = pool_module.named_pools.pools.get(pool_alias)
-            if pool is None:
-                errors._raise_err(
-                    errors.ERR_NAMED_POOL_MISSING, alias=pool_alias
-                )
-        if pool is not None and not isinstance(
-            pool, pool_module.ConnectionPool
-        ):
-            message = "pool must be an instance of oracledb.ConnectionPool"
-            raise TypeError(message)
-        return conn_class(dsn=dsn, pool=pool, params=params, **kwargs)
-
-    return connect
-
-
-@_connection_factory
-def connect(
-    dsn: Optional[str] = None,
-    *,
-    pool: Optional["pool_module.ConnectionPool"] = None,
-    pool_alias: Optional[str] = None,
-    conn_class: Type[Connection] = Connection,
-    params: Optional[ConnectParams] = None,
-    # {{ args_with_defaults }}
-) -> Connection:
-    """
-    Factory function which creates a connection to the database and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool`` parameter is expected to be a pool object. This parameter was
-    deprecated in python-oracledb 3.0.0. Use :meth:`ConnectionPool.acquire()`
-    instead since the use of this parameter is the equivalent of calling this
-    method.
-
-    The ``conn_class`` parameter is expected to be Connection or a subclass of
-    Connection.
-
-    The ``params`` parameter is expected to be of type ConnectParams and
-    contains connection parameters that will be used when establishing the
-    connection. See the documentation on ConnectParams for more information.
-    If this parameter is not specified, the additional keyword parameters will
-    be used to create an instance of ConnectParams. If both the ``params``
-    parameter and additional keyword parameters are specified, the values in
-    the keyword parameters have precedence. Note that if a ``dsn`` is also
-    supplied, then in python-oracledb Thin mode, the values of the parameters
-    specified (if any) within the ``dsn`` will override the values passed as
-    additional keyword parameters, which themselves override the values set in
-    the ``params`` parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    # {{ args_help_with_defaults }}
-    """
-    pass
-
-
-class AsyncConnection(BaseConnection):
-
-    def __init__(
-        self,
-        dsn: str,
-        pool: pool_module.AsyncConnectionPool,
-        params: ConnectParams,
-        kwargs: dict,
-    ) -> None:
-        """
-        Constructor for creating an asynchronous connection to the database.
-        """
-        super().__init__()
-        self._pool = pool
-        self._connect_coroutine = self._connect(dsn, pool, params, kwargs)
-
-    def __await__(self):
-        coroutine = self._connect_coroutine
-        self._connect_coroutine = None
-        return coroutine.__await__()
-
-    async def __aenter__(self):
-        """
-        The entry point for the asynchronous connection as a context manager.
-        It returns itself.
-        """
-        if self._connect_coroutine is not None:
-            await self._connect_coroutine
-        else:
-            self._verify_connected()
-        return self
-
-    async def __aexit__(self, *exc_info):
-        """
-        The exit point for the asynchronous connection as a context manager.
-        This will close the connection and roll back any uncommitted
-        transaction.
-        """
-        if self._impl is not None:
-            await self._close()
-
-    async def _close(self, in_del=False):
-        """
-        Closes the connection and makes it unusable for further operations. An
-        Error exception will be raised if any operation is attempted with this
-        connection after this method completes successfully.
-        """
-        if self._pool is not None:
-            pool_impl = self._pool._impl
-            if pool_impl is not None:
-                await pool_impl.return_connection(self._impl, in_del)
-        else:
-            await self._impl.close(in_del)
-        self._impl = None
-
-    async def _connect(self, dsn, pool, params, kwargs):
-        """
-        Internal method for establishing a connection to the database using
-        asyncio.
-        """
-
-        # mandate that thin mode is required; with asyncio, only thin mode is
-        # supported and only one thread is executing, so the manager can be
-        # manipulated directly
-        driver_mode.manager.thin_mode = True
-
-        # determine which connection parameters to use
-        if params is None:
-            params_impl = base_impl.ConnectParamsImpl()
-        elif not isinstance(params, ConnectParams):
-            errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-        else:
-            params_impl = params._impl.copy()
-        dsn = params_impl.process_args(dsn, kwargs, thin=True)
-
-        # see if connection is being acquired from a pool
-        if pool is None:
-            pool_impl = None
-        elif not isinstance(pool, pool_module.AsyncConnectionPool):
-            message = (
-                "pool must be an instance of oracledb.AsyncConnectionPool"
-            )
-            raise TypeError(message)
-        else:
-            pool._verify_open()
-            pool_impl = pool._impl
-
-        # create implementation object
-        if pool is not None:
-            impl = await pool_impl.acquire(params_impl)
-        else:
-            impl = thin_impl.AsyncThinConnImpl(dsn, params_impl)
-            await impl.connect(params_impl)
-        self._impl = impl
-
-        # invoke callback, if applicable
-        if (
-            impl.invoke_session_callback
-            and pool is not None
-            and pool.session_callback is not None
-            and callable(pool.session_callback)
-        ):
-            await pool.session_callback(self, params_impl.tag)
-            impl.invoke_session_callback = False
-
-        return self
-
-    def _create_queue(self, impl):
-        """
-        Returns a queue object that the user can use to dequeue and enqueue
-        messages.
-        """
-        return AsyncQueue._from_impl(self, impl)
-
-    def _verify_can_execute(
-        self, parameters: Any, keyword_parameters: Any
-    ) -> Any:
-        """
-        Verifies that the connection can be used to execute
-        Verifies that the connection is connected to the database. If it is
-        not, an exception is raised.
-        """
-        self._verify_connected()
-        if keyword_parameters:
-            if parameters:
-                errors._raise_err(errors.ERR_ARGS_AND_KEYWORD_ARGS)
-            return keyword_parameters
-        elif parameters is not None and not isinstance(
-            parameters, (list, tuple, dict)
-        ):
-            errors._raise_err(errors.ERR_WRONG_EXECUTE_PARAMETERS_TYPE)
-        return parameters
-
-    async def begin_sessionless_transaction(
-        self,
-        transaction_id: Optional[Union[str, bytes]] = None,
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Begins a new sessionless transaction. This method returns the
-        transaction identifier specified by the user or generated by
-        python-oracledb.
-
-        The ``transaction_id`` parameter should be of type string or bytes. If
-        specified, it represents a unique identifier for the transaction. If a
-        string is passed, then it will be UTF-8 encoded to bytes. If this value
-        is not specified, then python-oracledb generates a a random
-        `universally-unique identifier (UUID) <https://www.rfc-editor.org/rfc/
-        rfc4122.txt>`__ value when this function is called. An example is
-        "36b8f84d-df4e-4d49-b662-bcde71a8764f". The user-chosen value cannot
-        exceed 64 bytes in length.
-
-        The ``timeout`` parameter is the number of seconds that this
-        transaction can stay suspended when
-        :meth:`suspend_sessionless_transaction()` is later called, or if the
-        transaction is automatically suspended when the ``suspend_on_success``
-        parameter is set to to *True* in :meth:`AsyncCursor.execute()` or
-        :meth:`AsyncCursor.executemany()`. The default value is *60* seconds.
-        If a transaction is not resumed within this specified duration, the
-        transaction will be rolled back.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to start a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not isinstance(timeout, int) or timeout <= 0:
-            raise TypeError("timeout must be a positive integer")
-
-        await self._impl.begin_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    async def callfunc(
-        self,
-        name: str,
-        return_type: Any,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> Any:
-        """
-        Calls a PL/SQL function with the given name.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.callfunc()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            return await cursor.callfunc(
-                name, return_type, parameters, keyword_parameters
-            )
-
-    async def callproc(
-        self,
-        name: str,
-        parameters: Optional[Union[list, tuple]] = None,
-        keyword_parameters: Optional[dict] = None,
-    ) -> list:
-        """
-        Calls a PL/SQL procedure with the given name.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.callproc()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            return await cursor.callproc(name, parameters, keyword_parameters)
-
-    async def changepassword(
-        self, old_password: str, new_password: str
-    ) -> None:
-        """
-        Changes the password for the user to which the connection is connected.
-        """
-        self._verify_connected()
-        await self._impl.change_password(old_password, new_password)
-
-    async def close(self) -> None:
-        """
-        Closes the connection.
-        """
-        self._verify_connected()
-        await self._close()
-
-    async def commit(self) -> None:
-        """
-        Commits any pending transaction to the database.
-        """
-        self._verify_connected()
-        await self._impl.commit()
-
-    async def createlob(
-        self, lob_type: DbType, data: Optional[Union[str, bytes]] = None
-    ) -> AsyncLOB:
-        """
-        Creates and returns a new temporary LOB of the specified type.
-        """
-        self._verify_connected()
-        if lob_type not in (DB_TYPE_CLOB, DB_TYPE_NCLOB, DB_TYPE_BLOB):
-            message = (
-                "parameter should be one of oracledb.DB_TYPE_CLOB, "
-                "oracledb.DB_TYPE_BLOB or oracledb.DB_TYPE_NCLOB"
-            )
-            raise TypeError(message)
-        impl = await self._impl.create_temp_lob_impl(lob_type)
-        lob = AsyncLOB._from_impl(impl)
-        if data:
-            await lob.write(data)
-        return lob
-
-    def cursor(self, scrollable: bool = False) -> AsyncCursor:
-        """
-        Returns an :ref:`AsyncCursor object <asynccursorobj>` associated with
-        the connection.
-        """
-        self._verify_connected()
-        return AsyncCursor(self, scrollable)
-
-    async def execute(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-    ) -> None:
-        """
-        Executes a statement against the database.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.execute()`, and then :meth:`AsyncCursor.close()`
-        """
-        with self.cursor() as cursor:
-            await cursor.execute(statement, parameters)
-
-    async def executemany(
-        self, statement: Union[str, None], parameters: Any
-    ) -> None:
-        """
-        Executes a SQL statement once using all bind value mappings or
-        sequences found in the sequence parameters. This can be used to insert,
-        update, or delete multiple rows in a table with a single
-        python-oracledb call. It can also invoke a PL/SQL procedure multiple
-        times.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one bind variable placeholder in ``statement``. It can
-        also be a list of dictionaries, where the keys match the bind variable
-        placeholder names in ``statement``. If there are no bind values, or
-        values have previously been bound, the ``parameters`` value can be an
-        integer specifying the number of iterations.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.executemany()`, and then
-        :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            await cursor.executemany(statement, parameters)
-
-    async def fetchall(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> list:
-        """
-        Executes a query and returns all of the rows.
-
-        The default value for ``arraysize`` is
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this method's :attr:`AsyncCursor.prefetchrows` size is set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        This is a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchall()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            if arraysize is not None:
-                cursor.arraysize = arraysize
-            cursor.prefetchrows = cursor.arraysize
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchall()
-
-    async def direct_path_load(
-        self,
-        schema_name: str,
-        table_name: str,
-        column_names: list[str],
-        data: Any,
-        *,
-        batch_size: int = 2**32 - 1,
-    ) -> None:
-        """
-        Load data into Oracle Database using the Direct Path Load interface.
-        It is available only in python-oracledb Thin mode.
-
-        The ``data`` parameter can be a list of sequences, a DataFrame, or a
-        third-party DataFrame instance that supports the Apache Arrow PyCapsule
-        Interface.
-
-        The ``batch_size`` parameter is used to split large data sets into
-        smaller pieces for sending to the database. It is the number of records
-        in each batch. This parameter can be used to tune performance.
-        """
-        self._verify_connected()
-        await self._impl.direct_path_load(
-            schema_name, table_name, column_names, data, batch_size
-        )
-
-    async def fetch_df_all(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        arraysize: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> DataFrame:
-        """
-        Fetches all rows of the SQL query ``statement``, returning them in a
-        :ref:`DataFrame <oracledataframeobj>` object. An empty DataFrame is
-        returned if there are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``arraysize`` parameter can be specified to tune performance of
-        fetching data across the network. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.  Internally,
-        the ``fetch_df_all()``'s :attr:`Cursor.prefetchrows` size is always set
-        to the value of the explicit or default ``arraysize`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return decimal
-        values when fetching columns of type ``NUMBER`` that are capable of
-        being represented in Apache Arrow Decimal128 format. The default value
-        is :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if arraysize is not None:
-            cursor.arraysize = arraysize
-        cursor.prefetchrows = cursor.arraysize
-        await cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        return await cursor._impl.fetch_df_all(cursor)
-
-    async def fetch_df_batches(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        size: Optional[int] = None,
-        *,
-        fetch_decimals: Optional[bool] = None,
-        requested_schema: Optional[Any] = None,
-    ) -> Iterator[DataFrame]:
-        """
-        This returns an iterator yielding the next ``size`` rows of the SQL
-        query ``statement`` in each iteration as a :ref:`DataFrame
-        <oracledataframeobj>` object. An empty DataFrame is returned if there
-        are no rows available.
-
-        The ``parameters`` parameter can be a list of tuples, where each tuple
-        item maps to one :ref:`bind variable placeholder <bind>` in
-        ``statement``. It can also be a list of dictionaries, where the keys
-        match the bind variable placeholder names in ``statement``.
-
-        The ``size`` parameter controls the number of records fetched in each
-        batch. It defaults to
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`. Internally,
-        the ``fetch_df_batches()``'s :attr:`Cursor.arraysize` and
-        :attr:`Cursor.prefetchrows` sizes are always set to the value of the
-        explicit or default ``size`` parameter value.
-
-        The ``fetch_decimals`` parameter specifies whether to return
-        decimal values when fetching columns of type ``NUMBER`` that are
-        capable of being represented in Arrow Decimal128 format. The default
-        value is
-        :data:`oracledb.defaults.fetch_decimals <Defaults.fetch_decimals>`.
-
-        The ``requested_schema`` parameter specifies an object that implements
-        the Apache Arrow PyCapsule schema interface. The DataFrame returned by
-        ``fetch_df_all()`` will have the data types and names of the schema.
-        """
-        cursor = self.cursor()
-        cursor._impl.fetching_arrow = True
-        if requested_schema is not None:
-            cursor._impl.schema_impl = ArrowSchemaImpl.from_arrow_schema(
-                requested_schema
-            )
-        if size is not None:
-            cursor.arraysize = size
-        cursor.prefetchrows = cursor.arraysize
-        await cursor.execute(
-            statement,
-            parameters,
-            fetch_decimals=fetch_decimals,
-        )
-        if size is None:
-            yield await cursor._impl.fetch_df_all(cursor)
-        else:
-            async for df in cursor._impl.fetch_df_batches(cursor, size):
-                yield df
-
-    async def fetchmany(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        num_rows: Optional[int] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> list:
-        """
-        Executes a query and returns up to the specified number of rows.
-
-        The default value for ``num_rows`` is the value of
-        :attr:`oracledb.defaults.arraysize <Defaults.arraysize>`.
-
-        Internally, this method's :attr:`AsyncCursor.prefetchrows` size is set
-        to the value of the explicit or default ``num_rows`` parameter,
-        allowing all rows to be fetched in one :ref:`round-trip <roundtrips>`
-
-        Since only one fetch is performed for a query, consider adding a
-        ``FETCH NEXT`` clause to the statement to prevent the database
-        processing rows that will never be fetched, see :ref:`rowlimit`.
-
-        This a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchmany()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            if num_rows is None:
-                num_rows = cursor.arraysize
-            elif num_rows <= 0:
-                return []
-            cursor.arraysize = cursor.prefetchrows = num_rows
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchmany(num_rows)
-
-    async def fetchone(
-        self,
-        statement: str,
-        parameters: Optional[Union[list, tuple, dict]] = None,
-        rowfactory: Optional[Callable] = None,
-        *,
-        fetch_lobs: Optional[bool] = None,
-        fetch_decimals: Optional[bool] = None,
-    ) -> Any:
-        """
-        Executes a query and returns the first row of the result set if one
-        exists (or *None* if no rows exist).
-
-        Internally, this method's :attr:`Cursor.prefetchrows` and
-        :attr:`Cursor.arraysize` sizes will be set to *1*.
-
-        Since only one fetch is performed for a query, consider adding a
-        ``WHERE`` condition or using a ``FETCH NEXT`` clause in the statement
-        to prevent the database processing rows that will never be fetched, see
-        :ref:`rowlimit`.
-
-        This a shortcut for calling :meth:`cursor()`,
-        :meth:`AsyncCursor.fetchone()`, and then :meth:`AsyncCursor.close()`.
-        """
-        with self.cursor() as cursor:
-            cursor.prefetchrows = cursor.arraysize = 1
-            await cursor.execute(
-                statement,
-                parameters,
-                fetch_lobs=fetch_lobs,
-                fetch_decimals=fetch_decimals,
-            )
-            cursor.rowfactory = rowfactory
-            return await cursor.fetchone()
-
-    async def gettype(self, name: str) -> DbObjectType:
-        """
-        Returns a type object given its name. This can then be used to create
-        objects which can be bound to cursors created by this connection.
-        """
-        self._verify_connected()
-        obj_type_impl = await self._impl.get_type(self, name)
-        return DbObjectType._from_impl(obj_type_impl)
-
-    async def ping(self) -> None:
-        """
-        Pings the database to verify if the connection is valid.
-        """
-        self._verify_connected()
-        await self._impl.ping()
-
-    async def resume_sessionless_transaction(
-        self,
-        transaction_id: Union[str, bytes],
-        timeout: int = 60,
-        defer_round_trip: bool = False,
-    ) -> bytes:
-        """
-        Resumes an existing sessionless transaction using the specified
-        transaction identifier. This method returns the transaction identifier
-        used to resume the sessionless transaction.
-
-        The ``transaction_id`` parameter should be a string or bytes value that
-        uniquely identifies an existing sessionless transaction that is to be
-        resumed.
-
-        The ``timeout`` parameter is the number of seconds that the current
-        connection waits to resume a transaction if another connection is using
-        it.  When ``defer_round_trip`` is set to *False*, the wait happens in
-        the ``resume_sessionless_transaction()`` call itself, and the function
-        blocks until the transaction becomes available or the timeout expires.
-        When ``defer_round_trip`` is set to *True*, the resume is deferred and
-        the wait occurs at the time of the next database operation instead. At
-        the start of the wait period, if the transaction is not in use by any
-        other connection, the resume happens immediately. If the transaction
-        remains in use by the other connection after the timeout period, the
-        error `ORA-25351
-        <https://docs.oracle.com/en/error-help/db/ora-25351>`__ is raised. If
-        another connection completes the transaction, the error `ORA-24756
-        <https://docs.oracle.com/en/error-help/db/ora-24756>`__ is raised.
-        These error messages are only thrown for non-RAC instances. For
-        information on using Oracle RAC, see :ref:`Sessionless Transactions
-        with Oracle RAC <sessionlesstxnswithrac>`.  The default value is *60*
-        seconds.
-
-        The ``defer_round_trip`` parameter is a boolean that determines whether
-        the request to resume a transaction is to be sent immediately or with
-        the next database operation. If set to *False*, the request is sent
-        immediately. If set to *True*, the request is included with the next
-        database operation on the connection. The default value is *False*.
-        """
-        self._verify_connected()
-        if transaction_id is None:
-            raise ValueError("transaction_id is required for resuming")
-
-        normalized_txnid = normalize_sessionless_transaction_id(transaction_id)
-
-        if not (isinstance(timeout, int) and timeout >= 0):
-            raise TypeError("timeout must be a non-negative integer")
-
-        await self._impl.resume_sessionless_transaction(
-            normalized_txnid, timeout, defer_round_trip
-        )
-        return normalized_txnid
-
-    async def rollback(self) -> None:
-        """
-        Rolls back any pending transaction.
-        """
-        self._verify_connected()
-        await self._impl.rollback()
-
-    async def run_pipeline(
-        self,
-        pipeline: Pipeline,
-        continue_on_error: bool = False,
-    ) -> list[PipelineOpResult]:
-        """
-        Runs all of the operations in the pipeline and returns a list of
-        PipelineOpResult, each entry corresponding to an operation executed in
-        the pipeline.
-
-        The ``continue_on_error`` parameter determines whether operations
-        should continue to run after an error has occurred. If this parameter
-        is set to *True*, then the :attr:`PipelineOpResult.error` attribute
-        will be populated with an :ref:`_Error <exchandling>` instance which
-        identifies the error that occurred. If this parameter is set to
-        *False*, then an exception will be raised as soon as an error is
-        detected and all subsequent operations will be terminated. The default
-        value is *False*.
-        """
-        self._verify_connected()
-        results = [op._create_result() for op in pipeline.operations]
-        if self._impl.supports_pipelining() and len(results) > 1:
-            await self._impl.run_pipeline_with_pipelining(
-                self, results, continue_on_error
-            )
-        else:
-            await self._impl.run_pipeline_without_pipelining(
-                self, results, continue_on_error
-            )
-        return results
-
-    async def suspend_sessionless_transaction(self) -> None:
-        """
-        Suspends the currently active sessionless transaction immediately.
-
-        This detaches the transaction from the connection, allowing it to be
-        resumed later with the transaction identifier that was specified during
-        creation of the sessionless transaction. The ``timeout`` previously
-        passed to :meth:`AsyncConnection.begin_sessionless_transaction()`
-        determines how long the transaction can stay suspended before it is
-        automatically rolled back.
-        """
-        self._verify_connected()
-        await self._impl.suspend_sessionless_transaction()
-
-    async def tpc_begin(
-        self, xid: Xid, flags: int = oracledb.TPC_BEGIN_NEW, timeout: int = 0
-    ) -> None:
-        """
-        Begins a Two-Phase Commit (TPC) on a global transaction using the
-        specified transaction identifier (xid).
-
-        The ``xid`` parameter should be an object returned by the
-        :meth:`xid()` method.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_BEGIN_JOIN`, :data:`oracledb.TPC_BEGIN_NEW`,
-        :data:`oracledb.TPC_BEGIN_PROMOTE`, or
-        :data:`oracledb.TPC_BEGIN_RESUME`.  The default is
-        :data:`oracledb.TPC_BEGIN_NEW`.
-
-        The ``timeout`` parameter is the number of seconds to wait for a
-        transaction to become available for resumption when
-        :data:`~oracledb.TPC_BEGIN_RESUME` is specified in the ``flags``
-        parameter.  When :data:`~oracledb.TPC_BEGIN_NEW` is specified in the
-        ``flags`` parameter, the ``timeout`` parameter indicates the number of
-        seconds the transaction can be inactive before it is automatically
-        terminated by the system. A transaction is inactive between the time it
-        is detached with :meth:`AsyncConnection.tpc_end()` and the time it is
-        resumed with :meth:`AsyncConnection.tpc_begin()`.The default is *0*
-        seconds.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        if flags not in (
-            oracledb.TPC_BEGIN_NEW,
-            oracledb.TPC_BEGIN_JOIN,
-            oracledb.TPC_BEGIN_RESUME,
-            oracledb.TPC_BEGIN_PROMOTE,
-        ):
-            errors._raise_err(errors.ERR_INVALID_TPC_BEGIN_FLAGS)
-        await self._impl.tpc_begin(xid, flags, timeout)
-
-    async def tpc_commit(
-        self, xid: Optional[Xid] = None, one_phase: bool = False
-    ) -> None:
-        """
-        Commits a global transaction. When called with no arguments, this
-        method commits a transaction previously prepared with
-        :meth:`~AsyncConnection.tpc_begin()` and optionally prepared with
-        :meth:`~AsyncConnection.tpc_prepare()`. If
-        :meth:`~AsyncConnection.tpc_prepare()` is not called, a single phase
-        commit is performed. A transaction manager may choose to do this if
-        only a single resource is participating in the global transaction.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`~Connection.xid()` function. This form should be called
-        outside of a transaction and is intended for use in recovery.
-
-        The ``one_phase`` parameter is a boolean identifying whether to perform
-        a one-phase or two-phase commit. If ``one_phase`` parameter is *True*,
-        a single-phase commit is performed.  The default value is *False*. This
-        parameter is only examined if a value is provided for the ``xid``
-        parameter. Otherwise, the driver already knows whether
-        :meth:`tpc_prepare()` was called for the transaction and whether a
-        one-phase or two-phase commit is required.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        await self._impl.tpc_commit(xid, one_phase)
-
-    async def tpc_end(
-        self, xid: Optional[Xid] = None, flags: int = oracledb.TPC_END_NORMAL
-    ) -> None:
-        """
-        Ends or suspends work on a global transaction. This function is only
-        intended for use by transaction managers.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`~Connection.xid()` function. If no xid parameter is passed,
-        then the transaction identifier used by the previous
-        :meth:`~Connection.tpc_begin()` is used.
-
-        The ``flags`` parameter is one of the constants
-        :data:`oracledb.TPC_END_NORMAL` or :data:`oracledb.TPC_END_SUSPEND`.
-        The default is :data:`oracledb.TPC_END_NORMAL`.
-
-        If the flag is :data:`oracledb.TPC_END_SUSPEND` then the transaction
-        may be resumed later by calling :meth:`AsyncConnection.tpc_begin()`
-        with the flag :data:`oracledb.TPC_BEGIN_RESUME`.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        if flags not in (oracledb.TPC_END_NORMAL, oracledb.TPC_END_SUSPEND):
-            errors._raise_err(errors.ERR_INVALID_TPC_END_FLAGS)
-        await self._impl.tpc_end(xid, flags)
-
-    async def tpc_forget(self, xid: Xid) -> None:
-        """
-        Causes the database to forget a heuristically completed TPC
-        transaction.  This function is only intended to be called by
-        transaction managers.
-
-        The ``xid`` parameter is mandatory and should be an object should be
-        returned by the :meth:`xid()` function.
-        """
-        self._verify_connected()
-        self._verify_xid(xid)
-        await self._impl.tpc_forget(xid)
-
-    async def tpc_prepare(self, xid: Optional[Xid] = None) -> bool:
-        """
-        Prepares a two-phase transaction for commit. After this function is
-        called, no further activity should take place on this connection until
-        either :meth:`tpc_commit()` or :meth:`tpc_rollback()` have been called.
-
-        Returns a boolean indicating whether a commit is needed or not. If you
-        attempt to commit when not needed, then it results in the error
-        ``ORA-24756: transaction does not exist``.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        the :meth:`xid()` function. If an ``xid`` parameter is not passed, then
-        the transaction identifier used by the previous :meth:`tpc_begin()` is
-        used.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        return await self._impl.tpc_prepare(xid)
-
-    async def tpc_recover(self) -> list:
-        """
-        Returns a list of pending transaction identifiers that require
-        recovery.  Objects of type ``Xid`` (as returned by the
-        :meth:`~Connection.xid()` function) are returned and these can be
-        passed to :meth:`tpc_commit()` or :meth:`tpc_rollback()` as needed.
-
-        This function queries the view ``DBA_PENDING_TRANSACTIONS`` and
-        requires ``SELECT`` privilege on that view.
-        """
-        with self.cursor() as cursor:
-            await cursor.execute(
-                """
-                    select
-                        formatid,
-                        globalid,
-                        branchid
-                    from dba_pending_transactions"""
-            )
-            cursor.rowfactory = Xid
-            return await cursor.fetchall()
-
-    async def tpc_rollback(self, xid: Optional[Xid] = None) -> None:
-        """
-        Rolls back a global transaction.
-
-        If an ``xid`` parameter is not passed, then it rolls back the
-        transaction that was previously started with
-        :meth:`~AsyncConnection.tpc_begin()`.
-
-        If an ``xid`` parameter is passed, then an object should be returned by
-        :meth:`~Connection.xid()` and the specified transaction is rolled back.
-        This form should be called outside of a transaction and is intended for
-        use in recovery.
-        """
-        self._verify_connected()
-        if xid is not None:
-            self._verify_xid(xid)
-        await self._impl.tpc_rollback(xid)
-
-
-def _async_connection_factory(
-    f: Callable[..., AsyncConnection],
-) -> Callable[..., AsyncConnection]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested AsyncConnection class.
-    """
-
-    @functools.wraps(f)
-    def connect_async(
-        dsn: Optional[str] = None,
-        *,
-        pool: Optional["pool_module.AsyncConnectionPool"] = None,
-        pool_alias: Optional[str] = None,
-        conn_class: Type[AsyncConnection] = AsyncConnection,
-        params: Optional[ConnectParams] = None,
-        **kwargs,
-    ) -> AsyncConnection:
-        # check arguments
-        f(
-            dsn=dsn,
-            pool=pool,
-            pool_alias=pool_alias,
-            conn_class=conn_class,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(conn_class, AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-
-        if pool is not None and pool_alias is not None:
-            errors._raise_err(
-                errors.ERR_DUPLICATED_PARAMETER,
-                deprecated_name="pool",
-                new_name="pool_alias",
-            )
-        if pool_alias is not None:
-            pool = pool_module.named_pools.pools.get(pool_alias)
-            if pool is None:
-                errors._raise_err(
-                    errors.ERR_NAMED_POOL_MISSING, alias=pool_alias
-                )
-        if pool is not None and not isinstance(
-            pool, pool_module.AsyncConnectionPool
-        ):
-            message = (
-                "pool must be an instance of oracledb.AsyncConnectionPool"
-            )
-            raise TypeError(message)
-        if params is not None and not isinstance(params, ConnectParams):
-            errors._raise_err(errors.ERR_INVALID_CONNECT_PARAMS)
-
-        # build connection class and call the implementation connect to
-        # actually establish the connection
-        oracledb.enable_thin_mode()
-        return conn_class(dsn, pool, params, kwargs)
-
-    return connect_async
-
-
-@_async_connection_factory
-def connect_async(
-    dsn: Optional[str] = None,
-    *,
-    pool: Optional["pool_module.AsyncConnectionPool"] = None,
-    pool_alias: Optional[str] = None,
-    conn_class: Type[AsyncConnection] = AsyncConnection,
-    params: Optional[ConnectParams] = None,
-    # {{ args_with_defaults }}
-) -> AsyncConnection:
-    """
-    Factory function which creates a connection to the database and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool`` parameter is expected to be a pool object. This parameter was
-    deprecated in python-oracledb 3.0.0. Use :meth:`ConnectionPool.acquire()`
-    instead since the use of this parameter is the equivalent of calling this
-    method.
-
-    The ``conn_class`` parameter is expected to be AsyncConnection or a
-    subclass of AsyncConnection.
-
-    The ``params`` parameter is expected to be of type ConnectParams and
-    contains connection parameters that will be used when establishing the
-    connection. See the documentation on ConnectParams for more information. If
-    this parameter is not specified, the additional keyword parameters will be
-    used to create an instance of ConnectParams. If both the ``params``
-    parameter and additional keyword parameters are specified, the values in
-    the keyword parameters have precedence. Note that if a ``dsn`` is also
-    supplied, then in python-oracledb Thin mode, the values of the parameters
-    specified (if any) within the dsn will override the values passed as
-    additional keyword parameters, which themselves override the values set in
-    the ``params`` parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    # {{ async_args_help_with_defaults }}
-    """
-    pass
diff --git a/utils/templates/pool.py b/utils/templates/pool.py
deleted file mode 100644
index 4177e561..00000000
--- a/utils/templates/pool.py
+++ /dev/null
@@ -1,912 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pool.py
-#
-# Contains the ConnectionPool class and the factory method create_pool() used
-# for creating connection pools.
-#
-# # {{ generated_notice }}
-# -----------------------------------------------------------------------------
-
-import functools
-import ssl
-import threading
-from typing import Callable, Type, Union, Any, Optional
-
-import oracledb
-
-from . import base_impl, thick_impl, thin_impl
-from . import connection as connection_module
-from . import driver_mode
-from . import errors
-from .base import BaseMetaClass
-from .pool_params import PoolParams
-
-
-class BaseConnectionPool(metaclass=BaseMetaClass):
-    _impl = None
-
-    def __init__(
-        self,
-        dsn: Optional[str] = None,
-        *,
-        params: Optional[PoolParams] = None,
-        cache_name: Optional[str] = None,
-        **kwargs,
-    ) -> None:
-        """
-        Constructor for creating a connection pool.
-        """
-        if params is None:
-            params_impl = base_impl.PoolParamsImpl()
-        elif not isinstance(params, PoolParams):
-            errors._raise_err(errors.ERR_INVALID_POOL_PARAMS)
-        else:
-            params_impl = params._impl.copy()
-        with driver_mode.get_manager() as mode_mgr:
-            thin = mode_mgr.thin
-            dsn = params_impl.process_args(dsn, kwargs, thin)
-            self._set_connection_type(params_impl.connectiontype)
-            self._cache_name = cache_name
-            if cache_name is not None:
-                named_pools.add_pool(cache_name, self)
-            try:
-                if issubclass(
-                    self._connection_type, connection_module.AsyncConnection
-                ):
-                    impl = thin_impl.AsyncThinPoolImpl(dsn, params_impl)
-                elif thin:
-                    impl = thin_impl.ThinPoolImpl(dsn, params_impl)
-                else:
-                    impl = thick_impl.ThickPoolImpl(dsn, params_impl)
-                self._impl = impl
-                self.session_callback = params_impl.session_callback
-            except:
-                if cache_name is not None:
-                    del named_pools.pools[cache_name]
-                raise
-
-    def _verify_open(self) -> None:
-        """
-        Verifies that the pool is open and able to perform its work.
-        """
-        if self._impl is None:
-            errors._raise_err(errors.ERR_POOL_NOT_OPEN)
-
-    @property
-    def busy(self) -> int:
-        """
-        This read-only attribute returns the number of connections currently
-        acquired.
-        """
-        self._verify_open()
-        return self._impl.get_busy_count()
-
-    @property
-    def dsn(self) -> str:
-        """
-        This read-only attribute returns the TNS entry of the database to which
-        a connection has been established.
-        """
-        self._verify_open()
-        return self._impl.dsn
-
-    @property
-    def getmode(self) -> oracledb.PoolGetMode:
-        """
-        This read-write attribute determines how connections are returned from
-        the pool. If :data:`~oracledb.POOL_GETMODE_FORCEGET` is specified, a
-        new connection will be returned even if there are no free connections
-        in the pool.  :data:`~oracledb.POOL_GETMODE_NOWAIT` will raise an
-        exception if there are no free connections are available in the pool.
-        If :data:`~oracledb.POOL_GETMODE_WAIT` is specified and there are no
-        free connections in the pool, the caller will wait until a free
-        connection is available. :data:`~oracledb.POOL_GETMODE_TIMEDWAIT` uses
-        the value of :data:`~ConnectionPool.wait_timeout` to determine how long
-        the caller should wait for a connection to become available before
-        returning an error.
-        """
-        self._verify_open()
-        return oracledb.PoolGetMode(self._impl.get_getmode())
-
-    @getmode.setter
-    def getmode(self, value: oracledb.PoolGetMode) -> None:
-        self._verify_open()
-        self._impl.set_getmode(value)
-
-    @property
-    def homogeneous(self) -> bool:
-        """
-        This read-only boolean attribute indicates whether the pool is
-        considered :ref:`homogeneous <connpooltypes>` or not. If the pool is
-        not homogeneous, different authentication can be used for each
-        connection acquired from the pool.
-        """
-        self._verify_open()
-        return self._impl.homogeneous
-
-    @property
-    def increment(self) -> int:
-        """
-        This read-only attribute returns the number of connections that will be
-        established when additional connections need to be created.
-        """
-        self._verify_open()
-        return self._impl.increment
-
-    @property
-    def max(self) -> int:
-        """
-        This read-only attribute returns the maximum number of connections that
-        the pool can control.
-        """
-        self._verify_open()
-        return self._impl.max
-
-    @property
-    def max_lifetime_session(self) -> int:
-        """
-        This read-write attribute is the maximum length of time (in seconds)
-        that a pooled connection may exist since first being created. A value
-        of *0* means there is no limit. Connections become candidates for
-        termination when they are acquired or released back to the pool, and
-        have existed for longer than ``max_lifetime_session`` seconds.
-        Connections that are in active use will not be closed. In
-        python-oracledb Thick mode, Oracle Client libraries 12.1 or later must
-        be used and, prior to Oracle Client 21, cleanup only occurs when the
-        pool is accessed.
-        """
-        self._verify_open()
-        return self._impl.get_max_lifetime_session()
-
-    @max_lifetime_session.setter
-    def max_lifetime_session(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_max_lifetime_session(value)
-
-    @property
-    def max_sessions_per_shard(self) -> int:
-        """
-        This read-write attribute returns the number of sessions that can be
-        created per shard in the pool. Setting this attribute greater than zero
-        specifies the maximum number of sessions in the pool that can be used
-        for any given shard in a sharded database. This lets connections in the
-        pool be balanced across the shards. A value of *0* will not set any
-        maximum number of sessions for each shard. This attribute is only
-        available in Oracle Client 18.3 and higher.
-        """
-        self._verify_open()
-        return self._impl.get_max_sessions_per_shard()
-
-    @max_sessions_per_shard.setter
-    def max_sessions_per_shard(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_max_sessions_per_shard(value)
-
-    @property
-    def min(self) -> int:
-        """
-        This read-only attribute returns the number of connections with which
-        the connection pool was created and the minimum number of connections
-        that will be controlled by the connection pool.
-        """
-        self._verify_open()
-        return self._impl.min
-
-    @property
-    def name(self) -> str:
-        """
-        This read-only attribute returns the name assigned to the pool by
-        Oracle.
-        """
-        self._verify_open()
-        return self._impl.name
-
-    @property
-    def opened(self) -> int:
-        """
-        This read-only attribute returns the number of connections currently
-        opened by the pool.
-        """
-        self._verify_open()
-        return self._impl.get_open_count()
-
-    @property
-    def ping_interval(self) -> int:
-        """
-        This read-write integer attribute specifies the pool ping interval in
-        seconds. When a connection is acquired from the pool, a check is first
-        made to see how long it has been since the connection was put into the
-        pool. If this idle time exceeds ``ping_interval``, then a
-        :ref:`round-trip <roundtrips>` ping to the database is performed. If
-        the connection is unusable, it is discarded and a different connection
-        is selected to be returned by :meth:`acquire()`.  Setting
-        ``ping_interval`` to a negative value disables pinging.  Setting it to
-        *0* forces a ping for every :meth:`acquire()` and is not recommended.
-        """
-        self._verify_open()
-        return self._impl.get_ping_interval()
-
-    @ping_interval.setter
-    def ping_interval(self, value: int) -> None:
-        self._impl.set_ping_interval(value)
-
-    @property
-    def soda_metadata_cache(self) -> bool:
-        """
-        This read-write boolean attribute returns whether the SODA metadata
-        cache is enabled or not. Enabling the cache significantly improves the
-        performance of methods :meth:`SodaDatabase.createCollection()` (when
-        not specifying a value for the ``metadata`` parameter) and
-        :meth:`SodaDatabase.openCollection()`. Note that the cache can become
-        out of date if changes to the metadata of cached collections are made
-        externally.
-        """
-        self._verify_open()
-        return self._impl.get_soda_metadata_cache()
-
-    @soda_metadata_cache.setter
-    def soda_metadata_cache(self, value: bool) -> None:
-        if not isinstance(value, bool):
-            message = "soda_metadata_cache must be a boolean value."
-            raise TypeError(message)
-        self._verify_open()
-        self._impl.set_soda_metadata_cache(value)
-
-    @property
-    def stmtcachesize(self) -> int:
-        """
-        This read-write attribute specifies the size of the statement cache
-        that will be used for connections obtained from the pool. Once a
-        connection is created, that connection’s statement cache size can only
-        be changed by setting the ``stmtcachesize`` attribute on the connection
-        itself.
-        """
-        self._verify_open()
-        return self._impl.get_stmt_cache_size()
-
-    @stmtcachesize.setter
-    def stmtcachesize(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_stmt_cache_size(value)
-
-    @property
-    def thin(self) -> bool:
-        """
-        This read-only attribute returns a boolean indicating if
-        python-oracledb is in Thin mode (*True*) or Thick mode (*False*).
-        """
-        self._verify_open()
-        return not isinstance(self._impl, thick_impl.ThickPoolImpl)
-
-    @property
-    def timeout(self) -> int:
-        """
-        This read-write attribute specifies the time (in seconds) after which
-        idle connections will be terminated in order to maintain an optimum
-        number of open connections. A value of *0* means that no idle
-        connections are terminated. Note that in python-oracledb Thick mode
-        with older Oracle Client Libraries, the termination only occurs when
-        the pool is accessed.
-        """
-        self._verify_open()
-        return self._impl.get_timeout()
-
-    @timeout.setter
-    def timeout(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_timeout(value)
-
-    @property
-    def tnsentry(self) -> str:
-        """
-        Deprecated. Use dsn instead.
-        """
-        return self.dsn
-
-    @property
-    def username(self) -> str:
-        """
-        This read-only attribute returns the name of the user which established
-        the connection to the database.
-        """
-        self._verify_open()
-        return self._impl.username
-
-    @property
-    def wait_timeout(self) -> int:
-        """
-        This read-write attribute specifies the time (in milliseconds) that the
-        caller should wait for a connection to become available in the pool
-        before returning with an error. This value is only used if the
-        ``getmode`` parameter to :meth:`oracledb.create_pool()` was the value
-        :data:`oracledb.POOL_GETMODE_TIMEDWAIT`.
-        """
-        self._verify_open()
-        return self._impl.get_wait_timeout()
-
-    @wait_timeout.setter
-    def wait_timeout(self, value: int) -> None:
-        self._verify_open()
-        self._impl.set_wait_timeout(value)
-
-
-class ConnectionPool(BaseConnectionPool):
-
-    def __del__(self):
-        if self._impl is not None:
-            self._impl.close(True)
-            self._impl = None
-
-    def _set_connection_type(self, conn_class):
-        """
-        Called internally when the pool is created to ensure that the correct
-        connection class is used for all connections created by the pool.
-        """
-        if conn_class is None:
-            conn_class = connection_module.Connection
-        elif not issubclass(
-            conn_class, connection_module.Connection
-        ) or issubclass(conn_class, connection_module.AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        self._connection_type = conn_class
-
-    def acquire(
-        self,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: int = oracledb.PURITY_DEFAULT,
-        tag: Optional[str] = None,
-        matchanytag: bool = False,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-    ) -> "connection_module.Connection":
-        """
-        Acquires a connection from the session pool and returns a
-        :ref:`connection object <connobj>`.
-
-        If the pool is :ref:`homogeneous <connpooltypes>`, the ``user`` and
-        ``password`` parameters cannot be specified. If they are, an exception
-        will be raised.
-
-        The ``cclass`` parameter, if specified, should be a string
-        corresponding to the connection class for :ref:`drcp`.
-
-        The ``purity`` parameter is expected to be one of
-        :data:`~oracledb.PURITY_NEW`, :data:`~oracledb.PURITY_SELF`, or
-        :data:`~oracledb.PURITY_DEFAULT`.
-
-        The ``tag`` parameter, if specified, is expected to be a string with
-        name=value pairs like "k1=v1;k2=v2" and will limit the connections that
-        can be returned from a connection pool unless the ``matchanytag``
-        parameter is set to *True*. In that case, connections with the
-        specified tag will be preferred over others, but if no such connections
-        are available, then a connection with a different tag may be returned
-        instead. In any case, untagged connections will always be returned if
-        no connections with the specified tag are available. Connections are
-        tagged when they are :meth:`released <ConnectionPool.release>` back to
-        the pool.
-
-        The ``shardingkey`` and ``supershardingkey`` parameters, if specified,
-        are expected to be a sequence of values which will be used to identify
-        the database shard to connect to. The key values can be strings,
-        numbers, bytes, or dates.  See :ref:`connsharding`.
-
-        When using the :ref:`connection pool cache <connpoolcache>`, calling
-        :meth:`oracledb.connect()` with a ``pool_alias`` parameter is the same
-        as calling ``pool.acquire()``.
-        """
-        self._verify_open()
-
-        return oracledb.connect(
-            conn_class=self._connection_type,
-            user=user,
-            password=password,
-            cclass=cclass,
-            purity=purity,
-            tag=tag,
-            matchanytag=matchanytag,
-            shardingkey=shardingkey,
-            supershardingkey=supershardingkey,
-            pool=self,
-        )
-
-    def close(self, force: bool = False) -> None:
-        """
-        Closes the pool now, rather than when the last reference to it is
-        released, which makes it unusable for further work.
-
-        If any connections have been acquired and not released back to the
-        pool, this method will fail unless the ``force`` parameter is set to
-        *True*.
-        """
-        self._verify_open()
-        self._impl.close(force)
-        if self._cache_name is not None:
-            named_pools.remove_pool(self._cache_name)
-        self._impl = None
-
-    def drop(self, connection: "connection_module.Connection") -> None:
-        """
-        Drops the connection from the pool which is useful if the connection is
-        no longer usable (such as when the session is killed).
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.Connection):
-            message = "connection must be an instance of oracledb.Connection"
-            raise TypeError(message)
-        connection._verify_connected()
-        self._impl.drop(connection._impl)
-        connection._impl = None
-
-    def reconfigure(
-        self,
-        min: Optional[int] = None,
-        max: Optional[int] = None,
-        increment: Optional[int] = None,
-        getmode: Optional[int] = None,
-        timeout: Optional[int] = None,
-        wait_timeout: Optional[int] = None,
-        max_lifetime_session: Optional[int] = None,
-        max_sessions_per_shard: Optional[int] = None,
-        soda_metadata_cache: Optional[bool] = None,
-        stmtcachesize: Optional[int] = None,
-        ping_interval: Optional[int] = None,
-    ) -> None:
-        """
-        Reconfigures various parameters of a connection pool. The pool size can
-        be altered with ``reconfigure()`` by passing values for
-        :data:`~ConnectionPool.min`, :data:`~ConnectionPool.max` or
-        :data:`~ConnectionPool.increment`.  The
-        :data:`~ConnectionPool.getmode`, :data:`~ConnectionPool.timeout`,
-        :data:`~ConnectionPool.wait_timeout`,
-        :data:`~ConnectionPool.max_lifetime_session`,
-        :data:`~ConnectionPool.max_sessions_per_shard`,
-        :data:`~ConnectionPool.soda_metadata_cache`,
-        :data:`~ConnectionPool.stmtcachesize` and
-        :data:`~ConnectionPool.ping_interval` attributes can be set directly or
-        with ``reconfigure()``.
-
-        All parameters are optional. Unspecified parameters will leave those
-        pool attributes unchanged. The parameters are processed in two stages.
-        After any size change has been processed, reconfiguration on the other
-        parameters is done sequentially. If an error such as an invalid value
-        occurs when changing one attribute, then an exception will be generated
-        but any already changed attributes will retain their new values.
-
-        During reconfiguration of a pool's size, the behavior of
-        :meth:`ConnectionPool.acquire()` depends on the ``getmode`` in effect
-        when ``acquire()`` is called:
-
-        * With mode :data:`~oracledb.POOL_GETMODE_FORCEGET`, an ``acquire()``
-          call will wait until the pool has been reconfigured.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_TIMEDWAIT`, an ``acquire()``
-          call will try to acquire a connection in the time specified by
-          pool.wait_timeout and return an error if the time taken exceeds that
-          value.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_WAIT`, an ``acquire()`` call
-          will wait until after the pool has been reconfigured and a connection
-          is available.
-
-        * With mode :data:`~oracledb.POOL_GETMODE_NOWAIT`, if the number of
-          busy connections is less than the pool size, ``acquire()`` will
-          return a new connection after pool reconfiguration is complete.
-
-        Closing connections with :meth:`ConnectionPool.release()` or
-        :meth:`Connection.close()` will wait until any pool size
-        reconfiguration is complete.
-
-        Closing the connection pool with :meth:`ConnectionPool.close()` will
-        wait until reconfiguration is complete.
-        """
-
-        if min is None:
-            min = self.min
-        if max is None:
-            max = self.max
-        if increment is None:
-            increment = self.increment
-        if self.min != min or self.max != max or self.increment != increment:
-            self._impl.reconfigure(min, max, increment)
-        if getmode is not None:
-            self.getmode = getmode
-        if timeout is not None:
-            self.timeout = timeout
-        if wait_timeout is not None:
-            self.wait_timeout = wait_timeout
-        if max_lifetime_session is not None:
-            self.max_lifetime_session = max_lifetime_session
-        if max_sessions_per_shard is not None:
-            self.max_sessions_per_shard = max_sessions_per_shard
-        if soda_metadata_cache is not None:
-            self.soda_metadata_cache = soda_metadata_cache
-        if stmtcachesize is not None:
-            self.stmtcachesize = stmtcachesize
-        if ping_interval is not None:
-            self.ping_interval = ping_interval
-
-    def release(
-        self,
-        connection: "connection_module.Connection",
-        tag: Optional[str] = None,
-    ) -> None:
-        """
-        Releases the connection back to the pool now, rather than whenever
-        __del__ is called. The connection will be unusable from this point
-        forward; an Error exception will be raised if any operation is
-        attempted with the connection. Any cursors or LOBs created by the
-        connection will also be marked unusable and an Error exception will be
-        raised if any operation is attempted with them.
-
-        Internally, references to the connection are held by cursor objects,
-        LOB objects, etc. Once all of these references are released, the
-        connection itself will be released back to the pool automatically.
-        Either control references to these related objects carefully or
-        explicitly release connections back to the pool in order to ensure
-        sufficient resources are available.
-
-        If the tag is not *None*, it is expected to be a string with name=value
-        pairs like "k1=v1;k2=v2" and will override the value in the property
-        :attr:`Connection.tag`. If either :attr:`Connection.tag` or the tag
-        parameter are not *None*, the connection will be retagged when it is
-        released back to the pool.
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.Connection):
-            message = "connection must be an instance of oracledb.Connection"
-            raise TypeError(message)
-        connection._verify_connected()
-        if tag is not None:
-            connection.tag = tag
-        self._impl.return_connection(connection._impl)
-        connection._impl = None
-
-
-def _pool_factory(
-    f: Callable[..., ConnectionPool],
-) -> Callable[..., ConnectionPool]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested ConnectionPool class. The base
-    ConnectionPool class constructor does not check the validity of the
-    supplied keyword parameters.
-    """
-
-    @functools.wraps(f)
-    def create_pool(
-        dsn: Optional[str] = None,
-        *,
-        pool_class: Type[ConnectionPool] = ConnectionPool,
-        pool_alias: Optional[str] = None,
-        params: Optional[PoolParams] = None,
-        **kwargs,
-    ) -> ConnectionPool:
-        f(
-            dsn=dsn,
-            pool_class=pool_class,
-            pool_alias=pool_alias,
-            params=params,
-            **kwargs,
-        )
-        if not issubclass(pool_class, ConnectionPool):
-            errors._raise_err(errors.ERR_INVALID_POOL_CLASS)
-        return pool_class(dsn, params=params, cache_name=pool_alias, **kwargs)
-
-    return create_pool
-
-
-@_pool_factory
-def create_pool(
-    dsn: Optional[str] = None,
-    *,
-    pool_class: Type[ConnectionPool] = ConnectionPool,
-    pool_alias: Optional[str] = None,
-    params: Optional[PoolParams] = None,
-    # {{ args_with_defaults }}
-) -> ConnectionPool:
-    """
-    Creates a connection pool with the supplied parameters and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool_class`` parameter is expected to be ConnectionPool or a subclass
-    of ConnectionPool.
-
-    The ``pool_alias`` parameter is expected to be a string representing the
-    name used to store and reference the pool in the python-oracledb connection
-    pool cache. If this parameter is not specified, then the pool will not be
-    added to the cache. The value of this parameter can be used with the
-    :meth:`oracledb.get_pool()` and :meth:`oracledb.connect()` methods to
-    access the pool.
-
-    The ``params`` parameter is expected to be of type PoolParams and contains
-    parameters that are used to create the pool. See the documentation on
-    PoolParams for more information. If this parameter is not specified, the
-    additional keyword parameters will be used to create an instance of
-    PoolParams. If both the ``params`` parameter and additional keyword
-    parameters are specified, the values in the keyword parameters have
-    precedence. Note that if a ``dsn`` is also supplied, then in
-    python-oracledb Thin mode, the values of the parameters specified (if any)
-    within the dsn will override the values passed as additional keyword
-    parameters, which themselves override the values set in the ``params``
-    parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    # {{ args_help_with_defaults }}
-    """
-    pass
-
-
-class AsyncConnectionPool(BaseConnectionPool):
-
-    def _set_connection_type(self, conn_class):
-        """
-        Called internally when the pool is created to ensure that the correct
-        connection class is used for all connections created by the pool.
-        """
-        if conn_class is None:
-            conn_class = connection_module.AsyncConnection
-        elif not issubclass(conn_class, connection_module.AsyncConnection):
-            errors._raise_err(errors.ERR_INVALID_CONN_CLASS)
-        self._connection_type = conn_class
-
-    def acquire(
-        self,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        cclass: Optional[str] = None,
-        purity: int = oracledb.PURITY_DEFAULT,
-        tag: Optional[str] = None,
-        matchanytag: bool = False,
-        shardingkey: Optional[list] = None,
-        supershardingkey: Optional[list] = None,
-    ) -> "connection_module.AsyncConnection":
-        """
-        Acquires a connection from the pool and returns an :ref:`asynchronous
-        connection object <asyncconnobj>`.
-
-        If the pool is :ref:`homogeneous <connpooltypes>`, the ``user`` and
-        ``password`` parameters cannot be specified. If they are, an exception
-        will be raised.
-
-        The ``cclass`` parameter, if specified, should be a string
-        corresponding to the connection class for :ref:`drcp`.
-
-        The ``purity`` parameter is expected to be one of
-        :data:`~oracledb.PURITY_NEW`, :data:`~oracledb.PURITY_SELF`, or
-        :data:`~oracledb.PURITY_DEFAULT`.
-
-        The ``tag``, ``matchanytag``, ``shardingkey``, and ``supershardingkey``
-        parameters are ignored in python-oracledb Thin mode.
-        """
-        self._verify_open()
-
-        return oracledb.connect_async(
-            conn_class=self._connection_type,
-            user=user,
-            password=password,
-            cclass=cclass,
-            purity=purity,
-            tag=tag,
-            matchanytag=matchanytag,
-            shardingkey=shardingkey,
-            supershardingkey=supershardingkey,
-            pool=self,
-        )
-
-    async def close(self, force: bool = False) -> None:
-        """
-        Closes the pool now, rather than when the last reference to it is
-        released, which makes it unusable for further work.
-
-        If any connections have been acquired and not released back to the
-        pool, this method will fail unless the ``force`` parameter is set to
-        *True*.
-        """
-        self._verify_open()
-        await self._impl.close(force)
-        if self._cache_name is not None:
-            named_pools.remove_pool(self._cache_name)
-        self._impl = None
-
-    async def drop(self, connection: "connection_module.Connection") -> None:
-        """
-        Drops the connection from the pool which is useful if the connection is
-        no longer usable (such as when the session is killed).
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.AsyncConnection):
-            message = (
-                "connection must be an instance of oracledb.AsyncConnection"
-            )
-            raise TypeError(message)
-        connection._verify_connected()
-        await self._impl.drop(connection._impl)
-        connection._impl = None
-
-    async def release(
-        self,
-        connection: "connection_module.AsyncConnection",
-        tag: Optional[str] = None,
-    ) -> None:
-        """
-        Releases the connection back to the pool now. The connection will be
-        unusable from this point forward. An Error exception will be raised if
-        any operation is attempted with the connection. Any cursors or LOBs
-        created by the connection will also be marked unusable and an Error
-        exception will be raised if any operation is attempted with them.
-
-        The ``tag`` parameter is ignored in python-oracledb Thin mode.
-        """
-        self._verify_open()
-        if not isinstance(connection, connection_module.AsyncConnection):
-            message = (
-                "connection must be an instance of oracledb.AsyncConnection"
-            )
-            raise TypeError(message)
-        if tag is not None:
-            connection.tag = tag
-        await self._impl.return_connection(connection._impl)
-        connection._impl = None
-
-
-def _async_pool_factory(
-    f: Callable[..., AsyncConnectionPool],
-) -> Callable[..., AsyncConnectionPool]:
-    """
-    Decorator which checks the validity of the supplied keyword parameters by
-    calling the original function (which does nothing), then creates and
-    returns an instance of the requested ConnectionPool class. The base
-    ConnectionPool class constructor does not check the validity of the
-    supplied keyword parameters.
-    """
-
-    @functools.wraps(f)
-    def create_pool_async(
-        dsn: Optional[str] = None,
-        *,
-        pool_class: Type[ConnectionPool] = AsyncConnectionPool,
-        pool_alias: Optional[str] = None,
-        params: Optional[PoolParams] = None,
-        **kwargs,
-    ) -> AsyncConnectionPool:
-        f(
-            dsn=dsn,
-            pool_class=pool_class,
-            pool_alias=pool_alias,
-            params=params,
-            **kwargs,
-        )
-        oracledb.enable_thin_mode()
-        if not issubclass(pool_class, AsyncConnectionPool):
-            errors._raise_err(errors.ERR_INVALID_POOL_CLASS)
-        return pool_class(dsn, params=params, cache_name=pool_alias, **kwargs)
-
-    return create_pool_async
-
-
-@_async_pool_factory
-def create_pool_async(
-    dsn: Optional[str] = None,
-    *,
-    pool_class: Type[ConnectionPool] = AsyncConnectionPool,
-    pool_alias: Optional[str] = None,
-    params: Optional[PoolParams] = None,
-    # {{ async_args_with_defaults }}
-) -> AsyncConnectionPool:
-    """
-    Creates a connection pool with the supplied parameters and returns it.
-
-    The ``dsn`` parameter (data source name) can be a string in the format
-    user/password@connect_string or can simply be the connect string (in
-    which case authentication credentials such as the username and password
-    need to be specified separately). See the documentation on connection
-    strings for more information.
-
-    The ``pool_class`` parameter is expected to be AsyncConnectionPool or a
-    subclass of AsyncConnectionPool.
-
-    The ``pool_alias`` parameter is expected to be a string representing the
-    name used to store and reference the pool in the python-oracledb connection
-    pool cache. If this parameter is not specified, then the pool will not be
-    added to the cache. The value of this parameter can be used with the
-    :meth:`oracledb.get_pool()` and :meth:o`racledb.connect_async()` methods to
-    access the pool.
-
-    The ``params`` parameter is expected to be of type PoolParams and contains
-    parameters that are used to create the pool. See the documentation on
-    PoolParams for more information. If this parameter is not specified, the
-    additional keyword parameters will be used to create an instance of
-    PoolParams. If both the ``params`` parameter and additional keyword
-    parameters are specified, the values in the keyword parameters have
-    precedence. Note that if a ``dsn`` is also supplied, then in
-    python-oracledb Thin mode, the values of the parameters specified (if any)
-    within the ``dsn`` will override the values passed as additional keyword
-    parameters, which themselves override the values set in the ``params``
-    parameter object.
-
-    The following parameters are all optional. A brief description of each
-    parameter follows:
-
-    # {{ async_args_help_with_defaults }}
-    """
-    pass
-
-
-class NamedPools:
-
-    def __init__(self):
-        self.lock = threading.Lock()
-        self.pools = {}
-
-    def add_pool(self, alias, pool):
-        """
-        Adds a pool to the cache. An exception is raised if a pool is already
-        cached with the given alias.
-        """
-        if not isinstance(alias, str):
-            raise TypeError("pool_alias must be a string")
-        with self.lock:
-            if alias in self.pools:
-                errors._raise_err(errors.ERR_NAMED_POOL_EXISTS, alias=alias)
-            self.pools[alias] = pool
-
-    def remove_pool(self, alias):
-        """
-        Removes the pool with the given alias from the cache. An exception is
-        raised if there is no pool cached with the given alias.
-        """
-        with self.lock:
-            if alias not in self.pools:
-                errors._raise_err(errors.ERR_NAMED_POOL_MISSING, alias=alias)
-            del self.pools[alias]
-
-
-named_pools = NamedPools()
-
-
-def get_pool(
-    pool_alias: str,
-) -> Union[ConnectionPool, AsyncConnectionPool, None]:
-    """
-    Returns a :ref:`ConnectionPool object <connpool>` from the python-oracledb
-    pool cache. The pool must have been previously created by passing the same
-    ``pool_alias`` value to :meth:`oracledb.create_pool()` or
-    :meth:`oracledb.create_pool_async()`.
-
-    If a pool with the given name does not exist, *None* is returned.
-    """
-    return named_pools.pools.get(pool_alias)
diff --git a/utils/templates/pool_params.py b/utils/templates/pool_params.py
deleted file mode 100644
index 2de09a42..00000000
--- a/utils/templates/pool_params.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -----------------------------------------------------------------------------
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates.
-#
-# This software is dual-licensed to you under the Universal Permissive License
-# (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
-# 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
-# either license.
-#
-# If you elect to accept the software under the Apache License, Version 2.0,
-# the following applies:
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# pool_params.py
-#
-# Contains the PoolParams class used for managing the parameters required to
-# create a connection pool.
-#
-# # {{ generated_notice }}
-# -----------------------------------------------------------------------------
-
-import ssl
-from typing import Callable, Type, Union, Any, Optional
-
-import oracledb
-
-from . import base_impl, utils
-from .connect_params import ConnectParams
-
-
-class PoolParams(ConnectParams):
-    """
-    Contains all parameters used for creating a connection pool.
-    """
-
-    __module__ = oracledb.__name__
-    __slots__ = ["_impl"]
-    _impl_class = base_impl.PoolParamsImpl
-
-    @utils.params_initer
-    def __init__(
-        # {{ params_constructor_args }}
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        # {{ args_help_with_defaults }}
-        """
-        pass
-
-    # {{ params_repr }}
-
-    # {{ params_properties }}
-
-    def copy(self) -> "PoolParams":
-        """
-        Creates a copy of the parameters and returns it.
-        """
-        params = PoolParams.__new__(PoolParams)
-        params._impl = self._impl.copy()
-        return params
-
-    @utils.params_setter
-    def set(
-        # {{ params_setter_args }}
-    ):
-        """
-        All parameters are optional. A brief description of each parameter
-        follows:
-
-        # {{ args_help_without_defaults }}
-        """
-        pass