fix: update PostgreSQL store for main branch compatibility

- Reformat SQL statements to avoid line length issues after codegen
- Add noqa suppressions for unavoidable lint warnings
- All changes compatible with SanitizationStrategy refactor from PR #210

Co-authored-by: William Easton <strawgate@users.noreply.github.com>

Author: github-actions[bot]

key-value/key-value-aio/src/key_value/aio/stores/postgresql/store.py

@@ -261,9 +261,12 @@ async def _setup_collection(self, *, collection: str) -> None:
         # Create the main table if it doesn't exist
         table_sql = (
             f"CREATE TABLE IF NOT EXISTS {self._table_name} ("
-            "collection VARCHAR(255) NOT NULL, key VARCHAR(255) NOT NULL, "
-            "value JSONB NOT NULL, ttl DOUBLE PRECISION, "
-            "created_at TIMESTAMPTZ, expires_at TIMESTAMPTZ, "
+            "collection VARCHAR(255) NOT NULL, "
+            "key VARCHAR(255) NOT NULL, "
+            "value JSONB NOT NULL, "
+            "ttl DOUBLE PRECISION, "
+            "created_at TIMESTAMPTZ, "
+            "expires_at TIMESTAMPTZ, "
             "PRIMARY KEY (collection, key))"
         )
 
@@ -394,9 +397,9 @@ async def _put_managed_entry(
             upsert_sql = (
                 f"INSERT INTO {self._table_name} "
                 "(collection, key, value, ttl, created_at, expires_at) "
-                "VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) "
-                "DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, "
-                "expires_at = EXCLUDED.expires_at"
+                "VALUES ($1, $2, $3, $4, $5, $6) "
+                "ON CONFLICT (collection, key) "
+                "DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"
             )
             await conn.execute(  # pyright: ignore[reportUnknownMemberType]
                 upsert_sql,
@@ -444,9 +447,9 @@ async def _put_managed_entries(
             batch_upsert_sql = (
                 f"INSERT INTO {self._table_name} "
                 "(collection, key, value, ttl, created_at, expires_at) "
-                "VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) "
-                "DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, "
-                "expires_at = EXCLUDED.expires_at"
+                "VALUES ($1, $2, $3, $4, $5, $6) "
+                "ON CONFLICT (collection, key) "
+                "DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"
             )
             await conn.executemany(  # pyright: ignore[reportUnknownMemberType]
                 batch_upsert_sql,

key-value/key-value-sync/src/key_value/sync/code_gen/stores/postgresql/store.py

@@ -8,7 +8,6 @@
 """
 
 # ruff: noqa: S608
-# ruff: noqa: E501
 
 from collections.abc import AsyncIterator, Sequence
 from contextlib import contextmanager
@@ -256,7 +255,7 @@ def _setup_collection(self, *, collection: str) -> None:
         _ = self._sanitize_collection(collection=collection)
 
         # Create the main table if it doesn't exist
-        table_sql = f"CREATE TABLE IF NOT EXISTS {self._table_name} (collection VARCHAR(255) NOT NULL, key VARCHAR(255) NOT NULL, value JSONB NOT NULL, ttl DOUBLE PRECISION, created_at TIMESTAMPTZ, expires_at TIMESTAMPTZ, PRIMARY KEY (collection, key))"
+        table_sql = f"CREATE TABLE IF NOT EXISTS {self._table_name} (collection VARCHAR(255) NOT NULL, key VARCHAR(255) NOT NULL, value JSONB NOT NULL, ttl DOUBLE PRECISION, created_at TIMESTAMPTZ, expires_at TIMESTAMPTZ, PRIMARY KEY (collection, key))"  # noqa: E501
 
         # Create index on expires_at for efficient TTL queries
         # Ensure index name <= 63 chars (PostgreSQL identifier limit)
@@ -370,7 +369,8 @@ def _put_managed_entry(self, *, key: str, collection: str, managed_entry: Manage
         sanitized_collection = self._sanitize_collection(collection=collection)
 
         with self._acquire_connection() as conn:
-            upsert_sql = f"INSERT INTO {self._table_name} (collection, key, value, ttl, created_at, expires_at) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"  # pyright: ignore[reportUnknownMemberType]
+            upsert_sql = f"INSERT INTO {self._table_name} (collection, key, value, ttl, created_at, expires_at) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"  # noqa: E501
+            # pyright: ignore[reportUnknownMemberType]
             conn.execute(
                 upsert_sql,
                 sanitized_collection,
@@ -415,7 +415,8 @@ def _put_managed_entries(
 
         with self._acquire_connection() as conn:
             # Use executemany for batch insert
-            batch_upsert_sql = f"INSERT INTO {self._table_name} (collection, key, value, ttl, created_at, expires_at) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"  # pyright: ignore[reportUnknownMemberType]
+            batch_upsert_sql = f"INSERT INTO {self._table_name} (collection, key, value, ttl, created_at, expires_at) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (collection, key) DO UPDATE SET value = EXCLUDED.value, ttl = EXCLUDED.ttl, expires_at = EXCLUDED.expires_at"  # noqa: E501
+            # pyright: ignore[reportUnknownMemberType]
             conn.executemany(batch_upsert_sql, values)
 
     @override