[Sqlalchemy-commits] [4586] sqlalchemy/branches/user_defined_state/test: - Experimentally moved a f
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [4586] sqlalchemy/branches/user_defined_state/test: - Experimentally moved a few test packages to fully explicit imports (no * ), pyflaked
|
From: <co...@sq...> - 2008-04-29 01:50:58
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[4586] sqlalchemy/branches/user_defined_state/test: - Experimentally moved a few test packages to fully explicit imports (no * ), pyflaked</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4586</dd> <dt>Author</dt> <dd>jek</dd> <dt>Date</dt> <dd>2008-04-28 21:50:56 -0400 (Mon, 28 Apr 2008)</dd> </dl> <h3>Log Message</h3> <pre>- Experimentally moved a few test packages to fully explicit imports (no *), pyflaked</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesuser_defined_statetestbasedependencypy">sqlalchemy/branches/user_defined_state/test/base/dependency.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestbaseexceptpy">sqlalchemy/branches/user_defined_state/test/base/except.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestbaseutilspy">sqlalchemy/branches/user_defined_state/test/base/utils.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginebindpy">sqlalchemy/branches/user_defined_state/test/engine/bind.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestengineddleventspy">sqlalchemy/branches/user_defined_state/test/engine/ddlevents.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestengineexecutepy">sqlalchemy/branches/user_defined_state/test/engine/execute.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginemetadatapy">sqlalchemy/branches/user_defined_state/test/engine/metadata.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestengineparseconnectpy">sqlalchemy/branches/user_defined_state/test/engine/parseconnect.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginepoolpy">sqlalchemy/branches/user_defined_state/test/engine/pool.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginereconnectpy">sqlalchemy/branches/user_defined_state/test/engine/reconnect.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginereflectionpy">sqlalchemy/branches/user_defined_state/test/engine/reflection.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestenginetransactionpy">sqlalchemy/branches/user_defined_state/test/engine/transaction.py</a></li> <li><a href="#sqlalchemybranchesuser_defined_statetestormsessionpy">sqlalchemy/branches/user_defined_state/test/orm/session.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesuser_defined_statetestbasedependencypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/base/dependency.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/base/dependency.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/base/dependency.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,7 +1,7 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><span class="cx"> import sqlalchemy.topological as topological </span><span class="cx"> from sqlalchemy import util </span><del>-from testlib import * </del><ins>+from testlib import TestBase </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class DependencySortTest(TestBase): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestbaseexceptpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/base/except.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/base/except.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/base/except.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,9 +1,8 @@ </span><span class="cx"> """Tests exceptions and DB-API exception wrapping.""" </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-import sys, unittest </del><ins>+import unittest </ins><span class="cx"> import exceptions as stdlib_exceptions </span><span class="cx"> from sqlalchemy import exc as sa_exceptions </span><del>-from testlib import * </del><span class="cx"> </span><span class="cx"> </span><span class="cx"> class Error(stdlib_exceptions.StandardError): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestbaseutilspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/base/utils.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/base/utils.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/base/utils.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,7 +1,7 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-import threading, time, unittest </del><ins>+import threading, unittest </ins><span class="cx"> from sqlalchemy import util, sql, exc </span><del>-from testlib import * </del><ins>+from testlib import TestBase, set </ins><span class="cx"> from testlib import sorted </span><span class="cx"> </span><span class="cx"> class OrderedDictTest(TestBase): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestenginebindpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/bind.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/bind.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/bind.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -2,9 +2,10 @@ </span><span class="cx"> including the deprecated versions of these arguments""" </span><span class="cx"> </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-from sqlalchemy import * </del><span class="cx"> from sqlalchemy import engine, exc </span><del>-from testlib import * </del><ins>+from sqlalchemy import MetaData, ThreadLocalMetaData +from testlib.sa import Table, Column, Integer, String, func, Sequence, text +from testlib import TestBase, testing </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class BindTest(TestBase): </span><span class="lines">@@ -71,6 +72,10 @@ </span><span class="cx"> </span><span class="cx"> @testing.future </span><span class="cx"> def test_create_drop_err2(self): </span><ins>+ metadata = MetaData() + table = Table('test_table', metadata, + Column('foo', Integer)) + </ins><span class="cx"> for meth in [ </span><span class="cx"> table.exists, </span><span class="cx"> table.create, </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestengineddleventspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/ddlevents.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/ddlevents.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/ddlevents.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,9 +1,9 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-from sqlalchemy import * -from sqlalchemy import exc </del><span class="cx"> from sqlalchemy.schema import DDL </span><del>-import sqlalchemy -from testlib import * </del><ins>+from sqlalchemy import create_engine +from testlib.sa import MetaData, Table, Column, Integer, String +import testlib.sa as tsa +from testlib import TestBase, testing </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class DDLEventTest(TestBase): </span><span class="lines">@@ -294,7 +294,7 @@ </span><span class="cx"> try: </span><span class="cx"> r = eval(py) </span><span class="cx"> assert False </span><del>- except exc.UnboundExecutionError: </del><ins>+ except tsa.exc.UnboundExecutionError: </ins><span class="cx"> pass </span><span class="cx"> </span><span class="cx"> for bind in engine, cx: </span><span class="lines">@@ -310,7 +310,7 @@ </span><span class="cx"> engine = create_engine(testing.db.name + '://', </span><span class="cx"> strategy='mock', executor=executor) </span><span class="cx"> engine.dialect.identifier_preparer = \ </span><del>- sqlalchemy.sql.compiler.IdentifierPreparer(engine.dialect) </del><ins>+ tsa.sql.compiler.IdentifierPreparer(engine.dialect) </ins><span class="cx"> return engine </span><span class="cx"> </span><span class="cx"> def test_tokens(self): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestengineexecutepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/execute.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/execute.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/execute.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,11 +1,13 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><span class="cx"> import re </span><del>-from sqlalchemy import * -from sqlalchemy import exc -from testlib import * </del><span class="cx"> from sqlalchemy.interfaces import ConnectionProxy </span><del>-from testlib import engines </del><ins>+from testlib.sa import MetaData, Table, Column, Integer, String, INT, \ + VARCHAR, func +import testlib.sa as tsa +from testlib import TestBase, testing, engines </ins><span class="cx"> </span><ins>+ +users, metadata = None, None </ins><span class="cx"> class ExecuteTest(TestBase): </span><span class="cx"> def setUpAll(self): </span><span class="cx"> global users, metadata </span><span class="lines">@@ -73,7 +75,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute("osdjafioajwoejoasfjdoifjowejfoawejqoijwef") </span><span class="cx"> assert False </span><del>- except exc.DBAPIError: </del><ins>+ except tsa.exc.DBAPIError: </ins><span class="cx"> assert True </span><span class="cx"> </span><span class="cx"> class ProxyConnectionTest(TestBase): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestenginemetadatapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/metadata.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/metadata.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/metadata.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,8 +1,10 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><span class="cx"> import pickle </span><del>-from sqlalchemy import * -from sqlalchemy import exc -from testlib import * </del><ins>+from sqlalchemy import MetaData +from testlib.sa import Table, Column, Integer, String, UniqueConstraint, \ + CheckConstraint, ForeignKey +import testlib.sa as tsa +from testlib import TestBase, ComparesTables, testing </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class MetaDataTest(TestBase, ComparesTables): </span><span class="lines">@@ -31,7 +33,7 @@ </span><span class="cx"> t2 = Table('table1', metadata, Column('col1', Integer, primary_key=True), </span><span class="cx"> Column('col2', String(20))) </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> assert str(e) == "Table 'table1' is already defined for this MetaData instance. Specify 'useexisting=True' to redefine options and columns on an existing Table object." </span><span class="cx"> finally: </span><span class="cx"> metadata.drop_all() </span><span class="lines">@@ -110,7 +112,7 @@ </span><span class="cx"> meta.drop_all(testing.db) </span><span class="cx"> </span><span class="cx"> def test_nonexistent(self): </span><del>- self.assertRaises(exc.NoSuchTableError, Table, </del><ins>+ self.assertRaises(tsa.exc.NoSuchTableError, Table, </ins><span class="cx"> 'fake_table', </span><span class="cx"> MetaData(testing.db), autoload=True) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestengineparseconnectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/parseconnect.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/parseconnect.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/parseconnect.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,9 +1,9 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><span class="cx"> import ConfigParser, StringIO </span><del>-from sqlalchemy import * -from sqlalchemy import exc, pool, engine </del><span class="cx"> import sqlalchemy.engine.url as url </span><del>-from testlib import * </del><ins>+from sqlalchemy import create_engine, engine_from_config +import testlib.sa as tsa +from testlib import TestBase </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class ParseConnectTest(TestBase): </span><span class="lines">@@ -92,10 +92,10 @@ </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> prefixed = dict(ini.items('prefixed')) </span><del>- self.assert_(engine._coerce_config(prefixed, 'sqlalchemy.') == expected) </del><ins>+ self.assert_(tsa.engine._coerce_config(prefixed, 'sqlalchemy.') == expected) </ins><span class="cx"> </span><span class="cx"> plain = dict(ini.items('plain')) </span><del>- self.assert_(engine._coerce_config(plain, '') == expected) </del><ins>+ self.assert_(tsa.engine._coerce_config(plain, '') == expected) </ins><span class="cx"> </span><span class="cx"> def test_engine_from_config(self): </span><span class="cx"> dbapi = MockDBAPI() </span><span class="lines">@@ -181,7 +181,7 @@ </span><span class="cx"> try: </span><span class="cx"> c = e.connect() </span><span class="cx"> assert False </span><del>- except exc.DBAPIError: </del><ins>+ except tsa.exc.DBAPIError: </ins><span class="cx"> assert True </span><span class="cx"> </span><span class="cx"> def test_urlattr(self): </span><span class="lines">@@ -200,11 +200,11 @@ </span><span class="cx"> assert e.pool._recycle == 50 </span><span class="cx"> </span><span class="cx"> # these args work for QueuePool </span><del>- e = create_engine('postgres://', max_overflow=8, pool_timeout=60, poolclass=pool.QueuePool, module=MockDBAPI()) </del><ins>+ e = create_engine('postgres://', max_overflow=8, pool_timeout=60, poolclass=tsa.pool.QueuePool, module=MockDBAPI()) </ins><span class="cx"> </span><span class="cx"> try: </span><span class="cx"> # but not SingletonThreadPool </span><del>- e = create_engine('sqlite://', max_overflow=8, pool_timeout=60, poolclass=pool.SingletonThreadPool) </del><ins>+ e = create_engine('sqlite://', max_overflow=8, pool_timeout=60, poolclass=tsa.pool.SingletonThreadPool) </ins><span class="cx"> assert False </span><span class="cx"> except TypeError: </span><span class="cx"> assert True </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestenginepoolpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/pool.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/pool.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/pool.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,7 +1,8 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-import threading, thread, time, gc -from sqlalchemy import exc, interfaces, pool -from testlib import * </del><ins>+import threading, time, gc +from sqlalchemy import pool +import testlib.sa as tsa +from testlib import TestBase </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> mcid = 1 </span><span class="lines">@@ -125,7 +126,7 @@ </span><span class="cx"> try: </span><span class="cx"> c4 = p.connect() </span><span class="cx"> assert False </span><del>- except exc.TimeoutError, e: </del><ins>+ except tsa.exc.TimeoutError, e: </ins><span class="cx"> assert int(time.time() - now) == 2 </span><span class="cx"> </span><span class="cx"> def test_timeout_race(self): </span><span class="lines">@@ -143,7 +144,7 @@ </span><span class="cx"> now = time.time() </span><span class="cx"> try: </span><span class="cx"> c1 = p.connect() </span><del>- except exc.TimeoutError, e: </del><ins>+ except tsa.exc.TimeoutError, e: </ins><span class="cx"> timeouts.append(int(time.time()) - now) </span><span class="cx"> continue </span><span class="cx"> time.sleep(4) </span><span class="lines">@@ -179,7 +180,7 @@ </span><span class="cx"> peaks.append(p.overflow()) </span><span class="cx"> con.close() </span><span class="cx"> del con </span><del>- except exc.TimeoutError: </del><ins>+ except tsa.exc.TimeoutError: </ins><span class="cx"> pass </span><span class="cx"> threads = [] </span><span class="cx"> for i in xrange(thread_count): </span><span class="lines">@@ -442,7 +443,7 @@ </span><span class="cx"> # con can be None if invalidated </span><span class="cx"> assert record is not None </span><span class="cx"> self.checked_in.append(con) </span><del>- class ListenAll(interfaces.PoolListener, InstrumentingListener): </del><ins>+ class ListenAll(tsa.interfaces.PoolListener, InstrumentingListener): </ins><span class="cx"> pass </span><span class="cx"> class ListenConnect(InstrumentingListener): </span><span class="cx"> def connect(self, con, record): </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestenginereconnectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/reconnect.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/reconnect.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/reconnect.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,7 +1,8 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><del>-import sys, weakref -from sqlalchemy import create_engine, exc, select, MetaData, Table, Column, Integer, String -from testlib import * </del><ins>+import weakref +from testlib.sa import select, MetaData, Table, Column, Integer, String +import testlib.sa as tsa +from testlib import TestBase, testing, engines </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> class MockDisconnect(Exception): </span><span class="lines">@@ -43,13 +44,14 @@ </span><span class="cx"> def close(self): </span><span class="cx"> pass </span><span class="cx"> </span><ins>+db, dbapi = None, None </ins><span class="cx"> class MockReconnectTest(TestBase): </span><span class="cx"> def setUp(self): </span><span class="cx"> global db, dbapi </span><span class="cx"> dbapi = MockDBAPI() </span><span class="cx"> </span><span class="cx"> # create engine using our current dburi </span><del>- db = create_engine('postgres://foo:bar@localhost/test', module=dbapi) </del><ins>+ db = tsa.create_engine('postgres://foo:bar@localhost/test', module=dbapi) </ins><span class="cx"> </span><span class="cx"> # monkeypatch disconnect checker </span><span class="cx"> db.dialect.is_disconnect = lambda e: isinstance(e, MockDisconnect) </span><span class="lines">@@ -80,7 +82,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError: </del><ins>+ except tsa.exc.DBAPIError: </ins><span class="cx"> pass </span><span class="cx"> </span><span class="cx"> # assert was invalidated </span><span class="lines">@@ -108,7 +110,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError: </del><ins>+ except tsa.exc.DBAPIError: </ins><span class="cx"> pass </span><span class="cx"> </span><span class="cx"> # assert was invalidated </span><span class="lines">@@ -120,7 +122,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> assert str(e) == "Can't reconnect until invalid transaction is rolled back" </span><span class="cx"> </span><span class="cx"> assert trans.is_active </span><span class="lines">@@ -128,7 +130,7 @@ </span><span class="cx"> try: </span><span class="cx"> trans.commit() </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> assert str(e) == "Can't reconnect until invalid transaction is rolled back" </span><span class="cx"> </span><span class="cx"> assert trans.is_active </span><span class="lines">@@ -154,7 +156,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError: </del><ins>+ except tsa.exc.DBAPIError: </ins><span class="cx"> pass </span><span class="cx"> </span><span class="cx"> assert not conn.closed </span><span class="lines">@@ -168,7 +170,7 @@ </span><span class="cx"> assert not conn.invalidated </span><span class="cx"> assert len(dbapi.connections) == 1 </span><span class="cx"> </span><del>- </del><ins>+engine = None </ins><span class="cx"> class RealReconnectTest(TestBase): </span><span class="cx"> def setUp(self): </span><span class="cx"> global engine </span><span class="lines">@@ -188,7 +190,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError, e: </del><ins>+ except tsa.exc.DBAPIError, e: </ins><span class="cx"> if not e.connection_invalidated: </span><span class="cx"> raise </span><span class="cx"> </span><span class="lines">@@ -204,7 +206,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError, e: </del><ins>+ except tsa.exc.DBAPIError, e: </ins><span class="cx"> if not e.connection_invalidated: </span><span class="cx"> raise </span><span class="cx"> assert conn.invalidated </span><span class="lines">@@ -212,7 +214,7 @@ </span><span class="cx"> assert not conn.invalidated </span><span class="cx"> </span><span class="cx"> conn.close() </span><del>- </del><ins>+ </ins><span class="cx"> def test_close(self): </span><span class="cx"> conn = engine.connect() </span><span class="cx"> self.assertEquals(conn.execute(select([1])).scalar(), 1) </span><span class="lines">@@ -223,7 +225,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError, e: </del><ins>+ except tsa.exc.DBAPIError, e: </ins><span class="cx"> if not e.connection_invalidated: </span><span class="cx"> raise </span><span class="cx"> </span><span class="lines">@@ -244,7 +246,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.DBAPIError, e: </del><ins>+ except tsa.exc.DBAPIError, e: </ins><span class="cx"> if not e.connection_invalidated: </span><span class="cx"> raise </span><span class="cx"> </span><span class="lines">@@ -255,7 +257,7 @@ </span><span class="cx"> try: </span><span class="cx"> conn.execute(select([1])) </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> assert str(e) == "Can't reconnect until invalid transaction is rolled back" </span><span class="cx"> </span><span class="cx"> assert trans.is_active </span><span class="lines">@@ -263,7 +265,7 @@ </span><span class="cx"> try: </span><span class="cx"> trans.commit() </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> assert str(e) == "Can't reconnect until invalid transaction is rolled back" </span><span class="cx"> </span><span class="cx"> assert trans.is_active </span><span class="lines">@@ -275,6 +277,7 @@ </span><span class="cx"> self.assertEquals(conn.execute(select([1])).scalar(), 1) </span><span class="cx"> assert not conn.invalidated </span><span class="cx"> </span><ins>+meta, table, engine = None, None, None </ins><span class="cx"> class InvalidateDuringResultTest(TestBase): </span><span class="cx"> def setUp(self): </span><span class="cx"> global meta, table, engine </span><span class="lines">@@ -287,28 +290,28 @@ </span><span class="cx"> table.insert().execute( </span><span class="cx"> [{'id':i, 'name':'row %d' % i} for i in range(1, 100)] </span><span class="cx"> ) </span><del>- </del><ins>+ </ins><span class="cx"> def tearDown(self): </span><span class="cx"> meta.drop_all() </span><span class="cx"> engine.dispose() </span><del>- - @testing.fails_on('mysql') </del><ins>+ + @testing.fails_on('mysql') </ins><span class="cx"> def test_invalidate_on_results(self): </span><span class="cx"> conn = engine.connect() </span><del>- </del><ins>+ </ins><span class="cx"> result = conn.execute("select * from sometable") </span><span class="cx"> for x in xrange(20): </span><span class="cx"> result.fetchone() </span><del>- </del><ins>+ </ins><span class="cx"> engine.test_shutdown() </span><span class="cx"> try: </span><span class="cx"> result.fetchone() </span><span class="cx"> assert False </span><del>- except exc.DBAPIError, e: </del><ins>+ except tsa.exc.DBAPIError, e: </ins><span class="cx"> if not e.connection_invalidated: </span><span class="cx"> raise </span><span class="cx"> </span><span class="cx"> assert conn.invalidated </span><del>- </del><ins>+ </ins><span class="cx"> if __name__ == '__main__': </span><span class="cx"> testenv.main() </span></span></pre></div> <a id="sqlalchemybranchesuser_defined_statetestenginereflectionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/user_defined_state/test/engine/reflection.py (4585 => 4586)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/user_defined_state/test/engine/reflection.py 2008-04-29 01:49:38 UTC (rev 4585) +++ sqlalchemy/branches/user_defined_state/test/engine/reflection.py 2008-04-29 01:50:56 UTC (rev 4586) </span><span class="lines">@@ -1,12 +1,13 @@ </span><span class="cx"> import testenv; testenv.configure_for_tests() </span><span class="cx"> import StringIO, unicodedata </span><del>-from sqlalchemy import * -from sqlalchemy import exc -from sqlalchemy import types as sqltypes -from testlib import * -from testlib import engines </del><ins>+import sqlalchemy as sa +from testlib.sa import MetaData, Table, Column +from testlib import TestBase, ComparesTables, testing, engines, sa as tsa +from testlib.compat import set </ins><span class="cx"> </span><span class="cx"> </span><ins>+metadata, users = None, None + </ins><span class="cx"> class ReflectionTest(TestBase, ComparesTables): </span><span class="cx"> </span><span class="cx"> @testing.exclude('mysql', '<', (4, 1, 1)) </span><span class="lines">@@ -14,35 +15,38 @@ </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> </span><span class="cx"> users = Table('engine_users', meta, </span><del>- Column('user_id', INT, primary_key=True), - Column('user_name', VARCHAR(20), nullable=False), - Column('test1', CHAR(5), nullable=False), - Column('test2', Float(5), nullable=False), - Column('test3', Text), - Column('test4', Numeric, nullable = False), - Column('test5', DateTime), - Column('parent_user_id', Integer, ForeignKey('engine_users.user_id')), - Column('test6', DateTime, nullable=False), - Column('test7', Text), - Column('test8', Binary), - Column('test_passivedefault2', Integer, PassiveDefault("5")), - Column('test9', Binary(100)), - Column('test_numeric', Numeric()), </del><ins>+ Column('user_id', sa.INT, primary_key=True), + Column('user_name', sa.VARCHAR(20), nullable=False), + Column('test1', sa.CHAR(5), nullable=False), + Column('test2', sa.Float(5), nullable=False), + Column('test3', sa.Text), + Column('test4', sa.Numeric, nullable = False), + Column('test5', sa.DateTime), + Column('parent_user_id', sa.Integer, + sa.ForeignKey('engine_users.user_id')), + Column('test6', sa.DateTime, nullable=False), + Column('test7', sa.Text), + Column('test8', sa.Binary), + Column('test_passivedefault2', sa.Integer, sa.PassiveDefault("5")), + Column('test9', sa.Binary(100)), + Column('test_numeric', sa.Numeric()), </ins><span class="cx"> test_needs_fk=True, </span><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> addresses = Table('engine_email_addresses', meta, </span><del>- Column('address_id', Integer, primary_key = True), - Column('remote_user_id', Integer, ForeignKey(users.c.user_id)), - Column('email_address', String(20)), </del><ins>+ Column('address_id', sa.Integer, primary_key = True), + Column('remote_user_id', sa.Integer, sa.ForeignKey(users.c.user_id)), + Column('email_address', sa.String(20)), </ins><span class="cx"> test_needs_fk=True, </span><span class="cx"> ) </span><span class="cx"> meta.create_all() </span><span class="cx"> </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData() </span><del>- reflected_users = Table('engine_users', meta2, autoload=True, autoload_with=testing.db) - reflected_addresses = Table('engine_email_addresses', meta2, autoload=True, autoload_with=testing.db) </del><ins>+ reflected_users = Table('engine_users', meta2, autoload=True, + autoload_with=testing.db) + reflected_addresses = Table('engine_email_addresses', meta2, + autoload=True, autoload_with=testing.db) </ins><span class="cx"> self.assert_tables_equal(users, reflected_users) </span><span class="cx"> self.assert_tables_equal(addresses, reflected_addresses) </span><span class="cx"> finally: </span><span class="lines">@@ -51,22 +55,25 @@ </span><span class="cx"> </span><span class="cx"> def test_include_columns(self): </span><span class="cx"> meta = MetaData(testing.db) </span><del>- foo = Table('foo', meta, *[Column(n, String(30)) for n in ['a', 'b', 'c', 'd', 'e', 'f']]) </del><ins>+ foo = Table('foo', meta, *[Column(n, sa.String(30)) + for n in ['a', 'b', 'c', 'd', 'e', 'f']]) </ins><span class="cx"> meta.create_all() </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData(testing.db) </span><del>- foo = Table('foo', meta2, autoload=True, include_columns=['b', 'f', 'e']) </del><ins>+ foo = Table('foo', meta2, autoload=True, + include_columns=['b', 'f', 'e']) </ins><span class="cx"> # test that cols come back in original order </span><span class="cx"> self.assertEquals([c.name for c in foo.c], ['b', 'e', 'f']) </span><span class="cx"> for c in ('b', 'f', 'e'): </span><span class="cx"> assert c in foo.c </span><span class="cx"> for c in ('a', 'c', 'd'): </span><span class="cx"> assert c not in foo.c </span><del>- </del><ins>+ </ins><span class="cx"> # test against a table which is already reflected </span><span class="cx"> meta3 = MetaData(testing.db) </span><span class="cx"> foo = Table('foo', meta3, autoload=True) </span><del>- foo = Table('foo', meta3, include_columns=['b', 'f', 'e'], useexisting=True) </del><ins>+ foo = Table('foo', meta3, include_columns=['b', 'f', 'e'], + useexisting=True) </ins><span class="cx"> self.assertEquals([c.name for c in foo.c], ['b', 'e', 'f']) </span><span class="cx"> for c in ('b', 'f', 'e'): </span><span class="cx"> assert c in foo.c </span><span class="lines">@@ -79,7 +86,7 @@ </span><span class="cx"> def test_unknown_types(self): </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> t = Table("test", meta, </span><del>- Column('foo', DateTime)) </del><ins>+ Column('foo', sa.DateTime)) </ins><span class="cx"> </span><span class="cx"> import sys </span><span class="cx"> dialect_module = sys.modules[testing.db.dialect.__module__] </span><span class="lines">@@ -100,14 +107,14 @@ </span><span class="cx"> m2 = MetaData(testing.db) </span><span class="cx"> t2 = Table("test", m2, autoload=True) </span><span class="cx"> assert False </span><del>- except exc.SAWarning: </del><ins>+ except tsa.exc.SAWarning: </ins><span class="cx"> assert True </span><span class="cx"> </span><span class="cx"> @testing.emits_warning('Did not recognize type') </span><span class="cx"> def warns(): </span><span class="cx"> m3 = MetaData(testing.db) </span><span class="cx"> t3 = Table("test", m3, autoload=True) </span><del>- assert t3.c.foo.type.__class__ == sqltypes.NullType </del><ins>+ assert t3.c.foo.type.__class__ == sa.types.NullType </ins><span class="cx"> </span><span class="cx"> finally: </span><span class="cx"> dialect_module.ischema_names = ischema_names </span><span class="lines">@@ -117,9 +124,9 @@ </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> table = Table( </span><span class="cx"> 'override_test', meta, </span><del>- Column('col1', Integer, primary_key=True), - Column('col2', String(20)), - Column('col3', Numeric) </del><ins>+ Column('col1', sa.Integer, primary_key=True), + Column('col2', sa.String(20)), + Column('col3', sa.Numeric) </ins><span class="cx"> ) </span><span class="cx"> table.create() </span><span class="cx"> </span><span class="lines">@@ -127,12 +134,12 @@ </span><span class="cx"> try: </span><span class="cx"> table = Table( </span><span class="cx"> 'override_test', meta2, </span><del>- Column('col2', Unicode()), - Column('col4', String(30)), autoload=True) </del><ins>+ Column('col2', sa.Unicode()), + Column('col4', sa.String(30)), autoload=True) </ins><span class="cx"> </span><del>- self.assert_(isinstance(table.c.col1.type, Integer)) - self.assert_(isinstance(table.c.col2.type, Unicode)) - self.assert_(isinstance(table.c.col4.type, String)) </del><ins>+ self.assert_(isinstance(table.c.col1.type, sa.Integer)) + self.assert_(isinstance(table.c.col2.type, sa.Unicode)) + self.assert_(isinstance(table.c.col4.type, sa.String)) </ins><span class="cx"> finally: </span><span class="cx"> table.drop() </span><span class="cx"> </span><span class="lines">@@ -142,18 +149,19 @@ </span><span class="cx"> </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> users = Table('users', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('name', String(30))) </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('name', sa.String(30))) </ins><span class="cx"> addresses = Table('addresses', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('street', String(30))) </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('street', sa.String(30))) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> meta.create_all() </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData(testing.db) </span><span class="cx"> a2 = Table('addresses', meta2, </span><del>- Column('id', Integer, ForeignKey('users.id'), primary_key=True), </del><ins>+ Column('id', sa.Integer, + sa.ForeignKey('users.id'), primary_key=True), </ins><span class="cx"> autoload=True) </span><span class="cx"> u2 = Table('users', meta2, autoload=True) </span><span class="cx"> </span><span class="lines">@@ -164,7 +172,8 @@ </span><span class="cx"> meta3 = MetaData(testing.db) </span><span class="cx"> u3 = Table('users', meta3, autoload=True) </span><span class="cx"> a3 = Table('addresses', meta3, </span><del>- Column('id', Integer, ForeignKey('users.id'), primary_key=True), </del><ins>+ Column('id', sa.Integer, sa.ForeignKey('users.id'), + primary_key=True), </ins><span class="cx"> autoload=True) </span><span class="cx"> </span><span class="cx"> assert list(a3.primary_key) == [a3.c.id] </span><span class="lines">@@ -180,18 +189,18 @@ </span><span class="cx"> </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> users = Table('users', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('name', String(30))) </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('name', sa.String(30))) </ins><span class="cx"> addresses = Table('addresses', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('street', String(30)), - Column('user_id', Integer)) </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('street', sa.String(30)), + Column('user_id', sa.Integer)) </ins><span class="cx"> </span><span class="cx"> meta.create_all() </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData(testing.db) </span><span class="cx"> a2 = Table('addresses', meta2, </span><del>- Column('user_id', Integer, ForeignKey('users.id')), </del><ins>+ Column('user_id', sa.Integer, sa.ForeignKey('users.id')), </ins><span class="cx"> autoload=True) </span><span class="cx"> u2 = Table('users', meta2, autoload=True) </span><span class="cx"> </span><span class="lines">@@ -205,19 +214,19 @@ </span><span class="cx"> meta3 = MetaData(testing.db) </span><span class="cx"> u3 = Table('users', meta3, autoload=True) </span><span class="cx"> a3 = Table('addresses', meta3, </span><del>- Column('user_id', Integer, ForeignKey('users.id')), </del><ins>+ Column('user_id', sa.Integer, sa.ForeignKey('users.id')), </ins><span class="cx"> autoload=True) </span><span class="cx"> </span><span class="cx"> assert u3.join(a3).onclause == u3.c.id==a3.c.user_id </span><span class="cx"> </span><span class="cx"> meta4 = MetaData(testing.db) </span><span class="cx"> u4 = Table('users', meta4, </span><del>- Column('id', Integer, key='u_id', primary_key=True), </del><ins>+ Column('id', sa.Integer, key='u_id', primary_key=True), </ins><span class="cx"> autoload=True) </span><span class="cx"> a4 = Table('addresses', meta4, </span><del>- Column('id', Integer, key='street', primary_key=True), - Column('street', String(30), key='user_id'), - Column('user_id', Integer, ForeignKey('users.u_id'), </del><ins>+ Column('id', sa.Integer, key='street', primary_key=True), + Column('street', sa.String(30), key='user_id'), + Column('user_id', sa.Integer, sa.ForeignKey('users.u_id'), </ins><span class="cx"> key='id'), </span><span class="cx"> autoload=True) </span><span class="cx"> </span><span class="lines">@@ -237,19 +246,19 @@ </span><span class="cx"> </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> users = Table('users', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('name', String(30)), </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('name', sa.String(30)), </ins><span class="cx"> test_needs_fk=True) </span><span class="cx"> addresses = Table('addresses', meta, </span><del>- Column('id', Integer,primary_key=True), - Column('user_id', Integer, ForeignKey('users.id')), </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('user_id', sa.Integer, sa.ForeignKey('users.id')), </ins><span class="cx"> test_needs_fk=True) </span><span class="cx"> </span><span class="cx"> meta.create_all() </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData(testing.db) </span><span class="cx"> a2 = Table('addresses', meta2, </span><del>- Column('user_id',Integer, ForeignKey('users.id')), </del><ins>+ Column('user_id', sa.Integer, sa.ForeignKey('users.id')), </ins><span class="cx"> autoload=True) </span><span class="cx"> u2 = Table('users', meta2, autoload=True) </span><span class="cx"> </span><span class="lines">@@ -263,11 +272,11 @@ </span><span class="cx"> </span><span class="cx"> meta2 = MetaData(testing.db) </span><span class="cx"> u2 = Table('users', meta2, </span><del>- Column('id', Integer, primary_key=True), </del><ins>+ Column('id', sa.Integer, primary_key=True), </ins><span class="cx"> autoload=True) </span><span class="cx"> a2 = Table('addresses', meta2, </span><del>- Column('id', Integer, primary_key=True), - Column('user_id',Integer, ForeignKey('users.id')), </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('user_id', sa.Integer, sa.ForeignKey('users.id')), </ins><span class="cx"> autoload=True) </span><span class="cx"> </span><span class="cx"> assert len(a2.foreign_keys) == 1 </span><span class="lines">@@ -279,31 +288,31 @@ </span><span class="cx"> assert u2.join(a2).onclause == u2.c.id==a2.c.user_id </span><span class="cx"> finally: </span><span class="cx"> meta.drop_all() </span><del>- </del><ins>+ </ins><span class="cx"> def test_use_existing(self): </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> users = Table('users', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('name', String(30)), </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('name', sa.String(30)), </ins><span class="cx"> test_needs_fk=True) </span><span class="cx"> addresses = Table('addresses', meta, </span><del>- Column('id', Integer,primary_key=True), - Column('user_id', Integer, ForeignKey('users.id')), - Column('data', String(100)), </del><ins>+ Column('id', sa.Integer,primary_key=True), + Column('user_id', sa.Integer, sa.ForeignKey('users.id')), + Column('data', sa.String(100)), </ins><span class="cx"> test_needs_fk=True) </span><span class="cx"> </span><span class="cx"> meta.create_all() </span><span class="cx"> try: </span><span class="cx"> meta2 = MetaData(testing.db) </span><del>- addresses = Table('addresses', meta2, Column('data', Unicode), autoload=True) </del><ins>+ addresses = Table('addresses', meta2, Column('data', sa.Unicode), autoload=True) </ins><span class="cx"> try: </span><del>- users = Table('users', meta2, Column('name', Unicode), autoload=True) </del><ins>+ users = Table('users', meta2, Column('name', sa.Unicode), autoload=True) </ins><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, err: </del><ins>+ except tsa.exc.InvalidRequestError, err: </ins><span class="cx"> assert str(err) == "Table 'users' is already defined for this MetaData instance. Specify 'useexisting=True' to redefine options and columns on an existing Table object." </span><span class="cx"> </span><del>- users = Table('users', meta2, Column('name', Unicode), autoload=True, useexisting=True) - assert isinstance(users.c.name.type, Unicode) </del><ins>+ users = Table('users', meta2, Column('name', sa.Unicode), autoload=True, useexisting=True) + assert isinstance(users.c.name.type, sa.Unicode) </ins><span class="cx"> </span><span class="cx"> assert not users.quote </span><span class="cx"> </span><span class="lines">@@ -337,14 +346,14 @@ </span><span class="cx"> def test_fk_error(self): </span><span class="cx"> metadata = MetaData(testing.db) </span><span class="cx"> slots_table = Table('slots', metadata, </span><del>- Column('slot_id', Integer, primary_key=True), - Column('pkg_id', Integer, ForeignKey('pkgs.pkg_id')), - Column('slot', String(128)), </del><ins>+ Column('slot_id', sa.Integer, primary_key=True), + Column('pkg_id', sa.Integer, sa.ForeignKey('pkgs.pkg_id')), + Column('slot', sa.String(128)), </ins><span class="cx"> ) </span><span class="cx"> try: </span><span class="cx"> metadata.create_all() </span><span class="cx"> assert False </span><del>- except exc.InvalidRequestError, err: </del><ins>+ except tsa.exc.InvalidRequestError, err: </ins><span class="cx"> assert str(err) == "Could not find table 'pkgs' with which to generate a foreign key" </span><span class="cx"> </span><span class="cx"> def test_composite_pks(self): </span><span class="lines">@@ -377,20 +386,20 @@ </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> multi = Table( </span><span class="cx"> 'multi', meta, </span><del>- Column('multi_id', Integer, primary_key=True), - Column('multi_rev', Integer, primary_key=True), - Column('multi_hoho', Integer, primary_key=True), - Column('name', String(50), nullable=False), - Column('val', String(100)), </del><ins>+ Column('multi_id', sa.Integer, primary_key=True), + Column('multi_rev', sa.Integer, primary_key=True), + Column('multi_hoho', sa.Integer, primary_key=True), + Column('name', sa.String(50), nullable=False), + Column('val', sa.String(100)), </ins><span class="cx"> test_needs_fk=True, </span><span class="cx"> ) </span><span class="cx"> multi2 = Table('multi2', meta, </span><del>- Column('id', Integer, primary_key=True), - Column('foo', Integer), - Column('bar', Integer), - Column('lala', Integer), - Column('data', String(50)), - ForeignKeyConstraint(['foo', 'bar', 'lala'], ['multi.multi_id', 'multi.multi_rev', 'multi.multi_hoho']), </del><ins>+ Column('id', sa.Integer, primary_key=True), + Column('foo', sa.Integer), + Column('bar', sa.Integer), + Column('lala', sa.Integer), + Column('data', sa.String(50)), + sa.ForeignKeyConstraint(['foo', 'bar', 'lala'], ['multi.multi_id', 'multi.multi_rev', 'multi.multi_hoho']), </ins><span class="cx"> test_needs_fk=True, </span><span class="cx"> ) </span><span class="cx"> meta.create_all() </span><span class="lines">@@ -401,8 +410,8 @@ </span><span class="cx"> table2 = Table('multi2', meta2, autoload=True, autoload_with=testing.db) </span><span class="cx"> self.assert_tables_equal(multi, table) </span><span class="cx"> self.assert_tables_equal(multi2, table2) </span><del>- j = join(table, table2) - self.assert_(and_(table.c.multi_id==table2.c.foo, table.c.multi_rev==table2.c.bar, table.c.multi_hoho==table2.c.lala).compare(j.onclause)) </del><ins>+ j = sa.join(table, table2) + self.assert_(sa.and_(table.c.multi_id==table2.c.foo, table.c.multi_rev==table2.c.bar, table.c.multi_hoho==table2.c.lala).compare(j.onclause)) </ins><span class="cx"> finally: </span><span class="cx"> meta.drop_all() </span><span class="cx"> </span><span class="lines">@@ -412,10 +421,10 @@ </span><span class="cx"> # check a table that uses an SQL reserved name doesn't cause an error </span><span class="cx"> meta = MetaData(testing.db) </span><span class="cx"> table_a = Table('select', meta, </span><del>- Column('not', Integer, primary_key=True), - Column('from', String(12), nullable=False), - UniqueConstraint('from', name='when')) - Index('where', table_a.c['from']) </del><ins>+ Column('not', sa.Integer, primary_key=True), + Column('from', sa.String(12), nullable=False), + sa.UniqueConstraint('from', name='when')) + sa.Index('where', table_a.c['from']) </ins><span class="cx"> </span><span class="cx"> # There's currently no way to calculate identifier case normalization </span><span class="cx"> # in isolation, so... </span><span class="lines">@@ -426,17 +435,17 @@ </span><span class="cx"> quoter = meta.bind.dialect.identifier_preparer.quote_identifier </span><span class="cx"> </span><span class="cx"> table_b = Table('false', meta, </span><del>- Column('create', Integer, primary_key=True), - Column('true', Integer, ForeignKey('select.not')), - CheckConstraint('%s <> 1' % quoter(check_col), </del><ins>+ Column('create', sa.Integer, primary_key=True), + Column('true', sa.Integer, sa.ForeignKey('select.not')), + sa.CheckConstraint('%s <> 1' % quoter(check_col), </ins><span class="cx"> name='limit')) </span><span class="cx"> </span><span class="cx"> table_c = Table('is', meta, </span><del>- Column('or', Integer, nullable=False, primary_key=True), - Column('join', Integer, nullable=False, primary_key=True), - PrimaryKeyConstraint('or', 'join', name='to')) </del><ins>+ Column('or', sa.Integer, nullable=False, primary_key=True), + Column('join', sa.Integer, nullable=False, primary_key=True), + sa.PrimaryKeyConstraint('or', 'join', name='to')) </ins><span class="cx"> </span><del>- index_c = Index('else', table_c.c.join) </del><ins>+ index_c = sa.Index('else', table_c.c.join) </ins><span class="cx"> </span><span class="cx"> meta.create_all() </span><span class="cx"> </span><span class="lines">@@ -462,7 +471,7 @@ </span><span class="cx"> </span><span class="cx"> baseline = MetaData(testing.db) </span><span class="cx"> for name in names: </span><del>- Table(name, baseline, Column('id', Integer, primary_key=True)) </del><ins>+ Table(name, baseline, Column('id', sa.Integer, primary_key=True)) </ins><span class="cx"> baseline.create_all() </span><span class="cx"> </span><span class="cx"> try: </span><span class="lines">@@ -484,7 +493,7 @@ </span><span class="cx"> try: </span><span class="cx"> m4.reflect(only=['rt_a', 'rt_f']) </span><span class="cx"> self.assert_(False) </span><del>- except exc.InvalidRequestError, e: </del><ins>+ except tsa.exc.InvalidRequestError, e: </ins><span class="cx"> self.assert_(e.args[0].endswith('(rt_f)')) </span><span class="cx"> </span><span class="cx"> m5 = MetaData(testing.db) </span><span class="lines">@@ -501,7 +510,7 @@ </span><span class="cx"> try: </span><span class="cx"> m8 = MetaData(reflect=True) </span><span class="cx"> self.assert_(False) </span><del>- except exc.ArgumentError, e: </del><ins>+ except tsa.exc.ArgumentError, e: </ins><span class="cx"> self.assert_( </span><span class="cx"> e.args[0] == </span><span class="cx"> "A bind must be supplied in conjunction with reflect=True") </span><span class="lines">@@ -521,27 +530,27 @@ </span><span class="cx"> global metadata, users </span><span class="cx"> metadata = MetaData() </span><span class="cx"> users = Table('users', metadata, </span><del>- Column('user_id', Integer, Sequence('user_id_seq', optional=True), primary_key=True), - Column('user_name', String(40)), </del><ins>+ Column('user_id', sa.Integer, sa.Sequence('user_id_seq', optional=True), primary_key=True), + Column('user_name', sa.String(40)), </ins><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> addresses = Table('email_addresses', metadata, </span><del>- Column('address_id', Integer, Sequence('address_id_seq', optional=True), primary_key = True), - Column('user_id', Integer, ForeignKey(users.c.user_id)), - Column('email_address', String(40)), </del><ins>+ Column('address_id', sa.Integer, sa.Sequence('address_id_seq', optional=True), primary_key = True), + Column('user_id', sa.Integer, sa.ForeignKey(users.c.user_id)), + Column('email_address', sa.String(40)), </ins><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> orders = Table('orders', metadata, </span><del>- Column('order_id', Integer, Sequence('order_id_seq', optional=True), primary_key = True), - Column('user_id', Integer, ForeignKey(users.c.user_id)), - Column('description', String(50)), - Column('isopen', Integer), </del><ins>+ Column('order_id', sa.Integer, sa.Sequence('order_id_seq', optional=True), primary_key = True), + Column('user_id', sa.Integer, sa.ForeignKey(users.c.user_id)), + Column('description', sa.String(50)), + Column('isopen', sa.Integer), </ins><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> orderitems = Table('items', metadata, </span><del>- Column('item_id', INT, Sequence('items_id_seq', optional=True), primary_key = True), - Column('order_id', INT, ForeignKey("orders")), - Column('ite... [truncated message content] |