v1.3.0 updates

- README updates. Simplified readmes
- Added EOF New line
- Renamed incremental/helpers.sql -> incremental/strategies.sql

Author: aosingh

README.md

@@ -3,14 +3,12 @@
 [![PyPI version](https://badge.fury.io/py/dbt-oracle.svg)](https://pypi.python.org/pypi/dbt-oracle)
 [![dbt-tests-adapter](https://github.com/oracle/dbt-oracle/actions/workflows/oracle-xe-adapter-tests.yml/badge.svg)](https://github.com/oracle/dbt-oracle/actions/workflows/oracle-xe-adapter-tests.yml)
 
-dbt "adapters" are responsible for adapting dbt's functionality to a given database. `dbt-oracle` implements dbt functionalities for the Oracle database. 
+`dbt-oracle` implements [dbt (data build tool)](https://docs.getdbt.com/docs/introduction) functionalities for the Oracle database. 
 
 > Prior to version 1.0.0, dbt-oracle was created and maintained by [Indicium](https://indicium.tech/) on [their GitHub repo](https://github.com/techindicium/dbt-oracle). Contributors in this repo are credited for laying the groundwork and maintaining the adapter till version 0.4.3.
 From version 1.0.0, dbt-oracle is maintained and distributed by Oracle.
 
 
-For dbt documentation, refer https://docs.getdbt.com/docs/introduction
-
 ## Installation
 
 For installation, read how you can set up [Oracle profile][1] for dbt

dbt/include/oracle/macros/materializations/incremental/helpers.sql renamed to dbt/include/oracle/macros/materializations/incremental/strategies.sql

@@ -34,15 +34,6 @@
     )
 {%- endmacro %}
 
-{% macro oracle_check_and_quote_column_names_for_incremental_merge(dest_column_names) %}
-    {%- set quoted_update_columns = [] -%}
-    {%- set update_columns = config.get("merge_update_columns", default=dest_column_names) -%}
-    {% for col in update_columns %}
-        {% do quoted_update_columns.append(adapter.check_and_quote_identifier(col, model.columns)) %}
-    {% endfor %}
-    {{ return(quoted_update_columns)}}
-{% endmacro %}
-
 {% macro oracle_check_and_quote_unique_key_for_incremental_merge(unique_key) %}
     {%- set quote = "\"" -%}
     {%- set unique_key_list = [] -%}
@@ -54,20 +45,20 @@
                 {% else %}
                     {% do unique_key_list.append(key.upper()) %}
                 {% endif %}
-            {% endfor %}
+          {% endfor %}
+    {% else %}
+        {% if adapter.should_identifier_be_quoted(unique_key, model.columns) == true %}
+            {% do unique_key_list.append(quote ~ unique_key ~ quote) %}
         {% else %}
-            {% if adapter.should_identifier_be_quoted(unique_key, model.columns) == true %}
-                {% do unique_key_list.append(quote ~ unique_key ~ quote) %}
-            {% else %}
-                {% do unique_key_list.append(unique_key.upper()) %}
-            {% endif %}
+            {% do unique_key_list.append(unique_key.upper()) %}
         {% endif %}
-        {% for key in unique_key_list %}
-            {% set this_key_match %}
-                    temp.{{ key }} = target.{{ key }}
-            {% endset %}
-            {% do unique_key_merge_predicates.append(this_key_match) %}
-        {% endfor %}
+    {% endif %}
+    {% for key in unique_key_list %}
+        {% set this_key_match %}
+                temp.{{ key }} = target.{{ key }}
+        {% endset %}
+        {% do unique_key_merge_predicates.append(this_key_match) %}
+    {% endfor %}
     {%- set unique_key_result = {'unique_key_list': unique_key_list, 'unique_key_merge_predicates': unique_key_merge_predicates} -%}
     {{ return(unique_key_result)}}
 {% endmacro %}
@@ -155,4 +146,3 @@
 {% macro oracle__get_incremental_default_sql(arg_dict) %}
   {% do return(get_incremental_merge_sql(arg_dict)) %}
 {% endmacro %}
-

dbt/include/oracle/macros/utils/data_types.sql

@@ -28,4 +28,4 @@
 
 {% macro oracle__type_boolean() -%}
     NUMBER(1)
-{%- endmacro %}
+{%- endmacro %}

dbt/include/oracle/macros/utils/timestamps.sql

@@ -22,4 +22,4 @@
 {% macro oracle__snapshot_string_as_time(timestamp) -%}
     {%- set result = "TO_TIMESTAMP('"~ timestamp ~ "','yyyy/mm/dd hh24:mi:ss.FF')" -%}
     {{ return(result) }}
-{%- endmacro %}
+{%- endmacro %}

dbt_adbs_test_project/README.md

@@ -9,70 +9,44 @@ To test the integration with ADBS, you can use OCI's [Always Free Autonomous Dat
 
 The database also provides a read-only Sales History data set. Any user can start querying the tables in this Sales History `sh` schema. Models in this test project refer the `sh` schema. You do not need to load any other dataset.
 
-## Setup the oracle profile
+## Setup
 
-To setup [profiles.yml](profiles.yml) read [setup & installation instructions][1] on dbt docs website
+[Install][1] dbt-oracle and setup [profiles.yml](profiles.yml) for ADBS
 
-Install dbt-oracle in your project's virtual environment.
+### Verify the installation
 
-
-## dbt project
-
-Next, run the `dbt compile` command in this project directory to compile the models and resolve dependencies.
 ```bash
-dbt compile --profiles-dir ./
+dbt --version
 ```
+
 ```text
-20:14:29  Running with dbt=1.0.1
-20:14:29  Found 10 models, 5 tests, 1 snapshot, 1 analysis, 382 macros, 2 operations, 1 seed file, 8 sources, 2 exposures, 0 metrics
-20:14:29  
-20:14:32  Concurrency: 4 threads (target='dev')
-20:14:32  
-20:14:33  Done.
+Core:
+  - installed: 1.3.0
+  - latest:    1.3.0 - Up to date!
 ```
-All dbt models in this test project refer the sales history (`sh`) sample schema.
-Following directory structure shows the 10 models, seed, test, analysis and snaphots.
 
+### Check database connectivity
 
-```text
-.
-├── README.md
-├── analysis
-│   └── eu_customers.sql
-├── data
-│   └── seed.csv
-├── dbt_packages
-│   └── dbt_utils
-├── dbt_project.yml
-├── macros
-│   ├── demo_multiple_statements.sql
-│   ├── execute_statements.sql
-│   └── readme.md
-├── models
-│   ├── direct_sales_channel_promo_cost.sql
-│   ├── eu
-│       ├── countries.sql
-│       └── eu_direct_sales_channels_promo_costs.sql
-│   ├── income_levels.sql
-│   ├── internet_sales_channel_customers.sql
-│   ├── people.sql
-│   ├── promotion_costs.sql
-│   ├── sales_internet_channel.sql
-│   ├── schema.yml
-│   ├── us_product_sales_channel_ranking.sql
-│   └── us_seed_customers.sql
-├── packages.yml
-├── profiles.yml
-├── seeds
-│   └── seed.csv
-├── snapshots
-│   ├── README.md
-│   └── promotion_costs.sql
-└── test
-    └── test_count_employees.sql
+```bash
+dbt debug --profiles-dir ./
+```
 
+```text
+dbt version: 1.3.0
+python version: 3.8.13
+..
+..
+Connection:
+  user: 
+  database:
+  schema:
+  ...
+  Connection test: [OK connection ok]
+
+All checks passed!
 
 ```
+After this, you can test various dbt features included in this project
 
 ## Features tested in this project
 

tests/README.md

@@ -5,7 +5,6 @@
 - [Environment Variables](#environment-variables)
 - [Adapter Plugin Tests](#adapter-plugin-tests)
 - [Testing for different Python versions](#different-python-versions)
-- [Jaffle Shop Test Project](#jaffle-shop-test-project)
 
 
 ## Environment variables <a name='environment-variables'></a>
@@ -109,181 +108,3 @@ For each environment, you can also see the test runtime as summary
   py39 - 24 passed in 755.18s (0:12:35)
   py310 - 24 passed in 764.96s (0:12:44)
 ```
-
-## Jaffle Shop Test Project <a name='jaffle-shop-test-project'></a>
-
-[Jaffle Shop test project](https://github.com/dbt-labs/jaffle_shop) is a self-contained dbt project which can be used for testing the adapter.
-
-### Profile
-
-Setup a `jaffle_shop` profile to connect to the Oracle Database
-
-```yaml
-# ~/.dbt/profiles.yml
-jaffle_shop:
-  target: dev
-  outputs:
-    dev:
-      type: oracle
-      user: "{{ env_var('DBT_ORACLE_USER') }}"
-      pass: "{{ env_var('DBT_ORACLE_PASSWORD') }}"
-      protocol: "tcps"
-      host: "{{ env_var('DBT_ORACLE_HOST') }}"
-      port: 1522
-      service: "{{ env_var('DBT_ORACLE_SERVICE') }}"
-      database: "{{ env_var('DBT_ORACLE_DATABASE') }}"
-      schema: "{{ env_var('DBT_ORACLE_SCHEMA') }}"
-      threads: 4
-
-```
-
-### dbt debug
-
-To test connection, run the `dbt debug` command from the `jaffle_shop` project directory
-
-```text
-Connection:
-  user: <...>
-  database: <...>
-  schema: <...>
-  protocol: tcps
-  host: <...>
-  port: 1522
-  service: <...>
-  connection_string: None
-  Connection test: [OK connection ok]
-
-All checks passed!
-```
-
-
-### Seed `quote_columns` config
-
-By default, seed configuration `quote_columns` is expected to be False as explained here https://docs.getdbt.com/reference/resource-configs/quote_columns
-
-However, seed column names are quoted when `dbt seed` command is run.
-
-This raises `ORA-00904: "AMOUNT": invalid identifier` errors in the subsequent `dbt run` command. 
-
-```text
-19:12:11.145108 [error] [MainThread]: Database Error in model stg_payments (models/staging/stg_payments.sql)
-19:12:11.145796 [error] [MainThread]:   ORA-00904: "AMOUNT": invalid identifier
-19:12:11.146445 [error] [MainThread]:   compiled SQL at target/run/jaffle_shop/models/staging/stg_payments.sql
-19:12:11.147094 [info ] [MainThread]: 
-19:12:11.147972 [error] [MainThread]: Database Error in model stg_orders (models/staging/stg_orders.sql)
-19:12:11.148769 [error] [MainThread]:   ORA-00904: "STATUS": invalid identifier
-19:12:11.149495 [error] [MainThread]:   compiled SQL at target/run/jaffle_shop/models/staging/stg_orders.sql
-19:12:11.150168 [info ] [MainThread]: 
-19:12:11.150703 [error] [MainThread]: Database Error in model stg_customers (models/staging/stg_customers.sql)
-19:12:11.151226 [error] [MainThread]:   ORA-00904: "LAST_NAME": invalid identifier
-19:12:11.151734 [error] [MainThread]:   compiled SQL at target/run/jaffle_shop/models/staging/stg_customers.sql
-
-```
-
-Disable `quote_columns` in `dbt_project.yml`.
-
-```yaml
-name: 'jaffle_shop'
-version: '0.1'
-profile: 'jaffle_shop'
-config-version: 2
-
-source-paths: ["models"]
-analysis-paths: ["analysis"]
-test-paths: ["tests"]
-data-paths: ["data"]
-macro-paths: ["macros"]
-
-target-path: "target"
-clean-targets:
-    - "target"
-    - "dbt_modules"
-    - "logs"
-
-models:
-  jaffle_shop:
-      materialized: table
-      staging:
-        materialized: view
-
-# Disable seed config quote_columns
-seeds:
-    jaffle_shop:
-        quote_columns: false
-```
-
-### dbt seed
-
-```text
-
-21:20:43  Running with dbt=1.0.1
-21:20:44  Found 5 models, 20 tests, 0 snapshots, 0 analyses, 193 macros, 0 operations, 3 seed files, 0 sources, 0 exposures, 0 metrics
-21:20:44  
-21:20:51  Concurrency: 4 threads (target='dev')
-21:20:51  
-21:20:51  1 of 3 START seed file dbt_test.raw_customers................................... [RUN]
-21:20:51  2 of 3 START seed file dbt_test.raw_orders...................................... [RUN]
-21:20:51  3 of 3 START seed file dbt_test.raw_payments.................................... [RUN]
-21:20:54  2 of 3 OK loaded seed file dbt_test.raw_orders.................................. [INSERT 99 in 3.56s]
-21:20:54  1 of 3 OK loaded seed file dbt_test.raw_customers............................... [INSERT 100 in 3.56s]
-21:20:55  3 of 3 OK loaded seed file dbt_test.raw_payments................................ [INSERT 113 in 4.20s]
-21:20:57  
-21:20:57  Finished running 3 seeds in 13.23s.
-21:20:57  
-21:20:57  Completed successfully
-21:20:57  
-21:20:57  Done. PASS=3 WARN=0 ERROR=0 SKIP=0 TOTAL=3
-
-```
-
-
-### dbt run
-
-```text
-21:21:28  Running with dbt=1.0.1
-21:21:28  Found 5 models, 20 tests, 0 snapshots, 0 analyses, 193 macros, 0 operations, 3 seed files, 0 sources, 0 exposures, 0 metrics
-21:21:28  
-21:21:35  Concurrency: 4 threads (target='dev')
-21:21:35  
-21:21:35  1 of 5 START view model dbt_test.stg_customers.................................. [RUN]
-21:21:35  2 of 5 START view model dbt_test.stg_orders..................................... [RUN]
-21:21:35  3 of 5 START view model dbt_test.stg_payments................................... [RUN]
-21:21:38  2 of 5 OK created view model dbt_test.stg_orders................................ [OK in 3.07s]
-21:21:38  3 of 5 OK created view model dbt_test.stg_payments.............................. [OK in 3.07s]
-21:21:38  1 of 5 OK created view model dbt_test.stg_customers............................. [OK in 3.07s]
-21:21:38  4 of 5 START table model dbt_test.orders........................................ [RUN]
-21:21:38  5 of 5 START table model dbt_test.customers..................................... [RUN]
-21:21:41  4 of 5 OK created table model dbt_test.orders................................... [OK in 3.63s]
-21:21:41  5 of 5 OK created table model dbt_test.customers................................ [OK in 3.61s]
-21:21:43  
-21:21:43  Finished running 3 view models, 2 table models in 15.27s.
-21:21:43  
-21:21:43  Completed successfully
-21:21:43  
-21:21:43  Done. PASS=5 WARN=0 ERROR=0 SKIP=0 TOTAL=5
-
-```
-
-### dbt test
-
-```text
-21:23:10  Running with dbt=1.0.1
-21:23:10  Found 5 models, 20 tests, 0 snapshots, 0 analyses, 193 macros, 0 operations, 3 seed files, 0 sources, 0 exposures, 0 metrics
-21:23:10  
-21:23:16  Concurrency: 4 threads (target='dev')
-21:23:16  
-....
-....
-....
-....
-21:23:34  17 of 20 PASS unique_orders_order_id............................................ [PASS in 2.78s]
-21:23:35  20 of 20 PASS unique_stg_payments_payment_id.................................... [PASS in 2.08s]
-21:23:35  19 of 20 PASS unique_stg_orders_order_id........................................ [PASS in 2.40s]
-21:23:37  
-21:23:37  Finished running 20 tests in 27.14s.
-21:23:37  
-21:23:37  Completed successfully
-21:23:37  
-21:23:37  Done. PASS=20 WARN=0 ERROR=0 SKIP=0 TOTAL=20
-
-```