update

tests/fixtures/dbt_project/models/glaredb_data/sources.yml

@@ -1,7 +1,13 @@
 version: 2
 
 sources:
-  - name: public
+  - name: basic
+    schema: public
     database: default
     tables: 
-      - name: dbt_test
+      - name: dbt_test
+  - name: my_pg
+    schema: public
+    database: my_pg
+    tables:
+      - name: borough_lookup

tests/fixtures/dbt_project/models/glaredb_data/table_materialization.sql

@@ -1,4 +1,4 @@
 {{ config(materialized='table') }}
 
 select *
-from {{ source('public', 'dbt_test')}}
+from {{ source('basic', 'dbt_test')}}

tests/fixtures/dbt_project/models/glaredb_data/view_materialization.sql

@@ -1,4 +1,4 @@
 {{ config(materialized='view') }}
 
 select *
-from {{ source('public', 'dbt_test')}}
+from {{ source('basic', 'dbt_test')}}

tests/test_dbt.py

@@ -19,33 +19,32 @@ def dbt_project_path() -> pathlib.Path:
     "model_name,run_success,query_result",
     [
         ("table_materialization", True, 10),
-        pytest.param("view_materialization", True, 10, marks=pytest.mark.xfail),
+        ("view_materialization", True, 10),
     ],
 )
 def test_dbt_glaredb(
     glaredb_connection: psycopg2.extensions.connection,
-    dbt_project_path,
-    model_name,
-    run_success,
-    query_result,
+    dbt_project_path: pathlib.Path,
+    model_name: str,
+    run_success: bool,
+    query_result: int,
 ):
-    dbt_project_directory: pathlib.Path = dbt_project_path
-    dbt_profiles_directory: pathlib.Path = dbt_project_path
-
     with glaredb_connection.cursor() as curr:
         curr.execute("create table dbt_test (amount int)")
         curr.execute(
             "INSERT INTO dbt_test (amount) VALUES (0), (1), (2), (3), (4), (5), (6), (7), (8), (9)"
         )
+        curr.execute("SELECT * FROM public.dbt_test")
+        a = curr.fetchall()
 
     with tests.tools.env("DBT_USER", glaredb_connection.info.user):
         res: dbtRunnerResult = dbtRunner().invoke(
             [
                 "run",
                 "--project-dir",
-                dbt_project_directory,
+                dbt_project_path,
                 "--profiles-dir",
-                dbt_profiles_directory,
+                dbt_project_path,
                 "-m",
                 model_name,
             ]
@@ -58,3 +57,46 @@ def test_dbt_glaredb(
         result: list = curr.fetchone()[0]
 
         assert result == query_result
+
+
+def test_dbt_glaredb_external_postgres(
+    glaredb_connection: psycopg2.extensions.connection,
+    dbt_project_path: pathlib.Path,
+):
+    model_name = "postgres_datasource_view_materialization"
+
+    with glaredb_connection.cursor() as curr:
+        curr.execute(
+            """
+                CREATE EXTERNAL DATABASE my_pg
+                FROM postgres
+                OPTIONS (
+                    host = 'pg.demo.glaredb.com',
+                    port = '5432',
+                    user = 'demo',
+                    password = 'demo',
+                    database = 'postgres',
+                );
+            """
+        )
+
+    with tests.tools.env("DBT_USER", glaredb_connection.info.user):
+        res: dbtRunnerResult = dbtRunner().invoke(
+            [
+                "run",
+                "--project-dir",
+                dbt_project_path,
+                "--profiles-dir",
+                dbt_project_path,
+                "-m",
+                model_name,
+            ]
+        )
+
+        assert res.success is True
+
+    with glaredb_connection.cursor() as curr:
+        curr.execute(f"select count(*) from {model_name}")
+        result: list = curr.fetchone()[0]
+
+    assert result == 5

tests/test_lance.py

@@ -72,6 +72,7 @@ def test_copy_to_round_trip(
             res = curr.fetchone()
             assert res[0] == 10
 
+
 def test_copy_to_round_trip(
     glaredb_connection: psycopg2.extensions.connection,
     tmp_path_factory: pytest.TempPathFactory,
@@ -89,7 +90,9 @@ def test_copy_to_round_trip(
         assert curr.fetchone()[0] == 10
 
         curr.execute(f"COPY lance_test TO '{output_path}' FORMAT lance")
-        curr.execute(f"create external table lance_import from lance options (location '{output_path}')")
+        curr.execute(
+            f"create external table lance_import from lance options (location '{output_path}')"
+        )
         curr.execute("alter table lance_import set access_mode to read_write")
 
         for i in range(10):