[Sqlalchemy-commits] [1130] sqlalchemy/trunk/test: oracle is requiring dictionary params to be in a
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1130] sqlalchemy/trunk/test: oracle is requiring dictionary params to be in a clean dict, added conversion
|
From: <co...@sq...> - 2006-03-13 02:00:32
|
<!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>[1130] sqlalchemy/trunk/test: oracle is requiring dictionary params to be in a clean dict, added conversion</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1130</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-12 20:00:21 -0600 (Sun, 12 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>oracle is requiring dictionary params to be in a clean dict, added conversion some fixes to unit tests</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyenginepy">sqlalchemy/trunk/lib/sqlalchemy/engine.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyexceptionspy">sqlalchemy/trunk/lib/sqlalchemy/exceptions.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemytrunktestobjectstorepy">sqlalchemy/trunk/test/objectstore.py</a></li> <li><a href="#sqlalchemytrunktesttesttypespy">sqlalchemy/trunk/test/testtypes.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyenginepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine.py (1129 => 1130)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-13 01:13:47 UTC (rev 1129) +++ sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-13 02:00:21 UTC (rev 1130) </span><span class="lines">@@ -586,14 +586,7 @@ </span><span class="cx"> if statement is None: </span><span class="cx"> return cursor </span><span class="cx"> </span><del>- executemany = parameters is not None and isinstance(parameters, list) - - if self.positional: - if executemany: - parameters = [p.values() for p in parameters] - else: - parameters = parameters.values() - </del><ins>+ parameters = self._convert_compiled_params(parameters) </ins><span class="cx"> self.execute(statement, parameters, connection=connection, cursor=cursor, return_raw=True) </span><span class="cx"> return cursor </span><span class="cx"> </span><span class="lines">@@ -657,12 +650,12 @@ </span><span class="cx"> return ResultProxy(cursor, self, typemap=typemap) </span><span class="cx"> </span><span class="cx"> def _execute(self, c, statement, parameters): </span><ins>+ if parameters is None: + if self.positional: + parameters = () + else: + parameters = {} </ins><span class="cx"> try: </span><del>- if parameters is None: - if self.positional: - parameters = () - else: - parameters = {} </del><span class="cx"> c.execute(statement, parameters) </span><span class="cx"> except Exception, e: </span><span class="cx"> raise exceptions.SQLError(statement, parameters, e) </span><span class="lines">@@ -671,15 +664,26 @@ </span><span class="cx"> c.executemany(statement, parameters) </span><span class="cx"> self.context.rowcount = c.rowcount </span><span class="cx"> </span><del>- def proxy(self, statement=None, parameters=None): </del><ins>+ def _convert_compiled_params(self, parameters): </ins><span class="cx"> executemany = parameters is not None and isinstance(parameters, list) </span><ins>+ # the bind params are a CompiledParams object. but all the DBAPI's hate + # that object (or similar). so convert it to a clean + # dictionary/list/tuple of dictionary/tuple of list + if parameters is not None: + if self.positional: + if executemany: + parameters = [p.values() for p in parameters] + else: + parameters = parameters.values() + else: + if executemany: + parameters = [p.get_raw_dict() for p in parameters] + else: + parameters = parameters.get_raw_dict() + return parameters </ins><span class="cx"> </span><del>- if self.positional: - if executemany: - parameters = [p.values() for p in parameters] - else: - parameters = parameters.values() - </del><ins>+ def proxy(self, statement=None, parameters=None): + parameters = self._convert_compiled_params(parameters) </ins><span class="cx"> return self.execute(statement, parameters) </span><span class="cx"> </span><span class="cx"> def log(self, msg): </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyexceptionspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/exceptions.py (1129 => 1130)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/exceptions.py 2006-03-13 01:13:47 UTC (rev 1129) +++ sqlalchemy/trunk/lib/sqlalchemy/exceptions.py 2006-03-13 02:00:21 UTC (rev 1130) </span><span class="lines">@@ -17,6 +17,8 @@ </span><span class="cx"> self.statement = statement </span><span class="cx"> self.params = params </span><span class="cx"> self.orig = orig </span><ins>+ def __str__(self): + return SQLAlchemyError.__str__(self) + " " + repr(self.statement) + " " + repr(self.params) </ins><span class="cx"> </span><span class="cx"> class ArgumentError(SQLAlchemyError): </span><span class="cx"> """raised for all those conditions where invalid arguments are sent to constructed </span><span class="lines">@@ -38,4 +40,4 @@ </span><span class="cx"> </span><span class="cx"> class DBAPIError(SQLAlchemyError): </span><span class="cx"> """something weird happened with a particular DBAPI version""" </span><del>- pass </del><span class="cx">\ No newline at end of file </span><ins>+ pass </ins></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1129 => 1130)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-13 01:13:47 UTC (rev 1129) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-13 02:00:21 UTC (rev 1130) </span><span class="lines">@@ -252,6 +252,11 @@ </span><span class="cx"> return [self[key] for key in self] </span><span class="cx"> def get_original_dict(self): </span><span class="cx"> return self.copy() </span><ins>+ def get_raw_dict(self): + d = {} + for k in self: + d[k] = self[k] + return d </ins><span class="cx"> </span><span class="cx"> class ClauseVisitor(object): </span><span class="cx"> """Defines the visiting of ClauseElements.""" </span></span></pre></div> <a id="sqlalchemytrunktestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/objectstore.py (1129 => 1130)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/objectstore.py 2006-03-13 01:13:47 UTC (rev 1129) +++ sqlalchemy/trunk/test/objectstore.py 2006-03-13 02:00:21 UTC (rev 1130) </span><span class="lines">@@ -144,7 +144,7 @@ </span><span class="cx"> class UnicodeTest(AssertMixin): </span><span class="cx"> def setUpAll(self): </span><span class="cx"> global uni_table </span><del>- uni_table = Table('test', db, </del><ins>+ uni_table = Table('uni_test', db, </ins><span class="cx"> Column('id', Integer, primary_key=True), </span><span class="cx"> Column('txt', Unicode(50))).create() </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunktesttesttypespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/testtypes.py (1129 => 1130)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/testtypes.py 2006-03-13 01:13:47 UTC (rev 1129) +++ sqlalchemy/trunk/test/testtypes.py 2006-03-13 02:00:21 UTC (rev 1130) </span><span class="lines">@@ -96,7 +96,7 @@ </span><span class="cx"> def setUpAll(self): </span><span class="cx"> global unicode_table </span><span class="cx"> unicode_table = Table('unicode_table', db, </span><del>- Column('id', Integer, primary_key=True), </del><ins>+ Column('id', Integer, Sequence('uni_id_seq', optional=True), primary_key=True), </ins><span class="cx"> Column('unicode_data', Unicode(250)), </span><span class="cx"> Column('plain_data', String(250)) </span><span class="cx"> ) </span></span></pre> </div> </div> </body> </html> |
