[Sqlalchemy-commits] [1421] sqlalchemy/branches/schema/test: sqlite url parse fix for [ticket:174]
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1421] sqlalchemy/branches/schema/test: sqlite url parse fix for [ticket:174]
|
From: <co...@sq...> - 2006-05-08 04:14:41
|
<!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>[1421] sqlalchemy/branches/schema/test: sqlite url parse fix for [ticket:174]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1421</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-07 23:14:28 -0500 (Sun, 07 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>sqlite url parse fix for [ticket:174]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemydatabasessqlitepy">sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyengineurlpy">sqlalchemy/branches/schema/lib/sqlalchemy/engine/url.py</a></li> <li><a href="#sqlalchemybranchesschematestparseconnectpy">sqlalchemy/branches/schema/test/parseconnect.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemydatabasessqlitepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py (1420 => 1421)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py 2006-05-08 04:01:19 UTC (rev 1420) +++ sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py 2006-05-08 04:14:28 UTC (rev 1421) </span><span class="lines">@@ -131,7 +131,7 @@ </span><span class="cx"> def schemagenerator(self, *args, **kwargs): </span><span class="cx"> return SQLiteSchemaGenerator(*args, **kwargs) </span><span class="cx"> def create_connect_args(self, url): </span><del>- filename = url.host or ':memory:' </del><ins>+ filename = url.database or ':memory:' </ins><span class="cx"> return ([filename], {}) </span><span class="cx"> def type_descriptor(self, typeobj): </span><span class="cx"> return sqltypes.adapt_type(typeobj, colspecs) </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyengineurlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/engine/url.py (1420 => 1421)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/engine/url.py 2006-05-08 04:01:19 UTC (rev 1420) +++ sqlalchemy/branches/schema/lib/sqlalchemy/engine/url.py 2006-05-08 04:14:28 UTC (rev 1421) </span><span class="lines">@@ -10,7 +10,19 @@ </span><span class="cx"> self.port = port </span><span class="cx"> self.database= database </span><span class="cx"> def __str__(self): </span><del>- return "%s:%s@%s:%s/%s" % (self.username,self.password, self.host,self.port,self.database) </del><ins>+ s = self.drivername + "://" + if self.username is not None: + s += self.username + if self.password is not None: + s += ':' + self.password + s += "@" + if self.host is not None: + s += self.host + if self.port is not None: + s += ':' + self.port + if self.database is not None: + s += '/' + self.database + return s </ins><span class="cx"> def get_module(self): </span><span class="cx"> return getattr(__import__('sqlalchemy.databases.%s' % self.drivername).databases, self.drivername) </span><span class="cx"> def translate_connect_args(self, names): </span></span></pre></div> <a id="sqlalchemybranchesschematestparseconnectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/parseconnect.py (1420 => 1421)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/parseconnect.py 2006-05-08 04:01:19 UTC (rev 1420) +++ sqlalchemy/branches/schema/test/parseconnect.py 2006-05-08 04:14:28 UTC (rev 1421) </span><span class="lines">@@ -15,11 +15,13 @@ </span><span class="cx"> 'dbtype://hostspec', </span><span class="cx"> 'dbtype:///database', </span><span class="cx"> 'dbtype:///:memory:', </span><ins>+ 'dbtype:///foo/bar/im/a/file', + 'dbtype:///E:/work/src/LEM/db/hello.db', </ins><span class="cx"> 'dbtype://' </span><span class="cx"> ): </span><span class="cx"> u = url.make_url(text) </span><del>- # TODO: assertion conditions - print u </del><ins>+ print u, text + assert str(u) == text </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span></span></pre> </div> </div> </body> </html> |
