castor-extractor 0.25.6__py3-none-any.whl → 0.25.7__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.25.7 - 2025-10-07
+
+* SqlServer: Ensure database consistency between query and engine
+
 ## 0.25.6 - 2025-10-06
 
 * PowerBi: Support additional authentication methods

castor_extractor/commands/extract_sqlserver.py

@@ -11,7 +11,6 @@ def main():
 
     parser.add_argument("-H", "--host", help="MSSQL Host")
     parser.add_argument("-P", "--port", help="MSSQL Port")
-    parser.add_argument("-d", "--database", help="MSSQL Database")
     parser.add_argument("-u", "--user", help="MSSQL User")
     parser.add_argument("-p", "--password", help="MSSQL Password")
 
@@ -47,7 +46,6 @@ def main():
 
     sqlserver.extract_all(
         host=args.host,
-        database=args.database,
         port=args.port,
         user=args.user,
         password=args.password,

castor_extractor/utils/client/abstract.py

@@ -26,17 +26,6 @@ class AbstractSourceClient(ABC):
     def execute(self, query: ExtractionQuery) -> Iterator[dict]:
         pass
 
-    def set_database(self, database: Optional[str]) -> None:
-        """
-        Set the active database for this client.
-
-        Some source technologies require establishing a new connection
-        or using a different connection URI when switching databases.
-
-        Default behaviour is to do nothing.
-        """
-        pass
-
 
 class SqlalchemyClient(AbstractSourceClient, ABC):
     def __init__(self, credentials: dict):

castor_extractor/utils/client/query.py

@@ -1,6 +1,20 @@
+from typing import Optional
+
+
 class ExtractionQuery:
-    """contains both statement and parameters for the query"""
+    """
+    Contains useful context to run the query:
+    - the sql statement itself
+    - parameters { ... }
+    - optionally, the target database (can be used to change the engine's URI)
+    """
 
-    def __init__(self, statement: str, params: dict):
+    def __init__(
+        self,
+        statement: str,
+        params: dict,
+        database: Optional[str] = None,
+    ):
         self.statement = statement
         self.params = params
+        self.database = database

castor_extractor/visualization/sigma/client/client.py

@@ -268,3 +268,7 @@ class SigmaClient(APIClient):
 
         else:
             raise ValueError(f"This asset {asset} is unknown")
+
+    def test_connection(self) -> None:
+        """Use credentials & verify requesting the API doesn't raise an error"""
+        self._auth.refresh_token()

castor_extractor/warehouse/abstract/extract.py

@@ -51,7 +51,6 @@ class SQLExtractionProcessor:
     def _fetch(self, query: ExtractionQuery) -> Iterator[dict]:
         default: Callable[[], Iterator] = lambda: iter(())  # type: ignore
         decorator = safe_mode(self._safe_mode, default)
-        self._client.set_database(query.database)
         decorated_execute = decorator(self._client.execute)
         return decorated_execute(query)
 

castor_extractor/warehouse/abstract/query.py

@@ -3,6 +3,7 @@ import os
 from abc import ABC, abstractmethod
 from typing import Optional
 
+from ...utils import ExtractionQuery
 from .asset import WarehouseAsset
 from .time_filter import TimeFilter
 
@@ -20,25 +21,6 @@ class AssetNotSupportedError(NotImplementedError):
         super().__init__(msg)
 
 
-class ExtractionQuery:
-    """
-    Contains useful context to run the query:
-    - the sql statement itself
-    - parameters { ... }
-    - optionally, the target database (can be used to change the engine's URI)
-    """
-
-    def __init__(
-        self,
-        statement: str,
-        params: dict,
-        database: Optional[str] = None,
-    ):
-        self.statement = statement
-        self.params = params
-        self.database = database
-
-
 class AbstractQueryBuilder(ABC):
     """
     Build queries necessary to extract warehouse assets.

castor_extractor/warehouse/sqlserver/client.py

@@ -4,7 +4,8 @@ from typing import Optional
 
 from sqlalchemy import create_engine, text
 
-from ...utils import ExtractionQuery, SqlalchemyClient, uri_encode
+from ...utils import SqlalchemyClient, uri_encode
+from ..abstract import ExtractionQuery
 
 logger = logging.getLogger(__name__)
 
@@ -50,12 +51,25 @@ class MSSQLClient(SqlalchemyClient):
         )
         return uri
 
+    def _set_database(self, database: Optional[str]) -> None:
+        """
+        To support SQL Server running on Azure, we must change the engine's
+        URI depending on the case:
+        - URI/database for database-scoped queries
+        - URI otherwise
+        https://learn.microsoft.com/en-us/sql/t-sql/language-elements/use-transact-sql?view=sql-server-2017#database_name
+        https://github.com/dbeaver/dbeaver/issues/5258
+        """
+        database_uri = f"{self._uri}/{database}" if database else self._uri
+        self._engine = create_engine(database_uri, **self._options)
+
     def execute(self, query: ExtractionQuery) -> Iterator[dict]:
         """
         Re-implements the SQLAlchemyClient execute function to ensure we consume
         the cursor before calling connection.close() as it wipes out the data
         otherwise
         """
+        self._set_database(query.database)
         connection = self.connect()
         try:
             proxy = connection.execute(text(query.statement), query.params)
@@ -64,18 +78,6 @@ class MSSQLClient(SqlalchemyClient):
         finally:
             self.close()
 
-    def set_database(self, database: Optional[str]) -> None:
-        """
-        To support SQL Server running on Azure, we must change the engine's
-        URI for each database-scoped query
-        https://chatgpt.com/share/68de93c3-9550-8001-9d54-c5da86faa43c
-        """
-        if not database:
-            return
-        self.close()
-        database_uri = f"{self._uri}/{database}"
-        self._engine = create_engine(database_uri, **self._options)
-
     def get_databases(self) -> list[str]:
         result = self.execute(
             ExtractionQuery("SELECT name FROM sys.databases", {})
@@ -128,7 +130,11 @@ class MSSQLClient(SqlalchemyClient):
         FROM
             [{database}].sys.database_query_store_options
         """
-        query = ExtractionQuery(sql, {})
+        query = ExtractionQuery(
+            statement=sql,
+            params={},
+            database=database,
+        )
         # 2 = READ_WRITE, which means the Query Store is activated
         return next(self.execute(query))["desired_state"] == 2
 

castor_extractor/warehouse/sqlserver/extract.py

@@ -32,7 +32,6 @@ MSSQL_USER = "CASTOR_MSSQL_USER"
 MSSQL_PASSWORD = "CASTOR_MSSQL_PASSWORD"  # noqa: S105
 MSSQL_HOST = "CASTOR_MSSQL_HOST"
 MSSQL_PORT = "CASTOR_MSSQL_PORT"
-MSSQL_DATABASE = "CASTOR_MSSQL_DATABASE"
 
 
 def _credentials(params: dict) -> dict:
@@ -43,7 +42,6 @@ def _credentials(params: dict) -> dict:
         "password": params.get("password") or from_env(MSSQL_PASSWORD),
         "host": params.get("host") or from_env(MSSQL_HOST),
         "port": params.get("port") or from_env(MSSQL_PORT),
-        "database": params.get("database") or from_env(MSSQL_DATABASE),
     }
 
 

{castor_extractor-0.25.6.dist-info → castor_extractor-0.25.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: castor-extractor
-Version: 0.25.6
+Version: 0.25.7
 Summary: Extract your metadata assets.
 Home-page: https://www.castordoc.com/
 License: EULA
@@ -216,6 +216,10 @@ For any questions or bug report, contact us at [support@coalesce.io](mailto:supp
 
 # Changelog
 
+## 0.25.7 - 2025-10-07
+
+* SqlServer: Ensure database consistency between query and engine
+
 ## 0.25.6 - 2025-10-06
 
 * PowerBi: Support additional authentication methods

{castor_extractor-0.25.6.dist-info → castor_extractor-0.25.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-CHANGELOG.md,sha256=_zH2Mm-Bn_xdVUaseScAbBos3i0Ae_MspceXsG-5vjc,21437
+CHANGELOG.md,sha256=59CuAENUDPUzehj5T9VIKCbS3bG-HGUQ-7U_QtegrvA,21528
 Dockerfile,sha256=xQ05-CFfGShT3oUqaiumaldwA288dj9Yb_pxofQpufg,301
 DockerfileUsage.md,sha256=2hkJQF-5JuuzfPZ7IOxgM6QgIQW7l-9oRMFVwyXC4gE,998
 LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
@@ -25,7 +25,7 @@ castor_extractor/commands/extract_salesforce.py,sha256=3j3YTmMkPAwocR-B1ozJQai0U
 castor_extractor/commands/extract_salesforce_reporting.py,sha256=FdANTNiLkIPdm80XMYxWReHjdycLsIa61pyeCD-sUDk,962
 castor_extractor/commands/extract_sigma.py,sha256=sxewHcZ1Doq35V2qnpX_zCKKXkrb1_9bYjUMg7BOW-k,643
 castor_extractor/commands/extract_snowflake.py,sha256=GwlrRxwEBjHqGs_3bs5vM9fzmv61_iwvBr1KcIgFgWM,2161
-castor_extractor/commands/extract_sqlserver.py,sha256=zwPITImztIIyIbZJyE1SioGraVrlRfxgLq_vHX6l5l0,1664
+castor_extractor/commands/extract_sqlserver.py,sha256=NNYfAOG-NJX0F_q0yBD-msIiwyp04Ne3fJs8hggv6YQ,1565
 castor_extractor/commands/extract_strategy.py,sha256=Q-pUymatPrBFGXobhyUPzFph0-t774-XOpjdCFF1dYo,821
 castor_extractor/commands/extract_tableau.py,sha256=cfH-b0Hq9LGrQSJv02Yr_4d6oNqhxwDqUcKraE-5fRc,2134
 castor_extractor/commands/extract_thoughtspot.py,sha256=caAYJlH-vK7u5IUB6OKXxcaWfLgc7d_XqnFDWK6YNS4,639
@@ -102,7 +102,7 @@ castor_extractor/utils/argument_parser_test.py,sha256=wnyLFJ74iEiPxxLSbwFtckR7FI
 castor_extractor/utils/batch.py,sha256=SFlLmJgVjV2nVhIrjVIEp8wJ9du4dKKHq8YVYubnwQQ,448
 castor_extractor/utils/batch_test.py,sha256=84JYXOxiTkZFAceVh0mzN6VtKxcqoFPbxkZfIDyLGlg,606
 castor_extractor/utils/client/__init__.py,sha256=h5gm8UNNCCkAqhjYK5f6BY7k0cHFOyAvkmlktqwpir0,392
-castor_extractor/utils/client/abstract.py,sha256=OyTpb_SBgxaZd-4QFUV3n7yTzszAbyxY89fHsdAGKS8,2410
+castor_extractor/utils/client/abstract.py,sha256=CWF7_afNpEZ3jor-22wXbKIvM20ukHkaDy_uknKz8B0,2075
 castor_extractor/utils/client/api/__init__.py,sha256=vlG7WXznYgLTn3XyMGsyUkgRkup8FbKM14EXJ8mv-b0,264
 castor_extractor/utils/client/api/auth.py,sha256=lq0K3UEl1vwIIa_vKTdlpIQPdE5K1-5DXmCwO4dKzng,1890
 castor_extractor/utils/client/api/auth_test.py,sha256=LlyXytnatg6ZzR4Zkvzk0BH99FYhHX7qn_nyr2MSnDI,1305
@@ -115,7 +115,7 @@ castor_extractor/utils/client/api/safe_request_test.py,sha256=LqS5FBxs6lLLcTkcgx
 castor_extractor/utils/client/api/utils.py,sha256=jr8CWf48cIp8QP1P7oZ1zg9WaGlDO3mqCWgQKdEcpyc,238
 castor_extractor/utils/client/api/utils_test.py,sha256=a5aL-pCwa74C8Ne7OT169Bjp8WPDV5Fl8MxNxAllHJg,514
 castor_extractor/utils/client/postgres.py,sha256=n6ulaT222WWPY0_6qAZ0MHF0m91HtI9mMqL71nyygo0,866
-castor_extractor/utils/client/query.py,sha256=O6D5EjD1KmBlwa786Uw4D4kzxx97_HH50xIIeSWt0B8,205
+castor_extractor/utils/client/query.py,sha256=Ucbv8dq5xRziV4HusleY2eJE3Whp8fHsVeQlPeVTuLs,473
 castor_extractor/utils/client/uri.py,sha256=jmP9hY-6PRqdc3-vAOdtll_U6q9VCqSqmBAN6QRs3ZI,150
 castor_extractor/utils/client/uri_test.py,sha256=1XKF6qSseCeD4G4ckaNO07JXfGbt7XUVinOZdpEYrDQ,259
 castor_extractor/utils/collection.py,sha256=g2HmB0ievvYHWaZ8iEzkcPPkrBFsh6R6b_liBqcsMjc,3044
@@ -285,7 +285,7 @@ castor_extractor/visualization/sigma/__init__.py,sha256=GINql4yJLtjfOJgjHaWNpE13
 castor_extractor/visualization/sigma/assets.py,sha256=iVZqi7XtNgSOVXy0jgeHZonVOeXi7jyikor8ztbECBc,398
 castor_extractor/visualization/sigma/client/__init__.py,sha256=YQv06FBBQHvBMFg_tN0nUcmUp2NCL2s-eFTXG8rXaBg,74
 castor_extractor/visualization/sigma/client/authentication.py,sha256=gHukrpfboIjZc_O9CcuDtrl6U-StH0J73VY2J74Bm9o,2279
-castor_extractor/visualization/sigma/client/client.py,sha256=SxSf5OjdDr8x-WZDezm8YNOw01R6CCoYIgW0od0ZgN8,8907
+castor_extractor/visualization/sigma/client/client.py,sha256=bYlOwtb6ftASb9onUSAHCdEiyfsY5H_KHWkQB4y2Y-o,9063
 castor_extractor/visualization/sigma/client/client_test.py,sha256=ae0ZOvKutCm44jnrJ-0_A5Y6ZGyDkMf9Ml3eEP8dNkY,581
 castor_extractor/visualization/sigma/client/credentials.py,sha256=XddAuQSmCKpxJ70TQgRnOj0vMPYVtiStk_lMMQ1AiNM,693
 castor_extractor/visualization/sigma/client/endpoints.py,sha256=by9VIFml2whlzQT66f2m56RYBsqPrWdAmIP4JkTaBV4,1799
@@ -326,8 +326,8 @@ castor_extractor/warehouse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 castor_extractor/warehouse/abstract/__init__.py,sha256=Fdfa026tgOo64MvzVRLHM_F2G-JmcehrF0mh3dHgb7s,419
 castor_extractor/warehouse/abstract/asset.py,sha256=wR5mJxAHBcqJ86HRb_Y8x3mDN4uUgSg8jMToLNu0jTM,2740
 castor_extractor/warehouse/abstract/asset_test.py,sha256=_kd4ybNlWSAdSdEgJKC-jhJTa1nMRa9i8RO3YbqKLM4,758
-castor_extractor/warehouse/abstract/extract.py,sha256=T_GwXO4_IFSVdBuMmnKvsftl549y43nzE5uN4He4G80,2974
-castor_extractor/warehouse/abstract/query.py,sha256=MSOou0F5BlTths1TsAxv9tcyOB013aJc1TegN4q7jfM,2852
+castor_extractor/warehouse/abstract/extract.py,sha256=9Y2fUn3y2-2WjiHnrabjvAvOA8UETJeTYr18zcM7bdI,2924
+castor_extractor/warehouse/abstract/query.py,sha256=h1VvSo6TpyS1myRqmPtoIFY1fVgbthsHOkkajUz-PKA,2444
 castor_extractor/warehouse/abstract/time_filter.py,sha256=bggIONfMmUxffkA6TwM3BsjfS2l9WFxPq8krfsau5pw,935
 castor_extractor/warehouse/abstract/time_filter_test.py,sha256=PIkegB7KOKBdpc6zIvmyl_CeQyADeFDplyQ8HTNU5LA,448
 castor_extractor/warehouse/bigquery/__init__.py,sha256=PCGNYdi7dHv-SyanUWzRuBp-ypuQ01PkDaQjVnaNhbM,170
@@ -431,8 +431,8 @@ castor_extractor/warehouse/snowflake/queries/user.sql,sha256=88V8eRj1NDaD_ufclsK
 castor_extractor/warehouse/snowflake/queries/view_ddl.sql,sha256=eWsci_50cxiYIv3N7BKkbXVM3RoIzqSDtohqRnE5kg4,673
 castor_extractor/warehouse/snowflake/query.py,sha256=C2LTdPwBzMQ_zMncg0Kq4_WkoY7K9as5tvxBDrIOlwI,1763
 castor_extractor/warehouse/sqlserver/__init__.py,sha256=PdOuYznmvKAbfWAm8UdN47MfEsd9jqPi_dDi3WEo1KY,116
-castor_extractor/warehouse/sqlserver/client.py,sha256=umxTNZ92S2ImtxkPwzXdTzGvym-bjv5xSNK29vawL-8,5549
-castor_extractor/warehouse/sqlserver/extract.py,sha256=HEJFDM1a4OeQH7OWhYhCOjhkHfGW6qf_qvjFAeMGPYg,2623
+castor_extractor/warehouse/sqlserver/client.py,sha256=ggqcOtGeDk9OMyqx7fO3p-2NsbFG8vT-GoHdRx5Iy_Q,5833
+castor_extractor/warehouse/sqlserver/extract.py,sha256=PlYANeqCUrw3uy3HnMxkPT1W3WyRt-qxY9ECK3Sc2lM,2510
 castor_extractor/warehouse/sqlserver/queries/.sqlfluff,sha256=yy0KQdz8I_67vnXyX8eeWwOWkxTXvHyVKSVwhURktd8,48
 castor_extractor/warehouse/sqlserver/queries/column.sql,sha256=ojiUQQnHXdWMbgaYOcxKBiwfi7rtu_tyamK6r4t4IBM,2929
 castor_extractor/warehouse/sqlserver/queries/database.sql,sha256=4dPeBCn85MEOXr1f-DPXxiI3RvvoE_1n8lsbTs26E0I,150
@@ -443,8 +443,8 @@ castor_extractor/warehouse/sqlserver/queries/user.sql,sha256=MAlnTis43E3Amu1e1Oz
 castor_extractor/warehouse/sqlserver/queries/view_ddl.sql,sha256=9rynvx6MWg3iZzrWPB7haZfVKEPkxulzryE2g19x804,315
 castor_extractor/warehouse/sqlserver/query.py,sha256=gr5lnZSUm-wSYuVnJlg6fc7jXWirbL-sCiQN9RnAiPQ,1789
 castor_extractor/warehouse/synapse/queries/column.sql,sha256=lNcFoIW3Y0PFOqoOzJEXmPvZvfAsY0AP63Mu2LuPzPo,1351
-castor_extractor-0.25.6.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
-castor_extractor-0.25.6.dist-info/METADATA,sha256=ayaVswDaw-D2Zele6ewtVK5inUm9fBOuDik-AGY7yAY,28939
-castor_extractor-0.25.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-castor_extractor-0.25.6.dist-info/entry_points.txt,sha256=qyTrKNByoq2HYi1xbA79OU7qxg-OWPvle8VwDqt-KnE,1869
-castor_extractor-0.25.6.dist-info/RECORD,,
+castor_extractor-0.25.7.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
+castor_extractor-0.25.7.dist-info/METADATA,sha256=omciSlMhL8CWEtzosDWL1hj0SP2C8DiI4z0CeMb-nTs,29030
+castor_extractor-0.25.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+castor_extractor-0.25.7.dist-info/entry_points.txt,sha256=qyTrKNByoq2HYi1xbA79OU7qxg-OWPvle8VwDqt-KnE,1869
+castor_extractor-0.25.7.dist-info/RECORD,,