t-sql 4.9.0__tar.gz → 4.9.2__tar.gz

{t_sql-4.9.0 → t_sql-4.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t-sql
-Version: 4.9.0
+Version: 4.9.2
 Summary: Safe SQL. SQL queries for python t-strings (PEP 750)
 Project-URL: Homepage, https://github.com/nhumrich/t-sql
 License-File: LICENSE

{t_sql-4.9.0 → t_sql-4.9.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "t-sql"
-version = "4.9.0"
+version = "4.9.2"
 description = "Safe SQL. SQL queries for python t-strings (PEP 750)"
 readme = "README.md"
 requires-python = ">=3.14"

{t_sql-4.9.0 → t_sql-4.9.2}/tests/test_asyncpg_integration.py

@@ -369,4 +369,92 @@ async def test_like_pattern_format_specs_with_postgres(conn):
     rows = await conn.fetch(sql, *params)
 
     # Should match both john_doe and john%smith (case-insensitive)
-    assert len(rows) == 2
+    assert len(rows) == 2
+
+
+async def test_jsonb_with_dict(conn):
+    """Test that dict objects can be used with asyncpg JSONB columns via set_type_codec"""
+    import json
+
+    # Create a table with JSONB column
+    await conn.execute("""
+        CREATE TABLE IF NOT EXISTS test_jsonb (
+            id SERIAL PRIMARY KEY,
+            data JSONB
+        )
+    """)
+
+    try:
+        # Set up a codec so asyncpg can handle Python dicts for JSONB
+        # This is the recommended asyncpg pattern for JSONB
+        await conn.set_type_codec(
+            'jsonb',
+            encoder=json.dumps,
+            decoder=json.loads,
+            schema='pg_catalog'
+        )
+
+        # Now dicts work directly because tsql preserves them (not stringified)
+        my_dict = {'name': 'billy', 'age': 30, 'tags': ['admin', 'user']}
+
+        query, params = tsql.render(
+            t"INSERT INTO test_jsonb (data) VALUES ({my_dict})",
+            style=tsql.styles.NUMERIC_DOLLAR
+        )
+
+        # Verify the parameter is still a dict (not stringified)
+        assert len(params) == 1
+        assert isinstance(params[0], dict)
+
+        # This should work now with the type codec
+        await conn.execute(query, *params)
+
+        # Verify data was inserted correctly and can be queried
+        row = await conn.fetchrow("SELECT data FROM test_jsonb WHERE id = 1")
+        assert row['data'] == my_dict
+        assert row['data']['name'] == 'billy'
+        assert row['data']['tags'] == ['admin', 'user']
+
+        # Test querying with JSONB operators
+        name = 'billy'
+        query2, params2 = tsql.render(
+            t"SELECT data FROM test_jsonb WHERE data->>'name' = {name}",
+            style=tsql.styles.NUMERIC_DOLLAR
+        )
+        rows = await conn.fetch(query2, *params2)
+        assert len(rows) == 1
+    finally:
+        await conn.execute("DROP TABLE IF EXISTS test_jsonb")
+
+
+async def test_array_with_list(conn):
+    """Test that list objects work correctly with asyncpg array columns"""
+    # Create a table with array column
+    await conn.execute("""
+        CREATE TABLE IF NOT EXISTS test_array (
+            id SERIAL PRIMARY KEY,
+            tags TEXT[]
+        )
+    """)
+
+    try:
+        # Insert a list - this should work because list is preserved
+        my_list = ['tag1', 'tag2', 'tag3']
+
+        query, params = tsql.render(
+            t"INSERT INTO test_array (tags) VALUES ({my_list})",
+            style=tsql.styles.NUMERIC_DOLLAR
+        )
+
+        # Verify the parameter is still a list (not stringified)
+        assert len(params) == 1
+        assert isinstance(params[0], list)
+
+        # This should work without asyncpg throwing an error
+        await conn.execute(query, *params)
+
+        # Verify data was inserted correctly
+        row = await conn.fetchrow("SELECT tags FROM test_array WHERE id = 1")
+        assert row['tags'] == my_list
+    finally:
+        await conn.execute("DROP TABLE IF EXISTS test_array")

{t_sql-4.9.0 → t_sql-4.9.2}/tests/test_query_builder.py

@@ -116,6 +116,19 @@ def test_select_specific_columns():
     assert params == []
 
 
+def test_multiple_select_calls_append():
+    """Test that multiple .select() calls append columns instead of replacing them"""
+    query = Users.select(Users.id)
+    query.select(Users.username, Users.email)
+    sql, params = query.render()
+
+    # All three columns should be present
+    assert 'users.id' in sql
+    assert 'users.username' in sql
+    assert 'users.email' in sql
+    assert params == []
+
+
 def test_select_with_where():
     """Test SELECT with WHERE clause"""
     query = Users.select(Users.id, Users.username).where(Users.id == 5)

{t_sql-4.9.0 → t_sql-4.9.2}/tests/test_tsql.py

@@ -168,4 +168,54 @@ def test_datetime_with_format_spec_converts_to_string():
     assert isinstance(result[1][0], str)
 
 
+def test_dict_preserved_as_native_type():
+    """Dict values should pass through as dict objects, not strings."""
+    my_dict = {'name': 'billy', 'age': 30}
+    result = tsql.render(t'INSERT INTO users (data) VALUES ({my_dict})')
+    assert result.sql == 'INSERT INTO users (data) VALUES (?)'
+    assert result.values == [{'name': 'billy', 'age': 30}]
+    assert isinstance(result.values[0], dict)
+
+
+def test_list_preserved_as_native_type():
+    """List values should pass through as list objects, not strings."""
+    my_list = [1, 2, 3, 'four']
+    result = tsql.render(t'INSERT INTO items (tags) VALUES ({my_list})')
+    assert result.sql == 'INSERT INTO items (tags) VALUES (?)'
+    assert result.values == [[1, 2, 3, 'four']]
+    assert isinstance(result.values[0], list)
+
+
+def test_set_preserved_as_native_type():
+    """Set values should pass through as set objects, not strings."""
+    my_set = {1, 2, 3}
+    result = tsql.render(t'INSERT INTO items (ids) VALUES ({my_set})')
+    assert result.sql == 'INSERT INTO items (ids) VALUES (?)'
+    assert isinstance(result.values[0], set)
+    assert result.values[0] == {1, 2, 3}
+
+
+def test_nested_dict_with_list():
+    """Nested structures should preserve their types."""
+    data = {'tags': ['a', 'b'], 'count': 5}
+    result = tsql.render(t'UPDATE users SET meta = {data}')
+    assert isinstance(result.values[0], dict)
+    assert isinstance(result.values[0]['tags'], list)
+
+
+def test_empty_collections_preserved():
+    """Empty collections should also preserve their types."""
+    empty_dict = {}
+    empty_list = []
+    empty_set = set()
+
+    r1 = tsql.render(t'VALUES ({empty_dict})')
+    r2 = tsql.render(t'VALUES ({empty_list})')
+    r3 = tsql.render(t'VALUES ({empty_set})')
+
+    assert isinstance(r1.values[0], dict)
+    assert isinstance(r2.values[0], list)
+    assert isinstance(r3.values[0], set)
+
+
 

{t_sql-4.9.0 → t_sql-4.9.2}/tsql/__init__.py

@@ -195,6 +195,8 @@ class TSQL:
                     return [Parameter(val.expression, val.value)]
                 case '', datetime.datetime() | datetime.date() | datetime.time() | datetime.timedelta():
                     return [Parameter(val.expression, value)]
+                case '', dict() | list() | set():
+                    return [Parameter(val.expression, value)]
                 case _, _:
                     return [Parameter(val.expression, formatter.format_field(value, val.format_spec))]
 

{t_sql-4.9.0 → t_sql-4.9.2}/tsql/query_builder.py

@@ -1201,7 +1201,13 @@ class SelectQueryBuilder(QueryBuilder):
             # No columns specified selects all (SELECT *)
             users.select()
         """
-        self._columns = list(columns) if columns else None
+        if columns:
+            if self._columns is None:
+                self._columns = []
+            self._columns.extend(columns)
+        else:
+            # Calling select() with no args resets to SELECT *
+            self._columns = None
         return self
 
     def where(self, condition: Union[Condition, Template]) -> 'SelectQueryBuilder':