dbt-adapters 1.13.2__tar.gz → 1.14.0__tar.gz

{dbt_adapters-1.13.2 → dbt_adapters-1.14.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.13.2
+Version: 1.14.0
 Summary: The set of adapter protocols and base functionality that supports integration with dbt-core
-Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters
+Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters/tree/main/dbt-adapters
 Project-URL: Documentation, https://docs.getdbt.com
-Project-URL: Repository, https://github.com/dbt-labs/dbt-adapters.git
+Project-URL: Repository, https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-adapters
 Project-URL: Issues, https://github.com/dbt-labs/dbt-adapters/issues
-Project-URL: Changelog, https://github.com/dbt-labs/dbt-adapters/blob/main/CHANGELOG.md
+Project-URL: Changelog, https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md
 Author-email: dbt Labs <info@dbtlabs.com>
 Maintainer-email: dbt Labs <info@dbtlabs.com>
 License-File: LICENSE

dbt_adapters-1.14.0/dbt/adapters/__about__.py

@@ -0,0 +1 @@
+version = "1.14.0"

{dbt_adapters-1.13.2 → dbt_adapters-1.14.0}/dbt/adapters/base/impl.py

@@ -104,7 +104,12 @@ DEFAULT_BASE_BEHAVIOR_FLAGS = [
         "name": "require_batched_execution_for_custom_microbatch_strategy",
         "default": False,
         "docs_url": "https://docs.getdbt.com/docs/build/incremental-microbatch",
-    }
+    },
+    {
+        "name": "enable_truthy_nulls_equals_macro",
+        "default": False,
+        "docs_url": "",
+    },
 ]
 
 

{dbt_adapters-1.13.2 → dbt_adapters-1.14.0}/dbt/include/global_project/macros/materializations/models/incremental/merge.sql

@@ -21,9 +21,9 @@
                 {% do predicates.append(this_key_match) %}
             {% endfor %}
         {% else %}
-            {% set unique_key_match %}
-                DBT_INTERNAL_SOURCE.{{ unique_key }} = DBT_INTERNAL_DEST.{{ unique_key }}
-            {% endset %}
+            {% set source_unique_key = ("DBT_INTERNAL_SOURCE." ~ unique_key) | trim %}
+	    {% set target_unique_key = ("DBT_INTERNAL_DEST." ~ unique_key) | trim %}
+	    {% set unique_key_match = equals(source_unique_key, target_unique_key) | trim %}
             {% do predicates.append(unique_key_match) %}
         {% endif %}
     {% else %}
@@ -62,11 +62,13 @@
 
     {% if unique_key %}
         {% if unique_key is sequence and unique_key is not string %}
-            delete from {{target }}
+            delete from {{ target }}
             using {{ source }}
             where (
                 {% for key in unique_key %}
-                    {{ source }}.{{ key }} = {{ target }}.{{ key }}
+		    {% set source_unique_key = (source ~ "." ~ key) | trim %}
+		    {% set target_unique_key = (target ~ "." ~ key) | trim %}
+                    {{ equals(source_unique_key, target_unique_key) }}
                     {{ "and " if not loop.last}}
                 {% endfor %}
                 {% if incremental_predicates %}

{dbt_adapters-1.13.2 → dbt_adapters-1.14.0}/dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -55,8 +55,11 @@
         from {{ target_relation }}
         where
             {% if config.get('dbt_valid_to_current') %}
-               {# Check for either dbt_valid_to_current OR null, in order to correctly update records with nulls #}
-               ( {{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or {{ columns.dbt_valid_to }} is null)
+		{% set source_unique_key = columns.dbt_valid_to | trim %}
+		{% set target_unique_key = config.get('dbt_valid_to_current') | trim %}
+
+		{# The exact equals semantics between NULL values depends on the current behavior flag set. Also, update records if the source field is null #}
+                ( {{ equals(source_unique_key, target_unique_key) }} or {{ source_unique_key }} is null )
             {% else %}
                 {{ columns.dbt_valid_to }} is null
             {% endif %}
@@ -279,7 +282,9 @@
 {% macro unique_key_join_on(unique_key, identifier, from_identifier) %}
     {% if unique_key | is_list %}
         {% for key in unique_key %}
-            {{ identifier }}.dbt_unique_key_{{ loop.index }} = {{ from_identifier }}.dbt_unique_key_{{ loop.index }}
+	    {% set source_unique_key = (identifier ~ ".dbt_unique_key_" ~ loop.index) | trim %}
+	    {% set target_unique_key = (from_identifier ~ ".dbt_unique_key_" ~ loop.index) | trim %}
+	    {{ equals(source_unique_key, target_unique_key) }}
             {%- if not loop.last %} and {%- endif %}
         {% endfor %}
     {% else %}

{dbt_adapters-1.13.2 → dbt_adapters-1.14.0}/dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql

@@ -15,8 +15,10 @@
 
     when matched
      {% if config.get("dbt_valid_to_current") %}
-       and (DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or
-            DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null)
+	{% set source_unique_key = ("DBT_INTERNAL_DEST." ~ columns.dbt_valid_to) | trim %}
+	{% set target_unique_key = config.get('dbt_valid_to_current') | trim %}
+	and ({{ equals(source_unique_key, target_unique_key) }} or {{ source_unique_key }} is null)
+
      {% else %}
        and DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null
      {% endif %}

dbt_adapters-1.14.0/dbt/include/global_project/macros/utils/equals.sql

@@ -0,0 +1,14 @@
+{% macro equals(expr1, expr2) %}
+    {{ return(adapter.dispatch('equals', 'dbt') (expr1, expr2)) }}
+{%- endmacro %}
+
+{% macro default__equals(expr1, expr2) -%}
+{%- if adapter.behavior.enable_truthy_nulls_equals_macro.no_warn %}
+    case when (({{ expr1 }} = {{ expr2 }}) or ({{ expr1 }} is null and {{ expr2 }} is null))
+        then 0
+        else 1
+    end = 0
+{%- else -%}
+    ({{ expr1 }} = {{ expr2 }})
+{%- endif %}
+{% endmacro %}

dbt_adapters-1.14.0/hatch.toml

@@ -0,0 +1,53 @@
+[version]
+path = "src/dbt/adapters/__about__.py"
+
+[build.targets.sdist]
+packages = ["src/dbt/adapters", "src/dbt/include"]
+sources = ["src"]
+
+[build.targets.wheel]
+packages = ["src/dbt/adapters", "src/dbt/include"]
+sources = ["src"]
+
+[envs.default]
+dependencies = [
+    "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
+    'pre-commit==3.7.0',
+    "pytest",
+    "pytest-dotenv",
+    "pytest-xdist",
+]
+[envs.default.scripts]
+setup = "pre-commit install"
+code-quality = "pre-commit run --all-files"
+unit-tests = "python -m pytest {args:tests/unit}"
+workflow-code-quality = "gh workflow run _code-quality.yml --ref $(git rev-parse --abbrev-ref HEAD) -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-generate-changelog = "gh workflow run _generate-changelog.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f merge=false -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-publish-pypi = "gh workflow run _publish-pypi.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f deploy-to=test -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-unit-tests = "gh workflow run _unit-tests.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-verify-build = "gh workflow run _verify-build.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
+workflow-publish = "gh workflow run publish.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD) -f deploy-to=test -f pypi-internal=false -f pypi-public=true"
+
+[envs.build]
+detached = true
+dependencies = [
+    "wheel",
+    "twine",
+    "check-wheel-contents",
+]
+[envs.build.scripts]
+check-all = [
+    "- check-wheel",
+    "- check-sdist",
+]
+check-wheel = [
+    "twine check dist/*",
+    "find ./dist/dbt_adapters-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
+    "pip freeze | grep dbt-adapters",
+]
+check-sdist = [
+    "check-wheel-contents dist/*.whl --ignore W007,W008",
+    "find ./dist/dbt_adapters-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
+    "pip freeze | grep dbt-adapters",
+]
+protobuf = "protoc -I=./dbt/adapters/events --python_out=./dbt/adapters/events ./dbt/adapters/events/adapter_types.proto"

dbt_adapters-1.14.0/pyproject.toml

@@ -0,0 +1,58 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+dynamic = ["version"]
+name = "dbt-adapters"
+description = "The set of adapter protocols and base functionality that supports integration with dbt-core"
+readme = "README.md"
+keywords = ["dbt", "adapter", "adapters", "database", "elt", "dbt-core", "dbt Core", "dbt Cloud", "dbt Labs"]
+requires-python = ">=3.9.0"
+authors = [
+    { name = "dbt Labs", email = "info@dbtlabs.com" },
+]
+maintainers = [
+    { name = "dbt Labs", email = "info@dbtlabs.com" },
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+dependencies = [
+    "dbt-common>=1.13,<2.0",
+    "pytz>=2015.7",
+    # installed via dbt-common but used directly
+    "agate>=1.0,<2.0",
+    "mashumaro[msgpack]>=3.9,<3.15",
+    "protobuf>=5.0,<6.0",
+    "typing-extensions>=4.0,<5.0",
+]
+[project.urls]
+Homepage = "https://github.com/dbt-labs/dbt-adapters/tree/main/dbt-adapters"
+Documentation = "https://docs.getdbt.com"
+Repository = "https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-adapters"
+Issues = "https://github.com/dbt-labs/dbt-adapters/issues"
+Changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md"
+
+[tool.mypy]
+mypy_path = "third-party-stubs/"
+[[tool.mypy.overrides]]
+module = ["dbt.adapters.events.adapter_types_pb2"]
+follow_imports = "skip"
+
+[tool.pytest]
+env_files = ["test.env"]
+testpaths = [
+    "tests/functional",
+    "tests/unit",
+]
+color = true
+csv = "results.csv"

dbt_adapters-1.13.2/dbt/__init__.py

@@ -1,6 +0,0 @@
-# N.B.
-# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters)
-
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)

dbt_adapters-1.13.2/dbt/adapters/__about__.py

@@ -1 +0,0 @@
-version = "1.13.2"

dbt_adapters-1.13.2/pyproject.toml

@@ -1,112 +0,0 @@
-[project]
-dynamic = ["version"]
-name = "dbt-adapters"
-description = "The set of adapter protocols and base functionality that supports integration with dbt-core"
-readme = "README.md"
-keywords = ["dbt", "adapter", "adapters", "database", "elt", "dbt-core", "dbt Core", "dbt Cloud", "dbt Labs"]
-requires-python = ">=3.9.0"
-authors = [
-    { name = "dbt Labs", email = "info@dbtlabs.com" },
-]
-maintainers = [
-    { name = "dbt Labs", email = "info@dbtlabs.com" },
-]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "License :: OSI Approved :: Apache Software License",
-    "Operating System :: MacOS :: MacOS X",
-    "Operating System :: Microsoft :: Windows",
-    "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-]
-dependencies = [
-    "dbt-common>=1.13,<2.0",
-    "pytz>=2015.7",
-    # installed via dbt-common but used directly
-    "agate>=1.0,<2.0",
-    "mashumaro[msgpack]>=3.9,<3.15",
-    "protobuf>=5.0,<6.0",
-    "typing-extensions>=4.0,<5.0",
-]
-[project.urls]
-Homepage = "https://github.com/dbt-labs/dbt-adapters"
-Documentation = "https://docs.getdbt.com"
-Repository = "https://github.com/dbt-labs/dbt-adapters.git"
-Issues = "https://github.com/dbt-labs/dbt-adapters/issues"
-Changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/CHANGELOG.md"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.version]
-path = "dbt/adapters/__about__.py"
-
-[tool.hatch.build.targets.sdist]
-include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"]
-
-[tool.hatch.build.targets.wheel]
-include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"]
-
-[tool.hatch.envs.default]
-python = "3.9"
-dependencies = [
-    "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
-    'pre-commit==3.7.0;python_version>="3.9"',
-    'pre-commit==3.5.0;python_version=="3.8"',
-    "pytest",
-    "pytest-dotenv",
-    "pytest-xdist",
-]
-[tool.hatch.envs.default.scripts]
-setup = "pre-commit install"
-code-quality = "pre-commit run --all-files"
-unit-tests = "python -m pytest {args:tests/unit}"
-workflow-code-quality = "gh workflow run _code-quality.yml --ref $(git rev-parse --abbrev-ref HEAD) -f branch=$(git rev-parse --abbrev-ref HEAD)"
-workflow-generate-changelog = "gh workflow run _generate-changelog.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f merge=false -f branch=$(git rev-parse --abbrev-ref HEAD)"
-workflow-publish-pypi = "gh workflow run _publish-pypi.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f deploy-to=test -f branch=$(git rev-parse --abbrev-ref HEAD)"
-workflow-unit-tests = "gh workflow run _unit-tests.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
-workflow-verify-build = "gh workflow run _verify-build.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD)"
-workflow-publish = "gh workflow run publish.yml --ref $(git rev-parse --abbrev-ref HEAD) -f package=dbt-adapters -f branch=$(git rev-parse --abbrev-ref HEAD) -f deploy-to=test -f pypi-internal=false -f pypi-public=true"
-
-[tool.hatch.envs.build]
-detached = true
-dependencies = [
-    "wheel",
-    "twine",
-    "check-wheel-contents",
-]
-[tool.hatch.envs.build.scripts]
-check-all = [
-    "- check-wheel",
-    "- check-sdist",
-]
-check-wheel = [
-    "twine check dist/*",
-    "find ./dist/dbt_adapters-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
-    "pip freeze | grep dbt-adapters",
-]
-check-sdist = [
-    "check-wheel-contents dist/*.whl --ignore W007,W008",
-    "find ./dist/dbt_adapters-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
-    "pip freeze | grep dbt-adapters",
-]
-protobuf = "protoc -I=./dbt/adapters/events --python_out=./dbt/adapters/events ./dbt/adapters/events/adapter_types.proto"
-
-[tool.mypy]
-mypy_path = "third-party-stubs/"
-[[tool.mypy.overrides]]
-module = ["dbt.adapters.events.adapter_types_pb2"]
-follow_imports = "skip"
-
-[tool.pytest]
-env_files = ["test.env"]
-testpaths = [
-    "tests/functional",
-    "tests/unit",
-]
-color = true
-csv = "results.csv"