diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/engine/test_deprecations.py | 1 | ||||
| -rw-r--r-- | test/orm/inheritance/test_basic.py | 3 | ||||
| -rw-r--r-- | test/requirements.py | 5 | ||||
| -rw-r--r-- | test/sql/test_defaults.py | 26 | ||||
| -rw-r--r-- | test/sql/test_insert.py | 12 |
5 files changed, 24 insertions, 23 deletions
diff --git a/test/engine/test_deprecations.py b/test/engine/test_deprecations.py index a08725921..fce9946dd 100644 --- a/test/engine/test_deprecations.py +++ b/test/engine/test_deprecations.py @@ -1589,6 +1589,7 @@ class DeprecatedExecParamsTest(fixtures.TablesTest): [(5, "some name"), (6, "some other name")], ) + @testing.requires.empty_inserts def test_single_scalar(self, connection): users = self.tables.users_autoinc diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py index 8769d2b39..1b4a367ac 100644 --- a/test/orm/inheritance/test_basic.py +++ b/test/orm/inheritance/test_basic.py @@ -1835,7 +1835,8 @@ class JoinedNoFKSortingTest(fixtures.MappedTest): testing.db, sess.flush, Conditional( - testing.db.dialect.insert_executemany_returning, + testing.db.dialect.insert_executemany_returning + and testing.db.dialect.supports_default_metavalue, [ CompiledSQL( "INSERT INTO a (id) VALUES (DEFAULT)", [{}, {}, {}, {}] diff --git a/test/requirements.py b/test/requirements.py index eca9e0518..29dd55b45 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -847,6 +847,11 @@ class DefaultRequirements(SuiteRequirements): ) @property + def empty_inserts_executemany(self): + # waiting on https://jira.mariadb.org/browse/CONPY-152 + return skip_if(["mariadb+mariadbconnector"]) + self.empty_inserts + + @property def expressions_against_unbounded_text(self): """target database supports use of an unbounded textual field in a WHERE clause.""" diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py index 543ae1f98..007dc157b 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -2,7 +2,6 @@ import datetime import itertools import sqlalchemy as sa -from sqlalchemy import Boolean from sqlalchemy import cast from sqlalchemy import DateTime from sqlalchemy import exc @@ -1062,25 +1061,6 @@ class PKIncrementTest(fixtures.TablesTest): ) -class EmptyInsertTest(fixtures.TestBase): - __backend__ = True - - @testing.fails_on("oracle", "FIXME: unknown") - def test_empty_insert(self, metadata, connection): - t1 = Table( - "t1", - metadata, - Column("is_true", Boolean, server_default=("1")), - ) - metadata.create_all(connection) - connection.execute(t1.insert()) - eq_( - 1, - connection.scalar(select(func.count(text("*"))).select_from(t1)), - ) - eq_(True, connection.scalar(t1.select())) - - class AutoIncrementTest(fixtures.TestBase): __backend__ = True @@ -1088,7 +1068,11 @@ class AutoIncrementTest(fixtures.TestBase): @testing.requires.empty_inserts def test_autoincrement_single_col(self, metadata, connection): single = Table( - "single", self.metadata, Column("id", Integer, primary_key=True) + "single", + self.metadata, + Column( + "id", Integer, primary_key=True, test_needs_autoincrement=True + ), ) self.metadata.create_all(connection) diff --git a/test/sql/test_insert.py b/test/sql/test_insert.py index a128db8a9..95a8d02a2 100644 --- a/test/sql/test_insert.py +++ b/test/sql/test_insert.py @@ -951,7 +951,9 @@ class EmptyTest(_InsertTestBase, fixtures.TablesTest, AssertsCompiledSQL): table1 = self.tables.mytable dialect = default.DefaultDialect() - dialect.supports_empty_insert = dialect.supports_default_values = True + dialect.supports_empty_insert = False + dialect.supports_default_values = True + dialect.supports_default_metavalue = True stmt = table1.insert().values({}) self.assert_compile( @@ -961,6 +963,14 @@ class EmptyTest(_InsertTestBase, fixtures.TablesTest, AssertsCompiledSQL): for_executemany=True, ) + dialect.supports_default_metavalue = False + self.assert_compile( + stmt, + "INSERT INTO mytable DEFAULT VALUES", + dialect=dialect, + for_executemany=True, + ) + def test_supports_empty_insert_false(self): table1 = self.tables.mytable |