sqlx->sqls; README.md; tests.yaml;

Author: cxllmerichie

Diff for: .github/workflows/tests.yaml

@@ -7,26 +7,27 @@ on:
 jobs:
   tests:
     runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
         os: [ ubuntu-latest ]
         python-version: [ '3.10', '3.11', '3.12' ]
-#
-#    services:
-#      redis:
-#        image: mysql:latest
-#        ports:
-#          - 3306:3306
-#
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Set up Python ${{ matrix.python-version }}
-#        uses: actions/setup-python@v2
-#        with:
-#          python-version: ${{ matrix.python-version }}
-#      - name: Install dependencies
-#        run: |
-#          python -m pip install --upgrade pip
-#          pip install tox tox-gh-actions
-#      - name: Test with tox
-#        run: tox
+
+    services:
+      mysql:
+        image: mysql:latest
+        ports:
+          - 3306:3306
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox tox-gh-actions
+      - name: Test with tox
+        run: tox

Diff for: README.md

@@ -1,5 +1,5 @@
 from pydantic import Field
-from sqlx import SQLX, Schema
+from sqls import SQLS, Schema
 import asyncio
 
 
@@ -12,22 +12,22 @@ class User(Schema):
 
 
 async def main():
-    sqlx = SQLX(
+    sqls = SQLS(
         db='test',
         user='root',
         password='password',
     )
 
-    await sqlx.create_pool()
+    await sqls.create_pool()
 
-    users = await sqlx.count().fr0m(User).where({
+    users = await sqls.count().fr0m(User).where({
         User.model().username: 'username'
     }).order_by(
         User.model().username.desc()
     ).limit(10).offset(5).all()
     print(users)
 
-    await sqlx.close_pool()
+    await sqls.close_pool()
 
 
 if __name__ == '__main__':

Diff for: examples/common.py

@@ -0,0 +1,2 @@
+from .core.sqls import SQLS
+from .types import Schema

Diff for: sqls/__init__.py

@@ -4,7 +4,7 @@
 
 import aiomysql
 
-from sqlx.types import Schema, Query, Args, Row
+from sqls.types import Schema, Query, Args, Row
 
 
 class Result:

Diff for: sqlx/core/__init__.py renamed to sqls/core/__init__.py

@@ -2,10 +2,10 @@
 
 import aiomysql
 
-from sqlx.sql.vendor import SQLVendor
+from sqls.sql.vendor import SQLVendor
 
 
-class SQLX(SQLVendor):
+class SQLS(SQLVendor):
     pool: aiomysql.Pool
 
     def __init__(self, *args, **kwargs):

Diff for: sqlx/core/result.py renamed to sqls/core/result.py

@@ -2,7 +2,7 @@
 
 from typing import Union, overload, Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Schema
 
 
@@ -41,7 +41,7 @@ def fr0m(
         elif table := getattr(table, '__table__', None):
             ...
         else:
-            raise NotImplementedError('No mathing @overload found for `sqlx.fr0m(...)`')
+            raise NotImplementedError('No mathing @overload found for `sqls.fr0m(...)`')
 
         self._query.update(f'FROM `{table}`')
 

Diff for: sqlx/core/sqlx.py renamed to sqls/core/sqls.py

@@ -2,7 +2,7 @@
 
 from typing import Union, overload, Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Schema
 
 
@@ -41,7 +41,7 @@ def into(
         elif table := getattr(table, '__table__', None):
             ...
         else:
-            raise NotImplementedError('No matching @overload found for `sqlx.into(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.into(...)`')
 
         self._query.update(f'INTO `{table}`')
 

Diff for: sqlx/sql/__init__.py renamed to sqls/sql/__init__.py

@@ -2,7 +2,7 @@
 
 from typing import Union, overload, Self, Literal
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Column, Schema
 
 
@@ -49,7 +49,7 @@ def join(
         elif table := getattr(table, '__table__', None):
             ...
         else:
-            raise NotImplementedError('No matching @overload found for `sqlx.join(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.join(...)`')
 
         self._query.update(f'{type} JOIN `{table}`')
 
@@ -88,7 +88,7 @@ def on(
             /,
     ):
         if not isinstance(on, (str, Column)):
-            raise NotImplementedError('No matching @overload found for `sqlx.on(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.on(...)`')
 
         self._query.update(f'ON {on}')
 

Diff for: sqlx/sql/mixin/__init__.py renamed to sqls/sql/mixin/__init__.py

@@ -2,7 +2,7 @@
 
 from typing import Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Schema
 
 

Diff for: sqlx/sql/mixin/fr0m.py renamed to sqls/sql/mixin/fr0m.py

@@ -2,7 +2,7 @@
 
 from typing import Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Schema
 
 

Diff for: sqlx/sql/mixin/into.py renamed to sqls/sql/mixin/into.py

@@ -2,7 +2,7 @@
 
 from typing import Union, overload, Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Column, Schema
 
 
@@ -53,7 +53,7 @@ def order_by(
         elif kwargs:
             columns = ', '.join(f'{column} {order.upper()}' for column, order in kwargs.items())
         else:
-            raise NotImplementedError('No matching @overload found for `sqlx.order_by(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.order_by(...)`')
 
         self._query.update(f'ORDER BY {columns}')
 

Diff for: sqlx/sql/mixin/join.py renamed to sqls/sql/mixin/join.py

@@ -2,7 +2,7 @@
 
 from typing import Union, overload, Self
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Column, Schema
 
 

Diff for: sqlx/sql/mixin/limit.py renamed to sqls/sql/mixin/limit.py

@@ -2,7 +2,7 @@
 
 from typing import Self, overload, Union, Any, Iterable
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Schema, Column
 
 

Diff for: sqlx/sql/mixin/offset.py renamed to sqls/sql/mixin/offset.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Union, Self, overload
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 from ...types import Column, Schema
 
 
@@ -64,7 +64,7 @@ def where(
             conditions = ''.join(f'`{column}` = %s' for column in as_dict.keys())
             values = as_dict.values()
         else:
-            raise NotImplementedError('Most likely, invalid usage of `sqlx.where`')
+            raise NotImplementedError('Most likely, invalid usage of `sqls.where`')
 
         self._query.update(f'WHERE {conditions}')
         self._args.update(*values)

Diff for: sqlx/sql/mixin/order_by.py renamed to sqls/sql/mixin/order_by.py

@@ -45,7 +45,7 @@ class UpdateQuery(
     #     elif issubclass(table, Schema):
     #         table = table.__table__
     #     else:
-    #         raise NotImplementedError('No matching @overload found for `sqlx.update(...)`')
+    #         raise NotImplementedError('No matching @overload found for `sqls.update(...)`')
     #
     #     self._query.update(f'UPDATE {table}')
     #

Diff for: sqlx/sql/mixin/returning.py renamed to sqls/sql/mixin/returning.py

@@ -40,6 +40,6 @@ def count(
         elif table := getattr(table, '__table__', None):
             ...
         else:
-            raise NotImplementedError('No matching @overload found for `sqlx.update(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.update(...)`')
 
         return CountQuery(pool=self.pool, query=f'SELECT COUNT(*) AS `total` FROM `{table}`')

Diff for: sqlx/sql/mixin/values.py renamed to sqls/sql/mixin/values.py

@@ -40,6 +40,6 @@ def update(
         elif table := getattr(table, '__table__', None):
             ...
         else:
-            raise NotImplementedError('No matching @overload found for `sqlx.update(...)`')
+            raise NotImplementedError('No matching @overload found for `sqls.update(...)`')
 
         return UpdateQuery(pool=self.pool, query=f'UPDATE `{table}`')

Diff for: sqlx/sql/mixin/where.py renamed to sqls/sql/mixin/where.py

@@ -1,6 +1,6 @@
 from typing import Any, Iterable
 
-from sqlx.core.result import Result
+from sqls.core.result import Result
 
 from .count import CountVendor
 from .insert import InsertVendor
@@ -20,7 +20,7 @@ class SQLVendor(
 ):
     def __call__(self, query: str, args: Iterable[Any] = ()) -> Result:
         """
-        >>> sqlx('SELECT * FROM `table` WHERE id = %s;', (1, ))
+        >>> sqls('SELECT * FROM `table` WHERE id = %s;', (1, ))
         :param query:
         :param args:
         :return:

Diff for: sqlx/sql/queries/__init__.py renamed to sqls/sql/queries/__init__.py

@@ -2,17 +2,17 @@
 import pytest_asyncio as aiopytest
 from pydantic import Field
 
-from sqlx import SQLX, Schema
+from sqls import SQLS, Schema
 
 
 @aiopytest.fixture(scope='session')
-async def sqlx():
-    _sqlx = SQLX(
+async def sqls():
+    _sqls = SQLS(
         db='test',
         user='root',
         password='password',
     )
-    async with _sqlx as _cnn:
+    async with _sqls as _cnn:
         await _cnn('''
             CREATE TABLE IF NOT EXISTS `user` (
               `id` int(11) PRIMARY KEY AUTO_INCREMENT,
@@ -21,7 +21,7 @@ async def sqlx():
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
         ''').execute()
 
-    yield _sqlx
+    yield _sqls
 
 
 class User(Schema):

Diff for: sqlx/sql/queries/count.py renamed to sqls/sql/queries/count.py

@@ -1,12 +1,12 @@
 import pytest
 
-from sqlx import SQLX
+from sqls import SQLS
 from .conftest import User
 
 
 @pytest.mark.asyncio(scope='session')
-async def test_batch_direct(sqlx: SQLX) -> None:
-    async with sqlx as cnn:
+async def test_batch_direct(sqls: SQLS) -> None:
+    async with sqls as cnn:
         users = await cnn(
             'INSERT INTO `user` (username, password) VALUES (%s, %s)',
             ('username', 'password'),
@@ -20,8 +20,8 @@ async def test_batch_direct(sqlx: SQLX) -> None:
 
 
 @pytest.mark.asyncio(scope='session')
-async def test_batch_indirect(sqlx: SQLX) -> None:
-    async with sqlx as cnn:
+async def test_batch_indirect(sqls: SQLS) -> None:
+    async with sqls as cnn:
         users = await cnn.insert(User).values(username='u', password='p')
         print(users)
         users = await cnn.insert(User).values(username='u', password='p')