From 19b2e52fe944de40f1cb8f177ae04ac526811baf Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Fri, 10 Oct 2025 22:35:44 -0700 Subject: [PATCH 1/4] Bump version to 1.10 --- Makefile | 2 +- dbt/adapters/oracle/__version__.py | 2 +- requirements.txt | 2 +- setup.cfg | 4 ++-- setup.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4cd4a1e..5fc7fe3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Configuration variables -VERSION=1.9.4 +VERSION=1.10.0 PROJ_DIR?=$(shell pwd) VENV_DIR?=${PROJ_DIR}/.bldenv BUILD_DIR=${PROJ_DIR}/build diff --git a/dbt/adapters/oracle/__version__.py b/dbt/adapters/oracle/__version__.py index 00af4c3..8f460a9 100644 --- a/dbt/adapters/oracle/__version__.py +++ b/dbt/adapters/oracle/__version__.py @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. """ -version = "1.9.4" +version = "1.10.0" diff --git a/requirements.txt b/requirements.txt index e44b8cd..f993417 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 dbt-core~=1.10,<1.11 -oracledb==3.3.0 +oracledb==3.4.0 diff --git a/setup.cfg b/setup.cfg index 6b2486a..f7dbd93 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dbt-oracle -version = 1.9.4 +version = 1.10.0 description = dbt (data build tool) adapter for Oracle Autonomous Database long_description = file: README.md long_description_content_type = text/markdown @@ -35,7 +35,7 @@ install_requires = dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 dbt-core~=1.10,<1.11 - oracledb==3.2.0 + oracledb==3.4.0 test_suite=tests test_requires = dbt-tests-adapter~=1.10,<1.11 diff --git a/setup.py b/setup.py index dd4ce10..ff44ee5 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ "dbt-common>=1.1.0,<2.0", "dbt-adapters>=1.2.1,<2.0", "dbt-core~=1.10,<1.11", - "oracledb==3.3.0" + "oracledb==3.4.0" ] test_requirements = [ @@ -61,7 +61,7 @@ url = 'https://github.com/oracle/dbt-oracle' -VERSION = '1.9.4' +VERSION = '1.10.0' setup( author="Oracle", python_requires='>=3.9', From 0b77a8ab0e59e075e8b1cac01853289dfa25e566 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 1 Dec 2025 09:17:27 -0800 Subject: [PATCH 2/4] Support Python 3.13 and update license expression --- .github/workflows/dbt-oracle-adapter-tests.yml | 2 +- dbt/include/oracle/macros/columns.sql | 8 ++++++++ dbt_adbs_test_project/models/test_py_ref.py | 1 - dbt_adbs_test_project/profiles.yml | 2 +- requirements.txt | 2 +- setup.cfg | 8 +++++--- setup.py | 7 ++++--- tox.ini | 2 +- 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dbt-oracle-adapter-tests.yml b/.github/workflows/dbt-oracle-adapter-tests.yml index 2ea9c1e..66a3212 100644 --- a/.github/workflows/dbt-oracle-adapter-tests.yml +++ b/.github/workflows/dbt-oracle-adapter-tests.yml @@ -8,7 +8,7 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest ] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] services: oracle_db: diff --git a/dbt/include/oracle/macros/columns.sql b/dbt/include/oracle/macros/columns.sql index cfa0867..c8c8bc8 100644 --- a/dbt/include/oracle/macros/columns.sql +++ b/dbt/include/oracle/macros/columns.sql @@ -56,4 +56,12 @@ {% endfor %} {%- set cols_csv = quoted | join(', ') -%} {{ return(cols_csv) }} +{% endmacro %} + +{% macro oracle__create_columns(relation, columns) %} + {% for column in columns %} + {% call statement() %} + alter table {{ relation }} add {{ adapter.check_and_quote_identifier(column.name, model.columns) }} {{ column.data_type }} + {% endcall %} + {% endfor %} {% endmacro %} \ No newline at end of file diff --git a/dbt_adbs_test_project/models/test_py_ref.py b/dbt_adbs_test_project/models/test_py_ref.py index 12b1ce7..4301d1a 100644 --- a/dbt_adbs_test_project/models/test_py_ref.py +++ b/dbt_adbs_test_project/models/test_py_ref.py @@ -2,7 +2,6 @@ def model(dbt, session): # Must be either table or incremental (view is not currently supported) dbt.config(materialized="table") dbt.config(async_flag=True) - dbt.config(timeout=900) # In seconds dbt.config(service="HIGH") # LOW, MEDIUM, HIGH # oml.core.DataFrame representing a datasource s_df = dbt.ref("sales_cost") diff --git a/dbt_adbs_test_project/profiles.yml b/dbt_adbs_test_project/profiles.yml index c837a56..83500c4 100644 --- a/dbt_adbs_test_project/profiles.yml +++ b/dbt_adbs_test_project/profiles.yml @@ -7,7 +7,7 @@ dbt_test: pass: "{{ env_var('DBT_ORACLE_PASSWORD') }}" protocol: "tcps" host: "{{ env_var('DBT_ORACLE_HOST') }}" - port: 1522 + port: 1521 service: "{{ env_var('DBT_ORACLE_SERVICE') }}" database: "{{ env_var('DBT_ORACLE_DATABASE') }}" schema: "{{ env_var('DBT_ORACLE_SCHEMA') }}" diff --git a/requirements.txt b/requirements.txt index f993417..32f22a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 dbt-core~=1.10,<1.11 -oracledb==3.4.0 +oracledb==3.4.1 diff --git a/setup.cfg b/setup.cfg index f7dbd93..0916fcc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,16 +6,18 @@ long_description = file: README.md long_description_content_type = text/markdown keywords = Oracle dbt author = Oracle -license = Apache Software License 2.0 +license = Apache License 2.0 +license_files = + LICENSE.txt classifiers = Development Status :: 5 - Production/Stable Intended Audience :: Developers - License :: OSI Approved :: Apache Software License Programming Language :: Python :: 3 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 # Map or URL names to links # Github, PyPI and documentations urls should be added below @@ -35,7 +37,7 @@ install_requires = dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 dbt-core~=1.10,<1.11 - oracledb==3.4.0 + oracledb==3.4.1 test_suite=tests test_requires = dbt-tests-adapter~=1.10,<1.11 diff --git a/setup.py b/setup.py index ff44ee5..9b88941 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ "dbt-common>=1.1.0,<2.0", "dbt-adapters>=1.2.1,<2.0", "dbt-core~=1.10,<1.11", - "oracledb==3.4.0" + "oracledb==3.4.1" ] test_requirements = [ @@ -68,17 +68,18 @@ classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', 'Natural Language :: English', 'Programming Language :: Python :: 3', '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' ], description="dbt (data build tool) adapter for Oracle Autonomous Database", install_requires=requirements, - license="Apache Software License 2.0", + license="Apache License 2.0", + license_files=["LICENSE.txt"], long_description=readme, long_description_content_type='text/markdown', include_package_data=True, diff --git a/tox.ini b/tox.ini index c7c48be..e349776 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py3{9,10,11,12} +envlist = py3{9,10,11,12,13} [testenv] passenv = From 1b0d4c0e3e422eedbcf9555d77d0118a1f292915 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 1 Dec 2025 11:28:23 -0800 Subject: [PATCH 3/4] Added newline char --- dbt/include/oracle/macros/columns.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/include/oracle/macros/columns.sql b/dbt/include/oracle/macros/columns.sql index c8c8bc8..a5c0034 100644 --- a/dbt/include/oracle/macros/columns.sql +++ b/dbt/include/oracle/macros/columns.sql @@ -64,4 +64,4 @@ alter table {{ relation }} add {{ adapter.check_and_quote_identifier(column.name, model.columns) }} {{ column.data_type }} {% endcall %} {% endfor %} -{% endmacro %} \ No newline at end of file +{% endmacro %} From ac0bd69ff2665f14192b239a8ac60e1fbb832ba6 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 1 Dec 2025 11:40:53 -0800 Subject: [PATCH 4/4] Fix Python version classifiers --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9b88941..b9fbefc 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12' + 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13' ], description="dbt (data build tool) adapter for Oracle Autonomous Database",