From 1489010681f94544c77de20ee3e60ddbe5c8a9dd Mon Sep 17 00:00:00 2001 From: Adam Stus Date: Fri, 8 Mar 2024 15:40:22 +0100 Subject: [PATCH] Moved test fixes to test_suite_20 --- tests/sqlalchemy_test_suite/test_suite.py | 18 --------------- tests/sqlalchemy_test_suite/test_suite_20.py | 23 ++++++++++++++++---- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/tests/sqlalchemy_test_suite/test_suite.py b/tests/sqlalchemy_test_suite/test_suite.py index ce5e377f..643d1559 100644 --- a/tests/sqlalchemy_test_suite/test_suite.py +++ b/tests/sqlalchemy_test_suite/test_suite.py @@ -6,9 +6,6 @@ from sqlalchemy.schema import Column, Sequence, Table from sqlalchemy.testing import config from sqlalchemy.testing.assertions import eq_ -from sqlalchemy.testing.suite import ( - BizarroCharacterFKResolutionTest as _BizarroCharacterFKResolutionTest, -) from sqlalchemy.testing.suite import ( CompositeKeyReflectionTest as _CompositeKeyReflectionTest, ) @@ -156,18 +153,3 @@ def test_fk_column_order(self): def test_pk_column_order(self): # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion. super().test_pk_column_order() - - -class BizarroCharacterFKResolutionTest(_BizarroCharacterFKResolutionTest): - @testing.combinations( - ("id",), ("(3)",), ("col%p",), ("[brack]",), argnames="columnname" - ) - @testing.variation("use_composite", [True, False]) - @testing.combinations( - ("plain",), - ("(2)",), - ("[brackets]",), - argnames="tablename", - ) - def test_fk_ref(self, connection, metadata, use_composite, tablename, columnname): - super().test_fk_ref(connection, metadata, use_composite, tablename, columnname) diff --git a/tests/sqlalchemy_test_suite/test_suite_20.py b/tests/sqlalchemy_test_suite/test_suite_20.py index 83f3a0d4..32bdf572 100644 --- a/tests/sqlalchemy_test_suite/test_suite_20.py +++ b/tests/sqlalchemy_test_suite/test_suite_20.py @@ -75,6 +75,10 @@ def test_empty_insert(self, connection): def test_empty_insert_multiple(self, connection): pass + @pytest.mark.skip("Snowflake does not support returning in insert.") + def test_no_results_for_non_returning_insert(self, connection, style, executemany): + pass + # road to 2.0 class TrueDivTest(_TrueDivTest): @@ -91,10 +95,6 @@ class DateTimeHistoricTest(_DateTimeHistoricTest): ... -class BizarroCharacterFKResolutionTest(_BizarroCharacterFKResolutionTest): - ... - - # 2. Patched Tests @@ -174,3 +174,18 @@ def test_fk_column_order(self): def test_pk_column_order(self): # Check https://snowflakecomputing.atlassian.net/browse/SNOW-640134 for details on breaking changes discussion. super().test_pk_column_order() + + +class BizarroCharacterFKResolutionTest(_BizarroCharacterFKResolutionTest): + @testing.combinations( + ("id",), ("(3)",), ("col%p",), ("[brack]",), argnames="columnname" + ) + @testing.variation("use_composite", [True, False]) + @testing.combinations( + ("plain",), + ("(2)",), + ("[brackets]",), + argnames="tablename", + ) + def test_fk_ref(self, connection, metadata, use_composite, tablename, columnname): + super().test_fk_ref(connection, metadata, use_composite, tablename, columnname)