Columns now have default= and server_default=. PassiveDefault fades away.

1 files changed, 30 insertions, 30 deletions

diff --git a/test/dialect/postgres.py b/test/dialect/postgres.py
index 83ca6c6f6..88bc0bb99 100644
--- a/test/dialect/postgres.py
+++ b/test/dialect/postgres.py
@@ -411,7 +411,7 @@ class DomainReflectionTest(TestBase, AssertsExecutionResults):
     def test_domain_is_reflected(self):
         metadata = MetaData(testing.db)
         table = Table('testtable', metadata, autoload=True)
-        self.assertEquals(str(table.columns.answer.default.arg), '42', "Reflected default value didn't equal expected value")
+        self.assertEquals(str(table.columns.answer.server_default.arg), '42', "Reflected default value didn't equal expected value")
         self.assertFalse(table.columns.answer.nullable, "Expected reflected column to not be nullable.")
 
     def test_table_is_reflected_alt_schema(self):
@@ -423,13 +423,13 @@ class DomainReflectionTest(TestBase, AssertsExecutionResults):
     def test_schema_domain_is_reflected(self):
         metadata = MetaData(testing.db)
         table = Table('testtable', metadata, autoload=True, schema='alt_schema')
-        self.assertEquals(str(table.columns.answer.default.arg), '0', "Reflected default value didn't equal expected value")
+        self.assertEquals(str(table.columns.answer.server_default.arg), '0', "Reflected default value didn't equal expected value")
         self.assertTrue(table.columns.answer.nullable, "Expected reflected column to be nullable.")
 
     def test_crosschema_domain_is_reflected(self):
         metadata = MetaData(testing.db)
         table = Table('crosschema', metadata, autoload=True)
-        self.assertEquals(str(table.columns.answer.default.arg), '0', "Reflected default value didn't equal expected value")
+        self.assertEquals(str(table.columns.answer.server_default.arg), '0', "Reflected default value didn't equal expected value")
         self.assertTrue(table.columns.answer.nullable, "Expected reflected column to be nullable.")
 
 class MiscTest(TestBase, AssertsExecutionResults):
@@ -568,10 +568,10 @@ class MiscTest(TestBase, AssertsExecutionResults):
             self.assert_((subject.c.id==referer.c.ref).compare(subject.join(referer).onclause))
         finally:
             meta1.drop_all()
-    
+
     def test_schema_roundtrips(self):
         meta = MetaData(testing.db)
-        users = Table('users', meta, 
+        users = Table('users', meta,
             Column('id', Integer, primary_key=True),
             Column('name', String(50)), schema='alt_schema')
         users.create()
@@ -580,23 +580,23 @@ class MiscTest(TestBase, AssertsExecutionResults):
             users.insert().execute(id=2, name='name2')
             users.insert().execute(id=3, name='name3')
             users.insert().execute(id=4, name='name4')
-            
+
             self.assertEquals(users.select().where(users.c.name=='name2').execute().fetchall(), [(2, 'name2')])
             self.assertEquals(users.select(use_labels=True).where(users.c.name=='name2').execute().fetchall(), [(2, 'name2')])
-            
+
             users.delete().where(users.c.id==3).execute()
             self.assertEquals(users.select().where(users.c.name=='name3').execute().fetchall(), [])
-            
+
             users.update().where(users.c.name=='name4').execute(name='newname')
             self.assertEquals(users.select(use_labels=True).where(users.c.id==4).execute().fetchall(), [(4, 'newname')])
-            
+
         finally:
             users.drop()
-            
+
     def test_preexecute_passivedefault(self):
         """test that when we get a primary key column back
         from reflecting a table which has a default value on it, we pre-execute
-        that PassiveDefault upon insert."""
+        that DefaultClause upon insert."""
 
         try:
             meta = MetaData(testing.db)
@@ -739,7 +739,7 @@ class ArrayTest(TestBase, AssertsExecutionResults):
         mapper(Foo, footable)
         metadata.create_all()
         sess = create_session()
-        
+
         foo = Foo()
         foo.id = 1
         foo.intarr = [1,2,3]
@@ -748,18 +748,18 @@ class ArrayTest(TestBase, AssertsExecutionResults):
         sess.clear()
         foo = sess.query(Foo).get(1)
         self.assertEquals(foo.intarr, [1,2,3])
-        
+
         foo.intarr.append(4)
         sess.flush()
         sess.clear()
         foo = sess.query(Foo).get(1)
         self.assertEquals(foo.intarr, [1,2,3,4])
-        
+
         foo.intarr = []
         sess.flush()
         sess.clear()
         self.assertEquals(foo.intarr, [])
-        
+
         foo.intarr = None
         sess.flush()
         sess.clear()
@@ -771,25 +771,25 @@ class ArrayTest(TestBase, AssertsExecutionResults):
         sess.save(foo)
         sess.flush()
 
-class TimeStampTest(TestBase, AssertsExecutionResults): 
-    __only_on__ = 'postgres' 
-    def test_timestamp(self): 
+class TimeStampTest(TestBase, AssertsExecutionResults):
+    __only_on__ = 'postgres'
+    def test_timestamp(self):
         engine = testing.db
-        connection = engine.connect() 
-        s = select([func.TIMESTAMP("12/25/07").label("ts")]) 
-        result = connection.execute(s).fetchone() 
-        self.assertEqual(result[0], datetime.datetime(2007, 12, 25, 0, 0)) 
+        connection = engine.connect()
+        s = select([func.TIMESTAMP("12/25/07").label("ts")])
+        result = connection.execute(s).fetchone()
+        self.assertEqual(result[0], datetime.datetime(2007, 12, 25, 0, 0))
 
 class ServerSideCursorsTest(TestBase, AssertsExecutionResults):
     __only_on__ = 'postgres'
-    
+
     def setUpAll(self):
         global ss_engine
         ss_engine = engines.testing_engine(options={'server_side_cursors':True})
-        
+
     def tearDownAll(self):
         ss_engine.dispose()
-    
+
     def test_roundtrip(self):
         test_table = Table('test_table', MetaData(ss_engine),
             Column('id', Integer, primary_key=True),
@@ -798,19 +798,19 @@ class ServerSideCursorsTest(TestBase, AssertsExecutionResults):
         test_table.create(checkfirst=True)
         try:
             test_table.insert().execute(data='data1')
-            
+
             nextid = ss_engine.execute(Sequence('test_table_id_seq'))
             test_table.insert().execute(id=nextid, data='data2')
-            
+
             self.assertEquals(test_table.select().execute().fetchall(), [(1, 'data1'), (2, 'data2')])
-            
+
             test_table.update().where(test_table.c.id==2).values(data=test_table.c.data + ' updated').execute()
             self.assertEquals(test_table.select().execute().fetchall(), [(1, 'data1'), (2, 'data2 updated')])
             test_table.delete().execute()
             self.assertEquals(test_table.count().scalar(), 0)
         finally:
             test_table.drop(checkfirst=True)
-            
-    
+
+
 if __name__ == "__main__":
     testenv.main()