From 9ffc39c3c0d45cae3eb9c968c4274c4bdd30c8ba Mon Sep 17 00:00:00 2001
From: percious17 <unknown>
Date: Tue, 2 Dec 2008 15:54:58 +0000
Subject: [PATCH] removed driver deprecation, since that was deprecated in 0.4.

---
 migrate/run.py                    | 21 ---------------------
 test/changeset/test_changeset.py  |  6 ------
 test/changeset/test_constraint.py |  6 +++---
 test/fixture/database.py          |  4 ----
 4 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 migrate/run.py

diff --git a/migrate/run.py b/migrate/run.py
deleted file mode 100644
index 0d8fe39..0000000
--- a/migrate/run.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Each migration script must import everything in this file."""
-#from sqlalchemy import *
-#from migrate.changeset import *
-#from migrate.versioning import logengine
-
-#__all__=[
-#    'engine',
-#]
-
-# 'migrate_engine' is assigned elsewhere, and used during scripts
-#migrate_engine = None
-
-def driver(engine):
-    """Given an engine, return the name of the database driving it: 
-    
-    'postgres','mysql','sqlite'...
-    """
-    from warnings import warn
-    warn("Use engine.name instead; http://erosson.com/migrate/trac/ticket/80",
-        DeprecationWarning)
-    return engine.name
diff --git a/test/changeset/test_changeset.py b/test/changeset/test_changeset.py
index 8b9724c..3926192 100644
--- a/test/changeset/test_changeset.py
+++ b/test/changeset/test_changeset.py
@@ -7,7 +7,6 @@ from migrate.changeset.schema import _ColumnDelta
 from sqlalchemy.databases import information_schema
 
 import migrate
-from migrate.run import driver
 
 class TestAddDropColumn(fixture.DB):
     level=fixture.DB.CONNECT
@@ -512,8 +511,3 @@ class TestColumnDelta(fixture.Base):
         verify(['default'],mkcol(default=None),mkcol(default='42'))
         verify([],mkcol(default=None),mkcol(default=None))
         verify([],mkcol(default='42'),mkcol(default='42'))
-
-class TestDriver(fixture.DB):
-    @fixture.usedb()
-    def test_driver(self):
-        self.assertEquals(self.url.split(':',1)[0],driver(self.engine))
diff --git a/test/changeset/test_constraint.py b/test/changeset/test_constraint.py
index b6c2967..9d397a1 100644
--- a/test/changeset/test_constraint.py
+++ b/test/changeset/test_constraint.py
@@ -83,9 +83,9 @@ class TestConstraint(fixture.DB):
         self.assert_(self.table.c.fkey.foreign_keys._list is not [])
 
         print 'drop...'
-        self.engine.echo=True
+        #self.engine.echo=True
         fk.drop()
-        self.engine.echo=False
+        #self.engine.echo=False
         print 'dropped'
         self.refresh_table()
         self.assertEquals(self.table.c.fkey.foreign_keys._list, [])
@@ -98,7 +98,7 @@ class TestConstraint(fixture.DB):
     @fixture.usedb()
     def test_define_pk_multi(self):
         """Multicolumn PK constraints can be defined, created, and dropped"""
-        self.engine.echo=True
+        #self.engine.echo=True
         self._define_pk(self.table.c.id,self.table.c.fkey)
 
 
diff --git a/test/fixture/database.py b/test/fixture/database.py
index 57b8a71..97d18b9 100644
--- a/test/fixture/database.py
+++ b/test/fixture/database.py
@@ -63,13 +63,9 @@ def usedb(supported=None,not_supported=None):
     def dec(func):
         def entangle(self):
             for url in my_urls:
-                print '*'*80
-                print func.__name__
-                print url
                 self._setup(url)
                 yield func, self
                 self._teardown()
-                
         entangle.__name__ = func.__name__
         return entangle
     return dec