Merge pull request #200 from oracle/dev/v1.12.0

v1.12.0

Author: aosingh

.github/scripts/create_new_user.sh

@@ -4,24 +4,14 @@ set -Exeuo pipefail
 
 # Parameters
 DB_USER="${1}"
-DB_PASSWORD="${2}"
-TARGET_PDB="${3:-FREEPDB1}"
+ADMIN_PASSWORD="${2}"
+DB_PASSWORD="${3}"
 
-# Prepare container switch statement to create user in PDB.
-ALTER_SESSION_CMD="ALTER SESSION SET CONTAINER=${TARGET_PDB};"
-
-# 11g XE does not support PDBs, set container switch statement to empty string.
-ORACLE_VERSION=$(sqlplus -version | grep "Release" | awk '{ print $3 }')
-if [[ "${ORACLE_VERSION}" = "11.2"* ]]; then
-   ALTER_SESSION_CMD="";
-fi;
-
-# Create new user in target PDB
-sqlplus -s / as sysdba << EOF
+# Create the user through the ADB administrator account.
+sqlplus -s "admin/${ADMIN_PASSWORD}@localhost:1521/myatp" << EOF
    -- Exit on any errors
    WHENEVER SQLERROR EXIT SQL.SQLCODE
-   ${ALTER_SESSION_CMD}
-   CREATE USER ${DB_USER} IDENTIFIED BY "${DB_PASSWORD}" QUOTA UNLIMITED ON SYSTEM;
-   GRANT DB_DEVELOPER_ROLE TO ${DB_USER};
+   CREATE USER ${DB_USER} IDENTIFIED BY "${DB_PASSWORD}" QUOTA UNLIMITED ON DATA;
+   GRANT CONNECT, CONSOLE_DEVELOPER, DWROLE, RESOURCE TO ${DB_USER};
    exit;
 EOF

.github/scripts/install_oracle_instantclient.sh

@@ -1,11 +1,10 @@
 sudo apt-get update
 sudo apt-get install wget libaio1t64
 sudo mkdir -p /opt/oracle
-wget https://download.oracle.com/otn_software/linux/instantclient/2370000/instantclient-basiclite-linux.x64-23.7.0.25.01.zip -P /tmp
-sudo unzip /tmp/instantclient-basiclite-linux.x64-23.7.0.25.01.zip -d /opt/oracle
-export PATH="$PATH:/opt/oracle/instantclient_23_7"
-export LD_LIBRARY_PATH="/opt/oracle/instantclient_23_7:$LD_LIBRARY_PATH"
+wget https://download.oracle.com/otn_software/linux/instantclient/2326300/instantclient-basiclite-linux.x64-23.26.3.0.0.zip -P /tmp
+sudo unzip /tmp/instantclient-basiclite-linux.x64-23.26.3.0.0.zip -d /opt/oracle
+export PATH="$PATH:/opt/oracle/instantclient_23_26"
+export LD_LIBRARY_PATH="/opt/oracle/instantclient_23_26:$LD_LIBRARY_PATH"
 sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
 sudo mkdir -p /opt/tns_admin
 echo "DISABLE_OOB=ON" >> /opt/tns_admin/sqlnet.ora
-

.github/workflows/tests.yaml

@@ -1,6 +1,8 @@
 name: dbt-tests-adapter
 on:
   push:
+    branches:
+      - "**"
   workflow_call:
 
 permissions:
@@ -13,23 +15,30 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     services:
-      oracle_db:
-        image: container-registry.oracle.com/database/free:latest-lite
+      adb:
+        image: ghcr.io/oracle/adb-free:latest-26ai
         env:
-          ORACLE_PWD: ${{ secrets.DBT_ORACLE_PASSWORD }}
-        options: --name oracle_db
+          WORKLOAD_TYPE: ATP
+          START_ORDS: "False"
+          ENABLE_ARCHIVE_LOG: "False"
+          ADMIN_PASSWORD: ${{ secrets.DBT_ORACLE_ADMIN_PASSWORD }}
+          WALLET_PASSWORD: ${{ secrets.DBT_ORACLE_TEST_WALLET_PASSWORD }}
         ports:
           - 1521:1521
+        options: >-
+          --name adb
+          --cap-add SYS_ADMIN
+          --device /dev/fuse
 
     steps:
       - name: Check out dbt-oracle repository code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -38,27 +47,24 @@ jobs:
           chmod +x ${{ github.workspace }}/.github/scripts/install_oracle_instantclient.sh
           ${{ github.workspace }}/.github/scripts/install_oracle_instantclient.sh
 
-      - name: Copy Create User script
-        run: |
-          chmod +x ${{ github.workspace }}/.github/scripts/create_new_user.sh
-          docker cp ${{ github.workspace }}/.github/scripts/create_new_user.sh oracle_db:/home/oracle/create_new_user.sh
-
       - name: Create dbt test users
         run: |
-          docker exec oracle_db /home/oracle/create_new_user.sh dbt_test ${{ secrets.DBT_ORACLE_PASSWORD }}
-          docker exec oracle_db /home/oracle/create_new_user.sh dbt_test_user_1 ${{ secrets.DBT_ORACLE_PASSWORD }}
-          docker exec oracle_db /home/oracle/create_new_user.sh dbt_test_user_2 ${{ secrets.DBT_ORACLE_PASSWORD }}
-          docker exec oracle_db /home/oracle/create_new_user.sh dbt_test_user_3 ${{ secrets.DBT_ORACLE_PASSWORD }}
+          chmod +x ${{ github.workspace }}/.github/scripts/create_new_user.sh
+          docker cp ${{ github.workspace }}/.github/scripts/create_new_user.sh adb:/tmp/create_new_user.sh
+          docker exec adb /tmp/create_new_user.sh dbt_test \
+            '${{ secrets.DBT_ORACLE_ADMIN_PASSWORD }}' '${{ secrets.DBT_ORACLE_PASSWORD }}'
+          docker exec adb /tmp/create_new_user.sh dbt_test_user_1 \
+            '${{ secrets.DBT_ORACLE_ADMIN_PASSWORD }}' '${{ secrets.DBT_ORACLE_PASSWORD }}'
+          docker exec adb /tmp/create_new_user.sh dbt_test_user_2 \
+            '${{ secrets.DBT_ORACLE_ADMIN_PASSWORD }}' '${{ secrets.DBT_ORACLE_PASSWORD }}'
+          docker exec adb /tmp/create_new_user.sh dbt_test_user_3 \
+            '${{ secrets.DBT_ORACLE_ADMIN_PASSWORD }}' '${{ secrets.DBT_ORACLE_PASSWORD }}'
 
       - name: Install dbt-oracle with core dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -e '.[test]'
 
-      - name: Check create-pem-from-p12 script is installed in bin
-        run: |
-          create-pem-from-p12 --help
-
       - name: Run adapter tests - ORA_PYTHON_DRIVER_TYPE => THICK
         run: |
           pytest -v
@@ -69,10 +75,10 @@ jobs:
           DBT_ORACLE_PORT: 1521
           DBT_ORACLE_SCHEMA: DBT_TEST
           DBT_ORACLE_PASSWORD: ${{ secrets.DBT_ORACLE_PASSWORD }}
-          DBT_ORACLE_DATABASE: FREEPDB1
-          DBT_ORACLE_SERVICE: FREEPDB1
+          DBT_ORACLE_DATABASE: MYATP
+          DBT_ORACLE_SERVICE: MYATP
           DBT_ORACLE_PROTOCOL: tcp
-          LD_LIBRARY_PATH: /opt/oracle/instantclient_23_7
+          LD_LIBRARY_PATH: /opt/oracle/instantclient_23_26
           TNS_ADMIN: /opt/tns_admin
           DBT_TEST_USER_1: DBT_TEST_USER_1
           DBT_TEST_USER_2: DBT_TEST_USER_2
@@ -88,8 +94,8 @@ jobs:
           DBT_ORACLE_PORT: 1521
           DBT_ORACLE_SCHEMA: DBT_TEST
           DBT_ORACLE_PASSWORD: ${{ secrets.DBT_ORACLE_PASSWORD }}
-          DBT_ORACLE_DATABASE: FREEPDB1
-          DBT_ORACLE_SERVICE: FREEPDB1
+          DBT_ORACLE_DATABASE: MYATP
+          DBT_ORACLE_SERVICE: MYATP
           DBT_ORACLE_PROTOCOL: tcp
           DISABLE_OOB: on
           TNS_ADMIN: /opt/tns_admin

Makefile

@@ -1,5 +1,5 @@
 # Configuration variables
-VERSION=1.11.1
+VERSION=1.12.0
 PROJ_DIR?=$(shell pwd)
 VENV_DIR?=${PROJ_DIR}/.bldenv
 BUILD_DIR=${PROJ_DIR}/build

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.11.1"
+version = "1.12.0"

dbt_adbs_test_project/README.md

@@ -21,8 +21,8 @@ dbt --version
 
 ```text
 Core:
-  - installed: 1.3.0
-  - latest:    1.3.0 - Up to date!
+  - installed: 1.12.0
+  - latest:    1.12.0 - Up to date!
 ```
 
 ### Check database connectivity
@@ -32,7 +32,7 @@ dbt debug --profiles-dir ./
 ```
 
 ```text
-dbt version: 1.3.0
+dbt version: 1.12.0
 python version: 3.8.13
 ..
 ..
@@ -65,12 +65,27 @@ After this, you can test various dbt features included in this project
 | Generic Test - Accepted values | `dbt test` | [schema.yml](./models/schema.yml)
 | Generic Test - Relationships | `dbt test` | [schema.yml](./models/schema.yml)
 | Operations |  `dbt run-operation`  | Check [macros](macros)
+| v1.12 ad hoc operation | `dbt run-operation --sql "select 1 from dual"` | Executes an Oracle statement without a macro |
+| v1.12 named selector composition | `dbt ls --select selector:sample_models` | [selectors.yml](selectors.yml) |
+| v1.12 downstream failure behavior | `dbt run -s sales_cost_incremental+` | `on_error: continue` in [properties.yml](models/properties.yml) |
 | Snapshots | `dbt snapshot` | Check [snapshots](snapshots)
 | Analyses | `dbt compile` | [eu_customers.sql](./analysis/eu_customers.sql)
 | Exposures | `dbt run` or `dbt test` | [exposures.yml](./models/exposures.yml)
 | Generate documentation | `dbt docs generate` |
 | Serve project documentation on port 8080 | `dbt docs serve`
 
+## dbt Core v1.12 compatibility
+
+The project uses the v1.12 generic-test `arguments` syntax and validates the
+new `run-operation --sql`, `selector:` selection method, and `on_error` model
+configuration. The opt-in v2 parser is not currently usable with `dbt-oracle`:
+the bundled experimental parser does not yet recognize the Oracle adapter.
+
+`dbt_constraints` 1.0.9 is the latest supported package release, but its
+published macro documentation does not match its macro signatures. With dbt
+1.12's default macro-argument validation enabled, dbt therefore emits warnings
+for that dependency. They are not caused by this project's macros or schema.
+
 
 ## Tests [TODO]
 - Metrics - Experimental feature introduced in dbt-core==1.0.0

dbt_adbs_test_project/models/properties.yml

@@ -3,3 +3,5 @@ models:
   - name: sales_cost_incremental
     config:
       post-hook: "SELECT COUNT(*) FROM sales_cost_incremental"
+      # dbt Core v1.12: allow unrelated downstream branches to continue after a failure.
+      on_error: continue

dbt_adbs_test_project/models/schema.yml

@@ -60,7 +60,8 @@ models:
       - name: gender
         tests:
           - accepted_values:
-              values: ['Male', 'Female']
+              arguments:
+                values: ['Male', 'Female']
   - name: countries
     columns:
       - name: country_id
@@ -73,10 +74,10 @@ models:
       - name: country_id
         tests:
           - relationships:
-              to: ref('countries')
-              field: country_id
+              arguments:
+                to: ref('countries')
+                field: country_id
           - dbt_constraints.foreign_key:
-              pk_table_name: ref('countries')
-              pk_column_name: country_id
-
-
+              arguments:
+                pk_table_name: ref('countries')
+                pk_column_name: country_id

dbt_adbs_test_project/package-lock.yml

@@ -1,6 +1,8 @@
 packages:
-- package: dbt-labs/dbt_utils
-  version: 0.8.6
-- package: Snowflake-Labs/dbt_constraints
-  version: 0.4.2
-sha1_hash: 7664cb2e33183f39e86a72079d63607e43a50ad8
+  - name: dbt_utils
+    package: dbt-labs/dbt_utils
+    version: 1.4.1
+  - name: dbt_constraints
+    package: Snowflake-Labs/dbt_constraints
+    version: 1.0.9
+sha1_hash: b9f858fcf43fd74717c56899e55ceaf1c1789d10

dbt_adbs_test_project/packages.yml

@@ -1,5 +1,5 @@
 packages:
   - package: dbt-labs/dbt_utils
-    version: 0.8.6
+    version: 1.4.1
   - package: Snowflake-Labs/dbt_constraints
-    version: [">=0.4.0", "<0.5.0"]
+    version: 1.0.9