merge 0.6 series to trunk.

1 files changed, 29 insertions, 19 deletions

diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py
index b063780ac..5379c9714 100644
--- a/test/orm/test_defaults.py
+++ b/test/orm/test_defaults.py
@@ -2,8 +2,7 @@
 import sqlalchemy as sa
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.orm import mapper, relation, create_session
 from test.orm import _base
 from sqlalchemy.test.testing import eq_
@@ -15,7 +14,7 @@ class TriggerDefaultsTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         dt = Table('dt', metadata,
-                   Column('id', Integer, primary_key=True),
+                   Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
                    Column('col1', String(20)),
                    Column('col2', String(20),
                           server_default=sa.schema.FetchedValue()),
@@ -34,17 +33,23 @@ class TriggerDefaultsTest(_base.MappedTest):
                    "UPDATE dt SET col2='ins', col4='ins' "
                    "WHERE dt.id IN (SELECT id FROM inserted);",
                    on='mssql'),
-            ):
-            if testing.against(ins.on):
-                break
-        else:
-            ins = sa.DDL("CREATE TRIGGER dt_ins BEFORE INSERT ON dt "
+            sa.DDL("CREATE TRIGGER dt_ins BEFORE INSERT "
+                     "ON dt "
+                     "FOR EACH ROW "
+                     "BEGIN "
+                     ":NEW.col2 := 'ins'; :NEW.col4 := 'ins'; END;",
+                     on='oracle'),
+            sa.DDL("CREATE TRIGGER dt_ins BEFORE INSERT ON dt "
                          "FOR EACH ROW BEGIN "
-                         "SET NEW.col2='ins'; SET NEW.col4='ins'; END")
-        ins.execute_at('after-create', dt)
+                         "SET NEW.col2='ins'; SET NEW.col4='ins'; END",
+                         on=lambda event, schema_item, bind, **kw: 
+                                bind.engine.name not in ('oracle', 'mssql', 'sqlite')
+                ),
+            ):
+            ins.execute_at('after-create', dt)
+            
         sa.DDL("DROP TRIGGER dt_ins").execute_at('before-drop', dt)
 
-
         for up in (
             sa.DDL("CREATE TRIGGER dt_up AFTER UPDATE ON dt "
                    "FOR EACH ROW BEGIN "
@@ -55,14 +60,19 @@ class TriggerDefaultsTest(_base.MappedTest):
                    "UPDATE dt SET col3='up', col4='up' "
                    "WHERE dt.id IN (SELECT id FROM deleted);",
                    on='mssql'),
-            ):
-            if testing.against(up.on):
-                break
-        else:
-            up = sa.DDL("CREATE TRIGGER dt_up BEFORE UPDATE ON dt "
+            sa.DDL("CREATE TRIGGER dt_up BEFORE UPDATE ON dt "
+                  "FOR EACH ROW BEGIN "
+                  ":NEW.col3 := 'up'; :NEW.col4 := 'up'; END;",
+                  on='oracle'),
+            sa.DDL("CREATE TRIGGER dt_up BEFORE UPDATE ON dt "
                         "FOR EACH ROW BEGIN "
-                        "SET NEW.col3='up'; SET NEW.col4='up'; END")
-        up.execute_at('after-create', dt)
+                        "SET NEW.col3='up'; SET NEW.col4='up'; END",
+                        on=lambda event, schema_item, bind, **kw: 
+                                bind.engine.name not in ('oracle', 'mssql', 'sqlite')
+                    ),
+            ):
+            up.execute_at('after-create', dt)
+
         sa.DDL("DROP TRIGGER dt_up").execute_at('before-drop', dt)
 
 
@@ -115,7 +125,7 @@ class ExcludedDefaultsTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         dt = Table('dt', metadata,
-                   Column('id', Integer, primary_key=True),
+                   Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
                    Column('col1', String(20), default="hello"),
         )