[Sqlalchemy-commits] [1486] zblog/trunk/components: more 0.2 changes...
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1486] zblog/trunk/components: more 0.2 changes...
|
From: <co...@sq...> - 2006-05-22 17:34:07
|
<!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>[1486] zblog/trunk/components: more 0.2 changes...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1486</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-22 12:33:50 -0500 (Mon, 22 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>more 0.2 changes...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#zblogtrunkcomponentsdatamyc">zblog/trunk/components/data.myc</a></li> <li><a href="#zblogtrunklibzblogcontrollerbootstrappy">zblog/trunk/lib/zblog/controller/bootstrap.py</a></li> <li><a href="#zblogtrunklibzblogdatabase__init__py">zblog/trunk/lib/zblog/database/__init__.py</a></li> <li><a href="#zblogtrunklibzblogdatabasemapperspy">zblog/trunk/lib/zblog/database/mappers.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="zblogtrunkcomponentsdatamyc"></a> <div class="modfile"><h4>Modified: zblog/trunk/components/data.myc (1485 => 1486)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/components/data.myc 2006-05-22 17:31:52 UTC (rev 1485) +++ zblog/trunk/components/data.myc 2006-05-22 17:33:50 UTC (rev 1486) </span><span class="lines">@@ -44,7 +44,10 @@ </span><span class="cx"> keyword=False </span><span class="cx"> </%args> </span><span class="cx"> <%init> </span><del>- posts = session().query(Post).select_by(blog_id=blog.id, keyword=keyword) </del><ins>+ if keyword is not False: + posts = session().query(Post).select_by(blog_id=blog.id, keyword=keyword) + else: + posts = session().query(Post).select_by(blog_id=blog.id) </ins><span class="cx"> if not m.has_content(): </span><span class="cx"> return posts </span><span class="cx"> </%init> </span></span></pre></div> <a id="zblogtrunklibzblogcontrollerbootstrappy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/bootstrap.py (1485 => 1486)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/bootstrap.py 2006-05-22 17:31:52 UTC (rev 1485) +++ zblog/trunk/lib/zblog/controller/bootstrap.py 2006-05-22 17:33:50 UTC (rev 1486) </span><span class="lines">@@ -60,7 +60,7 @@ </span><span class="cx"> dbform.description = desc['description'] </span><span class="cx"> f['dbtype'].value=dbtype </span><span class="cx"> for field in desc['arguments']: </span><del>- if dbtype == 'sqlite' and field[0] == 'host': </del><ins>+ if dbtype == 'sqlite' and field[0] == 'database': </ins><span class="cx"> default = './data/zblog.db' </span><span class="cx"> else: </span><span class="cx"> default = field[2] </span></span></pre></div> <a id="zblogtrunklibzblogdatabase__init__py"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/database/__init__.py (1485 => 1486)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/database/__init__.py 2006-05-22 17:31:52 UTC (rev 1485) +++ zblog/trunk/lib/zblog/database/__init__.py 2006-05-22 17:33:50 UTC (rev 1486) </span><span class="lines">@@ -47,11 +47,10 @@ </span><span class="cx"> import zblog.domain.user as user </span><span class="cx"> import zblog.database.mappers as mapper </span><span class="cx"> mapper.start_session() </span><del>- mapper.begin() </del><span class="cx"> try: </span><span class="cx"> u = user.User(admin_username, 'Administrator', admin_password, user.administrator) </span><span class="cx"> mapper.session().save(u) </span><del>- mapper.commit() </del><ins>+ mapper.session().flush() </ins><span class="cx"> finally: </span><span class="cx"> engine.echo = e </span><span class="cx"> engine.logger = sys.stdout </span><span class="cx">\ No newline at end of file </span></span></pre></div> <a id="zblogtrunklibzblogdatabasemapperspy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/database/mappers.py (1485 => 1486)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/database/mappers.py 2006-05-22 17:31:52 UTC (rev 1485) +++ zblog/trunk/lib/zblog/database/mappers.py 2006-05-22 17:33:50 UTC (rev 1486) </span><span class="lines">@@ -6,6 +6,7 @@ </span><span class="cx"> from zblog.domain.blog import * </span><span class="cx"> from sqlalchemy import * </span><span class="cx"> import sqlalchemy.util as util </span><ins>+import sys </ins><span class="cx"> </span><span class="cx"> # User mapper. Here, we redefine the names of some of the columns </span><span class="cx"> # to different property names. normally the table columns are all </span><span class="lines">@@ -17,6 +18,9 @@ </span><span class="cx"> 'crypt_password':tables.users.c.password, </span><span class="cx"> }) </span><span class="cx"> </span><ins>+#print [(k,p) for k, p in user.User.__dict__.iteritems()] +#sys.exit(0) + </ins><span class="cx"> # blog mapper. this contains a reference to the user mapper, </span><span class="cx"> # and also installs a "backreference" on that relationship to handle it </span><span class="cx"> # in both ways. this will also attach a 'blogs' property to the user mapper. </span><span class="lines">@@ -54,10 +58,13 @@ </span><span class="cx"> outerjoin(tables.posts, tables.comments) </span><span class="cx"> ], </span><span class="cx"> group_by=[ </span><del>- c for c in tables.posts.c </del><ins>+ c for c in tables.posts.c if c.key != 'body' </ins><span class="cx"> ] </span><span class="cx"> ) .alias('postswcount') </span><span class="cx"> </span><ins>+#print str(posts_with_ccount) +#sys.exit(0) + </ins><span class="cx"> # then create a Post mapper on that query. </span><span class="cx"> # we have the body as "deferred" so that it loads only when needed, </span><span class="cx"> # the user as a Lazy load, since the lazy load will run only once per user and </span><span class="lines">@@ -124,7 +131,7 @@ </span><span class="cx"> </span><span class="cx"> def start_session(): </span><span class="cx"> """creates a new session for the start of a request.""" </span><del>- trans.session = create_session(bind_to=zblog.database.engine) </del><ins>+ trans.session = create_session(bind_to=zblog.database.engine, echo_uow=True) </ins><span class="cx"> </span><span class="cx"> def session(): </span><span class="cx"> return trans.session </span></span></pre> </div> </div> </body> </html> |
