add minimum compatibility for 1.6.0

Per the adapter maintainer upgrade guide for v1.6.0, this PR includes the following:
Bugs fixed:

- Fixed a bug causing the dateadd macro to fail its tests when handling DATETIME type fields. The updated sqlite__dateadd.sql macro now adequately handles both DATE and DATETIME types per ISO-8601 and passes its tests now.

Changes made:

[BtS] Adapter zone tests

- Added four new tests in test_utils.py and all tests passed without overrides.

No changes required:

[BtS] Drop support for Py 3.7

- Support for Py 3.7 was already removed in dbt-sqlite 1.2.0rc1.

[BtS] new arg for adapter.execute()

- We use SQLConnectionManager.execute() directly. No changes required.

No changes made:

[FEATURE] Materialized Views:

- Materialized views are not supported in sqlite3. No changes made.

[FEATURE] dbt clone

- Clone objects are not supported in sqlite3 because it is a simple in-process database.

[BtS] revamp of dbt debug

- No new warnings or errors in tests. No changes made.

Possible remaining todo

- Left out tests related to Contracts as they aren't being implemented as a feature. I had created a test and ran it only to see the test failed, which was expected, so the unit test needs to be overridden in order to make that passing criteria instead of failing.

Author: tom-juntunen

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && apt-get -y install git python3 python3-pip python3-venv sq
 WORKDIR /opt/dbt-sqlite
 
 RUN python3 -m pip install --upgrade pip \
-    && python3 -m pip install pytest pytest-dotenv dbt-core~=1.5.0 dbt-tests-adapter~=1.5.0
+    && python3 -m pip install pytest pytest-dotenv dbt-core~=1.6.0 dbt-tests-adapter~=1.6.0
 
 RUN wget -q https://github.com/nalgeon/sqlean/releases/download/0.15.2/crypto.so
 RUN wget -q https://github.com/nalgeon/sqlean/releases/download/0.15.2/math.so

README.md

@@ -34,6 +34,7 @@ Use the right version. Starting with the release of dbt-core 1.0.0,
 versions of dbt-sqlite are aligned to the same major+minor
 [version](https://semver.org/) of dbt-core.
 
+- versions 1.5.x of this adapter work with dbt-core 1.6.x
 - versions 1.5.x of this adapter work with dbt-core 1.5.x
 - versions 1.4.x of this adapter work with dbt-core 1.4.x
 - versions 1.3.x of this adapter work with dbt-core 1.3.x

dbt/adapters/sqlite/__version__.py

@@ -1 +1 @@
-version = '1.5.0'
+version = '1.6.0'

dbt/include/sqlite/macros/utils/dateadd.sql

@@ -1,8 +1,33 @@
 {% macro sqlite__dateadd(datepart, interval, from_date_or_timestamp) %}
+    -- If provided a DATETIME, returns a DATETIME
+    -- If provided a DATE, returns a DATE
 
-    date(
-        {{ from_date_or_timestamp }},
-        "{{ datepart }} {{ datepart }}"
-        )
-
+    CASE
+        -- Matches DATETIME type based on ISO-8601 
+        WHEN {{ from_date_or_timestamp }} LIKE '%:%' OR ({{ from_date_or_timestamp }} LIKE '%T%' AND {{ from_date_or_timestamp }} LIKE '%Z%') THEN
+            CASE
+                WHEN LOWER({{ datepart }}) = 'second' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' seconds')
+                WHEN LOWER({{ datepart }}) = 'minute' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' minutes')
+                WHEN LOWER({{ datepart }}) = 'hour' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' hours')
+                WHEN LOWER({{ datepart }}) = 'day' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' days')
+                WHEN LOWER({{ datepart }}) = 'week' THEN datetime({{ from_date_or_timestamp }}, '+' || ({{ interval }} * 7) || ' days')
+                WHEN LOWER({{ datepart }}) = 'month' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' months')
+                WHEN LOWER({{ datepart }}) = 'quarter' THEN datetime({{ from_date_or_timestamp }}, '+' || ({{ interval }} * 3) || ' months')
+                WHEN LOWER({{ datepart }}) = 'year' THEN datetime({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' years')
+                ELSE NULL
+            END
+        -- Matches DATE type based on ISO-8601
+        WHEN {{ from_date_or_timestamp }} LIKE '%-%' AND {{ from_date_or_timestamp }} NOT LIKE '%T%' AND {{ from_date_or_timestamp }} NOT LIKE '% %' THEN
+            CASE
+                WHEN LOWER({{ datepart }}) IN ('second', 'minute', 'hour') THEN date({{ from_date_or_timestamp }})
+                WHEN LOWER({{ datepart }}) = 'day' THEN date({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' days')
+                WHEN LOWER({{ datepart }}) = 'week' THEN date({{ from_date_or_timestamp }}, '+' || ({{ interval }} * 7) || ' days')
+                WHEN LOWER({{ datepart }}) = 'month' THEN date({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' months')
+                WHEN LOWER({{ datepart }}) = 'quarter' THEN date({{ from_date_or_timestamp }}, '+' || ({{ interval }} * 3) || ' months')
+                WHEN LOWER({{ datepart }}) = 'year' THEN date({{ from_date_or_timestamp }}, '+' || {{ interval }} || ' years')
+                ELSE NULL
+            END
+        ELSE
+            NULL
+    END
 {% endmacro %}

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

@@ -3,7 +3,7 @@
 {%- endmacro %}
 
 {% macro sqlite__snapshot_string_as_time(timestamp) -%}
-    {# just return the string; SQLite doesn't have a timestamp data type per se #}
+    {# just return the string; SQLite doesn''t have a timestamp data type per se #}
     {{ return("'" + timestamp|string + "'") }}
 {%- endmacro %}
 

setup.py

@@ -46,7 +46,7 @@ def _get_plugin_version():
         ]
     },
     install_requires=[
-        "dbt-core~=1.5.0"
+        "dbt-core~=1.6.0"
     ],
     classifiers=[
         'Development Status :: 4 - Beta',

tests/functional/adapter/utils/test_utils.py

@@ -4,6 +4,10 @@
     seeds__data_datediff_csv,
     models__test_datediff_yml,
 )
+from dbt.tests.adapter.utils.fixture_dateadd import (
+    seeds__data_dateadd_csv,
+    models__test_dateadd_yml,
+)
 from dbt.tests.adapter.utils.test_any_value import BaseAnyValue
 from dbt.tests.adapter.utils.test_array_append import BaseArrayAppend
 from dbt.tests.adapter.utils.test_array_concat import BaseArrayConcat
@@ -29,6 +33,9 @@
 from dbt.tests.adapter.utils.test_safe_cast import BaseSafeCast
 from dbt.tests.adapter.utils.test_split_part import BaseSplitPart
 from dbt.tests.adapter.utils.test_string_literal import BaseStringLiteral
+from dbt.tests.adapter.utils.test_equals import BaseEquals
+from dbt.tests.adapter.utils.test_null_compare import BaseMixedNullCompare, BaseNullCompare
+from dbt.tests.adapter.utils.test_validate_sql import BaseValidateSqlMethod
 
 
 class TestAnyValue(BaseAnyValue):
@@ -66,6 +73,32 @@ class TestConcat(BaseConcat):
 class TestCurrentTimestampNaive(BaseCurrentTimestampNaive):
     pass
 
+class BaseDateAdd(BaseUtils):
+
+    models__test_dateadd_sql = """
+    with data as (
+        select * from {{ ref('data_dateadd') }}
+    )
+    
+    select
+        {{ dateadd('datepart', 'interval_length', 'from_time') }} AS actual,
+        result as expected
+    from data
+    """
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {"data_dateadd.csv": seeds__data_dateadd_csv}
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "test_dateadd.yml": models__test_dateadd_yml,
+            "test_dateadd.sql": self.interpolate_macro_namespace(
+                self.models__test_dateadd_sql, "dateadd"
+            ),
+        }
+
 
 class TestDateAdd(BaseDateAdd):
     pass
@@ -179,10 +212,21 @@ class TestRight(BaseRight):
 class TestSafeCast(BaseSafeCast):
     pass
 
-
+@pytest.mark.skip("TODO: implement split_part, either using sqlite>=3.8.3 for WITH RECURSIVE support, or possibly sooner using jinja and agate tables")
 class TestSplitPart(BaseSplitPart):
     pass
 
-
 class TestStringLiteral(BaseStringLiteral):
     pass
+
+class TestEquals(BaseEquals):
+    pass
+
+class TestMixedNullCompare(BaseMixedNullCompare):
+    pass
+
+class TestNullCompare(BaseNullCompare):
+    pass
+
+class TestValidateSqlMethod(BaseValidateSqlMethod):
+    pass