Merge pull request #66 from oracle/fixes/v1.3.2

Fixes and features for v1.3.2

Author: aosingh

Makefile

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

dbt/include/oracle/macros/adapters.sql

@@ -100,19 +100,22 @@
   {% if temporary -%} on commit preserve rows {%- endif %}
   as
     {{ sql }}
-
 {%- endmacro %}
 
 
 {% macro oracle__create_table_as(temporary, relation, sql) -%}
   {%- set sql_header = config.get('sql_header', none) -%}
+  {%- set parallel = config.get('parallel', none) -%}
+  {%- set compression_clause = config.get('table_compression_clause', none) -%}
 
   {{ sql_header if sql_header is not none }}
 
   create {% if temporary -%}
     global temporary
   {%- endif %} table {{ relation.include(schema=(not temporary)) }}
   {% if temporary -%} on commit preserve rows {%- endif %}
+  {% if parallel %} parallel {{ parallel }}{% endif %}
+  {% if compression_clause %} {{ compression_clause }} {% endif %}
   as
     {{ sql }}
 

dbt/include/oracle/macros/materializations/table/table.sql

@@ -17,8 +17,8 @@
 {% materialization table, adapter='oracle' %}
   {% set identifier = model['alias'] %}
   {% set grant_config = config.get('grants') %}
-  {% set tmp_identifier = model['name'] + '__dbt_tmp' %}
-  {% set backup_identifier = model['name'] + '__dbt_backup' %}
+  {% set tmp_identifier = model['alias'] + '__dbt_tmp' %}
+  {% set backup_identifier = model['alias'] + '__dbt_backup' %}
   {% set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %}
   {% set target_relation = api.Relation.create(identifier=identifier,
                                                 schema=schema,

dbt/include/oracle/macros/materializations/view/view.sql

@@ -18,7 +18,7 @@
 
   {%- set identifier = model['alias'] -%}
   {%- set grant_config = config.get('grants') -%}
-  {%- set backup_identifier = model['name'] + '__dbt_backup' -%}
+  {%- set backup_identifier = model['alias'] + '__dbt_backup' -%}
 
   {%- set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) -%}
   {%- set target_relation = api.Relation.create(identifier=identifier, schema=schema, database=database,

dbt_adbs_test_project/models/internet_sales_channel_customers.sql

@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 #}
+{{config(materialized='table', parallel=4, table_compression_clause='COLUMN STORE COMPRESS FOR QUERY')}}
 select c.cust_id, c.cust_first_name, c.cust_last_name, t.country_iso_code, t.country_name, t.country_region
 from {{ ref('sales_internet_channel') }} s, {{ source('sh_database', 'countries') }} t, {{ source('sh_database', 'customers') }} c
 WHERE s.cust_id = c.cust_id