diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-12 23:23:44 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-12 23:23:44 +0000 |
| commit | d816c09f66f7d1735a764d27a187fbd0cd1f576e (patch) | |
| tree | 1aaa5fdc0128cb45f87fa925fd48ea92272fed8d | |
| parent | 6f0093805515a76e8c53b80b5ed53dd21acb3195 (diff) | |
| parent | b9d275fdc134376b3e81066870b92a8c84c0705c (diff) | |
| download | sqlalchemy-d816c09f66f7d1735a764d27a187fbd0cd1f576e.tar.gz | |
merging master...
| -rw-r--r-- | test/orm/test_naturalpks.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py index 3f327a907..44dce446b 100644 --- a/test/orm/test_naturalpks.py +++ b/test/orm/test_naturalpks.py @@ -594,7 +594,7 @@ class CascadeToFKPKTest(_base.MappedTest, testing.AssertsCompiledSQL): self._test_onetomany(True) # PG etc. need passive=True to allow PK->PK cascade - @testing.fails_on_everything_except('sqlite', 'oracle') + @testing.fails_on_everything_except('sqlite', 'oracle', '+zxjdbc') def test_onetomany_nonpassive(self): self._test_onetomany(False) @@ -737,7 +737,7 @@ class JoinedInheritanceTest(_base.MappedTest): self._test_pk(True) # PG etc. need passive=True to allow PK->PK cascade - @testing.fails_on_everything_except('sqlite', 'oracle') + @testing.fails_on_everything_except('sqlite', 'oracle', '+zxjdbc') def test_pk_nonpassive(self): self._test_pk(False) @@ -747,7 +747,7 @@ class JoinedInheritanceTest(_base.MappedTest): self._test_fk(True) # PG etc. need passive=True to allow PK->PK cascade - @testing.fails_on_everything_except('sqlite') + @testing.fails_on_everything_except('sqlite', '+zxjdbc') def test_fk_nonpassive(self): self._test_fk(False) |