From b1771ce091c0b6f83a561f2d35de0bf8de30c7db Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:13:00 +0200
Subject: [PATCH] improve dbt plugin code

---
 opendbt/dbt/__init__.py                     | 11 +++++++----
 opendbt/dbt/{v17 => shared}/cli/__init__.py |  0
 opendbt/dbt/{v17 => shared}/cli/main.py     |  0
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename opendbt/dbt/{v17 => shared}/cli/__init__.py (100%)
 rename opendbt/dbt/{v17 => shared}/cli/main.py (100%)

diff --git a/opendbt/dbt/__init__.py b/opendbt/dbt/__init__.py
index a2d3796..467cddd 100644
--- 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 b/opendbt/dbt/shared/cli/__init__.py
similarity index 100%
rename from opendbt/dbt/v17/cli/__init__.py
rename to opendbt/dbt/shared/cli/__init__.py
diff --git a/opendbt/dbt/v17/cli/main.py b/opendbt/dbt/shared/cli/main.py
similarity index 100%
rename from opendbt/dbt/v17/cli/main.py
rename to opendbt/dbt/shared/cli/main.py