Merge pull request #447 from duckdb/jwills_184_updates

Updates for dbt-duckdb 1.8.4
duckdb · Sep 26, 2024 · c30c548 · c30c548
2 parents 47d447c + 020e0ee
commit c30c548
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     env:
       TOXENV: "unit"
@@ -118,7 +118,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     env:
       TOXENV: "functional"
@@ -163,7 +163,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     env:
       TOXENV: "filebased"
@@ -445,7 +445,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/dbt/adapters/duckdb/impl.py b/dbt/adapters/duckdb/impl.py
@@ -237,8 +237,17 @@ def render_column_constraint(cls, constraint: ColumnLevelConstraint) -> Optional
         """Render the given constraint as DDL text. Should be overriden by adapters which need custom constraint
         rendering."""
         if constraint.type == ConstraintType.foreign_key:
-            # DuckDB doesn't support 'foreign key' as an alias
-            return f"references {constraint.expression}"
+            if constraint.to and constraint.to_columns:
+                # TODO: this is a hack to get around a limitation in DuckDB around setting FKs
+                # across databases.
+                pieces = constraint.to.split(".")
+                if len(pieces) > 2:
+                    constraint_to = ".".join(pieces[1:])
+                else:
+                    constraint_to = constraint.to
+                return f"references {constraint_to} ({', '.join(constraint.to_columns)})"
+            else:
+                return f"references {constraint.expression}"
         else:
             return super().render_column_constraint(constraint)