fdc-shared-kernel 0.0.176__tar.gz → 0.0.178__tar.gz

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.176
+Version: 0.0.178
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.176
+Version: 0.0.178
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/fdc_shared_kernel.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ shared_kernel/data_warehouse_handlers/connections/mysql_warehouse_connection.py
 shared_kernel/data_warehouse_handlers/connections/postgresql_warehouse_connection.py
 shared_kernel/data_warehouse_handlers/connections/redshift_warehouse_connection.py
 shared_kernel/data_warehouse_handlers/connections/snowflake_warehouse_connection.py
+shared_kernel/data_warehouse_handlers/custom_query_builders/databricks_query.py
 shared_kernel/data_warehouse_handlers/query_executors/databricks_query_executor.py
 shared_kernel/data_warehouse_handlers/query_executors/mssql_query_executor.py
 shared_kernel/data_warehouse_handlers/query_executors/mysql_query_executor.py

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.176"
+version = "0.0.178"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/shared_kernel/data_warehouse_handlers/connections/databricks_warehouse_connection.py

@@ -52,6 +52,7 @@ class DatabricksWarehouseConnection(DataWarehouseConnection):
             server_hostname=cfg.server_hostname,
             http_path=cfg.http_path,
             access_token=cfg.access_token,
+            catalog=cfg.catalog,
             **self._CONNECT_KWARGS,
         )
         self._cursor = self._conn.cursor()

fdc_shared_kernel-0.0.178/shared_kernel/data_warehouse_handlers/custom_query_builders/databricks_query.py

@@ -0,0 +1,41 @@
+from typing import Any
+from pypika import Query
+from pypika.queries import QueryBuilder, Selectable, AliasedQuery
+from pypika.utils import format_quotes, builder
+
+
+class DatabricksQuery(Query):
+    """
+    Defines a query class for use with Databricks.
+    """
+
+    @classmethod
+    def _builder(cls, **kwargs) -> "DatabricksQueryBuilder":
+        return DatabricksQueryBuilder(dialect="databricks", **kwargs)
+
+
+class DatabricksQueryBuilder(QueryBuilder):
+    QUERY_CLS = DatabricksQuery
+    
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.quote_char = "`" # Set default quote_char to backticks
+
+    def get_sql(self, *args, **kwargs) -> str:
+        # Databricks uses backticks instead of double quotes etc. 
+        kwargs["quote_char"] = self.quote_char
+        return super().get_sql(*args, **kwargs)
+    
+    @builder
+    def with_(self, selectable: Selectable, name: str) -> "QueryBuilder":
+        # Unlike other  query builders for databricks we need backticks for ctename we cant use double quotes.
+        if '"' in name:
+            name = name.strip('"')
+        t = AliasedQuery(name, selectable)
+        self._with.append(t)
+    
+    def _with_sql(self, **kwargs: Any) -> str:
+        return "WITH " + ",".join(
+            format_quotes(clause.name, self.quote_char) + " AS (" + clause.get_sql(subquery=False, with_alias=False, **kwargs) + ") "
+            for clause in self._with
+        )

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/shared_kernel/data_warehouse_handlers/databricks_handler.py

@@ -1,6 +1,7 @@
 from pypika import Query
 
 from shared_kernel.data_warehouse_handlers.connections.databricks_warehouse_connection import DatabricksWarehouseConnection
+from shared_kernel.data_warehouse_handlers.custom_query_builders.databricks_query import DatabricksQuery
 from shared_kernel.data_warehouse_handlers.query_executors.databricks_query_executor import DatabricksQueryExecutor
 from shared_kernel.dataclasses.warehouse_configs import DatabricksConfig
 from shared_kernel.interfaces.data_warehouse_handler import WarehouseHandler
@@ -20,7 +21,7 @@ class DatabricksWarehouseHandler(WarehouseHandler):
         if source_config and isinstance(source_config, DatabricksConfig):
             return source_config
 
-        required = ("server_hostname", "http_path", "access_token", "database")
+        required = ("server_hostname", "http_path", "access_token", "catalog")
         missing = [f for f in required if not self.payload.get(f)]
         if missing:
             raise ValueError(
@@ -31,7 +32,7 @@ class DatabricksWarehouseHandler(WarehouseHandler):
             server_hostname=str(self.payload.get("server_hostname")).strip(),
             http_path=str(self.payload.get("http_path")).strip(),
             access_token=str(self.payload.get("access_token")).strip(),
-            database=str(self.payload.get("database")).strip(),
+            catalog=str(self.payload.get("catalog")).strip(),
             schema=str(self.payload.get("schema")).strip() if self.payload.get("schema") else None,
             schema_list=self.payload.get("schema_list"),
             pagination=self.pagination,
@@ -50,7 +51,7 @@ class DatabricksWarehouseHandler(WarehouseHandler):
 
     def get_query_object(self) -> Query:
         """Return the PyPika Query builder class."""
-        return Query
+        return DatabricksQuery
 
     def create_records_and_count_query(
         self,

{fdc_shared_kernel-0.0.176 → fdc_shared_kernel-0.0.178}/shared_kernel/dataclasses/warehouse_configs.py

@@ -49,7 +49,7 @@ class DatabricksConfig(BaseConfig):
     server_hostname: str
     http_path: str
     access_token: str
-    database: str
+    catalog: str
     default_schema: str = "default"