added __mod__ type

diff --git a/CHANGES b/CHANGES
index ee22d6ce9a9ef5d249d2fd262c9b1622aadbf615..cc6e7fe32eecd5cdbbdd9d9ce3c797715f49f0e3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 0.1.7
 - some fixes to topological sort algorithm
 - added DISTINCT ON support to Postgres (just supply distinct=[col1,col2..])
+- added __mod__ (% operator) to sql expressions
 - "order_by" mapper property inherited from inheriting mapper
 - fix to column type used when mapper UPDATES/DELETEs
 - with convert_unicode=True, reflection was failing, has been fixed

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index a6908a1b99a122f24b37ed9c1720c9cb3191dee1..8c10a44d942cecf060701ed5441d0f49e625e9f2 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -531,6 +531,8 @@ class CompareMixin(object):
         return self._operate('*', other)
     def __div__(self, other):
         return self._operate('/', other)
+    def __mod__(self, other):
+        return self._operate('%', other)
     def __truediv__(self, other):
         return self._operate('/', other)
     def _bind_param(self, obj):

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index bc894184f9244bfcff770c00199f3a78451c5994..74961dbf81bfc12c18238e21fa9958989fc16834 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -33,7 +33,7 @@ class TypeEngine(AbstractType):
     def engine_impl(self, engine):
         try:
             return self.impl_dict[engine]
-        except:
+        except KeyError:
             return self.impl_dict.setdefault(engine, engine.type_descriptor(self))
     def get_col_spec(self):
         raise NotImplementedError()