diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-04 11:28:20 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-04 11:29:06 -0400 |
| commit | 9034fc2b4820f95dd5ed473765c4079073982335 (patch) | |
| tree | 2f1b6518541f6f112855cb13dde67044cadc3a13 | |
| parent | 2d24d9c4f145088daadfc1e364a825b25f520047 (diff) | |
| download | sqlalchemy-9034fc2b4820f95dd5ed473765c4079073982335.tar.gz | |
- fix one test for STRICT, which may be turned on by default
in mariadb 10.2. more mariadb fixes coming
Change-Id: I6e3a94ae7340772663677b1082506adbb2d84a38
(cherry picked from commit 54cdda032ea59789be15972ed0529f71fd4f0214)
| -rw-r--r-- | test/orm/test_relationships.py | 3 | ||||
| -rw-r--r-- | test/requirements.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py index 52debbe3a..d2af2b1a7 100644 --- a/test/orm/test_relationships.py +++ b/test/orm/test_relationships.py @@ -1083,7 +1083,8 @@ class FKsAsPksTest(fixtures.MappedTest): "Dependency rule tried to blank-out " "primary key column 'tableB.id' on instance ") - @testing.fails_on_everything_except('sqlite', 'mysql') + @testing.fails_on_everything_except( + 'sqlite', testing.requires.mysql_non_strict) def test_nullPKsOK_BtoA(self): A, tableA = self.classes.A, self.tables.tableA diff --git a/test/requirements.py b/test/requirements.py index b1f965029..fc9a50381 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -908,7 +908,7 @@ class DefaultRequirements(SuiteRequirements): def mysql_non_strict(self): def check(config): row = config.db.execute("show variables like 'sql_mode'").first() - return not row or "STRICT" not in row[1] + return not row or "STRICT_TRANS_TABLES" not in row[1] return only_if(check) |