x/sqlalchemy-migrate
Code Issues Proposed changes

removed driver deprecation, since that was deprecated in 0.4.

Browse Source
This commit is contained in:
percious17 2008-12-02 15:54:58 +00:00
parent b267d64f9e
commit 9ffc39c3c0
4 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
migrate/run.py
View File

@ -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

6
test/changeset/test_changeset.py
View File

@ -7,7 +7,6 @@ from migrate.changeset.schema import _ColumnDelta
from sqlalchemy.databases import information_schema from sqlalchemy.databases import information_schema
import migrate import migrate
from migrate.run import driver
class TestAddDropColumn(fixture.DB): class TestAddDropColumn(fixture.DB):
level=fixture.DB.CONNECT level=fixture.DB.CONNECT
@ -512,8 +511,3 @@ class TestColumnDelta(fixture.Base):
verify(['default'],mkcol(default=None),mkcol(default='42')) verify(['default'],mkcol(default=None),mkcol(default='42'))
verify([],mkcol(default=None),mkcol(default=None)) verify([],mkcol(default=None),mkcol(default=None))
verify([],mkcol(default='42'),mkcol(default='42')) 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))

6
test/changeset/test_constraint.py
View File

@ -83,9 +83,9 @@ class TestConstraint(fixture.DB):
self.assert_(self.table.c.fkey.foreign_keys._list is not []) self.assert_(self.table.c.fkey.foreign_keys._list is not [])
print 'drop...' print 'drop...'
self.engine.echo=True #self.engine.echo=True
fk.drop() fk.drop()
self.engine.echo=False #self.engine.echo=False
print 'dropped' print 'dropped'
self.refresh_table() self.refresh_table()
self.assertEquals(self.table.c.fkey.foreign_keys._list, []) self.assertEquals(self.table.c.fkey.foreign_keys._list, [])
@ -98,7 +98,7 @@ class TestConstraint(fixture.DB):
@fixture.usedb() @fixture.usedb()
def test_define_pk_multi(self): def test_define_pk_multi(self):
"""Multicolumn PK constraints can be defined, created, and dropped""" """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) self._define_pk(self.table.c.id,self.table.c.fkey)

4
test/fixture/database.py
View File

@ -63,13 +63,9 @@ def usedb(supported=None,not_supported=None):
def dec(func): def dec(func):
def entangle(self): def entangle(self):
for url in my_urls: for url in my_urls:
print '*'*80
print func.__name__
print url
self._setup(url) self._setup(url)
yield func, self yield func, self
self._teardown() self._teardown()
entangle.__name__ = func.__name__ entangle.__name__ = func.__name__
return entangle return entangle
return dec return dec