using string interpoloation to gather correct pointer for dbt-core te…

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0rc1
+current_version = 1.0.0
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)

.github/workflows/integration.yml

@@ -216,3 +216,19 @@ jobs:
             "You do not have permissions to run integration tests, @dbt-labs/core "\
             "needs to label this PR with `ok to test` in order to run integration tests!"
           check_for_duplicate_msg: true
+
+  slack-results:
+    runs-on: ubuntu-latest
+    needs: test 
+    if: always()
+
+    steps:
+      - name: Posting scheduled run failures
+        uses: ravsamhq/notify-slack-action@v1
+        if: ${{ github.event_name == 'schedule' }}
+        with:
+          notification_title: 'Redshift nightly integration test failed'
+          status: ${{ job.status }}
+          notify_when: 'failure'
+    env:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEV_CORE_ALERTS }}

.github/workflows/main.yml

@@ -93,21 +93,28 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-
+      - name: Get dbt-core version
+        id: dbt-core-version
+        run: | 
+          echo "::set-output name=dbt-version::${{ 
+            ( contains( github.event.pull_request.base.ref, 'latest' ) || github.event.pull_request.base.ref == main) 
+            && github.event.pull_request.base.ref 
+            || main
+          }}"
       - name: Install python dependencies
         run: |
           pip install  --user --upgrade pip
           pip install tox
           pip --version
           tox --version
 
-      - name: Install dbt-core latest
+      - name: Install dbt-core from branch ${{ steps.dbt-core-version.outputs.dbt-version }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-version }}#egg=dbt-core&subdirectory=core"
 
-      - name: Install dbt-postgres latest
+      - name: Install dbt-postgres from ${{ steps.dbt-core-version.outputs.dbt-version }}
         run: |
-          pip install "git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres"
+          pip install "git+https://github.com/dbt-labs/dbt-core.git@${{ steps.dbt-core-version.outputs.dbt-version }}#egg=dbt-postgres&subdirectory=plugins/postgres"
 
       - name: Run tox
         run: tox

CHANGELOG.md

@@ -1,4 +1,12 @@
-## dbt-redshift 1.0.0 (Release TBD)
+## dbt-redshift 1.0.0 (December 3, 2021)
+
+## dbt-redshift 1.0.0rc2 (November 24, 2021)
+
+### Under the hood
+- Add optional Redshift parameter to create tables with BACKUP NO set, to exclude them from snapshots. ([#18](https://github.com/dbt-labs/dbt-redshift/issues/18), [#42](https://github.com/dbt-labs/dbt-redshift/pull/42))
+
+### Contributors
+- [@dlb8685](https://github.com/dlb8685) ([#42](https://github.com/dbt-labs/dbt-redshift/pull/42))
 
 ## dbt-redshift 1.0.0rc1 (November 10, 2021)
 

dbt/adapters/redshift/__version__.py

@@ -1 +1 @@
-version = '1.0.0rc1'
+version = '1.0.0'

dbt/adapters/redshift/impl.py

@@ -19,6 +19,7 @@ class RedshiftConfig(AdapterConfig):
     dist: Optional[str] = None
     sort: Optional[str] = None
     bind: Optional[bool] = None
+    backup: Optional[bool] = True
 
 
 class RedshiftAdapter(PostgresAdapter, SQLAdapter):

dbt/include/redshift/macros/adapters.sql

@@ -39,13 +39,15 @@
           'sort',
           validator=validation.any[list, basestring]) -%}
   {%- set sql_header = config.get('sql_header', none) -%}
+  {%- set backup = config.get('backup') -%}
 
   {{ sql_header if sql_header is not none }}
 
   create {% if temporary -%}temporary{%- endif %} table
     {{ relation.include(database=(not temporary), schema=(not temporary)) }}
     {{ dist(_dist) }}
     {{ sort(_sort_type, _sort) }}
+    {% if backup == false -%}backup no{%- endif %}
   as (
     {{ sql }}
   );

setup.py

@@ -55,9 +55,9 @@ def _get_dbt_core_version():
     pre = (parts["prekind"]+"1" if parts["prekind"] else "")
     return f"{minor}{pre}"
 
-
+#TODO remove old logic and add to versionBump script
 package_name = "dbt-redshift"
-package_version = _get_plugin_version()
+package_version = "1.0.0"
 dbt_core_version = _get_dbt_core_version()
 description = """The Redshift adapter plugin for dbt"""
 

tests/integration/backup_table_tests/models/model_backup_false.sql

@@ -0,0 +1,7 @@
+{{
+    config(
+        materialized='table', backup=False
+    )
+}}
+
+select 1

tests/integration/backup_table_tests/models/model_backup_true.sql

@@ -0,0 +1,7 @@
+{{
+    config(
+        materialized='table', backup=True
+    )
+}}
+
+select 2

tests/integration/backup_table_tests/models/model_backup_true_view.sql

@@ -0,0 +1,7 @@
+{{
+    config(
+        materialized='view', backup=True
+    )
+}}
+
+select 3

tests/integration/backup_table_tests/models/model_backup_undefined.sql

@@ -0,0 +1,7 @@
+{{
+    config(
+        materialized='table'
+    )
+}}
+
+select 4

tests/integration/backup_table_tests/test_backup_table_option.py

@@ -0,0 +1,90 @@
+import os
+
+from tests.integration.base import DBTIntegrationTest, use_profile
+
+
+class TestBackupTableOption(DBTIntegrationTest):
+    @property
+    def schema(self):
+        return 'backup_table_tests'
+
+    @staticmethod
+    def dir(path):
+        return os.path.normpath(path)
+
+    @property
+    def models(self):
+        return self.dir("models")
+
+    @property
+    def project_config(self):
+        return {
+            'config-version': 2
+        }
+
+    def check_backup_param_template(self, test_table_name, backup_is_expected):
+        # Use raw DDL statement to confirm backup is set correctly on new table
+        with open('target/run/test/models/{}.sql'.format(test_table_name), 'r') as ddl_file:
+            ddl_statement = ddl_file.readlines()
+            self.assertEqual('backup no' not in ' '.join(ddl_statement).lower(), backup_is_expected)
+
+    @use_profile('redshift')
+    def test__redshift_backup_table_option(self):
+        self.assertEqual(len(self.run_dbt()), 4)
+
+        # model_backup_undefined should not contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_undefined', True)
+
+        # model_backup_true should not contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_true', True)
+
+        # model_backup_false should contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_false', False)
+
+        # Any view should not contain a BACKUP NO parameter, regardless of the specified config (create will fail)
+        self.check_backup_param_template('model_backup_true_view', True)
+
+
+class TestBackupTableOptionProjectFalse(DBTIntegrationTest):
+    @property
+    def schema(self):
+        return 'backup_table_tests'
+
+    @staticmethod
+    def dir(path):
+        return os.path.normpath(path)
+
+    @property
+    def models(self):
+        return self.dir("models")
+
+    @property
+    def project_config(self):
+        # Update project config to set backup to False.
+        # This should make the 'model_backup_undefined' switch to BACKUP NO
+        return {
+            'config-version': 2,
+            'models': {'backup': False}
+        }
+
+    def check_backup_param_template(self, test_table_name, backup_is_expected):
+        # Use raw DDL statement to confirm backup is set correctly on new table
+        with open('target/run/test/models/{}.sql'.format(test_table_name), 'r') as ddl_file:
+            ddl_statement = ddl_file.readlines()
+            self.assertEqual('backup no' not in ' '.join(ddl_statement).lower(), backup_is_expected)
+
+    @use_profile('redshift')
+    def test__redshift_backup_table_option_project_config_false(self):
+        self.assertEqual(len(self.run_dbt()), 4)
+
+        # model_backup_undefined should contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_undefined', False)
+
+        # model_backup_true should not contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_true', True)
+
+        # model_backup_false should contain a BACKUP NO parameter in the table DDL
+        self.check_backup_param_template('model_backup_false', False)
+
+        # Any view should not contain a BACKUP NO parameter, regardless of the specified config (create will fail)
+        self.check_backup_param_template('model_backup_true_view', True)