Migrate pieces into core + plugins

Author: jtcohen6

dev-requirements.txt

@@ -1,9 +1,6 @@
 pytest
 pytest-dotenv
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=tests/adapter
-git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugins/postgres
-git+https://github.com/dbt-labs/dbt-redshift.git
-git+https://github.com/dbt-labs/dbt-snowflake.git
-git+https://github.com/dbt-labs/dbt-bigquery.git
+git+https://github.com/dbt-labs/dbt-core.git@jerco/data-type-macros#egg=dbt-core&subdirectory=core
+git+https://github.com/dbt-labs/dbt-core.git@jerco/data-type-macros#egg=dbt-tests-adapter&subdirectory=tests/adapter
+git+https://github.com/dbt-labs/dbt-bigquery.git@jerco/data-type-macros
 pytest-xdist

macros/cross_db_utils/datatypes.sql

@@ -1,3 +1,6 @@
+{# These macros have been moved into dbt-core #}
+{# Here for backwards compatibility ONLY #}
+
 {# string  -------------------------------------------------     #}
 
 {%- macro type_string() -%}
@@ -8,10 +11,6 @@
     {{ return(adapter.dispatch('type_string', 'dbt')()) }}
 {% endmacro %}
 
--- This will return 'text' by default
--- On Postgres + Snowflake, that's equivalent to varchar (no size)
--- Redshift will treat that as varchar(256)
-
 
 {# timestamp  -------------------------------------------------     #}
 
@@ -23,34 +22,6 @@
     {{ return(adapter.dispatch('type_timestamp', 'dbt')()) }}
 {% endmacro %}
 
-<<<<<<< HEAD
-=======
-/*
-POSTGRES
-https://www.postgresql.org/docs/current/datatype-datetime.html:
-The SQL standard requires that writing just `timestamp` 
-be equivalent to `timestamp without time zone`, and 
-PostgreSQL honors that behavior. 
-`timestamptz` is accepted as an abbreviation for `timestamp with time zone`;
-this is a PostgreSQL extension.
-
-SNOWFLAKE
-https://docs.snowflake.com/en/sql-reference/data-types-datetime.html#timestamp
-The TIMESTAMP_* variation associated with TIMESTAMP is specified by the 
-TIMESTAMP_TYPE_MAPPING session parameter. The default is TIMESTAMP_NTZ.
-
-BIGQUERY
-TIMESTAMP means 'timestamp with time zone'
-DATETIME means 'timestamp without time zone'
-TODO: shouldn't this return DATETIME instead of TIMESTAMP, for consistency with other databases?
-e.g. dateadd returns a DATETIME
-
-/* Snowflake:
-https://docs.snowflake.com/en/sql-reference/data-types-datetime.html#timestamp
-The TIMESTAMP_* variation associated with TIMESTAMP is specified by the TIMESTAMP_TYPE_MAPPING session parameter. The default is TIMESTAMP_NTZ.
-*/
-
->>>>>>> caf0388 (Refactor tests, passing on BQ)
 
 {# float  -------------------------------------------------     #}
 
@@ -94,6 +65,3 @@ The TIMESTAMP_* variation associated with TIMESTAMP is specified by the TIMESTAM
 {% macro default__type_int() %}
     {{ return(adapter.dispatch('type_int', 'dbt')()) }}
 {% endmacro %}
-
--- returns 'int' everywhere, except BigQuery, where it returns 'int64'
--- (but BigQuery also now accepts 'int' as a valid alias for 'int64')

tests/functional/data_type/base_data_type.py

@@ -1,16 +1,20 @@
 import os
 import pytest
 from dbt.tests.util import run_dbt, check_relations_equal, get_relation_columns
-from dbt.tests.adapter.utils.base_utils import BaseUtils
+from dbt.tests.adapter.utils.data_types.base_data_type_macro import BaseDataTypeMacro
 
 class BaseDbtUtilsBackCompat(BaseDataTypeMacro):
+    # install this repo as a package
     @pytest.fixture(scope="class")
     def packages(self):
         return {"packages": [{"local": os.getcwd()}]}
 
-    def assert_columns_equal(self, project, expected_cols, actual_cols):
-        assert expected_cols == actual_cols, f"Type difference detected: {expected_cols} vs. {actual_cols}"
+    # call the macros from the 'dbt_utils' namespace
+    # instead of the unspecified / global namespace
+    def macro_namespace(self):
+        return "dbt_utils"
 
+    # actual test sequence needs to run 'deps' first
     def test_check_types_assert_match(self, project):
         run_dbt(['deps'])
         super().test_check_types_assert_match(project)

tests/functional/data_type/test_type_bigint.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDbtUtilsLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_bigint import BaseTypeBigInt
 
 

tests/functional/data_type/test_type_float.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDataTypeMacro, BaseLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_float import BaseTypeFloat
 
 

tests/functional/data_type/test_type_int.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDataTypeMacro, BaseLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_int import BaseTypeInt
 
 

tests/functional/data_type/test_type_numeric.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDataTypeMacro, BaseLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_numeric import BaseTypeNumeric
 
 

tests/functional/data_type/test_type_string.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDataTypeMacro, BaseLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_string import BaseTypeString
 
 

tests/functional/data_type/test_type_timestamp.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from tests.functional.data_type.base_data_type import BaseDataTypeMacro, BaseLegacyDataTypeMacro
+from tests.functional.data_type.base_data_type import BaseDbtUtilsBackCompat, BaseLegacyDataTypeMacro
 from dbt.tests.adapter.utils.data_types.test_type_timestamp import BaseTypeTimestamp