]> git.ipfire.org Git - thirdparty/sqlalchemy/alembic.git/commitdiff
- SQlite supports reflection of ON UPDATE / ON DELETE in SQLA 1.1
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 3 Jun 2016 19:10:01 +0000 (15:10 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 3 Jun 2016 19:10:01 +0000 (15:10 -0400)
- this reflection retains the original case

alembic/testing/exclusions.py
tests/requirements.py
tests/test_autogen_fks.py

index 85b8c7cead7b0c9a6924fd269c6144ec7ba1b6b4..31aead2e7ce7b83120523ab732f05a4ab03719ce 100644 (file)
@@ -431,7 +431,7 @@ def skip(db, reason=None):
 
 def only_on(dbs, reason=None):
     return only_if(
-        OrPredicate([SpecPredicate(db) for db in util.to_list(dbs)])
+        OrPredicate([Predicate.as_predicate(db) for db in util.to_list(dbs)])
     )
 
 
index 3703963b35e8ead3736b43f5e50ea49a9939076c..491e6556553b0dcfbfc7780e3553bf5e77dde6ec 100644 (file)
@@ -56,7 +56,10 @@ class DefaultRequirements(SuiteRequirements):
 
     @property
     def reflects_fk_options(self):
-        return exclusions.only_on(['postgresql', 'mysql'])
+        return exclusions.only_on([
+            'postgresql', 'mysql',
+            lambda config: util.sqla_110 and
+            exclusions.against(config, 'sqlite')])
 
     @property
     def fk_initially(self):
index 0a5b1de2ccb7af36d98ae1a14d2ba1b16a932877..7b792bd5563cb8b127b0903c847b04a9bff756cc 100644 (file)
@@ -542,7 +542,7 @@ class AutogenerateFKOptionsTest(AutogenFixtureTest, TestBase):
 
     def test_remove_ondelete(self):
         diffs = self._fk_opts_fixture(
-            {"ondelete": "cascade"}, {}
+            {"ondelete": "CASCADE"}, {}
         )
 
         if self._expect_opts_supported():
@@ -595,7 +595,7 @@ class AutogenerateFKOptionsTest(AutogenFixtureTest, TestBase):
 
     def test_remove_onupdate(self):
         diffs = self._fk_opts_fixture(
-            {"onupdate": "cascade"}, {}
+            {"onupdate": "CASCADE"}, {}
         )
 
         if self._expect_opts_supported():
@@ -713,8 +713,8 @@ class AutogenerateFKOptionsTest(AutogenFixtureTest, TestBase):
 
     def test_ondelete_onupdate_combo(self):
         diffs = self._fk_opts_fixture(
-            {"onupdate": "cascade", "ondelete": "set null"},
-            {"onupdate": "restrict", "ondelete": "restrict"}
+            {"onupdate": "CASCADE", "ondelete": "SET NULL"},
+            {"onupdate": "RESTRICT", "ondelete": "RESTRICT"}
         )
 
         if self._expect_opts_supported():
@@ -731,8 +731,8 @@ class AutogenerateFKOptionsTest(AutogenFixtureTest, TestBase):
                 diffs[1], "add_fk",
                 "user", ["tid"],
                 "table", ["id"],
-                onupdate="restrict",
-                ondelete="restrict"
+                onupdate="RESTRICT",
+                ondelete="RESTRICT"
             )
         else:
             eq_(diffs, [])