From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 22 Oct 2005 23:36:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~469
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d60fc7e9f5187a6dec927e44905101d3d35aa24;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/test/objectstore.py b/test/objectstore.py
index b3ae4b115f..b8a29e5576 100644
--- a/test/objectstore.py
+++ b/test/objectstore.py
@@ -32,6 +32,7 @@ class SaveTest(AssertMixin):
         db.echo = testbase.echo
     def tearDownAll(self):
         db.echo = False
+        db.commit()
         tables.drop()
         db.echo = testbase.echo
         
@@ -55,6 +56,7 @@ class SaveTest(AssertMixin):
 
     def tearDown(self):
         db.echo = False
+        db.commit()
         tables.delete()
         db.echo = testbase.echo
         
@@ -309,23 +311,26 @@ class SaveTest(AssertMixin):
             objects.append(a)
         self.assert_sql(db, lambda: objectstore.commit(), [
                 (
-                    "INSERT INTO users_nm (user_id, user_name) VALUES (:user_id, :user_name)",
-                    {'user_id': None, 'user_name': 'thesub'}
+                    "INSERT INTO users_nm (user_name) VALUES (:user_name)",
+                    {'user_name': 'thesub'}
                 ),
                 (
-                    "INSERT INTO users_nm (user_id, user_name) VALUES (:user_id, :user_name)",
-                    {'user_id': None, 'user_name': 'assdkfj'}
+                    "INSERT INTO users_nm (user_name) VALUES (:user_name)",
+                    {'user_name': 'assdkfj'}
                 ),
                 (
-                "INSERT INTO email_addresses_nm (address_id, rel_user_id, email_address) VALUES (:address_id, :rel_user_id, :email_address)",
-                {'rel_user_id': 1, 'address_id': None, 'email_address': 'bar@foo.com'}
+                "INSERT INTO email_addresses_nm (rel_user_id, email_address) VALUES (:rel_user_id, :email_address)",
+                {'rel_user_id': 1, 'email_address': 'bar@foo.com'}
                 ),
                 (
-                "INSERT INTO email_addresses_nm (address_id, rel_user_id, email_address) VALUES (:address_id, :rel_user_id, :email_address)",
-                {'rel_user_id': 2, 'address_id': None, 'email_address': 'thesdf@asdf.com'}
+                "INSERT INTO email_addresses_nm (rel_user_id, email_address) VALUES (:rel_user_id, :email_address)",
+                {'rel_user_id': 2, 'email_address': 'thesdf@asdf.com'}
                 )
                 ]
         )
+        a2.drop()
+        u2.drop()
+        db.commit()
         
         
 
diff --git a/test/tables.py b/test/tables.py
index 1c9cf52973..845077716c 100644
--- a/test/tables.py
+++ b/test/tables.py
@@ -10,8 +10,8 @@ __ALL__ = ['db', 'users', 'addresses', 'orders', 'orderitems', 'keywords', 'item
 
 ECHO = testbase.echo
 
-DBTYPE = 'sqlite_memory'
-#DBTYPE = 'postgres'
+#DBTYPE = 'sqlite_memory'
+DBTYPE = 'postgres'
 #DBTYPE = 'sqlite_file'
 
 if DBTYPE == 'sqlite_memory':
diff --git a/test/testbase.py b/test/testbase.py
index 2ddea27e88..77688f7da6 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -62,7 +62,7 @@ class EngineAssert(object):
         self.engine.echo = self.echo
         self.engine.logger = self.logger
         
-        if self.assert_list is not None and not (isinstance(self.engine, postgres.PGSQLEngine) and re.search(r'%\(oid\)s', statement, re.S)):
+        if self.assert_list is not None and not (isinstance(self.engine, postgres.PGSQLEngine) and re.search(r'%\(.*oid\)s', statement, re.S)):
             item = self.assert_list.pop()
             (query, params) = item
             if callable(params):