[Sqlalchemy-commits] [1339] zblog/trunk/components: more literal Session usage
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1339] zblog/trunk/components: more literal Session usage
|
From: <co...@sq...> - 2006-04-26 00:06:17
|
<!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>[1339] zblog/trunk/components: more literal Session usage</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1339</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-25 19:06:04 -0500 (Tue, 25 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>more literal Session usage</pre> <h3>Modified Paths</h3> <ul> <li><a href="#zblogtrunkcomponentsdatamyc">zblog/trunk/components/data.myc</a></li> <li><a href="#zblogtrunklibzblogcontroller__init__py">zblog/trunk/lib/zblog/controller/__init__.py</a></li> <li><a href="#zblogtrunklibzblogcontrollerblogcommentspy">zblog/trunk/lib/zblog/controller/blog/comments.py</a></li> <li><a href="#zblogtrunklibzblogcontrollerblogindexpy">zblog/trunk/lib/zblog/controller/blog/index.py</a></li> <li><a href="#zblogtrunklibzblogcontrollerloginpy">zblog/trunk/lib/zblog/controller/login.py</a></li> <li><a href="#zblogtrunklibzblogcontrollermanageblogpy">zblog/trunk/lib/zblog/controller/manage/blog.py</a></li> <li><a href="#zblogtrunklibzblogcontrollermanageuserpy">zblog/trunk/lib/zblog/controller/manage/user.py</a></li> <li><a href="#zblogtrunklibzblogdatabasemapperspy">zblog/trunk/lib/zblog/database/mappers.py</a></li> <li><a href="#zblogtrunklibzblogdomainactionspy">zblog/trunk/lib/zblog/domain/actions.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 (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/components/data.myc 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/components/data.myc 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> </span><span class="cx"> <%global> </span><span class="cx"> from zblog.domain.blog import * </span><del>- from zblog.database.mappers import query </del><ins>+ from zblog.database.mappers import session </ins><span class="cx"> </%global> </span><span class="cx"> </span><span class="cx"> <%method bloglist> </span><span class="lines">@@ -15,9 +15,9 @@ </span><span class="cx"> </%args> </span><span class="cx"> <%init> </span><span class="cx"> if user is not None: </span><del>- blogs = query(Blog).select_by(owner_id=user.id) </del><ins>+ blogs = session().query(Blog).select_by(owner_id=user.id) </ins><span class="cx"> else: </span><del>- blogs = query(Blog).select() </del><ins>+ blogs = session().query(Blog).select() </ins><span class="cx"> if not m.has_content(): </span><span class="cx"> return blogs </span><span class="cx"> </%init> </span><span class="lines">@@ -44,7 +44,7 @@ </span><span class="cx"> keyword=False </span><span class="cx"> </%args> </span><span class="cx"> <%init> </span><del>- posts = query(Post).select_by(blog_id=blog.id, keyword=keyword) </del><ins>+ posts = session().query(Post).select_by(blog_id=blog.id, keyword=keyword) </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="zblogtrunklibzblogcontroller__init__py"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/__init__.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/__init__.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/__init__.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -14,7 +14,7 @@ </span><span class="cx"> return zblog.database.mappers.session().merge(u) </span><span class="cx"> else: </span><span class="cx"> return None </span><del>- </del><ins>+ sqlsess = property(lambda s:zblog.database.mappers.session()) </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> </span></span></pre></div> <a id="zblogtrunklibzblogcontrollerblogcommentspy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/blog/comments.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/blog/comments.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/blog/comments.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -3,7 +3,6 @@ </span><span class="cx"> from zblog.domain.blog import * </span><span class="cx"> import zblog.domain.actions as actions </span><span class="cx"> import zblog.util.form as formutil </span><del>-import zblog.database.mappers as mapper </del><span class="cx"> </span><span class="cx"> class Comments(Controller): </span><span class="cx"> @access_control() </span><span class="lines">@@ -15,7 +14,7 @@ </span><span class="cx"> else: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> if post is None: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><span class="lines">@@ -31,7 +30,7 @@ </span><span class="cx"> else: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><del>- comment = mapper.query(Comment).get(comment_id) </del><ins>+ comment = self.sqlsess.query(Comment).get(comment_id) </ins><span class="cx"> if comment is None: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><span class="lines">@@ -41,12 +40,12 @@ </span><span class="cx"> @access_control(action=actions.CreateComment()) </span><span class="cx"> def post(self, m, ARGS, post_id, parent_comment_id, confirm=False, preview=False): </span><span class="cx"> """posts a comment, or provides a preview display.""" </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> if post is None: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><span class="cx"> if parent_comment_id: </span><del>- parentcomment = mapper.query(Comment).get(parent_comment_id) </del><ins>+ parentcomment = self.sqlsess.query(Comment).get(parent_comment_id) </ins><span class="cx"> else: </span><span class="cx"> parentcomment = None </span><span class="cx"> form = self.commentform(m, ARGS, post, comment=parentcomment) </span><span class="lines">@@ -59,8 +58,8 @@ </span><span class="cx"> self.template(m, '/blog/postcomment.myt', post=post, form=form, comment=parentcomment, preview=comment) </span><span class="cx"> return </span><span class="cx"> comment = self.createcomment(m, post, form, parentcomment) </span><del>- mapper.session().save(comment) - mapper.flush() </del><ins>+ self.sqlsess.save(comment) + self.sqlsess.flush() </ins><span class="cx"> form = self.commentform(m, ARGS, post, comment) </span><span class="cx"> form.append_success("Comment posted!") </span><span class="cx"> self.template(m, '/blog/postcomment.myt', post=post, comment=comment, form=form) </span></span></pre></div> <a id="zblogtrunklibzblogcontrollerblogindexpy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/blog/index.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/blog/index.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/blog/index.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -3,7 +3,6 @@ </span><span class="cx"> from zblog.domain.blog import * </span><span class="cx"> import zblog.domain.actions as actions </span><span class="cx"> import zblog.util.form as formutil </span><del>-import zblog.database.mappers as mapper </del><span class="cx"> from zblog.controller.blog.comments import index as commentcontroller </span><span class="cx"> </span><span class="cx"> class BlogHome(Controller): </span><span class="lines">@@ -20,7 +19,7 @@ </span><span class="cx"> else: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> if blog is None: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><span class="lines">@@ -29,12 +28,12 @@ </span><span class="cx"> @access_control(action=actions.CreatePost()) </span><span class="cx"> def post(self, m, ARGS, blog_id, post_id=None, preview=False): </span><span class="cx"> """submits a post, or previews it.""" </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> form = self.postform(m, ARGS) </span><span class="cx"> form.set_request(ARGS, validate=True) </span><span class="cx"> </span><span class="cx"> if post_id: </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> if post is None: </span><span class="cx"> form.append_error("no post found for id '%s'" % post_id) </span><span class="cx"> self.template(m, '/blog/index.myt', blog=blog, loadcomponent='/blog/forms.myt:postform', form=form) </span><span class="lines">@@ -52,12 +51,11 @@ </span><span class="cx"> self.reflect_to(m, form, preview, blog) </span><span class="cx"> self.template(m, '/blog/index.myt', blog=blog, loadcomponent='/blog/forms.myt:postform', form=form, preview=preview, post=post) </span><span class="cx"> else: </span><del>- sess = mapper.session() </del><span class="cx"> if post is None: </span><span class="cx"> post = Post() </span><del>- sess.save(post) </del><ins>+ self.sqlsess.save(post) </ins><span class="cx"> self.reflect_to(m, form, post, blog) </span><del>- mapper.flush() </del><ins>+ self.sqlsess.flush() </ins><span class="cx"> if not post_id: </span><span class="cx"> form.append_success("Post added") </span><span class="cx"> else: </span><span class="lines">@@ -72,10 +70,10 @@ </span><span class="cx"> for keyword in form['topic_keywords'].value.split(' '): </span><span class="cx"> if not keyword: </span><span class="cx"> continue </span><del>- topic = mapper.query(Topic).get_by(keyword=keyword) </del><ins>+ topic = self.sqlsess.query(Topic).get_by(keyword=keyword) </ins><span class="cx"> if topic is None: </span><span class="cx"> topic = Topic(keyword=keyword, description=keyword) </span><del>- mapper.session().save(topic) </del><ins>+ self.sqlsess.save(topic) </ins><span class="cx"> post.topics.append(TopicAssociation(post=post, topic=topic, is_primary=False)) </span><span class="cx"> </span><span class="cx"> print repr([(t, t.post, t.topic) for t in post.topics.records.keys()]) </span><span class="lines">@@ -90,14 +88,14 @@ </span><span class="cx"> @access_control(action=actions.CreatePost()) </span><span class="cx"> def new_post(self, m, ARGS, blog_id): </span><span class="cx"> """provides a blank "submit a post" screen""" </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> form = self.postform(m, ARGS) </span><span class="cx"> self.template(m, '/blog/index.myt', loadcomponent='/blog/forms.myt:postform', form=form, blog=blog) </span><span class="cx"> </span><span class="cx"> @access_control(action=actions.EditPost()) </span><span class="cx"> def ajax_edit_post(self, m, ARGS, post_id): </span><span class="cx"> """produces an "edit post" screen, given the id of the post""" </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> form = self.postform(m, ARGS) </span><span class="cx"> self.reflect_from(form, post) </span><span class="cx"> m.comp('/blog/forms.myt:postform', form=form, blog=post.blog, post=post) </span><span class="lines">@@ -105,14 +103,14 @@ </span><span class="cx"> @access_control(action=actions.EditPost()) </span><span class="cx"> def ajax_delete_post(self, m, ARGS, post_id, confirm=False): </span><span class="cx"> """deletes a post, given its ID.""" </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> blog = post.blog </span><span class="cx"> if not confirm: </span><span class="cx"> m.comp('/blog/forms.myt:delete_confirm', post=post) </span><span class="cx"> return </span><span class="cx"> form = self.postform(m, ARGS) </span><del>- mapper.session().delete(post) - mapper.flush() </del><ins>+ self.sqlsess.delete(post) + self.sqlsess.flush() </ins><span class="cx"> form.append_success("Post deleted") </span><span class="cx"> m.comp('/blog/index.myt:postlist', blog=blog, form=form) </span><span class="cx"> </span><span class="lines">@@ -125,8 +123,8 @@ </span><span class="cx"> else: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span><del>- #post = Post.mapper.options(nodefer('body')).get(post_id) - post = mapper.query(Post).get(post_id) </del><ins>+ #post = Post.self.sqlsess.options(nodefer('body')).get(post_id) + post = self.sqlsess.query(Post).get(post_id) </ins><span class="cx"> if post is None: </span><span class="cx"> m.abort(404) </span><span class="cx"> </span></span></pre></div> <a id="zblogtrunklibzblogcontrollerloginpy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/login.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/login.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/login.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -1,5 +1,4 @@ </span><span class="cx"> import zblog.controller </span><del>-import zblog.database.mappers as mapper </del><span class="cx"> from zblog.domain.user import User </span><span class="cx"> import zblog.util.form as form </span><span class="cx"> import StringIO, os </span><span class="lines">@@ -24,7 +23,7 @@ </span><span class="cx"> f = self.form() </span><span class="cx"> f.set_request(ARGS) </span><span class="cx"> </span><del>- u = mapper.query(User).get_by(name=f['username'].display) </del><ins>+ u = self.sqlsess.query(User).get_by(name=f['username'].display) </ins><span class="cx"> if u is None or not u.checkpw(f['password'].display): </span><span class="cx"> u = None </span><span class="cx"> if u is not None: </span><span class="lines">@@ -62,7 +61,7 @@ </span><span class="cx"> form.append_error("Passwords do not match") </span><span class="cx"> form.isvalid=False </span><span class="cx"> </span><del>- existing = mapper.query(User).get_by(name=form['name'].value) </del><ins>+ existing = self.sqlsess.query(User).get_by(name=form['name'].value) </ins><span class="cx"> if existing is not None: </span><span class="cx"> form['name'].append_error("Username '%s' already exists" % form['name'].value) </span><span class="cx"> form.isvalid=False </span><span class="lines">@@ -71,12 +70,11 @@ </span><span class="cx"> self.template(m, '/register.myt', form=form) </span><span class="cx"> return </span><span class="cx"> </span><del>- sess = mapper.session() </del><span class="cx"> user = User() </span><span class="cx"> form.reflect_to(user) </span><span class="cx"> user.group=zblog.domain.user.user </span><del>- sess.save(user) - sess.flush() </del><ins>+ self.sqlsess.save(user) + self.sqlsess.flush() </ins><span class="cx"> form = self.form() </span><span class="cx"> form.append_success("Thanks for registering, %s!" % (user.name)) </span><span class="cx"> self.template(m, '/login.myt', form=form) </span></span></pre></div> <a id="zblogtrunklibzblogcontrollermanageblogpy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/manage/blog.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/manage/blog.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/manage/blog.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -2,7 +2,6 @@ </span><span class="cx"> import zblog.util.form as formutil </span><span class="cx"> from zblog.domain.user import User </span><span class="cx"> from zblog.domain.blog import Blog </span><del>-import zblog.database.mappers as mapper </del><span class="cx"> import zblog.domain.actions as actions </span><span class="cx"> from zblog.controller import access_control </span><span class="cx"> </span><span class="lines">@@ -12,7 +11,7 @@ </span><span class="cx"> if form is None: </span><span class="cx"> form = self.form(m) </span><span class="cx"> if blog_id: </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> form.reflect_from(blog) </span><span class="cx"> m.comp('/admin/blog.myt:blogedit', form=form) </span><span class="cx"> </span><span class="lines">@@ -29,7 +28,7 @@ </span><span class="cx"> self.ajax_editblog(m, ARGS, form=form, blog_id=blog_id) </span><span class="cx"> return </span><span class="cx"> </span><del>- owner = mapper.query(User).get_by(name=form['owner_name'].value) </del><ins>+ owner = self.sqlsess.query(User).get_by(name=form['owner_name'].value) </ins><span class="cx"> if owner is None: </span><span class="cx"> form.append_error("Could not locate user %s" % form['owner_name'].value) </span><span class="cx"> self.ajax_editblog(m, ARGS, form=form, blog_id=blog_id) </span><span class="lines">@@ -37,15 +36,15 @@ </span><span class="cx"> </span><span class="cx"> if blog_id: </span><span class="cx"> created = False </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> else: </span><span class="cx"> created = True </span><span class="cx"> blog = Blog() </span><del>- mapper.session().save(blog) </del><ins>+ self.sqlsess.save(blog) </ins><span class="cx"> </span><span class="cx"> form.reflect_to(blog) </span><span class="cx"> blog.owner = owner </span><del>- mapper.flush() </del><ins>+ self.sqlsess.flush() </ins><span class="cx"> form.append_success("Blog '%s' %s" % (blog.name, created and 'created' or 'updated')) </span><span class="cx"> form.reflect_from(blog) </span><span class="cx"> m.comp('/admin/blog.myt:blogedit', form=form) </span><span class="lines">@@ -53,7 +52,7 @@ </span><span class="cx"> @access_control(login=True, action=actions.EditBlog()) </span><span class="cx"> def delete_blog(self, m, ARGS, blog_id=None, confirm=False): </span><span class="cx"> form= self.form(m) </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = self.sqlsess.query(Blog).get(blog_id) </ins><span class="cx"> if blog is None: </span><span class="cx"> form.append_error("No blog found for id '%s'" % blog_id) </span><span class="cx"> self.ajax_editblog(m, ARGS, form=form) </span><span class="lines">@@ -64,8 +63,8 @@ </span><span class="cx"> return </span><span class="cx"> </span><span class="cx"> name = blog.name </span><del>- mapper.delete(blog) - mapper.flush() </del><ins>+ self.sqlsess.delete(blog) + self.sqlsess.flush() </ins><span class="cx"> form.append_success("Blog '%s' deleted" % name) </span><span class="cx"> form.clear() </span><span class="cx"> m.comp('/admin/blog.myt:blogedit', form=form) </span></span></pre></div> <a id="zblogtrunklibzblogcontrollermanageuserpy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/controller/manage/user.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/controller/manage/user.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/controller/manage/user.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -2,7 +2,6 @@ </span><span class="cx"> import zblog.util.form as formutil </span><span class="cx"> from zblog.domain.user import User </span><span class="cx"> from zblog.domain.blog import Blog </span><del>-import zblog.database.mappers as mapper </del><span class="cx"> import zblog.domain.actions as actions </span><span class="cx"> from zblog.controller import access_control </span><span class="cx"> </span><span class="lines">@@ -12,7 +11,7 @@ </span><span class="cx"> if form is None: </span><span class="cx"> form = self.form(m) </span><span class="cx"> if username is not None: </span><del>- user = mapper.query(User).get_by(name=username) </del><ins>+ user = self.sqlsess.query(User).get_by(name=username) </ins><span class="cx"> if user is not None: </span><span class="cx"> form.reflect_from(user) </span><span class="cx"> form['password_set'].required = False </span><span class="lines">@@ -35,7 +34,7 @@ </span><span class="cx"> form.append_error("Passwords do not match") </span><span class="cx"> </span><span class="cx"> if not user_id: </span><del>- existing = mapper.query(User).get_by(name=form['name'].value) </del><ins>+ existing = self.sqlsess.query(User).get_by(name=form['name'].value) </ins><span class="cx"> if existing is not None: </span><span class="cx"> form['name'].append_error("Username '%s' already exists" % form['name'].value) </span><span class="cx"> </span><span class="lines">@@ -45,13 +44,13 @@ </span><span class="cx"> </span><span class="cx"> if user_id: </span><span class="cx"> created = False </span><del>- user = mapper.query(User).get(user_id) </del><ins>+ user = self.sqlsess.query(User).get(user_id) </ins><span class="cx"> else: </span><span class="cx"> created = True </span><span class="cx"> user = User() </span><del>- mapper.session().save(user) </del><ins>+ self.sqlsess.save(user) </ins><span class="cx"> form.reflect_to(user) </span><del>- mapper.flush() </del><ins>+ self.sqlsess.flush() </ins><span class="cx"> form.append_success("User '%s' %s" % (user.name, created and 'created' or 'updated')) </span><span class="cx"> form.reflect_from(user) </span><span class="cx"> m.comp('/admin/user.myt:userform', form=form) </span><span class="lines">@@ -59,7 +58,7 @@ </span><span class="cx"> @access_control(login=True, action=actions.AdminUsers()) </span><span class="cx"> def delete_user(self, m, ARGS, user_id, confirm=False): </span><span class="cx"> form = self.form(m) </span><del>- user = mapper.query(User).get(user_id) </del><ins>+ user = self.sqlsess.query(User).get(user_id) </ins><span class="cx"> if user is None: </span><span class="cx"> form.append_error("Userid %d not found" % user_id) </span><span class="cx"> self.ajax_edituser(m, ARGS, form=form) </span><span class="lines">@@ -69,8 +68,8 @@ </span><span class="cx"> m.comp('/admin/user.myt:delete_confirm', user=user) </span><span class="cx"> return </span><span class="cx"> name = user.name </span><del>- mapper.session().delete(user) - mapper.flush() </del><ins>+ self.sqlsess.delete(user) + self.sqlsess.flush() </ins><span class="cx"> form.append_success("User '%s' deleted" % name) </span><span class="cx"> form.clear() </span><span class="cx"> m.comp('/admin/user.myt:userform', form=form) </span></span></pre></div> <a id="zblogtrunklibzblogdatabasemapperspy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/database/mappers.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/database/mappers.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/database/mappers.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -70,7 +70,7 @@ </span><span class="cx"> 'body':deferred(tables.posts.c.body), </span><span class="cx"> 'user':relation(user.User, lazy=True, backref='posts'), </span><span class="cx"> 'blog':relation(Blog, lazy=True, backref='posts'), </span><del>- 'topics':relation(TopicAssociation, lazy=False, private=True, association=Topic) </del><ins>+ 'topics':relation(TopicAssociation, lazy=False, private=True, association=Topic, backref='post') </ins><span class="cx"> }, is_primary=True, order_by=[desc(posts_with_ccount.c.datetime)]) </span><span class="cx"> </span><span class="cx"> # override 'posts' property on Blog to be private, so that posts get deleted when the blog does. </span><span class="lines">@@ -103,7 +103,7 @@ </span><span class="cx"> uses a mapper that does not lazy load replies or parents, and instead </span><span class="cx"> organizes comments into a hierarchical tree when the result is produced. </span><span class="cx"> """ </span><del>- q = query(Comment).options(noload('replies'), noload('parent')) </del><ins>+ q = session().query(Comment).options(noload('replies'), noload('parent')) </ins><span class="cx"> comments = q.select_by(post_id=post.id) </span><span class="cx"> result = [] </span><span class="cx"> d = {} </span><span class="lines">@@ -129,9 +129,3 @@ </span><span class="cx"> def session(): </span><span class="cx"> return trans.session </span><span class="cx"> </span><del>-def query(class_): - return trans.session.query(class_) - -def flush(): - trans.session.flush() - </del></span></pre></div> <a id="zblogtrunklibzblogdomainactionspy"></a> <div class="modfile"><h4>Modified: zblog/trunk/lib/zblog/domain/actions.py (1338 => 1339)</h4> <pre class="diff"><span> <span class="info">--- zblog/trunk/lib/zblog/domain/actions.py 2006-04-26 00:05:30 UTC (rev 1338) +++ zblog/trunk/lib/zblog/domain/actions.py 2006-04-26 00:06:04 UTC (rev 1339) </span><span class="lines">@@ -56,7 +56,7 @@ </span><span class="cx"> if user is None: </span><span class="cx"> return False </span><span class="cx"> if blog_id and not user.is_administrator(): </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = mapper.session().query(Blog).get(blog_id) </ins><span class="cx"> if blog is None: </span><span class="cx"> return False </span><span class="cx"> return user.id==blog.owner.id </span><span class="lines">@@ -68,7 +68,7 @@ </span><span class="cx"> if user is None: </span><span class="cx"> return False </span><span class="cx"> if blog is None: </span><del>- blog = mapper.query(Blog).get(blog_id) </del><ins>+ blog = mapper.session().query(Blog).get(blog_id) </ins><span class="cx"> if blog is None: </span><span class="cx"> return False </span><span class="cx"> return blog.owner.id==user.id or user.is_administrator() </span><span class="lines">@@ -78,7 +78,7 @@ </span><span class="cx"> if user is None: </span><span class="cx"> return False </span><span class="cx"> if post is None: </span><del>- post = mapper.query(Post).get(post_id) </del><ins>+ post = mapper.session().query(Post).get(post_id) </ins><span class="cx"> if post is None: </span><span class="cx"> return False </span><span class="cx"> return post.user.id==user.id or user.is_administrator() or user.id==post.blog.owner.id </span></span></pre> </div> </div> </body> </html> |