diff --git a/tests/functional/adapter/test_basic.py b/tests/functional/adapter/test_basic.py index 09ddf3d57..fec10aa33 100644 --- a/tests/functional/adapter/test_basic.py +++ b/tests/functional/adapter/test_basic.py @@ -11,7 +11,7 @@ from dbt.tests.adapter.basic.test_generic_tests import BaseGenericTests from dbt.tests.adapter.basic.test_snapshot_check_cols import BaseSnapshotCheckCols from dbt.tests.adapter.basic.test_snapshot_timestamp import BaseSnapshotTimestamp - +from dbt.tests.adapter.basic.test_adapter_methods import BaseAdapterMethod class TestSimpleMaterializationsSnowflake(BaseSimpleMaterializations): pass @@ -47,3 +47,8 @@ class TestSnapshotCheckColsSnowflake(BaseSnapshotCheckCols): class TestSnapshotTimestampSnowflake(BaseSnapshotTimestamp): pass + +class TestBaseAdapterMethodSnowflake(BaseAdapterMethod): + @pytest.fixture(scope="class") + def equal_tables(self): + return ["MODEL", "EXPECTED"] \ No newline at end of file diff --git a/tests/integration/adapter_methods_test/bigquery-models/renamed_model.sql b/tests/integration/adapter_methods_test/bigquery-models/renamed_model.sql deleted file mode 100644 index 3c030d920..000000000 --- a/tests/integration/adapter_methods_test/bigquery-models/renamed_model.sql +++ /dev/null @@ -1 +0,0 @@ -select * from {{ source('test_source', 'renamed_seed') }} \ No newline at end of file diff --git a/tests/integration/adapter_methods_test/bigquery-models/sources.yml b/tests/integration/adapter_methods_test/bigquery-models/sources.yml deleted file mode 100644 index cb74cde9c..000000000 --- a/tests/integration/adapter_methods_test/bigquery-models/sources.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -sources: - - name: test_source - schema: "{{ target.schema }}" - tables: - - name: renamed_seed diff --git a/tests/integration/adapter_methods_test/macros/rename_named_relation.sql b/tests/integration/adapter_methods_test/macros/rename_named_relation.sql deleted file mode 100644 index 253e1e0ad..000000000 --- a/tests/integration/adapter_methods_test/macros/rename_named_relation.sql +++ /dev/null @@ -1,6 +0,0 @@ --- Macro to rename a relation -{% macro rename_named_relation(from_name, to_name) %} -{%- set from_relation = api.Relation.create(database=target.database, schema=target.schema, identifier=from_name, type='table') -%} -{%- set to_relation = api.Relation.create(database=target.database, schema=target.schema, identifier=to_name, type='table') -%} -{% do adapter.rename_relation(from_relation, to_relation) %} -{% endmacro %} \ No newline at end of file diff --git a/tests/integration/adapter_methods_test/models/expected.sql b/tests/integration/adapter_methods_test/models/expected.sql deleted file mode 100644 index ddebb5f5d..000000000 --- a/tests/integration/adapter_methods_test/models/expected.sql +++ /dev/null @@ -1,3 +0,0 @@ --- make sure this runs after 'model' --- {{ ref('model') }} -select 2 as id diff --git a/tests/integration/adapter_methods_test/models/model.sql b/tests/integration/adapter_methods_test/models/model.sql deleted file mode 100644 index bcf11d81c..000000000 --- a/tests/integration/adapter_methods_test/models/model.sql +++ /dev/null @@ -1,19 +0,0 @@ - -{% set upstream = ref('upstream') %} - -{% if execute %} - {# don't ever do any of this #} - {%- do adapter.drop_schema(upstream) -%} - {% set existing = adapter.get_relation(upstream.database, upstream.schema, upstream.identifier) %} - {% if existing is not none %} - {% do exceptions.raise_compiler_error('expected ' ~ ' to not exist, but it did') %} - {% endif %} - - {%- do adapter.create_schema(upstream) -%} - - {% set sql = create_view_as(upstream, 'select 2 as id') %} - {% do run_query(sql) %} -{% endif %} - - -select * from {{ upstream }} diff --git a/tests/integration/adapter_methods_test/models/upstream.sql b/tests/integration/adapter_methods_test/models/upstream.sql deleted file mode 100644 index 43258a714..000000000 --- a/tests/integration/adapter_methods_test/models/upstream.sql +++ /dev/null @@ -1 +0,0 @@ -select 1 as id diff --git a/tests/integration/adapter_methods_test/seed_bq.sql b/tests/integration/adapter_methods_test/seed_bq.sql deleted file mode 100644 index 71a9a78c6..000000000 --- a/tests/integration/adapter_methods_test/seed_bq.sql +++ /dev/null @@ -1,32 +0,0 @@ -create table {database}.{schema}.seed ( - id INT64, - first_name STRING, - last_name STRING, - email STRING, - gender STRING, - ip_address STRING, - updated_at TIMESTAMP -); - --- seed inserts -insert {database}.{schema}.seed (id, first_name, last_name, email, gender, ip_address, updated_at) values -(1, 'Judith', 'Kennedy', 'jkennedy0@phpbb.com', 'Female', '54.60.24.128', '2015-12-24 12:19:28'), -(2, 'Arthur', 'Kelly', 'akelly1@eepurl.com', 'Male', '62.56.24.215', '2015-10-28 16:22:15'), -(3, 'Rachel', 'Moreno', 'rmoreno2@msu.edu', 'Female', '31.222.249.23', '2016-04-05 02:05:30'), -(4, 'Ralph', 'Turner', 'rturner3@hp.com', 'Male', '157.83.76.114', '2016-08-08 00:06:51'), -(5, 'Laura', 'Gonzales', 'lgonzales4@howstuffworks.com', 'Female', '30.54.105.168', '2016-09-01 08:25:38'), -(6, 'Katherine', 'Lopez', 'klopez5@yahoo.co.jp', 'Female', '169.138.46.89', '2016-08-30 18:52:11'), -(7, 'Jeremy', 'Hamilton', 'jhamilton6@mozilla.org', 'Male', '231.189.13.133', '2016-07-17 02:09:46'), -(8, 'Heather', 'Rose', 'hrose7@goodreads.com', 'Female', '87.165.201.65', '2015-12-29 22:03:56'), -(9, 'Gregory', 'Kelly', 'gkelly8@trellian.com', 'Male', '154.209.99.7', '2016-03-24 21:18:16'), -(10, 'Rachel', 'Lopez', 'rlopez9@themeforest.net', 'Female', '237.165.82.71', '2016-08-20 15:44:49'), -(11, 'Donna', 'Welch', 'dwelcha@shutterfly.com', 'Female', '103.33.110.138', '2016-02-27 01:41:48'), -(12, 'Russell', 'Lawrence', 'rlawrenceb@qq.com', 'Male', '189.115.73.4', '2016-06-11 03:07:09'), -(13, 'Michelle', 'Montgomery', 'mmontgomeryc@scientificamerican.com', 'Female', '243.220.95.82', '2016-06-18 16:27:19'), -(14, 'Walter', 'Castillo', 'wcastillod@pagesperso-orange.fr', 'Male', '71.159.238.196', '2016-10-06 01:55:44'), -(15, 'Robin', 'Mills', 'rmillse@vkontakte.ru', 'Female', '172.190.5.50', '2016-10-31 11:41:21'), -(16, 'Raymond', 'Holmes', 'rholmesf@usgs.gov', 'Male', '148.153.166.95', '2016-10-03 08:16:38'), -(17, 'Gary', 'Bishop', 'gbishopg@plala.or.jp', 'Male', '161.108.182.13', '2016-08-29 19:35:20'), -(18, 'Anna', 'Riley', 'arileyh@nasa.gov', 'Female', '253.31.108.22', '2015-12-11 04:34:27'), -(19, 'Sarah', 'Knight', 'sknighti@foxnews.com', 'Female', '222.220.3.177', '2016-09-26 00:49:06'), -(20, 'Phyllis', 'Fox', null, 'Female', '163.191.232.95', '2016-08-21 10:35:19'); diff --git a/tests/integration/adapter_methods_test/test_adapter_methods.py b/tests/integration/adapter_methods_test/test_adapter_methods.py deleted file mode 100644 index 181505586..000000000 --- a/tests/integration/adapter_methods_test/test_adapter_methods.py +++ /dev/null @@ -1,30 +0,0 @@ -from tests.integration.base import DBTIntegrationTest, use_profile - - -class TestBaseCaching(DBTIntegrationTest): - @property - def schema(self): - return "caching" - - @property - def models(self): - return "models" - - @property - def project_config(self): - return { - 'config-version': 2, - 'test-paths': ['tests'] - } - - @use_profile('snowflake') - def test_snowflake_adapter_methods(self): - self.run_dbt(['compile']) - self.run_dbt() - self.assertTablesEqual('MODEL', 'EXPECTED') - - @use_profile('snowflake') - def test_snowflake_adapter_query_id(self): - results = self.run_dbt() - # strip to ensure nonempty string doesn't get passed - assert results[0].adapter_response['query_id'].strip() != "" diff --git a/tests/integration/adapter_methods_test/tests/get_columns_in_relation.sql b/tests/integration/adapter_methods_test/tests/get_columns_in_relation.sql deleted file mode 100644 index 6507b52ec..000000000 --- a/tests/integration/adapter_methods_test/tests/get_columns_in_relation.sql +++ /dev/null @@ -1,7 +0,0 @@ -{% set columns = adapter.get_columns_in_relation(ref('model')) %} -{% set limit_query = 0 %} -{% if (columns | length) == 0 %} - {% set limit_query = 1 %} -{% endif %} - -select 1 as id limit {{ limit_query }}