sql-athame 0.4.0a9__py3-none-any.whl → 0.4.0a11__py3-none-any.whl

sql_athame/__init__.py

@@ -1,2 +1,2 @@
 from .base import Fragment, sql
-from .dataclasses import ColumnInfo, ModelBase
+from .dataclasses import ColumnInfo, ModelBase, ReplaceMultiplePlan

sql_athame/dataclasses.py

@@ -8,6 +8,7 @@ from typing import (
     Annotated,
     Any,
     Callable,
+    Generic,
     Optional,
     TypeVar,
     Union,
@@ -156,7 +157,7 @@ class ModelBase:
     _cache: dict[tuple, Any]
     table_name: str
     primary_key_names: tuple[str, ...]
-    array_safe_insert: bool
+    insert_multiple_mode: str
 
     def __init_subclass__(
         cls,
@@ -168,12 +169,9 @@ class ModelBase:
     ):
         cls._cache = {}
         cls.table_name = table_name
-        if insert_multiple_mode == "array_safe":
-            cls.array_safe_insert = True
-        elif insert_multiple_mode == "unnest":
-            cls.array_safe_insert = False
-        else:
+        if insert_multiple_mode not in ("array_safe", "unnest", "executemany"):
             raise ValueError("Unknown `insert_multiple_mode`")
+        cls.insert_multiple_mode = insert_multiple_mode
         if isinstance(primary_key, str):
             cls.primary_key_names = (primary_key,)
         else:
@@ -251,7 +249,7 @@ class ModelBase:
             if ci.field.name not in exclude:
                 if ci.serialize:
                     env[f"_ser_{ci.field.name}"] = ci.serialize
-                    func.append(f"_ser_{ci.field.name}(self.{ci.field.name}), ")
+                    func.append(f"_ser_{ci.field.name}(self.{ci.field.name}),")
                 else:
                     func.append(f"self.{ci.field.name},")
         func += ["]"]
@@ -356,7 +354,17 @@ class ModelBase:
         return query
 
     @classmethod
-    async def select_cursor(
+    async def cursor_from(
+        cls: type[T],
+        connection: Connection,
+        query: Fragment,
+        prefetch: int = 1000,
+    ) -> AsyncGenerator[T, None]:
+        async for row in connection.cursor(*query, prefetch=prefetch):
+            yield cls.from_mapping(row)
+
+    @classmethod
+    def select_cursor(
         cls: type[T],
         connection: Connection,
         order_by: Union[FieldNames, str] = (),
@@ -364,11 +372,19 @@ class ModelBase:
         where: Where = (),
         prefetch: int = 1000,
     ) -> AsyncGenerator[T, None]:
-        async for row in connection.cursor(
-            *cls.select_sql(order_by=order_by, for_update=for_update, where=where),
+        return cls.cursor_from(
+            connection,
+            cls.select_sql(order_by=order_by, for_update=for_update, where=where),
             prefetch=prefetch,
-        ):
-            yield cls.from_mapping(row)
+        )
+
+    @classmethod
+    async def fetch_from(
+        cls: type[T],
+        connection_or_pool: Union[Connection, Pool],
+        query: Fragment,
+    ) -> list[T]:
+        return [cls.from_mapping(row) for row in await connection_or_pool.fetch(*query)]
 
     @classmethod
     async def select(
@@ -378,12 +394,10 @@ class ModelBase:
         for_update: bool = False,
         where: Where = (),
     ) -> list[T]:
-        return [
-            cls.from_mapping(row)
-            for row in await connection_or_pool.fetch(
-                *cls.select_sql(order_by=order_by, for_update=for_update, where=where)
-            )
-        ]
+        return await cls.fetch_from(
+            connection_or_pool,
+            cls.select_sql(order_by=order_by, for_update=for_update, where=where),
+        )
 
     @classmethod
     def create_sql(cls: type[T], **kwargs: Any) -> Fragment:
@@ -505,6 +519,37 @@ class ModelBase:
             ),
         )
 
+    @classmethod
+    def insert_multiple_executemany_chunk_sql(
+        cls: type[T], chunk_size: int
+    ) -> Fragment:
+        def generate() -> Fragment:
+            columns = len(cls.column_info())
+            values = ", ".join(
+                f"({', '.join(f'${i}' for i in chunk)})"
+                for chunk in chunked(range(1, columns * chunk_size + 1), columns)
+            )
+            return sql(
+                "INSERT INTO {table} ({fields}) VALUES {values}",
+                table=cls.table_name_sql(),
+                fields=sql.list(cls.field_names_sql()),
+                values=sql.literal(values),
+            ).flatten()
+
+        return cls._cached(
+            ("insert_multiple_executemany_chunk", chunk_size),
+            generate,
+        )
+
+    @classmethod
+    async def insert_multiple_executemany(
+        cls: type[T], connection_or_pool: Union[Connection, Pool], rows: Iterable[T]
+    ) -> None:
+        args = [r.field_values() for r in rows]
+        query = cls.insert_multiple_executemany_chunk_sql(1).query()[0]
+        if args:
+            await connection_or_pool.executemany(query, args)
+
     @classmethod
     async def insert_multiple_unnest(
         cls: type[T], connection_or_pool: Union[Connection, Pool], rows: Iterable[T]
@@ -526,11 +571,28 @@ class ModelBase:
     async def insert_multiple(
         cls: type[T], connection_or_pool: Union[Connection, Pool], rows: Iterable[T]
     ) -> str:
-        if cls.array_safe_insert:
+        if cls.insert_multiple_mode == "executemany":
+            await cls.insert_multiple_executemany(connection_or_pool, rows)
+            return "INSERT"
+        elif cls.insert_multiple_mode == "array_safe":
             return await cls.insert_multiple_array_safe(connection_or_pool, rows)
         else:
             return await cls.insert_multiple_unnest(connection_or_pool, rows)
 
+    @classmethod
+    async def upsert_multiple_executemany(
+        cls: type[T],
+        connection_or_pool: Union[Connection, Pool],
+        rows: Iterable[T],
+        insert_only: FieldNamesSet = (),
+    ) -> None:
+        args = [r.field_values() for r in rows]
+        query = cls.upsert_sql(
+            cls.insert_multiple_executemany_chunk_sql(1), exclude=insert_only
+        ).query()[0]
+        if args:
+            await connection_or_pool.executemany(query, args)
+
     @classmethod
     async def upsert_multiple_unnest(
         cls: type[T],
@@ -565,7 +627,12 @@ class ModelBase:
         rows: Iterable[T],
         insert_only: FieldNamesSet = (),
     ) -> str:
-        if cls.array_safe_insert:
+        if cls.insert_multiple_mode == "executemany":
+            await cls.upsert_multiple_executemany(
+                connection_or_pool, rows, insert_only=insert_only
+            )
+            return "INSERT"
+        elif cls.insert_multiple_mode == "array_safe":
             return await cls.upsert_multiple_array_safe(
                 connection_or_pool, rows, insert_only=insert_only
             )
@@ -588,7 +655,7 @@ class ModelBase:
         return env["equal_ignoring"]
 
     @classmethod
-    async def replace_multiple(
+    async def plan_replace_multiple(
         cls: type[T],
         connection: Connection,
         rows: Union[Iterable[T], Iterable[Mapping[str, Any]]],
@@ -596,7 +663,7 @@ class ModelBase:
         where: Where,
         ignore: FieldNamesSet = (),
         insert_only: FieldNamesSet = (),
-    ) -> tuple[list[T], list[T], list[T]]:
+    ) -> "ReplaceMultiplePlan[T]":
         ignore = sorted(set(ignore) | set(insert_only))
         equal_ignoring = cls._cached(
             ("equal_ignoring", tuple(ignore)),
@@ -620,14 +687,23 @@ class ModelBase:
 
         created = list(pending.values())
 
-        if created or updated:
-            await cls.upsert_multiple(
-                connection, (*created, *updated), insert_only=insert_only
-            )
-        if deleted:
-            await cls.delete_multiple(connection, deleted)
+        return ReplaceMultiplePlan(cls, insert_only, created, updated, deleted)
 
-        return created, updated, deleted
+    @classmethod
+    async def replace_multiple(
+        cls: type[T],
+        connection: Connection,
+        rows: Union[Iterable[T], Iterable[Mapping[str, Any]]],
+        *,
+        where: Where,
+        ignore: FieldNamesSet = (),
+        insert_only: FieldNamesSet = (),
+    ) -> tuple[list[T], list[T], list[T]]:
+        plan = await cls.plan_replace_multiple(
+            connection, rows, where=where, ignore=ignore, insert_only=insert_only
+        )
+        await plan.execute(connection)
+        return plan.cud
 
     @classmethod
     def _get_differences_ignoring_fn(
@@ -694,6 +770,33 @@ class ModelBase:
         return created, updated_triples, deleted
 
 
+@dataclass
+class ReplaceMultiplePlan(Generic[T]):
+    model_class: type[T]
+    insert_only: FieldNamesSet
+    created: list[T]
+    updated: list[T]
+    deleted: list[T]
+
+    @property
+    def cud(self) -> tuple[list[T], list[T], list[T]]:
+        return (self.created, self.updated, self.deleted)
+
+    async def execute_upserts(self, connection: Connection) -> None:
+        if self.created or self.updated:
+            await self.model_class.upsert_multiple(
+                connection, (*self.created, *self.updated), insert_only=self.insert_only
+            )
+
+    async def execute_deletes(self, connection: Connection) -> None:
+        if self.deleted:
+            await self.model_class.delete_multiple(connection, self.deleted)
+
+    async def execute(self, connection: Connection) -> None:
+        await self.execute_upserts(connection)
+        await self.execute_deletes(connection)
+
+
 def chunked(lst, n):
     if type(lst) is not list:
         lst = list(lst)

{sql_athame-0.4.0a9.dist-info → sql_athame-0.4.0a11.dist-info}/METADATA

@@ -1,22 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sql-athame
-Version: 0.4.0a9
+Version: 0.4.0a11
 Summary: Python tool for slicing and dicing SQL
-Home-page: https://github.com/bdowning/sql-athame
+Project-URL: homepage, https://github.com/bdowning/sql-athame
+Project-URL: repository, https://github.com/bdowning/sql-athame
+Author-email: Brian Downing <bdowning@lavos.net>
 License: MIT
-Author: Brian Downing
-Author-email: bdowning@lavos.net
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: asyncpg
-Requires-Dist: asyncpg ; extra == "asyncpg"
+License-File: LICENSE
+Requires-Python: <4.0,>=3.9
 Requires-Dist: typing-extensions
-Project-URL: Repository, https://github.com/bdowning/sql-athame
+Provides-Extra: asyncpg
+Requires-Dist: asyncpg; extra == 'asyncpg'
 Description-Content-Type: text/markdown
 
 # sql-athame
@@ -405,4 +399,3 @@ MIT.
 
 ---
 Copyright (c) 2019, 2020 Brian Downing
-

sql_athame-0.4.0a11.dist-info/RECORD

@@ -0,0 +1,11 @@
+sql_athame/__init__.py,sha256=0GA9-xfnZ_gw7Vysx6t4iInQ2kGXos1EYwBI6Eb7auU,100
+sql_athame/base.py,sha256=FR7EmC0VkX1VRgvAutSEfYSWhlEYpoqS1Kqxp1jHp6Y,10293
+sql_athame/dataclasses.py,sha256=0XjLXpSBgdtWqJkTdaluLs8_RXPlfJp5ERKGOe-bXBM,27442
+sql_athame/escape.py,sha256=kK101xXeFitlvuG-L_hvhdpgGJCtmRTprsn1yEfZKws,758
+sql_athame/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sql_athame/sqlalchemy.py,sha256=aWopfPh3j71XwKmcN_VcHRNlhscI0Sckd4AiyGf8Tpw,1293
+sql_athame/types.py,sha256=FQ06l9Uc-vo57UrAarvnukILdV2gN1IaYUnHJ_bNYic,475
+sql_athame-0.4.0a11.dist-info/METADATA,sha256=DXasc1ZenA7rqqTPu0G0Y1dfFEGmzngZGhAnUxGJAcs,12570
+sql_athame-0.4.0a11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sql_athame-0.4.0a11.dist-info/licenses/LICENSE,sha256=xqV29vPFqITcKifYrGPgVIBjq4fdmLSwY3gRUtDKafg,1076
+sql_athame-0.4.0a11.dist-info/RECORD,,

{sql_athame-0.4.0a9.dist-info → sql_athame-0.4.0a11.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

sql_athame-0.4.0a9.dist-info/RECORD

@@ -1,11 +0,0 @@
-sql_athame/__init__.py,sha256=7OBIMZOcrD2pvfIL-rjD1IGZ3TNQbwyu76a9PWk-yYg,79
-sql_athame/base.py,sha256=FR7EmC0VkX1VRgvAutSEfYSWhlEYpoqS1Kqxp1jHp6Y,10293
-sql_athame/dataclasses.py,sha256=9Q-Z3itKyuqhR5u47bVBfA714uFbf-K4t1FPiFd8XAE,23792
-sql_athame/escape.py,sha256=kK101xXeFitlvuG-L_hvhdpgGJCtmRTprsn1yEfZKws,758
-sql_athame/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sql_athame/sqlalchemy.py,sha256=aWopfPh3j71XwKmcN_VcHRNlhscI0Sckd4AiyGf8Tpw,1293
-sql_athame/types.py,sha256=FQ06l9Uc-vo57UrAarvnukILdV2gN1IaYUnHJ_bNYic,475
-sql_athame-0.4.0a9.dist-info/LICENSE,sha256=xqV29vPFqITcKifYrGPgVIBjq4fdmLSwY3gRUtDKafg,1076
-sql_athame-0.4.0a9.dist-info/METADATA,sha256=pf4xAdRJ7NuJaViLLWsQeq8LRIA78tY_YdOmPBjpFgg,12845
-sql_athame-0.4.0a9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-sql_athame-0.4.0a9.dist-info/RECORD,,