[Sqlalchemy-commits] [1070] sqlalchemy/trunk/test: added schema support for postgres column defaults
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1070] sqlalchemy/trunk/test: added schema support for postgres column defaults, fix for [ticket:88]
|
From: <co...@sq...> - 2006-03-01 07:23:10
|
<!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>[1070] sqlalchemy/trunk/test: added schema support for postgres column defaults, fix for [ticket:88]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1070</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-01 01:22:53 -0600 (Wed, 01 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>added schema support for postgres column defaults, fix for [ticket:88]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemydatabasespostgrespy">sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py</a></li> <li><a href="#sqlalchemytrunktestquerypy">sqlalchemy/trunk/test/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemydatabasespostgrespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py (1069 => 1070)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2006-03-01 00:11:25 UTC (rev 1069) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/postgres.py 2006-03-01 07:22:53 UTC (rev 1070) </span><span class="lines">@@ -338,7 +338,12 @@ </span><span class="cx"> c = self.proxy("select %s" % column.default.arg) </span><span class="cx"> return c.fetchone()[0] </span><span class="cx"> elif isinstance(column.type, types.Integer) and (column.default is None or (isinstance(column.default, schema.Sequence) and column.default.optional)): </span><del>- c = self.proxy("select nextval('%s_%s_seq')" % (column.table.name, column.name)) </del><ins>+ sch = column.table.schema + if sch is not None: + exc = "select nextval('%s.%s_%s_seq')" % (sch, column.table.name, column.name) + else: + exc = "select nextval('%s_%s_seq')" % (column.table.name, column.name) + c = self.proxy(exc) </ins><span class="cx"> return c.fetchone()[0] </span><span class="cx"> else: </span><span class="cx"> return ansisql.ANSIDefaultRunner.get_column_default(self, column) </span></span></pre></div> <a id="sqlalchemytrunktestquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/query.py (1069 => 1070)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/query.py 2006-03-01 00:11:25 UTC (rev 1069) +++ sqlalchemy/trunk/test/query.py 2006-03-01 07:22:53 UTC (rev 1070) </span><span class="lines">@@ -67,6 +67,29 @@ </span><span class="cx"> self.assert_(l == [(1, 'user', 'lala')]) </span><span class="cx"> finally: </span><span class="cx"> db.execute("drop table speedy_users", None) </span><ins>+ + def testschema(self): + if not db.engine.__module__.endswith('postgres'): + return + + test_table = Table('my_table', db, + Column('id', Integer, primary_key=True), + Column('data', String(20), nullable=False), + schema='alt_schema' + ) + test_table.create() + try: + # plain insert + test_table.insert().execute(data='test') + + # try with a PassiveDefault + test_table.deregister() + test_table = Table('my_table', db, autoload=True, redefine=True, schema='alt_schema') + test_table.insert().execute(data='test') + + finally: + test_table.drop() + </ins><span class="cx"> def testdefaults(self): </span><span class="cx"> x = {'x':50} </span><span class="cx"> def mydefault(): </span></span></pre> </div> </div> </body> </html> |
