Merge branch 'main' into edgarrmondragon/refactor/stop-testing-sqlalc…

…hemy-1
meltano · Oct 22, 2024 · 2e1472b · 2e1472b
2 parents f9a997d + 9004c41
commit 2e1472b
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 10 deletions.
diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -1,5 +1,5 @@
-griffe~=1.4
+griffe~=1.5
 pip==24.2
-poetry==1.8.3
+poetry==1.8.4
 pre-commit==4.0.1
 nox==2024.10.9
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,7 +44,7 @@ repos:
   - id: check-readthedocs
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.6.9
+  rev: v0.7.0
   hooks:
   - id: ruff
     args: [--fix, --exit-non-zero-on-fix, --show-fixes]

diff --git a/singer_sdk/connectors/sql.py b/singer_sdk/connectors/sql.py
@@ -982,6 +982,28 @@ def prepare_table(
                 self.to_sql_type(property_def),
             )
 
+        self.prepare_primary_key(
+            full_table_name=full_table_name,
+            primary_keys=primary_keys,
+        )
+
+    def prepare_primary_key(
+        self,
+        *,
+        full_table_name: str | FullyQualifiedName,  # noqa: ARG002
+        primary_keys: t.Sequence[str],  # noqa: ARG002
+    ) -> None:
+        """Adapt target table primary key to provided schema if possible.
+
+        Implement this method in a subclass to adapt the primary key of the target table
+        to the provided one if possible.
+
+        Args:
+            full_table_name: the target table name.
+            primary_keys: list of key properties.
+        """
+        self.logger.debug("Primary key adaptation is not implemented")
+
     def prepare_column(
         self,
         full_table_name: str | FullyQualifiedName,

diff --git a/singer_sdk/sinks/sql.py b/singer_sdk/sinks/sql.py
@@ -292,7 +292,7 @@ def generate_insert_statement(
             INSERT INTO {full_table_name}
             ({", ".join(column_identifiers)})
             VALUES ({", ".join([f":{name}" for name in property_names])})
-            """,  # noqa: S608
+            """,
         )
         return statement.rstrip()
 

diff --git a/singer_sdk/testing/suites.py b/singer_sdk/testing/suites.py
@@ -36,6 +36,7 @@
     TargetInvalidSchemaTest,
     TargetNoPrimaryKeys,
     TargetOptionalAttributes,
+    TargetPrimaryKeyUpdates,
     TargetRecordBeforeSchemaTest,
     TargetRecordMissingKeyProperty,
     TargetRecordMissingOptionalFields,
@@ -104,6 +105,7 @@ class TestSuite(t.Generic[T]):
         # TargetMultipleStateMessages,
         TargetNoPrimaryKeys,
         TargetOptionalAttributes,
+        TargetPrimaryKeyUpdates,
         TargetRecordBeforeSchemaTest,
         TargetRecordMissingKeyProperty,
         TargetRecordMissingOptionalFields,

diff --git a/singer_sdk/testing/target_test_streams/pk_updates.singer b/singer_sdk/testing/target_test_streams/pk_updates.singer
@@ -0,0 +1,4 @@
+{"type": "SCHEMA", "stream": "example_stream", "schema": {"properties": {"id": {"type": "integer"}, "name": {"type": "string"}, "email": {"type": "string"}}, "key_properties": ["id"]}}
+{"type": "RECORD", "stream": "example_stream", "record": {"id": 1, "name": "Alice", "email": "[email protected]"}}
+{"type": "SCHEMA", "stream": "example_stream", "schema": {"properties": {"id": {"type": "integer"}, "name": {"type": "string"}, "email": {"type": "string"}}, "key_properties": ["email"]}}
+{"type": "RECORD", "stream": "example_stream", "record": {"id": 2, "name": "Bob", "email": "[email protected]"}}
diff --git a/singer_sdk/testing/target_tests.py b/singer_sdk/testing/target_tests.py
@@ -135,6 +135,12 @@ class TargetSchemaUpdates(TargetFileTestTemplate):
     name = "schema_updates"
 
 
+class TargetPrimaryKeyUpdates(TargetFileTestTemplate):
+    """Test Target handles Primary Key updates."""
+
+    name = "pk_updates"
+
+
 class TargetSpecialCharsInAttributes(TargetFileTestTemplate):
     """Test Target handles special chars in attributes."""
 

diff --git a/tests/core/test_connector_sql.py b/tests/core/test_connector_sql.py
@@ -321,9 +321,7 @@ def test_column_rename(self, connector: DuckDBConnector):
         connector.rename_column("test_table", "old_name", "new_name")
 
         with engine.connect() as conn:
-            result = conn.execute(
-                sa.text("SELECT * FROM test_table"),
-            )
+            result = conn.execute(sa.text("SELECT * FROM test_table"))
             assert result.keys() == ["id", "new_name"]
 
     def test_adapt_column_type(self, connector: DuckDBConnector):
@@ -341,9 +339,7 @@ def test_adapt_column_type(self, connector: DuckDBConnector):
         connector._adapt_column_type("test_table", "name", sa.types.String())
 
         with engine.connect() as conn:
-            result = conn.execute(
-                sa.text("SELECT * FROM test_table"),
-            )
+            result = conn.execute(sa.text("SELECT * FROM test_table"))
             assert result.keys() == ["id", "name"]
             assert result.cursor.description[1][1] == "STRING"