david8 0.dev4__tar.gz → 0.dev5__tar.gz

{david8-0.dev4 → david8-0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: david8
-Version: 0.dev4
+Version: 0.dev5
 Summary: Lightweight Python SQL query builder with support for multiple dialects: ClickHouse and PostgreSQL
 Author-email: Danila Ganchar <danila.ganchar@gmail.com>
 Maintainer-email: Danila Ganchar <danila.ganchar@gmail.com>
@@ -24,3 +24,19 @@ License-File: LICENSE
 Dynamic: license-file
 
 # david8
+
+A fast, lightweight, and elegant SQL query builder for Python.
+Designed with clarity and minimalism in mind, it provides a clean, expressive interface for constructing 
+SQL queries without sacrificing control or performance.
+
+The builder automatically generates safe parameter placeholders and binds parameters for you, keeping your code 
+concise and secure.
+
+Whether you're assembling simple filters or composing complex queries, this query builder gives you a 
+predictable and ergonomic workflow 
+
+- Zero dependencies
+- Zero global objects
+- Built-in base support for ClickHouse, PostgreSQL, DuckDB, and MySQL
+
+See [Wiki](https://github.com/d-ganchar/david8/wiki)

david8-0.dev5/README.md

@@ -0,0 +1,17 @@
+# david8
+
+A fast, lightweight, and elegant SQL query builder for Python.
+Designed with clarity and minimalism in mind, it provides a clean, expressive interface for constructing 
+SQL queries without sacrificing control or performance.
+
+The builder automatically generates safe parameter placeholders and binds parameters for you, keeping your code 
+concise and secure.
+
+Whether you're assembling simple filters or composing complex queries, this query builder gives you a 
+predictable and ergonomic workflow 
+
+- Zero dependencies
+- Zero global objects
+- Built-in base support for ClickHouse, PostgreSQL, DuckDB, and MySQL
+
+See [Wiki](https://github.com/d-ganchar/david8/wiki)

{david8-0.dev4 → david8-0.dev5}/david8/predicates.py

@@ -97,7 +97,7 @@ def le(column: str, value: int | float | ExprProtocol) -> PredicateProtocol:
 def ne(column: str, value: int | float | str | ExprProtocol) -> PredicateProtocol:
     return _LeftColRightParamPredicate(column, value, '!=')
 
-def between_c(
+def between(
     column: str,
     start: str | float | int | ExprProtocol,
     end: str | float | int | ExprProtocol

{david8-0.dev4 → david8-0.dev5}/david8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: david8
-Version: 0.dev4
+Version: 0.dev5
 Summary: Lightweight Python SQL query builder with support for multiple dialects: ClickHouse and PostgreSQL
 Author-email: Danila Ganchar <danila.ganchar@gmail.com>
 Maintainer-email: Danila Ganchar <danila.ganchar@gmail.com>
@@ -24,3 +24,19 @@ License-File: LICENSE
 Dynamic: license-file
 
 # david8
+
+A fast, lightweight, and elegant SQL query builder for Python.
+Designed with clarity and minimalism in mind, it provides a clean, expressive interface for constructing 
+SQL queries without sacrificing control or performance.
+
+The builder automatically generates safe parameter placeholders and binds parameters for you, keeping your code 
+concise and secure.
+
+Whether you're assembling simple filters or composing complex queries, this query builder gives you a 
+predictable and ergonomic workflow 
+
+- Zero dependencies
+- Zero global objects
+- Built-in base support for ClickHouse, PostgreSQL, DuckDB, and MySQL
+
+See [Wiki](https://github.com/d-ganchar/david8/wiki)

{david8-0.dev4 → david8-0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "david8"
-version = "0.dev.4"
+version = "0.dev.5"
 description = "Lightweight Python SQL query builder with support for multiple dialects: ClickHouse and PostgreSQL"
 authors = [{name = "Danila Ganchar", email = "danila.ganchar@gmail.com"}]
 maintainers = [{name = "Danila Ganchar", email = "danila.ganchar@gmail.com"}]

{david8-0.dev4 → david8-0.dev5}/tests/test_predicates.py

@@ -2,7 +2,7 @@ from parameterized import parameterized
 
 from david8.expressions import param, val
 from david8.predicates import (
-    between_c,
+    between,
     eq,
     eq_c,
     eq_e,
@@ -30,14 +30,14 @@ class TestPredicates(BaseTest):
     @parameterized.expand([
         # between
         (
-            between_c('age', 14, 18).as_('is_valid'),
+                between('age', 14, 18).as_('is_valid'),
             'SELECT age BETWEEN %(p1)s AND %(p2)s AS is_valid',
-            {'p1': 14, 'p2': 18}
+                {'p1': 14, 'p2': 18}
         ),
         (
-            between_c('created_day', val('2025-01-01'), val('2026-01-01')),
+                between('created_day', val('2025-01-01'), val('2026-01-01')),
             "SELECT created_day BETWEEN '2025-01-01' AND '2026-01-01'",
-            {}
+                {}
         ),
         # eq
         (

{david8-0.dev4 → david8-0.dev5}/tests/test_where_predicates.py

@@ -1,5 +1,8 @@
+from parameterized import parameterized
+
+from david8.expressions import col, val
 from david8.predicates import (
-    between_c,
+    between,
     eq,
     ge,
     gt,
@@ -7,6 +10,7 @@ from david8.predicates import (
     lt,
     ne,
 )
+from david8.protocols.sql import PredicateProtocol
 from tests.base_test import BaseTest
 
 
@@ -23,14 +27,13 @@ class TestWherePredicates(BaseTest):
                 gt('weight', 3.1),
                 lt('weight', 3.9),
                 ne('gender', 'f'),
-                between_c('last_visit', '2023', '2024'),
             )
         )
 
         self.assertEqual(
             query.get_sql(),
             "SELECT * FROM cats WHERE color = %(p1)s AND age >= %(p2)s AND age <= %(p3)s AND weight > %(p4)s AND "
-            "weight < %(p5)s AND gender != %(p6)s AND last_visit BETWEEN %(p7)s AND %(p8)s"
+            "weight < %(p5)s AND gender != %(p6)s"
         )
 
         self.assertEqual(
@@ -41,8 +44,6 @@ class TestWherePredicates(BaseTest):
                 'p4': 3.1,
                 'p5': 3.9,
                 'p6': 'f',
-                'p7': '2023',
-                'p8': '2024',
              },
             query.get_parameters()
         )
@@ -57,30 +58,50 @@ class TestWherePredicates(BaseTest):
             gt('weight', 3.1),
             lt('weight', 3.9),
             ne('gender', 'f'),
-            between_c('last_visit', '2023-01-01', '2024-01-01'),
-            between_c('sociality', 69, 96),
         ]:
             query.where(predicate)
 
         self.assertEqual(
             query.get_sql(),
             'SELECT * FROM cats WHERE color = %(p1)s AND age >= %(p2)s AND age <= %(p3)s AND weight > %(p4)s AND '
-            'weight < %(p5)s AND gender != %(p6)s AND last_visit BETWEEN %(p7)s AND %(p8)s AND sociality '
-            'BETWEEN %(p9)s AND %(p10)s'
+            'weight < %(p5)s AND gender != %(p6)s'
         )
 
         self.assertEqual(
             {
                 'p1': 'ginger',
-                'p10': 96,
                 'p2': 2,
                 'p3': 3,
                 'p4': 3.1,
                 'p5': 3.9,
                 'p6': 'f',
-                'p7': '2023-01-01',
-                'p8': '2024-01-01',
-                'p9': 69,
             },
             query.get_parameters(),
         )
+
+    @parameterized.expand([
+        (
+            between('last_visit', '2023-01-01', '2024-01-01'),
+            'SELECT last_visit BETWEEN %(p1)s AND %(p2)s',
+            {'p1': '2023-01-01', 'p2': '2024-01-01'},
+        ),
+        (
+            between('sociality', 69, 96).as_('soc_level'),
+            'SELECT sociality BETWEEN %(p1)s AND %(p2)s AS soc_level',
+            {'p1': 69, 'p2': 96},
+        ),
+        (
+            between('price', col('account_balance_free'), col('account_balance_total')),
+            'SELECT price BETWEEN account_balance_free AND account_balance_total',
+            {},
+        ),
+        (
+            between('price', val(0.1), val(0.9)),
+            'SELECT price BETWEEN 0.1 AND 0.9',
+            {},
+        )
+    ])
+    def test_between(self, b_expr: PredicateProtocol, exp_sql: str, exp_params: dict):
+        query = self.qb.select(b_expr)
+        self.assertEqual(query.get_sql(), exp_sql)
+        self.assertEqual(query.get_parameters(), exp_params)

david8-0.dev4/README.md

@@ -1 +0,0 @@
-# david8