[Sqlalchemy-commits] [1483] sqlalchemy/branches/schema/lib/sqlalchemy: fixes...getting mapper column
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1483] sqlalchemy/branches/schema/lib/sqlalchemy: fixes...getting mapper column targeting to be more liberal, add_property fix
|
From: <co...@sq...> - 2006-05-21 22:37:11
|
<!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>[1483] sqlalchemy/branches/schema/lib/sqlalchemy: fixes...getting mapper column targeting to be more liberal, add_property fix</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1483</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-21 17:36:53 -0500 (Sun, 21 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixes...getting mapper column targeting to be more liberal, add_property fix</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyattributespy">sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemydatabasessqlitepy">sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyutilpy">sqlalchemy/branches/schema/lib/sqlalchemy/util.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py (1482 => 1483)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-21 21:17:58 UTC (rev 1482) +++ sqlalchemy/branches/schema/lib/sqlalchemy/attributes.py 2006-05-21 22:36:53 UTC (rev 1483) </span><span class="lines">@@ -522,5 +522,8 @@ </span><span class="cx"> if not hasattr(class_, '_attribute_manager'): </span><span class="cx"> class_._attribute_manager = self </span><span class="cx"> typecallable = getattr(class_, key, None) </span><ins>+ # TODO: look at existing properties on the class, and adapt them to the SmartProperty + if isinstance(typecallable, SmartProperty): + typecallable = None </ins><span class="cx"> setattr(class_, key, self.create_prop(class_, key, uselist, callable_, typecallable=typecallable, **kwargs)) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemydatabasessqlitepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py (1482 => 1483)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py 2006-05-21 21:17:58 UTC (rev 1482) +++ sqlalchemy/branches/schema/lib/sqlalchemy/databases/sqlite.py 2006-05-21 22:36:53 UTC (rev 1483) </span><span class="lines">@@ -116,7 +116,7 @@ </span><span class="cx"> return {'name':'sqlite', </span><span class="cx"> 'description':'SQLite', </span><span class="cx"> 'arguments':[ </span><del>- ('host', "Database Filename",None) </del><ins>+ ('database', "Database Filename",None) </ins><span class="cx"> ]} </span><span class="cx"> </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1482 => 1483)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-21 21:17:58 UTC (rev 1482) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-21 22:36:53 UTC (rev 1483) </span><span class="lines">@@ -1084,21 +1084,22 @@ </span><span class="cx"> def __init__(self, selectable): </span><span class="cx"> super(TranslatingDict, self).__init__() </span><span class="cx"> self.selectable = selectable </span><ins>+ def __translate_col(self, col): + ourcol = self.selectable.corresponding_column(col, keys_ok=False, raiseerr=False) + if ourcol is None: + return col + else: + return ourcol </ins><span class="cx"> def __getitem__(self, col): </span><del>- ourcol = self.selectable.corresponding_column(col) - return super(TranslatingDict, self).__getitem__(ourcol) </del><ins>+ return super(TranslatingDict, self).__getitem__(self.__translate_col(col)) </ins><span class="cx"> def has_key(self, col): </span><del>- ourcol = self.selectable.corresponding_column(col) - return super(TranslatingDict, self).has_key(ourcol) </del><ins>+ return super(TranslatingDict, self).has_key(self.__translate_col(col)) </ins><span class="cx"> def __setitem__(self, col, value): </span><del>- ourcol = self.selectable.corresponding_column(col) - return super(TranslatingDict, self).__setitem__(ourcol, value) </del><ins>+ return super(TranslatingDict, self).__setitem__(self.__translate_col(col), value) </ins><span class="cx"> def __contains__(self, col): </span><del>- ourcol = self.selectable.corresponding_column(col) - return super(TranslatingDict, self).__contains__(ourcol) </del><ins>+ return self.has_key(col) </ins><span class="cx"> def setdefault(self, col, value): </span><del>- ourcol = self.selectable.corresponding_column(col) - return super(TranslatingDict, self).setdefault(ourcol, value) </del><ins>+ return super(TranslatingDict, self).setdefault(self.__translate_col(col), value) </ins><span class="cx"> </span><span class="cx"> class ClassKey(object): </span><span class="cx"> """keys a class and an entity name to a mapper, via the mapper_registry""" </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyutilpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/util.py (1482 => 1483)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/util.py 2006-05-21 21:17:58 UTC (rev 1482) +++ sqlalchemy/branches/schema/lib/sqlalchemy/util.py 2006-05-21 22:36:53 UTC (rev 1483) </span><span class="lines">@@ -255,9 +255,9 @@ </span><span class="cx"> """sets the data for this HistoryArraySet to be that of the given data. </span><span class="cx"> duplicates in the incoming list will be removed.""" </span><span class="cx"> # first mark everything current as "deleted" </span><del>- for i in self.data: - self.records[i] = False - self.do_value_deleted(value) </del><ins>+ for item in self.data: + self.records[item] = False + self.do_value_deleted(item) </ins><span class="cx"> </span><span class="cx"> # switch array </span><span class="cx"> self.data = data </span></span></pre> </div> </div> </body> </html> |
