From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 10 Sep 2006 23:59:30 +0000 (+0000)
Subject: checks for invalid lockmode argument
X-Git-Tag: rel_0_3_0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8bdde94cb2863f8b5f99abb6cbb23618bc1749b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

checks for invalid lockmode argument
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d35219208d..052d048cbb 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -334,7 +334,10 @@ class Query(object):
             if self.table.default_order_by() is not None:
                 order_by = self.table.default_order_by()
 
-        for_update = {'read':'read','update':True,'update_nowait':'nowait'}.get(lockmode, False)
+        try:
+            for_update = {'read':'read','update':True,'update_nowait':'nowait',None:False}[lockmode]
+        except KeyError:
+            raise exceptions.ArgumentError("Unknown lockmode '%s'" % lockmode)
         
         if self.mapper.single and self.mapper.polymorphic_on is not None and self.mapper.polymorphic_identity is not None:
             whereclause = sql.and_(whereclause, self.mapper.polymorphic_on==self.mapper.polymorphic_identity)