From: Jason Kirtland <jek@discorporate.us>
Date: Sat, 4 Aug 2007 19:29:54 +0000 (+0000)
Subject: More robust droppage of table detritus, also respect --quiet
X-Git-Tag: rel_0_4beta1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e56af84f4253718b8e3552c7ecae25114def4c9f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

More robust droppage of table detritus, also respect --quiet
---

diff --git a/test/testlib/config.py b/test/testlib/config.py
index 23f86a70ed..8b5819cc2b 100644
--- a/test/testlib/config.py
+++ b/test/testlib/config.py
@@ -202,21 +202,24 @@ def _create_testing_engine(options, file_config):
 post_configure['create_engine'] = _create_testing_engine
 
 def _prep_testing_database(options, file_config):
+    from testlib import engines
     from sqlalchemy import schema
 
     # also create alt schemas etc. here?
-    existing = db.table_names()
+    e = engines.utf8_engine()
+    existing = e.table_names()
     if existing:
-        print "Dropping existing tables in database: " + db_url
-        try:
-            print "Tables: %s" % ', '.join(existing)
-        except:
-            pass
-        print "Abort within 5 seconds..."
-        time.sleep(5)
-
-        md = schema.MetaData(db, reflect=True)
+        if not options.quiet:
+            print "Dropping existing tables in database: " + db_url
+            try:
+                print "Tables: %s" % ', '.join(existing)
+            except:
+                pass
+            print "Abort within 5 seconds..."
+            time.sleep(5)
+        md = schema.MetaData(e, reflect=True)
         md.drop_all()
+    e.dispose()
 post_configure['prep_db'] = _prep_testing_database
 
 def _set_table_options(options, file_config):