Merge pull request #14 from bdowning/safe-array-insert

Make array_safe insert/upsert work with empty rows

Author: bdowning

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0-alpha-3
+current_version = 0.4.0-alpha-4
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?
 serialize = 
 	{major}.{minor}.{patch}-{release}-{build}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sql-athame"
-version = "0.4.0-alpha-3"
+version = "0.4.0-alpha-4"
 description = "Python tool for slicing and dicing SQL"
 authors = ["Brian Downing <bdowning@lavos.net>"]
 license = "MIT"

sql_athame/dataclasses.py

@@ -440,6 +440,7 @@ async def insert_multiple_unnest(
     async def insert_multiple_array_safe(
         cls: Type[T], connection_or_pool: Union[Connection, Pool], rows: Iterable[T]
     ) -> str:
+        last = ""
         for chunk in chunked(rows, 100):
             last = await connection_or_pool.execute(
                 *cls.insert_multiple_array_safe_sql(chunk)
@@ -467,6 +468,7 @@ async def upsert_multiple_unnest(
     async def upsert_multiple_array_safe(
         cls: Type[T], connection_or_pool: Union[Connection, Pool], rows: Iterable[T]
     ) -> str:
+        last = ""
         for chunk in chunked(rows, 100):
             last = await connection_or_pool.execute(
                 *cls.upsert_sql(cls.insert_multiple_array_safe_sql(chunk))

tests/test_asyncpg.py

@@ -55,6 +55,8 @@ class Test(ModelBase, table_name="test", primary_key="id"):
         b: str
 
     await conn.execute(*Test.create_table_sql())
+    await Test.insert_multiple(conn, [])
+    await Test.upsert_multiple(conn, [])
 
     data = [
         Test(1, 1, "foo"),
@@ -106,13 +108,15 @@ class Test(
         b: str
 
     await conn.execute(*Test.create_table_sql())
+    await Test.insert_multiple(conn, [])
+    await Test.upsert_multiple(conn, [])
 
     data = [
         Test(1, [1], "foo"),
         Test(2, [1, 3, 5], "bar"),
         Test(3, [], "quux"),
     ]
-    await Test.insert_multiple(conn, data)
+    await Test.insert_multiple(conn, dict(enumerate(data)).values())
 
     c, u, d = await Test.replace_multiple(conn, [], where=[])
     assert not c and not u