[Sqlalchemy-commits] [1189] sqlalchemy/trunk/test: added oracle8 test target, sets use_ansi to false
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1189] sqlalchemy/trunk/test: added oracle8 test target, sets use_ansi to false
|
From: <co...@sq...> - 2006-03-23 06:35:38
|
<!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><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 { 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; } #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>[1189] sqlalchemy/trunk/test: added oracle8 test target, sets use_ansi to false</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1189</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-23 00:35:27 -0600 (Thu, 23 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>added oracle8 test target, sets use_ansi to false got mapper, objectstore, inheritance unittest working with oracle8, tweaks to join syntax</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesoraclepy">sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py</a></li> <li><a href="#sqlalchemytrunktestinheritancepy">sqlalchemy/trunk/test/inheritance.py</a></li> <li><a href="#sqlalchemytrunktesttestbasepy">sqlalchemy/trunk/test/testbase.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasesoraclepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py (1188 => 1189)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-23 06:19:26 UTC (rev 1188) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/oracle.py 2006-03-23 06:35:27 UTC (rev 1189) </span><span class="lines">@@ -233,14 +233,13 @@ </span><span class="cx"> </span><span class="cx"> if join.isouter: </span><span class="cx"> # if outer join, push on the right side table as the current "outertable" </span><del>- outertable = self._outertable </del><span class="cx"> self._outertable = join.right </span><span class="cx"> </span><span class="cx"> # now re-visit the onclause, which will be used as a where clause </span><span class="cx"> # (the first visit occured via the Join object itself right before it called visit_join()) </span><span class="cx"> join.onclause.accept_visitor(self) </span><span class="cx"> </span><del>- self._outertable = outertable </del><ins>+ self._outertable = None </ins><span class="cx"> </span><span class="cx"> self.visit_compound(self.wheres[join]) </span><span class="cx"> </span><span class="lines">@@ -250,13 +249,9 @@ </span><span class="cx"> self.strings[alias] = self.get_str(alias.original) </span><span class="cx"> </span><span class="cx"> def visit_column(self, column): </span><del>- if self._use_ansi: - return ansisql.ANSICompiler.visit_column(self, column) - - if column.table is self._outertable: - self.strings[column] = "%s.%s(+)" % (column.table.name, column.name) - else: - self.strings[column] = "%s.%s" % (column.table.name, column.name) </del><ins>+ ansisql.ANSICompiler.visit_column(self, column) + if not self._use_ansi and self._outertable is not None and column.table is self._outertable: + self.strings[column] = self.strings[column] + "(+)" </ins><span class="cx"> </span><span class="cx"> def visit_insert(self, insert): </span><span class="cx"> """inserts are required to have the primary keys be explicitly present. </span></span></pre></div> <a id="sqlalchemytrunktestinheritancepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/inheritance.py (1188 => 1189)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/inheritance.py 2006-03-23 06:19:26 UTC (rev 1188) +++ sqlalchemy/trunk/test/inheritance.py 2006-03-23 06:35:27 UTC (rev 1189) </span><span class="lines">@@ -95,7 +95,7 @@ </span><span class="cx"> engine = testbase.db </span><span class="cx"> global foo, bar, foo_bar </span><span class="cx"> foo = Table('foo', engine, </span><del>- Column('id', Integer, primary_key=True), </del><ins>+ Column('id', Integer, Sequence('foo_id_seq'), primary_key=True), </ins><span class="cx"> Column('data', String(20)), </span><span class="cx"> ).create() </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunktesttestbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/testbase.py (1188 => 1189)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/testbase.py 2006-03-23 06:19:26 UTC (rev 1188) +++ sqlalchemy/trunk/test/testbase.py 2006-03-23 06:35:27 UTC (rev 1189) </span><span class="lines">@@ -25,7 +25,7 @@ </span><span class="cx"> elif sys.argv[1] == '--db': </span><span class="cx"> (param, DBTYPE) = (sys.argv.pop(1), sys.argv.pop(1)) </span><span class="cx"> </span><del>- </del><ins>+ opts = {} </ins><span class="cx"> if (None == db_uri): </span><span class="cx"> p = DBTYPE.split('.') </span><span class="cx"> if len(p) > 1: </span><span class="lines">@@ -43,15 +43,18 @@ </span><span class="cx"> db_uri = 'mysql://database=test&host=127.0.0.1&user=scott&password=tiger' </span><span class="cx"> elif DBTYPE == 'oracle': </span><span class="cx"> db_uri = 'oracle://user=scott&password=tiger' </span><ins>+ elif DBTYPE == 'oracle8': + db_uri = 'oracle://user=scott&password=tiger' + opts = {'use_ansi':False} </ins><span class="cx"> </span><span class="cx"> if not db_uri: </span><span class="cx"> raise "Could not create engine. specify --db <sqlite|sqlite_file|postgres|mysql|oracle> to test runner." </span><span class="cx"> </span><span class="cx"> if PROXY: </span><del>- db = proxy.ProxyEngine(echo=echo, default_ordering=True) </del><ins>+ db = proxy.ProxyEngine(echo=echo, default_ordering=True, **opts) </ins><span class="cx"> db.connect(db_uri) </span><span class="cx"> else: </span><del>- db = engine.create_engine(db_uri, echo=echo, default_ordering=True) </del><ins>+ db = engine.create_engine(db_uri, echo=echo, default_ordering=True, **opts) </ins><span class="cx"> db = EngineAssert(db) </span><span class="cx"> </span><span class="cx"> class PersistTest(unittest.TestCase): </span></span></pre> </div> </div> </body> </html> |
