summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-29 17:29:08 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-29 17:29:08 -0400
commit28be45cb54d63f8a2038f221a3a35580ff47f238 (patch)
treeedca011f6a8f48723d1f3e710a1c9c37e3f7c9b0
parent561c71ff5540d92bd82c31f49848d75c77906356 (diff)
downloadsqlalchemy-28be45cb54d63f8a2038f221a3a35580ff47f238.tar.gz
oops, one more
-rw-r--r--test/ext/declarative/test_mixin.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/ext/declarative/test_mixin.py b/test/ext/declarative/test_mixin.py
index 7bc1e1d15..6c2233302 100644
--- a/test/ext/declarative/test_mixin.py
+++ b/test/ext/declarative/test_mixin.py
@@ -289,6 +289,8 @@ class DeclarativeMixinTest(DeclarativeTestBase):
assert len(General.bar.prop.columns) == 1
assert Specific.bar.prop is General.bar.prop
+ @testing.skip_if(lambda: testing.against('oracle'),
+ "Test has an empty insert in it at the moment")
def test_columns_single_inheritance_conflict_resolution(self):
"""Test that a declared_attr can return the existing column and it will
be ignored. this allows conditional columns to be added.