Merge pull request #159 from jwills/jwills_the_profileless_profile

Support profiles that are simply 'type: duckdb' by correctly configuring the in-memory db setup
duckdb · May 2, 2023 · d022d7e · d022d7e
2 parents dfb89f8 + 9a4159a
commit d022d7e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/dbt/adapters/duckdb/credentials.py b/dbt/adapters/duckdb/credentials.py
@@ -118,22 +118,25 @@ class DuckDBCredentials(Credentials):
 
     @classmethod
     def __pre_deserialize__(cls, data: Dict[Any, Any]) -> Dict[Any, Any]:
-        data = super().__pre_deserialize__(data)
-        path = data.get("path")
-        if path and "database" not in data and duckdb.__version__ >= "0.7.0":
-            if path == ":memory:":
-                data["database"] = "memory"
-            else:
-                parsed = urlparse(path)
-                base_file = os.path.basename(parsed.path)
-                db = os.path.splitext(base_file)[0]
-                if db:
-                    data["database"] = db
+        if duckdb.__version__ >= "0.7.0":
+            data = super().__pre_deserialize__(data)
+            if "database" not in data:
+                # if no database is specified in the profile, figure out
+                # the database value to use from the path argument
+                path = data.get("path")
+                if path is None or path == ":memory:":
+                    data["database"] = "memory"
                 else:
-                    raise dbt.exceptions.DbtRuntimeError(
-                        "Unable to determine database name from path"
-                        " and no database was specified in profile"
-                    )
+                    parsed = urlparse(path)
+                    base_file = os.path.basename(parsed.path)
+                    db = os.path.splitext(base_file)[0]
+                    if db:
+                        data["database"] = db
+                    else:
+                        raise dbt.exceptions.DbtRuntimeError(
+                            "Unable to determine database name from path"
+                            " and no database was specified in profile"
+                        )
         return data
 
     @property

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -50,10 +50,10 @@ def dbt_profile_target(profile_type, bv_server_process, tmp_path_factory):
             "port": 5433,
             "user": "test",
         }
-    elif profile_type == "memory":
-        profile["path"] = ":memory:"
     elif profile_type == "file":
         profile["path"] = str(tmp_path_factory.getbasetemp() / "tmp.db")
+    elif profile_type == "memory":
+        pass  # use the default path-less profile
     else:
         raise ValueError(f"Invalid profile type '{profile_type}'")
 
@@ -71,4 +71,4 @@ def skip_by_profile_type(profile_type, request):
 @pytest.fixture(scope="session")
 def test_data_path():
     test_dir = os.path.dirname(os.path.abspath(__file__))
-    return os.path.join(test_dir, "data")
+    return os.path.join(test_dir, "data")
diff --git a/tests/functional/adapter/test_attach.py b/tests/functional/adapter/test_attach.py
@@ -31,6 +31,7 @@
     SELECT * FROM {{ ref('source_model') }}
 """
 
+
 @pytest.mark.skip_profile("buenavista")
 class TestAttachedDatabase:
     @pytest.fixture(scope="class")
@@ -45,14 +46,12 @@ def attach_test_db(self):
 
     @pytest.fixture(scope="class")
     def profiles_config_update(self, dbt_profile_target, attach_test_db):
-        if "path" not in dbt_profile_target:
-            return {}
         return {
             "test": {
                 "outputs": {
                     "dev": {
                         "type": "duckdb",
-                        "path": dbt_profile_target["path"],
+                        "path": dbt_profile_target.get("path", ":memory:"),
                         "attach": [{"path": attach_test_db}],
                     }
                 },

diff --git a/tests/functional/fsspec/test_filesystems.py b/tests/functional/fsspec/test_filesystems.py
@@ -9,16 +9,17 @@
 WHERE conf = 'West'
 """
 
+
 @pytest.mark.skip_profile("buenavista")
 class TestFilesystems:
     @pytest.fixture(scope="class")
     def dbt_profile_target(self, dbt_profile_target):
-        if "path" not in dbt_profile_target:
-            return dbt_profile_target
         return {
             "type": "duckdb",
-            "path": dbt_profile_target["path"],
-            "filesystems": [{"fs": "github", "org": "jwills", "repo": "nba_monte_carlo"}],
+            "path": dbt_profile_target.get("path", ":memory:"),
+            "filesystems": [
+                {"fs": "github", "org": "jwills", "repo": "nba_monte_carlo"}
+            ],
         }
 
     @pytest.fixture(scope="class")

diff --git a/tests/functional/plugins/test_plugins.py b/tests/functional/plugins/test_plugins.py
@@ -73,9 +73,6 @@ def sqlite_test_db(self):
 
     @pytest.fixture(scope="class")
     def profiles_config_update(self, dbt_profile_target, sqlite_test_db):
-        if "path" not in dbt_profile_target:
-            return {}
-
         config = {"connection_url": f"sqlite:///{sqlite_test_db}"}
         plugins = [
             {"name": "excel", "impl": "excel"},
@@ -87,7 +84,7 @@ def profiles_config_update(self, dbt_profile_target, sqlite_test_db):
                 "outputs": {
                     "dev": {
                         "type": "duckdb",
-                        "path": dbt_profile_target["path"],
+                        "path": dbt_profile_target.get("path", ":memory:"),
                         "plugins": plugins,
                     }
                 },