t-sql 3.0.0__tar.gz → 3.1.0__tar.gz

{t_sql-3.0.0 → t_sql-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t-sql
-Version: 3.0.0
+Version: 3.1.0
 Summary: Safe SQL. SQL queries for python t-strings (PEP 750)
 Project-URL: Homepage, https://github.com/nhumrich/t-sql
 License-File: LICENSE
@@ -159,8 +159,7 @@ sql, params = query.render()
 Quick INSERT queries:
 
 ```python
-values = {'id': 'abc123', 'name': 'bob', 'email': 'bob@example.com'}
-query = tsql.insert('users', values)
+query = tsql.insert('users', id='abc123', name='bob', email='bob@example.com')
 sql, params = query.render()
 # ('INSERT INTO users (id, name, email) VALUES (?, ?, ?)', ['abc123', 'bob', 'bob@example.com'])
 ```
@@ -171,14 +170,9 @@ Quick UPDATE queries:
 
 ```python
 # Update by ID
-query = tsql.update('users', {'email': 'new@example.com'}, id_value='abc123')
+query = tsql.update('users', 'abc123', email='new@example.com')
 sql, params = query.render()
 # ('UPDATE users SET email = ? WHERE id = ?', ['new@example.com', 'abc123'])
-
-# Update with custom WHERE
-query = tsql.update('users', {'email': 'new@example.com'}, where={'age': 25})
-sql, params = query.render()
-# ('UPDATE users SET email = ? WHERE age = ?', ['new@example.com', 25])
 ```
 
 #### delete
@@ -271,8 +265,9 @@ query = Users.select().where(Users.id.in_([1, 2, 3]))
 query = Users.select().where(Users.username.like('%john%'))
 
 # ORDER BY
-query = Posts.select().order_by(Posts.id)
-query = Posts.select().order_by((Posts.id, 'DESC'))
+query = Posts.select().order_by(Posts.id)  # defaults to ASC
+query = Posts.select().order_by(Posts.id.desc())
+query = Posts.select().order_by(Posts.created_at.asc(), Posts.id.desc())
 
 # LIMIT and OFFSET
 query = Posts.select().limit(10).offset(20)
@@ -291,47 +286,46 @@ The query builder supports INSERT, UPDATE, and DELETE with database-agnostic con
 
 ```python
 # Basic insert
-values = {'id': 'abc123', 'username': 'john', 'email': 'john@example.com'}
-query = Users.insert(values)
+query = Users.insert(id='abc123', username='john', email='john@example.com')
 sql, params = query.render()
 # ('INSERT INTO users (id, username, email) VALUES (?, ?, ?)', ['abc123', 'john', 'john@example.com'])
 
 # INSERT with RETURNING (Postgres/SQLite)
-query = Users.insert(values).returning()
+query = Users.insert(id='abc123', username='john', email='john@example.com').returning()
 sql, params = query.render()
 # ('INSERT INTO users (id, username, email) VALUES (?, ?, ?) RETURNING *', [...])
 
 # INSERT IGNORE (MySQL)
-query = Users.insert(values).ignore()
+query = Users.insert(id='abc123', username='john', email='john@example.com').ignore()
 sql, params = query.render()
 # ('INSERT IGNORE INTO users (id, username, email) VALUES (?, ?, ?)', [...])
 
 # ON CONFLICT DO NOTHING (Postgres/SQLite)
-query = Users.insert(values).on_conflict_do_nothing()
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_do_nothing()
 # ('INSERT INTO users (...) VALUES (...) ON CONFLICT DO NOTHING', [...])
 
 # ON CONFLICT DO NOTHING with specific conflict target (Postgres/SQLite)
-query = Users.insert(values).on_conflict_do_nothing(conflict_on='email')
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_do_nothing(conflict_on='email')
 # ('INSERT INTO users (...) VALUES (...) ON CONFLICT (email) DO NOTHING', [...])
 
 # ON CONFLICT DO UPDATE (Postgres/SQLite upsert)
-query = Users.insert(values).on_conflict_update(conflict_on='id')
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_update(conflict_on='id')
 # ('INSERT INTO users (...) VALUES (...)
 #   ON CONFLICT (id) DO UPDATE SET username = EXCLUDED.username, email = EXCLUDED.email', [...])
 
 # ON CONFLICT with custom update
-query = Users.insert(values).on_conflict_update(
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_update(
     conflict_on='id',
     update={'username': 'updated_name'}
 )
 
 # ON DUPLICATE KEY UPDATE (MySQL)
-query = Users.insert(values).on_duplicate_key_update()
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_duplicate_key_update()
 # ('INSERT INTO users (...) VALUES (...)
 #   ON DUPLICATE KEY UPDATE id = VALUES(id), username = VALUES(username), ...', [...])
 
 # Chain multiple modifiers
-query = (Users.insert(values)
+query = (Users.insert(id='abc123', username='john', email='john@example.com')
          .on_conflict_update(conflict_on='id')
          .returning('id', 'username'))
 ```
@@ -340,22 +334,22 @@ query = (Users.insert(values)
 
 ```python
 # Basic update (no WHERE = updates all rows!)
-query = Users.update({'email': 'newemail@example.com'})
+query = Users.update(email='newemail@example.com')
 sql, params = query.render()
 # ('UPDATE users SET email = ?', ['newemail@example.com'])
 
 # UPDATE with WHERE
-query = Users.update({'email': 'newemail@example.com'}).where(Users.id == 'abc123')
+query = Users.update(email='newemail@example.com').where(Users.id == 'abc123')
 sql, params = query.render()
 # ('UPDATE users SET email = ? WHERE users.id = ?', ['newemail@example.com', 'abc123'])
 
 # Multiple WHERE conditions
-query = (Users.update({'email': 'newemail@example.com'})
+query = (Users.update(email='newemail@example.com')
          .where(Users.id == 'abc123')
          .where(Users.age > 18))
 
 # With RETURNING (Postgres/SQLite)
-query = (Users.update({'email': 'new@example.com'})
+query = (Users.update(email='new@example.com')
          .where(Users.id == 'abc123')
          .returning())
 # ('UPDATE users SET email = ? WHERE users.id = ? RETURNING *', [...])

{t_sql-3.0.0 → t_sql-3.1.0}/README.md

@@ -149,8 +149,7 @@ sql, params = query.render()
 Quick INSERT queries:
 
 ```python
-values = {'id': 'abc123', 'name': 'bob', 'email': 'bob@example.com'}
-query = tsql.insert('users', values)
+query = tsql.insert('users', id='abc123', name='bob', email='bob@example.com')
 sql, params = query.render()
 # ('INSERT INTO users (id, name, email) VALUES (?, ?, ?)', ['abc123', 'bob', 'bob@example.com'])
 ```
@@ -161,14 +160,9 @@ Quick UPDATE queries:
 
 ```python
 # Update by ID
-query = tsql.update('users', {'email': 'new@example.com'}, id_value='abc123')
+query = tsql.update('users', 'abc123', email='new@example.com')
 sql, params = query.render()
 # ('UPDATE users SET email = ? WHERE id = ?', ['new@example.com', 'abc123'])
-
-# Update with custom WHERE
-query = tsql.update('users', {'email': 'new@example.com'}, where={'age': 25})
-sql, params = query.render()
-# ('UPDATE users SET email = ? WHERE age = ?', ['new@example.com', 25])
 ```
 
 #### delete
@@ -261,8 +255,9 @@ query = Users.select().where(Users.id.in_([1, 2, 3]))
 query = Users.select().where(Users.username.like('%john%'))
 
 # ORDER BY
-query = Posts.select().order_by(Posts.id)
-query = Posts.select().order_by((Posts.id, 'DESC'))
+query = Posts.select().order_by(Posts.id)  # defaults to ASC
+query = Posts.select().order_by(Posts.id.desc())
+query = Posts.select().order_by(Posts.created_at.asc(), Posts.id.desc())
 
 # LIMIT and OFFSET
 query = Posts.select().limit(10).offset(20)
@@ -281,47 +276,46 @@ The query builder supports INSERT, UPDATE, and DELETE with database-agnostic con
 
 ```python
 # Basic insert
-values = {'id': 'abc123', 'username': 'john', 'email': 'john@example.com'}
-query = Users.insert(values)
+query = Users.insert(id='abc123', username='john', email='john@example.com')
 sql, params = query.render()
 # ('INSERT INTO users (id, username, email) VALUES (?, ?, ?)', ['abc123', 'john', 'john@example.com'])
 
 # INSERT with RETURNING (Postgres/SQLite)
-query = Users.insert(values).returning()
+query = Users.insert(id='abc123', username='john', email='john@example.com').returning()
 sql, params = query.render()
 # ('INSERT INTO users (id, username, email) VALUES (?, ?, ?) RETURNING *', [...])
 
 # INSERT IGNORE (MySQL)
-query = Users.insert(values).ignore()
+query = Users.insert(id='abc123', username='john', email='john@example.com').ignore()
 sql, params = query.render()
 # ('INSERT IGNORE INTO users (id, username, email) VALUES (?, ?, ?)', [...])
 
 # ON CONFLICT DO NOTHING (Postgres/SQLite)
-query = Users.insert(values).on_conflict_do_nothing()
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_do_nothing()
 # ('INSERT INTO users (...) VALUES (...) ON CONFLICT DO NOTHING', [...])
 
 # ON CONFLICT DO NOTHING with specific conflict target (Postgres/SQLite)
-query = Users.insert(values).on_conflict_do_nothing(conflict_on='email')
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_do_nothing(conflict_on='email')
 # ('INSERT INTO users (...) VALUES (...) ON CONFLICT (email) DO NOTHING', [...])
 
 # ON CONFLICT DO UPDATE (Postgres/SQLite upsert)
-query = Users.insert(values).on_conflict_update(conflict_on='id')
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_update(conflict_on='id')
 # ('INSERT INTO users (...) VALUES (...)
 #   ON CONFLICT (id) DO UPDATE SET username = EXCLUDED.username, email = EXCLUDED.email', [...])
 
 # ON CONFLICT with custom update
-query = Users.insert(values).on_conflict_update(
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_conflict_update(
     conflict_on='id',
     update={'username': 'updated_name'}
 )
 
 # ON DUPLICATE KEY UPDATE (MySQL)
-query = Users.insert(values).on_duplicate_key_update()
+query = Users.insert(id='abc123', username='john', email='john@example.com').on_duplicate_key_update()
 # ('INSERT INTO users (...) VALUES (...)
 #   ON DUPLICATE KEY UPDATE id = VALUES(id), username = VALUES(username), ...', [...])
 
 # Chain multiple modifiers
-query = (Users.insert(values)
+query = (Users.insert(id='abc123', username='john', email='john@example.com')
          .on_conflict_update(conflict_on='id')
          .returning('id', 'username'))
 ```
@@ -330,22 +324,22 @@ query = (Users.insert(values)
 
 ```python
 # Basic update (no WHERE = updates all rows!)
-query = Users.update({'email': 'newemail@example.com'})
+query = Users.update(email='newemail@example.com')
 sql, params = query.render()
 # ('UPDATE users SET email = ?', ['newemail@example.com'])
 
 # UPDATE with WHERE
-query = Users.update({'email': 'newemail@example.com'}).where(Users.id == 'abc123')
+query = Users.update(email='newemail@example.com').where(Users.id == 'abc123')
 sql, params = query.render()
 # ('UPDATE users SET email = ? WHERE users.id = ?', ['newemail@example.com', 'abc123'])
 
 # Multiple WHERE conditions
-query = (Users.update({'email': 'newemail@example.com'})
+query = (Users.update(email='newemail@example.com')
          .where(Users.id == 'abc123')
          .where(Users.age > 18))
 
 # With RETURNING (Postgres/SQLite)
-query = (Users.update({'email': 'new@example.com'})
+query = (Users.update(email='new@example.com')
          .where(Users.id == 'abc123')
          .returning())
 # ('UPDATE users SET email = ? WHERE users.id = ? RETURNING *', [...])

{t_sql-3.0.0 → t_sql-3.1.0}/pyproject.toml

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

{t_sql-3.0.0 → t_sql-3.1.0}/tests/test_query_builder.py

@@ -213,7 +213,7 @@ def test_order_by():
 
 def test_order_by_desc():
     """Test ORDER BY with DESC"""
-    query = Users.select().order_by((Users.id, 'DESC'))
+    query = Users.select().order_by(Users.id.desc())
     sql, params = query.render()
 
     assert 'ORDER BY users.id DESC' in sql
@@ -221,7 +221,39 @@ def test_order_by_desc():
 
 def test_order_by_multiple():
     """Test ORDER BY with multiple columns"""
-    query = Users.select().order_by(Users.username, (Users.id, 'DESC'))
+    query = Users.select().order_by(Users.username, Users.id.desc())
+    sql, params = query.render()
+
+    assert 'ORDER BY users.username ASC, users.id DESC' in sql
+
+
+def test_order_by_asc_method():
+    """Test ORDER BY with .asc() method"""
+    query = Users.select().order_by(Users.username.asc())
+    sql, params = query.render()
+
+    assert 'ORDER BY users.username ASC' in sql
+
+
+def test_order_by_desc_method():
+    """Test ORDER BY with .desc() method"""
+    query = Users.select().order_by(Users.id.desc())
+    sql, params = query.render()
+
+    assert 'ORDER BY users.id DESC' in sql
+
+
+def test_order_by_mixed_methods():
+    """Test ORDER BY with mixed .asc() and .desc() methods"""
+    query = Users.select().order_by(Users.username.asc(), Users.id.desc())
+    sql, params = query.render()
+
+    assert 'ORDER BY users.username ASC, users.id DESC' in sql
+
+
+def test_order_by_mixed_syntax():
+    """Test ORDER BY with mixed method calls and bare columns"""
+    query = Users.select().order_by(Users.username, Users.id.desc())
     sql, params = query.render()
 
     assert 'ORDER BY users.username ASC, users.id DESC' in sql
@@ -242,7 +274,7 @@ def test_complex_query():
              .join(Users, Posts.user_id == Users.id)
              .where(Posts.id > 100)
              .where(Users.id >= 5)
-             .order_by((Posts.id, 'DESC'))
+             .order_by(Posts.id.desc())
              .limit(20))
     sql, params = query.render()
 
@@ -480,7 +512,7 @@ def test_complex_aggregation_query():
              .where(Posts.id > 100)
              .group_by(Posts.user_id)
              .having(Posts.id > 5)
-             .order_by((Posts.user_id, 'DESC'))
+             .order_by(Posts.user_id.desc())
              .limit(10)
              .offset(5))
     sql, params = query.render()

{t_sql-3.0.0 → t_sql-3.1.0}/tests/test_sqlite_integration.py

@@ -331,7 +331,7 @@ async def test_query_builder_select(conn):
     assert rows[0][0] == 'Alice'
 
     # Test ORDER BY
-    query = TestUsers.select().order_by((TestUsers.age, 'DESC'))
+    query = TestUsers.select().order_by(TestUsers.age.desc())
     sql, params = query.render()
 
     cursor = await conn.execute(sql, params)

{t_sql-3.0.0 → t_sql-3.1.0}/tsql/query_builder.py

@@ -16,6 +16,17 @@ except ImportError:
     SAColumnType = None
 
 
+class OrderByClause:
+    """Represents a column with an ORDER BY direction (ASC/DESC)"""
+
+    def __init__(self, column: 'Column', direction: str):
+        self.column = column
+        self.direction = direction.upper()
+
+    def __repr__(self) -> str:
+        return f"OrderByClause({self.column!r}, {self.direction!r})"
+
+
 class Column:
     """Represents a bound column (table + column name) for building queries"""
 
@@ -140,6 +151,28 @@ class Column:
         """Create an IS NOT NULL condition"""
         return Condition(self, 'IS NOT', None)
 
+    def asc(self) -> OrderByClause:
+        """Create an ascending ORDER BY clause
+
+        Returns:
+            OrderByClause for use in order_by()
+
+        Example:
+            Users.select().order_by(Users.username.asc())
+        """
+        return OrderByClause(self, 'ASC')
+
+    def desc(self) -> OrderByClause:
+        """Create a descending ORDER BY clause
+
+        Returns:
+            OrderByClause for use in order_by()
+
+        Example:
+            Users.select().order_by(Users.created_at.desc())
+        """
+        return OrderByClause(self, 'DESC')
+
 
 class Table:
     """Base class for all table definitions. Provides query builder methods.
@@ -838,11 +871,22 @@ class SelectQueryBuilder(QueryBuilder):
         """Add a RIGHT JOIN clause"""
         return self.join(table, on, 'RIGHT')
 
-    def order_by(self, *columns: Union[Column, tuple[Column, str]]) -> 'SelectQueryBuilder':
-        """Add ORDER BY clause. Pass (column, 'DESC') for descending"""
+    def order_by(self, *columns: Union[Column, OrderByClause]) -> 'SelectQueryBuilder':
+        """Add ORDER BY clause
+
+        Args:
+            columns: Column objects or OrderByClause objects (from .asc()/.desc())
+
+        Examples:
+            # Using .asc() and .desc() methods
+            Users.select().order_by(Users.username.asc(), Users.id.desc())
+
+            # Bare column defaults to ASC
+            Users.select().order_by(Users.username)
+        """
         for col in columns:
-            if isinstance(col, tuple):
-                self._order_by_columns.append(col)
+            if isinstance(col, OrderByClause):
+                self._order_by_columns.append((col.column, col.direction))
             else:
                 self._order_by_columns.append((col, 'ASC'))
         return self