- Session.connection(), Session.execute() accept 'bind',

to allow execute/connection operations to participate
in the open transaction of an engine explicitly.
[ticket:1996]
- fix up the docs for connection, execute, which were awful.
- correct usage strings in hybrid

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index 5c747400d..56abdabd8 100644
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -310,7 +310,7 @@ class hybrid_method(object):
                 def value(self, x, y):
                     return self._value + x + y
             
-                @hybrid_property.expression
+                @value.expression
                 def value(self, x, y):
                     return func.some_function(self._value, x, y)
             
@@ -348,7 +348,7 @@ class hybrid_property(object):
                 def value(self):
                     return self._value
             
-                @hybrid_property.setter
+                @value.setter
                 def value(self, value):
                     self._value = value