soda-sqlserver 4.22.0__tar.gz → 4.23.1__tar.gz

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: soda-sqlserver
-Version: 4.22.0
+Version: 4.23.1
 Summary: Soda SQL Server V4
 Author-email: "Soda Data N.V." <info@soda.io>
 License: Proprietary
 Requires-Python: >=3.10
-Requires-Dist: soda-core==4.22.0
+Requires-Dist: soda-core==4.23.1
 Requires-Dist: pyodbc

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "soda-sqlserver"
-version = "4.22.0"
+version = "4.23.1"
 description = "Soda SQL Server V4"
 requires-python = ">=3.10"
 license = {text = "Proprietary"}
@@ -8,7 +8,7 @@ authors = [
     {name = "Soda Data N.V.", email = "info@soda.io"}
 ]
 dependencies = [
-    "soda-core==4.22.0",
+    "soda-core==4.23.1",
     "pyodbc",
 ]
 

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/src/soda_sqlserver/common/data_sources/sqlserver_data_source.py

@@ -10,7 +10,6 @@ from soda_core.common.logging_constants import soda_logger
 from soda_core.common.metadata_types import SodaDataTypeName, SqlDataType
 from soda_core.common.sql_ast import (
     ADD_INTERVAL,
-    AND,
     COLUMN,
     COUNT,
     CREATE_TABLE,
@@ -23,7 +22,6 @@ from soda_core.common.sql_ast import (
     DROP_TABLE_IF_EXISTS,
     DROP_VIEW,
     DROP_VIEW_IF_EXISTS,
-    FROM,
     INSERT_INTO,
     INSERT_INTO_VIA_SELECT,
     INTO,
@@ -32,25 +30,19 @@ from soda_core.common.sql_ast import (
     OFFSET,
     PERCENTILE_WITHIN_GROUP,
     RANDOM,
-    REGEX_LIKE,
-    SELECT,
-    STAR,
     STRING_HASH,
     TIME_DELTA,
     TUPLE,
     VALUES,
-    WHERE,
     WITH,
-    SqlExpressionStr,
+    SqlColumnTerm,
     seconds_per_time_bucket,
 )
 from soda_core.common.sql_dialect import SqlDialect
 from soda_sqlserver.common.data_sources.sqlserver_data_source_connection import (
     SqlServerDataSource as SqlServerDataSourceModel,
 )
-from soda_sqlserver.common.data_sources.sqlserver_data_source_connection import (
-    SqlServerDataSourceConnection,
-)
+from soda_sqlserver.common.data_sources.sqlserver_data_source_connection import SqlServerDataSourceConnection
 
 logger: logging.Logger = soda_logger
 
@@ -175,7 +167,12 @@ class SqlServerSqlDialect(SqlDialect, sqlglot_dialect="tsql"):
             limit_element: LIMIT = [
                 select_element for select_element in select_elements if isinstance(select_element, LIMIT)
             ][0]
-            select_sql_lines[0] = select_sql_lines[0].replace("SELECT ", f"SELECT TOP {limit_element.limit} ")
+            # T-SQL grammar is `SELECT [ALL | DISTINCT] [TOP n] <fields>`, so TOP goes after
+            # DISTINCT when the base rendered a distinct select.
+            select_prefix: str = "SELECT DISTINCT " if select_sql_lines[0].startswith("SELECT DISTINCT ") else "SELECT "
+            select_sql_lines[0] = select_sql_lines[0].replace(
+                select_prefix, f"{select_prefix}TOP {limit_element.limit} ", 1
+            )
         return select_sql_lines
 
     def __requires_select_top(self, select_elements: list) -> bool:
@@ -307,19 +304,23 @@ class SqlServerSqlDialect(SqlDialect, sqlglot_dialect="tsql"):
             return ", ".join(self.build_expression_sql(e) for e in tuple.expressions)
         return super()._build_tuple_sql(tuple)
 
-    def _build_regex_like_sql(self, matches: REGEX_LIKE) -> str:
-        expression: str = self.build_expression_sql(matches.expression)
-        regex_pattern = matches.regex_pattern
+    def _rewrite_regex_pattern(self, regex_pattern: str) -> str:
         # alpha expansion doesn't work properly for case sensitive ranges in SQLServer
-        # this is quite a hack to fit the common use-cases.  generally regex's are only partially supported anyway
+        # this is quite a hack to fit the common use-cases.  generally regex's are only
+        # partially supported anyway
         regex_pattern = regex_pattern.replace("a-z", "abcdefghijklmnopqrstuvwxyz")
         regex_pattern = regex_pattern.replace("A-Z", "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+        # PATINDEX matches a substring, so the pattern is wrapped rather than anchored.
+        # Wrapping here rather than around the rendered literal keeps the % inside the
+        # quotes that the base escaping puts on.
+        return f"%{regex_pattern}%"
+
+    def _regex_like_sql(self, expression: str, pattern: str) -> str:
         # collations define rules for sorting strings and distinguishing similar characters
         # see: https://learn.microsoft.com/en-us/sql/relational-databases/collations/collation-and-unicode-support?view=sql-server-ver17
         # CS: Case sensitive; AS: Accent sensitive
         # The default is SQL_Latin1_General_Cp1_CI_AS (case-insensitive), we replcae with a case sensitive collation
-        pattern_literal: str = self.literal_string(f"%{regex_pattern}%")
-        return f"PATINDEX ({pattern_literal}, {expression} COLLATE SQL_Latin1_General_Cp1_CS_AS) > 0"
+        return f"PATINDEX ({pattern}, {expression} COLLATE SQL_Latin1_General_Cp1_CS_AS) > 0"
 
     def supports_regex_advanced(self) -> bool:
         return False
@@ -330,23 +331,25 @@ class SqlServerSqlDialect(SqlDialect, sqlglot_dialect="tsql"):
     def select_all_paginated_sql(
         self,
         dataset_identifier: DatasetIdentifier,
-        columns: list[str],
+        columns: list[SqlColumnTerm],
         filter: Optional[str],
-        order_by: list[str],
+        order_by: list[SqlColumnTerm],
         limit: int,
         offset: int,
         normalize_key_columns: frozenset[str] = frozenset(),
+        distinct: bool = False,
     ) -> str:
-        where_clauses = []
-
-        if filter:
-            where_clauses.append(SqlExpressionStr(filter))
-
+        # Same elements as the base paginator (including its distinct x normalize composition),
+        # but T-SQL spells the page as OFFSET n ROWS FETCH NEXT m ROWS ONLY, so OFFSET leads.
         statements = [
-            SELECT(columns or [STAR()]),
-            FROM(table_name=dataset_identifier.dataset_name, table_prefix=dataset_identifier.prefixes),
-            WHERE.optional(AND.optional(where_clauses)),
-            *[term for c in order_by for term in self._order_by_key(c, normalize_key_columns)],
+            *self._paginated_select_statements(
+                dataset_identifier=dataset_identifier,
+                columns=columns,
+                filter=filter,
+                order_by=order_by,
+                normalize_key_columns=normalize_key_columns,
+                distinct=distinct,
+            ),
             OFFSET(offset),
             LIMIT(limit),
         ]

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/src/soda_sqlserver/common/data_sources/sqlserver_data_source_connection.py

@@ -16,9 +16,7 @@ from soda_core.common.data_source_results import QueryResult
 from soda_core.common.exceptions import DataSourceConnectionException
 from soda_core.common.logging_constants import soda_logger
 from soda_core.model.data_source.data_source import DataSourceBase
-from soda_core.model.data_source.data_source_connection_properties import (
-    DataSourceConnectionProperties,
-)
+from soda_core.model.data_source.data_source_connection_properties import DataSourceConnectionProperties
 
 logger: logging.Logger = soda_logger
 

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/src/soda_sqlserver/test_helpers/sqlserver_data_source_test_helper.py

@@ -5,10 +5,7 @@ from typing import Optional
 
 from helpers.data_source_test_helper import DataSourceTestHelper
 from soda_core.common.sql_ast import DROP_TABLE, DROP_VIEW
-from soda_sqlserver.common.data_sources.sqlserver_data_source import (
-    SqlServerDataSourceImpl,
-    SqlServerSqlDialect,
-)
+from soda_sqlserver.common.data_sources.sqlserver_data_source import SqlServerDataSourceImpl, SqlServerSqlDialect
 
 
 class SqlServerDataSourceTestHelper(DataSourceTestHelper):

{soda_sqlserver-4.22.0 → soda_sqlserver-4.23.1}/src/soda_sqlserver.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: soda-sqlserver
-Version: 4.22.0
+Version: 4.23.1
 Summary: Soda SQL Server V4
 Author-email: "Soda Data N.V." <info@soda.io>
 License: Proprietary
 Requires-Python: >=3.10
-Requires-Dist: soda-core==4.22.0
+Requires-Dist: soda-core==4.23.1
 Requires-Dist: pyodbc

soda_sqlserver-4.23.1/src/soda_sqlserver.egg-info/requires.txt

@@ -0,0 +1,2 @@
+soda-core==4.23.1
+pyodbc

soda_sqlserver-4.22.0/src/soda_sqlserver.egg-info/requires.txt

@@ -1,2 +0,0 @@
-soda-core==4.22.0
-pyodbc