criteria-pattern 3.2.0__tar.gz → 3.3.0__tar.gz

{criteria_pattern-3.2.0 → criteria_pattern-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: criteria-pattern
-Version: 3.2.0
+Version: 3.3.0
 Summary: The Criteria Pattern is a Python package that simplifies and standardizes criteria based filtering, validation and selection.
 Project-URL: Homepage, https://github.com/adriamontoto/criteria-pattern
 Project-URL: Repository, https://github.com/adriamontoto/criteria-pattern

{criteria_pattern-3.2.0 → criteria_pattern-3.3.0}/criteria_pattern/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 
 from .models import Criteria, Direction, Filter, Operator, Order, PageNumber, PageSize
 

{criteria_pattern-3.2.0 → criteria_pattern-3.3.0}/criteria_pattern/converters/criteria_to_mysql_converter.py

@@ -120,20 +120,27 @@ class CriteriaToMysqlConverter:
 
         query = f'SELECT {", ".join(columns)} FROM {table}'  # noqa: S608  # nosec
         parameters: list[Any] = []
+        parameters_counter = 0
 
         if criteria.has_filters():
             where_clause, parameters = cls._process_filters(criteria=criteria, columns_mapping=columns_mapping)
             query += f' WHERE {where_clause}'
+            parameters_counter = len(parameters)
 
         if criteria.has_orders():
             order_clause = cls._process_orders(criteria=criteria, columns_mapping=columns_mapping)
             query += f' ORDER BY {order_clause}'
 
         if criteria.has_page_size():
-            query += f' LIMIT {criteria.page_size}'
+            parameters.append(criteria.page_size)
+            query += ' LIMIT %s'
+            parameters_counter += 1
 
         if criteria.has_pagination():
-            query += f' OFFSET {criteria.page_size * (criteria.page_number - 1)}'  # type: ignore[operator]
+            offset_value = criteria.page_size * (criteria.page_number - 1)  # type: ignore[operator]
+            parameters.append(offset_value)
+            query += ' OFFSET %s'
+            parameters_counter += 1
 
         return f'{query};', parameters
 

{criteria_pattern-3.2.0 → criteria_pattern-3.3.0}/criteria_pattern/converters/criteria_to_postgresql_converter.py

@@ -122,20 +122,29 @@ class CriteriaToPostgresqlConverter:
         quoted_table = '.'.join(f'"{part}"' for part in table.split('.'))
         query = f'SELECT {", ".join(quoted_columns)} FROM {quoted_table}'  # noqa: S608  # nosec
         parameters: dict[str, Any] = {}
+        parameters_counter = 0
 
         if criteria.has_filters():
             where_clause, parameters = cls._process_filters(criteria=criteria, columns_mapping=columns_mapping)
             query += f' WHERE {where_clause}'
+            parameters_counter = len(parameters)
 
         if criteria.has_orders():
             order_clause = cls._process_orders(criteria=criteria, columns_mapping=columns_mapping)
             query += f' ORDER BY {order_clause}'
 
         if criteria.has_page_size():
-            query += f' LIMIT {criteria.page_size}'
+            limit_parameter = f'limit_{parameters_counter}'
+            parameters[limit_parameter] = criteria.page_size
+            query += f' LIMIT %({limit_parameter})s'
+            parameters_counter += 1
 
         if criteria.has_pagination():
-            query += f' OFFSET {criteria.page_size * (criteria.page_number - 1)}'  # type: ignore[operator]
+            offset_parameter = f'offset_{parameters_counter}'
+            offset_value = criteria.page_size * (criteria.page_number - 1)  # type: ignore[operator]
+            parameters[offset_parameter] = offset_value
+            query += f' OFFSET %({offset_parameter})s'
+            parameters_counter += 1
 
         return f'{query};', parameters
 

{criteria_pattern-3.2.0 → criteria_pattern-3.3.0}/criteria_pattern/converters/criteria_to_sqlite_converter.py

@@ -122,20 +122,29 @@ class CriteriaToSqliteConverter:
         quoted_table = '.'.join(f'"{part}"' for part in table.split('.'))
         query = f'SELECT {", ".join(quoted_columns)} FROM {quoted_table}'  # noqa: S608  # nosec
         parameters: dict[str, Any] = {}
+        parameters_counter = 0
 
         if criteria.has_filters():
             where_clause, parameters = cls._process_filters(criteria=criteria, columns_mapping=columns_mapping)
             query += f' WHERE {where_clause}'
+            parameters_counter = len(parameters)
 
         if criteria.has_orders():
             order_clause = cls._process_orders(criteria=criteria, columns_mapping=columns_mapping)
             query += f' ORDER BY {order_clause}'
 
         if criteria.has_page_size():
-            query += f' LIMIT {criteria.page_size}'
+            limit_parameter = f'limit_{parameters_counter}'
+            parameters[limit_parameter] = criteria.page_size
+            query += f' LIMIT :{limit_parameter}'
+            parameters_counter += 1
 
         if criteria.has_pagination():
-            query += f' OFFSET {criteria.page_size * (criteria.page_number - 1)}'  # type: ignore[operator]
+            offset_parameter = f'offset_{parameters_counter}'
+            offset_value = criteria.page_size * (criteria.page_number - 1)  # type: ignore[operator]
+            parameters[offset_parameter] = offset_value
+            query += f' OFFSET :{offset_parameter}'
+            parameters_counter += 1
 
         return f'{query};', parameters