From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Sep 2005 05:31:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~811
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359ccab4289fc641c00d3d5681a5d31c0db2fed9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/test/tables.py b/test/tables.py
index 1db25a2a6e..bfa711784c 100644
--- a/test/tables.py
+++ b/test/tables.py
@@ -1,19 +1,20 @@
-import unittest, sys, os
 
-import sqlalchemy.databases.sqlite as sqllite
+from sqlalchemy.sql import *
+from sqlalchemy.schema import *
+from sqlalchemy.mapper import *
 
-db_type = 'memory'
+DBTYPE = 'sqlite_memory'
 
-if db_type == 'memory':
-    db = sqllite.engine(':memory:', {})
-elif db_type =='file':
+if DBTYPE == 'sqlite_memory':
+    import sqlalchemy.databases.sqlite as sqllite
+    db = sqllite.engine(':memory:', {}, echo = False)
+elif DBTYPE == 'sqlite_file':
+    import sqlalchemy.databases.sqlite as sqllite
     if os.access('querytest.db', os.F_OK):
         os.remove('querytest.db')
-    db = sqllite.engine('querytest.db', {}, echo = True)
-
-from sqlalchemy.sql import *
-from sqlalchemy.schema import *
-
+    db = sqllite.engine('querytest.db', opts = {}, echo = True)
+elif DBTYPE == 'postgres':
+    pass
 
 users = Table('users', db,
     Column('user_id', INT, primary_key = True),
@@ -53,7 +54,6 @@ users.build()
 users.insert().execute(user_id = 7, user_name = 'jack')
 users.insert().execute(user_id = 8, user_name = 'ed')
 users.insert().execute(user_id = 9, user_name = 'fred')
-db.connection().commit()
 
 addresses.build()
 addresses.insert().execute(address_id = 1, user_id = 7, email_address = "jack@bean.com")
@@ -98,4 +98,3 @@ itemkeywords.insert().execute(keyword_id=3, item_id=3)
 itemkeywords.insert().execute(keyword_id=5, item_id=2)
 itemkeywords.insert().execute(keyword_id=4, item_id=3)
 db.connection().commit()
-