improve dbt plugin code

memiiso · Oct 16, 2024 · b1771ce · b1771ce
1 parent 898e0ce
commit b1771ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/opendbt/dbt/__init__.py b/opendbt/dbt/__init__.py
@@ -11,9 +11,6 @@ def patch_dbt():
         from opendbt.dbt.v17.task.docs.generate import OpenDbtGenerateTask
         from opendbt.dbt.v17.adapters.factory import OpenDbtAdapterContainer
         import opendbt.dbt.v17.cli.main
-        dbt.cli.main.sqlfluff = opendbt.dbt.v17.cli.main.sqlfluff
-        dbt.cli.main.sqlfluff_lint = opendbt.dbt.v17.cli.main.sqlfluff_lint
-        dbt.cli.main.sqlfluff_fix = opendbt.dbt.v17.cli.main.sqlfluff_fix
         dbt.task.generate.GenerateTask = OpenDbtGenerateTask
         dbt.adapters.factory.FACTORY = OpenDbtAdapterContainer()
     if dbt_version >= Version("1.8.0") and dbt_version < Version("1.9.0"):
@@ -22,4 +19,10 @@ def patch_dbt():
         dbt.task.docs.generate.GenerateTask = OpenDbtGenerateTask
         dbt.adapters.factory.FACTORY = OpenDbtAdapterContainer()
     else:
-        raise Exception(f"Unsupported dbt version {dbt_version}")
+        raise Exception(
+            f"Unsupported dbt version {dbt_version}, please make sure dbt version is supported/integrated by opendbt")
+
+    # common code
+    dbt.cli.main.sqlfluff = opendbt.dbt.shared.cli.main.sqlfluff
+    dbt.cli.main.sqlfluff_lint = opendbt.dbt.shared.cli.main.sqlfluff_lint
+    dbt.cli.main.sqlfluff_fix = opendbt.dbt.shared.cli.main.sqlfluff_fix
diff --git a/opendbt/dbt/v17/cli/__init__.py → opendbt/dbt/shared/cli/__init__.py b/opendbt/dbt/v17/cli/__init__.py → opendbt/dbt/shared/cli/__init__.py
diff --git a/opendbt/dbt/v17/cli/main.py → opendbt/dbt/shared/cli/main.py b/opendbt/dbt/v17/cli/main.py → opendbt/dbt/shared/cli/main.py